Commit 2bf7271d authored by Konstantin Tokarev's avatar Konstantin Tokarev Committed by Eike Ziller

Moved QrcEditor to ResourceEditor plugin.

Change-Id: I623b47ab4fdad7abf07e47abd99959f0326639c6
Reviewed-by: default avatarEike Ziller <eike.ziller@nokia.com>
parent faf7ba62
......@@ -39,7 +39,7 @@
#include <QFileDialog>
#include <QMessageBox>
using namespace SharedTools;
using namespace ResourceEditor;
QrcEditor::QrcEditor(QWidget *parent)
: QWidget(parent),
......
......@@ -38,7 +38,7 @@
#include <QWidget>
#include <QUndoStack>
namespace SharedTools {
namespace ResourceEditor {
class QrcEditor : public QWidget
{
......
......@@ -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
......@@ -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
......@@ -45,7 +45,7 @@
#include <QMouseEvent>
#include <QUndoStack>
namespace SharedTools {
namespace ResourceEditor {
/*!
\class FileEntryBackup
......
......@@ -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;
......
......@@ -34,7 +34,7 @@
#include <QModelIndex>
namespace SharedTools {
namespace ResourceEditor {
ViewCommand::ViewCommand(ResourceView *view)
: m_view(view)
......
......@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
class QModelIndex;
QT_END_NAMESPACE
namespace SharedTools {
namespace ResourceEditor {
/*!
\class ViewCommand
......
......@@ -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
......
......@@ -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"
]
}
......@@ -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),
......
......@@ -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;
......
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