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

Help: Use nullptr and fix a few warnings

Browse Source 
Change-Id: I7f7307a765d8755bf96b0cad1210e61df0a0199f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Eike Ziller
2018-04-19 10:47:13 +02:00
parent 0e81d01b2a
commit da18fc1f50
29 changed files with 70 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/help/macwebkithelpviewer.mm
View File

@@ -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;
}
}