diff --git a/DataControlPlugin.cc b/DataControlPlugin.cc index d44fde15749a4f0af813ea04d260a5967a203481..a4838ef8ce6062d3730a686f72944ff3ff00c6ca 100644 --- a/DataControlPlugin.cc +++ b/DataControlPlugin.cc @@ -49,10 +49,6 @@ #include "DataControlPlugin.hh" -#if QT_VERSION >= 0x050000 -#else - #include <QtGui> -#endif #include <ACG/QtWidgets/QtMaterialDialog.hh> @@ -936,7 +932,4 @@ void DataControlPlugin::slotObjectUpdated( int _identifier, const UpdateType& _t } } -#if QT_VERSION < 0x050000 -Q_EXPORT_PLUGIN2( datacontrolplugin , DataControlPlugin ); -#endif diff --git a/DataControlPlugin.hh b/DataControlPlugin.hh index a1de203b55e661a1395af6501f3387fc8af4c707..0b7baf6dc914e5bd16882967474640251144dc3e 100644 --- a/DataControlPlugin.hh +++ b/DataControlPlugin.hh @@ -84,9 +84,7 @@ class DataControlPlugin : public QObject, BaseInterface, ToolboxInterface, KeyIn Q_INTERFACES(ScriptInterface) Q_INTERFACES(LoadSaveInterface) -#if QT_VERSION >= 0x050000 Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-DataControl") -#endif signals: // BaseInterface diff --git a/Toolbox.hh b/Toolbox.hh index 7cc7f9f1623662188d2455f17e08898e97291d13..c292af4a7e570b4fe146b0b6abde10ee0eff77c4 100644 --- a/Toolbox.hh +++ b/Toolbox.hh @@ -49,11 +49,7 @@ #include "ui_toolbox.hh" -#if QT_VERSION >= 0x050000 #include <QtWidgets> -#else - #include <QtGui> -#endif class DatacontrolToolboxWidget : public QWidget, public Ui::dctoolbox diff --git a/TreeModel.cc b/TreeModel.cc index 669fbbb05b49ea95276b35d85818ecc3aad7aeb4..568eae4852e34f9944e799a0c30f6aa798dadae8 100644 --- a/TreeModel.cc +++ b/TreeModel.cc @@ -49,11 +49,7 @@ #include "TreeModel.hh" -#if QT_VERSION >= 0x050000 #include <QtWidgets> -#else - #include <QtGui> -#endif #include <OpenFlipper/BasePlugin/PluginFunctions.hh> diff --git a/TreeView.hh b/TreeView.hh index 5c3fbb4e75d04c103618e976ff3c480e9a457963..d4808980f5ad3b624dd5cebb993ed03a0f465358 100644 --- a/TreeView.hh +++ b/TreeView.hh @@ -49,11 +49,7 @@ #include <QTreeView> -#if QT_VERSION >= 0x050000 #include <QtWidgets> -#else - #include <QtGui> -#endif class DataControlTreeView : public QTreeView {