Commit f7fecfa0 authored by Kai Koehne's avatar Kai Koehne
Browse files

Core: Move Q_DECLARE_METATYPE for IEditor to ieditor.h

Fixes a gcc warning about different visibility of struct in files.

Reviewed-by: con
parent 48c2dccd
...@@ -80,8 +80,6 @@ ...@@ -80,8 +80,6 @@
#include <QtGui/QSplitter> #include <QtGui/QSplitter>
#include <QtGui/QStackedLayout> #include <QtGui/QStackedLayout>
Q_DECLARE_METATYPE(Core::IEditor*)
enum { debugEditorManager=0 }; enum { debugEditorManager=0 };
static inline ExtensionSystem::PluginManager *pluginManager() static inline ExtensionSystem::PluginManager *pluginManager()
......
...@@ -66,8 +66,6 @@ ...@@ -66,8 +66,6 @@
#include <qmacstyle_mac.h> #include <qmacstyle_mac.h>
#endif #endif
Q_DECLARE_METATYPE(Core::IEditor *)
using namespace Core; using namespace Core;
using namespace Core::Internal; using namespace Core::Internal;
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <coreplugin/core_global.h> #include <coreplugin/core_global.h>
#include <coreplugin/icontext.h> #include <coreplugin/icontext.h>
#include <QtCore/QMetaType>
namespace Core { namespace Core {
...@@ -74,4 +75,6 @@ signals: ...@@ -74,4 +75,6 @@ signals:
} // namespace Core } // namespace Core
Q_DECLARE_METATYPE(Core::IEditor*)
#endif // IEDITOR_H #endif // IEDITOR_H
...@@ -34,8 +34,6 @@ ...@@ -34,8 +34,6 @@
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtGui/QIcon> #include <QtGui/QIcon>
Q_DECLARE_METATYPE(Core::IEditor*)
namespace Core { namespace Core {
struct OpenEditorsModelPrivate { struct OpenEditorsModelPrivate {
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "icore.h" #include "icore.h"
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/filemanager.h> #include <coreplugin/filemanager.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/uniqueidmanager.h>
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
...@@ -50,8 +51,6 @@ ...@@ -50,8 +51,6 @@
#include <qmacstyle_mac.h> #include <qmacstyle_mac.h>
#endif #endif
Q_DECLARE_METATYPE(Core::IEditor*)
using namespace Core; using namespace Core;
using namespace Core::Internal; using namespace Core::Internal;
......
...@@ -63,8 +63,6 @@ ...@@ -63,8 +63,6 @@
#include <QtGui/QLabel> #include <QtGui/QLabel>
#include <QtGui/QToolBar> #include <QtGui/QToolBar>
Q_DECLARE_METATYPE(Core::IEditor*)
enum { enum {
debug = false debug = false
}; };
......
...@@ -50,7 +50,6 @@ Q_DECLARE_METATYPE(Core::MessageManager*) ...@@ -50,7 +50,6 @@ Q_DECLARE_METATYPE(Core::MessageManager*)
Q_DECLARE_METATYPE(Core::FileManager*) Q_DECLARE_METATYPE(Core::FileManager*)
Q_DECLARE_METATYPE(Core::IFile*) Q_DECLARE_METATYPE(Core::IFile*)
Q_DECLARE_METATYPE(QList<Core::IFile*>) Q_DECLARE_METATYPE(QList<Core::IFile*>)
Q_DECLARE_METATYPE(Core::IEditor*)
Q_DECLARE_METATYPE(QList<Core::IEditor*>) Q_DECLARE_METATYPE(QList<Core::IEditor*>)
Q_DECLARE_METATYPE(Core::EditorGroup*) Q_DECLARE_METATYPE(Core::EditorGroup*)
Q_DECLARE_METATYPE(QList<Core::EditorGroup*>) Q_DECLARE_METATYPE(QList<Core::EditorGroup*>)
......
...@@ -32,8 +32,6 @@ ...@@ -32,8 +32,6 @@
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditor.h>
Q_DECLARE_METATYPE(Core::IEditor*);
using namespace Core; using namespace Core;
using namespace Locator; using namespace Locator;
using namespace Locator::Internal; using namespace Locator::Internal;
......
...@@ -72,8 +72,6 @@ using Core::EditorManager; ...@@ -72,8 +72,6 @@ using Core::EditorManager;
using namespace QmlDesigner; using namespace QmlDesigner;
Q_DECLARE_METATYPE(Core::IEditor*)
enum { enum {
debug = false debug = false
}; };
......
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