osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

qt: use NULL instead of Q_NULLPTR 

Q_NULLPTR is not defined in Qt4

Change-Id: I0dd5444c6c019b7e8f1a346d9e12432d9b306d8a
Reviewed-on: https://code.wireshark.org/review/15197
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
This commit is contained in:
Martin Kaiser 2016-04-30 17:19:59 +02:00
parent b83c39e029
commit 80e554659e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/qt/overlay_scroll_bar.cpp
View File

@ -49,7 +49,7 @@ class OsbProxyStyle : public QProxyStyle
public:
// Hack to keep the scrollbar from disappearing on OS X. We should
// handle this more gracefully.
virtual int styleHint(StyleHint hint, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR, QStyleHintReturn *returnData = Q_NULLPTR) const {
virtual int styleHint(StyleHint hint, const QStyleOption *option = NULL, const QWidget *widget = NULL, QStyleHintReturn *returnData = NULL) const {
if (hint == SH_ScrollBar_Transient) return false;
return QProxyStyle::styleHint(hint, option, widget, returnData);