Commit 1ddc2ced 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 03a5c3e0
......@@ -50,7 +50,9 @@
#include <QFileInfo>
#include <QDir>
#include <QTextStream>
#undef QT_NO_OPENGL
#include <QGLFormat>
#define QT_NO_OPENGL
namespace ACG
{
......
......@@ -58,7 +58,9 @@
#include "../Scenegraph/SceneGraph.hh"
#include "../Scenegraph/DrawModes.hh"
#include <QtOpenGL/QGLFormat>
#undef QT_NO_OPENGL
#include <QGLFormat>
#define QT_NO_OPENGL
#include <QBoxLayout>
#include <QtNetwork/QUdpSocket>
#include <QWheelEvent>
......
......@@ -55,7 +55,10 @@
//== INCLUDES =================================================================
#undef QT_NO_OPENGL
#include <QGLContext>
#define QT_NO_OPENGL
#include "../Config/ACGDefines.hh"
//== NAMESPACES ===============================================================
......
......@@ -65,7 +65,9 @@
#include <QFontMetrics>
#include <QImage>
#include <QPainter>
#undef QT_NO_OPENGL
#include <QGLWidget>
#define QT_NO_OPENGL
//== NAMESPACES ===============================================================
......
......@@ -55,7 +55,9 @@
#include "TextureNode.hh"
#include "DrawModes.hh"
#undef QT_NO_OPENGL
#include <QGLWidget>
#define QT_NO_OPENGL
//== NAMESPACES ===============================================================
......
......@@ -58,7 +58,9 @@
#include <ACG/Scenegraph/BaseNode.hh>
#include <ACG/Scenegraph/DrawModes.hh>
#undef QT_NO_OPENGL
#include <QGLWidget>
#define QT_NO_OPENGL
//== FORWARDDECLARATIONS ======================================================
......
......@@ -58,7 +58,10 @@
#include <ACG/Scenegraph/BaseNode.hh>
#include <ACG/Scenegraph/DrawModes.hh>
#undef QT_NO_OPENGL
#include <QGLWidget>
#define QT_NO_OPENGL
#include <QImage>
//== FORWARDDECLARATIONS ======================================================
......
......@@ -41,7 +41,7 @@
\*===========================================================================*/
#include "LightWidget.hh"
#include <QtGui>
#include <QMessageBox>
#include <iostream>
#include <OpenFlipper/common/GlobalOptions.hh>
......
......@@ -41,7 +41,13 @@
\*===========================================================================*/
#include <ui_lightWidget.hh>
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <ObjectTypes/Light/LightNode.hh>
#include <OpenFlipper/common/GlobalDefines.hh>
#include "Light.hh"
......
......@@ -48,9 +48,12 @@
#include <ACG/Geometry/Types/PlaneT.hh>
#include <QImage>
#include <QGLWidget>
#include <QMouseEvent>
#include<QApplication>
#include <QApplication>
#undef QT_NO_OPENGL
#include <QGLWidget>
#define QT_NO_OPENGL
//== NAMESPACES ===============================================================
......
......@@ -43,7 +43,12 @@
#pragma once
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
/** \file AboutInfoInterface.hh
......
......@@ -43,7 +43,13 @@
#ifndef BACKUPPLUGININTERFACE_HH
#define BACKUPPLUGININTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/common/Types.hh>
/** \file BackupInterface.hh
......
......@@ -43,7 +43,13 @@
#ifndef BASEINTERFACE_HH
#define BASEINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar>
#include <OpenFlipper/common/Types.hh>
#include "WhatsThisGenerator.hh"
......
......@@ -44,7 +44,13 @@
#ifndef CONTEXTMENUINTERFACE_HH
#define CONTEXTMENUINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar>
#include <OpenFlipper/common/Types.hh>
......
......@@ -44,7 +44,13 @@
#ifndef FILEINTERFACE_HH
#define FILEINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/common/Types.hh>
/** \file FileInterface.hh
......
......@@ -44,7 +44,13 @@
#ifndef INIINTERFACE_HH
#define INIINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar>
#include <OpenFlipper/common/Types.hh>
......
......@@ -44,7 +44,13 @@
#ifndef KEYINTERFACE_HH
#define KEYINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
......
......@@ -43,7 +43,13 @@
#ifndef MENUBARINTERFACE_HH
#define MENUBARINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar>
#include <OpenFlipper/common/Types.hh>
......
......@@ -44,7 +44,12 @@
#ifndef MOUSEINTERFACE_HH
#define MOUSEINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
/** \file MouseInterface.hh
......
......@@ -44,7 +44,12 @@
#ifndef OPTIONSINTERFACE_HH
#define OPTIONSINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
/** \file OptionsInterface.hh
......
......@@ -43,7 +43,12 @@
#ifndef PICKINGINTERFACE_HH
#define PICKINGINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar>
#include <OpenFlipper/common/Types.hh>
......
......@@ -43,7 +43,13 @@
#ifndef PROCESSINTERFACE_HH
#define PROCESSINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/threads/OpenFlipperThread.hh>
/** \file ProcessInterface.hh
......
......@@ -43,7 +43,13 @@
#ifndef SECURITYINTERFACE_HH
#define SECURITYINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/common/Types.hh>
......
......@@ -46,7 +46,14 @@
#include <OpenFlipper/INIFile/INIFile.hh>
#include <OpenFlipper/common/Types.hh>
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
/** \file SelectionInterface.hh
*
......
......@@ -43,7 +43,13 @@
#ifndef STATUSBARINTERFACE_HH
#define STATUSBARINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/common/Types.hh>
#include <QStatusBar>
......
......@@ -44,7 +44,13 @@
#ifndef TEXTUREINTERFACE_HH
#define TEXTUREINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar>
#include <OpenFlipper/common/Types.hh>
......
......@@ -43,7 +43,13 @@
#ifndef TOOLBARINTERFACE_HH
#define TOOLBARINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar>
#include <QStringList>
#include <OpenFlipper/common/Types.hh>
......
......@@ -43,7 +43,13 @@
#ifndef TOOLBOXINTERFACE_HH
#define TOOLBOXINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar>
#include <QStringList>
#include <OpenFlipper/common/Types.hh>
......
......@@ -43,9 +43,15 @@
#ifndef VIEWINTERFACE_HH
#define VIEWINTERFACE_HH
#include <QtGui>
#include <QMenuBar>
#include <OpenFlipper/common/Types.hh>
#if QT_VERSION >= 0x050000
#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.
......
......@@ -43,7 +43,13 @@
#ifndef VIEWMODEINTERFACE_HH
#define VIEWMODEINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar>
#include <QStringList>
......
......@@ -41,7 +41,13 @@
\*===========================================================================*/
#include <QApplication>
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QFile>
#include <QMessageBox>
#include <iostream>
......
......@@ -41,7 +41,13 @@
\*===========================================================================*/
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "keygenWidget.hh"
#include <iostream>
......
......@@ -40,7 +40,13 @@
* *
\*===========================================================================*/
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QBrush>
#include "TreeModelObjectSelection.hh"
......
......@@ -41,7 +41,7 @@
\*===========================================================================*/
#include "PluginDialog.hh"
#include <QtGui>
#include <QMessageBox>
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
......
......@@ -41,7 +41,12 @@
\*===========================================================================*/
#include "ui_pluginDialog.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/Core/PluginInfo.hh>
......
......@@ -43,7 +43,6 @@
#include "aboutWidget.hh"
#include <QtGui>
#include <OpenFlipper/common/GlobalOptions.hh>
......
......@@ -42,7 +42,13 @@
#include "ui_aboutWidget.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class AboutWidget : public QMainWindow, public Ui::AboutWidget
{
......
......@@ -47,7 +47,13 @@
#define ADDEMPTYWIDGET_HH
#include "ui_addEmpty.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "OpenFlipper/common/Types.hh"
......
......@@ -53,6 +53,12 @@
#include "CoreWidget.hh"
#if QT_VERSION > 0x050000
#include <QtConcurrent>
#else
#include <QtCore>
#endif
#include <ACG/Scenegraph/CoordsysNode.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
......
......@@ -64,7 +64,9 @@
#include <ACG/ShaderUtils/GLSLShader.hh>
#include <ACG/GL/globjects.hh>
#include <QtOpenGL/QGLFormat>
#undef QT_NO_OPENGL
#include <QGLFormat>
#define QT_NO_OPENGL
#include <QBoxLayout>
#include <QtNetwork/QUdpSocket>
#include <QWheelEvent>
......
......@@ -55,7 +55,9 @@
#include <OpenFlipper/common/ViewerProperties.hh>
#include <OpenFlipper/common/GlobalDefines.hh>
#include <QGraphicsView>
#undef QT_NO_OPENGL
#include <QGLFormat>
#define QT_NO_OPENGL
......
......@@ -51,7 +51,13 @@
#ifndef HELPBROWSER_HH_
#define HELPBROWSER_HH_
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QTextBrowser>
#include <QtHelp>
......
......@@ -52,7 +52,13 @@
#define HELPWIDGET_HH_
#include "ui_helpWidget.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QtHelp>
#include <QTextDocument>
......
......@@ -40,7 +40,13 @@
* *
\*===========================================================================*/
#include <QtGui>
#if QT_VERSION >= 0x050000