Commit 1134c17b authored by Konstantin Tokarev's avatar Konstantin Tokarev Committed by Eike Ziller
Browse files

Moved QrcEditor to Internal namespace, fixed namespace usage.



Change-Id: I24a142318cd6898ce32991085dcbeb7f00507f4e
Reviewed-by: default avatarEike Ziller <eike.ziller@nokia.com>
parent e0ffb2f6
......@@ -38,6 +38,7 @@
#include <QMessageBox>
using namespace ResourceEditor;
using namespace ResourceEditor::Internal;
QrcEditor::QrcEditor(QWidget *parent)
: QWidget(parent),
......
......@@ -37,6 +37,7 @@
#include <QUndoStack>
namespace ResourceEditor {
namespace Internal {
class QrcEditor : public QWidget
{
......@@ -105,6 +106,7 @@ private:
QString m_currentLanguage;
};
}
} // namespace Internal
} // namespace ResourceEditor
#endif
......@@ -59,7 +59,8 @@ static QString msgFileNameEmpty()
return QCoreApplication::translate("Designer", "The file name is empty.");
}
namespace ResourceEditor {
using namespace ResourceEditor;
using namespace ResourceEditor::Internal;
/******************************************************************************
** File
......@@ -1155,5 +1156,3 @@ QMimeData *ResourceModel::mimeData(const QModelIndexList &indexes) const
rc->setText(doc.toString());
return rc;
}
} // namespace ResourceEditor
......@@ -38,6 +38,7 @@
#include <QIcon>
namespace ResourceEditor {
namespace Internal {
class File;
struct Prefix;
......@@ -274,6 +275,7 @@ private:
QIcon m_prefixIcon;
};
} // namespace SharedTools
} // namespace Internal
} // namespace ResourceEditor
#endif // RESOURCEFILE_P_H
......@@ -48,6 +48,7 @@
#include <QUndoStack>
namespace ResourceEditor {
namespace Internal {
/*!
\class FileEntryBackup
......@@ -99,8 +100,6 @@ void PrefixEntryBackup::restore() const
}
}
namespace Internal {
class RelativeResourceModel : public ResourceModel
{
public:
......@@ -184,10 +183,14 @@ EntryBackup * RelativeResourceModel::removeEntry(const QModelIndex &index)
}
} // namespace Internal
} // namespace ResourceEditor
using namespace ResourceEditor;
using namespace ResourceEditor::Internal;
ResourceView::ResourceView(QUndoStack *history, QWidget *parent) :
QTreeView(parent),
m_qrcModel(new Internal::RelativeResourceModel(m_qrcFile, this)),
m_qrcModel(new RelativeResourceModel(m_qrcFile, this)),
m_history(history),
m_mergeId(-1)
{
......@@ -547,5 +550,3 @@ bool ResourceView::resourceDragEnabled() const
{
return m_qrcModel->resourceDragEnabled();
}
} // namespace SharedTools
......@@ -44,6 +44,7 @@ class QUndoStack;
QT_END_NAMESPACE
namespace ResourceEditor {
namespace Internal {
/*!
\class EntryBackup
......@@ -65,9 +66,7 @@ public:
virtual ~EntryBackup() { }
};
namespace Internal {
class RelativeResourceModel;
}
class RelativeResourceModel;
class ResourceView : public QTreeView
{
......@@ -144,12 +143,13 @@ private:
const QString &before, const QString &after);
ResourceFile m_qrcFile;
Internal::RelativeResourceModel *m_qrcModel;
RelativeResourceModel *m_qrcModel;
QUndoStack *m_history;
int m_mergeId;
};
} // namespace SharedTools
} // namespace Internal
} // namespace ResourceEditor
#endif // RESOURCEVIEW_H
......@@ -32,7 +32,8 @@
#include <QModelIndex>
namespace ResourceEditor {
using namespace ResourceEditor;
using namespace ResourceEditor::Internal;
ViewCommand::ViewCommand(ResourceView *view)
: m_view(view)
......@@ -183,5 +184,3 @@ void AddEmptyPrefixCommand::undo()
m_prefixArrayIndex, 0, QModelIndex());
delete m_view->removeEntry(prefixModelIndex);
}
} // namespace SharedTools
......@@ -41,6 +41,7 @@ class QModelIndex;
QT_END_NAMESPACE
namespace ResourceEditor {
namespace Internal {
/*!
\class ViewCommand
......@@ -157,6 +158,7 @@ private:
void undo();
};
} // namespace SharedTools
} // namespace Internal
} // namespace ResourceEditor
#endif // UNDO_COMMANDS_H
......@@ -42,13 +42,11 @@ class QToolBar;
QT_END_NAMESPACE
namespace ResourceEditor {
class QrcEditor;
namespace Internal {
class ResourceEditorPlugin;
class ResourceEditorW;
class QrcEditor;
class ResourceEditorDocument
: public virtual Core::IDocument
......
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