More Qt5 changes and cleanups.

Now builds on Qt 5.9.1, and works on Mac, Windows, Linux.

25 files changed, 32 insertions, 154 deletions

diff --git a/quacker/quacker.plist b/quacker/Quackle.plist
index 3969d54..c826b55 100644
--- a/quacker/quacker.plist
+++ b/quacker/Quackle.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleExecutable</key>
-	<string>quacker</string>
+	<string>Quackle</string>
 	<key>CFBundleIconFile</key>
 	<string>quacker.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -21,6 +21,6 @@
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright &copy; 2005-2016 by Jason Katz-Brown & John O'Laughlin</string>
+	<string>Copyright © 2005-2017 by Jason Katz-Brown &amp; John O'Laughlin</string>
 </dict>
 </plist>
diff --git a/quacker/bagdisplay.cpp b/quacker/bagdisplay.cpp
index da52732..9777c06 100644
--- a/quacker/bagdisplay.cpp
+++ b/quacker/bagdisplay.cpp
@@ -18,11 +18,7 @@
 
 #include <math.h>
 
-#include <QtGui>
-#include <QTextEdit>
-#include <QLabel>
-#include <QVBoxLayout>
-#include <QScrollBar>
+#include <QtWidgets>
 
 #include <bag.h>
 #include <game.h>
diff --git a/quacker/boarddisplay.cpp b/quacker/boarddisplay.cpp
index d8b2a8d..fb6a3ba 100644
--- a/quacker/boarddisplay.cpp
+++ b/quacker/boarddisplay.cpp
@@ -16,14 +16,7 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtGui>
-#include <QTextEdit>
-#include <QLineEdit>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QPushButton>
-#include <QLabel>
-#include <QMessageBox>
+#include <QtWidgets>
 
 #include <alphabetparameters.h>
 #include <board.h>
diff --git a/quacker/boardsetup.cpp b/quacker/boardsetup.cpp
index bc641c3..995c644 100644
--- a/quacker/boardsetup.cpp
+++ b/quacker/boardsetup.cpp
@@ -19,9 +19,7 @@
 #include <iostream>
 #include <math.h>
 
-#include <QtGui>
-#include <QVBoxLayout>
-#include <QLabel>
+#include <QtWidgets>
 
 #include <game.h>
 #include <move.h>
diff --git a/quacker/boardsetupdialog.cpp b/quacker/boardsetupdialog.cpp
index d9a5c0c..e1962fb 100644
--- a/quacker/boardsetupdialog.cpp
+++ b/quacker/boardsetupdialog.cpp
@@ -17,16 +17,7 @@
  */
 
 #include <sstream>
-#include <QtGui>
-#include <QCheckBox>
-#include <QPushButton>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QGroupBox>
-#include <QLabel>
-#include <QComboBox>
-#include <QMessageBox>
-#include <QLineEdit>
+#include <QtWidgets>
 
 #include <boardparameters.h>
 #include <board.h>
diff --git a/quacker/brb.cpp b/quacker/brb.cpp
index 8341dd6..6a42a48 100644
--- a/quacker/brb.cpp
+++ b/quacker/brb.cpp
@@ -16,9 +16,7 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtGui>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
+#include <QtWidgets>
 
 #include <game.h>
 
diff --git a/quacker/configdialog.cpp b/quacker/configdialog.cpp
index 4f871d9..509650e 100644
--- a/quacker/configdialog.cpp
+++ b/quacker/configdialog.cpp
@@ -16,13 +16,7 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtGui>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QListWidget>
-#include <QStackedWidget>
-#include <QCheckBox>
-#include <QPushButton>
+#include <QtWidgets>
 
 #include "configpages.h"
 #include "configdialog.h"
diff --git a/quacker/configpages.cpp b/quacker/configpages.cpp
index a424c15..0571094 100644
--- a/quacker/configpages.cpp
+++ b/quacker/configpages.cpp
@@ -16,14 +16,7 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtGui>
-#include <QCheckBox>
-#include <QGroupBox>
-#include <QSpinBox>
-#include <QComboBox>
-#include <QLabel>
-#include <QGridLayout>
-#include <QVBoxLayout>
+#include <QtWidgets>
 
 #include <uv.h>
 
diff --git a/quacker/customqsettings.h b/quacker/customqsettings.h
index 4501a59..9131233 100644
--- a/quacker/customqsettings.h
+++ b/quacker/customqsettings.h
@@ -23,7 +23,7 @@ class CustomQSettings : public QSettings
 {
 public:
 	CustomQSettings() :
-#if defined(Q_WS_WIN)
+#if defined(Q_OS_WIN)
 		QSettings((QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based) ? IniFormat : NativeFormat,
 			UserScope, tr("Quackle"))
 #else
diff --git a/quacker/dashboard.cpp b/quacker/dashboard.cpp
index e1f45af..c4fd429 100644
--- a/quacker/dashboard.cpp
+++ b/quacker/dashboard.cpp
@@ -16,10 +16,7 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtGui>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QLabel>
+#include <QtWidgets>
 
 #include <game.h>
 #include <quackleio/util.h>
diff --git a/quacker/geometry.cpp b/quacker/geometry.cpp
index db6bf66..0a2a589 100644
--- a/quacker/geometry.cpp
+++ b/quacker/geometry.cpp
@@ -16,8 +16,7 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtGui>
-#include <QBoxLayout>
+#include <QtWidgets>
 
 #include "geometry.h"
 
diff --git a/quacker/graphicalboard.cpp b/quacker/graphicalboard.cpp
index 37db686..7bc3fa8 100644
--- a/quacker/graphicalboard.cpp
+++ b/quacker/graphicalboard.cpp
@@ -89,9 +89,9 @@ GraphicalBoardFrame::GraphicalBoardFrame(QWidget *parent)
     setPalette(customPalette);
 
     PixmapCacher::self()->tileFont = font();
-#if defined(Q_WS_WIN)
+#if defined(Q_OS_WIN)
     PixmapCacher::self()->tileFont.setFamily(QString("Arial"));
-#endif // Q_WS_WIN
+#endif // Q_OS_WIN
 
     //expandToSize(QSize(15 * 25, 15 * 25));
 
diff --git a/quacker/graphicalreporter.cpp b/quacker/graphicalreporter.cpp
index 39e74ef..a126641 100644
--- a/quacker/graphicalreporter.cpp
+++ b/quacker/graphicalreporter.cpp
@@ -16,8 +16,7 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtGui>
-#include <QMessageBox>
+#include <QtWidgets>
 
 #include <board.h>
 #include <computerplayer.h>
diff --git a/quacker/history.cpp b/quacker/history.cpp
index 0ea2feb..8794579 100644
--- a/quacker/history.cpp
+++ b/quacker/history.cpp
@@ -16,10 +16,7 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtGui>
-#include <QVBoxLayout>
-#include <QTableWidget>
-#include <QTableWidgetItem>
+#include <QtWidgets>
 
 #include <game.h>
 #include <quackleio/util.h>
diff --git a/quacker/letterbox.cpp b/quacker/letterbox.cpp
index 492f24d..2f89467 100644
--- a/quacker/letterbox.cpp
+++ b/quacker/letterbox.cpp
@@ -16,16 +16,7 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtGui>
-#include <QStatusBar>
-#include <QAction>
-#include <QMessageBox>
-#include <QVBoxLayout>
-#include <QLineEdit>
-#include <QMenu>
-#include <QMenuBar>
-#include <QFileDialog>
-#include <QInputDialog>
+#include <QtWidgets>
 
 #include <quackleio/dictfactory.h>
 #include <quackleio/util.h>
diff --git a/quacker/lexicondialog.cpp b/quacker/lexicondialog.cpp
index 1d06cb0..362aa4b 100644
--- a/quacker/lexicondialog.cpp
+++ b/quacker/lexicondialog.cpp
@@ -17,15 +17,7 @@
  */
 
 #include <sstream>
-#include <QtGui>
-#include <QLineEdit>
-#include <QComboBox>
-#include <QPushButton>
-#include <QFileDialog>
-#include <QLabel>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QGroupBox>
+#include <QtWidgets>
 
 #include <datamanager.h>
 #include <quackleio/util.h>
diff --git a/quacker/lister.cpp b/quacker/lister.cpp
index 316ac49..30b0b4c 100644
--- a/quacker/lister.cpp
+++ b/quacker/lister.cpp
@@ -19,16 +19,7 @@
 #include <iostream>
 using namespace std;
 
-#include <QtGui>
-#include <QSpinBox>
-#include <QLabel>
-#include <QVBoxLayout>
-#include <QLineEdit>
-#include <QCheckBox>
-#include <QListWidget>
-#include <QPushButton>
-#include <QFileDialog>
-#include <QMessageBox>
+#include <QtWidgets>
 
 #include <quackleio/dictfactory.h>
 
diff --git a/quacker/movebox.cpp b/quacker/movebox.cpp
index 1e403df..44b88e0 100644
--- a/quacker/movebox.cpp
+++ b/quacker/movebox.cpp
@@ -18,12 +18,7 @@
 
 #include <iostream>
 
-#include <QtGui>
-#include <QTreeWidget>
-#include <QTreeWidgetItem>
-#include <QPushButton>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
+#include <QtWidgets>
 
 #include <game.h>
 #include <quackleio/util.h>
diff --git a/quacker/newgame.cpp b/quacker/newgame.cpp
index 6d03813..7d3006e 100644
--- a/quacker/newgame.cpp
+++ b/quacker/newgame.cpp
@@ -18,15 +18,7 @@
 
 #include <iostream>
 
-#include <QtGui>
-#include <QTabWidget>
-#include <QTreeWidget>
-#include <QPushButton>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QLineEdit>
+#include <QtWidgets>
 
 #include <computerplayer.h>
 #include <datamanager.h>
diff --git a/quacker/noteeditor.cpp b/quacker/noteeditor.cpp
index 149b88a..0246a6c 100644
--- a/quacker/noteeditor.cpp
+++ b/quacker/noteeditor.cpp
@@ -16,9 +16,7 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtGui>
-#include <QVBoxLayout>
-#include <QTextEdit>
+#include <QtWidgets>
 
 #include <game.h>
 #include <quackleio/util.h>
diff --git a/quacker/oppothreadprogressbar.cpp b/quacker/oppothreadprogressbar.cpp
index 6323770..6999c63 100644
--- a/quacker/oppothreadprogressbar.cpp
+++ b/quacker/oppothreadprogressbar.cpp
@@ -16,10 +16,7 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtGui>
-#include <QProgressBar>
-#include <QPushButton>
-#include <QHBoxLayout>
+#include <QtWidgets>
 
 #include "geometry.h"
 #include "oppothreadprogressbar.h"
diff --git a/quacker/quacker.cpp b/quacker/quacker.cpp
index f7cc336..97f24b0 100644
--- a/quacker/quacker.cpp
+++ b/quacker/quacker.cpp
@@ -21,24 +21,7 @@
 
 using namespace std;
 
-#include <QtGui>
-#include <QApplication>
-#include <QMessageBox>
-#include <QInputDialog>
-#include <QStatusBar>
-#include <QAction>
-#include <QFileDialog>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QMenuBar>
-#include <QToolBar>
-#include <QMenu>
-#include <QSplitter>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
+#include <QtWidgets>
 
 #include <game.h>
 #include <boardparameters.h>
diff --git a/quacker/rackdisplay.cpp b/quacker/rackdisplay.cpp
index 086be1c..c8bd82c 100644
--- a/quacker/rackdisplay.cpp
+++ b/quacker/rackdisplay.cpp
@@ -18,11 +18,7 @@
 
 #include <iostream>
 
-#include <QtGui>
-#include <QHBoxLayout>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QLabel>
+#include <QtWidgets>
 
 #include <game.h>
 #include <quackleio/util.h>
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";
diff --git a/quacker/simviewer.cpp b/quacker/simviewer.cpp
index 14858b3..587b862 100644
--- a/quacker/simviewer.cpp
+++ b/quacker/simviewer.cpp
@@ -18,13 +18,7 @@
 
 #include <iostream>
 
-#include <QtGui>
-#include <QTabWidget>
-#include <QPushButton>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QTextEdit>
-#include <QMessageBox>
+#include <QtWidgets>
 
 #include <quackleio/util.h>