feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Remove Internal namespace in the ItemLibrary

Browse Source 
Change-Id: I183e57c7e5dcfaca903346972f5e4983e1beaa14
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Marco Bubke
2014-05-14 14:26:06 +02:00
committed by Tim Jenssen
parent 617ffe7303
commit e3ae459ef1
6 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp
View File

@@ -42,8 +42,6 @@ enum { debug = 0 };
namespace QmlDesigner { namespace QmlDesigner {
namespace Internal {
static void drawSelectionBackground(QPainter *painter, const QStyleOption &option) static void drawSelectionBackground(QPainter *painter, const QStyleOption &option)
{ {
painter->save(); painter->save();
@@ -198,7 +196,5 @@ void ResourceItemDelegate::setModel(QFileSystemModel *model)
m_model = model; m_model = model;
} }
} // namespace Internal
} // namespace QmlDesigner } // namespace QmlDesigner

4
src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h
View File

@@ -40,8 +40,6 @@ QT_END_NAMESPACE
namespace QmlDesigner { namespace QmlDesigner {
namespace Internal {
class ResourceItemDelegate; class ResourceItemDelegate;
// ItemLibraryTreeView with Drag implementation // ItemLibraryTreeView with Drag implementation
@@ -81,8 +79,6 @@ private:
QFileSystemModel *m_model; QFileSystemModel *m_model;
}; };
} // namespace Internal
} // namespace QmlDesigner } // namespace QmlDesigner
#endif // ITEMLIBRARYCOMPONENTS_H #endif // ITEMLIBRARYCOMPONENTS_H

5
src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
View File

@@ -40,14 +40,12 @@
#include <qdebug.h> #include <qdebug.h>
static bool inline registerItemLibrarySortedModel() { static bool inline registerItemLibrarySortedModel() {
qmlRegisterType<QmlDesigner::Internal::ItemLibrarySortedModel>(); qmlRegisterType<QmlDesigner::ItemLibrarySortedModel>();
return true; return true;
} }
namespace QmlDesigner { namespace QmlDesigner {
namespace Internal {
static QHash<QString, bool> collapsedStateHash; static QHash<QString, bool> collapsedStateHash;
ItemLibrarySortedModel::ItemLibrarySortedModel(QObject *parent) : ItemLibrarySortedModel::ItemLibrarySortedModel(QObject *parent) :
@@ -659,6 +657,5 @@ void registerQmlTypes()
registerItemLibrarySortedModel(); registerItemLibrarySortedModel();
} }
} // namespace Internal
} // namespace QmlDesigner } // namespace QmlDesigner

5
src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
View File

@@ -43,8 +43,6 @@ class ItemLibraryInfo;
class ItemLibraryEntry; class ItemLibraryEntry;
class Model; class Model;
namespace Internal {
void registerQmlTypes(); void registerQmlTypes();
class ItemLibrarySortedModel: public QAbstractListModel { class ItemLibrarySortedModel: public QAbstractListModel {
@@ -217,10 +215,9 @@ private:
int m_nextLibId; int m_nextLibId;
}; };
} // namespace Internal
} // namespace QmlDesigner } // namespace QmlDesigner
QML_DECLARE_TYPE(QmlDesigner::Internal::ItemLibrarySortedModel) QML_DECLARE_TYPE(QmlDesigner::ItemLibrarySortedModel)
#endif // ITEMLIBRARYMODEL_H #endif // ITEMLIBRARYMODEL_H

6
src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
View File

@@ -63,18 +63,18 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) :
m_resIconSize(24, 24), m_resIconSize(24, 24),
m_iconProvider(m_resIconSize), m_iconProvider(m_resIconSize),
m_itemsView(new QQuickView()), m_itemsView(new QQuickView()),
m_resourcesView(new Internal::ItemLibraryTreeView(this)), m_resourcesView(new ItemLibraryTreeView(this)),
m_filterFlag(QtBasic), m_filterFlag(QtBasic),
m_itemLibraryId(-1) m_itemLibraryId(-1)
{ {
Internal::registerQmlTypes(); registerQmlTypes();
setWindowTitle(tr("Library", "Title of library view")); setWindowTitle(tr("Library", "Title of library view"));
/* create Items view and its model */ /* create Items view and its model */
m_itemsView->setResizeMode(QQuickView::SizeRootObjectToView); m_itemsView->setResizeMode(QQuickView::SizeRootObjectToView);
m_itemsView->engine()->setOutputWarningsToStandardError(debug); m_itemsView->engine()->setOutputWarningsToStandardError(debug);
m_itemLibraryModel = new Internal::ItemLibraryModel(this); m_itemLibraryModel = new ItemLibraryModel(this);
m_itemLibraryModel->setItemIconSize(m_itemIconSize); m_itemLibraryModel->setItemIconSize(m_itemIconSize);
QQmlContext *rootContext = m_itemsView->rootContext(); QQmlContext *rootContext = m_itemsView->rootContext();

12
src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
View File

@@ -51,10 +51,10 @@ class MetaInfo;
class ItemLibraryEntry; class ItemLibraryEntry;
class Model; class Model;
namespace Internal {
class ItemLibraryModel; class ItemLibraryModel;
class ItemLibraryTreeView; class ItemLibraryTreeView;
}
class ItemLibraryFileIconProvider : public QFileIconProvider class ItemLibraryFileIconProvider : public QFileIconProvider
{ {
@@ -127,14 +127,14 @@ private:
QPointer<ItemLibraryInfo> m_itemLibraryInfo; QPointer<ItemLibraryInfo> m_itemLibraryInfo;
QPointer<Internal::ItemLibraryModel> m_itemLibraryModel; QPointer<ItemLibraryModel> m_itemLibraryModel;
QPointer<QFileSystemModel> m_resourcesFileSystemModel; QPointer<QFileSystemModel> m_resourcesFileSystemModel;
QPointer<QStackedWidget> m_stackedWidget; QPointer<QStackedWidget> m_stackedWidget;
QPointer<Utils::FancyLineEdit> m_filterLineEdit; QPointer<Utils::FancyLineEdit> m_filterLineEdit;
QScopedPointer<QQuickView> m_itemsView; QScopedPointer<QQuickView> m_itemsView;
QScopedPointer<Internal::ItemLibraryTreeView> m_resourcesView; QScopedPointer<ItemLibraryTreeView> m_resourcesView;
QPointer<Model> m_model; QPointer<Model> m_model;
FilterChangeFlag m_filterFlag; FilterChangeFlag m_filterFlag;