From e9f92aa50314231c27f62290775292f023714000 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 15 Mar 2017 14:36:12 -0400 Subject: [PATCH] qt5: fix include directives Qt4 and Qt5 can conflict when using the module in the include path. --- smtk/extension/cumulus/cumuluswidget.cxx | 10 +++++----- smtk/extension/cumulus/cumuluswidget.h | 4 ++-- smtk/extension/cumulus/jobtablewidget.cxx | 2 +- smtk/extension/cumulus/jobtablewidget.h | 2 +- smtk/extension/cumulus/jobview.cxx | 8 ++++---- smtk/extension/cumulus/jobview.h | 4 ++-- smtk/extension/cumulus/logindialog.h | 2 +- smtk/extension/cumulus/main.cxx | 12 ++++++------ smtk/extension/cumulus/mainwindow.cxx | 4 ++-- smtk/extension/cumulus/mainwindow.h | 2 +- smtk/extension/qt/examples/cxx/ModelBrowser.cxx | 4 ++-- smtk/extension/qt/examples/cxx/ModelBrowser.h | 2 +- smtk/extension/qt/examples/cxx/browseMesh.cxx | 6 +++--- smtk/extension/qt/examples/cxx/browseModel.cxx | 6 +++--- smtk/extension/qt/qtEntityItemEditor.cxx | 4 ++-- smtk/extension/qt/qtEntityItemEditor.h | 2 +- 16 files changed, 37 insertions(+), 37 deletions(-) diff --git a/smtk/extension/cumulus/cumuluswidget.cxx b/smtk/extension/cumulus/cumuluswidget.cxx index 8c777151b5..3a9c1eaeb3 100644 --- a/smtk/extension/cumulus/cumuluswidget.cxx +++ b/smtk/extension/cumulus/cumuluswidget.cxx @@ -13,11 +13,11 @@ #include "jobtablemodel.h" #include "cumulusproxy.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace cumulus { diff --git a/smtk/extension/cumulus/cumuluswidget.h b/smtk/extension/cumulus/cumuluswidget.h index f2c891cb72..6ec9e027f3 100644 --- a/smtk/extension/cumulus/cumuluswidget.h +++ b/smtk/extension/cumulus/cumuluswidget.h @@ -16,8 +16,8 @@ #include "logindialog.h" -#include -#include +#include +#include class QAction; class QIcon; diff --git a/smtk/extension/cumulus/jobtablewidget.cxx b/smtk/extension/cumulus/jobtablewidget.cxx index 375fedf992..4f125e370e 100644 --- a/smtk/extension/cumulus/jobtablewidget.cxx +++ b/smtk/extension/cumulus/jobtablewidget.cxx @@ -15,7 +15,7 @@ #include "jobtablemodel.h" #include "cumulusproxy.h" -#include +#include namespace cumulus { diff --git a/smtk/extension/cumulus/jobtablewidget.h b/smtk/extension/cumulus/jobtablewidget.h index fb587544f7..367b2cc6da 100644 --- 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 +#include class QAbstractItemModel; namespace Ui { diff --git a/smtk/extension/cumulus/jobview.cxx b/smtk/extension/cumulus/jobview.cxx index f22c88eed1..ada1f8efe3 100644 --- a/smtk/extension/cumulus/jobview.cxx +++ b/smtk/extension/cumulus/jobview.cxx @@ -12,10 +12,10 @@ #include "jobtablemodel.h" #include "cumulusproxy.h" -#include -#include -#include -#include +#include +#include +#include +#include namespace cumulus { diff --git a/smtk/extension/cumulus/jobview.h b/smtk/extension/cumulus/jobview.h index ab6ee4f728..caeda66721 100644 --- a/smtk/extension/cumulus/jobview.h +++ b/smtk/extension/cumulus/jobview.h @@ -16,8 +16,8 @@ #include "job.h" -#include -#include +#include +#include namespace cumulus diff --git a/smtk/extension/cumulus/logindialog.h b/smtk/extension/cumulus/logindialog.h index c00543b5d5..58ca556ab4 100644 --- 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 +#include namespace Ui { class LoginDialog; diff --git a/smtk/extension/cumulus/main.cxx b/smtk/extension/cumulus/main.cxx index b768afc42b..8abbe9d510 100644 --- 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 -#include -#include +#include +#include +#include -#include -#include +#include +#include -#include +#include #include "mainwindow.h" diff --git a/smtk/extension/cumulus/mainwindow.cxx b/smtk/extension/cumulus/mainwindow.cxx index 396499a47c..0a465f5109 100644 --- a/smtk/extension/cumulus/mainwindow.cxx +++ b/smtk/extension/cumulus/mainwindow.cxx @@ -11,8 +11,8 @@ #include "mainwindow.h" #include "ui_mainwindow.h" -#include -#include +#include +#include namespace cumulus { diff --git a/smtk/extension/cumulus/mainwindow.h b/smtk/extension/cumulus/mainwindow.h index 5e7d8259d9..45c1f9f276 100644 --- 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 +#include class QAction; class QIcon; diff --git a/smtk/extension/qt/examples/cxx/ModelBrowser.cxx b/smtk/extension/qt/examples/cxx/ModelBrowser.cxx index 028d48db1a..ae958acbaa 100644 --- 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 -#include +#include +#include namespace Ui { class qtAttributeAssociation; } diff --git a/smtk/extension/qt/examples/cxx/ModelBrowser.h b/smtk/extension/qt/examples/cxx/ModelBrowser.h index 10f942b4f5..98a267be99 100644 --- 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 +#include class QTreeView; class QModelIndex; diff --git a/smtk/extension/qt/examples/cxx/browseMesh.cxx b/smtk/extension/qt/examples/cxx/browseMesh.cxx index fe4e82d403..bbc8c884f1 100644 --- 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 -#include -#include +#include +#include +#include // Mesh related includes #include "smtk/io/ModelToMesh.h" diff --git a/smtk/extension/qt/examples/cxx/browseModel.cxx b/smtk/extension/qt/examples/cxx/browseModel.cxx index c61c4e5317..4bf0eb22b4 100644 --- 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 -#include -#include +#include +#include +#include #include #include diff --git a/smtk/extension/qt/qtEntityItemEditor.cxx b/smtk/extension/qt/qtEntityItemEditor.cxx index a8372c2301..643c4694e5 100644 --- a/smtk/extension/qt/qtEntityItemEditor.cxx +++ b/smtk/extension/qt/qtEntityItemEditor.cxx @@ -9,8 +9,8 @@ //========================================================================= #include "smtk/extension/qt/qtEntityItemEditor.h" -#include -#include +#include +#include namespace smtk { namespace extension { diff --git a/smtk/extension/qt/qtEntityItemEditor.h b/smtk/extension/qt/qtEntityItemEditor.h index fcb51efce5..681829220f 100644 --- 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 +#include class QLineEdit; -- GitLab