summaryrefslogtreecommitdiff
path: root/src/plugins/help
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-04-19 10:47:13 +0200
committerEike Ziller <eike.ziller@qt.io>2018-04-19 12:07:59 +0000
commitda18fc1f50e07d4bec6f32c0ccf5f08ea10fb634 (patch)
treeb0c8d37fcfa736b591ebe95d046ce66b35e9a486 /src/plugins/help
parent0e81d01b2a1d02fe1a4313716be232cf9f918f05 (diff)
downloadqt-creator-da18fc1f50e07d4bec6f32c0ccf5f08ea10fb634.tar.gz
Help: Use nullptr and fix a few warnings
Change-Id: I7f7307a765d8755bf96b0cad1210e61df0a0199f Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/help')
-rw-r--r--src/plugins/help/centralwidget.cpp2
-rw-r--r--src/plugins/help/centralwidget.h2
-rw-r--r--src/plugins/help/filtersettingspage.cpp4
-rw-r--r--src/plugins/help/generalsettingspage.cpp7
-rw-r--r--src/plugins/help/generalsettingspage.h2
-rw-r--r--src/plugins/help/helpindexfilter.h2
-rw-r--r--src/plugins/help/helpmode.h2
-rw-r--r--src/plugins/help/helpplugin.cpp2
-rw-r--r--src/plugins/help/helpviewer.cpp8
-rw-r--r--src/plugins/help/helpviewer.h4
-rw-r--r--src/plugins/help/helpwidget.cpp2
-rw-r--r--src/plugins/help/helpwidget.h2
-rw-r--r--src/plugins/help/localhelpmanager.cpp12
-rw-r--r--src/plugins/help/localhelpmanager.h2
-rw-r--r--src/plugins/help/macwebkithelpviewer.h4
-rw-r--r--src/plugins/help/macwebkithelpviewer.mm10
-rw-r--r--src/plugins/help/openpagesmanager.cpp10
-rw-r--r--src/plugins/help/openpagesmanager.h10
-rw-r--r--src/plugins/help/openpagesswitcher.cpp2
-rw-r--r--src/plugins/help/openpagesswitcher.h4
-rw-r--r--src/plugins/help/openpageswidget.cpp2
-rw-r--r--src/plugins/help/openpageswidget.h2
-rw-r--r--src/plugins/help/remotehelpfilter.h2
-rw-r--r--src/plugins/help/searchwidget.cpp12
-rw-r--r--src/plugins/help/searchwidget.h14
-rw-r--r--src/plugins/help/textbrowserhelpviewer.cpp8
-rw-r--r--src/plugins/help/textbrowserhelpviewer.h4
-rw-r--r--src/plugins/help/webenginehelpviewer.h6
-rw-r--r--src/plugins/help/xbelsupport.cpp4
29 files changed, 70 insertions, 77 deletions
diff --git a/src/plugins/help/centralwidget.cpp b/src/plugins/help/centralwidget.cpp
index cabc2d5ad2..26e65d16e5 100644
--- a/src/plugins/help/centralwidget.cpp
+++ b/src/plugins/help/centralwidget.cpp
@@ -32,7 +32,7 @@
using namespace Help::Internal;
-static CentralWidget *gStaticCentralWidget = 0;
+static CentralWidget *gStaticCentralWidget = nullptr;
// -- CentralWidget
diff --git a/src/plugins/help/centralwidget.h b/src/plugins/help/centralwidget.h
index 1796088fa9..47343f8c31 100644
--- a/src/plugins/help/centralwidget.h
+++ b/src/plugins/help/centralwidget.h
@@ -38,7 +38,7 @@ class CentralWidget : public HelpWidget
Q_OBJECT
public:
- CentralWidget(const Core::Context &context, QWidget *parent = 0);
+ CentralWidget(const Core::Context &context, QWidget *parent = nullptr);
~CentralWidget();
static CentralWidget *instance();
diff --git a/src/plugins/help/filtersettingspage.cpp b/src/plugins/help/filtersettingspage.cpp
index ba0ba5c9a6..bf9814e45d 100644
--- a/src/plugins/help/filtersettingspage.cpp
+++ b/src/plugins/help/filtersettingspage.cpp
@@ -104,7 +104,7 @@ void FilterSettingsPage::updateFilterPage()
foreach (const QString &attribute, attributes)
new QTreeWidgetItem(m_ui.attributeWidget, QStringList(attribute));
- if (!m_filterMap.keys().isEmpty()) {
+ if (!m_filterMap.isEmpty()) {
m_ui.filterWidget->setCurrentRow(0);
updateAttributes(m_ui.filterWidget->currentItem());
}
@@ -228,7 +228,7 @@ void FilterSettingsPage::finish()
QString FilterSettingsPage::msgFilterLabel(const QString &filter) const
{
- if (m_filterMap.keys().isEmpty())
+ if (m_filterMap.isEmpty())
return tr("No user defined filters available or no filter selected.");
const QStringList &checkedList = m_filterMap.value(filter);
diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp
index 9c5c7458cb..1ede072893 100644
--- a/src/plugins/help/generalsettingspage.cpp
+++ b/src/plugins/help/generalsettingspage.cpp
@@ -50,7 +50,6 @@ using namespace Core;
using namespace Help::Internal;
GeneralSettingsPage::GeneralSettingsPage()
- : m_ui(0)
{
setId("A.General settings");
setDisplayName(tr("General"));
@@ -145,13 +144,13 @@ void GeneralSettingsPage::apply()
const int startOption = m_ui->helpStartComboBox->currentIndex();
if (m_startOption != startOption) {
m_startOption = startOption;
- LocalHelpManager::setStartOption((LocalHelpManager::StartOption)m_startOption);
+ LocalHelpManager::setStartOption(LocalHelpManager::StartOption(m_startOption));
}
const int helpOption = m_ui->contextHelpComboBox->currentIndex();
if (m_contextOption != helpOption) {
m_contextOption = helpOption;
- LocalHelpManager::setContextHelpOption((HelpManager::HelpViewerLocation)m_contextOption);
+ LocalHelpManager::setContextHelpOption(HelpManager::HelpViewerLocation(m_contextOption));
}
const bool close = m_ui->m_returnOnClose->isChecked();
@@ -327,5 +326,5 @@ void GeneralSettingsPage::finish()
if (!m_ui) // page was never shown
return;
delete m_ui;
- m_ui = 0;
+ m_ui = nullptr;
}
diff --git a/src/plugins/help/generalsettingspage.h b/src/plugins/help/generalsettingspage.h
index 7b5fe53146..c77378fbf8 100644
--- a/src/plugins/help/generalsettingspage.h
+++ b/src/plugins/help/generalsettingspage.h
@@ -71,7 +71,7 @@ private:
bool m_returnOnClose;
QPointer<QWidget> m_widget;
- Ui::GeneralSettingsPage *m_ui;
+ Ui::GeneralSettingsPage *m_ui = nullptr;
};
} // Internal
diff --git a/src/plugins/help/helpindexfilter.h b/src/plugins/help/helpindexfilter.h
index c74646d91e..78ad22f27f 100644
--- a/src/plugins/help/helpindexfilter.h
+++ b/src/plugins/help/helpindexfilter.h
@@ -39,7 +39,7 @@ class HelpIndexFilter : public Core::ILocatorFilter
public:
HelpIndexFilter();
- ~HelpIndexFilter();
+ ~HelpIndexFilter() final;
// ILocatorFilter
void prepareSearch(const QString &entry) override;
diff --git a/src/plugins/help/helpmode.h b/src/plugins/help/helpmode.h
index cc3c93222d..7fe08463aa 100644
--- a/src/plugins/help/helpmode.h
+++ b/src/plugins/help/helpmode.h
@@ -36,7 +36,7 @@ namespace Internal {
class HelpMode : public Core::IMode
{
public:
- explicit HelpMode(QObject *parent = 0);
+ explicit HelpMode(QObject *parent = nullptr);
};
} // namespace Internal
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 091a845686..7afa1ca1e8 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -740,7 +740,7 @@ void HelpPluginPrivate::handleHelpRequest(const QUrl &url, HelpManager::HelpView
class DialogClosingOnEscape : public QDialog
{
public:
- DialogClosingOnEscape(QWidget *parent = 0) : QDialog(parent) {}
+ DialogClosingOnEscape(QWidget *parent = nullptr) : QDialog(parent) {}
bool event(QEvent *event)
{
if (event->type() == QEvent::ShortcutOverride) {
diff --git a/src/plugins/help/helpviewer.cpp b/src/plugins/help/helpviewer.cpp
index 7a553000b2..e2cac11fc9 100644
--- a/src/plugins/help/helpviewer.cpp
+++ b/src/plugins/help/helpviewer.cpp
@@ -46,7 +46,9 @@ using namespace Help::Internal;
struct ExtensionMap {
const char *extension;
const char *mimeType;
-} extensionMap[] = {
+};
+
+static ExtensionMap extensionMap[] = {
{".bmp", "image/bmp"},
{".css", "text/css"},
{".gif", "image/gif"},
@@ -76,8 +78,8 @@ struct ExtensionMap {
{".xhtml", "application/xhtml+xml"},
{".wml", "text/vnd.wap.wml"},
{".wmlc", "application/vnd.wap.wmlc"},
- {"about:blank", 0},
- {0, 0}
+ {"about:blank", nullptr},
+ {nullptr, nullptr}
};
HelpViewer::HelpViewer(QWidget *parent)
diff --git a/src/plugins/help/helpviewer.h b/src/plugins/help/helpviewer.h
index c98e8dbbfb..28a2312e46 100644
--- a/src/plugins/help/helpviewer.h
+++ b/src/plugins/help/helpviewer.h
@@ -48,7 +48,7 @@ public:
};
Q_DECLARE_FLAGS(Actions, Action)
- explicit HelpViewer(QWidget *parent = 0);
+ explicit HelpViewer(QWidget *parent = nullptr);
~HelpViewer();
virtual QFont viewerFont() const = 0;
@@ -75,7 +75,7 @@ public:
bool isActionVisible(Action action);
virtual bool findText(const QString &text, Core::FindFlags flags,
- bool incremental, bool fromSearch, bool *wrapped = 0) = 0;
+ bool incremental, bool fromSearch, bool *wrapped = nullptr) = 0;
bool handleForwardBackwardMouseButtons(QMouseEvent *e);
diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp
index 8a0c4f943f..0e092e0d72 100644
--- a/src/plugins/help/helpwidget.cpp
+++ b/src/plugins/help/helpwidget.cpp
@@ -696,7 +696,7 @@ void HelpWidget::highlightSearchTerms()
HelpViewer *viewer = qobject_cast<HelpViewer *>(sender());
QTC_ASSERT(viewer, return);
foreach (const QString& term, m_searchTerms)
- viewer->findText(term, 0, false, true);
+ viewer->findText(term, nullptr, false, true);
m_searchTerms.clear();
}
diff --git a/src/plugins/help/helpwidget.h b/src/plugins/help/helpwidget.h
index cd1fffa424..7afd555f96 100644
--- a/src/plugins/help/helpwidget.h
+++ b/src/plugins/help/helpwidget.h
@@ -58,7 +58,7 @@ public:
ExternalWindow
};
- HelpWidget(const Core::Context &context, WidgetStyle style, QWidget *parent = 0);
+ HelpWidget(const Core::Context &context, WidgetStyle style, QWidget *parent = nullptr);
~HelpWidget();
HelpViewer *currentViewer() const;
diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp
index daeaf5eb56..5142a72877 100644
--- a/src/plugins/help/localhelpmanager.cpp
+++ b/src/plugins/help/localhelpmanager.cpp
@@ -42,18 +42,18 @@
using namespace Help::Internal;
-static LocalHelpManager *m_instance = 0;
+static LocalHelpManager *m_instance = nullptr;
bool LocalHelpManager::m_guiNeedsSetup = true;
bool LocalHelpManager::m_needsCollectionFile = true;
QMutex LocalHelpManager::m_guiMutex;
-QHelpEngine* LocalHelpManager::m_guiEngine = 0;
+QHelpEngine* LocalHelpManager::m_guiEngine = nullptr;
QMutex LocalHelpManager::m_bkmarkMutex;
-BookmarkManager* LocalHelpManager::m_bookmarkManager = 0;
+BookmarkManager* LocalHelpManager::m_bookmarkManager = nullptr;
-QStandardItemModel *LocalHelpManager::m_filterModel = 0;
+QStandardItemModel *LocalHelpManager::m_filterModel = nullptr;
QString LocalHelpManager::m_currentFilter = QString();
int LocalHelpManager::m_currentFilterIndex = -1;
@@ -115,11 +115,11 @@ LocalHelpManager::~LocalHelpManager()
if (m_bookmarkManager) {
m_bookmarkManager->saveBookmarks();
delete m_bookmarkManager;
- m_bookmarkManager = 0;
+ m_bookmarkManager = nullptr;
}
delete m_guiEngine;
- m_guiEngine = 0;
+ m_guiEngine = nullptr;
}
LocalHelpManager *LocalHelpManager::instance()
diff --git a/src/plugins/help/localhelpmanager.h b/src/plugins/help/localhelpmanager.h
index 39ace0168b..4846c74231 100644
--- a/src/plugins/help/localhelpmanager.h
+++ b/src/plugins/help/localhelpmanager.h
@@ -57,7 +57,7 @@ public:
ShowLastPages = 2,
};
- LocalHelpManager(QObject *parent = 0);
+ LocalHelpManager(QObject *parent = nullptr);
~LocalHelpManager();
static LocalHelpManager *instance();
diff --git a/src/plugins/help/macwebkithelpviewer.h b/src/plugins/help/macwebkithelpviewer.h
index 643a468880..d98bc4ddfb 100644
--- a/src/plugins/help/macwebkithelpviewer.h
+++ b/src/plugins/help/macwebkithelpviewer.h
@@ -67,7 +67,7 @@ class MacWebKitHelpViewer : public HelpViewer
Q_OBJECT
public:
- explicit MacWebKitHelpViewer(QWidget *parent = 0);
+ explicit MacWebKitHelpViewer(QWidget *parent = nullptr);
~MacWebKitHelpViewer();
QFont viewerFont() const;
@@ -93,7 +93,7 @@ public:
void setActionVisible(bool visible);
bool findText(const QString &text, Core::FindFlags flags,
- bool incremental, bool fromSearch, bool *wrapped = 0);
+ bool incremental, bool fromSearch, bool *wrapped = nullptr);
MacWebKitHelpWidget *widget() const { return m_widget; }
diff --git a/src/plugins/help/macwebkithelpviewer.mm b/src/plugins/help/macwebkithelpviewer.mm
index 49744104e4..1a7d561aee 100644
--- a/src/plugins/help/macwebkithelpviewer.mm
+++ b/src/plugins/help/macwebkithelpviewer.mm
@@ -427,7 +427,7 @@ public:
// #pragma mark -- MacWebKitHelpWidget
MacWebKitHelpWidget::MacWebKitHelpWidget(MacWebKitHelpViewer *parent)
- : QMacCocoaViewContainer(0, parent),
+ : QMacCocoaViewContainer(nullptr, parent),
d(new MacWebKitHelpWidgetPrivate(parent))
{
d->m_toolTipTimer.setSingleShot(true);
@@ -465,7 +465,7 @@ WebView *MacWebKitHelpWidget::webView() const
void MacWebKitHelpWidget::startToolTipTimer(const QPoint &pos, const QString &text)
{
- int delay = style()->styleHint(QStyle::SH_ToolTip_WakeUpDelay, 0, this, 0);
+ int delay = style()->styleHint(QStyle::SH_ToolTip_WakeUpDelay, nullptr, this, nullptr);
d->m_toolTipPos = pos;
d->m_toolTipText = text;
d->m_toolTipTimer.start(delay);
@@ -558,21 +558,21 @@ void MacWebKitHelpViewer::setViewerFont(const QFont &font)
void MacWebKitHelpViewer::scaleUp()
{
@autoreleasepool {
- m_widget->webView().textSizeMultiplier += 0.1;
+ m_widget->webView().textSizeMultiplier += 0.1f;
}
}
void MacWebKitHelpViewer::scaleDown()
{
@autoreleasepool {
- m_widget->webView().textSizeMultiplier = qMax(0.1, m_widget->webView().textSizeMultiplier - 0.1);
+ m_widget->webView().textSizeMultiplier = qMax(0.1f, m_widget->webView().textSizeMultiplier - 0.1f);
}
}
void MacWebKitHelpViewer::resetScale()
{
@autoreleasepool {
- m_widget->webView().textSizeMultiplier = 1.0;
+ m_widget->webView().textSizeMultiplier = 1.0f;
}
}
diff --git a/src/plugins/help/openpagesmanager.cpp b/src/plugins/help/openpagesmanager.cpp
index 2fd78a57bc..63d9a5cda0 100644
--- a/src/plugins/help/openpagesmanager.cpp
+++ b/src/plugins/help/openpagesmanager.cpp
@@ -46,16 +46,12 @@
using namespace Core;
using namespace Help::Internal;
-OpenPagesManager *OpenPagesManager::m_instance = 0;
+OpenPagesManager *OpenPagesManager::m_instance = nullptr;
// -- OpenPagesManager
OpenPagesManager::OpenPagesManager(QObject *parent)
: QObject(parent)
- , m_comboBox(0)
- , m_model(0)
- , m_openPagesWidget(0)
- , m_openPagesSwitcher(0)
{
Q_ASSERT(!m_instance);
@@ -79,7 +75,7 @@ OpenPagesManager::OpenPagesManager(QObject *parent)
OpenPagesManager ::~OpenPagesManager()
{
- m_instance = 0;
+ m_instance = nullptr;
delete m_openPagesSwitcher;
}
@@ -180,7 +176,7 @@ HelpViewer *OpenPagesManager::createPage()
HelpViewer *OpenPagesManager::createPage(const QUrl &url)
{
if (url.isValid() && HelpViewer::launchWithExternalApp(url))
- return 0;
+ return nullptr;
m_model->addPage(url);
diff --git a/src/plugins/help/openpagesmanager.h b/src/plugins/help/openpagesmanager.h
index 203cb37943..6c85e08675 100644
--- a/src/plugins/help/openpagesmanager.h
+++ b/src/plugins/help/openpagesmanager.h
@@ -47,7 +47,7 @@ class OpenPagesManager : public QObject
Q_OBJECT
public:
- OpenPagesManager(QObject *parent = 0);
+ OpenPagesManager(QObject *parent = nullptr);
~OpenPagesManager();
static OpenPagesManager &instance();
@@ -79,10 +79,10 @@ private:
void showTwicherOrSelectPage() const;
void openPagesContextMenu(const QPoint &point);
- QComboBox *m_comboBox;
- OpenPagesModel *m_model;
- mutable OpenPagesWidget *m_openPagesWidget;
- OpenPagesSwitcher *m_openPagesSwitcher;
+ QComboBox *m_comboBox = nullptr;
+ OpenPagesModel *m_model = nullptr;
+ mutable OpenPagesWidget *m_openPagesWidget = nullptr;
+ OpenPagesSwitcher *m_openPagesSwitcher = nullptr;
static OpenPagesManager *m_instance;
};
diff --git a/src/plugins/help/openpagesswitcher.cpp b/src/plugins/help/openpagesswitcher.cpp
index 0fb5b15140..5f5b80f944 100644
--- a/src/plugins/help/openpagesswitcher.cpp
+++ b/src/plugins/help/openpagesswitcher.cpp
@@ -42,7 +42,7 @@ const int gWidth = 300;
const int gHeight = 200;
OpenPagesSwitcher::OpenPagesSwitcher(OpenPagesModel *model)
- : QFrame(0, Qt::Popup)
+ : QFrame(nullptr, Qt::Popup)
, m_openPagesModel(model)
{
resize(gWidth, gHeight);
diff --git a/src/plugins/help/openpagesswitcher.h b/src/plugins/help/openpagesswitcher.h
index 2903e486ad..350b352d78 100644
--- a/src/plugins/help/openpagesswitcher.h
+++ b/src/plugins/help/openpagesswitcher.h
@@ -61,8 +61,8 @@ private:
void selectPageUpDown(int summand);
private:
- OpenPagesModel *m_openPagesModel;
- OpenPagesWidget *m_openPagesWidget;
+ OpenPagesModel *m_openPagesModel = nullptr;
+ OpenPagesWidget *m_openPagesWidget = nullptr;
};
} // namespace Internal
diff --git a/src/plugins/help/openpageswidget.cpp b/src/plugins/help/openpageswidget.cpp
index a6ee23bda0..0878b03fd8 100644
--- a/src/plugins/help/openpageswidget.cpp
+++ b/src/plugins/help/openpageswidget.cpp
@@ -116,7 +116,7 @@ void OpenPagesWidget::handleActivated(const QModelIndex &index)
// work around a bug in itemviews where the delegate wouldn't get the QStyle::State_MouseOver
QWidget *vp = viewport();
const QPoint &cursorPos = QCursor::pos();
- QMouseEvent e(QEvent::MouseMove, vp->mapFromGlobal(cursorPos), cursorPos, Qt::NoButton, 0, 0);
+ QMouseEvent e(QEvent::MouseMove, vp->mapFromGlobal(cursorPos), cursorPos, Qt::NoButton, nullptr, nullptr);
QCoreApplication::sendEvent(vp, &e);
}
}
diff --git a/src/plugins/help/openpageswidget.h b/src/plugins/help/openpageswidget.h
index 33686df2ea..80b957bd2c 100644
--- a/src/plugins/help/openpageswidget.h
+++ b/src/plugins/help/openpageswidget.h
@@ -37,7 +37,7 @@ class OpenPagesWidget : public Core::OpenDocumentsTreeView
Q_OBJECT
public:
- explicit OpenPagesWidget(OpenPagesModel *model, QWidget *parent = 0);
+ explicit OpenPagesWidget(OpenPagesModel *model, QWidget *parent = nullptr);
~OpenPagesWidget();
void selectCurrentPage();
diff --git a/src/plugins/help/remotehelpfilter.h b/src/plugins/help/remotehelpfilter.h
index 146b537ec2..550c67fc86 100644
--- a/src/plugins/help/remotehelpfilter.h
+++ b/src/plugins/help/remotehelpfilter.h
@@ -40,7 +40,7 @@ class RemoteHelpFilter : public Core::ILocatorFilter
Q_OBJECT
public:
RemoteHelpFilter();
- ~RemoteHelpFilter();
+ ~RemoteHelpFilter() final;
// ILocatorFilter
QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future,
diff --git a/src/plugins/help/searchwidget.cpp b/src/plugins/help/searchwidget.cpp
index c3bcd1c314..a605e0958a 100644
--- a/src/plugins/help/searchwidget.cpp
+++ b/src/plugins/help/searchwidget.cpp
@@ -56,10 +56,6 @@
using namespace Help::Internal;
SearchWidget::SearchWidget()
- : zoomCount(0)
- , m_progress(0)
- , searchEngine(0)
- , resultWidget(0)
{
}
@@ -226,7 +222,7 @@ void SearchWidget::indexingFinished()
m_progress->reportFinished();
delete m_progress;
- m_progress = NULL;
+ m_progress = nullptr;
m_queryWidget->show();
m_indexingDocumentationLabel->hide();
@@ -261,9 +257,9 @@ void SearchWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent)
if (!browser->rect().contains(point, true))
return;
- QAction *openLink = 0;
- QAction *openLinkInNewTab = 0;
- QAction *copyAnchorAction = 0;
+ QAction *openLink = nullptr;
+ QAction *openLinkInNewTab = nullptr;
+ QAction *copyAnchorAction = nullptr;
QMenu menu;
QUrl link = browser->anchorAt(point);
diff --git a/src/plugins/help/searchwidget.h b/src/plugins/help/searchwidget.h
index 6464099d5a..5f4e5c4fc6 100644
--- a/src/plugins/help/searchwidget.h
+++ b/src/plugins/help/searchwidget.h
@@ -89,16 +89,16 @@ private:
void contextMenuEvent(QContextMenuEvent *contextMenuEvent);
QStringList currentSearchTerms() const;
- int zoomCount;
+ int zoomCount = 0;
QFutureWatcher<void> m_watcher;
- QFutureInterface<void> *m_progress;
+ QFutureInterface<void> *m_progress = nullptr;
- QHelpSearchEngine *searchEngine;
- QHelpSearchResultWidget *resultWidget;
- QHelpSearchQueryWidget *m_queryWidget;
- QWidget *m_indexingDocumentationLabel;
- Utils::ProgressIndicator *m_indexingIndicator;
+ QHelpSearchEngine *searchEngine = nullptr;
+ QHelpSearchResultWidget *resultWidget = nullptr;
+ QHelpSearchQueryWidget *m_queryWidget = nullptr;
+ QWidget *m_indexingDocumentationLabel = nullptr;
+ Utils::ProgressIndicator *m_indexingIndicator = nullptr;
};
} // namespace Internal
diff --git a/src/plugins/help/textbrowserhelpviewer.cpp b/src/plugins/help/textbrowserhelpviewer.cpp
index 34e821e524..930df58207 100644
--- a/src/plugins/help/textbrowserhelpviewer.cpp
+++ b/src/plugins/help/textbrowserhelpviewer.cpp
@@ -121,12 +121,12 @@ void TextBrowserHelpViewer::setScale(qreal scale)
scale = 10;
else if (scale < -5)
scale = -5;
- int diff = (int)scale - m_textBrowser->zoomCount;
+ int diff = int(scale) - m_textBrowser->zoomCount;
if (diff > 0)
m_textBrowser->zoomIn(diff);
else if (diff < 0)
m_textBrowser->zoomOut(-diff);
- m_textBrowser->zoomCount = (int)scale;
+ m_textBrowser->zoomCount = int(scale);
m_textBrowser->forceFont = false;
}
@@ -354,9 +354,9 @@ void TextBrowserHelpWidget::scaleDown()
void TextBrowserHelpWidget::contextMenuEvent(QContextMenuEvent *event)
{
- QMenu menu("", 0);
+ QMenu menu("", nullptr);
- QAction *copyAnchorAction = 0;
+ QAction *copyAnchorAction = nullptr;
const QUrl link(linkAt(event->pos()));
if (!link.isEmpty() && link.isValid()) {
QAction *action = menu.addAction(tr("Open Link"));
diff --git a/src/plugins/help/textbrowserhelpviewer.h b/src/plugins/help/textbrowserhelpviewer.h
index 068baee028..38b3180983 100644
--- a/src/plugins/help/textbrowserhelpviewer.h
+++ b/src/plugins/help/textbrowserhelpviewer.h
@@ -41,7 +41,7 @@ class TextBrowserHelpViewer : public HelpViewer
Q_OBJECT
public:
- explicit TextBrowserHelpViewer(QWidget *parent = 0);
+ explicit TextBrowserHelpViewer(QWidget *parent = nullptr);
~TextBrowserHelpViewer();
QFont viewerFont() const;
@@ -64,7 +64,7 @@ public:
void addForwardHistoryItems(QMenu *forwardMenu);
bool findText(const QString &text, Core::FindFlags flags,
- bool incremental, bool fromSearch, bool *wrapped = 0);
+ bool incremental, bool fromSearch, bool *wrapped = nullptr);
void scaleUp();
void scaleDown();
diff --git a/src/plugins/help/webenginehelpviewer.h b/src/plugins/help/webenginehelpviewer.h
index 390e90ea65..e060c8d718 100644
--- a/src/plugins/help/webenginehelpviewer.h
+++ b/src/plugins/help/webenginehelpviewer.h
@@ -38,14 +38,14 @@ class WebEngineHelpViewer;
class HelpUrlSchemeHandler : public QWebEngineUrlSchemeHandler
{
public:
- explicit HelpUrlSchemeHandler(QObject *parent = 0);
+ explicit HelpUrlSchemeHandler(QObject *parent = nullptr);
void requestStarted(QWebEngineUrlRequestJob *job) override;
};
class WebEngineHelpPage : public QWebEnginePage
{
public:
- explicit WebEngineHelpPage(QObject *parent = 0);
+ explicit WebEngineHelpPage(QObject *parent = nullptr);
#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
QWebEnginePage *createWindow(QWebEnginePage::WebWindowType) override;
#endif
@@ -67,7 +67,7 @@ class WebEngineHelpViewer : public HelpViewer
{
Q_OBJECT
public:
- explicit WebEngineHelpViewer(QWidget *parent = 0);
+ explicit WebEngineHelpViewer(QWidget *parent = nullptr);
QFont viewerFont() const override;
void setViewerFont(const QFont &font) override;
diff --git a/src/plugins/help/xbelsupport.cpp b/src/plugins/help/xbelsupport.cpp
index ab9db674ad..ea4313f5bc 100644
--- a/src/plugins/help/xbelsupport.cpp
+++ b/src/plugins/help/xbelsupport.cpp
@@ -133,9 +133,9 @@ void XbelReader::readXBEL()
if (isStartElement()) {
if (name() == "folder")
- readFolder(0);
+ readFolder(nullptr);
else if (name() == "bookmark")
- readBookmark(0);
+ readBookmark(nullptr);
else
readUnknownElement();
}