From 56f80e7876367f9da3cff765b46e842270d45a0d Mon Sep 17 00:00:00 2001 From: Teemu Hukkanen Date: Sat, 8 Nov 2014 10:05:45 +0000 Subject: [PATCH] Replace QtGui includes with QtWidgets, add QT += widgets for qmake --- src/gui/about.h | 2 +- src/gui/alpinetab.h | 2 +- src/gui/app.h | 2 +- src/gui/configdialog.h | 2 +- src/gui/controllertab.h | 2 +- src/gui/controllerwidget.h | 2 +- src/gui/debug/cpubrowser.h | 2 +- src/gui/debug/m68kdasmbrowser.h | 2 +- src/gui/debug/memorybrowser.h | 2 +- src/gui/debug/opbrowser.h | 2 +- src/gui/debug/riscdasmbrowser.h | 2 +- src/gui/filelistmodel.h | 2 +- src/gui/filepicker.h | 2 +- src/gui/filethread.cpp | 1 - src/gui/filethread.h | 1 + src/gui/generaltab.h | 2 +- src/gui/glwidget.h | 1 - src/gui/help.h | 2 +- src/gui/imagedelegate.h | 2 +- src/gui/keygrabber.h | 2 +- src/gui/mainwin.h | 2 +- src/gui/profile.cpp | 1 - src/gui/profile.h | 1 + virtualjaguar.pro | 3 ++- 24 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/gui/about.h b/src/gui/about.h index 9c5f086..90d825f 100644 --- a/src/gui/about.h +++ b/src/gui/about.h @@ -8,7 +8,7 @@ #ifndef __ABOUT_H__ #define __ABOUT_H__ -#include +#include class AboutWindow: public QWidget { diff --git a/src/gui/alpinetab.h b/src/gui/alpinetab.h index 5826ac6..d2dddd9 100644 --- a/src/gui/alpinetab.h +++ b/src/gui/alpinetab.h @@ -1,7 +1,7 @@ #ifndef __ALPINETAB_H__ #define __ALPINETAB_H__ -#include +#include class AlpineTab: public QWidget { diff --git a/src/gui/app.h b/src/gui/app.h index 664ce67..090efdf 100644 --- a/src/gui/app.h +++ b/src/gui/app.h @@ -9,7 +9,7 @@ #define __APP_H__ //Hrm. uh??? I thought this wasn't the way to do this stuff...??? -#include +#include // Forward declarations class MainWin; diff --git a/src/gui/configdialog.h b/src/gui/configdialog.h index 295ebdf..370b597 100644 --- a/src/gui/configdialog.h +++ b/src/gui/configdialog.h @@ -8,7 +8,7 @@ #ifndef __CONFIGDIALOG_H__ #define __CONFIGDIALOG_H__ -#include +#include class GeneralTab; class ControllerTab; diff --git a/src/gui/controllertab.h b/src/gui/controllertab.h index c72507d..5862eb3 100644 --- a/src/gui/controllertab.h +++ b/src/gui/controllertab.h @@ -1,7 +1,7 @@ #ifndef __CONTROLLERTAB_H__ #define __CONTROLLERTAB_H__ -#include +#include #include class ControllerWidget; diff --git a/src/gui/controllerwidget.h b/src/gui/controllerwidget.h index d506071..2613486 100644 --- a/src/gui/controllerwidget.h +++ b/src/gui/controllerwidget.h @@ -1,7 +1,7 @@ #ifndef __CONTROLLERWIDGET_H__ #define __CONTROLLERWIDGET_H__ -#include +#include #include class ControllerWidget: public QWidget diff --git a/src/gui/debug/cpubrowser.h b/src/gui/debug/cpubrowser.h index e651872..04fa775 100644 --- a/src/gui/debug/cpubrowser.h +++ b/src/gui/debug/cpubrowser.h @@ -8,7 +8,7 @@ #ifndef __CPUBROWSER_H__ #define __CPUBROWSER_H__ -#include +#include #include class CPUBrowserWindow: public QWidget diff --git a/src/gui/debug/m68kdasmbrowser.h b/src/gui/debug/m68kdasmbrowser.h index fe3f29d..8d83adf 100644 --- a/src/gui/debug/m68kdasmbrowser.h +++ b/src/gui/debug/m68kdasmbrowser.h @@ -8,7 +8,7 @@ #ifndef __M68KDASMBROWSER_H__ #define __M68KDASMBROWSER_H__ -#include +#include #include class M68KDasmBrowserWindow: public QWidget diff --git a/src/gui/debug/memorybrowser.h b/src/gui/debug/memorybrowser.h index ce3234d..ec368ab 100644 --- a/src/gui/debug/memorybrowser.h +++ b/src/gui/debug/memorybrowser.h @@ -8,7 +8,7 @@ #ifndef __MEMORYBROWSER_H__ #define __MEMORYBROWSER_H__ -#include +#include #include class MemoryBrowserWindow: public QWidget diff --git a/src/gui/debug/opbrowser.h b/src/gui/debug/opbrowser.h index b2a4028..8790783 100644 --- a/src/gui/debug/opbrowser.h +++ b/src/gui/debug/opbrowser.h @@ -8,7 +8,7 @@ #ifndef __OPBROWSER_H__ #define __OPBROWSER_H__ -#include +#include #include class OPBrowserWindow: public QWidget diff --git a/src/gui/debug/riscdasmbrowser.h b/src/gui/debug/riscdasmbrowser.h index 39ae057..224c8e3 100644 --- a/src/gui/debug/riscdasmbrowser.h +++ b/src/gui/debug/riscdasmbrowser.h @@ -8,7 +8,7 @@ #ifndef __RISCDASMBROWSER_H__ #define __RISCDASMBROWSER_H__ -#include +#include #include class RISCDasmBrowserWindow: public QWidget diff --git a/src/gui/filelistmodel.h b/src/gui/filelistmodel.h index 10f2e2a..83666f4 100644 --- a/src/gui/filelistmodel.h +++ b/src/gui/filelistmodel.h @@ -8,7 +8,7 @@ #ifndef __FILELISTMODEL_H__ #define __FILELISTMODEL_H__ -#include +#include #include #include diff --git a/src/gui/filepicker.h b/src/gui/filepicker.h index e6a7c02..f304ab1 100644 --- a/src/gui/filepicker.h +++ b/src/gui/filepicker.h @@ -2,7 +2,7 @@ // filepicker.h - A ROM chooser // -#include +#include // Forward declarations class QListWidget; diff --git a/src/gui/filethread.cpp b/src/gui/filethread.cpp index 5d0d583..01397e4 100644 --- a/src/gui/filethread.cpp +++ b/src/gui/filethread.cpp @@ -17,7 +17,6 @@ #include "filethread.h" -#include #include "crc32.h" #include "file.h" #include "filedb.h" diff --git a/src/gui/filethread.h b/src/gui/filethread.h index 20fd3a0..5a8ef93 100644 --- a/src/gui/filethread.h +++ b/src/gui/filethread.h @@ -6,6 +6,7 @@ #define __FILETHREAD_H__ #include +#include #include class FileThread: public QThread diff --git a/src/gui/generaltab.h b/src/gui/generaltab.h index 3ca5b19..a8f0bba 100644 --- a/src/gui/generaltab.h +++ b/src/gui/generaltab.h @@ -1,7 +1,7 @@ #ifndef __GENERALTAB_H__ #define __GENERALTAB_H__ -#include +#include class GeneralTab: public QWidget { diff --git a/src/gui/glwidget.h b/src/gui/glwidget.h index 7557ea6..170afff 100644 --- a/src/gui/glwidget.h +++ b/src/gui/glwidget.h @@ -6,7 +6,6 @@ #ifndef __GLWIDGET_H__ #define __GLWIDGET_H__ -#include #include #include diff --git a/src/gui/help.h b/src/gui/help.h index 5969083..511a359 100644 --- a/src/gui/help.h +++ b/src/gui/help.h @@ -8,7 +8,7 @@ #ifndef __HELP_H__ #define __HELP_H__ -#include +#include class HelpWindow: public QWidget { diff --git a/src/gui/imagedelegate.h b/src/gui/imagedelegate.h index 8ba69dc..8f0a950 100644 --- a/src/gui/imagedelegate.h +++ b/src/gui/imagedelegate.h @@ -5,7 +5,7 @@ #ifndef __IMAGEDELEGATE_H__ #define __IMAGEDELEGATE_H__ -#include +#include class ImageDelegate: public QAbstractItemDelegate { diff --git a/src/gui/keygrabber.h b/src/gui/keygrabber.h index abaf534..56494e1 100644 --- a/src/gui/keygrabber.h +++ b/src/gui/keygrabber.h @@ -8,7 +8,7 @@ #ifndef __KEYGRABBER_H__ #define __KEYGRABBER_H__ -#include +#include class KeyGrabber: public QDialog { diff --git a/src/gui/mainwin.h b/src/gui/mainwin.h index 4263cb1..a29dbc6 100644 --- a/src/gui/mainwin.h +++ b/src/gui/mainwin.h @@ -9,7 +9,7 @@ #define __MAINWIN_H__ //Hrm. uh??? I thought this wasn't the way to do this stuff...??? -#include +#include #include "tom.h" #define RING_BUFFER_SIZE 32 diff --git a/src/gui/profile.cpp b/src/gui/profile.cpp index cbb12f4..6e43ad0 100644 --- a/src/gui/profile.cpp +++ b/src/gui/profile.cpp @@ -30,7 +30,6 @@ // #include "profile.h" -#include #include "gamepad.h" #include "log.h" #include "settings.h" diff --git a/src/gui/profile.h b/src/gui/profile.h index 211a8a5..6c5a96f 100644 --- a/src/gui/profile.h +++ b/src/gui/profile.h @@ -1,6 +1,7 @@ #ifndef __PROFILE_H__ #define __PROFILE_H__ +#include #include class QComboBox; diff --git a/virtualjaguar.pro b/virtualjaguar.pro index f0399e5..6976d85 100644 --- a/virtualjaguar.pro +++ b/virtualjaguar.pro @@ -16,9 +16,10 @@ TARGET = virtualjaguar CONFIG += qt warn_on release # debug -RESOURCES += virtualjaguar.qrc +RESOURCES += src/gui/virtualjaguar.qrc LIBS += -Lobj -Lsrc/m68000/obj -ljaguarcore -lz -lm68k QT += opengl +QT += widgets # We stuff all the intermediate crap into obj/ so it won't confuse us mere # mortals ;-) -- 2.37.2