Instead of having the same method four time with different name and image to load

we now have a define.
This makes it more easy to change the handling of builtin decoration image

1 files changed, 15 insertions, 40 deletions

diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp
index fb47c14..1afae88 100644
--- a/library/qpedecoration_qws.cpp
+++ b/library/qpedecoration_qws.cpp
@@ -296,64 +296,39 @@ void QPEManager::whatsThisTimeout()
 	    if ( active ) {
 		whatsThis = active;
 		drawTitle( active );
 		// check periodically to see if we've left whats this mode
 		wtTimer->start( 250 );
 	    }
 	}
 	inWhatsThis = !inWhatsThis;
     }
 }
 
 //===========================================================================
-
-static QImage *okImage( int th )
-{
-    static QImage *i = 0;
-    if ( !i || ::abs( i->height()-th ) > 4 ) {
-	delete i;
-	i = new QImage(scaleButton(Resource::loadImage("OKButton"),th));
-    }
-    return i;
-}
-
-static QImage *closeImage( int th )
-{
-    static QImage *i = 0;
-    if ( !i || ::abs( i->height()-th ) > 4 ) {
-	delete i;
-	i = new QImage(scaleButton(Resource::loadImage("CloseButton"),th));
-    }
-    return i;
-}
-
-static QImage *helpImage( int th )
-{
-    static QImage *i = 0;
-    if ( !i || ::abs( i->height()-th ) > 4 ) {
-	delete i;
-	i = new QImage(scaleButton(Resource::loadImage("HelpButton"),th));
-    }
-    return i;
-}
-
-static QImage *maximizeImage( int th )
-{
-    static QImage *i = 0;
-    if ( !i || ::abs( i->height()-th ) > 4 ) {
-	delete i;
-	i = new QImage(scaleButton(Resource::loadImage("MaximizeButton"),th));
-    }
-    return i;
-}
+#define IMAGE_METHOD( methodName, imageName )                             \
+static QImage* methodName( int th ) {                                     \
+    static QImage *i = 0;                                                 \
+     if ( !i || ::abs( i->height()-th ) > 4 ) {                           \
+         delete i;                                                        \
+         i = new QImage(scaleButton(Resource::loadImage(#imageName),th)); \
+     }                                                                    \
+                                                                          \
+     return i;                                                            \
+}
+
+IMAGE_METHOD(okImage,      OKButton       );
+IMAGE_METHOD(closeImage,   CloseButton    );
+IMAGE_METHOD(helpImage,    HelpButton     );
+IMAGE_METHOD(maximizeImage,MaximizeButton );
 
 int WindowDecorationInterface::metric( Metric m, const WindowData *wd ) const
 {
     switch ( m ) {
 	case TitleHeight:
 	    if ( QApplication::desktop()->height() > 320 )
 		return 19;
 	    else
 		return 15;
 	case LeftBorder:
 	case RightBorder:
 	case TopBorder: