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

Make method naming more consistent.

Browse Source 
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
This commit is contained in:
Tobias Hunger
2010-01-07 18:17:24 +01:00
parent 8bb87fcda4
commit a6ad773722
332 changed files with 1666 additions and 1543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cpptools/completionsettingspage.cpp
View File

@@ -55,7 +55,7 @@ QString CompletionSettingsPage::id() const
return QLatin1String("P.Completion");
}
QString CompletionSettingsPage::trName() const
QString CompletionSettingsPage::displayName() const
{
return tr("Completion");
}
@@ -65,7 +65,7 @@ QString CompletionSettingsPage::category() const
return QLatin1String(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY);
}
QString CompletionSettingsPage::trCategory() const
QString CompletionSettingsPage::displayCategory() const
{
return QCoreApplication::translate("Text Editor", TextEditor::Constants::TEXT_EDITOR_SETTINGS_TR_CATEGORY);
}

4
src/plugins/cpptools/completionsettingspage.h
View File

@@ -50,9 +50,9 @@ public:
~CompletionSettingsPage();
QString id() const;
QString trName() const;
QString displayName() const;
QString category() const;
QString trCategory() const;
QString displayCategory() const;
QWidget *createPage(QWidget *parent);
void apply();

4
src/plugins/cpptools/cppclassesfilter.h
View File

@@ -43,8 +43,8 @@ public:
CppClassesFilter(CppModelManager *manager, Core::EditorManager *editorManager);
~CppClassesFilter();
QString trName() const { return tr("Classes"); }
QString name() const { return QLatin1String("Classes"); }
QString displayName() const { return tr("Classes"); }
QString id() const { return QLatin1String("Classes"); }
Priority priority() const { return Medium; }
};

4
src/plugins/cpptools/cppcurrentdocumentfilter.h
View File

@@ -50,8 +50,8 @@ public:
CppCurrentDocumentFilter(CppModelManager *manager, Core::EditorManager *editorManager);
~CppCurrentDocumentFilter() {}
QString trName() const { return tr("Methods in current Document"); }
QString name() const { return QLatin1String("Methods in current Document"); }
QString displayName() const { return tr("Methods in current Document"); }
QString id() const { return QLatin1String("Methods in current Document"); }
Priority priority() const { return Medium; }
QList<Locator::FilterEntry> matchesFor(const QString &entry);
void accept(Locator::FilterEntry selection) const;

8
src/plugins/cpptools/cppfilesettingspage.cpp
View File

@@ -268,7 +268,7 @@ void CppFileSettingsWidget::slotEdit()
QString path = licenseTemplatePath();
// Edit existing file with C++
if (!path.isEmpty()) {
Core::EditorManager::instance()->openEditor(path, QLatin1String(CppEditor::Constants::CPPEDITOR_KIND));
Core::EditorManager::instance()->openEditor(path, QLatin1String(CppEditor::Constants::CPPEDITOR_ID));
return;
}
// Pick a file name and write new template, edit with C++
@@ -284,7 +284,7 @@ void CppFileSettingsWidget::slotEdit()
file.write(tr(licenseTemplateTemplate).toUtf8());
file.close();
setLicenseTemplatePath(path);
Core::EditorManager::instance()->openEditor(path, QLatin1String(CppEditor::Constants::CPPEDITOR_KIND));
Core::EditorManager::instance()->openEditor(path, QLatin1String(CppEditor::Constants::CPPEDITOR_ID));
}
// --------------- CppFileSettingsPage
@@ -304,7 +304,7 @@ QString CppFileSettingsPage::id() const
return QLatin1String(Constants::CPP_SETTINGS_ID);
}
QString CppFileSettingsPage::trName() const
QString CppFileSettingsPage::displayName() const
{
return QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_NAME);
}
@@ -314,7 +314,7 @@ QString CppFileSettingsPage::category() const
return QLatin1String(Constants::CPP_SETTINGS_CATEGORY);
}
QString CppFileSettingsPage::trCategory() const
QString CppFileSettingsPage::displayCategory() const
{
return QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY);
}

4
src/plugins/cpptools/cppfilesettingspage.h
View File

@@ -98,9 +98,9 @@ public:
virtual ~CppFileSettingsPage();
virtual QString id() const;
virtual QString trName() const;
virtual QString displayName() const;
virtual QString category() const;
virtual QString trCategory() const;
virtual QString displayCategory() const;
virtual QWidget *createPage(QWidget *parent);
virtual void apply();

4
src/plugins/cpptools/cppfunctionsfilter.h
View File

@@ -43,8 +43,8 @@ public:
CppFunctionsFilter(CppModelManager *manager, Core::EditorManager *editorManager);
~CppFunctionsFilter();
QString trName() const { return tr("Methods"); }
QString name() const { return QLatin1String("Methods"); }
QString displayName() const { return tr("Methods"); }
QString id() const { return QLatin1String("Methods"); }
Priority priority() const { return Medium; }
};

4
src/plugins/cpptools/cpplocatorfilter.h
View File

@@ -50,8 +50,8 @@ public:
CppLocatorFilter(CppModelManager *manager, Core::EditorManager *editorManager);
~CppLocatorFilter();
QString trName() const { return tr("Classes and Methods"); }
QString name() const { return QLatin1String("Classes and Methods"); }
QString displayName() const { return tr("Classes and Methods"); }
QString id() const { return QLatin1String("Classes and Methods"); }
Priority priority() const { return Medium; }
QList<Locator::FilterEntry> matchesFor(const QString &entry);
void accept(Locator::FilterEntry selection) const;

2
src/plugins/cpptools/cpptoolsplugin.cpp
View File

@@ -128,7 +128,7 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error)
mtools->addMenu(mcpptools);
// Actions
m_context = core->uniqueIDManager()->uniqueIdentifier(CppEditor::Constants::C_CPPEDITOR);
m_context = core->uniqueIDManager()->uniqueIdentifier(CppEditor::Constants::CPPEDITOR_ID);
QList<int> context = QList<int>() << m_context;
QAction *switchAction = new QAction(tr("Switch Header/Source"), this);