diff --git a/FunctionList.hh b/FunctionList.hh index edfd80877611236541f732a295c7ee5ca6f6ca47..98af462767248b60e394d30e33b277a947cea674 100644 --- a/FunctionList.hh +++ b/FunctionList.hh @@ -47,11 +47,7 @@ * * \*===========================================================================*/ -#if QT_VERSION >= 0x050000 #include <QtWidgets> -#else - #include <QtGui> -#endif #include <QListWidget> diff --git a/ScriptingPlugin.cc b/ScriptingPlugin.cc index bfdf6a714cef7b9d4a8b758a2c55f7c3158fc7b8..e5063485c0436ec299abdf89b8051ed85b549737 100644 --- a/ScriptingPlugin.cc +++ b/ScriptingPlugin.cc @@ -51,10 +51,6 @@ #include "OpenFlipper/common/GlobalOptions.hh" -#if QT_VERSION >= 0x050000 -#else -#include <QtGui> -#endif ScriptingPlugin::ScriptingPlugin() : @@ -776,7 +772,4 @@ void ScriptingPlugin::clearEditor() { scriptWidget_->currentScript->clear(); } -#if QT_VERSION < 0x050000 - Q_EXPORT_PLUGIN2( skriptingplugin , ScriptingPlugin ); -#endif diff --git a/ScriptingPlugin.hh b/ScriptingPlugin.hh index e4f6b54535c3f2a2e3b44e1b57b0c7584638a626..bfc3db1525eb03b206c30ad9ed81e603d2c38494 100644 --- a/ScriptingPlugin.hh +++ b/ScriptingPlugin.hh @@ -79,9 +79,7 @@ Q_INTERFACES(ScriptInterface) Q_INTERFACES(RPCInterface) Q_INTERFACES(LoggingInterface) -#if QT_VERSION >= 0x050000 Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-Scripting") -#endif signals: void updateView(); diff --git a/codeeditor.cc b/codeeditor.cc index 58b0627d7d251f630f3e074a9a439a5127e8ed58..3ce5c25d3f6c7beefb469573aeac0adef602b897 100644 --- a/codeeditor.cc +++ b/codeeditor.cc @@ -49,11 +49,7 @@ \*===========================================================================*/ -#if QT_VERSION >= 0x050000 #include <QtWidgets> -#else - #include <QtGui> -#endif #include "codeeditor.hh" diff --git a/highLighter.cc b/highLighter.cc index 8e8dae5e0bf7d9252fc1cc95a548006736d3c3bf..2ad8ed74a49552f872570f415fe7590f85fa7eaf 100644 --- a/highLighter.cc +++ b/highLighter.cc @@ -47,11 +47,7 @@ * * \*===========================================================================*/ -#if QT_VERSION >= 0x050000 #include <QtWidgets> -#else - #include <QtGui> -#endif #include "highLighter.hh" diff --git a/scriptingWidget.hh b/scriptingWidget.hh index 7bc6f465b1436622e25032f920d8e1a9aa8840b3..a31da0dd662089b8bc85c876037a64231b421888 100644 --- a/scriptingWidget.hh +++ b/scriptingWidget.hh @@ -49,11 +49,7 @@ #include "ui_scriptingWidget.hh" -#if QT_VERSION >= 0x050000 #include <QtWidgets> -#else - #include <QtGui> -#endif class ScriptWidget : public QMainWindow, public Ui::ScriptWidget {