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

8
src/plugins/help/textbrowserhelpviewer.cpp
View File

@@ -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"));