diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-09-09 16:42:58 -0400 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-12-20 17:39:29 +0000 |
| commit | 9ba9cd83a4f72339b15aebbc1fbdde32f08ef3bc (patch) | |
| tree | 4ed17ac7d9681f43bf1e0e1069bb2a84a48a8387 /ui/qt/wireshark_application.h | |
| parent | 2bb8255e29e26c7c14f7a83ce33b41f9af18501e (diff) | |
| download | wireshark-9ba9cd83a4f72339b15aebbc1fbdde32f08ef3bc.tar.gz | |
Qt: Add a CaptureFile class.
Wrap the capture_file struct in a QObject which translates cf_cb_* and
capture_cb_* events into signals. Move the global cfile to
capture_file.cpp.
Don't use a void pointer for the capture file struct.
Change-Id: Ic5d5efb4bb1db64aa0247245890e5669b1da723a
Reviewed-on: https://code.wireshark.org/review/5885
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/wireshark_application.h')
| -rw-r--r-- | ui/qt/wireshark_application.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h index 981dc8e74c..f6f43e8632 100644 --- a/ui/qt/wireshark_application.h +++ b/ui/qt/wireshark_application.h @@ -82,8 +82,6 @@ public: e_prefs * readConfigurationFiles(char **gdp_path, char **dp_path); QList<recent_item_status *> recentItems() const; void addRecentItem(const QString &filename, qint64 size, bool accessible); - void captureCallback(int event, capture_session * cap_session); - void captureFileCallback(int event, void * data); QDir lastOpenDir(); void setLastOpenDir(const char *dir_name); void setLastOpenDir(QString *dir_str); @@ -130,7 +128,7 @@ signals: void addressResolutionChanged(); void fieldsChanged(); - // XXX It might make more sense to move these to main.cpp or main_window.cpp or their own class. +#if 0 void captureCapturePrepared(capture_session *cap_session); void captureCaptureUpdateStarted(capture_session *cap_session); void captureCaptureUpdateContinue(capture_session *cap_session); @@ -139,17 +137,22 @@ signals: void captureCaptureFixedFinished(capture_session *cap_session); void captureCaptureStopping(capture_session *cap_session); void captureCaptureFailed(capture_session *cap_session); +#endif +#if 0 void captureFileOpened(const capture_file *cf); void captureFileReadStarted(const capture_file *cf); void captureFileReadFinished(const capture_file *cf); void captureFileClosing(const capture_file *cf); void captureFileClosed(const capture_file *cf); +#endif void openStatCommandDialog(const QString &menu_path, const char *arg, void *userdata); public slots: void clearRecentItems(); + void captureFileReadStarted(); + void updateTaps(); private slots: void cleanup(); @@ -157,7 +160,6 @@ private slots: void itemStatusFinished(const QString filename = "", qint64 size = 0, bool accessible = false); void refreshRecentFiles(void); void refreshAddressResolution(void); - void updateTaps(); }; extern WiresharkApplication *wsApp; |