From b6d455a02bd338e9dc0faa09d4d8177ecd8d569a Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Sun, 10 Apr 2016 15:53:05 +0200 Subject: NOISSUE reorganize and document libraries --- libraries/logic/AbstractCommonModel.cpp | 133 ----- libraries/logic/AbstractCommonModel.h | 462 ---------------- libraries/logic/BaseConfigObject.cpp | 103 ---- libraries/logic/BaseConfigObject.h | 50 -- libraries/logic/BaseInstaller.cpp | 61 -- libraries/logic/BaseInstaller.h | 46 -- libraries/logic/BaseInstance.cpp | 270 --------- libraries/logic/BaseInstance.h | 243 -------- libraries/logic/BaseVersion.h | 59 -- libraries/logic/BaseVersionList.cpp | 104 ---- libraries/logic/BaseVersionList.h | 126 ----- libraries/logic/CMakeLists.txt | 344 ------------ libraries/logic/Commandline.cpp | 483 ---------------- libraries/logic/Commandline.h | 252 --------- libraries/logic/DefaultVariable.h | 35 -- libraries/logic/Env.cpp | 222 -------- libraries/logic/Env.h | 60 -- libraries/logic/Exception.h | 34 -- libraries/logic/FileSystem.cpp | 436 --------------- libraries/logic/FileSystem.h | 123 ---- libraries/logic/GZip.cpp | 115 ---- libraries/logic/GZip.h | 12 - libraries/logic/InstanceList.cpp | 580 ------------------- libraries/logic/InstanceList.h | 187 ------- libraries/logic/Json.cpp | 272 --------- libraries/logic/Json.h | 249 --------- libraries/logic/MMCStrings.cpp | 76 --- libraries/logic/MMCStrings.h | 10 - libraries/logic/MMCZip.cpp | 491 ---------------- libraries/logic/MMCZip.h | 88 --- libraries/logic/NullInstance.h | 90 --- libraries/logic/QObjectPtr.h | 78 --- libraries/logic/RWStorage.h | 60 -- libraries/logic/RecursiveFileSystemWatcher.cpp | 111 ---- libraries/logic/RecursiveFileSystemWatcher.h | 63 --- libraries/logic/SeparatorPrefixTree.h | 298 ---------- libraries/logic/TypeMagic.h | 37 -- libraries/logic/Version.cpp | 140 ----- libraries/logic/Version.h | 110 ---- libraries/logic/java/JavaChecker.cpp | 159 ------ libraries/logic/java/JavaChecker.h | 54 -- libraries/logic/java/JavaCheckerJob.cpp | 45 -- libraries/logic/java/JavaCheckerJob.h | 84 --- libraries/logic/java/JavaInstall.cpp | 28 - libraries/logic/java/JavaInstall.h | 38 -- libraries/logic/java/JavaInstallList.cpp | 186 ------- libraries/logic/java/JavaInstallList.h | 71 --- libraries/logic/java/JavaUtils.cpp | 219 -------- libraries/logic/java/JavaUtils.h | 43 -- libraries/logic/java/JavaVersion.cpp | 112 ---- libraries/logic/java/JavaVersion.h | 30 - libraries/logic/launch/LaunchStep.cpp | 27 - libraries/logic/launch/LaunchStep.h | 48 -- libraries/logic/launch/LaunchTask.cpp | 228 -------- libraries/logic/launch/LaunchTask.h | 122 ---- libraries/logic/launch/LoggedProcess.cpp | 163 ------ libraries/logic/launch/LoggedProcess.h | 76 --- libraries/logic/launch/MessageLevel.cpp | 36 -- libraries/logic/launch/MessageLevel.h | 28 - libraries/logic/launch/steps/CheckJava.cpp | 92 --- libraries/logic/launch/steps/CheckJava.h | 41 -- libraries/logic/launch/steps/LaunchMinecraft.cpp | 154 ------ libraries/logic/launch/steps/LaunchMinecraft.h | 48 -- libraries/logic/launch/steps/ModMinecraftJar.cpp | 44 -- libraries/logic/launch/steps/ModMinecraftJar.h | 39 -- libraries/logic/launch/steps/PostLaunchCommand.cpp | 84 --- libraries/logic/launch/steps/PostLaunchCommand.h | 39 -- libraries/logic/launch/steps/PreLaunchCommand.cpp | 85 --- libraries/logic/launch/steps/PreLaunchCommand.h | 39 -- libraries/logic/launch/steps/TextPrint.cpp | 29 - libraries/logic/launch/steps/TextPrint.h | 43 -- libraries/logic/launch/steps/Update.cpp | 50 -- libraries/logic/launch/steps/Update.h | 41 -- libraries/logic/minecraft/AssetsUtils.cpp | 230 -------- libraries/logic/minecraft/AssetsUtils.h | 48 -- libraries/logic/minecraft/GradleSpecifier.h | 129 ----- libraries/logic/minecraft/JarMod.h | 12 - libraries/logic/minecraft/Library.cpp | 239 -------- libraries/logic/minecraft/Library.h | 184 ------ libraries/logic/minecraft/MinecraftInstance.cpp | 369 ------------ libraries/logic/minecraft/MinecraftInstance.h | 69 --- libraries/logic/minecraft/MinecraftProfile.cpp | 610 -------------------- libraries/logic/minecraft/MinecraftProfile.h | 200 ------- libraries/logic/minecraft/MinecraftVersion.cpp | 215 ------- libraries/logic/minecraft/MinecraftVersion.h | 119 ---- libraries/logic/minecraft/MinecraftVersionList.cpp | 591 -------------------- libraries/logic/minecraft/MinecraftVersionList.h | 72 --- libraries/logic/minecraft/Mod.cpp | 377 ------------- libraries/logic/minecraft/Mod.h | 134 ----- libraries/logic/minecraft/ModList.cpp | 616 --------------------- libraries/logic/minecraft/ModList.h | 160 ------ libraries/logic/minecraft/MojangDownloadInfo.h | 71 --- libraries/logic/minecraft/MojangVersionFormat.cpp | 381 ------------- libraries/logic/minecraft/MojangVersionFormat.h | 25 - libraries/logic/minecraft/OpSys.cpp | 42 -- libraries/logic/minecraft/OpSys.h | 37 -- libraries/logic/minecraft/ParseUtils.cpp | 34 -- libraries/logic/minecraft/ParseUtils.h | 11 - libraries/logic/minecraft/ProfilePatch.h | 104 ---- libraries/logic/minecraft/ProfileStrategy.h | 35 -- libraries/logic/minecraft/ProfileUtils.cpp | 191 ------- libraries/logic/minecraft/ProfileUtils.h | 25 - libraries/logic/minecraft/Rule.cpp | 93 ---- libraries/logic/minecraft/Rule.h | 101 ---- libraries/logic/minecraft/VersionBuildError.h | 58 -- libraries/logic/minecraft/VersionFile.cpp | 60 -- libraries/logic/minecraft/VersionFile.h | 195 ------- libraries/logic/minecraft/VersionFilterData.cpp | 75 --- libraries/logic/minecraft/VersionFilterData.h | 32 -- libraries/logic/minecraft/World.cpp | 385 ------------- libraries/logic/minecraft/World.h | 83 --- libraries/logic/minecraft/WorldList.cpp | 355 ------------ libraries/logic/minecraft/WorldList.h | 125 ----- libraries/logic/minecraft/auth/AuthSession.cpp | 30 - libraries/logic/minecraft/auth/AuthSession.h | 51 -- libraries/logic/minecraft/auth/MojangAccount.cpp | 278 ---------- libraries/logic/minecraft/auth/MojangAccount.h | 173 ------ .../logic/minecraft/auth/MojangAccountList.cpp | 427 -------------- libraries/logic/minecraft/auth/MojangAccountList.h | 201 ------- libraries/logic/minecraft/auth/YggdrasilTask.cpp | 255 --------- libraries/logic/minecraft/auth/YggdrasilTask.h | 150 ----- .../minecraft/auth/flows/AuthenticateTask.cpp | 202 ------- .../logic/minecraft/auth/flows/AuthenticateTask.h | 46 -- .../logic/minecraft/auth/flows/RefreshTask.cpp | 144 ----- libraries/logic/minecraft/auth/flows/RefreshTask.h | 44 -- .../logic/minecraft/auth/flows/ValidateTask.cpp | 61 -- .../logic/minecraft/auth/flows/ValidateTask.h | 47 -- libraries/logic/minecraft/forge/ForgeInstaller.cpp | 458 --------------- libraries/logic/minecraft/forge/ForgeInstaller.h | 52 -- libraries/logic/minecraft/forge/ForgeVersion.cpp | 55 -- libraries/logic/minecraft/forge/ForgeVersion.h | 42 -- .../logic/minecraft/forge/ForgeVersionList.cpp | 450 --------------- libraries/logic/minecraft/forge/ForgeVersionList.h | 90 --- .../logic/minecraft/forge/ForgeXzDownload.cpp | 358 ------------ libraries/logic/minecraft/forge/ForgeXzDownload.h | 59 -- libraries/logic/minecraft/forge/LegacyForge.cpp | 56 -- libraries/logic/minecraft/forge/LegacyForge.h | 25 - libraries/logic/minecraft/ftb/FTBPlugin.cpp | 395 ------------- libraries/logic/minecraft/ftb/FTBPlugin.h | 13 - .../logic/minecraft/ftb/FTBProfileStrategy.cpp | 128 ----- libraries/logic/minecraft/ftb/FTBProfileStrategy.h | 21 - libraries/logic/minecraft/ftb/FTBVersion.h | 32 -- .../logic/minecraft/ftb/LegacyFTBInstance.cpp | 27 - libraries/logic/minecraft/ftb/LegacyFTBInstance.h | 17 - .../logic/minecraft/ftb/OneSixFTBInstance.cpp | 138 ----- libraries/logic/minecraft/ftb/OneSixFTBInstance.h | 30 - .../logic/minecraft/legacy/LegacyInstance.cpp | 453 --------------- libraries/logic/minecraft/legacy/LegacyInstance.h | 142 ----- libraries/logic/minecraft/legacy/LegacyUpdate.cpp | 393 ------------- libraries/logic/minecraft/legacy/LegacyUpdate.h | 70 --- .../logic/minecraft/legacy/LwjglVersionList.cpp | 189 ------- .../logic/minecraft/legacy/LwjglVersionList.h | 156 ------ .../minecraft/liteloader/LiteLoaderInstaller.cpp | 142 ----- .../minecraft/liteloader/LiteLoaderInstaller.h | 39 -- .../minecraft/liteloader/LiteLoaderVersionList.cpp | 276 --------- .../minecraft/liteloader/LiteLoaderVersionList.h | 119 ---- .../logic/minecraft/onesix/OneSixInstance.cpp | 597 -------------------- libraries/logic/minecraft/onesix/OneSixInstance.h | 117 ---- .../minecraft/onesix/OneSixProfileStrategy.cpp | 418 -------------- .../logic/minecraft/onesix/OneSixProfileStrategy.h | 26 - libraries/logic/minecraft/onesix/OneSixUpdate.cpp | 342 ------------ libraries/logic/minecraft/onesix/OneSixUpdate.h | 67 --- .../logic/minecraft/onesix/OneSixVersionFormat.cpp | 225 -------- .../logic/minecraft/onesix/OneSixVersionFormat.h | 22 - libraries/logic/net/ByteArrayDownload.cpp | 105 ---- libraries/logic/net/ByteArrayDownload.h | 48 -- libraries/logic/net/CacheDownload.cpp | 192 ------- libraries/logic/net/CacheDownload.h | 63 --- libraries/logic/net/HttpMetaCache.cpp | 273 --------- libraries/logic/net/HttpMetaCache.h | 125 ----- libraries/logic/net/MD5EtagDownload.cpp | 155 ------ libraries/logic/net/MD5EtagDownload.h | 52 -- libraries/logic/net/NetAction.h | 96 ---- libraries/logic/net/NetJob.cpp | 125 ----- libraries/logic/net/NetJob.h | 117 ---- libraries/logic/net/PasteUpload.cpp | 99 ---- libraries/logic/net/PasteUpload.h | 50 -- libraries/logic/net/URLConstants.cpp | 16 - libraries/logic/net/URLConstants.h | 40 -- libraries/logic/news/NewsChecker.cpp | 135 ----- libraries/logic/news/NewsChecker.h | 107 ---- libraries/logic/news/NewsEntry.cpp | 77 --- libraries/logic/news/NewsEntry.h | 65 --- .../logic/notifications/NotificationChecker.cpp | 130 ----- .../logic/notifications/NotificationChecker.h | 63 --- libraries/logic/pathmatcher/FSTreeMatcher.h | 21 - libraries/logic/pathmatcher/IPathMatcher.h | 12 - libraries/logic/pathmatcher/MultiMatcher.h | 31 -- libraries/logic/pathmatcher/RegexpMatcher.h | 42 -- libraries/logic/resources/Resource.cpp | 155 ------ libraries/logic/resources/Resource.h | 132 ----- libraries/logic/resources/ResourceHandler.cpp | 28 - libraries/logic/resources/ResourceHandler.h | 36 -- libraries/logic/resources/ResourceObserver.cpp | 55 -- libraries/logic/resources/ResourceObserver.h | 73 --- libraries/logic/resources/ResourceProxyModel.cpp | 89 --- libraries/logic/resources/ResourceProxyModel.h | 39 -- libraries/logic/screenshots/ImgurAlbumCreation.cpp | 90 --- libraries/logic/screenshots/ImgurAlbumCreation.h | 44 -- libraries/logic/screenshots/ImgurUpload.cpp | 114 ---- libraries/logic/screenshots/ImgurUpload.h | 33 -- libraries/logic/screenshots/Screenshot.h | 19 - libraries/logic/settings/INIFile.cpp | 151 ----- libraries/logic/settings/INIFile.h | 38 -- libraries/logic/settings/INISettingsObject.cpp | 107 ---- libraries/logic/settings/INISettingsObject.h | 66 --- libraries/logic/settings/OverrideSetting.cpp | 54 -- libraries/logic/settings/OverrideSetting.h | 46 -- libraries/logic/settings/PassthroughSetting.cpp | 66 --- libraries/logic/settings/PassthroughSetting.h | 45 -- libraries/logic/settings/Setting.cpp | 53 -- libraries/logic/settings/Setting.h | 119 ---- libraries/logic/settings/SettingsObject.cpp | 142 ----- libraries/logic/settings/SettingsObject.h | 214 ------- libraries/logic/status/StatusChecker.cpp | 153 ----- libraries/logic/status/StatusChecker.h | 60 -- libraries/logic/tasks/SequentialTask.cpp | 55 -- libraries/logic/tasks/SequentialTask.h | 31 -- libraries/logic/tasks/Task.cpp | 88 --- libraries/logic/tasks/Task.h | 96 ---- libraries/logic/tasks/ThreadTask.cpp | 41 -- libraries/logic/tasks/ThreadTask.h | 25 - libraries/logic/tools/BaseExternalTool.cpp | 41 -- libraries/logic/tools/BaseExternalTool.h | 60 -- libraries/logic/tools/BaseProfiler.cpp | 35 -- libraries/logic/tools/BaseProfiler.h | 38 -- libraries/logic/tools/JProfiler.cpp | 116 ---- libraries/logic/tools/JProfiler.h | 15 - libraries/logic/tools/JVisualVM.cpp | 103 ---- libraries/logic/tools/JVisualVM.h | 15 - libraries/logic/tools/MCEditTool.cpp | 124 ----- libraries/logic/tools/MCEditTool.h | 26 - libraries/logic/trans/TranslationDownloader.cpp | 53 -- libraries/logic/trans/TranslationDownloader.h | 32 -- libraries/logic/updater/DownloadTask.cpp | 169 ------ libraries/logic/updater/DownloadTask.h | 95 ---- libraries/logic/updater/GoUpdate.cpp | 216 -------- libraries/logic/updater/GoUpdate.h | 133 ----- libraries/logic/updater/UpdateChecker.cpp | 269 --------- libraries/logic/updater/UpdateChecker.h | 121 ---- libraries/logic/wonko/BaseWonkoEntity.cpp | 39 -- libraries/logic/wonko/BaseWonkoEntity.h | 51 -- libraries/logic/wonko/WonkoIndex.cpp | 147 ----- libraries/logic/wonko/WonkoIndex.h | 68 --- libraries/logic/wonko/WonkoReference.cpp | 44 -- libraries/logic/wonko/WonkoReference.h | 41 -- libraries/logic/wonko/WonkoUtil.cpp | 47 -- libraries/logic/wonko/WonkoUtil.h | 31 -- libraries/logic/wonko/WonkoVersion.cpp | 102 ---- libraries/logic/wonko/WonkoVersion.h | 83 --- libraries/logic/wonko/WonkoVersionList.cpp | 283 ---------- libraries/logic/wonko/WonkoVersionList.h | 92 --- libraries/logic/wonko/format/WonkoFormat.cpp | 80 --- libraries/logic/wonko/format/WonkoFormat.h | 54 -- libraries/logic/wonko/format/WonkoFormatV1.cpp | 156 ------ libraries/logic/wonko/format/WonkoFormatV1.h | 30 - .../wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp | 117 ---- .../wonko/tasks/BaseWonkoEntityLocalLoadTask.h | 81 --- .../wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp | 126 ----- .../wonko/tasks/BaseWonkoEntityRemoteLoadTask.h | 85 --- 260 files changed, 32792 deletions(-) delete mode 100644 libraries/logic/AbstractCommonModel.cpp delete mode 100644 libraries/logic/AbstractCommonModel.h delete mode 100644 libraries/logic/BaseConfigObject.cpp delete mode 100644 libraries/logic/BaseConfigObject.h delete mode 100644 libraries/logic/BaseInstaller.cpp delete mode 100644 libraries/logic/BaseInstaller.h delete mode 100644 libraries/logic/BaseInstance.cpp delete mode 100644 libraries/logic/BaseInstance.h delete mode 100644 libraries/logic/BaseVersion.h delete mode 100644 libraries/logic/BaseVersionList.cpp delete mode 100644 libraries/logic/BaseVersionList.h delete mode 100644 libraries/logic/CMakeLists.txt delete mode 100644 libraries/logic/Commandline.cpp delete mode 100644 libraries/logic/Commandline.h delete mode 100644 libraries/logic/DefaultVariable.h delete mode 100644 libraries/logic/Env.cpp delete mode 100644 libraries/logic/Env.h delete mode 100644 libraries/logic/Exception.h delete mode 100644 libraries/logic/FileSystem.cpp delete mode 100644 libraries/logic/FileSystem.h delete mode 100644 libraries/logic/GZip.cpp delete mode 100644 libraries/logic/GZip.h delete mode 100644 libraries/logic/InstanceList.cpp delete mode 100644 libraries/logic/InstanceList.h delete mode 100644 libraries/logic/Json.cpp delete mode 100644 libraries/logic/Json.h delete mode 100644 libraries/logic/MMCStrings.cpp delete mode 100644 libraries/logic/MMCStrings.h delete mode 100644 libraries/logic/MMCZip.cpp delete mode 100644 libraries/logic/MMCZip.h delete mode 100644 libraries/logic/NullInstance.h delete mode 100644 libraries/logic/QObjectPtr.h delete mode 100644 libraries/logic/RWStorage.h delete mode 100644 libraries/logic/RecursiveFileSystemWatcher.cpp delete mode 100644 libraries/logic/RecursiveFileSystemWatcher.h delete mode 100644 libraries/logic/SeparatorPrefixTree.h delete mode 100644 libraries/logic/TypeMagic.h delete mode 100644 libraries/logic/Version.cpp delete mode 100644 libraries/logic/Version.h delete mode 100644 libraries/logic/java/JavaChecker.cpp delete mode 100644 libraries/logic/java/JavaChecker.h delete mode 100644 libraries/logic/java/JavaCheckerJob.cpp delete mode 100644 libraries/logic/java/JavaCheckerJob.h delete mode 100644 libraries/logic/java/JavaInstall.cpp delete mode 100644 libraries/logic/java/JavaInstall.h delete mode 100644 libraries/logic/java/JavaInstallList.cpp delete mode 100644 libraries/logic/java/JavaInstallList.h delete mode 100644 libraries/logic/java/JavaUtils.cpp delete mode 100644 libraries/logic/java/JavaUtils.h delete mode 100644 libraries/logic/java/JavaVersion.cpp delete mode 100644 libraries/logic/java/JavaVersion.h delete mode 100644 libraries/logic/launch/LaunchStep.cpp delete mode 100644 libraries/logic/launch/LaunchStep.h delete mode 100644 libraries/logic/launch/LaunchTask.cpp delete mode 100644 libraries/logic/launch/LaunchTask.h delete mode 100644 libraries/logic/launch/LoggedProcess.cpp delete mode 100644 libraries/logic/launch/LoggedProcess.h delete mode 100644 libraries/logic/launch/MessageLevel.cpp delete mode 100644 libraries/logic/launch/MessageLevel.h delete mode 100644 libraries/logic/launch/steps/CheckJava.cpp delete mode 100644 libraries/logic/launch/steps/CheckJava.h delete mode 100644 libraries/logic/launch/steps/LaunchMinecraft.cpp delete mode 100644 libraries/logic/launch/steps/LaunchMinecraft.h delete mode 100644 libraries/logic/launch/steps/ModMinecraftJar.cpp delete mode 100644 libraries/logic/launch/steps/ModMinecraftJar.h delete mode 100644 libraries/logic/launch/steps/PostLaunchCommand.cpp delete mode 100644 libraries/logic/launch/steps/PostLaunchCommand.h delete mode 100644 libraries/logic/launch/steps/PreLaunchCommand.cpp delete mode 100644 libraries/logic/launch/steps/PreLaunchCommand.h delete mode 100644 libraries/logic/launch/steps/TextPrint.cpp delete mode 100644 libraries/logic/launch/steps/TextPrint.h delete mode 100644 libraries/logic/launch/steps/Update.cpp delete mode 100644 libraries/logic/launch/steps/Update.h delete mode 100644 libraries/logic/minecraft/AssetsUtils.cpp delete mode 100644 libraries/logic/minecraft/AssetsUtils.h delete mode 100644 libraries/logic/minecraft/GradleSpecifier.h delete mode 100644 libraries/logic/minecraft/JarMod.h delete mode 100644 libraries/logic/minecraft/Library.cpp delete mode 100644 libraries/logic/minecraft/Library.h delete mode 100644 libraries/logic/minecraft/MinecraftInstance.cpp delete mode 100644 libraries/logic/minecraft/MinecraftInstance.h delete mode 100644 libraries/logic/minecraft/MinecraftProfile.cpp delete mode 100644 libraries/logic/minecraft/MinecraftProfile.h delete mode 100644 libraries/logic/minecraft/MinecraftVersion.cpp delete mode 100644 libraries/logic/minecraft/MinecraftVersion.h delete mode 100644 libraries/logic/minecraft/MinecraftVersionList.cpp delete mode 100644 libraries/logic/minecraft/MinecraftVersionList.h delete mode 100644 libraries/logic/minecraft/Mod.cpp delete mode 100644 libraries/logic/minecraft/Mod.h delete mode 100644 libraries/logic/minecraft/ModList.cpp delete mode 100644 libraries/logic/minecraft/ModList.h delete mode 100644 libraries/logic/minecraft/MojangDownloadInfo.h delete mode 100644 libraries/logic/minecraft/MojangVersionFormat.cpp delete mode 100644 libraries/logic/minecraft/MojangVersionFormat.h delete mode 100644 libraries/logic/minecraft/OpSys.cpp delete mode 100644 libraries/logic/minecraft/OpSys.h delete mode 100644 libraries/logic/minecraft/ParseUtils.cpp delete mode 100644 libraries/logic/minecraft/ParseUtils.h delete mode 100644 libraries/logic/minecraft/ProfilePatch.h delete mode 100644 libraries/logic/minecraft/ProfileStrategy.h delete mode 100644 libraries/logic/minecraft/ProfileUtils.cpp delete mode 100644 libraries/logic/minecraft/ProfileUtils.h delete mode 100644 libraries/logic/minecraft/Rule.cpp delete mode 100644 libraries/logic/minecraft/Rule.h delete mode 100644 libraries/logic/minecraft/VersionBuildError.h delete mode 100644 libraries/logic/minecraft/VersionFile.cpp delete mode 100644 libraries/logic/minecraft/VersionFile.h delete mode 100644 libraries/logic/minecraft/VersionFilterData.cpp delete mode 100644 libraries/logic/minecraft/VersionFilterData.h delete mode 100644 libraries/logic/minecraft/World.cpp delete mode 100644 libraries/logic/minecraft/World.h delete mode 100644 libraries/logic/minecraft/WorldList.cpp delete mode 100644 libraries/logic/minecraft/WorldList.h delete mode 100644 libraries/logic/minecraft/auth/AuthSession.cpp delete mode 100644 libraries/logic/minecraft/auth/AuthSession.h delete mode 100644 libraries/logic/minecraft/auth/MojangAccount.cpp delete mode 100644 libraries/logic/minecraft/auth/MojangAccount.h delete mode 100644 libraries/logic/minecraft/auth/MojangAccountList.cpp delete mode 100644 libraries/logic/minecraft/auth/MojangAccountList.h delete mode 100644 libraries/logic/minecraft/auth/YggdrasilTask.cpp delete mode 100644 libraries/logic/minecraft/auth/YggdrasilTask.h delete mode 100644 libraries/logic/minecraft/auth/flows/AuthenticateTask.cpp delete mode 100644 libraries/logic/minecraft/auth/flows/AuthenticateTask.h delete mode 100644 libraries/logic/minecraft/auth/flows/RefreshTask.cpp delete mode 100644 libraries/logic/minecraft/auth/flows/RefreshTask.h delete mode 100644 libraries/logic/minecraft/auth/flows/ValidateTask.cpp delete mode 100644 libraries/logic/minecraft/auth/flows/ValidateTask.h delete mode 100644 libraries/logic/minecraft/forge/ForgeInstaller.cpp delete mode 100644 libraries/logic/minecraft/forge/ForgeInstaller.h delete mode 100644 libraries/logic/minecraft/forge/ForgeVersion.cpp delete mode 100644 libraries/logic/minecraft/forge/ForgeVersion.h delete mode 100644 libraries/logic/minecraft/forge/ForgeVersionList.cpp delete mode 100644 libraries/logic/minecraft/forge/ForgeVersionList.h delete mode 100644 libraries/logic/minecraft/forge/ForgeXzDownload.cpp delete mode 100644 libraries/logic/minecraft/forge/ForgeXzDownload.h delete mode 100644 libraries/logic/minecraft/forge/LegacyForge.cpp delete mode 100644 libraries/logic/minecraft/forge/LegacyForge.h delete mode 100644 libraries/logic/minecraft/ftb/FTBPlugin.cpp delete mode 100644 libraries/logic/minecraft/ftb/FTBPlugin.h delete mode 100644 libraries/logic/minecraft/ftb/FTBProfileStrategy.cpp delete mode 100644 libraries/logic/minecraft/ftb/FTBProfileStrategy.h delete mode 100644 libraries/logic/minecraft/ftb/FTBVersion.h delete mode 100644 libraries/logic/minecraft/ftb/LegacyFTBInstance.cpp delete mode 100644 libraries/logic/minecraft/ftb/LegacyFTBInstance.h delete mode 100644 libraries/logic/minecraft/ftb/OneSixFTBInstance.cpp delete mode 100644 libraries/logic/minecraft/ftb/OneSixFTBInstance.h delete mode 100644 libraries/logic/minecraft/legacy/LegacyInstance.cpp delete mode 100644 libraries/logic/minecraft/legacy/LegacyInstance.h delete mode 100644 libraries/logic/minecraft/legacy/LegacyUpdate.cpp delete mode 100644 libraries/logic/minecraft/legacy/LegacyUpdate.h delete mode 100644 libraries/logic/minecraft/legacy/LwjglVersionList.cpp delete mode 100644 libraries/logic/minecraft/legacy/LwjglVersionList.h delete mode 100644 libraries/logic/minecraft/liteloader/LiteLoaderInstaller.cpp delete mode 100644 libraries/logic/minecraft/liteloader/LiteLoaderInstaller.h delete mode 100644 libraries/logic/minecraft/liteloader/LiteLoaderVersionList.cpp delete mode 100644 libraries/logic/minecraft/liteloader/LiteLoaderVersionList.h delete mode 100644 libraries/logic/minecraft/onesix/OneSixInstance.cpp delete mode 100644 libraries/logic/minecraft/onesix/OneSixInstance.h delete mode 100644 libraries/logic/minecraft/onesix/OneSixProfileStrategy.cpp delete mode 100644 libraries/logic/minecraft/onesix/OneSixProfileStrategy.h delete mode 100644 libraries/logic/minecraft/onesix/OneSixUpdate.cpp delete mode 100644 libraries/logic/minecraft/onesix/OneSixUpdate.h delete mode 100644 libraries/logic/minecraft/onesix/OneSixVersionFormat.cpp delete mode 100644 libraries/logic/minecraft/onesix/OneSixVersionFormat.h delete mode 100644 libraries/logic/net/ByteArrayDownload.cpp delete mode 100644 libraries/logic/net/ByteArrayDownload.h delete mode 100644 libraries/logic/net/CacheDownload.cpp delete mode 100644 libraries/logic/net/CacheDownload.h delete mode 100644 libraries/logic/net/HttpMetaCache.cpp delete mode 100644 libraries/logic/net/HttpMetaCache.h delete mode 100644 libraries/logic/net/MD5EtagDownload.cpp delete mode 100644 libraries/logic/net/MD5EtagDownload.h delete mode 100644 libraries/logic/net/NetAction.h delete mode 100644 libraries/logic/net/NetJob.cpp delete mode 100644 libraries/logic/net/NetJob.h delete mode 100644 libraries/logic/net/PasteUpload.cpp delete mode 100644 libraries/logic/net/PasteUpload.h delete mode 100644 libraries/logic/net/URLConstants.cpp delete mode 100644 libraries/logic/net/URLConstants.h delete mode 100644 libraries/logic/news/NewsChecker.cpp delete mode 100644 libraries/logic/news/NewsChecker.h delete mode 100644 libraries/logic/news/NewsEntry.cpp delete mode 100644 libraries/logic/news/NewsEntry.h delete mode 100644 libraries/logic/notifications/NotificationChecker.cpp delete mode 100644 libraries/logic/notifications/NotificationChecker.h delete mode 100644 libraries/logic/pathmatcher/FSTreeMatcher.h delete mode 100644 libraries/logic/pathmatcher/IPathMatcher.h delete mode 100644 libraries/logic/pathmatcher/MultiMatcher.h delete mode 100644 libraries/logic/pathmatcher/RegexpMatcher.h delete mode 100644 libraries/logic/resources/Resource.cpp delete mode 100644 libraries/logic/resources/Resource.h delete mode 100644 libraries/logic/resources/ResourceHandler.cpp delete mode 100644 libraries/logic/resources/ResourceHandler.h delete mode 100644 libraries/logic/resources/ResourceObserver.cpp delete mode 100644 libraries/logic/resources/ResourceObserver.h delete mode 100644 libraries/logic/resources/ResourceProxyModel.cpp delete mode 100644 libraries/logic/resources/ResourceProxyModel.h delete mode 100644 libraries/logic/screenshots/ImgurAlbumCreation.cpp delete mode 100644 libraries/logic/screenshots/ImgurAlbumCreation.h delete mode 100644 libraries/logic/screenshots/ImgurUpload.cpp delete mode 100644 libraries/logic/screenshots/ImgurUpload.h delete mode 100644 libraries/logic/screenshots/Screenshot.h delete mode 100644 libraries/logic/settings/INIFile.cpp delete mode 100644 libraries/logic/settings/INIFile.h delete mode 100644 libraries/logic/settings/INISettingsObject.cpp delete mode 100644 libraries/logic/settings/INISettingsObject.h delete mode 100644 libraries/logic/settings/OverrideSetting.cpp delete mode 100644 libraries/logic/settings/OverrideSetting.h delete mode 100644 libraries/logic/settings/PassthroughSetting.cpp delete mode 100644 libraries/logic/settings/PassthroughSetting.h delete mode 100644 libraries/logic/settings/Setting.cpp delete mode 100644 libraries/logic/settings/Setting.h delete mode 100644 libraries/logic/settings/SettingsObject.cpp delete mode 100644 libraries/logic/settings/SettingsObject.h delete mode 100644 libraries/logic/status/StatusChecker.cpp delete mode 100644 libraries/logic/status/StatusChecker.h delete mode 100644 libraries/logic/tasks/SequentialTask.cpp delete mode 100644 libraries/logic/tasks/SequentialTask.h delete mode 100644 libraries/logic/tasks/Task.cpp delete mode 100644 libraries/logic/tasks/Task.h delete mode 100644 libraries/logic/tasks/ThreadTask.cpp delete mode 100644 libraries/logic/tasks/ThreadTask.h delete mode 100644 libraries/logic/tools/BaseExternalTool.cpp delete mode 100644 libraries/logic/tools/BaseExternalTool.h delete mode 100644 libraries/logic/tools/BaseProfiler.cpp delete mode 100644 libraries/logic/tools/BaseProfiler.h delete mode 100644 libraries/logic/tools/JProfiler.cpp delete mode 100644 libraries/logic/tools/JProfiler.h delete mode 100644 libraries/logic/tools/JVisualVM.cpp delete mode 100644 libraries/logic/tools/JVisualVM.h delete mode 100644 libraries/logic/tools/MCEditTool.cpp delete mode 100644 libraries/logic/tools/MCEditTool.h delete mode 100644 libraries/logic/trans/TranslationDownloader.cpp delete mode 100644 libraries/logic/trans/TranslationDownloader.h delete mode 100644 libraries/logic/updater/DownloadTask.cpp delete mode 100644 libraries/logic/updater/DownloadTask.h delete mode 100644 libraries/logic/updater/GoUpdate.cpp delete mode 100644 libraries/logic/updater/GoUpdate.h delete mode 100644 libraries/logic/updater/UpdateChecker.cpp delete mode 100644 libraries/logic/updater/UpdateChecker.h delete mode 100644 libraries/logic/wonko/BaseWonkoEntity.cpp delete mode 100644 libraries/logic/wonko/BaseWonkoEntity.h delete mode 100644 libraries/logic/wonko/WonkoIndex.cpp delete mode 100644 libraries/logic/wonko/WonkoIndex.h delete mode 100644 libraries/logic/wonko/WonkoReference.cpp delete mode 100644 libraries/logic/wonko/WonkoReference.h delete mode 100644 libraries/logic/wonko/WonkoUtil.cpp delete mode 100644 libraries/logic/wonko/WonkoUtil.h delete mode 100644 libraries/logic/wonko/WonkoVersion.cpp delete mode 100644 libraries/logic/wonko/WonkoVersion.h delete mode 100644 libraries/logic/wonko/WonkoVersionList.cpp delete mode 100644 libraries/logic/wonko/WonkoVersionList.h delete mode 100644 libraries/logic/wonko/format/WonkoFormat.cpp delete mode 100644 libraries/logic/wonko/format/WonkoFormat.h delete mode 100644 libraries/logic/wonko/format/WonkoFormatV1.cpp delete mode 100644 libraries/logic/wonko/format/WonkoFormatV1.h delete mode 100644 libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp delete mode 100644 libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.h delete mode 100644 libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp delete mode 100644 libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h (limited to 'libraries/logic') diff --git a/libraries/logic/AbstractCommonModel.cpp b/libraries/logic/AbstractCommonModel.cpp deleted file mode 100644 index 71d75829..00000000 --- a/libraries/logic/AbstractCommonModel.cpp +++ /dev/null @@ -1,133 +0,0 @@ -/* Copyright 2015 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "AbstractCommonModel.h" - -BaseAbstractCommonModel::BaseAbstractCommonModel(const Qt::Orientation orientation, QObject *parent) - : QAbstractListModel(parent), m_orientation(orientation) -{ -} - -int BaseAbstractCommonModel::rowCount(const QModelIndex &parent) const -{ - return m_orientation == Qt::Horizontal ? entryCount() : size(); -} -int BaseAbstractCommonModel::columnCount(const QModelIndex &parent) const -{ - return m_orientation == Qt::Horizontal ? size() : entryCount(); -} -QVariant BaseAbstractCommonModel::data(const QModelIndex &index, int role) const -{ - if (!hasIndex(index.row(), index.column(), index.parent())) - { - return QVariant(); - } - const int i = m_orientation == Qt::Horizontal ? index.column() : index.row(); - const int entry = m_orientation == Qt::Horizontal ? index.row() : index.column(); - return formatData(i, role, get(i, entry, role)); -} -QVariant BaseAbstractCommonModel::headerData(int section, Qt::Orientation orientation, int role) const -{ - if (orientation != m_orientation && role == Qt::DisplayRole) - { - return entryTitle(section); - } - else - { - return QVariant(); - } -} -bool BaseAbstractCommonModel::setData(const QModelIndex &index, const QVariant &value, int role) -{ - const int i = m_orientation == Qt::Horizontal ? index.column() : index.row(); - const int entry = m_orientation == Qt::Horizontal ? index.row() : index.column(); - const bool result = set(i, entry, role, sanetizeData(i, role, value)); - if (result) - { - emit dataChanged(index, index, QVector() << role); - } - return result; -} -Qt::ItemFlags BaseAbstractCommonModel::flags(const QModelIndex &index) const -{ - if (!hasIndex(index.row(), index.column(), index.parent())) - { - return Qt::NoItemFlags; - } - - const int entry = m_orientation == Qt::Horizontal ? index.row() : index.column(); - if (canSet(entry)) - { - return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEnabled; - } - else - { - return Qt::ItemIsEnabled | Qt::ItemIsSelectable; - } -} - -void BaseAbstractCommonModel::notifyAboutToAddObject(const int at) -{ - if (m_orientation == Qt::Horizontal) - { - beginInsertColumns(QModelIndex(), at, at); - } - else - { - beginInsertRows(QModelIndex(), at, at); - } -} -void BaseAbstractCommonModel::notifyObjectAdded() -{ - if (m_orientation == Qt::Horizontal) - { - endInsertColumns(); - } - else - { - endInsertRows(); - } -} -void BaseAbstractCommonModel::notifyAboutToRemoveObject(const int at) -{ - if (m_orientation == Qt::Horizontal) - { - beginRemoveColumns(QModelIndex(), at, at); - } - else - { - beginRemoveRows(QModelIndex(), at, at); - } -} -void BaseAbstractCommonModel::notifyObjectRemoved() -{ - if (m_orientation == Qt::Horizontal) - { - endRemoveColumns(); - } - else - { - endRemoveRows(); - } -} - -void BaseAbstractCommonModel::notifyBeginReset() -{ - beginResetModel(); -} -void BaseAbstractCommonModel::notifyEndReset() -{ - endResetModel(); -} diff --git a/libraries/logic/AbstractCommonModel.h b/libraries/logic/AbstractCommonModel.h deleted file mode 100644 index 31b86a23..00000000 --- a/libraries/logic/AbstractCommonModel.h +++ /dev/null @@ -1,462 +0,0 @@ -/* Copyright 2015 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include -#include -#include -#include - -class BaseAbstractCommonModel : public QAbstractListModel -{ - Q_OBJECT -public: - explicit BaseAbstractCommonModel(const Qt::Orientation orientation, QObject *parent = nullptr); - - // begin QAbstractItemModel interface - int rowCount(const QModelIndex &parent = QModelIndex()) const override; - int columnCount(const QModelIndex &parent = QModelIndex()) const override; - QVariant data(const QModelIndex &index, int role) const override; - QVariant headerData(int section, Qt::Orientation orientation, int role) const override; - bool setData(const QModelIndex &index, const QVariant &value, int role) override; - Qt::ItemFlags flags(const QModelIndex &index) const override; - // end QAbstractItemModel interface - - virtual int size() const = 0; - virtual int entryCount() const = 0; - - virtual QVariant formatData(const int index, int role, const QVariant &data) const { return data; } - virtual QVariant sanetizeData(const int index, int role, const QVariant &data) const { return data; } - -protected: - virtual QVariant get(const int index, const int entry, const int role) const = 0; - virtual bool set(const int index, const int entry, const int role, const QVariant &value) = 0; - virtual bool canSet(const int entry) const = 0; - virtual QString entryTitle(const int entry) const = 0; - - void notifyAboutToAddObject(const int at); - void notifyObjectAdded(); - void notifyAboutToRemoveObject(const int at); - void notifyObjectRemoved(); - void notifyBeginReset(); - void notifyEndReset(); - - const Qt::Orientation m_orientation; -}; - -template -class AbstractCommonModel : public BaseAbstractCommonModel -{ -public: - explicit AbstractCommonModel(const Qt::Orientation orientation) - : BaseAbstractCommonModel(orientation) {} - virtual ~AbstractCommonModel() {} - - int size() const override { return m_objects.size(); } - int entryCount() const override { return m_entries.size(); } - - void append(const Object &object) - { - notifyAboutToAddObject(size()); - m_objects.append(object); - notifyObjectAdded(); - } - void prepend(const Object &object) - { - notifyAboutToAddObject(0); - m_objects.prepend(object); - notifyObjectAdded(); - } - void insert(const Object &object, const int index) - { - if (index >= size()) - { - prepend(object); - } - else if (index <= 0) - { - append(object); - } - else - { - notifyAboutToAddObject(index); - m_objects.insert(index, object); - notifyObjectAdded(); - } - } - void remove(const int index) - { - notifyAboutToRemoveObject(index); - m_objects.removeAt(index); - notifyObjectRemoved(); - } - Object get(const int index) const - { - return m_objects.at(index); - } - -private: - friend class CommonModel; - QVariant get(const int index, const int entry, const int role) const override - { - if (m_entries.size() < entry || !m_entries[entry].second.contains(role)) - { - return QVariant(); - } - return m_entries[entry].second.value(role)->get(m_objects.at(index)); - } - bool set(const int index, const int entry, const int role, const QVariant &value) override - { - if (m_entries.size() < entry || !m_entries[entry].second.contains(role)) - { - return false; - } - IEntry *e = m_entries[entry].second.value(role); - if (!e->canSet()) - { - return false; - } - e->set(m_objects[index], value); - return true; - } - bool canSet(const int entry) const override - { - if (m_entries.size() < entry || !m_entries[entry].second.contains(Qt::EditRole)) - { - return false; - } - IEntry *e = m_entries[entry].second.value(Qt::EditRole); - return e->canSet(); - } - - QString entryTitle(const int entry) const override - { - return m_entries.at(entry).first; - } - -private: - struct IEntry - { - virtual ~IEntry() {} - virtual void set(Object &object, const QVariant &value) = 0; - virtual QVariant get(const Object &object) const = 0; - virtual bool canSet() const = 0; - }; - template - struct VariableEntry : public IEntry - { - typedef T (Object::*Member); - - explicit VariableEntry(Member member) - : m_member(member) {} - - void set(Object &object, const QVariant &value) override - { - object.*m_member = value.value(); - } - QVariant get(const Object &object) const override - { - return QVariant::fromValue(object.*m_member); - } - bool canSet() const override { return true; } - - private: - Member m_member; - }; - template - struct FunctionEntry : public IEntry - { - typedef T (Object::*Getter)() const; - typedef void (Object::*Setter)(T); - - explicit FunctionEntry(Getter getter, Setter setter) - : m_getter(m_getter), m_setter(m_setter) {} - - void set(Object &object, const QVariant &value) override - { - object.*m_setter(value.value()); - } - QVariant get(const Object &object) const override - { - return QVariant::fromValue(object.*m_getter()); - } - bool canSet() const override { return !!m_setter; } - - private: - Getter m_getter; - Setter m_setter; - }; - - QList m_objects; - QVector>> m_entries; - - void addEntryInternal(IEntry *e, const int entry, const int role) - { - if (m_entries.size() <= entry) - { - m_entries.resize(entry + 1); - } - m_entries[entry].second.insert(role, e); - } - -protected: - template - typename std::enable_if::value && std::is_member_function_pointer::value, void>::type - addEntry(Getter getter, Setter setter, const int entry, const int role) - { - addEntryInternal(new FunctionEntry::type>(getter, setter), entry, role); - } - template - typename std::enable_if::value, void>::type - addEntry(Getter getter, const int entry, const int role) - { - addEntryInternal(new FunctionEntry::type>(getter, nullptr), entry, role); - } - template - typename std::enable_if::value, void>::type - addEntry(T (Object::*member), const int entry, const int role) - { - addEntryInternal(new VariableEntry(member), entry, role); - } - - void setEntryTitle(const int entry, const QString &title) - { - m_entries[entry].first = title; - } -}; -template -class AbstractCommonModel : public BaseAbstractCommonModel -{ -public: - explicit AbstractCommonModel(const Qt::Orientation orientation) - : BaseAbstractCommonModel(orientation) {} - virtual ~AbstractCommonModel() - { - qDeleteAll(m_objects); - } - - int size() const override { return m_objects.size(); } - int entryCount() const override { return m_entries.size(); } - - void append(Object *object) - { - notifyAboutToAddObject(size()); - m_objects.append(object); - notifyObjectAdded(); - } - void prepend(Object *object) - { - notifyAboutToAddObject(0); - m_objects.prepend(object); - notifyObjectAdded(); - } - void insert(Object *object, const int index) - { - if (index >= size()) - { - prepend(object); - } - else if (index <= 0) - { - append(object); - } - else - { - notifyAboutToAddObject(index); - m_objects.insert(index, object); - notifyObjectAdded(); - } - } - void remove(const int index) - { - notifyAboutToRemoveObject(index); - m_objects.removeAt(index); - notifyObjectRemoved(); - } - Object *get(const int index) const - { - return m_objects.at(index); - } - int find(Object * const obj) const - { - return m_objects.indexOf(obj); - } - - QList getAll() const - { - return m_objects; - } - -private: - friend class CommonModel; - QVariant get(const int index, const int entry, const int role) const override - { - if (m_entries.size() < entry || !m_entries[entry].second.contains(role)) - { - return QVariant(); - } - return m_entries[entry].second.value(role)->get(m_objects.at(index)); - } - bool set(const int index, const int entry, const int role, const QVariant &value) override - { - if (m_entries.size() < entry || !m_entries[entry].second.contains(role)) - { - return false; - } - IEntry *e = m_entries[entry].second.value(role); - if (!e->canSet()) - { - return false; - } - e->set(m_objects[index], value); - return true; - } - bool canSet(const int entry) const override - { - if (m_entries.size() < entry || !m_entries[entry].second.contains(Qt::EditRole)) - { - return false; - } - IEntry *e = m_entries[entry].second.value(Qt::EditRole); - return e->canSet(); - } - - QString entryTitle(const int entry) const override - { - return m_entries.at(entry).first; - } - -private: - struct IEntry - { - virtual ~IEntry() {} - virtual void set(Object *object, const QVariant &value) = 0; - virtual QVariant get(Object *object) const = 0; - virtual bool canSet() const = 0; - }; - template - struct VariableEntry : public IEntry - { - typedef T (Object::*Member); - - explicit VariableEntry(Member member) - : m_member(member) {} - - void set(Object *object, const QVariant &value) override - { - object->*m_member = value.value(); - } - QVariant get(Object *object) const override - { - return QVariant::fromValue(object->*m_member); - } - bool canSet() const override { return true; } - - private: - Member m_member; - }; - template - struct FunctionEntry : public IEntry - { - typedef T (Object::*Getter)() const; - typedef void (Object::*Setter)(T); - - explicit FunctionEntry(Getter getter, Setter setter) - : m_getter(getter), m_setter(setter) {} - - void set(Object *object, const QVariant &value) override - { - (object->*m_setter)(value.value()); - } - QVariant get(Object *object) const override - { - return QVariant::fromValue((object->*m_getter)()); - } - bool canSet() const override { return !!m_setter; } - - private: - Getter m_getter; - Setter m_setter; - }; - template - struct LambdaEntry : public IEntry - { - using Getter = std::function; - - explicit LambdaEntry(Getter getter) - : m_getter(getter) {} - - void set(Object *object, const QVariant &value) override {} - QVariant get(Object *object) const override - { - return QVariant::fromValue(m_getter(object)); - } - bool canSet() const override { return false; } - - private: - Getter m_getter; - }; - - QList m_objects; - QVector>> m_entries; - - void addEntryInternal(IEntry *e, const int entry, const int role) - { - if (m_entries.size() <= entry) - { - m_entries.resize(entry + 1); - } - m_entries[entry].second.insert(role, e); - } - -protected: - template - typename std::enable_if::value && std::is_member_function_pointer::value, void>::type - addEntry(const int entry, const int role, Getter getter, Setter setter) - { - addEntryInternal(new FunctionEntry::type>(getter, setter), entry, role); - } - template - typename std::enable_if::Getter>::value, void>::type - addEntry(const int entry, const int role, typename FunctionEntry::Getter getter) - { - addEntryInternal(new FunctionEntry(getter, nullptr), entry, role); - } - template - typename std::enable_if::value, void>::type - addEntry(const int entry, const int role, T (Object::*member)) - { - addEntryInternal(new VariableEntry(member), entry, role); - } - template - void addEntry(const int entry, const int role, typename LambdaEntry::Getter lambda) - { - addEntryInternal(new LambdaEntry(lambda), entry, role); - } - - void setEntryTitle(const int entry, const QString &title) - { - m_entries[entry].first = title; - } - - void setAll(const QList objects) - { - notifyBeginReset(); - qDeleteAll(m_objects); - m_objects = objects; - notifyEndReset(); - } -}; diff --git a/libraries/logic/BaseConfigObject.cpp b/libraries/logic/BaseConfigObject.cpp deleted file mode 100644 index 3040ac2e..00000000 --- a/libraries/logic/BaseConfigObject.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/* Copyright 2015 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "BaseConfigObject.h" - -#include -#include -#include -#include - -#include "Exception.h" -#include "FileSystem.h" - -BaseConfigObject::BaseConfigObject(const QString &filename) - : m_filename(filename) -{ - m_saveTimer = new QTimer; - m_saveTimer->setSingleShot(true); - // cppcheck-suppress pureVirtualCall - QObject::connect(m_saveTimer, &QTimer::timeout, [this](){saveNow();}); - setSaveTimeout(250); - - m_initialReadTimer = new QTimer; - m_initialReadTimer->setSingleShot(true); - QObject::connect(m_initialReadTimer, &QTimer::timeout, [this]() - { - loadNow(); - m_initialReadTimer->deleteLater(); - m_initialReadTimer = 0; - }); - m_initialReadTimer->start(0); - - // cppcheck-suppress pureVirtualCall - m_appQuitConnection = QObject::connect(qApp, &QCoreApplication::aboutToQuit, [this](){saveNow();}); -} -BaseConfigObject::~BaseConfigObject() -{ - delete m_saveTimer; - if (m_initialReadTimer) - { - delete m_initialReadTimer; - } - QObject::disconnect(m_appQuitConnection); -} - -void BaseConfigObject::setSaveTimeout(int msec) -{ - m_saveTimer->setInterval(msec); -} - -void BaseConfigObject::scheduleSave() -{ - m_saveTimer->stop(); - m_saveTimer->start(); -} -void BaseConfigObject::saveNow() -{ - if (m_saveTimer->isActive()) - { - m_saveTimer->stop(); - } - if (m_disableSaving) - { - return; - } - - try - { - FS::write(m_filename, doSave()); - } - catch (Exception & e) - { - qCritical() << e.cause(); - } -} -void BaseConfigObject::loadNow() -{ - if (m_saveTimer->isActive()) - { - saveNow(); - } - - try - { - doLoad(FS::read(m_filename)); - } - catch (Exception & e) - { - qWarning() << "Error loading" << m_filename << ":" << e.cause(); - } -} diff --git a/libraries/logic/BaseConfigObject.h b/libraries/logic/BaseConfigObject.h deleted file mode 100644 index 1c96b3d1..00000000 --- a/libraries/logic/BaseConfigObject.h +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright 2015 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include - -class QTimer; - -class BaseConfigObject -{ -public: - void setSaveTimeout(int msec); - -protected: - explicit BaseConfigObject(const QString &filename); - virtual ~BaseConfigObject(); - - // cppcheck-suppress pureVirtualCall - virtual QByteArray doSave() const = 0; - virtual void doLoad(const QByteArray &data) = 0; - - void setSavingDisabled(bool savingDisabled) { m_disableSaving = savingDisabled; } - - QString fileName() const { return m_filename; } - -public: - void scheduleSave(); - void saveNow(); - void loadNow(); - -private: - QTimer *m_saveTimer; - QTimer *m_initialReadTimer; - QString m_filename; - QMetaObject::Connection m_appQuitConnection; - bool m_disableSaving = false; -}; diff --git a/libraries/logic/BaseInstaller.cpp b/libraries/logic/BaseInstaller.cpp deleted file mode 100644 index cb762ebd..00000000 --- a/libraries/logic/BaseInstaller.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/* Copyright 2013-2015 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -#include "BaseInstaller.h" -#include "minecraft/onesix/OneSixInstance.h" - -BaseInstaller::BaseInstaller() -{ - -} - -bool BaseInstaller::isApplied(OneSixInstance *on) -{ - return QFile::exists(filename(on->instanceRoot())); -} - -bool BaseInstaller::add(OneSixInstance *to) -{ - if (!patchesDir(to->instanceRoot()).exists()) - { - QDir(to->instanceRoot()).mkdir("patches"); - } - - if (isApplied(to)) - { - if (!remove(to)) - { - return false; - } - } - - return true; -} - -bool BaseInstaller::remove(OneSixInstance *from) -{ - return QFile::remove(filename(from->instanceRoot())); -} - -QString BaseInstaller::filename(const QString &root) const -{ - return patchesDir(root).absoluteFilePath(id() + ".json"); -} -QDir BaseInstaller::patchesDir(const QString &root) const -{ - return QDir(root + "/patches/"); -} diff --git a/libraries/logic/BaseInstaller.h b/libraries/logic/BaseInstaller.h deleted file mode 100644 index a50c8cb1..00000000 --- a/libraries/logic/BaseInstaller.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2013-2015 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include - -#include "multimc_logic_export.h" - -class OneSixInstance; -class QDir; -class QString; -class QObject; -class Task; -class BaseVersion; -typedef std::shared_ptr BaseVersionPtr; - -class MULTIMC_LOGIC_EXPORT BaseInstaller -{ -public: - BaseInstaller(); - virtual ~BaseInstaller(){}; - bool isApplied(OneSixInstance *on); - - virtual bool add(OneSixInstance *to); - virtual bool remove(OneSixInstance *from); - - virtual Task *createInstallTask(OneSixInstance *instance, BaseVersionPtr version, QObject *parent) = 0; - -protected: - virtual QString id() const = 0; - QString filename(const QString &root) const; - QDir patchesDir(const QString &root) const; -}; diff --git a/libraries/logic/BaseInstance.cpp b/libraries/logic/BaseInstance.cpp deleted file mode 100644 index ce55d5e4..00000000 --- a/libraries/logic/BaseInstance.cpp +++ /dev/null @@ -1,270 +0,0 @@ -/* Copyright 2013-2015 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "BaseInstance.h" - -#include -#include - -#include "settings/INISettingsObject.h" -#include "settings/Setting.h" -#include "settings/OverrideSetting.h" - -#include "minecraft/MinecraftVersionList.h" -#include "FileSystem.h" -#include "Commandline.h" - -BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) - : QObject() -{ - m_settings = settings; - m_rootDir = rootDir; - - m_settings->registerSetting("name", "Unnamed Instance"); - m_settings->registerSetting("iconKey", "default"); - m_settings->registerSetting("notes", ""); - m_settings->registerSetting("lastLaunchTime", 0); - m_settings->registerSetting("totalTimePlayed", 0); - - // Custom Commands - auto commandSetting = m_settings->registerSetting({"OverrideCommands","OverrideLaunchCmd"}, false); - m_settings->registerOverride(globalSettings->getSetting("PreLaunchCommand"), commandSetting); - m_settings->registerOverride(globalSettings->getSetting("WrapperCommand"), commandSetting); - m_settings->registerOverride(globalSettings->getSetting("PostExitCommand"), commandSetting); - - // Console - auto consoleSetting = m_settings->registerSetting("OverrideConsole", false); - m_settings->registerOverride(globalSettings->getSetting("ShowConsole"), consoleSetting); - m_settings->registerOverride(globalSettings->getSetting("AutoCloseConsole"), consoleSetting); - m_settings->registerOverride(globalSettings->getSetting("LogPrePostOutput"), consoleSetting); -} - -QString BaseInstance::getPreLaunchCommand() -{ - return settings()->get("PreLaunchCommand").toString(); -} - -QString BaseInstance::getWrapperCommand() -{ - return settings()->get("WrapperCommand").toString(); -} - -QString BaseInstance::getPostExitCommand() -{ - return settings()->get("PostExitCommand").toString(); -} - -void BaseInstance::iconUpdated(QString key) -{ - if(iconKey() == key) - { - emit propertiesChanged(this); - } -} - -void BaseInstance::nuke() -{ - FS::deletePath(instanceRoot()); - emit nuked(this); -} - -QString BaseInstance::id() const -{ - return QFileInfo(instanceRoot()).fileName(); -} - -bool BaseInstance::isRunning() const -{ - return m_isRunning; -} - -void BaseInstance::setRunning(bool running) -{ - if(running && !m_isRunning) - { - m_timeStarted = QDateTime::currentDateTime(); - } - else if(!running && m_isRunning) - { - qint64 current = settings()->get("totalTimePlayed").toLongLong(); - QDateTime timeEnded = QDateTime::currentDateTime(); - settings()->set("totalTimePlayed", current + m_timeStarted.secsTo(timeEnded)); - emit propertiesChanged(this); - } - m_isRunning = running; -} - -int64_t BaseInstance::totalTimePlayed() const -{ - qint64 current = settings()->get("totalTimePlayed").toLongLong(); - if(m_isRunning) - { - QDateTime timeNow = QDateTime::currentDateTime(); - return current + m_timeStarted.secsTo(timeNow); - } - return current; -} - -void BaseInstance::resetTimePlayed() -{ - settings()->reset("totalTimePlayed"); -} - -QString BaseInstance::instanceType() const -{ - return m_settings->get("InstanceType").toString(); -} - -QString BaseInstance::instanceRoot() const -{ - return m_rootDir; -} - -InstancePtr BaseInstance::getSharedPtr() -{ - return shared_from_this(); -} - -SettingsObjectPtr BaseInstance::settings() const -{ - return m_settings; -} - -BaseInstance::InstanceFlags BaseInstance::flags() const -{ - return m_flags; -} - -void BaseInstance::setFlags(const InstanceFlags &flags) -{ - if (flags != m_flags) - { - m_flags = flags; - emit flagsChanged(); - emit propertiesChanged(this); - } -} - -void BaseInstance::setFlag(const BaseInstance::InstanceFlag flag) -{ - // nothing to set? - if(flag & m_flags) - return; - m_flags |= flag; - emit flagsChanged(); - emit propertiesChanged(this); -} - -void BaseInstance::unsetFlag(const BaseInstance::InstanceFlag flag) -{ - // nothing to unset? - if(!(flag & m_flags)) - return; - m_flags &= ~flag; - emit flagsChanged(); - emit propertiesChanged(this); -} - -bool BaseInstance::canLaunch() const -{ - return !(flags() & VersionBrokenFlag); -} - -bool BaseInstance::reload() -{ - return m_settings->reload(); -} - -qint64 BaseInstance::lastLaunch() const -{ - return m_settings->get("lastLaunchTime").value(); -} - -void BaseInstance::setLastLaunch(qint64 val) -{ - //FIXME: if no change, do not set. setting involves saving a file. - m_settings->set("lastLaunchTime", val); - emit propertiesChanged(this); -} - -void BaseInstance::setGroupInitial(QString val) -{ - if(m_group == val) - { - return; - } - m_group = val; - emit propertiesChanged(this); -} - -void BaseInstance::setGroupPost(QString val) -{ - if(m_group == val) - { - return; - } - setGroupInitial(val); - emit groupChanged(); -} - -QString BaseInstance::group() const -{ - return m_group; -} - -void BaseInstance::setNotes(QString val) -{ - //FIXME: if no change, do not set. setting involves saving a file. - m_settings->set("notes", val); -} - -QString BaseInstance::notes() const -{ - return m_settings->get("notes").toString(); -} - -void BaseInstance::setIconKey(QString val) -{ - //FIXME: if no change, do not set. setting involves saving a file. - m_settings->set("iconKey", val); - emit propertiesChanged(this); -} - -QString BaseInstance::iconKey() const -{ - return m_settings->get("iconKey").toString(); -} - -void BaseInstance::setName(QString val) -{ - //FIXME: if no change, do not set. setting involves saving a file. - m_settings->set("name", val); - emit propertiesChanged(this); -} - -QString BaseInstance::name() const -{ - return m_settings->get("name").toString(); -} - -QString BaseInstance::windowTitle() const -{ - return "MultiMC: " + name(); -} - -QStringList BaseInstance::extraArguments() const -{ - return Commandline::splitArgs(settings()->get("JvmArgs").toString()); -} diff --git a/libraries/logic/BaseInstance.h b/libraries/logic/BaseInstance.h deleted file mode 100644 index 5e587c48..00000000 --- a/libraries/logic/BaseInstance.h +++ /dev/null @@ -1,243 +0,0 @@ -/* Copyright 2013-2015 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include -#include -#include -#include - -#include "settings/SettingsObject.h" - -#include "settings/INIFile.h" -#include "BaseVersionList.h" -#include "minecraft/auth/MojangAccount.h" -#include "launch/MessageLevel.h" -#include "pathmatcher/IPathMatcher.h" - -#include "multimc_logic_export.h" - -class QDir; -class Task; -class LaunchTask; -class BaseInstance; - -// pointer for lazy people -typedef std::shared_ptr InstancePtr; - -/*! - * \brief Base class for instances. - * This class implements many functions that are common between instances and - * provides a standard interface for all instances. - * - * To create a new instance type, create a new class inheriting from this class - * and implement the pure virtual functions. - */ -class MULTIMC_LOGIC_EXPORT BaseI