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

IOptionsPage: replace virtual fuctions by data members

Browse Source 
Change-Id: I8297df85109b67b79f90c33263a5dc7b89efbb60
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
hjk
2012-05-22 11:17:13 +02:00
committed by Eike Ziller
parent 444445ceb3
commit f77cd29e54
101 changed files with 403 additions and 1542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,6 +51,9 @@ CompletionSettingsPage::CompletionSettingsPage(QObject *parent)
{
if (QSettings *s = Core::ICore::settings())
m_commentsSettings.fromSettings(QLatin1String(CPPTOOLS_SETTINGSGROUP), s);
setId(QLatin1String("P.Completion"));
setDisplayName(tr("Completion"));
}
CompletionSettingsPage::~CompletionSettingsPage()
@@ -58,16 +61,6 @@ CompletionSettingsPage::~CompletionSettingsPage()
delete m_page;
}
QString CompletionSettingsPage::id() const
{
return QLatin1String("P.Completion");
}
QString CompletionSettingsPage::displayName() const
{
return tr("Completion");
}
QWidget *CompletionSettingsPage::createPage(QWidget *parent)
{
QWidget *w = new QWidget(parent);

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

@@ -55,13 +55,10 @@ public:
CompletionSettingsPage(QObject *parent);
~CompletionSettingsPage();
QString id() const;
QString displayName() const;
QWidget *createPage(QWidget *parent);
void apply();
void finish();
virtual bool matches(const QString &) const;
bool matches(const QString &) const;
const CommentsSettings &commentsSettings() const;

37
src/plugins/cpptools/cppcodestylesettingspage.cpp
View File

@@ -479,40 +479,15 @@ void CppCodeStylePreferencesWidget::setVisualizeWhitespace(bool on)
// ------------------ CppCodeStyleSettingsPage
CppCodeStyleSettingsPage::CppCodeStyleSettingsPage(
QWidget *parent) :
CppCodeStyleSettingsPage::CppCodeStyleSettingsPage(QWidget *parent) :
Core::IOptionsPage(parent),
m_pageCppCodeStylePreferences(0)
{
}
CppCodeStyleSettingsPage::~CppCodeStyleSettingsPage()
{
}
QString CppCodeStyleSettingsPage::id() const
{
return QLatin1String(Constants::CPP_CODE_STYLE_SETTINGS_ID);
}
QString CppCodeStyleSettingsPage::displayName() const
{
return QCoreApplication::translate("CppTools", Constants::CPP_CODE_STYLE_SETTINGS_NAME);
}
QString CppCodeStyleSettingsPage::category() const
{
return QLatin1String(Constants::CPP_SETTINGS_CATEGORY);
}
QString CppCodeStyleSettingsPage::displayCategory() const
{
return QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY);
}
QIcon CppCodeStyleSettingsPage::categoryIcon() const
{
return QIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPP_ICON));
setId(QLatin1String(Constants::CPP_CODE_STYLE_SETTINGS_ID));
setDisplayName(QCoreApplication::translate("CppTools", Constants::CPP_CODE_STYLE_SETTINGS_NAME));
setCategory(QLatin1String(Constants::CPP_SETTINGS_CATEGORY));
setDisplayCategory(QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPP_ICON));
}
QWidget *CppCodeStyleSettingsPage::createPage(QWidget *parent)

15
src/plugins/cpptools/cppcodestylesettingspage.h
View File

@@ -100,18 +100,11 @@ class CppCodeStyleSettingsPage : public Core::IOptionsPage
public:
explicit CppCodeStyleSettingsPage(QWidget *parent = 0);
~CppCodeStyleSettingsPage();
virtual QString id() const;
virtual QString displayName() const;
virtual QString category() const;
virtual QString displayCategory() const;
virtual QIcon categoryIcon() const;
virtual QWidget *createPage(QWidget *parent);
virtual void apply();
virtual void finish() { }
virtual bool matches(const QString &) const;
QWidget *createPage(QWidget *parent);
void apply();
void finish() { }
bool matches(const QString &) const;
private:
QString m_searchKeywords;

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

@@ -325,35 +325,11 @@ CppFileSettingsPage::CppFileSettingsPage(QSharedPointer<CppFileSettings> &settin
Core::IOptionsPage(parent),
m_settings(settings)
{
}
CppFileSettingsPage::~CppFileSettingsPage()
{
}
QString CppFileSettingsPage::id() const
{
return QLatin1String(Constants::CPP_FILE_SETTINGS_ID);
}
QString CppFileSettingsPage::displayName() const
{
return QCoreApplication::translate("CppTools", Constants::CPP_FILE_SETTINGS_NAME);
}
QString CppFileSettingsPage::category() const
{
return QLatin1String(Constants::CPP_SETTINGS_CATEGORY);
}
QString CppFileSettingsPage::displayCategory() const
{
return QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY);
}
QIcon CppFileSettingsPage::categoryIcon() const
{
return QIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPP_ICON));
setId(QLatin1String(Constants::CPP_FILE_SETTINGS_ID));
setDisplayName(QCoreApplication::translate("CppTools", Constants::CPP_FILE_SETTINGS_NAME));
setCategory(QLatin1String(Constants::CPP_SETTINGS_CATEGORY));
setDisplayCategory(QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPP_ICON));
}
QWidget *CppFileSettingsPage::createPage(QWidget *parent)

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

@@ -98,18 +98,11 @@ class CppFileSettingsPage : public Core::IOptionsPage
public:
explicit CppFileSettingsPage(QSharedPointer<CppFileSettings> &settings,
QObject *parent = 0);
virtual ~CppFileSettingsPage();
virtual QString id() const;
virtual QString displayName() const;
virtual QString category() const;
virtual QString displayCategory() const;
virtual QIcon categoryIcon() const;
virtual QWidget *createPage(QWidget *parent);
virtual void apply();
virtual void finish() { }
virtual bool matches(const QString &) const;
QWidget *createPage(QWidget *parent);
void apply();
void finish() { }
bool matches(const QString &) const;
private:
const QSharedPointer<CppFileSettings> m_settings;