aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2013-09-09 19:30:02 +0000
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2013-09-09 19:30:02 +0000
commit37260a4e093ca4071c6a0590c8b7b526f99bc3f2 (patch)
treeb1651da56f6e571ba700703d547f230704aa6b9e /ui
parent346ff86c0c4e0ba6c20da3e2d9ada4671fbc2eb4 (diff)
Use the same variable name than GTK (cf_name)
svn path=/trunk/; revision=51880
Diffstat (limited to 'ui')
-rw-r--r--ui/qt/main.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index d2a2d91095..35e03ff3b6 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -492,8 +492,9 @@ int main(int argc, char *argv[])
#ifdef _WIN32
create_app_running_mutex();
#endif
+
QString locale;
- QString *capture_file = NULL;
+ QString *cf_name = NULL;
// In Qt 5, C strings are treated always as UTF-8 when converted to
// QStrings; in Qt 4, the codec must be set to make that happen
@@ -710,7 +711,7 @@ int main(int argc, char *argv[])
exit(0);
break;
case 'r':
- capture_file = new QString(optarg);
+ cf_name = new QString(optarg);
break;
case 'X':
/*
@@ -937,8 +938,8 @@ int main(int argc, char *argv[])
wsApp->allSystemsGo();
g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_INFO, "Wireshark is up and ready to go");
- if (capture_file != NULL) {
- main_w->openCaptureFile(*capture_file);
+ if (cf_name != NULL) {
+ main_w->openCaptureFile(*cf_name);
}
g_main_loop_new(NULL, FALSE);