merged from 0.6.7 codebase

1 files changed, 43 insertions, 46 deletions

diff --git a/application/BuildConfig.h b/application/BuildConfig.h
index e561cb52..b7965e10 100644
--- a/application/BuildConfig.h
+++ b/application/BuildConfig.h
@@ -7,64 +7,61 @@
 class Config
 {
 public:
-	Config();
-	/// The major version number.
-	int VERSION_MAJOR;
-	/// The minor version number.
-	int VERSION_MINOR;
-	/// The hotfix number.
-	int VERSION_HOTFIX;
-	/// The build number.
-	int VERSION_BUILD;
+    Config();
+    /// The major version number.
+    int VERSION_MAJOR;
+    /// The minor version number.
+    int VERSION_MINOR;
+    /// The hotfix number.
+    int VERSION_HOTFIX;
+    /// The build number.
+    int VERSION_BUILD;
 
-	/**
-	 * The version channel
-	 * This is used by the updater to determine what channel the current version came from.
-	 */
-	QString VERSION_CHANNEL;
+    /**
+     * The version channel
+     * This is used by the updater to determine what channel the current version came from.
+     */
+    QString VERSION_CHANNEL;
 
-	bool UPDATER_ENABLED = false;
+    bool UPDATER_ENABLED = false;
 
-	/// A short string identifying this build's platform. For example, "lin64" or "win32".
-	QString BUILD_PLATFORM;
+    /// A short string identifying this build's platform. For example, "lin64" or "win32".
+    QString BUILD_PLATFORM;
 
-	/// URL for the updater's channel
-	QString CHANLIST_URL;
+    /// URL for the updater's channel
+    QString CHANLIST_URL;
 
-/*	/// Google analytics ID
-	QString ANALYTICS_ID;
-*/
-	/// URL for notifications
-	QString NOTIFICATION_URL;
+    /// URL for notifications
+    QString NOTIFICATION_URL;
 
-	/// Used for matching notifications
-	QString FULL_VERSION_STR;
+    /// Used for matching notifications
+    QString FULL_VERSION_STR;
 
-	/// The git commit hash of this build
-	QString GIT_COMMIT;
+    /// The git commit hash of this build
+    QString GIT_COMMIT;
 
-	/// The git refspec of this build
-	QString GIT_REFSPEC;
+    /// The git refspec of this build
+    QString GIT_REFSPEC;
 
-	/// This is printed on start to standard output
-	QString VERSION_STR;
+    /// This is printed on start to standard output
+    QString VERSION_STR;
 
-	/**
-	 * This is used to fetch the news RSS feed.
-	 * It defaults in CMakeLists.txt to "http://multimc.org/rss.xml"
-	 */
-	QString NEWS_RSS_URL;
+    /**
+     * This is used to fetch the news RSS feed.
+     * It defaults in CMakeLists.txt to "https://multimc.org/rss.xml"
+     */
+    QString NEWS_RSS_URL;
 
-	/**
-	 * API key you can get from paste.ee when you register an account
-	 */
-	QString PASTE_EE_KEY;
+    /**
+     * API key you can get from paste.ee when you register an account
+     */
+    QString PASTE_EE_KEY;
 
-	/**
-	 * \brief Converts the Version to a string.
-	 * \return The version number in string format (major.minor.revision.build).
-	 */
-	QString printableVersionString() const;
+    /**
+     * \brief Converts the Version to a string.
+     * \return The version number in string format (major.minor.revision.build).
+     */
+    QString printableVersionString() const;
 };
 
 extern Config BuildConfig;