Commit 98171a61 authored by jcfr's avatar jcfr
Browse files

STYLE: Remove obsolete code supporting Qt4 plugin infrastructure

See https://www.slicer.org/wiki/Documentation/Nightly/Developers/Tutorials/MigrationGuide#Obsolete_Code_Removal

Co-authored-by: Jean-Christophe Fillion-Robin's avatarJean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Co-authored-by: phcerdan's avatarPablo Hernandez-Cerdan <pablo.hernandez.cerdan@outlook.com>

From: Pablo Hernandez-Cerdan <pablo.hernandez.cerdan@outlook.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@28001 3bd1e089-480b-0410-8dfb-8563597acbee
parent 1e4cc629
......@@ -23,11 +23,7 @@
// QT includes
#include <QtGlobal>
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QDesignerCustomWidgetInterface>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#endif
// QTCLI includes
#include "qSlicerBaseQTCLIPluginsExport.h"
......@@ -35,9 +31,7 @@
class Q_SLICER_BASE_QTCLI_PLUGINS_EXPORT qSlicerQTCLIAbstractPlugin
: public QDesignerCustomWidgetInterface
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface")
#endif
Q_INTERFACES(QDesignerCustomWidgetInterface);
public:
......
......@@ -21,8 +21,3 @@
#include "qSlicerQTCLIPlugins.h"
#include <QtGlobal>
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QtPlugin>
Q_EXPORT_PLUGIN2(customwidgetplugin, qSlicerQTCLIPlugins);
#endif
......@@ -23,11 +23,7 @@
// QT includes
#include <QtGlobal>
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QDesignerCustomWidgetInterface>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#endif
// QTGUI includes
#include "qSlicerBaseQTGUIDesignerPluginsExport.h"
......@@ -35,9 +31,7 @@
class Q_SLICER_DESIGNER_PLUGINS_EXPORT qSlicerQTGUIAbstractPlugin
: public QDesignerCustomWidgetInterface
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface")
#endif
Q_INTERFACES(QDesignerCustomWidgetInterface);
public:
......
......@@ -21,8 +21,3 @@
#include "qSlicerQTGUIPlugins.h"
#include <QtGlobal>
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QtPlugin>
Q_EXPORT_PLUGIN2(customwidgetplugin, qSlicerQTGUIPlugins);
#endif
......@@ -27,12 +27,6 @@
#include "qSlicerDarkStyle.h"
#include "qSlicerStylePlugin.h"
// --------------------------------------------------------------------------
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QtPlugin>
Q_EXPORT_PLUGIN2(qSlicerStylePlugin, qSlicerStylePlugin)
#endif
// --------------------------------------------------------------------------
// qSlicerStylePlugin methods
......
......@@ -20,12 +20,6 @@
#include "qSlicerIconEnginePlugin.h"
//-----------------------------------------------------------------------------
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QtPlugin>
Q_EXPORT_PLUGIN2(qSlicerIconEnginePlugin, qSlicerIconEnginePlugin)
#endif
//------------------------------------------------------------------------------
qSlicerIconEnginePlugin::qSlicerIconEnginePlugin(QObject* parentObject)
:ctkIconEnginePlugin(parentObject)
......
......@@ -22,12 +22,6 @@
#include "qSlicerLoadableModuleTemplateModule.h"
#include "qSlicerLoadableModuleTemplateModuleWidget.h"
//-----------------------------------------------------------------------------
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QtPlugin>
Q_EXPORT_PLUGIN2(qSlicerLoadableModuleTemplateModule, qSlicerLoadableModuleTemplateModule);
#endif
//-----------------------------------------------------------------------------
/// \ingroup Slicer_QtModules_ExtensionTemplate
class qSlicerLoadableModuleTemplateModulePrivate
......
......@@ -22,12 +22,6 @@
#include "qSlicerSuperLoadableModuleTemplateModule.h"
#include "qSlicerSuperLoadableModuleTemplateModuleWidget.h"
//-----------------------------------------------------------------------------
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QtPlugin>
Q_EXPORT_PLUGIN2(qSlicerSuperLoadableModuleTemplateModule, qSlicerSuperLoadableModuleTemplateModule);
#endif
//-----------------------------------------------------------------------------
/// \ingroup Slicer_QtModules_ExtensionTemplate
class qSlicerSuperLoadableModuleTemplateModulePrivate
......
#include "qMRMLWidgetsPlugin.h"
#include <QtGlobal>
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QtPlugin>
Q_EXPORT_PLUGIN2(customwidgetplugin, qMRMLWidgetsPlugin);
#endif
#include "qSlicerTablesModuleWidgetsPlugin.h"
#include <QtGlobal>
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QtPlugin>
Q_EXPORT_PLUGIN2(customwidgetplugin, qSlicerTablesModuleWidgetsPlugin);
#endif
......@@ -22,19 +22,13 @@
#define __qSlicerAnnotationModuleWidgetsAbstractPlugin_h
#include <QtGlobal>
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QDesignerCustomWidgetInterface>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#endif
#include "qSlicerAnnotationsModuleWidgetsPluginsExport.h"
class Q_SLICER_MODULE_ANNOTATIONS_WIDGETS_PLUGINS_EXPORT qSlicerAnnotationModuleWidgetsAbstractPlugin
: public QDesignerCustomWidgetInterface
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface")
#endif
Q_INTERFACES(QDesignerCustomWidgetInterface);
public:
......
#include "qSlicerAnnotationModuleWidgetsPlugin.h"
#include <QtGlobal>
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QtPlugin>
Q_EXPORT_PLUGIN2(customwidgetplugin, qSlicerAnnotationModuleWidgetsPlugin);
#endif
......@@ -25,12 +25,6 @@
#include <vtkAutoInit.h>
VTK_MODULE_INIT(vtkSlicerAnnotationsModuleMRMLDisplayableManager)
//-----------------------------------------------------------------------------
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QtPlugin>
Q_EXPORT_PLUGIN2(qSlicerAnnotationsModule, qSlicerAnnotationsModule);
#endif
//-----------------------------------------------------------------------------
/// \ingroup Slicer_QtModules_Annotation
class qSlicerAnnotationsModulePrivate
......
......@@ -23,12 +23,6 @@
#include "qSlicerCamerasModuleWidget.h"
#include "vtkSlicerCamerasModuleLogic.h"
//-----------------------------------------------------------------------------
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QtPlugin>
Q_EXPORT_PLUGIN2(qSlicerCamerasModule, qSlicerCamerasModule);
#endif
//-----------------------------------------------------------------------------
class qSlicerCamerasModulePrivate
{
......
......@@ -41,12 +41,6 @@
#include <vtkSlicerApplicationLogic.h>
#include "vtkSlicerColorLogic.h"
//-----------------------------------------------------------------------------
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QtPlugin>
Q_EXPORT_PLUGIN2(qSlicerColorsModule, qSlicerColorsModule);
#endif
//-----------------------------------------------------------------------------
class qSlicerColorsModulePrivate
{
......
......@@ -15,12 +15,6 @@
#include "qSlicerCropVolumeModule.h"
#include "qSlicerCropVolumeModuleWidget.h"
//-----------------------------------------------------------------------------
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QtPlugin>
Q_EXPORT_PLUGIN2(qSlicerCropVolumeModule, qSlicerCropVolumeModule);
#endif
//-----------------------------------------------------------------------------
/// \ingroup Slicer_QtModules_CropVolume
class qSlicerCropVolumeModulePrivate
......
......@@ -47,12 +47,6 @@
// VTK includes
#include <vtkSmartPointer.h>
//-----------------------------------------------------------------------------
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QtPlugin>
Q_EXPORT_PLUGIN2(qSlicerDataModule, qSlicerDataModule);
#endif
//-----------------------------------------------------------------------------
class qSlicerDataModulePrivate
{
......
......@@ -27,12 +27,6 @@
#include "qSlicerDoubleArraysModule.h"
#include "qSlicerDoubleArraysReader.h"
//-----------------------------------------------------------------------------
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QtPlugin>
Q_EXPORT_PLUGIN2(qSlicerDoubleArraysModule, qSlicerDoubleArraysModule);
#endif
//-----------------------------------------------------------------------------
/// \ingroup Slicer_QtModules_ExtensionTemplate
class qSlicerDoubleArraysModulePrivate
......
......@@ -22,19 +22,13 @@
#define __qSlicerMarkupsModuleWidgetsAbstractPlugin_h
#include <QtGlobal>
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QDesignerCustomWidgetInterface>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#endif
#include "qSlicerMarkupsModuleWidgetsPluginsExport.h"
class Q_SLICER_MODULE_MARKUPS_WIDGETS_PLUGINS_EXPORT qSlicerMarkupsModuleWidgetsAbstractPlugin
: public QDesignerCustomWidgetInterface
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface")
#endif
Q_INTERFACES(QDesignerCustomWidgetInterface);
public:
......
#include "qSlicerMarkupsModuleWidgetsPlugin.h"
#include <QtGlobal>
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QtPlugin>
Q_EXPORT_PLUGIN2(customwidgetplugin, qSlicerMarkupsModuleWidgetsPlugin);
#endif
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