Changed the system to use a file named portable_mode.txt instead of a…

… define and fixed the indentation type
LMMS · Jul 7, 2020 · 3969be0 · 3969be0
1 parent b5eba4d
commit 3969be0
Show file tree

Hide file tree

Showing 3 changed files with 467 additions and 461 deletions.
diff --git a/include/ConfigManager.h b/include/ConfigManager.h
@@ -46,31 +46,32 @@ const QString PRESETS_PATH = "presets/";
 const QString SAMPLES_PATH = "samples/";
 const QString GIG_PATH = "samples/gig/";
 const QString SF2_PATH = "samples/soundfonts/";
-const QString LADSPA_PATH ="plugins/ladspa/";
+const QString LADSPA_PATH = "plugins/ladspa/";
 const QString DEFAULT_THEME_PATH = "themes/default/";
 const QString TRACK_ICON_PATH = "track_icons/";
 const QString LOCALE_PATH = "locale/";
+const QString PORTABLE_MODE_FILE = "/portable_mode.txt";
 
 class LMMS_EXPORT ConfigManager : public QObject
 {
-	Q_OBJECT
+Q_OBJECT
 public:
-	static inline ConfigManager * inst()
+	static inline ConfigManager *inst()
 	{
-		if(s_instanceOfMe == NULL )
+		if (s_instanceOfMe == NULL)
 		{
 			s_instanceOfMe = new ConfigManager();
 		}
 		return s_instanceOfMe;
 	}
 
 
-	const QString & workingDir() const
+	const QString &workingDir() const
 	{
 		return m_workingDir;
 	}
 
-	const QString & dataDir() const
+	const QString &dataDir() const
 	{
 		return m_dataDir;
 	}
@@ -117,36 +118,40 @@ class LMMS_EXPORT ConfigManager : public QObject
 	}
 
 
-	const QString & vstDir() const
+	const QString &vstDir() const
 	{
 		return m_vstDir;
 	}
 
-	const QString & ladspaDir() const
+	const QString &ladspaDir() const
 	{
 		return m_ladspaDir;
 	}
 
-	const QString & sf2Dir() const
+	const QString &sf2Dir() const
 	{
 		return m_sf2Dir;
 	}
 
 #ifdef LMMS_HAVE_FLUIDSYNTH
-	const QString & sf2File() const
+
+	const QString &sf2File() const
 	{
 		return m_sf2File;
 	}
+
 #endif
 
 #ifdef LMMS_HAVE_STK
-	const QString & stkDir() const
+
+	const QString &stkDir() const
 	{
 		return m_stkDir;
 	}
+
 #endif
 
-	const QString & gigDir() const
+	const QString &gigDir() const
 	{
 		return m_gigDir;
 	}
@@ -182,7 +187,7 @@ class LMMS_EXPORT ConfigManager : public QObject
 		return m_themeDir;
 	}
 
-	const QString & backgroundPicFile() const
+	const QString &backgroundPicFile() const
 	{
 		return m_backgroundPicFile;
 	}
@@ -197,7 +202,7 @@ class LMMS_EXPORT ConfigManager : public QObject
 		return m_workingDir + "recover.mmp";
 	}
 
-	inline const QStringList & recentlyOpenedProjects() const
+	inline const QStringList &recentlyOpenedProjects() const
 	{
 		return m_recentlyOpenedProjects;
 	}
@@ -207,7 +212,7 @@ class LMMS_EXPORT ConfigManager : public QObject
 		return m_dataDir + LOCALE_PATH;
 	}
 
-	const QString & version() const
+	const QString &version() const
 	{
 		return m_version;
 	}
@@ -216,54 +221,74 @@ class LMMS_EXPORT ConfigManager : public QObject
 
 
 	static QStringList availableVstEmbedMethods();
+
 	QString vstEmbedMethod() const;
 
 	void InitializePortableWorkingDir();
+
 	void InitializeInstalledWorkingDir();
-    void InitializeDevelopmentDirs();
+
+	void InitializeDevelopmentDirs();
 
 	// Returns true if the working dir (e.g. ~/lmms) exists on disk.
 	bool hasWorkingDir() const;
 
-	void addRecentlyOpenedProject(const QString & _file);
+	void addRecentlyOpenedProject(const QString &_file);
 
-	const QString & value(const QString & cls,
-					const QString & attribute) const;
-	const QString & value(const QString & cls,
-					const QString & attribute,
-					const QString & defaultVal) const;
-	void setValue(const QString & cls, const QString & attribute,
-						const QString & value);
-	void deleteValue(const QString & cls, const QString & attribute);
+	const QString &value(const QString &cls,
+						 const QString &attribute) const;
+
+	const QString &value(const QString &cls,
+						 const QString &attribute,
+						 const QString &defaultVal) const;
+
+	void setValue(const QString &cls, const QString &attribute,
+				  const QString &value);
+
+	void deleteValue(const QString &cls, const QString &attribute);
+
+	void loadConfigFile(const QString &configFile = "");
 
-	void loadConfigFile(const QString & configFile = "");
 	void saveConfigFile();
 
-	void setWorkingDir(const QString & workingDir);
-	void setVSTDir(const QString & vstDir);
-	void setLADSPADir(const QString & ladspaDir);
-	void setSF2Dir(const QString & sf2Dir);
-	void setSF2File(const QString & sf2File);
-	void setSTKDir(const QString & stkDir);
-	void setGIGDir(const QString & gigDir);
-	void setThemeDir(const QString & themeDir);
-	void setBackgroundPicFile(const QString & backgroundPicFile);
+	void setWorkingDir(const QString &workingDir);
+
+	void setVSTDir(const QString &vstDir);
+
+	void setLADSPADir(const QString &ladspaDir);
+
+	void setSF2Dir(const QString &sf2Dir);
+
+	void setSF2File(const QString &sf2File);
+
+	void setSTKDir(const QString &stkDir);
+
+	void setGIGDir(const QString &gigDir);
+
+	void setThemeDir(const QString &themeDir);
+
+	void setBackgroundPicFile(const QString &backgroundPicFile);
 
 	// Creates the working directory & subdirectories on disk.
 	void createWorkingDir();
 
 signals:
-	void valueChanged( QString cls, QString attribute, QString value );
+
+	void valueChanged(QString cls, QString attribute, QString value);
 
 private:
-	static ConfigManager * s_instanceOfMe;
+	static ConfigManager *s_instanceOfMe;
 
 	ConfigManager();
-	ConfigManager(const ConfigManager & _c);
+
+	ConfigManager(const ConfigManager &_c);
+
 	~ConfigManager();
 
 	void upgrade_1_1_90();
+
 	void upgrade_1_1_91();
+
 	void upgrade();
 
 	QString m_workingDir;
@@ -291,4 +316,5 @@ class LMMS_EXPORT ConfigManager : public QObject
 
 	friend class LmmsCore;
 };
+
 #endif