From a6ad773722a758df46813afd7af42625a0f3e276 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 7 Jan 2010 18:17:24 +0100 Subject: Make method naming more consistent. * 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 --- src/plugins/cpptools/cppfilesettingspage.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/cpptools/cppfilesettingspage.cpp') diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index 017c35cdf0..c35c85d858 100644 --- a/src/plugins/cpptools/cppfilesettingspage.cpp +++ b/src/plugins/cpptools/cppfilesettingspage.cpp @@ -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); } -- cgit v1.2.1