From e3ae459ef119fd7f4d01a98f0ccaf40e9b8c0fa8 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Wed, 14 May 2014 14:26:06 +0200
Subject: [PATCH] QmlDesigner: Remove Internal namespace in the ItemLibrary

Change-Id: I183e57c7e5dcfaca903346972f5e4983e1beaa14
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
---
 .../components/itemlibrary/itemlibrarycomponents.cpp |  4 ----
 .../components/itemlibrary/itemlibrarycomponents.h   |  4 ----
 .../components/itemlibrary/itemlibrarymodel.cpp      |  5 +----
 .../components/itemlibrary/itemlibrarymodel.h        |  5 +----
 .../components/itemlibrary/itemlibrarywidget.cpp     |  6 +++---
 .../components/itemlibrary/itemlibrarywidget.h       | 12 ++++++------
 6 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp
index 61547e19482..62d56ed95fb 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp
@@ -42,8 +42,6 @@ enum { debug = 0 };
 
 namespace QmlDesigner {
 
-namespace Internal {
-
 static void drawSelectionBackground(QPainter *painter, const QStyleOption &option)
 {
     painter->save();
@@ -198,7 +196,5 @@ void ResourceItemDelegate::setModel(QFileSystemModel *model)
     m_model = model;
 }
 
-} // namespace Internal
-
 } // namespace QmlDesigner
 
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h
index 46c7d55f370..c932a537978 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h
@@ -40,8 +40,6 @@ QT_END_NAMESPACE
 
 namespace QmlDesigner {
 
-namespace Internal {
-
 class ResourceItemDelegate;
 
 // ItemLibraryTreeView with Drag implementation
@@ -81,8 +79,6 @@ private:
     QFileSystemModel *m_model;
 };
 
-} // namespace Internal
-
 } // namespace QmlDesigner
 
 #endif // ITEMLIBRARYCOMPONENTS_H
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
index ab4de50b969..85985b55f8a 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
@@ -40,14 +40,12 @@
 #include <qdebug.h>
 
 static bool inline registerItemLibrarySortedModel() {
-    qmlRegisterType<QmlDesigner::Internal::ItemLibrarySortedModel>();
+    qmlRegisterType<QmlDesigner::ItemLibrarySortedModel>();
     return true;
 }
 
 namespace QmlDesigner {
 
-namespace Internal {
-
 static QHash<QString, bool> collapsedStateHash;
 
 ItemLibrarySortedModel::ItemLibrarySortedModel(QObject *parent) :
@@ -659,6 +657,5 @@ void registerQmlTypes()
     registerItemLibrarySortedModel();
 }
 
-} // namespace Internal
 } // namespace QmlDesigner
 
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
index 2a9dabc43eb..91bcd3824da 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
@@ -43,8 +43,6 @@ class ItemLibraryInfo;
 class ItemLibraryEntry;
 class Model;
 
-namespace Internal {
-
 void registerQmlTypes();
 
 class ItemLibrarySortedModel: public QAbstractListModel {
@@ -217,10 +215,9 @@ private:
     int m_nextLibId;
 };
 
-} // namespace Internal
 } // namespace QmlDesigner
 
-QML_DECLARE_TYPE(QmlDesigner::Internal::ItemLibrarySortedModel)
+QML_DECLARE_TYPE(QmlDesigner::ItemLibrarySortedModel)
 
 #endif // ITEMLIBRARYMODEL_H
 
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
index 9f67f4d5a95..f18f6e7a37b 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
@@ -63,18 +63,18 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) :
     m_resIconSize(24, 24),
     m_iconProvider(m_resIconSize),
     m_itemsView(new QQuickView()),
-    m_resourcesView(new Internal::ItemLibraryTreeView(this)),
+    m_resourcesView(new ItemLibraryTreeView(this)),
     m_filterFlag(QtBasic),
     m_itemLibraryId(-1)
 {
-    Internal::registerQmlTypes();
+    registerQmlTypes();
 
     setWindowTitle(tr("Library", "Title of library view"));
 
     /* create Items view and its model */
     m_itemsView->setResizeMode(QQuickView::SizeRootObjectToView);
     m_itemsView->engine()->setOutputWarningsToStandardError(debug);
-    m_itemLibraryModel = new Internal::ItemLibraryModel(this);
+    m_itemLibraryModel = new ItemLibraryModel(this);
     m_itemLibraryModel->setItemIconSize(m_itemIconSize);
 
     QQmlContext *rootContext = m_itemsView->rootContext();
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
index a60fffa3948..f8c7c7dc742 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
@@ -51,10 +51,10 @@ class MetaInfo;
 class ItemLibraryEntry;
 class Model;
 
-namespace Internal {
-    class ItemLibraryModel;
-    class ItemLibraryTreeView;
-}
+
+class ItemLibraryModel;
+class ItemLibraryTreeView;
+
 
 class ItemLibraryFileIconProvider : public QFileIconProvider
 {
@@ -127,14 +127,14 @@ private:
 
     QPointer<ItemLibraryInfo> m_itemLibraryInfo;
 
-    QPointer<Internal::ItemLibraryModel> m_itemLibraryModel;
+    QPointer<ItemLibraryModel> m_itemLibraryModel;
     QPointer<QFileSystemModel> m_resourcesFileSystemModel;
 
     QPointer<QStackedWidget> m_stackedWidget;
 
     QPointer<Utils::FancyLineEdit> m_filterLineEdit;
     QScopedPointer<QQuickView> m_itemsView;
-    QScopedPointer<Internal::ItemLibraryTreeView> m_resourcesView;
+    QScopedPointer<ItemLibraryTreeView> m_resourcesView;
 
     QPointer<Model> m_model;
     FilterChangeFlag m_filterFlag;