qt5: fix include directives

Qt4 and Qt5 can conflict when using the module in the include path.

qt5: fix include directives
Qt4 and Qt5 can conflict when using the module in the include path.
e9f92aa5 · Ben Boeckel · 0a1bff76 · e9f92aa5 · e9f92aa5 · e9f92aa5
Commit e9f92aa5 authored Mar 15, 2017 by Ben Boeckel
16 changed files
--- a/smtk/extension/cumulus/cumuluswidget.cxx
+++ b/smtk/extension/cumulus/cumuluswidget.cxx
@@ -13,11 +13,11 @@
 #include "jobtablemodel.h"
 #include "cumulusproxy.h"

-#include <QtGui/QDesktopWidget>
-#include <QtGui/QMessageBox>
-#include <QtNetwork/QNetworkReply>
-#include <QtCore/QList>
-#include <QtCore/QTimer>
+#include <QDesktopWidget>
+#include <QMessageBox>
+#include <QNetworkReply>
+#include <QList>
+#include <QTimer>


 namespace cumulus {

--- a/smtk/extension/cumulus/cumuluswidget.h
+++ b/smtk/extension/cumulus/cumuluswidget.h
@@ -16,8 +16,8 @@

 #include "logindialog.h"

-#include <QtGui/QMainWindow>
-#include <QtNetwork/QNetworkReply>
+#include <QMainWindow>
+#include <QNetworkReply>

 class QAction;
 class QIcon;

--- a/smtk/extension/cumulus/jobtablewidget.cxx
+++ b/smtk/extension/cumulus/jobtablewidget.cxx
@@ -15,7 +15,7 @@
 #include "jobtablemodel.h"
 #include "cumulusproxy.h"

-#include <QtGui/QMessageBox>
+#include <QMessageBox>

 namespace cumulus
 {

--- a/smtk/extension/cumulus/jobtablewidget.h
+++ b/smtk/extension/cumulus/jobtablewidget.h
@@ -14,7 +14,7 @@
 #ifndef __smtk_extension_cumulus_jobtablewidget_h
 #define __smtk_extension_cumulus_jobtablewidget_h

-#include <QtGui/QWidget>
+#include <QWidget>
 class QAbstractItemModel;

 namespace Ui {

--- a/smtk/extension/cumulus/jobview.cxx
+++ b/smtk/extension/cumulus/jobview.cxx
@@ -12,10 +12,10 @@
 #include "jobtablemodel.h"
 #include "cumulusproxy.h"

-#include <QtGui/QMenu>
-#include <QtGui/QContextMenuEvent>
-#include <QtGui/QMessageBox>
-#include <QtGui/QFileDialog>
+#include <QMenu>
+#include <QContextMenuEvent>
+#include <QMessageBox>
+#include <QFileDialog>

 namespace cumulus
 {

--- a/smtk/extension/cumulus/jobview.h
+++ b/smtk/extension/cumulus/jobview.h
@@ -16,8 +16,8 @@

 #include "job.h"

-#include <QtGui/QTableView>
-#include <QtCore/QSet>
+#include <QTableView>
+#include <QSet>


 namespace cumulus

--- a/smtk/extension/cumulus/logindialog.h
+++ b/smtk/extension/cumulus/logindialog.h
@@ -14,7 +14,7 @@
 #ifndef __smtk_extension_cumulus_logindialog_h
 #define __smtk_extension_cumulus_logindialog_h

-#include <QtGui/QDialog>
+#include <QDialog>

 namespace Ui {
 class LoginDialog;

--- a/smtk/extension/cumulus/main.cxx
+++ b/smtk/extension/cumulus/main.cxx
@@ -8,14 +8,14 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //=========================================================================

-#include <QtCore/QDir>
-#include <QtCore/QSettings>
-#include <QtCore/QStringList>
+#include <QDir>
+#include <QSettings>
+#include <QStringList>

-#include <QtGui/QApplication>
-#include <QtGui/QMessageBox>
+#include <QApplication>
+#include <QMessageBox>

-#include <QtNetwork/QSslSocket>
+#include <QSslSocket>

 #include "mainwindow.h"


--- a/smtk/extension/cumulus/mainwindow.cxx
+++ b/smtk/extension/cumulus/mainwindow.cxx
@@ -11,8 +11,8 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"

-#include <QtGui/QDesktopWidget>
-#include <QtGui/QStatusBar>
+#include <QDesktopWidget>
+#include <QStatusBar>

 namespace cumulus {


--- a/smtk/extension/cumulus/mainwindow.h
+++ b/smtk/extension/cumulus/mainwindow.h
@@ -14,7 +14,7 @@
 #ifndef __smtk_extension_cumulus_mainwindow_h
 #define __smtk_extension_cumulus_mainwindow_h

-#include <QtGui/QMainWindow>
+#include <QMainWindow>

 class QAction;
 class QIcon;

--- a/smtk/extension/qt/examples/cxx/ModelBrowser.cxx
+++ b/smtk/extension/qt/examples/cxx/ModelBrowser.cxx
@@ -20,8 +20,8 @@
 #include "smtk/model/EntityListPhrase.h"
 #include "smtk/model/Manager.h"

-#include <QtGui/QPushButton>
-#include <QtGui/QTreeView>
+#include <QPushButton>
+#include <QTreeView>

 namespace Ui { class qtAttributeAssociation; }


--- a/smtk/extension/qt/examples/cxx/ModelBrowser.h
+++ b/smtk/extension/qt/examples/cxx/ModelBrowser.h
@@ -13,7 +13,7 @@
 #include "smtk/PublicPointerDefs.h"
 #include "smtk/model/Group.h"

-#include <QtGui/QWidget>
+#include <QWidget>

 class QTreeView;
 class QModelIndex;

--- a/smtk/extension/qt/examples/cxx/browseMesh.cxx
+++ b/smtk/extension/qt/examples/cxx/browseMesh.cxx
@@ -22,9 +22,9 @@
 #include "smtk/common/testing/cxx/helpers.h"
 #include "smtk/model/testing/cxx/helpers.h"

-#include <QtGui/QApplication>
-#include <QtGui/QTreeView>
-#include <QtGui/QHeaderView>
+#include <QApplication>
+#include <QTreeView>
+#include <QHeaderView>

 // Mesh related includes
 #include "smtk/io/ModelToMesh.h"

--- a/smtk/extension/qt/examples/cxx/browseModel.cxx
+++ b/smtk/extension/qt/examples/cxx/browseModel.cxx
@@ -22,9 +22,9 @@
 #include "smtk/common/testing/cxx/helpers.h"
 #include "smtk/model/testing/cxx/helpers.h"

-#include <QtGui/QApplication>
-#include <QtGui/QTreeView>
-#include <QtGui/QHeaderView>
+#include <QApplication>
+#include <QTreeView>
+#include <QHeaderView>

 #include <iomanip>
 #include <iostream>

--- a/smtk/extension/qt/qtEntityItemEditor.cxx
+++ b/smtk/extension/qt/qtEntityItemEditor.cxx
@@ -9,8 +9,8 @@
 //=========================================================================
 #include "smtk/extension/qt/qtEntityItemEditor.h"

-#include <QtGui/QLineEdit>
-#include <QtGui/QHBoxLayout>
+#include <QLineEdit>
+#include <QHBoxLayout>

 namespace smtk {
  namespace extension {

--- a/smtk/extension/qt/qtEntityItemEditor.h
+++ b/smtk/extension/qt/qtEntityItemEditor.h
@@ -12,7 +12,7 @@
 #define __smtk_extension_QEntityItemEditor_h

 #include "smtk/extension/qt/Exports.h"
-#include <QtGui/QWidget>
+#include <QWidget>

 class QLineEdit;