Fix compile problems on OS X.
authorGuy Harris <guy@alum.mit.edu>
Tue, 29 Dec 2015 20:40:16 +0000 (12:40 -0800)
committerGuy Harris <guy@alum.mit.edu>
Tue, 29 Dec 2015 23:13:43 +0000 (23:13 +0000)
Apparently, the C++ compilers on the OS X buildbots don't realize that a
reference cannot be null and therefore that there's nothing ambiguous
about QString(NULL) - the NULL must be a "const char *".  Instead, use a
constructed null QString.

Change-Id: Ibc56ea7f84c5e49cf3b1974c3de905bf23e90ff0
Reviewed-on: https://code.wireshark.org/review/12928
Reviewed-by: Guy Harris <guy@alum.mit.edu>
ui/qt/main_window.h

index 6a2032e256099eb38485ec631e68953da708e9cf..f7ffcfbabe8cc04fa2f33d294db84a5dd20fa0ab 100644 (file)
@@ -237,7 +237,7 @@ public slots:
     void updatePreferenceActions();
     void updateRecentActions();
 
-    void setWSWindowTitle(QString title = NULL);
+    void setWSWindowTitle(QString title = QString());
 
     void captureCapturePrepared(capture_session *);
     void captureCaptureUpdateStarted(capture_session *);