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

NOISSUE move everything.

Browse Source
This commit is contained in:
Petr Mrázek
2015-02-09 01:51:14 +01:00
parent 4730f54df7
commit db877ba121
665 changed files with 1321 additions and 1374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
logic/BaseInstaller.cpp
View File

@ -15,8 +15,8 @@
#include <QFile>
#include "logic/BaseInstaller.h"
#include "logic/minecraft/OneSixInstance.h"
#include "BaseInstaller.h"
#include "minecraft/OneSixInstance.h"
BaseInstaller::BaseInstaller()
{

10
logic/BaseInstance.cpp
View File

@ -18,14 +18,14 @@
#include <QFileInfo>
#include <QDir>
#include "logic/settings/INISettingsObject.h"
#include "logic/settings/Setting.h"
#include "logic/settings/OverrideSetting.h"
#include "settings/INISettingsObject.h"
#include "settings/Setting.h"
#include "settings/OverrideSetting.h"
#include "pathutils.h"
#include <cmdutils.h>
#include "logic/minecraft/MinecraftVersionList.h"
#include "logic/icons/IconList.h"
#include "minecraft/MinecraftVersionList.h"
#include "icons/IconList.h"
BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
: QObject()

10
logic/BaseInstance.h
View File

@ -19,11 +19,11 @@
#include <QDateTime>
#include <QSet>
#include "logic/settings/SettingsObject.h"
#include "settings/SettingsObject.h"
#include "logic/settings/INIFile.h"
#include "logic/BaseVersionList.h"
#include "logic/auth/MojangAccount.h"
#include "settings/INIFile.h"
#include "BaseVersionList.h"
#include "auth/MojangAccount.h"
class QDir;
class Task;
@ -186,7 +186,7 @@ protected slots:
protected:
QString m_rootDir;
QString m_group;
std::shared_ptr<SettingsObject> m_settings;
SettingsObjectPtr m_settings;
InstanceFlags m_flags;
bool m_isRunning = false;
};

3
logic/BaseProcess.cpp
View File

@ -14,7 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "logic/BaseProcess.h"
#include "BaseProcess.h"
#include <QDebug>
#include <QDir>
#include <QEventLoop>

4
logic/BaseVersionList.cpp
View File

@ -13,8 +13,8 @@
* limitations under the License.
*/
#include "logic/BaseVersionList.h"
#include "logic/BaseVersion.h"
#include "BaseVersionList.h"
#include "BaseVersion.h"
BaseVersionList::BaseVersionList(QObject *parent) : QAbstractListModel(parent)
{

2
logic/BaseVersionList.h
View File

@ -19,7 +19,7 @@
#include <QVariant>
#include <QAbstractListModel>
#include "logic/BaseVersion.h"
#include "BaseVersion.h"
class Task;

258
logic/CMakeLists.txt Normal file
View File

@ -0,0 +1,258 @@
project(MultiMC-Logic)
SET(LOGIC_SOURCES
# LOGIC - Base classes and infrastructure
BaseInstaller.h
BaseInstaller.cpp
BaseVersionList.h
BaseVersionList.cpp
InstanceList.h
InstanceList.cpp
BaseVersion.h
BaseProcess.h
BaseProcess.cpp
BaseInstance.h
BaseInstance.cpp
MMCError.h
# WARNING: globals live here
Env.h
Env.cpp
# JSON parsing helpers
MMCJson.h
MMCJson.cpp
# RW lock protected map
RWStorage.h
# A variable that has an implicit default value and keeps track of changes
DefaultVariable.h
# a smart pointer wrapper intended for safer use with Qt signal/slot mechanisms
QObjectPtr.h
# network stuffs
net/NetAction.h
net/MD5EtagDownload.h
net/MD5EtagDownload.cpp
net/ByteArrayDownload.h
net/ByteArrayDownload.cpp
net/CacheDownload.h
net/CacheDownload.cpp
net/NetJob.h
net/NetJob.cpp
net/HttpMetaCache.h
net/HttpMetaCache.cpp
net/PasteUpload.h
net/PasteUpload.cpp
net/URLConstants.h
net/URLConstants.cpp
# Yggdrasil login stuff
auth/AuthSession.h
auth/AuthSession.cpp
auth/MojangAccountList.h
auth/MojangAccountList.cpp
auth/MojangAccount.h
auth/MojangAccount.cpp
auth/YggdrasilTask.h
auth/YggdrasilTask.cpp
auth/flows/AuthenticateTask.h
auth/flows/AuthenticateTask.cpp
auth/flows/RefreshTask.cpp
auth/flows/RefreshTask.cpp
auth/flows/ValidateTask.h
auth/flows/ValidateTask.cpp
# Update system
updater/GoUpdate.h
updater/GoUpdate.cpp
updater/UpdateChecker.h
updater/UpdateChecker.cpp
updater/DownloadTask.h
updater/DownloadTask.cpp
# Notifications - short warning messages
notifications/NotificationChecker.h
notifications/NotificationChecker.cpp
# News System
news/NewsChecker.h
news/NewsChecker.cpp
news/NewsEntry.h
news/NewsEntry.cpp
# Status system
status/StatusChecker.h
status/StatusChecker.cpp
# Minecraft support
minecraft/OneSixUpdate.h
minecraft/OneSixUpdate.cpp
minecraft/OneSixInstance.h
minecraft/OneSixInstance.cpp
minecraft/LegacyUpdate.h
minecraft/LegacyUpdate.cpp
minecraft/LegacyInstance.h
minecraft/LegacyInstance.cpp
minecraft/LwjglVersionList.h
minecraft/LwjglVersionList.cpp
minecraft/SkinUtils.h
minecraft/SkinUtils.cpp
minecraft/JarUtils.h
minecraft/JarUtils.cpp
minecraft/GradleSpecifier.h
minecraft/MinecraftProfile.cpp
minecraft/MinecraftProfile.h
minecraft/JarMod.cpp
minecraft/JarMod.h
minecraft/MinecraftInstance.cpp
minecraft/MinecraftInstance.h
minecraft/MinecraftProcess.cpp
minecraft/MinecraftProcess.h
minecraft/MinecraftVersion.cpp
minecraft/MinecraftVersion.h
minecraft/MinecraftVersionList.cpp
minecraft/MinecraftVersionList.h
minecraft/NullProfileStrategy.h
minecraft/OneSixLibrary.cpp
minecraft/OneSixLibrary.h
minecraft/OneSixProfileStrategy.cpp
minecraft/OneSixProfileStrategy.h
minecraft/OneSixRule.cpp
minecraft/OneSixRule.h
minecraft/OpSys.cpp
minecraft/OpSys.h
minecraft/ParseUtils.cpp
minecraft/ParseUtils.h
minecraft/ProfileUtils.cpp
minecraft/ProfileUtils.h
minecraft/ProfileStrategy.h
minecraft/RawLibrary.cpp
minecraft/RawLibrary.h
minecraft/VersionBuilder.cpp
minecraft/VersionBuilder.h
minecraft/VersionBuildError.h
minecraft/VersionFile.cpp
minecraft/VersionFile.h
minecraft/ProfilePatch.h
minecraft/VersionSource.h
minecraft/VersionFilterData.h
minecraft/VersionFilterData.cpp
minecraft/Mod.h
minecraft/Mod.cpp
minecraft/ModList.h
minecraft/ModList.cpp
# FTB
ftb/OneSixFTBInstance.h
ftb/OneSixFTBInstance.cpp
ftb/LegacyFTBInstance.h
ftb/LegacyFTBInstance.cpp
ftb/FTBProfileStrategy.h
ftb/FTBProfileStrategy.cpp
ftb/FTBPlugin.h
ftb/FTBPlugin.cpp
# A Recursive file system watcher
RecursiveFileSystemWatcher.h
RecursiveFileSystemWatcher.cpp
# the screenshots feature
screenshots/Screenshot.h
screenshots/ImgurUpload.h
screenshots/ImgurUpload.cpp
screenshots/ImgurAlbumCreation.h
screenshots/ImgurAlbumCreation.cpp
# Icons
icons/MMCIcon.h
icons/MMCIcon.cpp
icons/IconList.h
icons/IconList.cpp
# Tasks
tasks/ProgressProvider.h
tasks/Task.h
tasks/Task.cpp
tasks/ThreadTask.h
tasks/ThreadTask.cpp
tasks/SequentialTask.h
tasks/SequentialTask.cpp
# Settings
settings/INIFile.cpp
settings/INIFile.h
settings/INISettingsObject.cpp
settings/INISettingsObject.h
settings/OverrideSetting.cpp
settings/OverrideSetting.h
settings/Setting.cpp
settings/Setting.h
settings/SettingsObject.cpp
settings/SettingsObject.h
# Java related code
java/JavaChecker.h
java/JavaChecker.cpp
java/JavaUtils.h
java/JavaUtils.cpp
java/JavaVersionList.h
java/JavaVersionList.cpp
java/JavaCheckerJob.h
java/JavaCheckerJob.cpp
# Assets
minecraft/AssetsUtils.h
minecraft/AssetsUtils.cpp
# Forge and all things forge related
forge/ForgeVersion.h
forge/ForgeVersion.cpp
forge/ForgeVersionList.h
forge/ForgeVersionList.cpp
forge/ForgeMirror.h
forge/ForgeMirrors.h
forge/ForgeMirrors.cpp
forge/ForgeXzDownload.h
forge/ForgeXzDownload.cpp
forge/LegacyForge.h
forge/LegacyForge.cpp
forge/ForgeInstaller.h
forge/ForgeInstaller.cpp
# Liteloader and related things
liteloader/LiteLoaderInstaller.h
liteloader/LiteLoaderInstaller.cpp
liteloader/LiteLoaderVersionList.h
liteloader/LiteLoaderVersionList.cpp
# Translations
trans/TranslationDownloader.h
trans/TranslationDownloader.cpp
# Tools
tools/BaseExternalTool.cpp
tools/BaseExternalTool.h
tools/BaseProfiler.cpp
tools/BaseProfiler.h
tools/JProfiler.cpp
tools/JProfiler.h
tools/JVisualVM.cpp
tools/JVisualVM.h
tools/MCEditTool.cpp
tools/MCEditTool.h
)
################################ COMPILE ################################
# Add common library
add_library(MultiMC_logic STATIC ${LOGIC_SOURCES})
# Link
target_link_libraries(MultiMC_logic xz-embedded unpack200 iconfix libUtil LogicalGui ${QUAZIP_LIBRARIES}
Qt5::Core Qt5::Xml Qt5::Widgets Qt5::Network Qt5::Concurrent Qt5::WebKitWidgets
${MultiMC_LINK_ADDITIONAL_LIBS})
add_dependencies(MultiMC_logic QuaZIP)

4
logic/Env.cpp
View File

@ -1,5 +1,5 @@
#include "Env.h"
#include "logic/net/HttpMetaCache.h"
#include "net/HttpMetaCache.h"
#include "icons/IconList.h"
#include "BaseVersion.h"
#include "BaseVersionList.h"
@ -7,7 +7,7 @@
#include <QNetworkProxy>
#include <QNetworkAccessManager>
#include <QDebug>
#include "logic/tasks/Task.h"
#include "tasks/Task.h"
#include <QDebug>
/*

12
logic/InstanceList.cpp
View File

@ -27,16 +27,16 @@
#include <pathutils.h>
#include <QDebug>
#include "logic/InstanceList.h"
#include "logic/icons/IconList.h"
#include "logic/BaseInstance.h"
#include "InstanceList.h"
#include "icons/IconList.h"
#include "BaseInstance.h"
//FIXME: this really doesn't belong *here*
#include "logic/minecraft/OneSixInstance.h"
#include "logic/minecraft/LegacyInstance.h"
#include "minecraft/OneSixInstance.h"
#include "minecraft/LegacyInstance.h"
#include "minecraft/MinecraftVersion.h"
#include "settings/INISettingsObject.h"
#include "logic/ftb/FTBPlugin.h"
#include "ftb/FTBPlugin.h"
const static int GROUP_FILE_FORMAT_VERSION = 1;

2
logic/InstanceList.h
View File

@ -19,7 +19,7 @@
#include <QAbstractListModel>
#include <QSet>
#include "logic/BaseInstance.h"
#include "BaseInstance.h"
class BaseInstance;
class QDir;

25
logic/MMCError.h Normal file
View File

@ -0,0 +1,25 @@
#pragma once
#include <exception>
#include <QString>
#include <QDebug>
class MMCError : public std::exception
{
public:
MMCError(QString cause)
{
exceptionCause = cause;
qCritical() << "Exception: " + cause;
};
virtual ~MMCError() noexcept {}
virtual const char *what() const noexcept
{
return exceptionCause.toLocal8Bit();
};
virtual QString cause() const
{
return exceptionCause;
}
private:
QString exceptionCause;
};

4
logic/auth/MojangAccountList.cpp
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
#include "logic/auth/MojangAccountList.h"
#include "auth/MojangAccountList.h"
#include <QIODevice>
#include <QFile>
@ -26,7 +26,7 @@
#include <QDebug>
#include "logic/auth/MojangAccount.h"
#include "auth/MojangAccount.h"
#include <pathutils.h>
#define ACCOUNT_LIST_FORMAT_VERSION 2

2
logic/auth/MojangAccountList.h
View File

@ -20,7 +20,7 @@
#include <QAbstractListModel>
#include <QSharedPointer>
#include "logic/auth/MojangAccount.h"
#include "auth/MojangAccount.h"
/*!
* \brief List of available Mojang accounts.

8
logic/auth/YggdrasilTask.cpp
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
#include <logic/auth/YggdrasilTask.h>
#include <auth/YggdrasilTask.h>
#include <QObject>
#include <QString>
@ -22,9 +22,9 @@
#include <QNetworkReply>
#include <QByteArray>
#include <logic/Env.h>
#include <logic/auth/MojangAccount.h>
#include <logic/net/URLConstants.h>
#include <Env.h>
#include <auth/MojangAccount.h>
#include <net/URLConstants.h>
#include <QDebug>

4
logic/auth/YggdrasilTask.h
View File

@ -15,14 +15,14 @@
#pragma once
#include <logic/tasks/Task.h>
#include <tasks/Task.h>
#include <QString>
#include <QJsonObject>
#include <QTimer>
#include <qsslerror.h>
#include "logic/auth/MojangAccount.h"
#include "auth/MojangAccount.h"
class QNetworkReply;

4
logic/auth/flows/AuthenticateTask.cpp
View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
#include <logic/auth/flows/AuthenticateTask.h>
#include <auth/flows/AuthenticateTask.h>
#include <logic/auth/MojangAccount.h>
#include <auth/MojangAccount.h>
#include <QJsonDocument>
#include <QJsonObject>

2
logic/auth/flows/AuthenticateTask.h
View File

@ -15,7 +15,7 @@
#pragma once
#include <logic/auth/YggdrasilTask.h>
#include <auth/YggdrasilTask.h>
#include <QObject>
#include <QString>

4
logic/auth/flows/RefreshTask.cpp
View File

@ -13,9 +13,9 @@
* limitations under the License.
*/
#include <logic/auth/flows/RefreshTask.h>
#include <auth/flows/RefreshTask.h>
#include <logic/auth/MojangAccount.h>
#include <auth/MojangAccount.h>
#include <QJsonDocument>
#include <QJsonObject>

2
logic/auth/flows/RefreshTask.h
View File

@ -15,7 +15,7 @@
#pragma once
#include <logic/auth/YggdrasilTask.h>
#include <auth/YggdrasilTask.h>
#include <QObject>
#include <QString>

4
logic/auth/flows/ValidateTask.cpp
View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
#include <logic/auth/flows/ValidateTask.h>
#include <auth/flows/ValidateTask.h>
#include <logic/auth/MojangAccount.h>
#include <auth/MojangAccount.h>
#include <QJsonDocument>
#include <QJsonObject>

2
logic/auth/flows/ValidateTask.h
View File

@ -19,7 +19,7 @@
#pragma once
#include <logic/auth/YggdrasilTask.h>
#include <auth/YggdrasilTask.h>
#include <QObject>
#include <QString>

16
logic/forge/ForgeInstaller.cpp
View File

@ -14,14 +14,14 @@
*/
#include "ForgeInstaller.h"
#include "logic/minecraft/MinecraftProfile.h"
#include "logic/minecraft/OneSixLibrary.h"
#include "logic/net/HttpMetaCache.h"
#include "logic/tasks/Task.h"
#include "logic/minecraft/OneSixInstance.h"
#include "logic/forge/ForgeVersionList.h"
#include "logic/minecraft/VersionFilterData.h"
#include "logic/Env.h"
#include "minecraft/MinecraftProfile.h"
#include "minecraft/OneSixLibrary.h"
#include "net/HttpMetaCache.h"
#include "tasks/Task.h"
#include "minecraft/OneSixInstance.h"
#include "forge/ForgeVersionList.h"
#include "minecraft/VersionFilterData.h"
#include "Env.h"
#include <quazip.h>
#include <quazipfile.h>

2
logic/forge/ForgeInstaller.h
View File

@ -15,7 +15,7 @@
#pragma once
#include "logic/BaseInstaller.h"
#include "BaseInstaller.h"
#include <QString>
#include <memory>

2
logic/forge/ForgeMirrors.cpp
View File

@ -1,4 +1,4 @@
#include "logic/Env.h"
#include "Env.h"
#include "ForgeMirrors.h"
#include <QDebug>
#include <algorithm>

8
logic/forge/ForgeMirrors.h
View File

@ -15,10 +15,10 @@
#pragma once
#include "logic/net/NetAction.h"
#include "logic/net/HttpMetaCache.h"
#include "logic/net/NetJob.h"
#include "logic/forge/ForgeXzDownload.h"
#include "net/NetAction.h"
#include "net/HttpMetaCache.h"
#include "net/NetJob.h"
#include "forge/ForgeXzDownload.h"
#include <QFile>
#include <QTemporaryFile>
typedef std::shared_ptr<class ForgeMirrors> ForgeMirrorsPtr;

2
logic/forge/ForgeVersion.cpp
View File

@ -1,5 +1,5 @@
#include "ForgeVersion.h"
#include "logic/minecraft/VersionFilterData.h"
#include "minecraft/VersionFilterData.h"
#include <QObject>
QString ForgeVersion::name()

2
logic/forge/ForgeVersion.h
View File

@ -1,7 +1,7 @@
#pragma once
#include <QString>
#include <memory>
#include "logic/BaseVersion.h"
#include "BaseVersion.h"
struct ForgeVersion;
typedef std::shared_ptr<ForgeVersion> ForgeVersionPtr;

10
logic/forge/ForgeVersionList.cpp
View File

@ -13,11 +13,11 @@
* limitations under the License.
*/
#include "logic/forge/ForgeVersionList.h"
#include "logic/forge/ForgeVersion.h"
#include "logic/net/NetJob.h"
#include "logic/net/URLConstants.h"
#include "logic/Env.h"
#include "forge/ForgeVersionList.h"
#include "forge/ForgeVersion.h"
#include "net/NetJob.h"
#include "net/URLConstants.h"
#include "Env.h"
#include <QtNetwork>
#include <QtXml>

8
logic/forge/ForgeVersionList.h
View File

@ -20,10 +20,10 @@
#include <QUrl>
#include <QNetworkReply>
#include "logic/BaseVersionList.h"
#include "logic/tasks/Task.h"
#include "logic/net/NetJob.h"
#include "logic/forge/ForgeVersion.h"
#include "BaseVersionList.h"
#include "tasks/Task.h"
#include "net/NetJob.h"
#include "forge/ForgeVersion.h"
class ForgeVersionList : public BaseVersionList
{

2
logic/forge/ForgeXzDownload.cpp
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
#include "logic/Env.h"
#include "Env.h"
#include "ForgeXzDownload.h"
#include <pathutils.h>

4
logic/forge/ForgeXzDownload.h
View File

@ -15,8 +15,8 @@
#pragma once
#include "logic/net/NetAction.h"
#include "logic/net/HttpMetaCache.h"
#include "net/NetAction.h"
#include "net/HttpMetaCache.h"
#include <QFile>
#include <QTemporaryFile>
#include "ForgeMirror.h"

2
logic/forge/LegacyForge.h
View File

@ -15,7 +15,7 @@
#pragma once
#include "logic/minecraft/Mod.h"
#include "minecraft/Mod.h"
class MinecraftForge : public Mod
{

10
logic/ftb/FTBPlugin.cpp
View File

@ -2,11 +2,11 @@
#include "FTBVersion.h"
#include "LegacyFTBInstance.h"
#include "OneSixFTBInstance.h"
#include <logic/BaseInstance.h>
#include <logic/icons/IconList.h>
#include <logic/InstanceList.h>
#include <logic/minecraft/MinecraftVersionList.h>
#include <logic/settings/INISettingsObject.h>
#include <BaseInstance.h>
#include <icons/IconList.h>
#include <InstanceList.h>
#include <minecraft/MinecraftVersionList.h>
#include <settings/INISettingsObject.h>
#include <pathutils.h>
#include "QDebug"
#include <QXmlStreamReader>

2
logic/ftb/FTBPlugin.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <logic/BaseInstance.h>
#include <BaseInstance.h>
// Pseudo-plugin for FTB related things. Super derpy!
class FTBPlugin

8
logic/ftb/FTBProfileStrategy.cpp
View File

@ -1,7 +1,7 @@
#include "logic/ftb/FTBProfileStrategy.h"
#include "logic/minecraft/VersionBuildError.h"
#include "logic/ftb/OneSixFTBInstance.h"
#include "logic/minecraft/MinecraftVersionList.h"
#include "ftb/FTBProfileStrategy.h"
#include "minecraft/VersionBuildError.h"
#include "ftb/OneSixFTBInstance.h"
#include "minecraft/MinecraftVersionList.h"
#include <pathutils.h>
#include <QDir>

2
logic/ftb/FTBVersion.h
View File

@ -1,5 +1,5 @@
#pragma once
#include <logic/minecraft/MinecraftVersion.h>
#include <minecraft/MinecraftVersion.h>
class FTBVersion : public BaseVersion
{

2
logic/ftb/LegacyFTBInstance.cpp
View File

@ -1,5 +1,5 @@
#include "LegacyFTBInstance.h"
#include <logic/settings/INISettingsObject.h>
#include <settings/INISettingsObject.h>
#include <QDir>
LegacyFTBInstance::LegacyFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) :

2
logic/ftb/LegacyFTBInstance.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "logic/minecraft/LegacyInstance.h"
#include "minecraft/LegacyInstance.h"
class LegacyFTBInstance : public LegacyInstance
{

14
logic/ftb/OneSixFTBInstance.cpp
View File

@ -1,13 +1,13 @@
#include "OneSixFTBInstance.h"
#include "FTBProfileStrategy.h"
#include "logic/minecraft/MinecraftProfile.h"
#include "logic/minecraft/OneSixLibrary.h"
#include "logic/minecraft/VersionBuilder.h"
#include "logic/tasks/SequentialTask.h"
#include "logic/forge/ForgeInstaller.h"
#include "logic/forge/ForgeVersionList.h"
#include <logic/settings/INISettingsObject.h>
#include "minecraft/MinecraftProfile.h"
#include "minecraft/OneSixLibrary.h"
#include "minecraft/VersionBuilder.h"
#include "tasks/SequentialTask.h"
#include "forge/ForgeInstaller.h"
#include "forge/ForgeVersionList.h"
#include <settings/INISettingsObject.h>
#include "pathutils.h"
OneSixFTBInstance::OneSixFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) :

2
logic/ftb/OneSixFTBInstance.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "logic/minecraft/OneSixInstance.h"
#include "minecraft/OneSixInstance.h"
class OneSixLibrary;

4
logic/icons/IconList.h
View File

@ -22,8 +22,8 @@
#include <QtGui/QIcon>
#include <memory>
#include "MMCIcon.h"
#include "logic/settings/Setting.h"
#include "logic/Env.h" // there is a global icon list inside Env.
#include "settings/Setting.h"
#include "Env.h" // there is a global icon list inside Env.
class QFileSystemWatcher;

2
logic/java/JavaCheckerJob.h
View File

@ -18,7 +18,7 @@
#include <QtNetwork>
#include <QLabel>
#include "JavaChecker.h"
#include "logic/tasks/ProgressProvider.h"
#include "tasks/ProgressProvider.h"
class JavaCheckerJob;
typedef std::shared_ptr<JavaCheckerJob> JavaCheckerJobPtr;

8
logic/java/JavaUtils.cpp
View File

@ -18,13 +18,13 @@
#include <QDir>
#include <QStringList>
#include <logic/settings/Setting.h>
#include <settings/Setting.h>
#include <pathutils.h>
#include <QDebug>
#include "logic/java/JavaUtils.h"
#include "logic/java/JavaCheckerJob.h"
#include "logic/java/JavaVersionList.h"
#include "java/JavaUtils.h"
#include "java/JavaCheckerJob.h"
#include "java/JavaVersionList.h"
JavaUtils::JavaUtils()
{

6
logic/java/JavaVersionList.cpp
View File

@ -19,9 +19,9 @@
#include <QDebug>
#include "logic/java/JavaVersionList.h"
#include "logic/java/JavaCheckerJob.h"
#include "logic/java/JavaUtils.h"
#include "java/JavaVersionList.h"
#include "java/JavaCheckerJob.h"
#include "java/JavaUtils.h"
JavaVersionList::JavaVersionList(QObject *parent) : BaseVersionList(parent)
{

6
logic/java/JavaVersionList.h
View File

@ -18,9 +18,9 @@
#include <QObject>
#include <QAbstractListModel>
#include "logic/BaseVersionList.h"
#include "logic/tasks/Task.h"
#include "logic/java/JavaCheckerJob.h"
#include "BaseVersionList.h"
#include "tasks/Task.h"
#include "java/JavaCheckerJob.h"
class JavaListLoadTask;

8
logic/liteloader/LiteLoaderInstaller.cpp
View File

@ -20,10 +20,10 @@
#include <QDebug>
#include "logic/minecraft/MinecraftProfile.h"
#include "logic/minecraft/OneSixLibrary.h"
#include "logic/minecraft/OneSixInstance.h"
#include "logic/liteloader/LiteLoaderVersionList.h"
#include "minecraft/MinecraftProfile.h"
#include "minecraft/OneSixLibrary.h"
#include "minecraft/OneSixInstance.h"
#include "liteloader/LiteLoaderVersionList.h"
LiteLoaderInstaller::LiteLoaderInstaller() : BaseInstaller()
{

4
logic/liteloader/LiteLoaderInstaller.h
View File

@ -18,8 +18,8 @@
#include <QString>
#include <QMap>
#include "logic/BaseInstaller.h"
#include "logic/liteloader/LiteLoaderVersionList.h"
#include "BaseInstaller.h"
#include "liteloader/LiteLoaderVersionList.h"
class LiteLoaderInstaller : public BaseInstaller
{

6
logic/liteloader/LiteLoaderVersionList.cpp
View File

@ -14,9 +14,9 @@
*/
#include "LiteLoaderVersionList.h"
#include "logic/Env.h"
#include "logic/net/URLConstants.h"
#include <MMCError.h>
#include "Env.h"
#include "net/URLConstants.h"
#include "MMCError.h"
#include <QtXml>

10
logic/liteloader/LiteLoaderVersionList.h
View File

@ -19,11 +19,11 @@
#include <QString>
#include <QStringList>
#include "logic/BaseVersion.h"
#include "logic/BaseVersionList.h"
#include "logic/tasks/Task.h"
#include "logic/net/NetJob.h"
#include <logic/minecraft/RawLibrary.h>
#include "BaseVersion.h"
#include "BaseVersionList.h"
#include "tasks/Task.h"
#include "net/NetJob.h"
#include <minecraft/RawLibrary.h>
class LLListLoadTask;
class QNetworkReply;

2
logic/minecraft/GradleSpecifier.h
View File

@ -2,7 +2,7 @@
#include <QString>
#include <QStringList>
#include "logic/DefaultVariable.h"
#include "DefaultVariable.h"
struct GradleSpecifier
{

2
logic/minecraft/JarMod.cpp
View File

@ -1,5 +1,5 @@
#include "JarMod.h"
#include "logic/MMCJson.h"
#include "MMCJson.h"
using namespace MMCJson;
JarmodPtr Jarmod::fromJson(const QJsonObject &libObj, const QString &filename)

2
logic/minecraft/JarUtils.cpp
View File

@ -1,4 +1,4 @@
#include "logic/minecraft/JarUtils.h"
#include "minecraft/JarUtils.h"
#include <quazip.h>
#include <quazipfile.h>
#include <JlCompress.h>

13
logic/minecraft/LegacyInstance.cpp
View File

@ -16,15 +16,17 @@
#include <QFileInfo>
#include <QDir>
#include <QImage>
#include <logic/settings/Setting.h>
#include <settings/Setting.h>
#include <pathutils.h>
#include <cmdutils.h>
#include "LegacyInstance.h"
#include "logic/minecraft/LegacyUpdate.h"
#include "logic/icons/IconList.h"
#include "logic/minecraft/MinecraftProcess.h"
#include "minecraft/LegacyUpdate.h"
#include "icons/IconList.h"
#include "minecraft/MinecraftProcess.h"
#include "minecraft/ModList.h"
/*
#include "gui/pages/LegacyUpgradePage.h"
#include "gui/pages/ModFolderPage.h"
#include "gui/pages/LegacyJarModPage.h"
@ -32,6 +34,7 @@
#include <gui/pages/InstanceSettingsPage.h>
#include <gui/pages/NotesPage.h>
#include <gui/pages/ScreenshotsPage.h>
*/
LegacyInstance::LegacyInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
: MinecraftInstance(globalSettings, settings, rootDir)
@ -53,6 +56,7 @@ LegacyInstance::LegacyInstance(SettingsObjectPtr globalSettings, SettingsObjectP
settings->registerSetting("CustomBaseJar", "");
}
/*
QList<BasePage *> LegacyInstance::getPages()
{
QList<BasePage *> values;
@ -74,6 +78,7 @@ QString LegacyInstance::dialogTitle()
{
return tr("Edit Instance (%1)").arg(name());
}
*/
QString LegacyInstance::baseJar() const
{

7
logic/minecraft/LegacyInstance.h
View File

@ -15,13 +15,12 @@
#pragma once
#include "logic/minecraft/MinecraftInstance.h"
#include "gui/pages/BasePageProvider.h"
#include "minecraft/MinecraftInstance.h"
class ModList;
class Task;
class LegacyInstance : public MinecraftInstance, public BasePageProvider
class LegacyInstance : public MinecraftInstance
{
Q_OBJECT
public:
@ -36,9 +35,11 @@ public:
//! Path to the instance's modlist file.
QString modListFile() const;
/*
////// Edit Instance Dialog stuff //////
virtual QList<BasePage *> getPages();
virtual QString dialogTitle();
*/
////// Mod Lists //////
std::shared_ptr<ModList> jarModList() const ;

18
logic/minecraft/LegacyUpdate.cpp
View File

@ -20,16 +20,16 @@
#include <JlCompress.h>
#include <QDebug>
#include "logic/Env.h"
#include "logic/BaseInstance.h"
#include "logic/net/URLConstants.h"
#include "Env.h"
#include "BaseInstance.h"
#include "net/URLConstants.h"
#include "logic/minecraft/JarUtils.h"
#include "logic/minecraft/LegacyUpdate.h"
#include "logic/minecraft/LwjglVersionList.h"
#include "logic/minecraft/MinecraftVersionList.h"
#include "logic/minecraft/ModList.h"
#include "logic/minecraft/LegacyInstance.h"
#include "minecraft/JarUtils.h"
#include "minecraft/LegacyUpdate.h"
#include "minecraft/LwjglVersionList.h"
#include "minecraft/MinecraftVersionList.h"
#include "minecraft/ModList.h"
#include "minecraft/LegacyInstance.h"
LegacyUpdate::LegacyUpdate(BaseInstance *inst, QObject *parent) : Task(parent), m_inst(inst)
{

6
logic/minecraft/LegacyUpdate.h
View File

@ -19,9 +19,9 @@
#include <QList>
#include <QUrl>
#include "logic/net/NetJob.h"
#include "logic/tasks/Task.h"
#include "logic/minecraft/VersionFilterData.h"
#include "net/NetJob.h"
#include "tasks/Task.h"
#include "minecraft/VersionFilterData.h"
class MinecraftVersion;
class BaseInstance;

2
logic/minecraft/LwjglVersionList.cpp
View File

@ -14,7 +14,7 @@
*/
#include "LwjglVersionList.h"
#include "logic/Env.h"
#include "Env.h"
#include <QtNetwork>
#include <QtXml>

4
logic/minecraft/LwjglVersionList.h
View File

@ -21,8 +21,8 @@
#include <QNetworkReply>
#include <memory>
#include "logic/BaseVersion.h"
#include "logic/BaseVersionList.h"
#include "BaseVersion.h"
#include "BaseVersionList.h"
class LWJGLVersion;
typedef std::shared_ptr<LWJGLVersion> PtrLWJGLVersion;

6
logic/minecraft/MinecraftInstance.cpp
View File

@ -1,8 +1,8 @@
#include "MinecraftInstance.h"
#include "logic/settings/SettingsObject.h"
#include "settings/SettingsObject.h"
#include <pathutils.h>
#include "logic/Env.h"
#include "logic/minecraft/MinecraftVersionList.h"
#include "Env.h"
#include "minecraft/MinecraftVersionList.h"
MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
: BaseInstance(globalSettings, settings, rootDir)

4
logic/minecraft/MinecraftInstance.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "logic/BaseInstance.h"
#include "logic/minecraft/Mod.h"
#include "BaseInstance.h"
#include "minecraft/Mod.h"
class ModList;

4
logic/minecraft/MinecraftProcess.cpp
View File

@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "logic/minecraft/MinecraftProcess.h"
#include "logic/BaseInstance.h"
#include "minecraft/MinecraftProcess.h"
#include "BaseInstance.h"
#include <QDataStream>
#include <QFile>

4
logic/minecraft/MinecraftProcess.h
View File

@ -18,8 +18,8 @@
#pragma once
#include <QString>
#include "logic/minecraft/MinecraftInstance.h"
#include "logic/BaseProcess.h"
#include "minecraft/MinecraftInstance.h"
#include "BaseProcess.h"
/**
* The MinecraftProcess class

4
logic/minecraft/MinecraftProfile.cpp
View File

@ -19,8 +19,8 @@
#include <QJsonArray>
#include <pathutils.h>
#include "logic/minecraft/MinecraftProfile.h"
#include "logic/minecraft/VersionBuilder.h"
#include "minecraft/MinecraftProfile.h"
#include "minecraft/VersionBuilder.h"
#include "ProfileUtils.h"
#include "NullProfileStrategy.h"

2
logic/minecraft/MinecraftVersion.cpp
View File

@ -3,7 +3,7 @@
#include "VersionBuildError.h"
#include "VersionBuilder.h"
#include "ProfileUtils.h"
#include "logic/settings/SettingsObject.h"
#include "settings/SettingsObject.h"
bool MinecraftVersion::usesLegacyLauncher()
{

2
logic/minecraft/MinecraftVersion.h
View File

@ -19,7 +19,7 @@
#include <QSet>
#include <QDateTime>
#include "logic/BaseVersion.h"
#include "BaseVersion.h"
#include "ProfilePatch.h"
#include "VersionFile.h"
#include "VersionSource.h"

6
logic/minecraft/MinecraftVersionList.cpp
View File

@ -14,15 +14,15 @@
*/
#include <QtXml>
#include "logic/MMCJson.h"
#include "MMCJson.h"
#include <QtAlgorithms>
#include <QtNetwork>
#include "logic/Env.h"
#include "Env.h"
#include "MMCError.h"
#include "MinecraftVersionList.h"
#include "logic/net/URLConstants.h"
#include "net/URLConstants.h"
#include "ParseUtils.h"
#include "ProfileUtils.h"

8
logic/minecraft/MinecraftVersionList.h
View File

@ -19,10 +19,10 @@
#include <QList>
#include <QSet>
#include "logic/BaseVersionList.h"
#include "logic/tasks/Task.h"
#include "logic/minecraft/MinecraftVersion.h"
#include <logic/net/NetJob.h>
#include "BaseVersionList.h"
#include "tasks/Task.h"
#include "minecraft/MinecraftVersion.h"
#include <net/NetJob.h>
class MCVListLoadTask;
class MCVListVersionUpdateTask;

2
logic/minecraft/Mod.cpp
View File

@ -24,7 +24,7 @@
#include "Mod.h"
#include <pathutils.h>
#include "logic/settings/INIFile.h"
#include "settings/INIFile.h"
#include <QDebug>
Mod::Mod(const QFileInfo &file)

2
logic/minecraft/ModList.h
View File

@ -20,7 +20,7 @@
#include <QDir>
#include <QAbstractListModel>
#include "logic/minecraft/Mod.h"
#include "minecraft/Mod.h"
class LegacyInstance;
class BaseInstance;

16
logic/minecraft/OneSixInstance.cpp
View File

@ -18,16 +18,16 @@
#include <QDebug>
#include "MMCError.h"
#include "logic/minecraft/OneSixInstance.h"
#include "minecraft/OneSixInstance.h"
#include "logic/minecraft/OneSixUpdate.h"
#include "logic/minecraft/MinecraftProfile.h"
#include "logic/minecraft/VersionBuildError.h"
#include "logic/minecraft/MinecraftProcess.h"
#include "logic/minecraft/OneSixProfileStrategy.h"
#include "minecraft/OneSixUpdate.h"
#include "minecraft/MinecraftProfile.h"
#include "minecraft/VersionBuildError.h"
#include "minecraft/MinecraftProcess.h"
#include "minecraft/OneSixProfileStrategy.h"
#include "logic/minecraft/AssetsUtils.h"
#include "logic/icons/IconList.h"
#include "minecraft/AssetsUtils.h"
#include "icons/IconList.h"
OneSixInstance::OneSixInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
: MinecraftInstance(globalSettings, settings, rootDir)

6
logic/minecraft/OneSixInstance.h
View File

@ -15,10 +15,10 @@
#pragma once
#include "logic/minecraft/MinecraftInstance.h"
#include "minecraft/MinecraftInstance.h"
#include "logic/minecraft/MinecraftProfile.h"
#include "logic/minecraft/ModList.h"
#include "minecraft/MinecraftProfile.h"
#include "minecraft/ModList.h"
class OneSixInstance : public MinecraftInstance
{

6
logic/minecraft/OneSixLibrary.h
View File

@ -22,9 +22,9 @@
#include <QDir>
#include <memory>
#include "logic/net/URLConstants.h"
#include "logic/minecraft/OpSys.h"
#include "logic/minecraft/RawLibrary.h"
#include "net/URLConstants.h"
#include "minecraft/OpSys.h"
#include "minecraft/RawLibrary.h"
class OneSixLibrary;
typedef std::shared_ptr<OneSixLibrary> OneSixLibraryPtr;

10
logic/minecraft/OneSixProfileStrategy.cpp
View File

@ -1,8 +1,8 @@
#include "logic/minecraft/OneSixProfileStrategy.h"
#include "logic/minecraft/VersionBuildError.h"
#include "logic/minecraft/OneSixInstance.h"
#include "logic/minecraft/MinecraftVersionList.h"
#include "logic/Env.h"
#include "minecraft/OneSixProfileStrategy.h"
#include "minecraft/VersionBuildError.h"
#include "minecraft/OneSixInstance.h"
#include "minecraft/MinecraftVersionList.h"
#include "Env.h"
#include <pathutils.h>
#include <QDir>

20
logic/minecraft/OneSixUpdate.cpp
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
#include "logic/Env.h"
#include "Env.h"
#include "OneSixUpdate.h"
#include <QtNetwork>
@ -25,15 +25,15 @@
#include <pathutils.h>
#include <JlCompress.h>
#include "logic/BaseInstance.h"
#include "logic/minecraft/MinecraftVersionList.h"
#include "logic/minecraft/MinecraftProfile.h"
#include "logic/minecraft/OneSixLibrary.h"
#include "logic/minecraft/OneSixInstance.h"
#include "logic/forge/ForgeMirrors.h"
#include "logic/net/URLConstants.h"
#include "logic/minecraft/AssetsUtils.h"
#include "logic/minecraft/JarUtils.h"
#include "BaseInstance.h"
#include "minecraft/MinecraftVersionList.h"
#include "minecraft/MinecraftProfile.h"
#include "minecraft/OneSixLibrary.h"
#include "minecraft/OneSixInstance.h"
#include "forge/ForgeMirrors.h"
#include "net/URLConstants.h"
#include "minecraft/AssetsUtils.h"
#include "minecraft/JarUtils.h"
OneSixUpdate::OneSixUpdate(OneSixInstance *inst, QObject *parent) : Task(parent), m_inst(inst)
{

6
logic/minecraft/OneSixUpdate.h
View File

@ -19,9 +19,9 @@
#include <QList>
#include <QUrl>
#include "logic/net/NetJob.h"
#include "logic/tasks/Task.h"
#include "logic/minecraft/VersionFilterData.h"
#include "net/NetJob.h"
#include "tasks/Task.h"
#include "minecraft/VersionFilterData.h"
#include <quazip.h>
class MinecraftVersion;

2
logic/minecraft/ParseUtils.cpp
View File

@ -1,7 +1,7 @@
#include <QDateTime>
#include <QString>
#include "ParseUtils.h"
#include <logic/MMCJson.h>
#include <MMCJson.h>
QDateTime timeFromS3Time(QString str)
{

4
logic/minecraft/ProfileUtils.cpp
View File

@ -1,6 +1,6 @@
#include "ProfileUtils.h"
#include "logic/minecraft/VersionFilterData.h"
#include "logic/MMCJson.h"
#include "minecraft/VersionFilterData.h"
#include "MMCJson.h"
#include <QDebug>
#include <QJsonDocument>

2
logic/minecraft/RawLibrary.cpp
View File

@ -1,4 +1,4 @@
#include "logic/MMCJson.h"
#include "MMCJson.h"
using namespace MMCJson;
#include "RawLibrary.h"

6
logic/minecraft/RawLibrary.h
View File

@ -7,10 +7,10 @@
#include <QDir>
#include <memory>
#include "logic/minecraft/OneSixRule.h"
#include "logic/minecraft/OpSys.h"
#include "minecraft/OneSixRule.h"
#include "minecraft/OpSys.h"
#include "GradleSpecifier.h"
#include "logic/net/URLConstants.h"
#include "net/URLConstants.h"
class RawLibrary;
typedef std::shared_ptr<RawLibrary> RawLibraryPtr;

6
logic/minecraft/SkinUtils.cpp
View File

@ -13,9 +13,9 @@
* limitations under the License.
*/
#include "logic/minecraft/SkinUtils.h"
#include "logic/net/HttpMetaCache.h"
#include "logic/Env.h"
#include "minecraft/SkinUtils.h"
#include "net/HttpMetaCache.h"
#include "Env.h"
#include <QFile>
#include <QJsonDocument>

14
logic/minecraft/VersionBuilder.cpp
View File

@ -26,17 +26,17 @@
#include <modutils.h>
#include <pathutils.h>
#include "logic/minecraft/VersionBuilder.h"
#include "logic/minecraft/MinecraftProfile.h"
#include "logic/minecraft/OneSixRule.h"
#include "logic/minecraft/ProfilePatch.h"
#include "logic/minecraft/VersionFile.h"
#include "minecraft/VersionBuilder.h"
#include "minecraft/MinecraftProfile.h"
#include "minecraft/OneSixRule.h"
#include "minecraft/ProfilePatch.h"
#include "minecraft/VersionFile.h"
#include "VersionBuildError.h"
#include "MinecraftVersionList.h"
#include "ProfileUtils.h"
#include "logic/minecraft/OneSixInstance.h"
#include "logic/MMCJson.h"
#include "minecraft/OneSixInstance.h"
#include "MMCJson.h"
#include <QDebug>

10
logic/minecraft/VersionFile.cpp
View File

@ -4,13 +4,13 @@
#include <QDebug>
#include "logic/minecraft/VersionFile.h"
#include "logic/minecraft/OneSixLibrary.h"
#include "logic/minecraft/MinecraftProfile.h"
#include "logic/minecraft/JarMod.h"
#include "minecraft/VersionFile.h"
#include "minecraft/OneSixLibrary.h"
#include "minecraft/MinecraftProfile.h"
#include "minecraft/JarMod.h"
#include "ParseUtils.h"
#include "logic/MMCJson.h"
#include "MMCJson.h"
using namespace MMCJson;
#include "VersionBuildError.h"

4
logic/minecraft/VersionFile.h
View File

@ -4,8 +4,8 @@
#include <QStringList>
#include <QDateTime>
#include <memory>
#include "logic/minecraft/OpSys.h"
#include "logic/minecraft/OneSixRule.h"
#include "minecraft/OpSys.h"
#include "minecraft/OneSixRule.h"
#include "ProfilePatch.h"
#include "MMCError.h"
#include "OneSixLibrary.h"

2
logic/net/ByteArrayDownload.cpp
View File

@ -14,7 +14,7 @@
*/
#include "ByteArrayDownload.h"
#include "logic/Env.h"
#include "Env.h"
#include <QDebug>
ByteArrayDownload::ByteArrayDownload(QUrl url) : NetAction()

2
logic/net/CacheDownload.cpp
View File

@ -20,7 +20,7 @@
#include <QFileInfo>
#include <QDateTime>
#include <QDebug>
#include "logic/Env.h"
#include "Env.h"
CacheDownload::CacheDownload(QUrl url, MetaEntryPtr entry)
: NetAction(), md5sum(QCryptographicHash::Md5)

2
logic/net/HttpMetaCache.cpp
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
#include "logic/Env.h"
#include "Env.h"
#include "HttpMetaCache.h"
#include <pathutils.h>

2
logic/net/MD5EtagDownload.cpp
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
#include "logic/Env.h"
#include "Env.h"
#include "MD5EtagDownload.h"
#include <pathutils.h>
#include <QCryptographicHash>

2
logic/net/NetAction.h
View File

@ -19,7 +19,7 @@
#include <QUrl>
#include <memory>
#include <QNetworkReply>
#include <logic/QObjectPtr.h>
#include <QObjectPtr.h>
enum JobStatus
{

4
logic/net/NetJob.h
View File

@ -21,8 +21,8 @@
#include "MD5EtagDownload.h"
#include "CacheDownload.h"
#include "HttpMetaCache.h"
#include "logic/tasks/ProgressProvider.h"
#include "logic/QObjectPtr.h"
#include "tasks/ProgressProvider.h"
#include "QObjectPtr.h"
class NetJob;
typedef QObjectPtr<NetJob> NetJobPtr;

2
logic/net/PasteUpload.cpp
View File

@ -1,5 +1,5 @@
#include "PasteUpload.h"
#include "logic/Env.h"
#include "Env.h"
#include <QDebug>
#include <QJsonObject>
#include <QJsonDocument>

2
logic/net/PasteUpload.h
View File

@ -1,5 +1,5 @@
#pragma once
#include "logic/tasks/Task.h"
#include "tasks/Task.h"
#include <QMessageBox>
#include <QNetworkReply>
#include <memory>

2
logic/news/NewsChecker.h
View File

@ -19,7 +19,7 @@
#include <QString>
#include <QList>
#include <logic/net/NetJob.h>
#include <net/NetJob.h>
#include "NewsEntry.h"

4
logic/notifications/NotificationChecker.cpp
View File

@ -5,8 +5,8 @@
#include <QJsonArray>
#include <QDebug>
#include "logic/Env.h"
#include "logic/net/CacheDownload.h"
#include "Env.h"
#include "net/CacheDownload.h"
NotificationChecker::NotificationChecker(QObject *parent)

4
logic/notifications/NotificationChecker.h
View File

@ -2,8 +2,8 @@
#include <QObject>
#include "logic/net/NetJob.h"
#include "logic/net/CacheDownload.h"
#include "net/NetJob.h"
#include "net/CacheDownload.h"
class NotificationChecker : public QObject
{

4
logic/screenshots/ImgurAlbumCreation.cpp
View File

@ -6,8 +6,8 @@
#include <QUrl>
#include <QStringList>
#include "logic/net/URLConstants.h"
#include "logic/Env.h"
#include "net/URLConstants.h"
#include "Env.h"
#include <QDebug>
ImgurAlbumCreation::ImgurAlbumCreation(QList<ScreenshotPtr> screenshots) : NetAction(), m_screenshots(screenshots)

2
logic/screenshots/ImgurAlbumCreation.h
View File

@ -1,5 +1,5 @@
#pragma once
#include "logic/net/NetAction.h"
#include "net/NetAction.h"
#include "Screenshot.h"
typedef std::shared_ptr<class ImgurAlbumCreation> ImgurAlbumCreationPtr;

4
logic/screenshots/ImgurUpload.cpp
View File

@ -8,8 +8,8 @@
#include <QFile>
#include <QUrl>
#include "logic/net/URLConstants.h"
#include "logic/Env.h"
#include "net/URLConstants.h"
#include "Env.h"
#include <QDebug>
ImgurUpload::ImgurUpload(ScreenshotPtr shot) : NetAction(), m_shot(shot)

2
logic/screenshots/ImgurUpload.h
View File

@ -1,5 +1,5 @@
#pragma once
#include "logic/net/NetAction.h"
#include "net/NetAction.h"
#include "Screenshot.h"
typedef std::shared_ptr<class ImgurUpload> ImgurUploadPtr;

2
logic/settings/INIFile.cpp
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
#include "logic/settings/INIFile.h"
#include "settings/INIFile.h"
#include <QFile>
#include <QTextStream>

4
logic/settings/INISettingsObject.h
View File

@ -17,9 +17,9 @@
#include <QObject>
#include "logic/settings/INIFile.h"
#include "settings/INIFile.h"
#include "logic/settings/SettingsObject.h"
#include "settings/SettingsObject.h"
/*!
* \brief A settings object that stores its settings in an INIFile.

Some files were not shown because too many files have changed in this diff Show More