diff options
Diffstat (limited to 'ui/qt/main_window.h')
| -rw-r--r-- | ui/qt/main_window.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index 1bac66cdcb..da2a829605 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -94,7 +94,8 @@ private: QSocketNotifier *pipe_notifier_; #endif - void openCaptureFile(QString& cfPath = *new QString()); + void openCaptureFile(QString& cf_path = *new QString()); + void mergeCaptureFile(); void saveCapture(capture_file *cf, bool close_capture); bool testCaptureFileClose(capture_file *cf, bool from_quit = false, QString& before_what = *new QString()); void captureStop(capture_file *cf); @@ -138,6 +139,7 @@ private slots: void openRecentCaptureFile(QString& cfPath = *new QString()); void on_actionFileOpen_triggered(); + void on_actionFileMerge_triggered(); void on_actionFileClose_triggered(); void on_actionGoGoToPacket_triggered(); void resetPreviousFocus(); |