made isX11 a static method of Breeze::Helper

use everywhere instead of duplicating code

kstyle/breezehelper.cpp

@@ -35,17 +35,12 @@ namespace Breeze
 {
     //____________________________________________________________________
     Helper::Helper( KSharedConfig::Ptr config ):
-        _config( config ),
-        _isX11( false )
+        _config( config )
     {
 
         #if HAVE_X11
 
-        // initialize X11 flag
-        _isX11 = QGuiApplication::platformName() == QStringLiteral("xcb");
-
-
-        if( _isX11 )
+        if( isX11() )
         {
             // create compositing screen
             const QString atomName( QStringLiteral( "_NET_WM_CM_S%1" ).arg( QX11Info::appScreen() ) );
@@ -1176,6 +1171,12 @@ namespace Breeze
 
     }
 
+    //______________________________________________________________________________
+    bool Helper::isX11( void )
+    {
+        static bool isX11 = QGuiApplication::platformName() == QStringLiteral("xcb");
+        return isX11;
+    }
 
     //______________________________________________________________________________
     QRectF Helper::shadowRect( const QRectF& rect ) const

kstyle/breezehelper.h

@@ -203,8 +203,7 @@ namespace Breeze
         //@{
 
         //! true if style was compiled for and is running on X11
-        bool isX11() const
-        { return _isX11; }
+        static bool isX11();
 
         //! returns true if compositing is active
         bool compositingActive( void ) const;
@@ -212,6 +211,11 @@ namespace Breeze
         //! returns true if a given widget supports alpha channel
         bool hasAlphaChannel( const QWidget* ) const;
 
+        //@}
+
+        //!@name X11 utilities
+        //@{
+
         #if HAVE_X11
 
         //! get xcb connection
@@ -248,8 +252,6 @@ namespace Breeze
         KStatefulBrush _viewNegativeTextBrush;
         //@}
 
-        bool _isX11;
-
         #if HAVE_X11
 
         //! atom used for compositing manager

kstyle/breezeshadowhelper.cpp

@@ -121,7 +121,7 @@ namespace Breeze
     {
 
         #if HAVE_X11
-        if( _helper.isX11() )
+        if( Helper::isX11() )
         { foreach( const uint32_t& value, _pixmaps  ) xcb_free_pixmap( Helper::connection(), value ); }
         #endif
 
@@ -131,7 +131,7 @@ namespace Breeze
     void ShadowHelper::reset( void )
     {
         #if HAVE_X11
-        if( _helper.isX11() )
+        if( Helper::isX11() )
         { foreach( const uint32_t& value, _pixmaps  ) xcb_free_pixmap( Helper::connection(), value ); }
         #endif
 
@@ -297,7 +297,7 @@ namespace Breeze
         #if HAVE_X11
 
         // make sure we are on X11
-        if( !_helper.isX11() ) return false;
+        if( !Helper::isX11() ) return false;
 
         // create atom
         xcb_atom_t netSupportedAtom( _helper.createAtom( "_NET_SUPPORTED" ) );
@@ -393,7 +393,7 @@ namespace Breeze
 
         // create atom
         #if HAVE_X11
-        if( !_atom && _helper.isX11() ) _atom = _helper.createAtom( QLatin1String( netWMShadowAtomName ) );
+        if( !_atom && Helper::isX11() ) _atom = _helper.createAtom( QLatin1String( netWMShadowAtomName ) );
         #endif
 
         shadowTiles();
@@ -424,7 +424,7 @@ namespace Breeze
 
         // do nothing for invalid pixmaps
         if( source.isNull() ) return 0;
-        if( !_helper.isX11() ) return 0;
+        if( !Helper::isX11() ) return 0;
 
         /*
         in some cases, pixmap handle is invalid. This is the case notably
@@ -469,7 +469,7 @@ namespace Breeze
 
         // check widget and shadow
         if( !widget ) return false;
-        if( !_helper.isX11() ) return false;
+        if( !Helper::isX11() ) return false;
 
         #if HAVE_X11
         #ifndef QT_NO_XRENDER
@@ -550,7 +550,7 @@ namespace Breeze
 
         #if HAVE_X11
         if( !_supported ) return;
-        if( !_helper.isX11() ) return;
+        if( !Helper::isX11() ) return;
         if( !( widget && widget->testAttribute(Qt::WA_WState_Created) ) ) return;
         xcb_delete_property( Helper::connection(), widget->winId(), _atom);
         #else

kstyle/breezewindowmanager.cpp

@@ -78,8 +78,7 @@ namespace Breeze
         _dragAboutToStart( false ),
         _dragInProgress( false ),
         _locked( false ),
-        _cursorOverride( false ),
-        _isX11( false )
+        _cursorOverride( false )
     {
 
         // install application wise event filter
@@ -87,9 +86,8 @@ namespace Breeze
         qApp->installEventFilter( _appEventFilter );
 
         #if HAVE_X11
-        _isX11 = QGuiApplication::platformName() == QStringLiteral("xcb");
         _moveResizeAtom = 0;
-        if( _isX11 )
+        if( Helper::isX11() )
         {
             // create move-resize atom
             xcb_connection_t* connection( Helper::connection() );
@@ -700,10 +698,10 @@ namespace Breeze
     {
 
         #if HAVE_X11
-        return _isX11;
-        #endif
-
+        return Helper::isX11();
+        #else
         return false;
+        #endif
 
     }
 

kstyle/breezewindowmanager.h

@@ -298,8 +298,6 @@ namespace Breeze
         xcb_atom_t _moveResizeAtom;
         #endif
 
-        bool _isX11;
-
         //! allow access of all private members to the app event filter
         friend class AppEventFilter;