diff options
| author | Petr Mrázek <peterix@gmail.com> | 2018-02-11 01:29:43 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2018-02-11 01:29:43 +0100 |
| commit | 2c219df061e67305a4af96d543dc1c4f1e570719 (patch) | |
| tree | a95ae488675dca8a454bc0fd2daf65572afc1449 | |
| parent | 604295e6d504f6e41ec2f91500479edbf2838a2d (diff) | |
| download | MultiMC-2c219df061e67305a4af96d543dc1c4f1e570719.tar MultiMC-2c219df061e67305a4af96d543dc1c4f1e570719.tar.gz MultiMC-2c219df061e67305a4af96d543dc1c4f1e570719.tar.lz MultiMC-2c219df061e67305a4af96d543dc1c4f1e570719.tar.xz MultiMC-2c219df061e67305a4af96d543dc1c4f1e570719.zip | |
NOISSUE clean up and fix win32 includes in FileSystem implementation
| -rw-r--r-- | api/logic/FileSystem.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/api/logic/FileSystem.cpp b/api/logic/FileSystem.cpp index d24d9364..4b47f415 100644 --- a/api/logic/FileSystem.cpp +++ b/api/logic/FileSystem.cpp @@ -3,16 +3,24 @@ #include "FileSystem.h" #include <QDir> +#include <QFile> #include <QSaveFile> #include <QFileInfo> #include <QDebug> #include <QUrl> #include <QStandardPaths> +#include <QTextStream> #if defined Q_OS_WIN32 #include <windows.h> #include <string> #include <sys/utime.h> + #include <winnls.h> + #include <shobjidl.h> + #include <objbase.h> + #include <objidl.h> + #include <shlguid.h> + #include <shlobj.h> #else #include <utime.h> #endif @@ -332,21 +340,9 @@ bool checkProblemticPathJava(QDir folder) return pathfoldername.contains("!", Qt::CaseInsensitive); } -#include <QStandardPaths> -#include <QFile> -#include <QTextStream> - // Win32 crap #if defined Q_OS_WIN -#include <windows.h> -#include <winnls.h> -#include <shobjidl.h> -#include <objbase.h> -#include <objidl.h> -#include <shlguid.h> -#include <shlobj.h> - bool called_coinit = false; HRESULT CreateLink(LPCSTR linkPath, LPCSTR targetPath, LPCSTR args) |