Commit b8906443 authored by Jan Möbius's avatar Jan Möbius
Browse files
parents cd161990 5875bf0c
...@@ -51,11 +51,7 @@ ...@@ -51,11 +51,7 @@
#pragma once #pragma once
#if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else
#include <QtGui>
#endif
/** \file AboutInfoInterface.hh /** \file AboutInfoInterface.hh
......
...@@ -53,11 +53,7 @@ ...@@ -53,11 +53,7 @@
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else
#include <QtGui>
#endif
/** \file BackupInterface.hh /** \file BackupInterface.hh
* *
......
...@@ -52,11 +52,7 @@ ...@@ -52,11 +52,7 @@
#define CONTEXTMENUINTERFACE_HH #define CONTEXTMENUINTERFACE_HH
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
......
...@@ -53,11 +53,7 @@ ...@@ -53,11 +53,7 @@
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
......
...@@ -52,11 +52,7 @@ ...@@ -52,11 +52,7 @@
#define KEYINTERFACE_HH #define KEYINTERFACE_HH
#if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else
#include <QtGui>
#endif
......
...@@ -51,11 +51,7 @@ ...@@ -51,11 +51,7 @@
#define MENUBARINTERFACE_HH #define MENUBARINTERFACE_HH
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
......
...@@ -55,9 +55,7 @@ ...@@ -55,9 +55,7 @@
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#if QT_VERSION >= 0x050000
#include <QJsonDocument> #include <QJsonDocument>
#endif
...@@ -110,14 +108,12 @@ class MetadataInterface { ...@@ -110,14 +108,12 @@ class MetadataInterface {
virtual void slotObjectMetadataDeserialized( virtual void slotObjectMetadataDeserialized(
QString object_name, QString value) {}; QString object_name, QString value) {};
#if QT_VERSION >= 0x050000
/** /**
* Triggered for every piece of object specific meta data encapsulated * Triggered for every piece of object specific meta data encapsulated
* in "Mesh Comments" if it is valid JSON. * in "Mesh Comments" if it is valid JSON.
*/ */
virtual void slotObjectMetadataDeserializedJson( virtual void slotObjectMetadataDeserializedJson(
QString object_name, QJsonDocument value) {}; QString object_name, QJsonDocument value) {};
#endif
signals: signals:
/** /**
...@@ -154,10 +150,6 @@ to find out which specific signal suits your needs. ...@@ -154,10 +150,6 @@ to find out which specific signal suits your needs.
*/ */
#if QT_VERSION >= 0x050000
Q_DECLARE_INTERFACE(MetadataInterface,"OpenFlipper.MetadataInterface_qt5/1.0") Q_DECLARE_INTERFACE(MetadataInterface,"OpenFlipper.MetadataInterface_qt5/1.0")
#else
Q_DECLARE_INTERFACE(MetadataInterface,"OpenFlipper.MetadataInterface_qt4/1.0")
#endif
#endif // METADATAINTERFACE_HH #endif // METADATAINTERFACE_HH
...@@ -52,11 +52,7 @@ ...@@ -52,11 +52,7 @@
#define MOUSEINTERFACE_HH #define MOUSEINTERFACE_HH
#if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else
#include <QtGui>
#endif
/** \file MouseInterface.hh /** \file MouseInterface.hh
......
...@@ -52,11 +52,7 @@ ...@@ -52,11 +52,7 @@
#define OPTIONSINTERFACE_HH #define OPTIONSINTERFACE_HH
#if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else
#include <QtGui>
#endif
/** \file OptionsInterface.hh /** \file OptionsInterface.hh
......
...@@ -52,11 +52,7 @@ ...@@ -52,11 +52,7 @@
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
......
...@@ -68,13 +68,7 @@ ...@@ -68,13 +68,7 @@
#ifndef OPENFLIPPERCORE #ifndef OPENFLIPPERCORE
#ifndef OPENFLIPPERPLUGINLIB #ifndef OPENFLIPPERPLUGINLIB
#ifdef WIN32 #error PluginFunctionsCore is only allowed to be used from within OpenFlippers Core application!
#pragma message("PluginFunctionsCore is only allowed to be used from within OpenFlippers Core application!")
#else
#warning PluginFunctionsCore is only allowed to be used from within OpenFlippers Core application!
#error Bla
#endif
#endif #endif
#endif #endif
......
...@@ -52,11 +52,7 @@ ...@@ -52,11 +52,7 @@
#include <OpenFlipper/threads/OpenFlipperThread.hh> #include <OpenFlipper/threads/OpenFlipperThread.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else
#include <QtGui>
#endif
/** \file ProcessInterface.hh /** \file ProcessInterface.hh
......
...@@ -64,10 +64,10 @@ QScriptValue callFunction( QString _plugin, QString _functionName , std::vector< ...@@ -64,10 +64,10 @@ QScriptValue callFunction( QString _plugin, QString _functionName , std::vector<
RPCHelper h; RPCHelper h;
Qt::ConnectionType connection = Qt::DirectConnection; Qt::ConnectionType connection = Qt::DirectConnection;
if (h.thread() != QThread::currentThread()) if (h.thread() != QApplication::instance()->thread())
{ {
h.moveToThread(QApplication::instance()->thread()); h.moveToThread(QApplication::instance()->thread());
connection = Qt::QueuedConnection; connection = Qt::BlockingQueuedConnection;
} }
QScriptValue retVal; QScriptValue retVal;
...@@ -90,10 +90,10 @@ QScriptValue callFunction( QString _plugin, QString _functionName ) { ...@@ -90,10 +90,10 @@ QScriptValue callFunction( QString _plugin, QString _functionName ) {
RPCHelper h; RPCHelper h;
Qt::ConnectionType connection = Qt::DirectConnection; Qt::ConnectionType connection = Qt::DirectConnection;
if (h.thread() != QThread::currentThread()) if (h.thread() != QApplication::instance()->thread())
{ {
h.moveToThread(QApplication::instance()->thread()); h.moveToThread(QApplication::instance()->thread());
connection = Qt::QueuedConnection; connection = Qt::BlockingQueuedConnection;
} }
QScriptValue retVal; QScriptValue retVal;
......
...@@ -52,11 +52,7 @@ ...@@ -52,11 +52,7 @@
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else
#include <QtGui>
#endif
/** \file SecurityInterface.hh /** \file SecurityInterface.hh
......
...@@ -55,11 +55,7 @@ ...@@ -55,11 +55,7 @@
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else
#include <QtGui>
#endif
/** \file SelectionInterface.hh /** \file SelectionInterface.hh
......
...@@ -52,11 +52,7 @@ ...@@ -52,11 +52,7 @@
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QStatusBar> #include <QStatusBar>
......
...@@ -53,11 +53,7 @@ ...@@ -53,11 +53,7 @@
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
......
...@@ -52,11 +52,7 @@ ...@@ -52,11 +52,7 @@
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
#include <QStringList> #include <QStringList>
......
...@@ -51,11 +51,7 @@ ...@@ -51,11 +51,7 @@
#define TOOLBOXINTERFACE_HH #define TOOLBOXINTERFACE_HH
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
#include <QStringList> #include <QStringList>
......
...@@ -51,11 +51,7 @@ ...@@ -51,11 +51,7 @@
#define VIEWINTERFACE_HH #define VIEWINTERFACE_HH
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment