From f7fecfa07c165795c2badb6e006b0455039fc506 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Mon, 6 Dec 2010 09:47:43 +0100
Subject: [PATCH] Core: Move Q_DECLARE_METATYPE for IEditor to ieditor.h

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

Reviewed-by: con
---
 src/plugins/coreplugin/editormanager/editormanager.cpp      | 2 --
 src/plugins/coreplugin/editormanager/editorview.cpp         | 2 --
 src/plugins/coreplugin/editormanager/ieditor.h              | 3 +++
 src/plugins/coreplugin/editormanager/openeditorsmodel.cpp   | 2 --
 src/plugins/coreplugin/editormanager/openeditorsview.cpp    | 3 +--
 src/plugins/coreplugin/editortoolbar.cpp                    | 2 --
 src/plugins/coreplugin/scriptmanager/metatypedeclarations.h | 1 -
 src/plugins/locator/opendocumentsfilter.cpp                 | 2 --
 src/plugins/qmldesigner/designmodewidget.cpp                | 2 --
 9 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 455cbfcf48..3351ff79de 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -80,8 +80,6 @@
 #include <QtGui/QSplitter>
 #include <QtGui/QStackedLayout>
 
-Q_DECLARE_METATYPE(Core::IEditor*)
-
 enum { debugEditorManager=0 };
 
 static inline ExtensionSystem::PluginManager *pluginManager()
diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index 75db54bcde..3bb73b635a 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -66,8 +66,6 @@
 #include <qmacstyle_mac.h>
 #endif
 
-Q_DECLARE_METATYPE(Core::IEditor *)
-
 using namespace Core;
 using namespace Core::Internal;
 
diff --git a/src/plugins/coreplugin/editormanager/ieditor.h b/src/plugins/coreplugin/editormanager/ieditor.h
index 90dad36a99..25bf597b38 100644
--- a/src/plugins/coreplugin/editormanager/ieditor.h
+++ b/src/plugins/coreplugin/editormanager/ieditor.h
@@ -32,6 +32,7 @@
 
 #include <coreplugin/core_global.h>
 #include <coreplugin/icontext.h>
+#include <QtCore/QMetaType>
 
 namespace Core {
 
@@ -74,4 +75,6 @@ signals:
 
 } // namespace Core
 
+Q_DECLARE_METATYPE(Core::IEditor*)
+
 #endif // IEDITOR_H
diff --git a/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp b/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp
index c5c86e181a..a8615e410d 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp
@@ -34,8 +34,6 @@
 #include <QtCore/QDir>
 #include <QtGui/QIcon>
 
-Q_DECLARE_METATYPE(Core::IEditor*)
-
 namespace Core {
 
 struct OpenEditorsModelPrivate {
diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
index c8387ff25b..5143c4a913 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
@@ -34,6 +34,7 @@
 #include "icore.h"
 
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/filemanager.h>
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>
@@ -50,8 +51,6 @@
 #include <qmacstyle_mac.h>
 #endif
 
-Q_DECLARE_METATYPE(Core::IEditor*)
-
 using namespace Core;
 using namespace Core::Internal;
 
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index 19edcb2f63..53a7487162 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -63,8 +63,6 @@
 #include <QtGui/QLabel>
 #include <QtGui/QToolBar>
 
-Q_DECLARE_METATYPE(Core::IEditor*)
-
 enum {
     debug = false
 };
diff --git a/src/plugins/coreplugin/scriptmanager/metatypedeclarations.h b/src/plugins/coreplugin/scriptmanager/metatypedeclarations.h
index 20fb253a6e..f1b1892212 100644
--- a/src/plugins/coreplugin/scriptmanager/metatypedeclarations.h
+++ b/src/plugins/coreplugin/scriptmanager/metatypedeclarations.h
@@ -50,7 +50,6 @@ Q_DECLARE_METATYPE(Core::MessageManager*)
 Q_DECLARE_METATYPE(Core::FileManager*)
 Q_DECLARE_METATYPE(Core::IFile*)
 Q_DECLARE_METATYPE(QList<Core::IFile*>)
-Q_DECLARE_METATYPE(Core::IEditor*)
 Q_DECLARE_METATYPE(QList<Core::IEditor*>)
 Q_DECLARE_METATYPE(Core::EditorGroup*)
 Q_DECLARE_METATYPE(QList<Core::EditorGroup*>)
diff --git a/src/plugins/locator/opendocumentsfilter.cpp b/src/plugins/locator/opendocumentsfilter.cpp
index 5603108d8f..f430b69e0b 100644
--- a/src/plugins/locator/opendocumentsfilter.cpp
+++ b/src/plugins/locator/opendocumentsfilter.cpp
@@ -32,8 +32,6 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 
-Q_DECLARE_METATYPE(Core::IEditor*);
-
 using namespace Core;
 using namespace Locator;
 using namespace Locator::Internal;
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index 4d822b66d5..08779e9685 100644
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -72,8 +72,6 @@ using Core::EditorManager;
 
 using namespace QmlDesigner;
 
-Q_DECLARE_METATYPE(Core::IEditor*)
-
 enum {
     debug = false
 };
-- 
2.11.0