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 @@
#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 {
......
......@@ -16,8 +16,8 @@
#include "logindialog.h"
#include <QtGui/QMainWindow>
#include <QtNetwork/QNetworkReply>
#include <QMainWindow>
#include <QNetworkReply>
class QAction;
class QIcon;
......
......@@ -15,7 +15,7 @@
#include "jobtablemodel.h"
#include "cumulusproxy.h"
#include <QtGui/QMessageBox>
#include <QMessageBox>
namespace cumulus
{
......
......@@ -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 {
......
......@@ -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
{
......
......@@ -16,8 +16,8 @@
#include "job.h"
#include <QtGui/QTableView>
#include <QtCore/QSet>
#include <QTableView>
#include <QSet>
namespace cumulus
......
......@@ -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;
......
......@@ -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"
......
......@@ -11,8 +11,8 @@
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include <QtGui/QDesktopWidget>
#include <QtGui/QStatusBar>
#include <QDesktopWidget>
#include <QStatusBar>
namespace cumulus {
......
......@@ -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;
......
......@@ -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; }
......
......@@ -13,7 +13,7 @@
#include "smtk/PublicPointerDefs.h"
#include "smtk/model/Group.h"
#include <QtGui/QWidget>
#include <QWidget>
class QTreeView;
class QModelIndex;
......
......@@ -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"
......
......@@ -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>
......
......@@ -9,8 +9,8 @@
//=========================================================================
#include "smtk/extension/qt/qtEntityItemEditor.h"
#include <QtGui/QLineEdit>
#include <QtGui/QHBoxLayout>
#include <QLineEdit>
#include <QHBoxLayout>
namespace smtk {
namespace extension {
......
......@@ -12,7 +12,7 @@
#define __smtk_extension_QEntityItemEditor_h
#include "smtk/extension/qt/Exports.h"
#include <QtGui/QWidget>
#include <QWidget>
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