Use QCoreApplication's applicationName property.

Store application names using QCoreApplication's applicationName property. This removes MythCoreContext::GetAppName() and ::SetAppName() and changes code to use names defined in mythcorecontext.h, rather than argv[0], for the application name (so that future code that keys off application name will work properly, even if distros change binary names, for example, to mythfrontend.real). This includes another binary version change, so another plugin recompile is required.
MythTV · Mar 8, 2011 · 281ffc8 · 281ffc8
1 parent 3095624
commit 281ffc8
Show file tree

Hide file tree

Showing 17 changed files with 44 additions and 71 deletions.
diff --git a/mythtv/libs/libmythbase/mythcorecontext.cpp b/mythtv/libs/libmythbase/mythcorecontext.cpp
@@ -50,7 +50,6 @@ class MythCoreContextPrivate : public QObject
     QObject         *m_GUIcontext;
     QObject         *m_GUIobject;
     QString          m_appBinaryVersion;
-    QString          m_appName;
 
     QMutex  m_hostnameLock;      ///< Locking for thread-safe copying of:
     QString m_localHostname;     ///< hostname from mysql.txt or gethostname()
@@ -187,16 +186,6 @@ MythCoreContext::~MythCoreContext()
     d = NULL;
 }
 
-void MythCoreContext::SetAppName(QString appName)
-{
-    d->m_appName = appName;
-}
-
-QString MythCoreContext::GetAppName(void)
-{
-    return d->m_appName;
-}
-
 bool MythCoreContext::SetupCommandSocket(MythSocket *serverSock,
                                          const QString &announcement,
                                          uint timeout_in_ms,

diff --git a/mythtv/libs/libmythbase/mythcorecontext.h b/mythtv/libs/libmythbase/mythcorecontext.h
@@ -11,6 +11,20 @@
 #include "mythverbose.h"
 #include "mythlocale.h"
 
+#define MYTH_APPNAME_MYTHBACKEND "mythbackend"
+#define MYTH_APPNAME_MYTHJOBQUEUE "mythjobqueue"
+#define MYTH_APPNAME_MYTHFRONTEND "mythfrontend"
+#define MYTH_APPNAME_MYTHTV_SETUP "mythtv-setup"
+#define MYTH_APPNAME_MYTHFILLDATABASE "mythfilldatabase"
+#define MYTH_APPNAME_MYTHCOMMFLAG "mythcommflag"
+#define MYTH_APPNAME_MYTHPREVIEWGEN "mythpreviewgen"
+#define MYTH_APPNAME_MYTHTRANSCODE "mythtranscode"
+#define MYTH_APPNAME_MYTHWELCOME "mythwelcome"
+#define MYTH_APPNAME_MYTHSHUTDOWN "mythshutdown"
+#define MYTH_APPNAME_MYTHMESSAGE "mythmessage"
+#define MYTH_APPNAME_MYTHLCDSERVER "mythlcdserver"
+#define MYTH_APPNAME_MYTHAVTEST "mythavtest"
+
 class MDBManager;
 class MythCoreContextPrivate;
 class MythSocket;
@@ -46,9 +60,6 @@ class MBASE_PUBLIC MythCoreContext : public MythObservable, public MythSocketCBs
 
     bool Init(void);
 
-    void    SetAppName(QString appName);
-    QString GetAppName(void);
-
     void SetLocalHostname(const QString &hostname);
     void SetServerSocket(MythSocket *serverSock);
     void SetEventSocket(MythSocket *eventSock);

diff --git a/mythtv/libs/libmythbase/mythdownloadmanager.cpp b/mythtv/libs/libmythbase/mythdownloadmanager.cpp
@@ -194,7 +194,7 @@ void MythDownloadManager::run(void)
     m_manager = new QNetworkAccessManager(this);
     m_diskCache = new QNetworkDiskCache(this);
     m_diskCache->setCacheDirectory(GetConfDir() + "/Cache-" +
-                                   gCoreContext->GetAppName() + "-" +
+                                   QCoreApplication::applicationName() + "-" +
                                    gCoreContext->GetHostName());
     m_manager->setCache(m_diskCache);
 

diff --git a/mythtv/libs/libmythbase/mythversion.h b/mythtv/libs/libmythbase/mythversion.h
@@ -12,7 +12,7 @@
 /// Update this whenever the plug-in API changes.
 /// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and
 /// libmythui class methods used by plug-ins.
-#define MYTH_BINARY_VERSION "0.25.20110307-1"
+#define MYTH_BINARY_VERSION "0.25.20110308-1"
 
 /** \brief Increment this whenever the MythTV network protocol changes.
  *

diff --git a/mythtv/programs/mythavtest/main.cpp b/mythtv/programs/mythavtest/main.cpp
@@ -55,8 +55,7 @@ int main(int argc, char *argv[])
 
     QApplication a(argc, argv);
 
-    QFileInfo finfo(a.argv()[0]);
-    QString binname = finfo.baseName();
+    QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHAVTEST);
 
     int argpos = 1;
     QString filename = "";
@@ -99,8 +98,6 @@ int main(int argc, char *argv[])
         return GENERIC_EXIT_NO_MYTHCONTEXT;
     }
 
-    gCoreContext->SetAppName(binname);
-
     QMap<QString, QString> settingsOverride = cmdline.GetSettingsOverride();
     if (settingsOverride.size())
     {

diff --git a/mythtv/programs/mythbackend/main.cpp b/mythtv/programs/mythbackend/main.cpp
@@ -122,9 +122,7 @@ int main(int argc, char **argv)
     // such as socket notifications :[
     QApplication a(argc, argv);
 #endif
-
-    QFileInfo finfo(a.argv()[0]);
-    QString binname = finfo.baseName();
+    QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHBACKEND);
 
     for (int argpos = 1; argpos < a.argc(); ++argpos)
     {
@@ -162,15 +160,13 @@ int main(int argc, char **argv)
         return exitCode;
 
     {
-        QFileInfo sName( argv[0] );
         QString versionStr = QString("%1 version: %2 [%3] www.mythtv.org")
-            .arg(sName.baseName()).arg(MYTH_SOURCE_PATH)
+            .arg(MYTH_APPNAME_MYTHBACKEND).arg(MYTH_SOURCE_PATH)
             .arg(MYTH_SOURCE_VERSION);
         VERBOSE(VB_IMPORTANT, versionStr);
     }
 
     gContext = new MythContext(MYTH_BINARY_VERSION);
-    gCoreContext->SetAppName(binname);
 
     if (cmdline.HasBackendCommand())
     {

diff --git a/mythtv/programs/mythcommflag/main.cpp b/mythtv/programs/mythcommflag/main.cpp
@@ -919,9 +919,7 @@ int main(int argc, char *argv[])
     QString newCutList = QString::null;
     QMap<QString, QString> settingsOverride;
 
-    QFileInfo finfo(a.argv()[0]);
-
-    QString binname = finfo.baseName();
+    QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHCOMMFLAG);
 
     print_verbose_messages = VB_IMPORTANT;
     verboseString = "important";
@@ -1269,8 +1267,6 @@ int main(int argc, char *argv[])
         return GENERIC_EXIT_NO_MYTHCONTEXT;
     }
 
-    gCoreContext->SetAppName(binname);
-
     MythTranslation::load("mythfrontend");
 
     if (settingsOverride.size())
@@ -1379,7 +1375,7 @@ int main(int argc, char *argv[])
     if (!quiet)
     {
         VERBOSE(VB_IMPORTANT, QString("%1 version: %2 www.mythtv.org")
-                                .arg(binname).arg(MYTH_BINARY_VERSION));
+                  .arg(MYTH_APPNAME_MYTHCOMMFLAG).arg(MYTH_BINARY_VERSION));
 
         VERBOSE(VB_IMPORTANT, QString("Enabled verbose msgs: %1").arg(verboseString));
 

diff --git a/mythtv/programs/mythfilldatabase/main.cpp b/mythtv/programs/mythfilldatabase/main.cpp
@@ -87,8 +87,7 @@ int main(int argc, char *argv[])
     int sourceid = -1;
     QString fromddfile_lineupid;
 
-    QFileInfo finfo(a.argv()[0]);
-    QString binname = finfo.baseName();
+    QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHFILLDATABASE);
 
     myth_nice(19);
 
@@ -556,8 +555,6 @@ int main(int argc, char *argv[])
         return GENERIC_EXIT_NO_MYTHCONTEXT;
     }
 
-    gCoreContext->SetAppName(binname);
-
     MythTranslation::load("mythfrontend");
 
     if (!UpgradeTVDatabaseSchema(false))

diff --git a/mythtv/programs/mythfrontend/main.cpp b/mythtv/programs/mythfrontend/main.cpp
@@ -1141,14 +1141,16 @@ int main(int argc, char **argv)
 #endif
     QApplication a(argc, argv);
 
+    QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHFRONTEND);
+
     QString pluginname;
 
     QFileInfo finfo(a.argv()[0]);
 
     QString binname = finfo.baseName();
 
     VERBOSE(VB_IMPORTANT, QString("%1 version: %2 [%3] www.mythtv.org")
-                            .arg(binname)
+                            .arg(MYTH_APPNAME_MYTHFRONTEND)
                             .arg(MYTH_SOURCE_PATH)
                             .arg(MYTH_SOURCE_VERSION));
 
@@ -1209,7 +1211,7 @@ int main(int argc, char **argv)
         else
         {
             VERBOSE(VB_IMPORTANT, QString("%1 version: %2 [%3] www.mythtv.org")
-                                    .arg(binname)
+                                    .arg(MYTH_APPNAME_MYTHFRONTEND)
                                     .arg(MYTH_SOURCE_PATH)
                                     .arg(MYTH_SOURCE_VERSION));
 
@@ -1266,8 +1268,6 @@ int main(int argc, char **argv)
             return GENERIC_EXIT_DB_ERROR;
     }
 
-    gCoreContext->SetAppName(binname);
-
     for(int argpos = 1; argpos < a.argc(); ++argpos)
     {
         if (!strcmp(a.argv()[argpos],"-l") ||

diff --git a/mythtv/programs/mythjobqueue/main.cpp b/mythtv/programs/mythjobqueue/main.cpp
@@ -129,11 +129,9 @@ int main(int argc, char *argv[])
     int argpos = 1;
     bool daemonize = false;
 
-    QString filename;
-
-    QFileInfo finfo(a.argv()[0]);
+    QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHJOBQUEUE);
 
-    QString binname = finfo.baseName();
+    QString filename;
 
     while (argpos < a.argc())
     {
@@ -294,7 +292,7 @@ int main(int argc, char *argv[])
     }
 
     VERBOSE(VB_IMPORTANT, QString("%1 version: %2 [%3] www.mythtv.org")
-                            .arg(binname)
+                            .arg(MYTH_APPNAME_MYTHJOBQUEUE)
                             .arg(MYTH_SOURCE_PATH)
                             .arg(MYTH_SOURCE_VERSION));
 
@@ -305,8 +303,6 @@ int main(int argc, char *argv[])
         return GENERIC_EXIT_NO_MYTHCONTEXT;
     }
 
-    gCoreContext->SetAppName(binname);
-
     if (settingsOverride.size())
     {
         QMap<QString, QString>::iterator it;

diff --git a/mythtv/programs/mythlcdserver/main.cpp b/mythtv/programs/mythlcdserver/main.cpp
@@ -37,6 +37,8 @@ int main(int argc, char **argv)
 
     debug_level = 0;  // don't show any debug messages by default
 
+    QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHLCDSERVER);
+
     //  Check command line arguments
     for (int argpos = 1; argpos < a.argc(); ++argpos)
     {

diff --git a/mythtv/programs/mythmessage/main.cpp b/mythtv/programs/mythmessage/main.cpp
@@ -45,6 +45,8 @@ int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);
 
+    QCoreApplication::setApplicationName("mythmessage");
+
     QHostAddress address = QHostAddress::Broadcast;
     unsigned short port = 6948;
 

diff --git a/mythtv/programs/mythpreviewgen/main.cpp b/mythtv/programs/mythpreviewgen/main.cpp
@@ -189,8 +189,7 @@ int main(int argc, char **argv)
     QApplication a(argc, argv);
 #endif
 
-    QFileInfo finfo(a.argv()[0]);
-    QString binname = finfo.baseName();
+    QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHPREVIEWGEN);
 
     for (int argpos = 1; argpos < a.argc(); ++argpos)
     {
@@ -231,13 +230,12 @@ int main(int argc, char **argv)
 
     {
         QString versionStr = QString("%1 version: %2 [%3] www.mythtv.org")
-            .arg(basename(argv[0])).arg(MYTH_SOURCE_PATH)
+            .arg(MYTH_APPNAME_MYTHPREVIEWGEN).arg(MYTH_SOURCE_PATH)
             .arg(MYTH_SOURCE_VERSION);
         VERBOSE(VB_IMPORTANT, versionStr);
     }
 
     gContext = new MythContext(MYTH_BINARY_VERSION);
-    gCoreContext->SetAppName(binname);
 
     if (!gContext->Init(false))
     {

diff --git a/mythtv/programs/mythshutdown/main.cpp b/mythtv/programs/mythshutdown/main.cpp
@@ -732,10 +732,8 @@ static int startup()
 
 static void showUsage()
 {
-    QString binname = "mythshutdown";
-
     VERBOSE(VB_IMPORTANT, QString("%1 version: %2 [%3] www.mythtv.org")
-                            .arg(binname)
+                            .arg(MYTH_APPNAME_MYTHSHUTDOWN)
                             .arg(MYTH_SOURCE_PATH)
                             .arg(MYTH_SOURCE_VERSION));
 
@@ -780,6 +778,8 @@ int main(int argc, char **argv)
 
     QCoreApplication a(argc, argv);
 
+    QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHSHUTDOWN);
+
     bool bLockShutdown = false;
     bool bUnlockShutdown = false;
     bool bCheckOKShutdown = false;

diff --git a/mythtv/programs/mythtranscode/main.cpp b/mythtv/programs/mythtranscode/main.cpp
@@ -154,8 +154,7 @@ int main(int argc, char *argv[])
 
     QCoreApplication a(argc, argv);
 
-    QFileInfo finfo(a.argv()[0]);
-    QString binname = finfo.baseName();
+    QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHTRANSCODE);
 
     print_verbose_messages = VB_IMPORTANT;
     verboseString = "important";
@@ -517,8 +516,6 @@ int main(int argc, char *argv[])
         return GENERIC_EXIT_NO_MYTHCONTEXT;
     }
 
-    gCoreContext->SetAppName(binname);
-
     MythTranslation::load("mythfrontend");
 
     if (settingsOverride.size())

diff --git a/mythtv/programs/mythtv-setup/main.cpp b/mythtv/programs/mythtv-setup/main.cpp
@@ -292,13 +292,12 @@ int main(int argc, char *argv[])
 #endif
     QApplication a(argc, argv, use_display);
 
-    QFileInfo finfo(a.argv()[0]);
-    QString binname = finfo.baseName();
+    QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHTV_SETUP);
 
     QMap<QString, QString> settingsOverride;
 
     VERBOSE(VB_IMPORTANT, QString("%1 version: %2 [%3] www.mythtv.org")
-                            .arg(binname)
+                            .arg(MYTH_APPNAME_MYTHTV_SETUP)
                             .arg(MYTH_SOURCE_PATH)
                             .arg(MYTH_SOURCE_VERSION));
 
@@ -508,7 +507,7 @@ int main(int argc, char *argv[])
         else
         {
             VERBOSE(VB_IMPORTANT, QString("%1 version: %2 [%3] www.mythtv.org")
-                                    .arg(binname)
+                                    .arg(MYTH_APPNAME_MYTHTV_SETUP)
                                     .arg(MYTH_SOURCE_PATH)
                                     .arg(MYTH_SOURCE_VERSION));
 
@@ -554,8 +553,6 @@ int main(int argc, char *argv[])
             return GENERIC_EXIT_DB_ERROR;
     }
 
-    gCoreContext->SetAppName(binname);
-
     if (use_display)
     {
         gCoreContext->SetSetting("Theme", DEFAULT_UI_THEME);

diff --git a/mythtv/programs/mythwelcome/main.cpp b/mythtv/programs/mythwelcome/main.cpp
@@ -50,10 +50,8 @@ static void showUsage(const MythCommandLineParser &cmdlineparser)
     QString    help  = cmdlineparser.GetHelpString(false);
     QByteArray ahelp = help.toLocal8Bit();
 
-    QString binname = "mythwelcome";
-
     VERBOSE(VB_IMPORTANT, QString("%1 version: %2 [%3] www.mythtv.org")
-                            .arg(binname)
+                            .arg(MYTH_APPNAME_MYTHWELCOME)
                             .arg(MYTH_SOURCE_PATH)
                             .arg(MYTH_SOURCE_VERSION));
 
@@ -91,8 +89,7 @@ int main(int argc, char **argv)
 
     QApplication a(argc, argv);
 
-    QFileInfo finfo(a.argv()[0]);
-    QString binname = finfo.baseName();
+    QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHWELCOME);
 
     // Check command line arguments
     for (int argpos = 1; argpos < a.argc(); ++argpos)
@@ -164,8 +161,6 @@ int main(int argc, char **argv)
         return GENERIC_EXIT_NO_MYTHCONTEXT;
     }
 
-    gCoreContext->SetAppName(binname);
-
     if (!MSqlQuery::testDBConnection())
     {
         VERBOSE(VB_IMPORTANT, "mythwelcome: Could not open the database. "