CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE dissolve util library

Browse Source
This commit is contained in:
Petr Mrázek
2015-10-05 01:47:27 +02:00
parent 7459eb627c
commit f93f867c3d
80 changed files with 770 additions and 869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
logic/java/JavaChecker.cpp
View File

@ -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)

1
logic/java/JavaCheckerJob.cpp
View File

@ -14,7 +14,6 @@
*/
#include "JavaCheckerJob.h"
#include "pathutils.h"
#include <QDebug>

1
logic/java/JavaUtils.cpp
View File

@ -19,7 +19,6 @@
#include <QStringList>
#include <settings/Setting.h>
#include <pathutils.h>
#include <QDebug>
#include "java/JavaUtils.h"

5
logic/java/JavaUtils.h
View File

@ -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
};