diff --git a/MeshObjectInfoPlugin.cc b/MeshObjectInfoPlugin.cc index 2c5b6c1ed65dcda97cb87cbf83e9588d02f8020a..a0056ffbd3d0e9ad5c6b95f06288a689a109d88c 100644 --- a/MeshObjectInfoPlugin.cc +++ b/MeshObjectInfoPlugin.cc @@ -65,10 +65,6 @@ #include "ValenceHistogramDialog.hh" -#if QT_VERSION >= 0x050000 -#else -#include -#endif //== IMPLEMENTATION ========================================================== @@ -968,8 +964,5 @@ void InfoMeshObjectPlugin::slotShowHistogram() { dialog->raise(); } -#if QT_VERSION < 0x050000 - Q_EXPORT_PLUGIN2( InfoMeshObjectPlugin , InfoMeshObjectPlugin ); -#endif diff --git a/MeshObjectInfoPlugin.hh b/MeshObjectInfoPlugin.hh index 8bf77f897b5840ac63da3518036001bcf77a72a7..de197f0d94b0a731dbc658356dcf36f5d845d92a 100644 --- a/MeshObjectInfoPlugin.hh +++ b/MeshObjectInfoPlugin.hh @@ -89,9 +89,7 @@ class InfoMeshObjectPlugin : public QObject, BaseInterface, InformationInterface Q_INTERFACES(StatusbarInterface) Q_INTERFACES(LoadSaveInterface) -#if QT_VERSION >= 0x050000 Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-MeshObjectInfo") -#endif signals: // BaseInterface diff --git a/ValenceHistogramDialog.hh b/ValenceHistogramDialog.hh index b2c3070b1564e03c607addf7a52884ff5b39b748..4664b790e14643f36413c9c9d30ac85b16d3503b 100644 --- a/ValenceHistogramDialog.hh +++ b/ValenceHistogramDialog.hh @@ -54,11 +54,7 @@ #include "ui_infoValenceHistograms.hh" -#if QT_VERSION >= 0x050000 #include -#else - #include -#endif class ValenceHistogramDialog: public QDialog, public Ui::ValenceHistogramsDlg { diff --git a/infoBar.hh b/infoBar.hh index 33f137f08294a17018340d9b072b12e9199ab0d5..c79ea3020e679bc5c4b16ba0a825b2d234aeee18 100644 --- a/infoBar.hh +++ b/infoBar.hh @@ -49,11 +49,7 @@ #include "ui_infoBar.hh" -#if QT_VERSION >= 0x050000 #include -#else - #include -#endif class InfoBar : public QWidget, public Ui::InfoBar diff --git a/infoDialog.hh b/infoDialog.hh index 5efc5b746527fb8556b544ad0c611f2745f60a29..8e03221d5d069f28beacdbe163c30c83b5c845ca 100644 --- a/infoDialog.hh +++ b/infoDialog.hh @@ -49,11 +49,7 @@ #include "ui_infoWidget.hh" -#if QT_VERSION >= 0x050000 #include -#else - #include -#endif class InfoDialog : public QDialog, public Ui::InfoWidget