From df168536ca1aaf0b147e67ef214bf35dfd34e441 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 30 May 2019 01:14:31 +0200
Subject: Cleanup, and rewrite cmdline + settings handling

Command line parsing now uses QCommandLineXXX classes
Old unused options have been removed, like the "pools" feature

Closes #3599
---
 src/globals.cpp | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'src/globals.cpp')

diff --git a/src/globals.cpp b/src/globals.cpp
index 427b4bb..c21598a 100644
--- a/src/globals.cpp
+++ b/src/globals.cpp
@@ -3,45 +3,24 @@
 #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 g_xSessionPath(VMCHOOSER_X_SESSIONS_PATH);
-QString g_runVmScript(VMCHOOSER_SCRIPTS_PATH "/vmchooser-run_virt");
-
 
 const QString SESSION_START_SCRIPT(VMCHOOSER_SESSION_START_SCRIPT);
 
-const QString CONFIG_FILE_GLOBAL("/opt/openslx/vmchooser/config/vmchooser.conf");
 const QString CONFIG_FILE_USER(userPath + "/vmchooser.conf");
 const QString CONFIG_FILE_XSESSIONS("/opt/openslx/vmchooser/config/xsessions.conf");
 const QString PREVIOUS_SESSION_USER(userPath + "/vmchooser2.ini");
 
 bool g_debugMode = false;
-bool g_pvsEnabled = false;
-bool g_pvsChecked = false;
+bool g_fullscreen = false;
 int g_autoQuitSeconds = 0;
-bool g_allowVmEdit = false;
-
-QString g_currentPoolName;
-QString g_themeName;
-QString g_vmBasePath;
 
 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 g_urlBase;
-QString g_urlList;
-QString g_urlNews;
-QString g_urlHelp;
-
-bool g_fullscreen = false;
-
 int g_templateHandling = TEMPLATES_IGNORE;
 int g_forLocationHandling = LOCATION_BUMP;
 
-- 
cgit v1.2.3-55-g7522