osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix some signal → slot mismatches. 

Update some signal definitions to match gb4e972b.

Bug: 11524
Change-Id: I0d98a4e83c791221962943c3dec8f0d4296d3027
Reviewed-on: https://code.wireshark.org/review/10557
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2015-09-17 12:32:28 -07:00
parent 43b77aeebf
commit 72f3b9f74c
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/qt/follow_stream_dialog.h
View File

@ -97,7 +97,7 @@ private slots:
void on_buttonBox_rejected(); void on_buttonBox_rejected();
signals: signals:
void updateFilter(QString &filter, bool force); void updateFilter(QString filter, bool force);
void goToPacket(int packet_num); void goToPacket(int packet_num);
private: private:

10
ui/qt/main_window_slots.cpp
View File

@ -2528,7 +2528,7 @@ void MainWindow::on_actionAnalyzeReloadLuaPlugins_triggered()
void MainWindow::openFollowStreamDialog(follow_type_t type) { void MainWindow::openFollowStreamDialog(follow_type_t type) {
FollowStreamDialog *fsd = new FollowStreamDialog(*this, capture_file_, 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))); connect(fsd, SIGNAL(goToPacket(int)), packet_list_, SLOT(goToPacket(int)));
fsd->show(); fsd->show();
@ -2553,8 +2553,8 @@ void MainWindow::on_actionAnalyzeFollowSSLStream_triggered()
void MainWindow::openSCTPAllAssocsDialog() void MainWindow::openSCTPAllAssocsDialog()
{ {
SCTPAllAssocsDialog *sctp_dialog = new SCTPAllAssocsDialog(this, capture_file_.capFile()); SCTPAllAssocsDialog *sctp_dialog = new SCTPAllAssocsDialog(this, capture_file_.capFile());
connect(sctp_dialog, SIGNAL(filterPackets(QString&,bool)), connect(sctp_dialog, SIGNAL(filterPackets(QString,bool)),
this, SLOT(filterPackets(QString&,bool))); this, SLOT(filterPackets(QString,bool)));
connect(this, SIGNAL(setCaptureFile(capture_file*)), connect(this, SIGNAL(setCaptureFile(capture_file*)),
sctp_dialog, SLOT(setCaptureFile(capture_file*))); sctp_dialog, SLOT(setCaptureFile(capture_file*)));
sctp_dialog->fillTable(); sctp_dialog->fillTable();
@ -2580,8 +2580,8 @@ void MainWindow::on_actionSCTPShowAllAssociations_triggered()
void MainWindow::on_actionSCTPAnalyseThisAssociation_triggered() void MainWindow::on_actionSCTPAnalyseThisAssociation_triggered()
{ {
SCTPAssocAnalyseDialog *sctp_analyse = new SCTPAssocAnalyseDialog(this, NULL, capture_file_.capFile()); SCTPAssocAnalyseDialog *sctp_analyse = new SCTPAssocAnalyseDialog(this, NULL, capture_file_.capFile());
connect(sctp_analyse, SIGNAL(filterPackets(QString&,bool)), connect(sctp_analyse, SIGNAL(filterPackets(QString,bool)),
this, SLOT(filterPackets(QString&,bool))); this, SLOT(filterPackets(QString,bool)));
if (sctp_analyse->isMinimized() == true) if (sctp_analyse->isMinimized() == true)
{ {

4
ui/qt/sctp_all_assocs_dialog.h
View File

@ -48,7 +48,7 @@ public:
~SCTPAllAssocsDialog(); ~SCTPAllAssocsDialog();
void fillTable(); void fillTable();
sctp_assoc_info_t* getSelectedAssoc() { return selected_assoc; }; sctp_assoc_info_t* getSelectedAssoc() { return selected_assoc; }
sctp_assoc_info_t* findSelectedAssoc(); sctp_assoc_info_t* findSelectedAssoc();
public slots: public slots:
@ -67,7 +67,7 @@ private:
signals: signals:
void filterPackets(QString& new_filter, bool force); void filterPackets(QString new_filter, bool force);
}; };
#endif // SCTP_ALL_ASSOCS_DIALOG_H #endif // SCTP_ALL_ASSOCS_DIALOG_H

2
ui/qt/sctp_assoc_analyse_dialog.h
View File

@ -81,7 +81,7 @@ private:
signals: signals:
void filterPackets(QString& new_filter, bool force); void filterPackets(QString new_filter, bool force);
}; };
#endif // SCTP_ASSOC_ANALYSE_DIALOG_H #endif // SCTP_ASSOC_ANALYSE_DIALOG_H