diff options
| author | John Fultz <jfultz@wolfram.com> | 2017-08-01 23:20:55 -0500 |
|---|---|---|
| committer | John Fultz <jfultz@wolfram.com> | 2017-08-02 00:27:47 -0500 |
| commit | 67059305e164f3b741c36d4e0ac22022c9b79901 (patch) | |
| tree | 7f9a62443c0283c58e4353fa38e41ef95bcf264a /quacker/settings.cpp | |
| parent | 6684280feec74fa4c58066cf8e667b5f19a717c7 (diff) | |
More Qt5 changes and cleanups.
Now builds on Qt 5.9.1, and works on Mac, Windows, Linux.
Diffstat (limited to 'quacker/settings.cpp')
| -rw-r--r-- | quacker/settings.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/quacker/settings.cpp b/quacker/settings.cpp index 5811edb..7896f90 100644 --- a/quacker/settings.cpp +++ b/quacker/settings.cpp @@ -21,17 +21,11 @@ #include <iostream> #include <sstream> -#include <QtGui> -#include <QGridLayout> -#include <QComboBox> -#include <QMessageBox> -#include <QLabel> -#include <QPushButton> -#include <QStandardPaths> - -#ifdef Q_WS_MAC +#include <QtWidgets> + +#ifdef Q_OS_MAC #include <CoreFoundation/CoreFoundation.h> -#endif // Q_WS_MAC +#endif // Q_OS_MAC #include "alphabetparameters.h" #include "board.h" @@ -64,7 +58,7 @@ Settings::Settings(QWidget *parent) m_self = this; QDir directory = QFileInfo(qApp->arguments().at(0)).absoluteDir(); - #ifdef Q_WS_MAC + #ifdef Q_OS_MAC if (CFBundleGetMainBundle()) { CFURLRef dataUrlRef = CFBundleCopyResourceURL(CFBundleGetMainBundle(), CFSTR("data"), NULL, NULL); @@ -83,7 +77,7 @@ Settings::Settings(QWidget *parent) CFRelease(macPath); } } - #endif + #endif // Q_OS_MAC if (QFile::exists("data")) m_appDataDir = "data"; |