Moved QrcEditor to ResourceEditor plugin.

Change-Id: I623b47ab4fdad7abf07e47abd99959f0326639c6
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

18 files changed, 27 insertions, 36 deletions

diff --git a/src/shared/qrceditor/qrceditor.cpp b/src/plugins/resourceeditor/qrceditor/qrceditor.cpp
index c3df8d3918..a9dfb9c6b9 100644
--- a/src/shared/qrceditor/qrceditor.cpp
+++ b/src/plugins/resourceeditor/qrceditor/qrceditor.cpp
@@ -39,7 +39,7 @@
 #include <QFileDialog>
 #include <QMessageBox>
 
-using namespace SharedTools;
+using namespace ResourceEditor;
 
 QrcEditor::QrcEditor(QWidget *parent)
   : QWidget(parent),
diff --git a/src/shared/qrceditor/qrceditor.h b/src/plugins/resourceeditor/qrceditor/qrceditor.h
index 6153f023c2..4fc94d8d51 100644
--- a/src/shared/qrceditor/qrceditor.h
+++ b/src/plugins/resourceeditor/qrceditor/qrceditor.h
@@ -38,7 +38,7 @@
 #include <QWidget>
 #include <QUndoStack>
 
-namespace SharedTools {
+namespace ResourceEditor {
 
 class QrcEditor : public QWidget
 {
diff --git a/src/shared/qrceditor/qrceditor.pri b/src/plugins/resourceeditor/qrceditor/qrceditor.pri
index 80005988d5..80005988d5 100644
--- a/src/shared/qrceditor/qrceditor.pri
+++ b/src/plugins/resourceeditor/qrceditor/qrceditor.pri
diff --git a/src/shared/qrceditor/qrceditor.ui b/src/plugins/resourceeditor/qrceditor/qrceditor.ui
index f9245dcaf5..f9245dcaf5 100644
--- a/src/shared/qrceditor/qrceditor.ui
+++ b/src/plugins/resourceeditor/qrceditor/qrceditor.ui
diff --git a/src/shared/qrceditor/resourcefile.cpp b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
index ecea7c0e9d..1d36b6ff0d 100644
--- a/src/shared/qrceditor/resourcefile.cpp
+++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
@@ -49,8 +49,6 @@
 
 #include <QDomDocument>
 
-QT_BEGIN_NAMESPACE
-
 
 /*
 TRANSLATOR qdesigner_internal::ResourceModel
@@ -61,7 +59,7 @@ static QString msgFileNameEmpty()
     return QCoreApplication::translate("Designer", "The file name is empty.");
 }
 
-namespace qdesigner_internal {
+namespace ResourceEditor {
 
 /******************************************************************************
 ** File
@@ -1155,6 +1153,6 @@ QMimeData *ResourceModel::mimeData(const QModelIndexList &indexes) const
     return rc;
 }
 
-} // namespace qdesigner_internal
+} // namespace SharedTools
 
 QT_END_NAMESPACE
diff --git a/src/shared/qrceditor/resourcefile_p.h b/src/plugins/resourceeditor/qrceditor/resourcefile_p.h
index ecc71078b7..38ae36d751 100644
--- a/src/shared/qrceditor/resourcefile_p.h
+++ b/src/plugins/resourceeditor/qrceditor/resourcefile_p.h
@@ -39,9 +39,7 @@
 #include <QStringList>
 #include <QIcon>
 
-QT_BEGIN_NAMESPACE
-
-namespace qdesigner_internal {
+namespace ResourceEditor {
 
 class File;
 struct Prefix;
@@ -278,8 +276,6 @@ private:
     QIcon m_prefixIcon;
 };
 
-} // namespace qdesigner_internal
-
-QT_END_NAMESPACE
+} // namespace SharedTools
 
 #endif // RESOURCEFILE_P_H
diff --git a/src/shared/qrceditor/resourceview.cpp b/src/plugins/resourceeditor/qrceditor/resourceview.cpp
index 87e731991e..ff32b7dfb6 100644
--- a/src/shared/qrceditor/resourceview.cpp
+++ b/src/plugins/resourceeditor/qrceditor/resourceview.cpp
@@ -45,7 +45,7 @@
 #include <QMouseEvent>
 #include <QUndoStack>
 
-namespace SharedTools {
+namespace ResourceEditor {
 
 /*!
     \class FileEntryBackup
diff --git a/src/shared/qrceditor/resourceview.h b/src/plugins/resourceeditor/qrceditor/resourceview.h
index 8314baedf0..23b1e9e10a 100644
--- a/src/shared/qrceditor/resourceview.h
+++ b/src/plugins/resourceeditor/qrceditor/resourceview.h
@@ -38,8 +38,6 @@
 #include <QTreeView>
 #include <QPoint>
 
-using namespace qdesigner_internal;
-
 QT_BEGIN_NAMESPACE
 class QAction;
 class QMenu;
@@ -47,7 +45,7 @@ class QMouseEvent;
 class QUndoStack;
 QT_END_NAMESPACE
 
-namespace SharedTools {
+namespace ResourceEditor {
 
 /*!
     \class EntryBackup
@@ -147,7 +145,7 @@ private:
     void addUndoCommand(const QModelIndex &nodeIndex, NodeProperty property,
                         const QString &before, const QString &after);
 
-    qdesigner_internal::ResourceFile m_qrcFile;
+    ResourceFile m_qrcFile;
     Internal::RelativeResourceModel *m_qrcModel;
 
     QUndoStack *m_history;
diff --git a/src/shared/qrceditor/test/main.cpp b/src/plugins/resourceeditor/qrceditor/test/main.cpp
index f51e92752f..f51e92752f 100644
--- a/src/shared/qrceditor/test/main.cpp
+++ b/src/plugins/resourceeditor/qrceditor/test/main.cpp
diff --git a/src/shared/qrceditor/test/mainwindow.cpp b/src/plugins/resourceeditor/qrceditor/test/mainwindow.cpp
index 30b49e0356..30b49e0356 100644
--- a/src/shared/qrceditor/test/mainwindow.cpp
+++ b/src/plugins/resourceeditor/qrceditor/test/mainwindow.cpp
diff --git a/src/shared/qrceditor/test/mainwindow.h b/src/plugins/resourceeditor/qrceditor/test/mainwindow.h
index 3f6e5c24d5..3f6e5c24d5 100644
--- a/src/shared/qrceditor/test/mainwindow.h
+++ b/src/plugins/resourceeditor/qrceditor/test/mainwindow.h
diff --git a/src/shared/qrceditor/test/test.pro b/src/plugins/resourceeditor/qrceditor/test/test.pro
index 6931488fce..6931488fce 100644
--- a/src/shared/qrceditor/test/test.pro
+++ b/src/plugins/resourceeditor/qrceditor/test/test.pro
diff --git a/src/shared/qrceditor/undocommands.cpp b/src/plugins/resourceeditor/qrceditor/undocommands.cpp
index c08a60f7a7..00aff6d9c3 100644
--- a/src/shared/qrceditor/undocommands.cpp
+++ b/src/plugins/resourceeditor/qrceditor/undocommands.cpp
@@ -34,7 +34,7 @@
 
 #include <QModelIndex>
 
-namespace SharedTools {
+namespace ResourceEditor {
 
 ViewCommand::ViewCommand(ResourceView *view)
         : m_view(view)
diff --git a/src/shared/qrceditor/undocommands_p.h b/src/plugins/resourceeditor/qrceditor/undocommands_p.h
index 8363211a32..7c446995b8 100644
--- a/src/shared/qrceditor/undocommands_p.h
+++ b/src/plugins/resourceeditor/qrceditor/undocommands_p.h
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 class QModelIndex;
 QT_END_NAMESPACE
 
-namespace SharedTools {
+namespace ResourceEditor {
 
 /*!
     \class ViewCommand
diff --git a/src/plugins/resourceeditor/resourceeditor.pro b/src/plugins/resourceeditor/resourceeditor.pro
index e6054b137c..bfdb9a528a 100644
--- a/src/plugins/resourceeditor/resourceeditor.pro
+++ b/src/plugins/resourceeditor/resourceeditor.pro
@@ -7,7 +7,7 @@ include(../../qtcreatorplugin.pri)
 include(../../libs/utils/utils.pri)
 include(../../plugins/coreplugin/coreplugin.pri)
 include(../../plugins/find/find.pri)
-include(../../shared/qrceditor/qrceditor.pri)
+include(qrceditor/qrceditor.pri)
 
 INCLUDEPATH += $$PWD/../../tools/utils
 
diff --git a/src/plugins/resourceeditor/resourceeditor.qbs b/src/plugins/resourceeditor/resourceeditor.qbs
index 630f21ac31..68dc1df8bc 100644
--- a/src/plugins/resourceeditor/resourceeditor.qbs
+++ b/src/plugins/resourceeditor/resourceeditor.qbs
@@ -15,7 +15,7 @@ QtcPlugin {
         "../..",
         "../../libs",
         buildDirectory,
-        "../../shared/qrceditor",
+        "qrceditor",
         "../../tools/utils"
     ]
 
@@ -31,15 +31,15 @@ QtcPlugin {
         "resourceeditorw.h",
         "resourcewizard.cpp",
         "resourcewizard.h",
-        "../../shared/qrceditor/resourcefile.cpp",
-        "../../shared/qrceditor/resourceview.cpp",
-        "../../shared/qrceditor/qrceditor.cpp",
-        "../../shared/qrceditor/undocommands.cpp",
-        "../../shared/qrceditor/resourcefile_p.h",
-        "../../shared/qrceditor/resourceview.h",
-        "../../shared/qrceditor/qrceditor.h",
-        "../../shared/qrceditor/undocommands_p.h",
-        "../../shared/qrceditor/qrceditor.ui"
+        "qrceditor/resourcefile.cpp",
+        "qrceditor/resourceview.cpp",
+        "qrceditor/qrceditor.cpp",
+        "qrceditor/undocommands.cpp",
+        "qrceditor/resourcefile_p.h",
+        "qrceditor/resourceview.h",
+        "qrceditor/qrceditor.h",
+        "qrceditor/undocommands_p.h",
+        "qrceditor/qrceditor.ui"
     ]
 }
 
diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp
index 1a2dd084e4..3ebf556d49 100644
--- a/src/plugins/resourceeditor/resourceeditorw.cpp
+++ b/src/plugins/resourceeditor/resourceeditorw.cpp
@@ -82,7 +82,7 @@ QString ResourceEditorDocument::mimeType() const
 ResourceEditorW::ResourceEditorW(const Core::Context &context,
                                ResourceEditorPlugin *plugin,
                                QWidget *parent)
-      : m_resourceEditor(new SharedTools::QrcEditor(parent)),
+      : m_resourceEditor(new QrcEditor(parent)),
         m_resourceDocument(new ResourceEditorDocument(this)),
         m_plugin(plugin),
         m_shouldAutoSave(false),
diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditorw.h
index 94f46e24be..2dd766f965 100644
--- a/src/plugins/resourceeditor/resourceeditorw.h
+++ b/src/plugins/resourceeditor/resourceeditorw.h
@@ -43,11 +43,10 @@ class QMenu;
 class QToolBar;
 QT_END_NAMESPACE
 
-namespace SharedTools {
-    class QrcEditor;
-}
-
 namespace ResourceEditor {
+
+class QrcEditor;
+
 namespace Internal {
 
 class ResourceEditorPlugin;
@@ -118,7 +117,7 @@ private:
     const QString m_fileFilter;
     QString m_displayName;
     QString m_suggestedName;
-    QPointer<SharedTools::QrcEditor> m_resourceEditor;
+    QPointer<QrcEditor> m_resourceEditor;
     ResourceEditorDocument *m_resourceDocument;
     ResourceEditorPlugin *m_plugin;
     bool m_shouldAutoSave;