Commit e3ae459e authored by Marco Bubke's avatar Marco Bubke Committed by Tim Jenssen

QmlDesigner: Remove Internal namespace in the ItemLibrary

Change-Id: I183e57c7e5dcfaca903346972f5e4983e1beaa14
Reviewed-by: default avatarTim Jenssen <tim.jenssen@digia.com>
parent 617ffe73
......@@ -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
......@@ -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
......
......@@ -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
......@@ -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
......@@ -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();
......
......@@ -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;
......
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