Merge branch 'inst_rewrite' of https://github.com/Forkk/MultiMC5

Conflicts:
	data/instancemodel.cpp

1 files changed, 37 insertions, 0 deletions

diff --git a/libutil/src/pathutils.cpp b/libutil/src/pathutils.cpp
new file mode 100644
index 00000000..8e91bf31
--- /dev/null
+++ b/libutil/src/pathutils.cpp
@@ -0,0 +1,37 @@
+/* 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/pathutils.h"
+
+#include <QFileInfo>
+#include <QDir>
+
+QString PathCombine(QString path1, QString path2)
+{
+	if (!path1.endsWith('/'))
+		return path1.append('/').append(path2);
+	else
+		return path1.append(path2);
+}
+
+QString PathCombine(QString path1, QString path2, QString path3)
+{
+	return PathCombine(PathCombine(path1, path2), path3);
+}
+
+QString AbsolutePath(QString path)
+{
+	return QFileInfo(path).absolutePath();
+}