forked from osmocom/wireshark
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:
parent
43b77aeebf
commit
72f3b9f74c
|
@ -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:
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue