Rename "ws_version_info.h", also .c

[metze/wireshark/wip.git] / ui / qt / main_window.cpp

diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 906c5bc981b5bca4fae2e06d28c36ec209ee23c7..eeab9fa92f71790c2824883cf67e38800983c3bd 100644 (file)
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -33,7 +33,7 @@ DIAG_ON(frame-larger-than=)
 #include "epan/dissector_filters.h"
 #include <epan/epan_dissect.h>
 #include <wsutil/filesystem.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #include <epan/prefs.h>
 #include <epan/stats_tree_priv.h>
 #include <epan/plugin_if.h>
@@ -409,8 +409,14 @@ MainWindow::MainWindow(QWidget *parent) :
 
     main_ui_->addressEditorFrame->hide();
     main_ui_->columnEditorFrame->hide();
+    connect(main_ui_->columnEditorFrame, SIGNAL(pushFilterSyntaxStatus(const QString&)),
+            main_ui_->statusBar, SLOT(pushTemporaryStatus(const QString&)));
     main_ui_->preferenceEditorFrame->hide();
+    connect(main_ui_->preferenceEditorFrame, SIGNAL(pushFilterSyntaxStatus(const QString&)),
+            main_ui_->statusBar, SLOT(pushTemporaryStatus(const QString&)));
     main_ui_->filterExpressionFrame->hide();
+    connect(main_ui_->filterExpressionFrame, SIGNAL(pushFilterSyntaxStatus(const QString&)),
+            main_ui_->statusBar, SLOT(pushTemporaryStatus(const QString&)));
 
 #ifndef HAVE_LIBPCAP
     main_ui_->menuCapture->setEnabled(false);
@@ -730,6 +736,16 @@ MainWindow::MainWindow(QWidget *parent) :
 
 MainWindow::~MainWindow()
 {
+    disconnect(main_ui_->mainStack, 0, 0, 0);
+
+#ifndef Q_OS_MAC
+    // file_set_dialog_ is a subclass of GeometryStateDialog.
+    // For reasons described in geometry_state_dialog.h no parent is set when
+    // instantiating the dialog and as a result the object is not automatically
+    // freed by its parent. Free it here explicitly to avoid leak and numerous
+    // Valgrind complaints.
+    delete file_set_dialog_;
+#endif
     delete main_ui_;
 }