Commit ec77395d authored by Matthias Möller's avatar Matthias Möller

- adding qt5 pluginsystem

- adding qt5 headers

refs #1359

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17080 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 109284d3
...@@ -43,7 +43,12 @@ ...@@ -43,7 +43,12 @@
#pragma once #pragma once
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
/** \file AboutInfoInterface.hh /** \file AboutInfoInterface.hh
......
...@@ -43,7 +43,13 @@ ...@@ -43,7 +43,13 @@
#ifndef BACKUPPLUGININTERFACE_HH #ifndef BACKUPPLUGININTERFACE_HH
#define BACKUPPLUGININTERFACE_HH #define BACKUPPLUGININTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
/** \file BackupInterface.hh /** \file BackupInterface.hh
......
...@@ -43,7 +43,13 @@ ...@@ -43,7 +43,13 @@
#ifndef BASEINTERFACE_HH #ifndef BASEINTERFACE_HH
#define BASEINTERFACE_HH #define BASEINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#include "WhatsThisGenerator.hh" #include "WhatsThisGenerator.hh"
......
...@@ -44,7 +44,13 @@ ...@@ -44,7 +44,13 @@
#ifndef CONTEXTMENUINTERFACE_HH #ifndef CONTEXTMENUINTERFACE_HH
#define CONTEXTMENUINTERFACE_HH #define CONTEXTMENUINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
......
...@@ -44,7 +44,13 @@ ...@@ -44,7 +44,13 @@
#ifndef FILEINTERFACE_HH #ifndef FILEINTERFACE_HH
#define FILEINTERFACE_HH #define FILEINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
/** \file FileInterface.hh /** \file FileInterface.hh
......
...@@ -44,7 +44,13 @@ ...@@ -44,7 +44,13 @@
#ifndef INIINTERFACE_HH #ifndef INIINTERFACE_HH
#define INIINTERFACE_HH #define INIINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
......
...@@ -44,7 +44,13 @@ ...@@ -44,7 +44,13 @@
#ifndef KEYINTERFACE_HH #ifndef KEYINTERFACE_HH
#define KEYINTERFACE_HH #define KEYINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
......
...@@ -43,7 +43,13 @@ ...@@ -43,7 +43,13 @@
#ifndef MENUBARINTERFACE_HH #ifndef MENUBARINTERFACE_HH
#define MENUBARINTERFACE_HH #define MENUBARINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
......
...@@ -44,7 +44,12 @@ ...@@ -44,7 +44,12 @@
#ifndef MOUSEINTERFACE_HH #ifndef MOUSEINTERFACE_HH
#define MOUSEINTERFACE_HH #define MOUSEINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
/** \file MouseInterface.hh /** \file MouseInterface.hh
......
...@@ -44,7 +44,12 @@ ...@@ -44,7 +44,12 @@
#ifndef OPTIONSINTERFACE_HH #ifndef OPTIONSINTERFACE_HH
#define OPTIONSINTERFACE_HH #define OPTIONSINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
/** \file OptionsInterface.hh /** \file OptionsInterface.hh
......
...@@ -43,7 +43,12 @@ ...@@ -43,7 +43,12 @@
#ifndef PICKINGINTERFACE_HH #ifndef PICKINGINTERFACE_HH
#define PICKINGINTERFACE_HH #define PICKINGINTERFACE_HH
#include <QtGui> #if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
......
...@@ -43,7 +43,13 @@ ...@@ -43,7 +43,13 @@
#ifndef PROCESSINTERFACE_HH #ifndef PROCESSINTERFACE_HH
#define PROCESSINTERFACE_HH #define PROCESSINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/threads/OpenFlipperThread.hh> #include <OpenFlipper/threads/OpenFlipperThread.hh>
/** \file ProcessInterface.hh /** \file ProcessInterface.hh
......
...@@ -43,7 +43,13 @@ ...@@ -43,7 +43,13 @@
#ifndef SECURITYINTERFACE_HH #ifndef SECURITYINTERFACE_HH
#define SECURITYINTERFACE_HH #define SECURITYINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
......
...@@ -46,7 +46,14 @@ ...@@ -46,7 +46,14 @@
#include <OpenFlipper/INIFile/INIFile.hh> #include <OpenFlipper/INIFile/INIFile.hh>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
/** \file SelectionInterface.hh /** \file SelectionInterface.hh
* *
......
...@@ -43,7 +43,13 @@ ...@@ -43,7 +43,13 @@
#ifndef STATUSBARINTERFACE_HH #ifndef STATUSBARINTERFACE_HH
#define STATUSBARINTERFACE_HH #define STATUSBARINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#include <QStatusBar> #include <QStatusBar>
......
...@@ -44,7 +44,13 @@ ...@@ -44,7 +44,13 @@
#ifndef TEXTUREINTERFACE_HH #ifndef TEXTUREINTERFACE_HH
#define TEXTUREINTERFACE_HH #define TEXTUREINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
......
...@@ -43,7 +43,13 @@ ...@@ -43,7 +43,13 @@
#ifndef TOOLBARINTERFACE_HH #ifndef TOOLBARINTERFACE_HH
#define TOOLBARINTERFACE_HH #define TOOLBARINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
#include <QStringList> #include <QStringList>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
......
...@@ -43,7 +43,13 @@ ...@@ -43,7 +43,13 @@
#ifndef TOOLBOXINTERFACE_HH #ifndef TOOLBOXINTERFACE_HH
#define TOOLBOXINTERFACE_HH #define TOOLBOXINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
#include <QStringList> #include <QStringList>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
......
...@@ -43,9 +43,15 @@ ...@@ -43,9 +43,15 @@
#ifndef VIEWINTERFACE_HH #ifndef VIEWINTERFACE_HH
#define VIEWINTERFACE_HH #define VIEWINTERFACE_HH
#include <QtGui>
#include <QMenuBar> #if QT_VERSION >= 0x050000
#include <OpenFlipper/common/Types.hh> #include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar>
#include <OpenFlipper/common/Types.hh>
/** /**
This Interface should be used by plugins which will provide an additional view widget. This Interface should be used by plugins which will provide an additional view widget.
......
...@@ -43,7 +43,13 @@ ...@@ -43,7 +43,13 @@
#ifndef VIEWMODEINTERFACE_HH #ifndef VIEWMODEINTERFACE_HH
#define VIEWMODEINTERFACE_HH #define VIEWMODEINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
#include <QStringList> #include <QStringList>
......
...@@ -41,7 +41,13 @@ ...@@ -41,7 +41,13 @@
\*===========================================================================*/ \*===========================================================================*/
#include <QApplication> #include <QApplication>
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QFile> #include <QFile>
#include <QMessageBox> #include <QMessageBox>
#include <iostream> #include <iostream>
......
...@@ -41,7 +41,13 @@ ...@@ -41,7 +41,13 @@
\*===========================================================================*/ \*===========================================================================*/
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "keygenWidget.hh" #include "keygenWidget.hh"
#include <iostream> #include <iostream>
......
...@@ -40,7 +40,13 @@ ...@@ -40,7 +40,13 @@
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QBrush> #include <QBrush>
#include "TreeModelObjectSelection.hh" #include "TreeModelObjectSelection.hh"
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
\*===========================================================================*/ \*===========================================================================*/
#include "PluginDialog.hh" #include "PluginDialog.hh"
#include <QtGui>
#include <QMessageBox> #include <QMessageBox>
#include <OpenFlipper/BasePlugin/BaseInterface.hh> #include <OpenFlipper/BasePlugin/BaseInterface.hh>
......
...@@ -41,7 +41,12 @@ ...@@ -41,7 +41,12 @@
\*===========================================================================*/ \*===========================================================================*/
#include "ui_pluginDialog.hh" #include "ui_pluginDialog.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/Core/PluginInfo.hh> #include <OpenFlipper/Core/PluginInfo.hh>
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include "aboutWidget.hh" #include "aboutWidget.hh"
#include <QtGui>
#include <OpenFlipper/common/GlobalOptions.hh> #include <OpenFlipper/common/GlobalOptions.hh>
......
...@@ -42,7 +42,13 @@ ...@@ -42,7 +42,13 @@
#include "ui_aboutWidget.hh" #include "ui_aboutWidget.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class AboutWidget : public QMainWindow, public Ui::AboutWidget class AboutWidget : public QMainWindow, public Ui::AboutWidget
{ {
......
...@@ -47,7 +47,13 @@ ...@@ -47,7 +47,13 @@
#define ADDEMPTYWIDGET_HH #define ADDEMPTYWIDGET_HH
#include "ui_addEmpty.hh" #include "ui_addEmpty.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "OpenFlipper/common/Types.hh" #include "OpenFlipper/common/Types.hh"
......
...@@ -53,6 +53,12 @@ ...@@ -53,6 +53,12 @@
#include "CoreWidget.hh" #include "CoreWidget.hh"
#if QT_VERSION > 0x050000
#include <QtConcurrent>
#else
#include <QtCore>
#endif
#include <ACG/Scenegraph/CoordsysNode.hh> #include <ACG/Scenegraph/CoordsysNode.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh> #include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh> #include <OpenFlipper/common/GlobalOptions.hh>
......
...@@ -64,7 +64,9 @@ ...@@ -64,7 +64,9 @@
#include <ACG/ShaderUtils/GLSLShader.hh> #include <ACG/ShaderUtils/GLSLShader.hh>
#include <ACG/GL/globjects.hh> #include <ACG/GL/globjects.hh>
#include <QtOpenGL/QGLFormat> #undef QT_NO_OPENGL
#include <QGLFormat>
#define QT_NO_OPENGL
#include <QBoxLayout> #include <QBoxLayout>
#include <QtNetwork/QUdpSocket> #include <QtNetwork/QUdpSocket>
#include <QWheelEvent> #include <QWheelEvent>
......
...@@ -55,7 +55,9 @@ ...@@ -55,7 +55,9 @@
#include <OpenFlipper/common/ViewerProperties.hh> #include <OpenFlipper/common/ViewerProperties.hh>
#include <OpenFlipper/common/GlobalDefines.hh> #include <OpenFlipper/common/GlobalDefines.hh>
#include <QGraphicsView> #include <QGraphicsView>
#undef QT_NO_OPENGL
#include <QGLFormat> #include <QGLFormat>
#define QT_NO_OPENGL
......
...@@ -51,7 +51,13 @@ ...@@ -51,7 +51,13 @@
#ifndef HELPBROWSER_HH_ #ifndef HELPBROWSER_HH_
#define HELPBROWSER_HH_ #define HELPBROWSER_HH_
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QTextBrowser> #include <QTextBrowser>
#include <QtHelp> #include <QtHelp>
......
...@@ -52,7 +52,13 @@ ...@@ -52,7 +52,13 @@
#define HELPWIDGET_HH_ #define HELPWIDGET_HH_
#include "ui_helpWidget.hh" #include "ui_helpWidget.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QtHelp> #include <QtHelp>
#include <QTextDocument> #include <QTextDocument>
......
...@@ -40,7 +40,13 @@ ...@@ -40,7 +40,13 @@
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/Core/Core.hh> #include <OpenFlipper/Core/Core.hh>
......
...@@ -41,9 +41,12 @@ ...@@ -41,9 +41,12 @@
\*===========================================================================*/ \*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QtGui>
#include <QDirModel> #include <QDirModel>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
......
...@@ -46,10 +46,16 @@ ...@@ -46,10 +46,16 @@
#ifndef LOGGERWIDGET_HH #ifndef LOGGERWIDGET_HH
#define LOGGERWIDGET_HH #define LOGGERWIDGET_HH
#include <QtGui> #include <QListWidget>
#include <OpenFlipper/BasePlugin/LoggingInterface.hh> #include <OpenFlipper/BasePlugin/LoggingInterface.hh>