diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2016-04-30 17:19:59 +0200 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2016-04-30 15:24:50 +0000 |
| commit | 80e554659e17be8ab7fbe1eb3091b0445dc8cc0b (patch) | |
| tree | 0982c884801da4d9581ccac5b24a5911597101ee /ui | |
| parent | b83c39e02942adf10440d91c0eafe4655642526d (diff) | |
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>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/overlay_scroll_bar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qt/overlay_scroll_bar.cpp b/ui/qt/overlay_scroll_bar.cpp index 51d077a160..215a2aa54b 100644 --- a/ui/qt/overlay_scroll_bar.cpp +++ b/ui/qt/overlay_scroll_bar.cpp @@ -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); |