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

1 files changed, 19 insertions, 33 deletions

diff --git a/src/globals.h b/src/globals.h
index d5248dc..d0f1c75 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1,65 +1,51 @@
 #ifndef VMCHOOSER_GLOBALS_H
 #define VMCHOOSER_GLOBALS_H
 
-#define VMCHOOSER_VERSION "0.1.0"
-
-#define VMCHOOSER_PLUGIN_PATH "/opt/openslx/plugin-repo/vmchooser"
-#define VMCHOOSER_BIN_PATH "/opt/openslx/bin"
-#define VMCHOOSER_SCRIPTS_PATH "/opt/openslx/scripts"
-#define VMCHOOSER_ETC_BASE_PATH "/opt/openslx/vmchooser/config"
-#define VMCHOOSER_VMPATH "/mnt/vmstore"
-#define VMCHOOSER_THEME_BASE "/opt/openslx/vmchooser/themes"
-
-#define VMCHOOSER_X_SESSIONS_PATH "/usr/share/xsessions"
+#define VMCHOOSER_VERSION "2.1.0"
 
 #define VMCHOOSER_SESSION_START_SCRIPT "/opt/openslx/vmchooser/sessionstart"
+#define VMCHOOSER_THEME_BASE "/opt/openslx/vmchooser/themes"
 
 #define VMCHOOSER_DEFAULT_WIDTH 800
 #define VMCHOOSER_DEFAULT_HEIGHT 600
 
-#define OPENSLXCONFIG "/opt/openslx/config"
-
-class QString;
 class Session;
 
-extern bool debugMode;
+extern bool g_debugMode;
 extern bool g_pvsEnabled;
 extern bool g_pvsChecked;
 extern int g_autoQuitSeconds;
 extern bool g_allowVmEdit;
 
-extern QString binPath;
-extern QString etcPath;
-extern QString vSessionPath;
-extern QString xSessionPath;
-extern QString userPath;
+extern QString g_xSessionPath;
 
-extern QString runVmScript;
+extern QString g_runVmScript;
 extern QString printerScript;
 extern QString scannerScript;
 // Script that is run before the xsession/vsession is started
-extern QString sessionStartScript;
+extern const QString SESSION_START_SCRIPT;
 
-extern const QString globalConfFile;
-extern const QString userConfFile;
-extern const QString previousSessionFile;
+extern const QString CONFIG_FILE_GLOBAL;
+extern const QString CONFIG_FILE_USER;
+extern const QString PREVIOUS_SESSION_USER;
 
-extern QString pool;
-extern QString theme;
-extern QString basePath;
+extern QString g_currentPoolName;
+extern QString g_themeName;
+extern QString g_vmBasePath;
 
-extern const QString iconsTempPath;
-extern const QString xml_filename;
-extern const QString help_backup_filename;
-extern const QString news_backup_filename;
+extern const QString TEMP_PATH_ICONS;
+extern const QString TEMP_PATH_XML_LIST;
+extern const QString TEMP_PATH_HELP;
+extern const QString TEMP_PATH_NEWS;
 
-extern QString urlBase;
+extern QString g_urlBase;
 
-extern bool _fullscreen;
+extern bool g_fullscreen;
 
 #define TEMPLATES_IGNORE (0)
 #define TEMPLATES_BUMP (1)
 extern int g_templateHandling;
+
 #define LOCATION_IGNORE (0)
 #define LOCATION_BUMP (1)
 #define LOCATION_EXCLUSIVE (2)