From 72f3b9f74cdf6dbc880c02c5af0315c323c5b7ea Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 17 Sep 2015 12:32:28 -0700 Subject: [PATCH] =?UTF-8?q?Fix=20some=20signal=20=E2=86=92=20slot=20mismat?= =?UTF-8?q?ches.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update some signal definitions to match gb4e972b. Bug: 11524 Change-Id: I0d98a4e83c791221962943c3dec8f0d4296d3027 Reviewed-on: https://code.wireshark.org/review/10557 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- ui/qt/follow_stream_dialog.h | 2 +- ui/qt/main_window_slots.cpp | 10 +++++----- ui/qt/sctp_all_assocs_dialog.h | 4 ++-- ui/qt/sctp_assoc_analyse_dialog.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ui/qt/follow_stream_dialog.h b/ui/qt/follow_stream_dialog.h index aa49b16537..86041e7192 100644 --- a/ui/qt/follow_stream_dialog.h +++ b/ui/qt/follow_stream_dialog.h @@ -97,7 +97,7 @@ private slots: void on_buttonBox_rejected(); signals: - void updateFilter(QString &filter, bool force); + void updateFilter(QString filter, bool force); void goToPacket(int packet_num); private: diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index dfcff45185..624d5a57e2 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -2528,7 +2528,7 @@ void MainWindow::on_actionAnalyzeReloadLuaPlugins_triggered() void MainWindow::openFollowStreamDialog(follow_type_t type) { FollowStreamDialog *fsd = new FollowStreamDialog(*this, capture_file_, type); - connect(fsd, SIGNAL(updateFilter(QString&, bool)), this, SLOT(filterPackets(QString&, bool))); + connect(fsd, SIGNAL(updateFilter(QString, bool)), this, SLOT(filterPackets(QString, bool))); connect(fsd, SIGNAL(goToPacket(int)), packet_list_, SLOT(goToPacket(int))); fsd->show(); @@ -2553,8 +2553,8 @@ void MainWindow::on_actionAnalyzeFollowSSLStream_triggered() void MainWindow::openSCTPAllAssocsDialog() { SCTPAllAssocsDialog *sctp_dialog = new SCTPAllAssocsDialog(this, capture_file_.capFile()); - connect(sctp_dialog, SIGNAL(filterPackets(QString&,bool)), - this, SLOT(filterPackets(QString&,bool))); + connect(sctp_dialog, SIGNAL(filterPackets(QString,bool)), + this, SLOT(filterPackets(QString,bool))); connect(this, SIGNAL(setCaptureFile(capture_file*)), sctp_dialog, SLOT(setCaptureFile(capture_file*))); sctp_dialog->fillTable(); @@ -2580,8 +2580,8 @@ void MainWindow::on_actionSCTPShowAllAssociations_triggered() void MainWindow::on_actionSCTPAnalyseThisAssociation_triggered() { SCTPAssocAnalyseDialog *sctp_analyse = new SCTPAssocAnalyseDialog(this, NULL, capture_file_.capFile()); - connect(sctp_analyse, SIGNAL(filterPackets(QString&,bool)), - this, SLOT(filterPackets(QString&,bool))); + connect(sctp_analyse, SIGNAL(filterPackets(QString,bool)), + this, SLOT(filterPackets(QString,bool))); if (sctp_analyse->isMinimized() == true) { diff --git a/ui/qt/sctp_all_assocs_dialog.h b/ui/qt/sctp_all_assocs_dialog.h index c59a3b594b..687cada32a 100644 --- a/ui/qt/sctp_all_assocs_dialog.h +++ b/ui/qt/sctp_all_assocs_dialog.h @@ -48,7 +48,7 @@ public: ~SCTPAllAssocsDialog(); void fillTable(); - sctp_assoc_info_t* getSelectedAssoc() { return selected_assoc; }; + sctp_assoc_info_t* getSelectedAssoc() { return selected_assoc; } sctp_assoc_info_t* findSelectedAssoc(); public slots: @@ -67,7 +67,7 @@ private: signals: - void filterPackets(QString& new_filter, bool force); + void filterPackets(QString new_filter, bool force); }; #endif // SCTP_ALL_ASSOCS_DIALOG_H diff --git a/ui/qt/sctp_assoc_analyse_dialog.h b/ui/qt/sctp_assoc_analyse_dialog.h index 414f4943d2..36cd725a2c 100644 --- a/ui/qt/sctp_assoc_analyse_dialog.h +++ b/ui/qt/sctp_assoc_analyse_dialog.h @@ -81,7 +81,7 @@ private: signals: - void filterPackets(QString& new_filter, bool force); + void filterPackets(QString new_filter, bool force); }; #endif // SCTP_ASSOC_ANALYSE_DIALOG_H