aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2014-03-06 17:50:01 +0100
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2014-03-06 17:05:15 +0000
commitbf3f4713b91d2cc93a52c911a70ee631f7e3dff7 (patch)
tree752be935a8fd0f654d7a5e4e124c522aca781341 /ui
parenteef0fa64d2e1c17c8d623fdb177ab5c54bc90c91 (diff)
Fix startup warning when launch Wireshark Qt
QObject::connect: No such signal WiresharkApplication::openCaptureFile(QString&,QString&,unsigned int) in main.cpp:502 QObject::connect: (receiver name: 'MainWindow') Change-Id: I0d6283c1b55619fa6878161d0a74db1ec9107bf2 Reviewed-on: https://code.wireshark.org/review/529 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'ui')
-rw-r--r--ui/qt/wireshark_application.cpp8
-rw-r--r--ui/qt/wireshark_application.h2
2 files changed, 6 insertions, 4 deletions
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index ef817a773c..d953ede9c3 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -499,12 +499,13 @@ void WiresharkApplication::setLastOpenDir(const char *dir_name)
bool WiresharkApplication::event(QEvent *event)
{
+ QString display_filter = NULL;
if (event->type() == QEvent::FileOpen) {
QFileOpenEvent *foe = static_cast<QFileOpenEvent *>(event);
if (foe && foe->file().length() > 0) {
QString cf_path(foe->file());
if (initialized_) {
- emit openCaptureFile(cf_path);
+ emit openCaptureFile(cf_path, display_filter, WTAP_TYPE_AUTO);
} else {
pending_open_files_.append(cf_path);
}
@@ -621,11 +622,12 @@ void WiresharkApplication::emitAppSignal(AppSignal signal)
}
void WiresharkApplication::allSystemsGo()
-{
+{
+ QString display_filter = NULL;
initialized_ = true;
emit appInitialized();
while (pending_open_files_.length() > 0) {
- emit openCaptureFile(pending_open_files_.front());
+ emit openCaptureFile(pending_open_files_.front(), display_filter, WTAP_TYPE_AUTO);
pending_open_files_.pop_front();
}
software_update_init();
diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h
index 3098195ab7..2403555894 100644
--- a/ui/qt/wireshark_application.h
+++ b/ui/qt/wireshark_application.h
@@ -100,7 +100,7 @@ protected:
signals:
void appInitialized();
- void openCaptureFile(QString &cf_path);
+ void openCaptureFile(QString &cf_path, QString &display_filter, unsigned int type);
void recentFilesRead();
void updateRecentItemStatus(const QString &filename, qint64 size, bool accessible);
void splashUpdate(register_action_e action, const char *message);