Clean up globals.* (remove unused, rename constants, prefix)

1 files changed, 23 insertions, 21 deletions

diff --git a/src/globals.cpp b/src/globals.cpp
index 698589d..ac14274 100644
--- a/src/globals.cpp
+++ b/src/globals.cpp
@@ -3,39 +3,41 @@
 #include "globals.h"
 #include "session.h"
 
+#define VMCHOOSER_SCRIPTS_PATH "/opt/openslx/scripts"
+#define VMCHOOSER_X_SESSIONS_PATH "/usr/share/xsessions"
+
+static const QString userPath(QDir::homePath() + "/.config/openslx");
+
 //QString binPath(QApplication::applicationDirPath());
-QString binPath(VMCHOOSER_BIN_PATH);
-QString scriptsPath(VMCHOOSER_SCRIPTS_PATH);
-QString etcPath(VMCHOOSER_ETC_BASE_PATH);
-QString vSessionPath(VMCHOOSER_VMPATH);
-QString xSessionPath(VMCHOOSER_X_SESSIONS_PATH);
-QString userPath(QDir::homePath() + "/.config/openslx");
+QString g_xSessionPath(VMCHOOSER_X_SESSIONS_PATH);
+QString g_runVmScript(VMCHOOSER_SCRIPTS_PATH "/vmchooser-run_virt");
+
+
+const QString SESSION_START_SCRIPT(VMCHOOSER_SESSION_START_SCRIPT);
 
-QString runVmScript(scriptsPath + "/vmchooser-run_virt");
-QString sessionStartScript(VMCHOOSER_SESSION_START_SCRIPT);
+const QString CONFIG_FILE_GLOBAL("/opt/openslx/vmchooser/config/vmchooser.conf");
 
-const QString globalConfFile(etcPath + "/vmchooser.conf");
-const QString userConfFile(userPath + "/vmchooser.conf");
-const QString previousSessionFile(userPath + "/vmchooser2.ini");
+const QString CONFIG_FILE_USER(userPath + "/vmchooser.conf");
+const QString PREVIOUS_SESSION_USER(userPath + "/vmchooser2.ini");
 
-bool debugMode = false;
+bool g_debugMode = false;
 bool g_pvsEnabled = false;
 bool g_pvsChecked = false;
 int g_autoQuitSeconds = 0;
 bool g_allowVmEdit = false;
 
-QString pool;
-QString theme;
-QString basePath;
+QString g_currentPoolName;
+QString g_themeName;
+QString g_vmBasePath;
 
-const QString iconsTempPath("/tmp/vmchooser2/icons/");
-const QString xml_filename("/tmp/vmchooser2/vmchooser2.xml");
-const QString help_backup_filename("/tmp/vmchooser2/vmchooser2_help.xml");
-const QString news_backup_filename("/tmp/vmchooser2/vmchooser2_news.xml");
+const QString TEMP_PATH_ICONS("/tmp/vmchooser2/icons/");
+const QString TEMP_PATH_XML_LIST("/tmp/vmchooser2/vmchooser2.xml");
+const QString TEMP_PATH_HELP("/tmp/vmchooser2/vmchooser2_help.xml");
+const QString TEMP_PATH_NEWS("/tmp/vmchooser2/vmchooser2_news.xml");
 
-QString urlBase;
+QString g_urlBase;
 
-bool _fullscreen = false;
+bool g_fullscreen = false;
 
 int g_templateHandling = TEMPLATES_IGNORE;
 int g_forLocationHandling = LOCATION_BUMP;