Skip to content
Permalink
Browse files

Remove some unused members

  • Loading branch information
nyalldawson committed Oct 23, 2018
1 parent 3ff5c82 commit 4fdec37c1732d0c2eada73f0908b29810c6a1a14
Showing with 4 additions and 64 deletions.
  1. +0 −42 src/app/qgisappstylesheet.cpp
  2. +4 −22 src/app/qgisappstylesheet.h
@@ -222,63 +222,21 @@ void QgisAppStyleSheet::setActiveValues()
mStyle = qApp->style()->objectName(); // active style name (lowercase)
QgsDebugMsg( QStringLiteral( "Style name: %1" ).arg( mStyle ) );

mMotifStyle = mStyle.contains( QLatin1String( "motif" ) ); // motif
mCdeStyle = mStyle.contains( QLatin1String( "cde" ) ); // cde
mPlastqStyle = mStyle.contains( QLatin1String( "plastique" ) ); // plastique
mCleanLkStyle = mStyle.contains( QLatin1String( "cleanlooks" ) ); // cleanlooks
mGtkStyle = mStyle.contains( QLatin1String( "gtk" ) ); // gtk+
mWinStyle = mStyle.contains( QLatin1String( "windows" ) ); // windows
mWinXpStyle = mStyle.contains( QLatin1String( "windowsxp" ) ); // windowsxp
mWinVistaStyle = mStyle.contains( QLatin1String( "windowsvista" ) ); // windowsvista
mMacStyle = mStyle.contains( QLatin1String( "macintosh" ) ); // macintosh (aqua)
mOxyStyle = mStyle.contains( QLatin1String( "oxygen" ) ); // oxygen

mDefaultFont = qApp->font(); // save before it is changed in any way

// platforms, specific
#ifdef Q_OS_LINUX
mLinuxOS = true;
#else
mLinuxOS = false;
#endif
#ifdef Q_OS_WIN
mWinOS = true;
#else
mWinOS = false;
#endif
#ifdef Q_OS_MAC
mMacOS = true;
#else
mMacOS = false;
#endif
#ifdef ANDROID
mAndroidOS = true;
#else
mAndroidOS = false;
#endif

// platforms, general
#ifdef Q_OS_UNIX
mUnix = true;
#else
mUnix = false;
#endif

// window servers
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
mX11WS = true;
#else
mX11WS = false;
#endif
#ifdef Q_OS_WIN
mWinWS = true;
#else
mWinWS = false;
#endif
#ifdef Q_OS_MAC
mMacWS = true;
#else
mMacWS = false;
#endif

}
@@ -64,33 +64,15 @@ class APP_EXPORT QgisAppStyleSheet: public QObject

// qt styles
QString mStyle; // active style name (lowercase)
bool mMotifStyle; // motif
bool mCdeStyle; // cde
bool mPlastqStyle; // plastique
bool mCleanLkStyle; // cleanlooks
bool mGtkStyle; // gtk+
bool mWinStyle; // windows
bool mWinXpStyle; // windowsxp
bool mWinVistaStyle; // windowsvista
bool mMacStyle; // macintosh (aqua)
bool mOxyStyle; // oxygen
bool mMacStyle = false; // macintosh (aqua)
bool mOxyStyle = false; // oxygen

// default font saved for reference
QFont mDefaultFont;

// platforms, specific
bool mLinuxOS;
bool mWinOS;
bool mMacOS;
bool mAndroidOS;

// platforms, general
bool mUnix;

// window servers
bool mX11WS;
bool mWinWS;
bool mMacWS;
bool mWinOS = false;
bool mAndroidOS = false;
};

#endif //QGISAPPSTYLESHEET_H

0 comments on commit 4fdec37

Please sign in to comment.
You can’t perform that action at this time.