Commit b214491a authored by jcfr's avatar jcfr
Browse files

STYLE: Update code removing obsolete Slicer_HAVE_QT5 ifdefs

From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@28007 3bd1e089-480b-0410-8dfb-8563597acbee
parent 46e9164c
......@@ -21,14 +21,8 @@
#ifndef __qSlicerQTCLIPlugins_h
#define __qSlicerQTCLIPlugins_h
#include "vtkSlicerConfigure.h" // For Slicer_HAVE_QT5
// Qt includes
#ifdef Slicer_HAVE_QT5
#include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>
#else
#include <QDesignerCustomWidgetCollectionInterface>
#endif
// QtCLI includes
#include "qSlicerCLIProgressBarPlugin.h"
......@@ -39,9 +33,7 @@ class Q_SLICER_BASE_QTCLI_PLUGINS_EXPORT qSlicerQTCLIPlugins
, public QDesignerCustomWidgetCollectionInterface
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetCollectionInterface")
#endif
Q_INTERFACES(QDesignerCustomWidgetCollectionInterface);
public:
......
......@@ -21,14 +21,8 @@
#ifndef __qSlicerQTGUIPlugins_h
#define __qSlicerQTGUIPlugins_h
#include "vtkSlicerConfigure.h" // For Slicer_HAVE_QT5
// Qt includes
#ifdef Slicer_HAVE_QT5
#include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>
#else
#include <QDesignerCustomWidgetCollectionInterface>
#endif
// QtGUI includes
#include "qSlicerWidgetPlugin.h"
......@@ -43,9 +37,7 @@ class Q_SLICER_DESIGNER_PLUGINS_EXPORT qSlicerQTGUIPlugins
, public QDesignerCustomWidgetCollectionInterface
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetCollectionInterface")
#endif
Q_INTERFACES(QDesignerCustomWidgetCollectionInterface);
public:
......
......@@ -21,8 +21,6 @@
#ifndef __qSlicerStylePlugin_h
#define __qSlicerStylePlugin_h
#include "vtkSlicerConfigure.h" // For Slicer_HAVE_QT5
// Qt includes
#include <QStylePlugin>
#include <QtPlugin>
......@@ -35,9 +33,7 @@ class QStyle;
class Q_SLICER_STYLES_PLUGINS_EXPORT qSlicerStylePlugin : public QStylePlugin
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID QStyleFactoryInterface_iid FILE "SlicerStyle.json")
#endif
public:
/// Superclass typedef
typedef QStylePlugin Superclass;
......
......@@ -31,9 +31,7 @@ qSlicerLoadableModuleTemplateModule
: public qSlicerLoadableModule
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID "org.slicer.modules.loadable.qSlicerLoadableModule/1.0");
#endif
Q_INTERFACES(qSlicerLoadableModule);
public:
......
......@@ -31,9 +31,7 @@ qSlicerSuperLoadableModuleTemplateModule
: public qSlicerLoadableModule
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID "org.slicer.modules.loadable.qSlicerLoadableModule/1.0");
#endif
Q_INTERFACES(qSlicerLoadableModule);
public:
......
......@@ -23,14 +23,8 @@
#ifndef __qSlicerTablesModuleWidgetsPlugin_h
#define __qSlicerTablesModuleWidgetsPlugin_h
#include "vtkSlicerConfigure.h" // For Slicer_HAVE_QT5
// Qt includes
#ifdef Slicer_HAVE_QT5
#include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>
#else
#include <QDesignerCustomWidgetCollectionInterface>
#endif
// Tables includes
#include "qMRMLTableViewPlugin.h"
......@@ -41,9 +35,7 @@ class Q_SLICER_MODULE_TABLES_WIDGETS_PLUGINS_EXPORT qSlicerTablesModuleWidgetsPl
, public QDesignerCustomWidgetCollectionInterface
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetCollectionInterface")
#endif
Q_INTERFACES(QDesignerCustomWidgetCollectionInterface);
public:
......
......@@ -21,14 +21,8 @@
#ifndef __qSlicerAnnotationModuleWidgetsPlugin_h
#define __qSlicerAnnotationModuleWidgetsPlugin_h
#include "vtkSlicerConfigure.h" // For Slicer_HAVE_QT5
// Qt includes
#ifdef Slicer_HAVE_QT5
#include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>
#else
#include <QDesignerCustomWidgetCollectionInterface>
#endif
// Annotations includes
#include "qMRMLAnnotationFiducialProjectionPropertyWidgetPlugin.h"
......@@ -42,9 +36,7 @@ class Q_SLICER_MODULE_ANNOTATIONS_WIDGETS_PLUGINS_EXPORT qSlicerAnnotationModule
, public QDesignerCustomWidgetCollectionInterface
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetCollectionInterface")
#endif
Q_INTERFACES(QDesignerCustomWidgetCollectionInterface);
public:
......
......@@ -17,9 +17,7 @@ class Q_SLICER_QTMODULES_ANNOTATIONS_EXPORT qSlicerAnnotationsModule :
public qSlicerLoadableModule
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID "org.slicer.modules.loadable.qSlicerLoadableModule/1.0");
#endif
Q_INTERFACES(qSlicerLoadableModule);
public:
......
......@@ -35,9 +35,7 @@ class Q_SLICER_QTMODULES_CAMERAS_EXPORT qSlicerCamerasModule
: public qSlicerLoadableModule
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID "org.slicer.modules.loadable.qSlicerLoadableModule/1.0");
#endif
Q_INTERFACES(qSlicerLoadableModule);
public:
typedef qSlicerLoadableModule Superclass;
......
......@@ -34,9 +34,7 @@ class Q_SLICER_QTMODULES_COLORS_EXPORT qSlicerColorsModule
: public qSlicerLoadableModule
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID "org.slicer.modules.loadable.qSlicerLoadableModule/1.0");
#endif
Q_INTERFACES(qSlicerLoadableModule);
public:
......
......@@ -13,9 +13,7 @@ class Q_SLICER_QTMODULES_CROPVOLUME_EXPORT qSlicerCropVolumeModule :
public qSlicerLoadableModule
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID "org.slicer.modules.loadable.qSlicerLoadableModule/1.0");
#endif
Q_INTERFACES(qSlicerLoadableModule);
public:
......
......@@ -34,9 +34,7 @@ class Q_SLICER_QTMODULES_DATA_EXPORT qSlicerDataModule
: public qSlicerLoadableModule
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID "org.slicer.modules.loadable.qSlicerLoadableModule/1.0");
#endif
Q_INTERFACES(qSlicerLoadableModule);
public:
typedef qSlicerLoadableModule Superclass;
......
......@@ -30,9 +30,7 @@ class Q_SLICER_QTMODULES_DOUBLEARRAYS_EXPORT qSlicerDoubleArraysModule :
public qSlicerLoadableModule
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID "org.slicer.modules.loadable.qSlicerLoadableModule/1.0");
#endif
Q_INTERFACES(qSlicerLoadableModule);
public:
......
......@@ -21,14 +21,8 @@
#ifndef __qSlicerMarkupsModuleWidgetsPlugin_h
#define __qSlicerMarkupsModuleWidgetsPlugin_h
#include "vtkSlicerConfigure.h" // For Slicer_HAVE_QT5
// Qt includes
#ifdef Slicer_HAVE_QT5
#include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>
#else
#include <QDesignerCustomWidgetCollectionInterface>
#endif
// Markups includes
#include "qMRMLMarkupsFiducialProjectionPropertyWidgetPlugin.h"
......@@ -41,9 +35,7 @@ class Q_SLICER_MODULE_MARKUPS_WIDGETS_PLUGINS_EXPORT qSlicerMarkupsModuleWidgets
, public QDesignerCustomWidgetCollectionInterface
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetCollectionInterface")
#endif
Q_INTERFACES(QDesignerCustomWidgetCollectionInterface);
public:
......
......@@ -30,9 +30,7 @@ class Q_SLICER_QTMODULES_MARKUPS_EXPORT qSlicerMarkupsModule :
public qSlicerLoadableModule
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID "org.slicer.modules.loadable.qSlicerLoadableModule/1.0");
#endif
Q_INTERFACES(qSlicerLoadableModule);
public:
......
......@@ -21,14 +21,8 @@
#ifndef __qSlicerModelsWidgetsPlugin_h
#define __qSlicerModelsWidgetsPlugin_h
#include "vtkSlicerConfigure.h" // For Slicer_HAVE_QT5
// Qt includes
#ifdef Slicer_HAVE_QT5
#include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>
#else
#include <QDesignerCustomWidgetCollectionInterface>
#endif
// Models includes
#include "qMRMLModelDisplayNodeWidgetPlugin.h"
......@@ -39,9 +33,7 @@ class Q_SLICER_QTMODULES_MODELS_WIDGETS_PLUGINS_EXPORT qSlicerModelsWidgetsPlugi
, public QDesignerCustomWidgetCollectionInterface
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetCollectionInterface")
#endif
Q_INTERFACES(QDesignerCustomWidgetCollectionInterface);
public:
......
......@@ -36,9 +36,7 @@ class Q_SLICER_QTMODULES_MODELS_EXPORT qSlicerModelsModule :
public qSlicerLoadableModule
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID "org.slicer.modules.loadable.qSlicerLoadableModule/1.0");
#endif
Q_INTERFACES(qSlicerLoadableModule);
public:
......
......@@ -21,14 +21,8 @@
#ifndef __qSlicerPlotsModuleWidgetsPlugin_h
#define __qSlicerPlotsModuleWidgetsPlugin_h
#include "vtkSlicerConfigure.h" // For Slicer_HAVE_QT5
// Qt includes
#ifdef Slicer_HAVE_QT5
#include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>
#else
#include <QDesignerCustomWidgetCollectionInterface>
#endif
// Plots includes
#include "qMRMLPlotSeriesPropertiesWidgetPlugin.h"
......@@ -40,9 +34,7 @@ class Q_SLICER_MODULE_PLOTS_WIDGETS_PLUGINS_EXPORT qSlicerPlotsModuleWidgetsPlug
, public QDesignerCustomWidgetCollectionInterface
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetCollectionInterface")
#endif
Q_INTERFACES(QDesignerCustomWidgetCollectionInterface);
public:
......
......@@ -35,9 +35,7 @@ class Q_SLICER_QTMODULES_PLOTS_EXPORT qSlicerPlotsModule :
public qSlicerLoadableModule
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID "org.slicer.modules.loadable.qSlicerLoadableModule/1.0");
#endif
Q_INTERFACES(qSlicerLoadableModule);
public:
......
......@@ -33,9 +33,7 @@ class Q_SLICER_QTMODULES_REFORMAT_EXPORT
qSlicerReformatModule : public qSlicerLoadableModule
{
Q_OBJECT
#ifdef Slicer_HAVE_QT5
Q_PLUGIN_METADATA(IID "org.slicer.modules.loadable.qSlicerLoadableModule/1.0");
#endif
Q_INTERFACES(qSlicerLoadableModule);
public:
......
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