Reformat and (slightly) decruft all the things.

13 files changed, 229 insertions, 550 deletions

diff --git a/depends/util/CMakeLists.txt b/depends/util/CMakeLists.txt
index 35c4db17..5c87c644 100644
--- a/depends/util/CMakeLists.txt
+++ b/depends/util/CMakeLists.txt
@@ -22,21 +22,18 @@ find_package(Qt5Core REQUIRED)
 include_directories(${Qt5Base_INCLUDE_DIRS})
 # include_directories(${Qt5Network_INCLUDE_DIRS})
 
-SET(LIBUTIL_HEADERS
+SET(LIBUTIL_SOURCES
 include/libutil_config.h
 
-include/apputils.h
-
 include/pathutils.h
+src/pathutils.cpp
+
 include/osutils.h
-include/userutils.h
-include/cmdutils.h
-)
 
-SET(LIBUTIL_SOURCES
-src/pathutils.cpp
-src/osutils.cpp
+include/userutils.h
 src/userutils.cpp
+
+include/cmdutils.h
 src/cmdutils.cpp
 )
 
@@ -50,7 +47,7 @@ add_definitions(-DLIBUTIL_LIBRARY)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-add_library(libUtil STATIC ${LIBUTIL_SOURCES} ${LIBUTIL_HEADERS})
+add_library(libUtil STATIC ${LIBUTIL_SOURCES})
 # qt5_use_modules(libUtil Core Network)
 qt5_use_modules(libUtil Core)
 target_link_libraries(libUtil)
diff --git a/depends/util/include/apputils.h b/depends/util/include/apputils.h
deleted file mode 100644
index a64adc50..00000000
--- a/depends/util/include/apputils.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2013 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APPUTILS_H
-#define APPUTILS_H
-
-#define STR_VAL(val) # val
-
-#endif // APPUTILS_H
diff --git a/depends/util/include/cmdutils.h b/depends/util/include/cmdutils.h
index bab5a9fa..4705f3ca 100644
--- a/depends/util/include/cmdutils.h
+++ b/depends/util/include/cmdutils.h
@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-#ifndef CMDUTILS_H
-#define CMDUTILS_H
+#pragma once
 
 #include <exception>
 #include <stdexcept>
@@ -33,8 +32,10 @@
  * @brief commandline parsing and processing utilities
  */
 
-namespace Util {
-namespace Commandline {
+namespace Util
+{
+namespace Commandline
+{
 
 /**
  * @brief split a string into argv items like a shell would do
@@ -52,13 +53,13 @@ namespace FlagStyle
 {
 enum Enum
 {
-	GNU,     /**< --option and -o (GNU Style) */
-	Unix,    /**< -option and -o  (Unix Style) */
+	GNU,	 /**< --option and -o (GNU Style) */
+	Unix,	/**< -option and -o  (Unix Style) */
 	Windows, /**< /option and /o  (Windows Style) */
 #ifdef Q_OS_WIN32
 	Default = Windows
 #else
-	Default = GNU
+		Default = GNU
 #endif
 };
 }
@@ -66,17 +67,17 @@ enum Enum
 /**
  * @brief The ArgumentStyle enum
  */
-namespace ArgumentStyle 
+namespace ArgumentStyle
 {
 enum Enum
 {
-	Space,          /**< --option=value */
-	Equals,         /**< --option value */
+	Space,		  /**< --option=value */
+	Equals,		 /**< --option value */
 	SpaceAndEquals, /**< --option[= ]value */
 #ifdef Q_OS_WIN32
 	Default = Equals
 #else
-	Default = SpaceAndEquals
+		Default = SpaceAndEquals
 #endif
 };
 }
@@ -101,47 +102,47 @@ public:
 	 * @param flagStyle the FlagStyle to use in this Parser
 	 * @param argStyle the ArgumentStyle to use in this Parser
 	 */
-	Parser(FlagStyle::Enum flagStyle = FlagStyle::Default, 
+	Parser(FlagStyle::Enum flagStyle = FlagStyle::Default,
 		   ArgumentStyle::Enum argStyle = ArgumentStyle::Default);
-	
+
 	/**
 	 * @brief set the flag style
 	 * @param style
 	 */
 	void setFlagStyle(FlagStyle::Enum style);
-	
+
 	/**
 	 * @brief get the flag style
 	 * @return
 	 */
 	FlagStyle::Enum flagStyle();
-	
+
 	/**
 	 * @brief set the argument style
 	 * @param style
 	 */
 	void setArgumentStyle(ArgumentStyle::Enum style);
-	
+
 	/**
 	 * @brief get the argument style
 	 * @return
 	 */
 	ArgumentStyle::Enum argumentStyle();
-	
+
 	/**
 	 * @brief define a boolean switch
 	 * @param name the parameter name
 	 * @param def the default value
 	 */
 	void addSwitch(QString name, bool def = false);
-	
+
 	/**
 	 * @brief define an option that takes an additional argument
 	 * @param name the parameter name
 	 * @param def the default value
 	 */
 	void addOption(QString name, QVariant def = QVariant());
-	
+
 	/**
 	 * @brief define a positional argument
 	 * @param name the parameter name
@@ -149,7 +150,7 @@ public:
 	 * @param def the default value
 	 */
 	void addArgument(QString name, bool required = true, QVariant def = QVariant());
-	
+
 	/**
 	 * @brief adds a flag to an existing parameter
 	 * @param name the (existing) parameter name
@@ -158,7 +159,7 @@ public:
 	 * Note: any one parameter can only have one flag
 	 */
 	void addShortOpt(QString name, QChar flag);
-	
+
 	/**
 	 * @brief adds documentation to a Parameter
 	 * @param name the parameter name
@@ -168,7 +169,7 @@ public:
 	 *       on options , metavar replaces the value placeholder
 	 */
 	void addDocumentation(QString name, QString doc, QString metavar = QString());
-	
+
 	/**
 	 * @brief generate a help message
 	 * @param progName the program name to use in the help message
@@ -177,7 +178,7 @@ public:
 	 * @return a help message
 	 */
 	QString compileHelp(QString progName, int helpIndent = 22, bool flagsInUsage = true);
-	
+
 	/**
 	 * @brief generate a short usage message
 	 * @param progName the program name to use in the usage message
@@ -185,21 +186,21 @@ public:
 	 * @return a usage message
 	 */
 	QString compileUsage(QString progName, bool useFlags = true);
-	
+
 	/**
 	 * @brief parse
 	 * @param argv a QStringList containing the program ARGV
 	 * @return a QHash mapping argument names to their values
 	 */
 	QHash<QString, QVariant> parse(QStringList argv);
-	
+
 	/**
 	 * @brief clear all definitions
 	 */
 	void clear();
-	
+
 	~Parser();
-	
+
 private:
 	FlagStyle::Enum m_flagStyle;
 	ArgumentStyle::Enum m_argStyle;
@@ -209,16 +210,18 @@ private:
 		otSwitch,
 		otOption
 	};
-	
+
 	// Important: the common part MUST BE COMMON ON ALL THREE structs
-	struct CommonDef {
+	struct CommonDef
+	{
 		QString name;
 		QString doc;
 		QString metavar;
 		QVariant def;
 	};
-	
-	struct OptionDef {
+
+	struct OptionDef
+	{
 		// common
 		QString name;
 		QString doc;
@@ -228,8 +231,9 @@ private:
 		OptionType type;
 		QChar flag;
 	};
-	
-	struct PositionalDef {
+
+	struct PositionalDef
+	{
 		// common
 		QString name;
 		QString doc;
@@ -238,17 +242,14 @@ private:
 		// positional
 		bool required;
 	};
-	
+
 	QHash<QString, OptionDef *> m_options;
 	QHash<QChar, OptionDef *> m_flags;
 	QHash<QString, CommonDef *> m_params;
 	QList<PositionalDef *> m_positionals;
 	QList<OptionDef *> m_optionList;
-	
+
 	void getPrefix(QString &opt, QString &flag);
 };
-
 }
 }
-
-#endif // CMDUTILS_H
diff --git a/depends/util/include/libutil_config.h b/depends/util/include/libutil_config.h
index 914337ed..56b33b74 100644
--- a/depends/util/include/libutil_config.h
+++ b/depends/util/include/libutil_config.h
@@ -3,7 +3,7 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ -18,12 +18,11 @@
 #include <QtCore/QtGlobal>
 
 #ifdef LIBUTIL_STATIC
-	#define LIBUTIL_EXPORT
+#define LIBUTIL_EXPORT
+#else
+#ifdef LIBUTIL_LIBRARY
+#define LIBUTIL_EXPORT Q_DECL_EXPORT
 #else
-	#ifdef LIBUTIL_LIBRARY
-		#define LIBUTIL_EXPORT Q_DECL_EXPORT
-	#else
-		#define LIBUTIL_EXPORT Q_DECL_IMPORT
-	#endif
+#define LIBUTIL_EXPORT Q_DECL_IMPORT
+#endif
 #endif
-
diff --git a/depends/util/include/osutils.h b/depends/util/include/osutils.h
index c5d4bb61..d615d31f 100644
--- a/depends/util/include/osutils.h
+++ b/depends/util/include/osutils.h
@@ -3,7 +3,7 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ -13,17 +13,14 @@
  * limitations under the License.
  */
 
-#ifndef OSUTILS_H
-#define OSUTILS_H
+#pragma once
 
 #include <QString>
 
 #if defined _WIN32 | defined _WIN64
-#define WINDOWS	1
-#elif __APPLE__ & __MACH__
+#define WINDOWS 1
+#elif __APPLE__ &__MACH__
 #define OSX 1
 #elif __linux__
 #define LINUX 1
 #endif
-
-#endif // OSUTILS_H
diff --git a/depends/util/include/pathutils.h b/depends/util/include/pathutils.h
index c892c115..45c2a6de 100644
--- a/depends/util/include/pathutils.h
+++ b/depends/util/include/pathutils.h
@@ -3,7 +3,7 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ -13,8 +13,7 @@
  * limitations under the License.
  */
 
-#ifndef PATHUTILS_H
-#define PATHUTILS_H
+#pragma once
 
 #include <QString>
 
@@ -27,10 +26,10 @@ LIBUTIL_EXPORT QString AbsolutePath(QString path);
 
 /**
  * Normalize path
- * 
+ *
  * Any paths inside the current directory will be normalized to relative paths (to current)
  * Other paths will be made absolute
- * 
+ *
  * Returns false if the path logic somehow filed (and normalizedPath in invalid)
  */
 QString NormalizePath(QString path);
@@ -54,9 +53,7 @@ LIBUTIL_EXPORT bool ensureFolderPathExists(QString filenamepath);
 LIBUTIL_EXPORT bool copyPath(QString src, QString dst);
 
 /// Opens the given file in the default application.
-LIBUTIL_EXPORT void openFileInDefaultProgram ( QString filename );
+LIBUTIL_EXPORT void openFileInDefaultProgram(QString filename);
 
 /// Opens the given directory in the default application.
-LIBUTIL_EXPORT void openDirInDefaultProgram ( QString dirpath, bool ensureExists = false );
-
-#endif // PATHUTILS_H
+LIBUTIL_EXPORT void openDirInDefaultProgram(QString dirpath, bool ensureExists = false);
diff --git a/depends/util/include/siglist.h b/depends/util/include/siglist.h
deleted file mode 100644
index 24b1a889..00000000
--- a/depends/util/include/siglist.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Copyright 2013 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef SIGLIST_H
-#define SIGLIST_H
-
-#include <QObject>
-#include <QList>
-
-// A QList that allows emitting signals when the list changes.
-// Since QObject doesn't support templates, to use this class with a 
-// certain type, you should create a class deriving from SigList<T> and then
-// call the DEFINE_SIGLIST_SIGNALS(T) and SETUP_SIGLIST_SIGNALS(T) macros.
-template <typename T>
-class SigList : public QList<T>
-{
-public:
-	explicit SigList() : QList<T>() {}
-	
-	virtual void append(const T &value);
-	virtual void append(const QList<T> &other);
-	
-	virtual void clear();
-	
-	virtual void erase(typename QList<T>::iterator pos);
-	virtual void erase(typename QList<T>::iterator first, typename QList<T>::iterator last);
-	
-	virtual void insert(int i, const T &t);
-	virtual void insert(typename QList<T>::iterator before, const T &t);
-	
-	virtual void move(int from, int to);
-	
-	virtual void pop_back() { takeLast(); }
-	virtual void pop_front() { takeFirst(); }
-	
-	virtual void push_back(const T &t) { append(t); }
-	virtual void push_front(const T &t) { prepend(t); }
-	
-	virtual void prepend(const T &t);
-	
-	virtual int removeAll(const T &t);
-	virtual bool removeOne(const T &t);
-	
-	virtual void removeAt(int i) { takeAt(i); }
-	virtual void removeFirst() { takeFirst(); }
-	virtual void removeLast() { takeLast(); }
-	
-	virtual void swap(QList<T> &other);
-	virtual void swap(int i, int j);
-	
-	virtual T takeAt(int i);
-	virtual T takeFirst();
-	virtual T takeLast();
-	
-	virtual QList<T> &operator +=(const QList<T> &other) { append(other); return *this; }
-	virtual QList<T> &operator +=(const T &value) { append(value); return *this; }
-	virtual QList<T> &operator <<(const QList<T> &other) { append(other); return *this; }
-	virtual QList<T> &operator <<(const T &value) { append(value); return *this; }
-	
-	virtual QList<T> &operator =(const QList<T> &other);
-	
-protected:
-	// Signal emitted after an item is added to the list. 
-	// Contains a reference to item and the item's new index.
-	virtual void onItemAdded(const T &item, int index) = 0;
-	
-	// Signal emitted after multiple items are added to the list at once.
-	// The items parameter is a const reference to a QList of the items that 
-	// were added.
-	// The firstIndex parameter is the new index of the first item added.
-	virtual void onItemsAdded(const QList<T> &items, int firstIndex) = 0;
-	
-	// Signal emitted after an item is removed to the list.
-	// Contains a reference to the item and the item's old index.
-	virtual void onItemRemoved(const T &item, int index) = 0;
-	
-	// Signal emitted after multiple items are removed from the list at once.
-	// The items parameter is a const reference to a QList of the items that 
-	// were added.
-	// The firstIndex parameter is the new index of the first item added.
-	virtual void onItemsRemoved(const QList<T> &items, int firstIndex) = 0;
-	
-	// Signal emitted after an item is moved to another index.
-	// Contains the item, the old index, and the new index.
-	virtual void onItemMoved(const T &item, int oldIndex, int newIndex) = 0;
-	
-	// Signal emitted after an operation that changes the whole list occurs.
-	// This signal should be treated as if all data in the entire list was cleared 
-	// and new data added in its place.
-	virtual void onInvalidated() = 0;
-};
-
-// Defines the signals for a SigList
-#define DEFINE_SIGLIST_SIGNALS(TYPE) \
-	Q_SIGNAL void itemAdded(TYPE const &item, int index);\
-	Q_SIGNAL void itemsAdded(const QList<TYPE> &items, int firstIndex);\
-	Q_SIGNAL void itemRemoved(TYPE const &item, int index);\
-	Q_SIGNAL void itemsRemoved(const QList<TYPE> &items, int firstIndex);\
-	Q_SIGNAL void itemMoved(TYPE const &item, int oldIndex, int newIndex);\
-	Q_SIGNAL void invalidated();
-
-// Overrides the onItem* functions and causes them to emit their corresponding 
-// signals.
-#define SETUP_SIGLIST_SIGNALS(TYPE) \
-	virtual void onItemAdded(TYPE const &item, int index)\
-	{ emit itemAdded(item, index); }\
-	virtual void onItemsAdded(const QList<TYPE> &items, int firstIndex)\
-	{ emit itemsAdded(items, firstIndex); }\
-	virtual void onItemRemoved(TYPE const &item, int index)\
-	{ emit itemRemoved(item, index); }\
-	virtual void onItemsRemoved(const QList<TYPE> &items, int firstIndex)\
-	{ emit itemsRemoved(items, firstIndex); }\
-	virtual void onItemMoved(TYPE const &item, int oldIndex, int newIndex)\
-	{ emit itemMoved(item, oldIndex, newIndex); }\
-	virtual void onInvalidated() { emit invalidated(); }
-
-#endif // SIGLIST_H
diff --git a/depends/util/include/siglist_impl.h b/depends/util/include/siglist_impl.h
deleted file mode 100644
index 5cdc632a..00000000
--- a/depends/util/include/siglist_impl.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2013 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "siglist.h"
-
-template <typename T>
-void SigList<T>::append(const T &value)
-{
-	QList<T>::append(value);
-	onItemAdded(value, QList<T>::length() - 1);
-}
-
-template <typename T>
-void SigList<T>::prepend(const T &value)
-{
-	QList<T>::prepend(value);
-	onItemAdded(value, 0);
-}
-
-template <typename T>
-void SigList<T>::append(const QList<T> &other)
-{
-	int index = QList<T>::length();
-	QList<T>::append(other);
-	onItemsAdded(other, index);
-}
-
-template <typename T>
-void SigList<T>::clear()
-{
-	QList<T>::clear();
-	onInvalidated();
-}
-
-template <typename T>
-void SigList<T>::erase(typename QList<T>::iterator pos)
-{
-	T value = *pos;
-	int index = QList<T>::indexOf(*pos);
-	QList<T>::erase(pos);
-	onItemRemoved(value, index);
-}
-
-template <typename T>
-void SigList<T>::erase(typename QList<T>::iterator first, typename QList<T>::iterator last)
-{
-	QList<T> removedValues;
-	int firstIndex = QList<T>::indexOf(*first);
-	
-	for (auto iter = first; iter < last; iter++)
-	{
-		removedValues << *iter;
-		QList<T>::erase(iter);
-	}
-	
-	onItemsRemoved(removedValues, firstIndex);
-}
-
-template <typename T>
-void SigList<T>::insert(int i, const T &t)
-{
-	QList<T>::insert(i, t);
-	onItemAdded(t, i);
-}
-
-template <typename T>
-void SigList<T>::insert(typename QList<T>::iterator before, const T &t)
-{
-	QList<T>::insert(before, t);
-	onItemAdded(t, QList<T>::indexOf(t));
-}
-
-template <typename T>
-void SigList<T>::move(int from, int to)
-{
-	const T &item = QList<T>::at(from);
-	QList<T>::move(from, to);
-	onItemMoved(item, from, to);
-}
-
-template <typename T>
-int SigList<T>::removeAll(const T &t)
-{
-	int retVal = QList<T>::removeAll(t);
-	onInvalidated();
-	return retVal;
-}
-
-template <typename T>
-bool SigList<T>::removeOne(const T &t)
-{
-	int index = QList<T>::indexOf(t);
-	if (QList<T>::removeOne(t))
-	{
-		onItemRemoved(t, index);
-		return true;
-	}
-	return false;
-}
-
-template <typename T>
-void SigList<T>::swap(QList<T> &other)
-{
-	QList<T>::swap(other);
-	onInvalidated();
-}
-
-template <typename T>
-void SigList<T>::swap(int i, int j)
-{
-	const T &item1 = QList<T>::at(i);
-	const T &item2 = QList<T>::at(j);
-	QList<T>::swap(i, j);
-	onItemMoved(item1, i, j);
-	onItemMoved(item2, j, i);
-}
-
-template <typename T>
-T SigList<T>::takeAt(int i)
-{
-	T val = QList<T>::takeAt(i);
-	onItemRemoved(val, i);
-	return val;
-}
-
-template <typename T>
-T SigList<T>::takeFirst()
-{
-	return takeAt(0);
-}
-
-template <typename T>
-T SigList<T>::takeLast()
-{
-	return takeAt(QList<T>::length() - 1);
-}
-
-template <typename T>
-QList<T> &SigList<T>::operator =(const QList<T> &other)
-{
-	QList<T>::operator =(other);
-	onInvalidated();
-	return *this;
-}
diff --git a/depends/util/include/userutils.h b/depends/util/include/userutils.h
index 4f2760b1..6ce08bce 100644
--- a/depends/util/include/userutils.h
+++ b/depends/util/include/userutils.h
@@ -1,5 +1,4 @@
-#ifndef USERUTILS_H
-#define USERUTILS_H
+#pragma once
 
 #include <QString>
 
@@ -13,7 +12,6 @@ LIBUTIL_EXPORT QString getDesktopDir();
 // Create a shortcut at *location*, pointing to *dest* called with the arguments *args*
 // call it *name* and assign it the icon *icon*
 // return true if operation succeeded
-LIBUTIL_EXPORT bool createShortCut(QString location, QString dest, QStringList args, QString name, QString iconLocation);
+LIBUTIL_EXPORT bool createShortCut(QString location, QString dest, QStringList args,
+								   QString name, QString iconLocation);
 }
-
-#endif // USERUTILS_H
diff --git a/depends/util/src/cmdutils.cpp b/depends/util/src/cmdutils.cpp
index b9cab717..43a0bcde 100644
--- a/depends/util/src/cmdutils.cpp
+++ b/depends/util/src/cmdutils.cpp
@@ -21,8 +21,10 @@
  * @file libutil/src/cmdutils.cpp
  */
 
-namespace Util {
-namespace Commandline {
+namespace Util
+{
+namespace Commandline
+{
 
 // commandline splitter
 QStringList splitArgs(QString args)
@@ -31,10 +33,10 @@ QStringList splitArgs(QString args)
 	QString current;
 	bool escape = false;
 	QChar inquotes;
-	for (int i=0; i<args.length(); i++)
+	for (int i = 0; i < args.length(); i++)
 	{
 		QChar cchar = args.at(i);
-		
+
 		// \ escaped
 		if (escape)
 		{
@@ -73,7 +75,6 @@ QStringList splitArgs(QString args)
 	return argv;
 }
 
-	
 Parser::Parser(FlagStyle::Enum flagStyle, ArgumentStyle::Enum argStyle)
 {
 	m_flagStyle = flagStyle;
@@ -104,13 +105,13 @@ void Parser::addSwitch(QString name, bool def)
 {
 	if (m_params.contains(name))
 		throw "Name not unique";
-	
+
 	OptionDef *param = new OptionDef;
 	param->type = otSwitch;
 	param->name = name;
 	param->metavar = QString("<%1>").arg(name);
 	param->def = def;
-	
+
 	m_options[name] = param;
 	m_params[name] = (CommonDef *)param;
 	m_optionList.append(param);
@@ -120,13 +121,13 @@ void Parser::addOption(QString name, QVariant def)
 {
 	if (m_params.contains(name))
 		throw "Name not unique";
-	
+
 	OptionDef *param = new OptionDef;
 	param->type = otOption;
 	param->name = name;
 	param->metavar = QString("<%1>").arg(name);
 	param->def = def;
-	
+
 	m_options[name] = param;
 	m_params[name] = (CommonDef *)param;
 	m_optionList.append(param);
@@ -136,13 +137,13 @@ void Parser::addArgument(QString name, bool required, QVariant def)
 {
 	if (m_params.contains(name))
 		throw "Name not unique";
-	
+
 	PositionalDef *param = new PositionalDef;
 	param->name = name;
 	param->def = def;
 	param->required = required;
 	param->metavar = name;
-	
+
 	m_positionals.append(param);
 	m_params[name] = (CommonDef *)param;
 }
@@ -151,7 +152,7 @@ void Parser::addDocumentation(QString name, QString doc, QString metavar)
 {
 	if (!m_params.contains(name))
 		throw "Name does not exist";
-	
+
 	CommonDef *param = m_params[name];
 	param->doc = doc;
 	if (!metavar.isNull())
@@ -164,7 +165,7 @@ void Parser::addShortOpt(QString name, QChar flag)
 		throw "Name does not exist";
 	if (!m_options.contains(name))
 		throw "Name is not an Option or Swtich";
-	
+
 	OptionDef *param = m_options[name];
 	m_flags[flag] = param;
 	param->flag = flag;
@@ -175,14 +176,14 @@ QString Parser::compileHelp(QString progName, int helpIndent, bool useFlags)
 {
 	QStringList help;
 	help << compileUsage(progName, useFlags) << "\r\n";
-	
+
 	// positionals
 	if (!m_positionals.isEmpty())
 	{
 		help << "\r\n";
 		help << "Positional arguments:\r\n";
 		QListIterator<PositionalDef *> it2(m_positionals);
-		while(it2.hasNext())
+		while (it2.hasNext())
 		{
 			PositionalDef *param = it2.next();
 			help << "  " << param->metavar;
@@ -190,17 +191,17 @@ QString Parser::compileHelp(QString progName, int helpIndent, bool useFlags)
 			help << param->doc << "\r\n";
 		}
 	}
-	
+
 	// Options
 	if (!m_optionList.isEmpty())
 	{
 		help << "\r\n";
 		QString optPrefix, flagPrefix;
 		getPrefix(optPrefix, flagPrefix);
-		
+
 		help << "Options & Switches:\r\n";
 		QListIterator<OptionDef *> it(m_optionList);
-		while(it.hasNext())
+		while (it.hasNext())
 		{
 			OptionDef *option = it.next();
 			help << "  ";
@@ -213,7 +214,8 @@ QString Parser::compileHelp(QString progName, int helpIndent, bool useFlags)
 			help << optPrefix << option->name;
 			if (option->type == otOption)
 			{
-				QString arg = QString("%1%2").arg(((m_argStyle == ArgumentStyle::Equals) ? "=" : " "), option->metavar);
+				QString arg = QString("%1%2").arg(
+					((m_argStyle == ArgumentStyle::Equals) ? "=" : " "), option->metavar);
 				nameLength += arg.length();
 				help << arg;
 			}
@@ -221,7 +223,7 @@ QString Parser::compileHelp(QString progName, int helpIndent, bool useFlags)
 			help << option->doc << "\r\n";
 		}
 	}
-	
+
 	return help.join("");
 }
 
@@ -229,13 +231,13 @@ QString Parser::compileUsage(QString progName, bool useFlags)
 {
 	QStringList usage;
 	usage << "Usage: " << progName;
-	
+
 	QString optPrefix, flagPrefix;
 	getPrefix(optPrefix, flagPrefix);
-	
+
 	// options
 	QListIterator<OptionDef *> it(m_optionList);
-	while(it.hasNext())
+	while (it.hasNext())
 	{
 		OptionDef *option = it.next();
 		usage << " [";
@@ -244,20 +246,20 @@ QString Parser::compileUsage(QString progName, bool useFlags)
 		else
 			usage << optPrefix << option->name;
 		if (option->type == otOption)
-			usage << ((m_argStyle == ArgumentStyle::Equals) ? "=" : " ") <<  option->metavar;
+			usage << ((m_argStyle == ArgumentStyle::Equals) ? "=" : " ") << option->metavar;
 		usage << "]";
 	}
-	
+
 	// arguments
 	QListIterator<PositionalDef *> it2(m_positionals);
-	while(it2.hasNext())
+	while (it2.hasNext())
 	{
 		PositionalDef *param = it2.next();
 		usage << " " << (param->required ? "<" : "[");
 		usage << param->metavar;
 		usage << (param->required ? ">" : "]");
 	}
-	
+
 	return usage.join("");
 }
 
@@ -265,59 +267,63 @@ QString Parser::compileUsage(QString progName, bool useFlags)
 QHash<QString, QVariant> Parser::parse(QStringList argv)
 {
 	QHash<QString, QVariant> map;
-	
+
 	QStringListIterator it(argv);
 	QString programName = it.next();
-	
+
 	QString optionPrefix;
 	QString flagPrefix;
 	QListIterator<PositionalDef *> positionals(m_positionals);
 	QStringList expecting;
-	
+
 	getPrefix(optionPrefix, flagPrefix);
-	
+
 	while (it.hasNext())
 	{
 		QString arg = it.next();
-		
+
 		if (!expecting.isEmpty())
-			// we were expecting an argument
+		// we were expecting an argument
 		{
 			QString name = expecting.first();
-			
+
 			if (map.contains(name))
-				throw ParsingError(QString("Option %2%1 was given multiple times").arg(name, optionPrefix));
-			
+				throw ParsingError(
+					QString("Option %2%1 was given multiple times").arg(name, optionPrefix));
+
 			map[name] = QVariant(arg);
-			
+
 			expecting.removeFirst();
 			continue;
 		}
-		
+
 		if (arg.startsWith(optionPrefix))
-			// we have an option
+		// we have an option
 		{
-			//qDebug("Found option %s", qPrintable(arg));
-			
+			// qDebug("Found option %s", qPrintable(arg));
+
 			QString name = arg.mid(optionPrefix.length());
 			QString equals;
-			
-			if ((m_argStyle == ArgumentStyle::Equals || m_argStyle == ArgumentStyle::SpaceAndEquals) && name.contains("="))
+
+			if ((m_argStyle == ArgumentStyle::Equals ||
+				 m_argStyle == ArgumentStyle::SpaceAndEquals) &&
+				name.contains("="))
 			{
 				int i = name.indexOf("=");
-				equals = name.mid(i+1);
+				equals = name.mid(i + 1);
 				name = name.left(i);
 			}
-			
+
 			if (m_options.contains(name))
 			{
 				if (map.contains(name))
-					throw ParsingError(QString("Option %2%1 was given multiple times").arg(name, optionPrefix));
-				
+					throw ParsingError(QString("Option %2%1 was given multiple times")
+										   .arg(name, optionPrefix));
+
 				OptionDef *option = m_options[name];
 				if (option->type == otSwitch)
 					map[name] = true;
-				else //if (option->type == otOption)
+				else // if (option->type == otOption)
 				{
 					if (m_argStyle == ArgumentStyle::Space)
 						expecting.append(name);
@@ -326,85 +332,94 @@ QHash<QString, QVariant> Parser::parse(QStringList argv)
 					else if (m_argStyle == ArgumentStyle::SpaceAndEquals)
 						expecting.append(name);
 					else
-						throw ParsingError(QString("Option %2%1 reqires an argument.").arg(name, optionPrefix));
+						throw ParsingError(QString("Option %2%1 reqires an argument.")
+											   .arg(name, optionPrefix));
 				}
-				
+
 				continue;
 			}
-			
+
 			throw ParsingError(QString("Unknown Option %2%1").arg(name, optionPrefix));
 		}
-		
+
 		if (arg.startsWith(flagPrefix))
-			// we have (a) flag(s)
+		// we have (a) flag(s)
 		{
-			//qDebug("Found flags %s", qPrintable(arg));
-			
+			// qDebug("Found flags %s", qPrintable(arg));
+
 			QString flags = arg.mid(flagPrefix.length());
 			QString equals;
-			
-			if ((m_argStyle == ArgumentStyle::Equals || m_argStyle == ArgumentStyle::SpaceAndEquals) && flags.contains("="))
+
+			if ((m_argStyle == ArgumentStyle::Equals ||
+				 m_argStyle == ArgumentStyle::SpaceAndEquals) &&
+				flags.contains("="))
 			{
 				int i = flags.indexOf("=");
-				equals = flags.mid(i+1);
+				equals = flags.mid(i + 1);
 				flags = flags.left(i);
 			}
-			
+
 			for (int i = 0; i < flags.length(); i++)
 			{
 				QChar flag = flags.at(i);
-				
+
 				if (!m_flags.contains(flag))
 					throw ParsingError(QString("Unknown flag %2%1").arg(flag, flagPrefix));
-				
+
 				OptionDef *option = m_flags[flag];
-				
+
 				if (map.contains(option->name))
-					throw ParsingError(QString("Option %2%1 was given multiple times").arg(option->name, optionPrefix));
-				
+					throw ParsingError(QString("Option %2%1 was given multiple times")
+										   .arg(option->name, optionPrefix));
+
 				if (option->type == otSwitch)
 					map[option->name] = true;
-				else //if (option->type == otOption)
+				else // if (option->type == otOption)
 				{
 					if (m_argStyle == ArgumentStyle::Space)
 						expecting.append(option->name);
 					else if (!equals.isNull())
-						if (i == flags.length()-1)
+						if (i == flags.length() - 1)
 							map[option->name] = equals;
 						else
-							throw ParsingError(QString("Flag %4%2 of Argument-requiring Option %1 not last flag in %4%3").arg(option->name, flag, flags, flagPrefix));
+							throw ParsingError(QString("Flag %4%2 of Argument-requiring Option "
+													   "%1 not last flag in %4%3")
+												   .arg(option->name, flag, flags, flagPrefix));
 					else if (m_argStyle == ArgumentStyle::SpaceAndEquals)
 						expecting.append(option->name);
 					else
-						throw ParsingError(QString("Option %1 reqires an argument. (flag %3%2)").arg(option->name, flag, flagPrefix));
+						throw ParsingError(QString("Option %1 reqires an argument. (flag %3%2)")
+											   .arg(option->name, flag, flagPrefix));
 				}
 			}
-			
+
 			continue;
 		}
-		
+
 		// must be a positional argument
 		if (!positionals.hasNext())
 			throw ParsingError(QString("Don't know what to do with '%1'").arg(arg));
-		
+
 		PositionalDef *param = positionals.next();
-		
+
 		map[param->name] = arg;
 	}
-	
+
 	// check if we're missing something
 	if (!expecting.isEmpty())
-		throw ParsingError(QString("Was still expecting arguments for %2%1").arg(expecting.join(QString(", ")+optionPrefix), optionPrefix));
-	
+		throw ParsingError(QString("Was still expecting arguments for %2%1").arg(
+			expecting.join(QString(", ") + optionPrefix), optionPrefix));
+
 	while (positionals.hasNext())
 	{
 		PositionalDef *param = positionals.next();
 		if (param->required)
-			throw ParsingError(QString("Missing required positional argument '%1'").arg(param->name));
+			throw ParsingError(
+				QString("Missing required positional argument '%1'").arg(param->name));
 		else
 			map[param->name] = param->def;
 	}
-	
+
 	// fill out gaps
 	QListIterator<OptionDef *> iter(m_optionList);
 	while (iter.hasNext())
@@ -413,27 +428,27 @@ QHash<QString, QVariant> Parser::parse(QStringList argv)
 		if (!map.contains(option->name))
 			map[option->name] = option->def;
 	}
-	
+
 	return map;
 }
 
-//clear defs
+// clear defs
 void Parser::clear()
 {
 	m_flags.clear();
 	m_params.clear();
 	m_options.clear();
-	
+
 	QMutableListIterator<OptionDef *> it(m_optionList);
-	while(it.hasNext())
+	while (it.hasNext())
 	{
 		OptionDef *option = it.next();
 		it.remove();
 		delete option;
 	}
-	
+
 	QMutableListIterator<PositionalDef *> it2(m_positionals);
-	while(it2.hasNext())
+	while (it2.hasNext())
 	{
 		PositionalDef *arg = it2.next();
 		it2.remove();
@@ -441,31 +456,30 @@ void Parser::clear()
 	}
 }
 
-//Destructor
+// Destructor
 Parser::~Parser()
 {
 	clear();
 }
 
-//getPrefix
+// getPrefix
 void Parser::getPrefix(QString &opt, QString &flag)
 {
 	if (m_flagStyle == FlagStyle::Windows)
 		opt = flag = "/";
 	else if (m_flagStyle == FlagStyle::Unix)
 		opt = flag = "-";
-	//else if (m_flagStyle == FlagStyle::GNU)
-	else {
+	// else if (m_flagStyle == FlagStyle::GNU)
+	else
+	{
 		opt = "--";
 		flag = "-";
 	}
 }
 
 // ParsingError
-ParsingError::ParsingError(const QString &what)
-:std::runtime_error(what.toStdString())
+ParsingError::ParsingError(const QString &what) : std::runtime_error(what.toStdString())
 {
 }
-
 }
 }
diff --git a/depends/util/src/osutils.cpp b/depends/util/src/osutils.cpp
deleted file mode 100644
index 9a85d1e5..00000000
--- a/depends/util/src/osutils.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2013 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "include/osutils.h"
-
-#include <QUrl>
-#include <QFileInfo>
diff --git a/depends/util/src/pathutils.cpp b/depends/util/src/pathutils.cpp
index ad8d7566..485d03e8 100644
--- a/depends/util/src/pathutils.cpp
+++ b/depends/util/src/pathutils.cpp
@@ -3,7 +3,7 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ -41,7 +41,7 @@ QString AbsolutePath(QString path)
 
 /**
  * Normalize path
- * 
+ *
  * Any paths inside the current directory will be normalized to relative paths (to current)
  * Other paths will be made absolute
  */
@@ -85,7 +85,7 @@ QString DirNameFromString(QString string, QString inDir)
 	{
 		num++;
 		dirName = RemoveInvalidFilenameChars(dirName, '-') + QString::number(num);
-		
+
 		// If it's over 9000
 		if (num > 9000)
 			return "";
@@ -95,59 +95,56 @@ QString DirNameFromString(QString string, QString inDir)
 
 bool ensureFilePathExists(QString filenamepath)
 {
-	QFileInfo a ( filenamepath );
+	QFileInfo a(filenamepath);
 	QDir dir;
 	QString ensuredPath = a.path();
-	bool success = dir.mkpath ( ensuredPath );
+	bool success = dir.mkpath(ensuredPath);
 	return success;
 }
 
 bool ensureFolderPathExists(QString foldernamepath)
 {
-	QFileInfo a ( foldernamepath );
+	QFileInfo a(foldernamepath);
 	QDir dir;
 	QString ensuredPath = a.filePath();
-	bool success = dir.mkpath ( ensuredPath );
+	bool success = dir.mkpath(ensuredPath);
 	return success;
 }
 
-
 bool copyPath(QString src, QString dst)
 {
 	QDir dir(src);
 	if (!dir.exists())
 		return false;
-	if(!ensureFolderPathExists(dst))
+	if (!ensureFolderPathExists(dst))
 		return false;
 
-	foreach (QString d, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
+	foreach(QString d, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
 	{
 		QString inner_src = src + QDir::separator() + d;
 		QString inner_dst = dst + QDir::separator() + d;
 		copyPath(inner_src, inner_dst);
 	}
 
-	foreach (QString f, dir.entryList(QDir::Files))
+	foreach(QString f, dir.entryList(QDir::Files))
 	{
 		QFile::copy(src + QDir::separator() + f, dst + QDir::separator() + f);
 	}
 	return true;
 }
 
-void openDirInDefaultProgram ( QString path, bool ensureExists )
+void openDirInDefaultProgram(QString path, bool ensureExists)
 {
 	QDir parentPath;
-	QDir dir( path );
-	if(!dir.exists())
+	QDir dir(path);
+	if (!dir.exists())
 	{
 		parentPath.mkpath(dir.absolutePath());
 	}
-	QDesktopServices::openUrl ( "file:///" + dir.absolutePath() );
+	QDesktopServices::openUrl("file:///" + dir.absolutePath());
 }
 
-void openFileInDefaultProgram ( QString filename )
+void openFileInDefaultProgram(QString filename)
 {
-	QDesktopServices::openUrl ( "file:///" + QFileInfo ( filename ).absolutePath() );
+	QDesktopServices::openUrl("file:///" + QFileInfo(filename).absolutePath());
 }
-
-
diff --git a/depends/util/src/userutils.cpp b/depends/util/src/userutils.cpp
index b70841ed..060a58e9 100644
--- a/depends/util/src/userutils.cpp
+++ b/depends/util/src/userutils.cpp
@@ -23,37 +23,37 @@ bool called_coinit = false;
 HRESULT CreateLink(LPCSTR linkPath, LPCSTR targetPath, LPCSTR args)
 {
 	HRESULT hres;
-	
+
 	if (!called_coinit)
 	{
 		hres = CoInitialize(NULL);
 		called_coinit = true;
-		
+
 		if (!SUCCEEDED(hres))
 		{
 			qWarning("Failed to initialize COM. Error 0x%08X", hres);
 			return hres;
 		}
 	}
-	
-	
-	IShellLink* link;
-	hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink, (LPVOID*)&link);
-	
+
+	IShellLink *link;
+	hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink,
+							(LPVOID *)&link);
+
 	if (SUCCEEDED(hres))
 	{
-		IPersistFile* persistFile;
-		
+		IPersistFile *persistFile;
+
 		link->SetPath(targetPath);
 		link->SetArguments(args);
-		
-		hres = link->QueryInterface(IID_IPersistFile, (LPVOID*)&persistFile);
+
+		hres = link->QueryInterface(IID_IPersistFile, (LPVOID *)&persistFile);
 		if (SUCCEEDED(hres))
 		{
 			WCHAR wstr[MAX_PATH];
-			
+
 			MultiByteToWideChar(CP_ACP, 0, linkPath, -1, wstr, MAX_PATH);
-			
+
 			hres = persistFile->Save(wstr, TRUE);
 			persistFile->Release();
 		}
@@ -70,51 +70,55 @@ QString Util::getDesktopDir()
 }
 
 // Cross-platform Shortcut creation
-bool Util::createShortCut(QString location, QString dest, QStringList args, QString name, QString icon)
+bool Util::createShortCut(QString location, QString dest, QStringList args, QString name,
+						  QString icon)
 {
 #if LINUX
 	location = PathCombine(location, name + ".desktop");
 	qDebug("location: %s", qPrintable(location));
-	
+
 	QFile f(location);
 	f.open(QIODevice::WriteOnly | QIODevice::Text);
 	QTextStream stream(&f);
-	
+
 	QString argstring;
 	if (!args.empty())
 		argstring = " '" + args.join("' '") + "'";
-	
-	stream << "[Desktop Entry]" << "\n";
-	stream << "Type=Application" << "\n";
+
+	stream << "[Desktop Entry]"
+		   << "\n";
+	stream << "Type=Application"
+		   << "\n";
 	stream << "TryExec=" << dest.toLocal8Bit() << "\n";
 	stream << "Exec=" << dest.toLocal8Bit() << argstring.toLocal8Bit() << "\n";
 	stream << "Name=" << name.toLocal8Bit() << "\n";
 	stream << "Icon=" << icon.toLocal8Bit() << "\n";
-	
+
 	stream.flush();
 	f.close();
-	
-	f.setPermissions(f.permissions() | QFileDevice::ExeOwner | QFileDevice::ExeGroup | QFileDevice::ExeOther);
-	
+
+	f.setPermissions(f.permissions() | QFileDevice::ExeOwner | QFileDevice::ExeGroup |
+					 QFileDevice::ExeOther);
+
 	return true;
 #elif WINDOWS
 	// TODO: Fix
-//	QFile file(PathCombine(location, name + ".lnk"));
-//	WCHAR *file_w;
-//	WCHAR *dest_w;
-//	WCHAR *args_w;
-//	file.fileName().toWCharArray(file_w);
-//	dest.toWCharArray(dest_w);
-	
-//	QString argStr;
-//	for (int i = 0; i < args.count(); i++)
-//	{
-//		argStr.append(args[i]);
-//		argStr.append(" ");
-//	}
-//	argStr.toWCharArray(args_w);
-	
-//	return SUCCEEDED(CreateLink(file_w, dest_w, args_w));
+	//	QFile file(PathCombine(location, name + ".lnk"));
+	//	WCHAR *file_w;
+	//	WCHAR *dest_w;
+	//	WCHAR *args_w;
+	//	file.fileName().toWCharArray(file_w);
+	//	dest.toWCharArray(dest_w);
+
+	//	QString argStr;
+	//	for (int i = 0; i < args.count(); i++)
+	//	{
+	//		argStr.append(args[i]);
+	//		argStr.append(" ");
+	//	}
+	//	argStr.toWCharArray(args_w);
+
+	//	return SUCCEEDED(CreateLink(file_w, dest_w, args_w));
 	return false;
 #else
 	qWarning("Desktop Shortcuts not supported on your platform!");