Qt → wireshark. GTK+ → wireshark-gtk.

Make sure the Qt UI is named "Wireshark" and its executable is named
"wireshark" or "wireshark.exe". Make sure the GTK+ UI is named
"Wireshark 1" or "Wireshark (GTK+)" depending on how much the target
audience is likely to care about UI toolkits. Make sure the GTK+
executable is named "wireshark-gtk" or "wireshark-gtk.exe".

It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps
package. It's likely even more broken now.

Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake
1.11.3) at some point. The first attempt to compile in ui/qt returns
"error: source_file.cpp: No such file or directory". The second attempt
works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1).

Tested:

- Nmake builds

- NSIS packaging

- CMake builds (Windows, OS X)

- Autotools build and distcheck

- RPM packaging

To do:

- Test Debian packaging

- Fix PortableApps

Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2
Reviewed-on: https://code.wireshark.org/review/3919
Reviewed-by: Gerald Combs <gerald@wireshark.org>

17 files changed, 40 insertions, 41 deletions

diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
index a4292e7d08..ef24563d23 100644
--- a/ui/qt/CMakeLists.txt
+++ b/ui/qt/CMakeLists.txt
@@ -266,12 +266,12 @@ set(WIRESHARK_QT_QRC
 )
 
 set(WIRESHARK_QT_TS
-	qtshark_de.ts
-	qtshark_en.ts # lupdate -pluralonly
-	qtshark_fr.ts
-	qtshark_ja_JP.ts
-	qtshark_pl.ts
-	qtshark_zh_CN.ts
+	wireshark_de.ts
+	wireshark_en.ts # lupdate -pluralonly
+	wireshark_fr.ts
+	wireshark_ja_JP.ts
+	wireshark_pl.ts
+	wireshark_zh_CN.ts
 )
 
 include_directories(
@@ -336,4 +336,3 @@ add_library(qtui STATIC
 )
 set_target_properties(qtui PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 set_target_properties(qtui PROPERTIES FOLDER "UI")
-
diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am
index 3ea7b5444c..668bcb3e67 100644
--- a/ui/qt/Makefile.am
+++ b/ui/qt/Makefile.am
@@ -269,6 +269,6 @@ EXTRA_DIST = \
 	main.cpp			\
 	Makefile.common			\
 	Makefile_custom.common		\
-	QtShark.pro			\
+	Wireshark.pro			\
 	display_filter_16.svg		\
 	gpl-template.txt
diff --git a/ui/qt/Makefile.common b/ui/qt/Makefile.common
index 1a50700b4d..d5a3bfc712 100644
--- a/ui/qt/Makefile.common
+++ b/ui/qt/Makefile.common
@@ -267,27 +267,27 @@ QRC_FILES =	\
 
 #
 # .ts files.
-# qtshark_en should be pluralonly.
+# wireshark_en should be pluralonly.
 #
 TS_FILES =	\
-	qtshark_de.ts	\
-	qtshark_en.ts	\
-	qtshark_fr.ts	\
-	qtshark_ja_JP.ts	\
-	qtshark_pl.ts	\
-	qtshark_zh_CN.ts
+	wireshark_de.ts	\
+	wireshark_en.ts	\
+	wireshark_fr.ts	\
+	wireshark_ja_JP.ts	\
+	wireshark_pl.ts	\
+	wireshark_zh_CN.ts
 
 #
 # .qm files.
 #
 # Should be auto-generated ?
 QM_FILES =	\
-	qtshark_de.qm		\
-	qtshark_en.qm		\
-	qtshark_fr.qm		\
-	qtshark_ja_JP.qm	\
-	qtshark_pl.qm		\
-	qtshark_zh_CN.qm
+	wireshark_de.qm		\
+	wireshark_en.qm		\
+	wireshark_fr.qm		\
+	wireshark_ja_JP.qm	\
+	wireshark_pl.qm		\
+	wireshark_zh_CN.qm
 
 #
 # The .rcc.cpp files generated from them.
diff --git a/ui/qt/QtShark.pro b/ui/qt/Wireshark.pro
index 93dd797c97..9d142d91e0 100644
--- a/ui/qt/QtShark.pro
+++ b/ui/qt/Wireshark.pro
@@ -33,10 +33,10 @@ isEqual(QT_MAJOR_VERSION, 5): greaterThan(QT_MINOR_VERSION, 1): win32 {
     QT += winextras
 }
 
-macx {
+win32|macx {
     TARGET = Wireshark
 } else {
-    TARGET = qtshark
+    TARGET = wireshark
 }
 
 TEMPLATE = app
@@ -133,7 +133,7 @@ win32 {
     #  of the Qt libraries themselves requires that Wireshark first be built with /MDd.
     #  Presumably doing source-level Qt library debugging shoyuld rarely be needed.
 
-    # We want to build only the QtShark linked with the QT "release" libraries
+    # We want to build only the Wireshark linked with the Qt "release" libraries
     #  so disable debug & etc.
 ##    CONFIG -= release
     CONFIG -= debug
@@ -487,7 +487,7 @@ win32 {
     # Currently the QT bin dir has to be on the path for windeployqt to work
     isEqual(QT_MAJOR_VERSION, 5):isEqual(QT_MINOR_VERSION, 3) {
       QMAKE_POST_LINK +=$$quote(set PATH=%PATH%;$${QT5_BASE_DIR}\\bin$$escape_expand(\\n\\t))
-      QMAKE_POST_LINK +=$$quote(windeployqt --release $(DESTDIR)qtshark.exe)$$escape_expand(\\n\\t))
+      QMAKE_POST_LINK +=$$quote(windeployqt --release $(DESTDIR)wireshark.exe)$$escape_expand(\\n\\t))
     }
 }
 
@@ -501,14 +501,14 @@ RESOURCES += \
     welcome.qrc \
 
 
-# qtshark_en should be pluralonly.
+# wireshark_en should be pluralonly.
 TRANSLATIONS = \
-        qtshark_de.ts \
-        qtshark_en.ts \
-        qtshark_fr.ts \
-        qtshark_ja_JP.ts \
-        qtshark_pl.ts \
-        qtshark_zh_CN.ts
+        wireshark_de.ts \
+        wireshark_en.ts \
+        wireshark_fr.ts \
+        wireshark_ja_JP.ts \
+        wireshark_pl.ts \
+        wireshark_zh_CN.ts
 
 ICON = ../../packaging/macosx/Resources/Wireshark.icns
 
diff --git a/ui/qt/i18n.qrc b/ui/qt/i18n.qrc
index 51aadfc5e4..ac7872ea9c 100644
--- a/ui/qt/i18n.qrc
+++ b/ui/qt/i18n.qrc
@@ -2,28 +2,28 @@
   Wireshark - Network traffic analyzer
   By Gerald Combs <gerald@wireshark.org>
   Copyright 1998 Gerald Combs
- 
+
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License
   as published by the Free Software Foundation; either version 2
   of the License, or (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 -->
 <RCC>
     <qresource prefix="/i18n">
-        <file>qtshark_de.qm</file>
-        <file>qtshark_en.qm</file>
-        <file>qtshark_fr.qm</file>
-        <file>qtshark_ja_JP.qm</file>
-        <file>qtshark_pl.qm</file>
-        <file>qtshark_zh_CN.qm</file>
+        <file>wireshark_de.qm</file>
+        <file>wireshark_en.qm</file>
+        <file>wireshark_fr.qm</file>
+        <file>wireshark_ja_JP.qm</file>
+        <file>wireshark_pl.qm</file>
+        <file>wireshark_zh_CN.qm</file>
     </qresource>
 </RCC>
diff --git a/ui/qt/qtshark_de.qm b/ui/qt/wireshark_de.qm
index 758ce73d5f..758ce73d5f 100644
--- a/ui/qt/qtshark_de.qm
+++ b/ui/qt/wireshark_de.qm
diff --git a/ui/qt/qtshark_de.ts b/ui/qt/wireshark_de.ts
index 59f7ccd584..59f7ccd584 100644
--- a/ui/qt/qtshark_de.ts
+++ b/ui/qt/wireshark_de.ts
diff --git a/ui/qt/qtshark_en.qm b/ui/qt/wireshark_en.qm
index 52c5b6c3a2..52c5b6c3a2 100644
--- a/ui/qt/qtshark_en.qm
+++ b/ui/qt/wireshark_en.qm
diff --git a/ui/qt/qtshark_en.ts b/ui/qt/wireshark_en.ts
index 901c19c684..901c19c684 100644
--- a/ui/qt/qtshark_en.ts
+++ b/ui/qt/wireshark_en.ts
diff --git a/ui/qt/qtshark_fr.qm b/ui/qt/wireshark_fr.qm
index 69ecc75663..69ecc75663 100644
--- a/ui/qt/qtshark_fr.qm
+++ b/ui/qt/wireshark_fr.qm
diff --git a/ui/qt/qtshark_fr.ts b/ui/qt/wireshark_fr.ts
index d9dc696e33..d9dc696e33 100644
--- a/ui/qt/qtshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
diff --git a/ui/qt/qtshark_ja_JP.qm b/ui/qt/wireshark_ja_JP.qm
index 8ebdf49e99..8ebdf49e99 100644
--- a/ui/qt/qtshark_ja_JP.qm
+++ b/ui/qt/wireshark_ja_JP.qm
diff --git a/ui/qt/qtshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index b57ab81c3c..b57ab81c3c 100644
--- a/ui/qt/qtshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
diff --git a/ui/qt/qtshark_pl.qm b/ui/qt/wireshark_pl.qm
index aaeed198f2..aaeed198f2 100644
--- a/ui/qt/qtshark_pl.qm
+++ b/ui/qt/wireshark_pl.qm
diff --git a/ui/qt/qtshark_pl.ts b/ui/qt/wireshark_pl.ts
index bee4254da9..bee4254da9 100644
--- a/ui/qt/qtshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
diff --git a/ui/qt/qtshark_zh_CN.qm b/ui/qt/wireshark_zh_CN.qm
index 3b89bc6fb8..3b89bc6fb8 100644
--- a/ui/qt/qtshark_zh_CN.qm
+++ b/ui/qt/wireshark_zh_CN.qm
diff --git a/ui/qt/qtshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 03a8217b34..03a8217b34 100644
--- a/ui/qt/qtshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts