summaryrefslogtreecommitdiff
path: root/ui/qt/main_window.h
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-09-11 11:13:23 -0700
committerGerald Combs <gerald@wireshark.org>2015-09-11 20:37:09 +0000
commitb4e972b7297b8835cacfc7ded7170de96140ce37 (patch)
tree7406942cca3cfbc0af3dc2b900b917cb6fe98053 /ui/qt/main_window.h
parenteca15bf5ae681312e3e94eb7d1aca67e9c7c4b90 (diff)
downloadwireshark-b4e972b7297b8835cacfc7ded7170de96140ce37.tar.gz
Fix a bunch of leaks found by Valgrind.
Change-Id: I8862ed15d354aee487bacd80ab5fb4918423287e Reviewed-on: https://code.wireshark.org/review/10487 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/main_window.h')
-rw-r--r--ui/qt/main_window.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h
index e36969b0ed..365648501d 100644
--- a/ui/qt/main_window.h
+++ b/ui/qt/main_window.h
@@ -169,7 +169,7 @@ private:
void exportDissections(export_type_e export_type);
void fileAddExtension(QString &file_name, int file_type, bool compressed);
- bool testCaptureFileClose(bool from_quit = false, QString& before_what = *new QString());
+ bool testCaptureFileClose(bool from_quit = false, QString before_what = QString());
void captureStop();
void initMainToolbarIcons();
@@ -215,9 +215,9 @@ public slots:
* @return True on success, false on failure.
*/
// XXX We might want to return a cf_read_status_t or a CaptureFile.
- bool openCaptureFile(QString& cf_path, QString& display_filter, unsigned int type);
- bool openCaptureFile(QString& cf_path = *new QString(), QString& display_filter = *new QString()) { return openCaptureFile(cf_path, display_filter, WTAP_TYPE_AUTO); }
- void filterPackets(QString& new_filter = *new QString(), bool force = false);
+ bool openCaptureFile(QString cf_path, QString display_filter, unsigned int type);
+ bool openCaptureFile(QString cf_path = QString(), QString display_filter = QString()) { return openCaptureFile(cf_path, display_filter, WTAP_TYPE_AUTO); }
+ void filterPackets(QString new_filter = QString(), bool force = false);
void updateForUnsavedChanges();
void layoutPanes();
void applyRecentPaneGeometry();