Commit e9f92aa5 authored by Ben Boeckel's avatar Ben Boeckel

qt5: fix include directives

Qt4 and Qt5 can conflict when using the module in the include path.
parent 0a1bff76
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
#include "jobtablemodel.h" #include "jobtablemodel.h"
#include "cumulusproxy.h" #include "cumulusproxy.h"
#include <QtGui/QDesktopWidget> #include <QDesktopWidget>
#include <QtGui/QMessageBox> #include <QMessageBox>
#include <QtNetwork/QNetworkReply> #include <QNetworkReply>
#include <QtCore/QList> #include <QList>
#include <QtCore/QTimer> #include <QTimer>
namespace cumulus { namespace cumulus {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "logindialog.h" #include "logindialog.h"
#include <QtGui/QMainWindow> #include <QMainWindow>
#include <QtNetwork/QNetworkReply> #include <QNetworkReply>
class QAction; class QAction;
class QIcon; class QIcon;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include "jobtablemodel.h" #include "jobtablemodel.h"
#include "cumulusproxy.h" #include "cumulusproxy.h"
#include <QtGui/QMessageBox> #include <QMessageBox>
namespace cumulus namespace cumulus
{ {
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#ifndef __smtk_extension_cumulus_jobtablewidget_h #ifndef __smtk_extension_cumulus_jobtablewidget_h
#define __smtk_extension_cumulus_jobtablewidget_h #define __smtk_extension_cumulus_jobtablewidget_h
#include <QtGui/QWidget> #include <QWidget>
class QAbstractItemModel; class QAbstractItemModel;
namespace Ui { namespace Ui {
......
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
#include "jobtablemodel.h" #include "jobtablemodel.h"
#include "cumulusproxy.h" #include "cumulusproxy.h"
#include <QtGui/QMenu> #include <QMenu>
#include <QtGui/QContextMenuEvent> #include <QContextMenuEvent>
#include <QtGui/QMessageBox> #include <QMessageBox>
#include <QtGui/QFileDialog> #include <QFileDialog>
namespace cumulus namespace cumulus
{ {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "job.h" #include "job.h"
#include <QtGui/QTableView> #include <QTableView>
#include <QtCore/QSet> #include <QSet>
namespace cumulus namespace cumulus
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#ifndef __smtk_extension_cumulus_logindialog_h #ifndef __smtk_extension_cumulus_logindialog_h
#define __smtk_extension_cumulus_logindialog_h #define __smtk_extension_cumulus_logindialog_h
#include <QtGui/QDialog> #include <QDialog>
namespace Ui { namespace Ui {
class LoginDialog; class LoginDialog;
......
...@@ -8,14 +8,14 @@ ...@@ -8,14 +8,14 @@
// PURPOSE. See the above copyright notice for more information. // PURPOSE. See the above copyright notice for more information.
//========================================================================= //=========================================================================
#include <QtCore/QDir> #include <QDir>
#include <QtCore/QSettings> #include <QSettings>
#include <QtCore/QStringList> #include <QStringList>
#include <QtGui/QApplication> #include <QApplication>
#include <QtGui/QMessageBox> #include <QMessageBox>
#include <QtNetwork/QSslSocket> #include <QSslSocket>
#include "mainwindow.h" #include "mainwindow.h"
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include <QtGui/QDesktopWidget> #include <QDesktopWidget>
#include <QtGui/QStatusBar> #include <QStatusBar>
namespace cumulus { namespace cumulus {
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#ifndef __smtk_extension_cumulus_mainwindow_h #ifndef __smtk_extension_cumulus_mainwindow_h
#define __smtk_extension_cumulus_mainwindow_h #define __smtk_extension_cumulus_mainwindow_h
#include <QtGui/QMainWindow> #include <QMainWindow>
class QAction; class QAction;
class QIcon; class QIcon;
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
#include "smtk/model/EntityListPhrase.h" #include "smtk/model/EntityListPhrase.h"
#include "smtk/model/Manager.h" #include "smtk/model/Manager.h"
#include <QtGui/QPushButton> #include <QPushButton>
#include <QtGui/QTreeView> #include <QTreeView>
namespace Ui { class qtAttributeAssociation; } namespace Ui { class qtAttributeAssociation; }
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "smtk/PublicPointerDefs.h" #include "smtk/PublicPointerDefs.h"
#include "smtk/model/Group.h" #include "smtk/model/Group.h"
#include <QtGui/QWidget> #include <QWidget>
class QTreeView; class QTreeView;
class QModelIndex; class QModelIndex;
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
#include "smtk/common/testing/cxx/helpers.h" #include "smtk/common/testing/cxx/helpers.h"
#include "smtk/model/testing/cxx/helpers.h" #include "smtk/model/testing/cxx/helpers.h"
#include <QtGui/QApplication> #include <QApplication>
#include <QtGui/QTreeView> #include <QTreeView>
#include <QtGui/QHeaderView> #include <QHeaderView>
// Mesh related includes // Mesh related includes
#include "smtk/io/ModelToMesh.h" #include "smtk/io/ModelToMesh.h"
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
#include "smtk/common/testing/cxx/helpers.h" #include "smtk/common/testing/cxx/helpers.h"
#include "smtk/model/testing/cxx/helpers.h" #include "smtk/model/testing/cxx/helpers.h"
#include <QtGui/QApplication> #include <QApplication>
#include <QtGui/QTreeView> #include <QTreeView>
#include <QtGui/QHeaderView> #include <QHeaderView>
#include <iomanip> #include <iomanip>
#include <iostream> #include <iostream>
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
//========================================================================= //=========================================================================
#include "smtk/extension/qt/qtEntityItemEditor.h" #include "smtk/extension/qt/qtEntityItemEditor.h"
#include <QtGui/QLineEdit> #include <QLineEdit>
#include <QtGui/QHBoxLayout> #include <QHBoxLayout>
namespace smtk { namespace smtk {
namespace extension { namespace extension {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#define __smtk_extension_QEntityItemEditor_h #define __smtk_extension_QEntityItemEditor_h
#include "smtk/extension/qt/Exports.h" #include "smtk/extension/qt/Exports.h"
#include <QtGui/QWidget> #include <QWidget>
class QLineEdit; class QLineEdit;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment