0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE clean up and fix win32 includes in FileSystem implementation

Browse Source
This commit is contained in:
Petr Mrázek 2018-02-11 01:29:43 +01:00
parent 604295e6d5
commit 2c219df061
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/logic/FileSystem.cpp
View File

@ -3,16 +3,24 @@
#include "FileSystem.h" #include "FileSystem.h"
#include <QDir> #include <QDir>
#include <QFile>
#include <QSaveFile> #include <QSaveFile>
#include <QFileInfo> #include <QFileInfo>
#include <QDebug> #include <QDebug>
#include <QUrl> #include <QUrl>
#include <QStandardPaths> #include <QStandardPaths>
#include <QTextStream>
#if defined Q_OS_WIN32 #if defined Q_OS_WIN32
#include <windows.h> #include <windows.h>
#include <string> #include <string>
#include <sys/utime.h> #include <sys/utime.h>
#include <winnls.h>
#include <shobjidl.h>
#include <objbase.h>
#include <objidl.h>
#include <shlguid.h>
#include <shlobj.h>
#else #else
#include <utime.h> #include <utime.h>
#endif #endif
@ -332,21 +340,9 @@ bool checkProblemticPathJava(QDir folder)
return pathfoldername.contains("!", Qt::CaseInsensitive); return pathfoldername.contains("!", Qt::CaseInsensitive);
} }
#include <QStandardPaths>
#include <QFile>
#include <QTextStream>
// Win32 crap // Win32 crap
#if defined Q_OS_WIN #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; bool called_coinit = false;
HRESULT CreateLink(LPCSTR linkPath, LPCSTR targetPath, LPCSTR args) HRESULT CreateLink(LPCSTR linkPath, LPCSTR targetPath, LPCSTR args)