diff options
Diffstat (limited to 'src/plugins/bineditor/bineditorplugin.cpp')
-rw-r--r-- | src/plugins/bineditor/bineditorplugin.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp index 04bf7642f9..decffc0c0e 100644 --- a/src/plugins/bineditor/bineditorplugin.cpp +++ b/src/plugins/bineditor/bineditorplugin.cpp @@ -303,8 +303,8 @@ public: Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance(); m_editor = parent; m_file = new BinEditorFile(parent); - m_context << uidm->uniqueIdentifier(Core::Constants::K_DEFAULT_BINARY_EDITOR); - m_context << uidm->uniqueIdentifier(Constants::C_BINEDITOR); + m_context << uidm->uniqueIdentifier(Core::Constants::K_DEFAULT_BINARY_EDITOR_ID); + m_context << uidm->uniqueIdentifier(Constants::C_BINEDITOR_ID); m_cursorPositionLabel = new Utils::LineColumnLabel; QHBoxLayout *l = new QHBoxLayout; @@ -336,7 +336,7 @@ public: return m_file->open(fileName); } Core::IFile *file() { return m_file; } - const char *kind() const { return Core::Constants::K_DEFAULT_BINARY_EDITOR; } + QString id() const { return QLatin1String(Core::Constants::K_DEFAULT_BINARY_EDITOR_ID); } QString displayName() const { return m_displayName; } void setDisplayName(const QString &title) { m_displayName = title; emit changed(); } @@ -371,21 +371,25 @@ private: ///////////////////////////////// BinEditorFactory ////////////////////////////////// BinEditorFactory::BinEditorFactory(BinEditorPlugin *owner) : - m_kind(QLatin1String(Core::Constants::K_DEFAULT_BINARY_EDITOR)), m_mimeTypes(QLatin1String(BINEditor::Constants::C_BINEDITOR_MIMETYPE)), m_owner(owner) { } -QString BinEditorFactory::kind() const +QString BinEditorFactory::id() const { - return m_kind; + return QLatin1String(Core::Constants::K_DEFAULT_BINARY_EDITOR_ID); +} + +QString BinEditorFactory::displayName() const +{ + return tr(Constants::C_BINEDITOR_DISPLAY_NAME); } Core::IFile *BinEditorFactory::open(const QString &fileName) { Core::EditorManager *em = Core::EditorManager::instance(); - Core::IEditor *iface = em->openEditor(fileName, kind()); + Core::IEditor *iface = em->openEditor(fileName, id()); return iface ? iface->file() : 0; } @@ -439,7 +443,7 @@ void BinEditorPlugin::initializeEditor(BinEditor *editor) editor->setEditorInterface(editorInterface); Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance(); - m_context << uidm->uniqueIdentifier(Constants::C_BINEDITOR); + m_context << uidm->uniqueIdentifier(Constants::C_BINEDITOR_ID); if (!m_undoAction) { m_undoAction = registerNewAction(QLatin1String(Core::Constants::UNDO), this, SLOT(undoAction()), |