From 89d20924c805a9acd04d0a2c8786132ed55b05f4 Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Mon, 29 Mar 2010 14:00:41 +0200
Subject: [PATCH] Add some more constants and make use where possible. More to
come.
---
src/plugins/help/generalsettingspage.cpp | 6 +++---
src/plugins/help/helpconstants.h | 10 ++++++++++
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp
index 0df4288670e..defe4dfb640 100644
--- a/src/plugins/help/generalsettingspage.cpp
+++ b/src/plugins/help/generalsettingspage.cpp
@@ -106,7 +106,7 @@ QWidget *GeneralSettingsPage::createPage(QWidget *parent)
m_homePage = engine.customValue(QLatin1String("HomePage"), QString()).toString();
if (m_homePage.isEmpty()) {
m_homePage = engine.customValue(QLatin1String("DefaultHomePage"),
- QLatin1String("about:blank")).toString();
+ Help::Constants::AboutBlank).toString();
}
m_ui.homePageLineEdit->setText(m_homePage);
@@ -178,7 +178,7 @@ void GeneralSettingsPage::apply()
QString homePage = m_ui.homePageLineEdit->text();
if (homePage.isEmpty())
- homePage = QLatin1String("about:blank");
+ homePage = Help::Constants::AboutBlank;
engine->setCustomValue(QLatin1String("HomePage"), homePage);
const int startOption = m_ui.helpStartComboBox->currentIndex();
@@ -199,7 +199,7 @@ void GeneralSettingsPage::setCurrentPage()
void GeneralSettingsPage::setBlankPage()
{
- m_ui.homePageLineEdit->setText(QLatin1String("about:blank"));
+ m_ui.homePageLineEdit->setText(Help::Constants::AboutBlank);
}
void GeneralSettingsPage::setDefaultPage()
diff --git a/src/plugins/help/helpconstants.h b/src/plugins/help/helpconstants.h
index e9910e830f9..00b8c322a46 100644
--- a/src/plugins/help/helpconstants.h
+++ b/src/plugins/help/helpconstants.h
@@ -35,6 +35,16 @@
namespace Help {
namespace Constants {
+enum {
+ ShowHomePage = 0,
+ ShowBlankPage = 1,
+ ShowLastPages = 2
+};
+
+static const QLatin1String ListSeparator("|");
+static const QLatin1String DefaultZoomFactor("0.0");
+static const QLatin1String AboutBlank("about:blank");
+
const int P_MODE_HELP = 70;
const char * const ID_MODE_HELP = "Help";
const char * const HELP_CATEGORY = "H.Help";
--
GitLab