Qt5 changes, fix warnings, started add Linux

source/NewProjectPage.h

@@ -1,7 +1,12 @@
 #ifndef NEWPROJECTPAGE_H
 #define NEWPROJECTPAGE_H
 
+#include <QtGlobal>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 #include <QtGui>
+#else
+#include <QtWidgets>
+#endif
 #include "ui_NewProjectPage.h"
 
 using namespace Ui;

source/PlatformCheck.cpp

@@ -1,12 +1,23 @@
 #include "PlatformCheck.h"
+#include <QtGlobal>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 #include <QtGui>
+#else
+#include <QtWidgets>
+#endif
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN)
    bool PlatformCheck::mWin = true;
    bool PlatformCheck::mMac = false;
-#endif
-
-#ifdef Q_OS_MAC
+   bool PlatformCheck::mLin = false;
+#elif defined(Q_OS_MACOS)
+   bool PlatformCheck::mWin = false;
    bool PlatformCheck::mMac = true;
+   bool PlatformCheck::mLin = false;
+#elif defined(Q_OS_LINUX)
+   bool PlatformCheck::mMac = false;
    bool PlatformCheck::mWin = false;
+   bool PlatformCheck::mLin = true;
+#else
+   #error Not a Windows, MacOS, or Linux system, aborting
 #endif

source/PlatformCheck.h

@@ -9,9 +9,11 @@ class PlatformCheck
    //~NewProjectPage();
    static bool mWin;
    static bool mMac;
+   static bool mLin;
 
    static bool isWin() { return PlatformCheck::mWin; };
    static bool isMac() { return PlatformCheck::mMac; };
+   static bool isLin() { return PlatformCheck::mLin; };
 };
 
-#endif // PLATFORMCHECK_H
+#endif // PLATFORMCHECK_H

source/ProgressFinishedDialog.cpp

@@ -1,5 +1,10 @@
 #include "ProgressFinishedDialog.h"
+#include <QtGlobal>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 #include <QtGui>
+#else
+#include <QtWidgets>
+#endif
 
 ProgressFinishedDialog::ProgressFinishedDialog(QWidget *parent)
    : QDialog(parent)
@@ -27,4 +32,4 @@ void ProgressFinishedDialog::hideFolderButton()
 void ProgressFinishedDialog::on_OpenFolderButton_clicked()
 {
    QDesktopServices::openUrl(QUrl("file:///" + mFolderLocation));
-}
+}

source/ProjectModuleListPage.cpp

@@ -201,6 +201,7 @@ void ProjectModuleListPage::populateControls()
    if(mCurrentInstance)
    {
       ModuleList* list = mFrontloader->getModuleList();
+      Q_UNUSED(list)
 
       // Module Groups
       for(int i=0; i<mCurrentInstance->mModuleGroupInstances.count(); ++i)

source/ProjectTree.cpp

@@ -268,18 +268,22 @@ void ProjectScrollArea::mousePressEvent(QMouseEvent *pressEvent)
 
 void ProjectTree::projectEntryRemoved(ProjectEntry *entry)
 {
+   Q_UNUSED(entry)
 }
 
 void ProjectTree::projectEntryAdded(ProjectEntry *entry)
 {
+   Q_UNUSED(entry)
 }
 
 void ProjectTree::projectCategoryAdded(QString title)
 {
+   Q_UNUSED(title)
 }
 
 void ProjectTree::projectCategoryRemoved(QString title)
 {
+   Q_UNUSED(title)
 }
 
 ProjectEntry *ProjectTree::getEntryFromAppName(QString uniqueName, QString appName)

source/copyDir.h

@@ -2,7 +2,12 @@
 #define _COPY_DIR_H_
 
 #include <QThread>
+#include <QtGlobal>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 #include <QtGui>
+#else
+#include <QtWidgets>
+#endif
 #include <QtCore>
 
 class Torque3DFrontloader;

source/moduleList.h

@@ -1,7 +1,12 @@
 #ifndef _MODULE_LIST_H_
 #define _MODULE_LIST_H_
 
+#include <QtGlobal>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 #include <QtGui>
+#else
+#include <QtWidgets>
+#endif
 #include <QtCore>
 #include <QtXml/QDomDocument>
 

source/projectList.cpp

@@ -18,6 +18,7 @@ QString ProjectEntry::getLevelPath()
 
 ProjectList::ProjectList(QWidget *parent)
 {
+   Q_UNUSED(parent)
    mAppName =  "No app name has been set";
    mParent  =  NULL;
    mProcess =  NULL;
@@ -40,7 +41,7 @@ QString ProjectList::getAppPath(QString path)
    {
       basePath = path;
    }
-#ifdef Q_OS_MAC
+#if defined(Q_OS_MACOS)
    int appIndex = basePath.lastIndexOf(QString(".app"));
    int basePathIndex = basePath.lastIndexOf("/", appIndex);
    QString macPath = basePath.left(basePathIndex);
@@ -332,6 +333,7 @@ BOOL CALLBACK ProjectList::EnumWindowsProc(HWND hwnd, LPARAM param)
 
 void ProjectList::toggleEditor(int editorMode)
 {
+   Q_UNUSED(editorMode)
 #ifdef Q_OS_WIN
    //PostMessage(ProjectList::appWindow, WM_TOGGLE_EDITOR, editorMode, 0);
 #endif
@@ -351,4 +353,4 @@ ProjectEntry *ProjectList::getFirstProjectEntry()
    }
 
    return entry;
-}
+}