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

30
src/plugins/help/docsettingspage.cpp
View File

@@ -45,31 +45,11 @@ using namespace Help::Internal;
DocSettingsPage::DocSettingsPage()
{
}
QString DocSettingsPage::id() const
{
return QLatin1String("B.Documentation");
}
QString DocSettingsPage::displayName() const
{
return tr("Documentation");
}
QString DocSettingsPage::category() const
{
return QLatin1String(Help::Constants::HELP_CATEGORY);
}
QString DocSettingsPage::displayCategory() const
{
return QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY);
}
QIcon DocSettingsPage::categoryIcon() const
{
return QIcon(QLatin1String(Help::Constants::HELP_CATEGORY_ICON));
setId(QLatin1String("B.Documentation"));
setDisplayName(tr("Documentation"));
setCategory(QLatin1String(Help::Constants::HELP_CATEGORY));
setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY));
setCategoryIcon(QLatin1String(Help::Constants::HELP_CATEGORY_ICON));
}
QWidget *DocSettingsPage::createPage(QWidget *parent)

10
src/plugins/help/docsettingspage.h
View File

@@ -42,21 +42,14 @@ namespace Internal {
class DocSettingsPage : public Core::IOptionsPage
{
Q_OBJECT
typedef QHash<QString, QString> NameSpaceToPathHash;
public:
DocSettingsPage();
QString id() const;
QString displayName() const;
QString category() const;
QString displayCategory() const;
QIcon categoryIcon() const;
QWidget *createPage(QWidget *parent);
void apply();
void finish() {}
virtual bool matches(const QString &s) const;
bool matches(const QString &s) const;
private slots:
void addDocumentation();
@@ -73,6 +66,7 @@ private:
QString m_searchKeywords;
QString m_recentDialogPath;
typedef QHash<QString, QString> NameSpaceToPathHash;
NameSpaceToPathHash m_filesToRegister;
NameSpaceToPathHash m_filesToUnregister;
};

30
src/plugins/help/filtersettingspage.cpp
View File

@@ -46,31 +46,11 @@ using namespace Help::Internal;
FilterSettingsPage::FilterSettingsPage()
{
}
QString FilterSettingsPage::id() const
{
return QLatin1String("D.Filters");
}
QString FilterSettingsPage::displayName() const
{
return tr("Filters");
}
QString FilterSettingsPage::category() const
{
return QLatin1String(Help::Constants::HELP_CATEGORY);
}
QString FilterSettingsPage::displayCategory() const
{
return QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY);
}
QIcon FilterSettingsPage::categoryIcon() const
{
return QIcon(QLatin1String(Help::Constants::HELP_CATEGORY_ICON));
setId(QLatin1String("D.Filters"));
setDisplayName(tr("Filters"));
setCategory(QLatin1String(Help::Constants::HELP_CATEGORY));
setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY));
setCategoryIcon(QLatin1String(Help::Constants::HELP_CATEGORY_ICON));
}
QWidget *FilterSettingsPage::createPage(QWidget *parent)

10
src/plugins/help/filtersettingspage.h
View File

@@ -42,21 +42,14 @@ namespace Internal {
class FilterSettingsPage : public Core::IOptionsPage
{
Q_OBJECT
typedef QMap<QString, QStringList> FilterMap;
public:
FilterSettingsPage();
QString id() const;
QString displayName() const;
QString category() const;
QString displayCategory() const;
QIcon categoryIcon() const;
QWidget *createPage(QWidget *parent);
void apply();
void finish();
virtual bool matches(const QString &s) const;
bool matches(const QString &s) const;
signals:
void filtersChanged();
@@ -75,6 +68,7 @@ private:
QString msgFilterLabel(const QString &filter) const;
Ui::FilterSettingsPage m_ui;
typedef QMap<QString, QStringList> FilterMap;
FilterMap m_filterMap;
FilterMap m_filterMapBackup;

30
src/plugins/help/generalsettingspage.cpp
View File

@@ -66,31 +66,11 @@ GeneralSettingsPage::GeneralSettingsPage()
QWebSettings* webSettings = QWebSettings::globalSettings();
m_font.setPointSize(webSettings->fontSize(QWebSettings::DefaultFontSize));
#endif
}
QString GeneralSettingsPage::id() const
{
return QLatin1String("A.General settings");
}
QString GeneralSettingsPage::displayName() const
{
return tr("General");
}
QString GeneralSettingsPage::category() const
{
return QLatin1String(Help::Constants::HELP_CATEGORY);
}
QString GeneralSettingsPage::displayCategory() const
{
return QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY);
}
QIcon GeneralSettingsPage::categoryIcon() const
{
return QIcon(QLatin1String(Help::Constants::HELP_CATEGORY_ICON));
setId(QLatin1String("A.General settings"));
setDisplayName(tr("General"));
setCategory(QLatin1String(Help::Constants::HELP_CATEGORY));
setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY));
setCategoryIcon(QLatin1String(Help::Constants::HELP_CATEGORY_ICON));
}
QWidget *GeneralSettingsPage::createPage(QWidget *parent)

8
src/plugins/help/generalsettingspage.h
View File

@@ -48,16 +48,10 @@ class GeneralSettingsPage : public Core::IOptionsPage
public:
GeneralSettingsPage();
QString id() const;
QString displayName() const;
QString category() const;
QString displayCategory() const;
QIcon categoryIcon() const;
QWidget *createPage(QWidget *parent);
void apply();
void finish();
virtual bool matches(const QString &s) const;
bool matches(const QString &s) const;
signals:
void fontChanged();