Skip to content

Commit 4fdec37

Browse files
committed
Remove some unused members
1 parent 3ff5c82 commit 4fdec37

File tree

2 files changed

+4
-64
lines changed

2 files changed

+4
-64
lines changed

src/app/qgisappstylesheet.cpp

-42
Original file line numberDiff line numberDiff line change
@@ -222,63 +222,21 @@ void QgisAppStyleSheet::setActiveValues()
222222
mStyle = qApp->style()->objectName(); // active style name (lowercase)
223223
QgsDebugMsg( QStringLiteral( "Style name: %1" ).arg( mStyle ) );
224224

225-
mMotifStyle = mStyle.contains( QLatin1String( "motif" ) ); // motif
226-
mCdeStyle = mStyle.contains( QLatin1String( "cde" ) ); // cde
227-
mPlastqStyle = mStyle.contains( QLatin1String( "plastique" ) ); // plastique
228-
mCleanLkStyle = mStyle.contains( QLatin1String( "cleanlooks" ) ); // cleanlooks
229-
mGtkStyle = mStyle.contains( QLatin1String( "gtk" ) ); // gtk+
230-
mWinStyle = mStyle.contains( QLatin1String( "windows" ) ); // windows
231-
mWinXpStyle = mStyle.contains( QLatin1String( "windowsxp" ) ); // windowsxp
232-
mWinVistaStyle = mStyle.contains( QLatin1String( "windowsvista" ) ); // windowsvista
233225
mMacStyle = mStyle.contains( QLatin1String( "macintosh" ) ); // macintosh (aqua)
234226
mOxyStyle = mStyle.contains( QLatin1String( "oxygen" ) ); // oxygen
235227

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

238230
// platforms, specific
239-
#ifdef Q_OS_LINUX
240-
mLinuxOS = true;
241-
#else
242-
mLinuxOS = false;
243-
#endif
244231
#ifdef Q_OS_WIN
245232
mWinOS = true;
246233
#else
247234
mWinOS = false;
248235
#endif
249-
#ifdef Q_OS_MAC
250-
mMacOS = true;
251-
#else
252-
mMacOS = false;
253-
#endif
254236
#ifdef ANDROID
255237
mAndroidOS = true;
256238
#else
257239
mAndroidOS = false;
258240
#endif
259241

260-
// platforms, general
261-
#ifdef Q_OS_UNIX
262-
mUnix = true;
263-
#else
264-
mUnix = false;
265-
#endif
266-
267-
// window servers
268-
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
269-
mX11WS = true;
270-
#else
271-
mX11WS = false;
272-
#endif
273-
#ifdef Q_OS_WIN
274-
mWinWS = true;
275-
#else
276-
mWinWS = false;
277-
#endif
278-
#ifdef Q_OS_MAC
279-
mMacWS = true;
280-
#else
281-
mMacWS = false;
282-
#endif
283-
284242
}

src/app/qgisappstylesheet.h

+4-22
Original file line numberDiff line numberDiff line change
@@ -64,33 +64,15 @@ class APP_EXPORT QgisAppStyleSheet: public QObject
6464

6565
// qt styles
6666
QString mStyle; // active style name (lowercase)
67-
bool mMotifStyle; // motif
68-
bool mCdeStyle; // cde
69-
bool mPlastqStyle; // plastique
70-
bool mCleanLkStyle; // cleanlooks
71-
bool mGtkStyle; // gtk+
72-
bool mWinStyle; // windows
73-
bool mWinXpStyle; // windowsxp
74-
bool mWinVistaStyle; // windowsvista
75-
bool mMacStyle; // macintosh (aqua)
76-
bool mOxyStyle; // oxygen
67+
bool mMacStyle = false; // macintosh (aqua)
68+
bool mOxyStyle = false; // oxygen
7769

7870
// default font saved for reference
7971
QFont mDefaultFont;
8072

8173
// platforms, specific
82-
bool mLinuxOS;
83-
bool mWinOS;
84-
bool mMacOS;
85-
bool mAndroidOS;
86-
87-
// platforms, general
88-
bool mUnix;
89-
90-
// window servers
91-
bool mX11WS;
92-
bool mWinWS;
93-
bool mMacWS;
74+
bool mWinOS = false;
75+
bool mAndroidOS = false;
9476
};
9577

9678
#endif //QGISAPPSTYLESHEET_H

0 commit comments

Comments
 (0)