Commit 50ccecee authored by Thorbjørn Lindeijer's avatar Thorbjørn Lindeijer
Browse files

Some initialization and removed redundant member variables

Reviewed-by: kh1
parent 86bd6d9d
...@@ -108,18 +108,18 @@ QWidget *GeneralSettingsPage::createPage(QWidget *parent) ...@@ -108,18 +108,18 @@ QWidget *GeneralSettingsPage::createPage(QWidget *parent)
} }
m_ui.homePageLineEdit->setText(m_homePage); m_ui.homePageLineEdit->setText(m_homePage);
m_startOption = engine.customValue(QLatin1String("StartOption"), 2).toInt(); int startOption = engine.customValue(QLatin1String("StartOption"), 2).toInt();
m_ui.helpStartComboBox->setCurrentIndex(m_startOption); m_ui.helpStartComboBox->setCurrentIndex(startOption);
m_helpOption = engine.customValue(QLatin1String("ContextHelpOption"), 0).toInt(); int helpOption = engine.customValue(QLatin1String("ContextHelpOption"), 0).toInt();
m_ui.contextHelpComboBox->setCurrentIndex(m_helpOption); m_ui.contextHelpComboBox->setCurrentIndex(helpOption);
connect(m_ui.currentPageButton, SIGNAL(clicked()), this, SLOT(setCurrentPage())); connect(m_ui.currentPageButton, SIGNAL(clicked()), this, SLOT(setCurrentPage()));
connect(m_ui.blankPageButton, SIGNAL(clicked()), this, SLOT(setBlankPage())); connect(m_ui.blankPageButton, SIGNAL(clicked()), this, SLOT(setBlankPage()));
connect(m_ui.defaultPageButton, SIGNAL(clicked()), this, SLOT(setDefaultPage())); connect(m_ui.defaultPageButton, SIGNAL(clicked()), this, SLOT(setDefaultPage()));
HelpViewer *viewer = CentralWidget::instance()->currentHelpViewer(); HelpViewer *viewer = CentralWidget::instance()->currentHelpViewer();
if (viewer == 0) if (!viewer)
m_ui.currentPageButton->setEnabled(false); m_ui.currentPageButton->setEnabled(false);
m_ui.errorLabel->setVisible(false); m_ui.errorLabel->setVisible(false);
......
...@@ -76,8 +76,6 @@ private: ...@@ -76,8 +76,6 @@ private:
QFont m_font; QFont m_font;
QFontDatabase m_fontDatabase; QFontDatabase m_fontDatabase;
int m_helpOption;
int m_startOption;
QString m_homePage; QString m_homePage;
QString m_searchKeywords; QString m_searchKeywords;
......
...@@ -56,6 +56,7 @@ SearchWidget::SearchWidget() ...@@ -56,6 +56,7 @@ SearchWidget::SearchWidget()
: zoomCount(0) : zoomCount(0)
, m_progress(0) , m_progress(0)
, searchEngine(0) , searchEngine(0)
, resultWidget(0)
{ {
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment