NOISSUE dissolve util library

4 files changed, 6 insertions, 9 deletions

diff --git a/logic/java/JavaChecker.cpp b/logic/java/JavaChecker.cpp
index 9c8d5f68..dfda464f 100644
--- a/logic/java/JavaChecker.cpp
+++ b/logic/java/JavaChecker.cpp
@@ -1,6 +1,6 @@
 #include "JavaChecker.h"
-#include <pathutils.h>
-#include <cmdutils.h>
+#include <FileSystem.h>
+#include <Commandline.h>
 #include <QFile>
 #include <QProcess>
 #include <QMap>
@@ -14,14 +14,14 @@ JavaChecker::JavaChecker(QObject *parent) : QObject(parent)
 
 void JavaChecker::performCheck()
 {
-	QString checkerJar = PathCombine(QCoreApplication::applicationDirPath(), "jars", "JavaCheck.jar");
+	QString checkerJar = FS::PathCombine(QCoreApplication::applicationDirPath(), "jars", "JavaCheck.jar");
 
 	QStringList args;
 
 	process.reset(new QProcess());
 	if(m_args.size())
 	{
-		auto extraArgs = Util::Commandline::splitArgs(m_args);
+		auto extraArgs = Commandline::splitArgs(m_args);
 		args.append(extraArgs);
 	}
 	if(m_minMem != 0)
diff --git a/logic/java/JavaCheckerJob.cpp b/logic/java/JavaCheckerJob.cpp
index bf4271c2..0b040e43 100644
--- a/logic/java/JavaCheckerJob.cpp
+++ b/logic/java/JavaCheckerJob.cpp
@@ -14,7 +14,6 @@
  */
 
 #include "JavaCheckerJob.h"
-#include "pathutils.h"
 
 #include <QDebug>
 
diff --git a/logic/java/JavaUtils.cpp b/logic/java/JavaUtils.cpp
index ac1d60e4..80ded3ee 100644
--- a/logic/java/JavaUtils.cpp
+++ b/logic/java/JavaUtils.cpp
@@ -19,7 +19,6 @@
 #include <QStringList>
 
 #include <settings/Setting.h>
-#include <pathutils.h>
 
 #include <QDebug>
 #include "java/JavaUtils.h"
diff --git a/logic/java/JavaUtils.h b/logic/java/JavaUtils.h
index d4dd2409..78693b37 100644
--- a/logic/java/JavaUtils.h
+++ b/logic/java/JavaUtils.h
@@ -18,12 +18,11 @@
 #include <QStringList>
 #include <QWidget>
 
-#include <osutils.h>
 #include "JavaCheckerJob.h"
 #include "JavaChecker.h"
 #include "JavaVersionList.h"
 
-#if WINDOWS
+#ifdef Q_OS_WIN
 #include <windows.h>
 #endif
 
@@ -39,7 +38,7 @@ public:
 	QList<QString> FindJavaPaths();
 	JavaVersionPtr GetDefaultJava();
 
-#if WINDOWS
+#ifdef Q_OS_WIN
 	QList<JavaVersionPtr> FindJavaFromRegistryKey(DWORD keyType, QString keyName);
 #endif
 };