diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index b4206b6a52..4c94910951 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -138,7 +138,6 @@ private: QActionGroup *time_display_actions_; QActionGroup *time_precision_actions_; FunnelStatistics *funnel_statistics_; - QList packet_dialogs_; bool capture_stopping_; bool capture_filter_valid_; @@ -202,6 +201,7 @@ signals: void setDissectedCaptureFile(capture_file *cf); void displayFilterSuccess(bool success); void monospaceFontChanged(const QFont &mono_font); + void closePacketDialogs(); public slots: // in main_window_slots.cpp @@ -240,7 +240,6 @@ public slots: void captureFileSaveStarted(const QString &file_path); void filterExpressionsChanged(); - void packetDialogClosed(QDialog *); private slots: // Manually connected slots (no "on__"). @@ -389,7 +388,6 @@ private slots: void on_actionViewResizeColumns_triggered(); void openPacketDialog(bool from_reference = false); - void closePacketDialogs(); void on_actionViewShowPacketInNewWindow_triggered(); void on_actionContextShowLinkedPacketInNewWindow_triggered(); void on_actionViewReload_triggered(); diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 34ba3cefdc..9f38c55386 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -2294,28 +2294,14 @@ void MainWindow::openPacketDialog(bool from_reference) connect(this, SIGNAL(monospaceFontChanged(QFont)), packet_dialog, SIGNAL(monospaceFontChanged(QFont))); - connect(packet_dialog, SIGNAL(packetDialogClosed(QDialog *)), - this, SLOT(packetDialogClosed(QDialog *))); + connect(this, SIGNAL(closePacketDialogs()), + packet_dialog, SLOT(close())); zoomText(); // Emits monospaceFontChanged - packet_dialogs_.append(packet_dialog); packet_dialog->show(); } } -void MainWindow::closePacketDialogs() -{ - QList packet_dialogs_copy(packet_dialogs_); - foreach(QDialog *packet_dialog, packet_dialogs_copy) { - packet_dialog->close(); - } -} - -void MainWindow::packetDialogClosed(QDialog *packet_dialog) -{ - packet_dialogs_.removeOne(packet_dialog); -} - void MainWindow::on_actionViewShowPacketInNewWindow_triggered() { openPacketDialog();