From 20b9f2b42a3b58b6081af271774fbcc34025dccb Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Sun, 25 Jul 2021 19:11:59 +0200 Subject: NOISSUE Flatten gui and logic libraries into MultiMC --- api/gui/CMakeLists.txt | 34 - api/gui/DesktopServices.cpp | 149 --- api/gui/DesktopServices.h | 37 - api/gui/SkinUtils.cpp | 52 - api/gui/SkinUtils.h | 25 - api/gui/icons/IconList.cpp | 419 ------- api/gui/icons/IconList.h | 88 -- api/gui/icons/MMCIcon.cpp | 118 -- api/gui/icons/MMCIcon.h | 51 - api/logic/BaseInstaller.cpp | 61 - api/logic/BaseInstaller.h | 46 - api/logic/BaseInstance.cpp | 275 ----- api/logic/BaseInstance.h | 272 ----- api/logic/BaseVersion.h | 59 - api/logic/BaseVersionList.cpp | 99 -- api/logic/BaseVersionList.h | 122 -- api/logic/CMakeLists.txt | 564 --------- api/logic/Commandline.cpp | 483 -------- api/logic/Commandline.h | 252 ---- api/logic/DefaultVariable.h | 35 - api/logic/Env.cpp | 211 ---- api/logic/Env.h | 65 -- api/logic/Exception.h | 34 - api/logic/ExponentialSeries.h | 43 - api/logic/FileSystem.cpp | 457 -------- api/logic/FileSystem.h | 128 -- api/logic/FileSystem_test.cpp | 164 --- api/logic/Filter.cpp | 31 - api/logic/Filter.h | 44 - api/logic/GZip.cpp | 115 -- api/logic/GZip.h | 12 - api/logic/GZip_test.cpp | 57 - api/logic/InstanceCopyTask.cpp | 60 - api/logic/InstanceCopyTask.h | 32 - api/logic/InstanceCreationTask.cpp | 31 - api/logic/InstanceCreationTask.h | 23 - api/logic/InstanceImportTask.cpp | 456 -------- api/logic/InstanceImportTask.h | 73 -- api/logic/InstanceList.cpp | 867 -------------- api/logic/InstanceList.h | 175 --- api/logic/InstanceTask.cpp | 9 - api/logic/InstanceTask.h | 53 - api/logic/Json.cpp | 272 ----- api/logic/Json.h | 249 ---- api/logic/LoggedProcess.cpp | 176 --- api/logic/LoggedProcess.h | 80 -- api/logic/MMCStrings.cpp | 76 -- api/logic/MMCStrings.h | 10 - api/logic/MMCZip.cpp | 312 ----- api/logic/MMCZip.h | 94 -- api/logic/MessageLevel.cpp | 36 - api/logic/MessageLevel.h | 28 - api/logic/NullInstance.h | 76 -- api/logic/ProblemProvider.h | 49 - api/logic/QObjectPtr.h | 83 -- api/logic/RWStorage.h | 66 -- api/logic/RecursiveFileSystemWatcher.cpp | 111 -- api/logic/RecursiveFileSystemWatcher.h | 63 - api/logic/SeparatorPrefixTree.h | 298 ----- api/logic/Usable.h | 58 - api/logic/Version.cpp | 85 -- api/logic/Version.h | 107 -- api/logic/Version_test.cpp | 85 -- api/logic/WatchLock.h | 20 - api/logic/icons/IIconList.cpp | 7 - api/logic/icons/IIconList.h | 26 - api/logic/icons/IconUtils.cpp | 62 - api/logic/icons/IconUtils.h | 14 - api/logic/java/JavaChecker.cpp | 166 --- api/logic/java/JavaChecker.h | 63 - api/logic/java/JavaCheckerJob.cpp | 44 - api/logic/java/JavaCheckerJob.h | 61 - api/logic/java/JavaInstall.cpp | 28 - api/logic/java/JavaInstall.h | 38 - api/logic/java/JavaInstallList.cpp | 208 ---- api/logic/java/JavaInstallList.h | 83 -- api/logic/java/JavaUtils.cpp | 399 ------- api/logic/java/JavaUtils.h | 44 - api/logic/java/JavaVersion.cpp | 121 -- api/logic/java/JavaVersion.h | 50 - api/logic/java/JavaVersion_test.cpp | 116 -- api/logic/java/launch/CheckJava.cpp | 139 --- api/logic/java/launch/CheckJava.h | 45 - api/logic/launch/LaunchStep.cpp | 27 - api/logic/launch/LaunchStep.h | 50 - api/logic/launch/LaunchTask.cpp | 280 ----- api/logic/launch/LaunchTask.h | 125 -- api/logic/launch/LogModel.cpp | 167 --- api/logic/launch/LogModel.h | 60 - api/logic/launch/steps/LookupServerAddress.cpp | 95 -- api/logic/launch/steps/LookupServerAddress.h | 49 - api/logic/launch/steps/PostLaunchCommand.cpp | 84 -- api/logic/launch/steps/PostLaunchCommand.h | 41 - api/logic/launch/steps/PreLaunchCommand.cpp | 85 -- api/logic/launch/steps/PreLaunchCommand.h | 41 - api/logic/launch/steps/TextPrint.cpp | 29 - api/logic/launch/steps/TextPrint.h | 43 - api/logic/launch/steps/Update.cpp | 80 -- api/logic/launch/steps/Update.h | 45 - api/logic/meta/BaseEntity.cpp | 168 --- api/logic/meta/BaseEntity.h | 68 -- api/logic/meta/Index.cpp | 148 --- api/logic/meta/Index.h | 71 -- api/logic/meta/Index_test.cpp | 44 - api/logic/meta/JsonFormat.cpp | 218 ---- api/logic/meta/JsonFormat.h | 83 -- api/logic/meta/Version.cpp | 140 --- api/logic/meta/Version.h | 118 -- api/logic/meta/VersionList.cpp | 245 ---- api/logic/meta/VersionList.h | 101 -- api/logic/minecraft/AssetsUtils.cpp | 333 ------ api/logic/minecraft/AssetsUtils.h | 53 - api/logic/minecraft/Component.cpp | 439 ------- api/logic/minecraft/Component.h | 111 -- api/logic/minecraft/ComponentUpdateTask.cpp | 704 ----------- api/logic/minecraft/ComponentUpdateTask.h | 37 - api/logic/minecraft/ComponentUpdateTask_p.h | 32 - api/logic/minecraft/GradleSpecifier.h | 151 --- api/logic/minecraft/GradleSpecifier_test.cpp | 78 -- api/logic/minecraft/LaunchProfile.cpp | 319 ----- api/logic/minecraft/LaunchProfile.h | 104 -- api/logic/minecraft/Library.cpp | 309 ----- api/logic/minecraft/Library.h | 219 ---- api/logic/minecraft/Library_test.cpp | 272 ----- api/logic/minecraft/MinecraftInstance.cpp | 1054 ----------------- api/logic/minecraft/MinecraftInstance.h | 133 --- api/logic/minecraft/MinecraftLoadAndCheck.cpp | 45 - api/logic/minecraft/MinecraftLoadAndCheck.h | 48 - api/logic/minecraft/MinecraftUpdate.cpp | 182 --- api/logic/minecraft/MinecraftUpdate.h | 57 - api/logic/minecraft/MojangDownloadInfo.h | 82 -- api/logic/minecraft/MojangVersionFormat.cpp | 383 ------ api/logic/minecraft/MojangVersionFormat.h | 26 - api/logic/minecraft/MojangVersionFormat_test.cpp | 55 - api/logic/minecraft/OneSixVersionFormat.cpp | 391 ------- api/logic/minecraft/OneSixVersionFormat.h | 30 - api/logic/minecraft/OpSys.cpp | 42 - api/logic/minecraft/OpSys.h | 37 - api/logic/minecraft/PackProfile.cpp | 1225 -------------------- api/logic/minecraft/PackProfile.h | 152 --- api/logic/minecraft/PackProfile_p.h | 42 - api/logic/minecraft/ParseUtils.cpp | 34 - api/logic/minecraft/ParseUtils.h | 11 - api/logic/minecraft/ParseUtils_test.cpp | 45 - api/logic/minecraft/ProfileUtils.cpp | 178 --- api/logic/minecraft/ProfileUtils.h | 28 - api/logic/minecraft/Rule.cpp | 93 -- api/logic/minecraft/Rule.h | 101 -- api/logic/minecraft/VersionFile.cpp | 60 - api/logic/minecraft/VersionFile.h | 114 -- api/logic/minecraft/VersionFilterData.cpp | 71 -- api/logic/minecraft/VersionFilterData.h | 31 - api/logic/minecraft/World.cpp | 520 --------- api/logic/minecraft/World.h | 113 -- api/logic/minecraft/WorldList.cpp | 387 ------- api/logic/minecraft/WorldList.h | 131 --- api/logic/minecraft/auth-msa/BuildConfig.cpp.in | 9 - api/logic/minecraft/auth-msa/BuildConfig.h | 11 - api/logic/minecraft/auth-msa/CMakeLists.txt | 28 - api/logic/minecraft/auth-msa/context.cpp | 938 --------------- api/logic/minecraft/auth-msa/context.h | 128 -- api/logic/minecraft/auth-msa/main.cpp | 100 -- api/logic/minecraft/auth-msa/mainwindow.cpp | 97 -- api/logic/minecraft/auth-msa/mainwindow.h | 34 - api/logic/minecraft/auth-msa/mainwindow.ui | 72 -- api/logic/minecraft/auth/AuthSession.cpp | 30 - api/logic/minecraft/auth/AuthSession.h | 54 - api/logic/minecraft/auth/MojangAccount.cpp | 315 ----- api/logic/minecraft/auth/MojangAccount.h | 182 --- api/logic/minecraft/auth/MojangAccountList.cpp | 468 -------- api/logic/minecraft/auth/MojangAccountList.h | 201 ---- api/logic/minecraft/auth/YggdrasilTask.cpp | 255 ---- api/logic/minecraft/auth/YggdrasilTask.h | 151 --- .../minecraft/auth/flows/AuthenticateTask.cpp | 202 ---- api/logic/minecraft/auth/flows/AuthenticateTask.h | 46 - api/logic/minecraft/auth/flows/RefreshTask.cpp | 144 --- api/logic/minecraft/auth/flows/RefreshTask.h | 44 - api/logic/minecraft/auth/flows/ValidateTask.cpp | 61 - api/logic/minecraft/auth/flows/ValidateTask.h | 47 - api/logic/minecraft/gameoptions/GameOptions.cpp | 144 --- api/logic/minecraft/gameoptions/GameOptions.h | 34 - api/logic/minecraft/launch/ClaimAccount.cpp | 24 - api/logic/minecraft/launch/ClaimAccount.h | 37 - api/logic/minecraft/launch/CreateGameFolders.cpp | 28 - api/logic/minecraft/launch/CreateGameFolders.h | 37 - api/logic/minecraft/launch/DirectJavaLaunch.cpp | 148 --- api/logic/minecraft/launch/DirectJavaLaunch.h | 58 - api/logic/minecraft/launch/ExtractNatives.cpp | 111 -- api/logic/minecraft/launch/ExtractNatives.h | 38 - api/logic/minecraft/launch/LauncherPartLaunch.cpp | 218 ---- api/logic/minecraft/launch/LauncherPartLaunch.h | 60 - .../minecraft/launch/MinecraftServerTarget.cpp | 66 -- api/logic/minecraft/launch/MinecraftServerTarget.h | 30 - api/logic/minecraft/launch/ModMinecraftJar.cpp | 82 -- api/logic/minecraft/launch/ModMinecraftJar.h | 36 - api/logic/minecraft/launch/PrintInstanceInfo.cpp | 106 -- api/logic/minecraft/launch/PrintInstanceInfo.h | 41 - api/logic/minecraft/launch/ReconstructAssets.cpp | 36 - api/logic/minecraft/launch/ReconstructAssets.h | 33 - api/logic/minecraft/launch/ScanModFolders.cpp | 59 - api/logic/minecraft/launch/ScanModFolders.h | 42 - api/logic/minecraft/launch/VerifyJavaInstall.cpp | 34 - api/logic/minecraft/launch/VerifyJavaInstall.h | 17 - api/logic/minecraft/legacy/LegacyInstance.cpp | 256 ---- api/logic/minecraft/legacy/LegacyInstance.h | 142 --- api/logic/minecraft/legacy/LegacyModList.cpp | 136 --- api/logic/minecraft/legacy/LegacyModList.h | 49 - api/logic/minecraft/legacy/LegacyUpgradeTask.cpp | 138 --- api/logic/minecraft/legacy/LegacyUpgradeTask.h | 30 - api/logic/minecraft/mod/LocalModParseTask.cpp | 467 -------- api/logic/minecraft/mod/LocalModParseTask.h | 37 - api/logic/minecraft/mod/Mod.cpp | 151 --- api/logic/minecraft/mod/Mod.h | 117 -- api/logic/minecraft/mod/ModDetails.h | 17 - api/logic/minecraft/mod/ModFolderLoadTask.cpp | 18 - api/logic/minecraft/mod/ModFolderLoadTask.h | 29 - api/logic/minecraft/mod/ModFolderModel.cpp | 554 --------- api/logic/minecraft/mod/ModFolderModel.h | 149 --- api/logic/minecraft/mod/ModFolderModel_test.cpp | 53 - .../minecraft/mod/ResourcePackFolderModel.cpp | 23 - api/logic/minecraft/mod/ResourcePackFolderModel.h | 13 - api/logic/minecraft/mod/TexturePackFolderModel.cpp | 23 - api/logic/minecraft/mod/TexturePackFolderModel.h | 13 - api/logic/minecraft/services/SkinDelete.cpp | 42 - api/logic/minecraft/services/SkinDelete.h | 30 - api/logic/minecraft/services/SkinUpload.cpp | 66 -- api/logic/minecraft/services/SkinUpload.h | 39 - api/logic/minecraft/testdata/1.9-simple.json | 198 ---- api/logic/minecraft/testdata/1.9.json | 529 --------- api/logic/minecraft/testdata/codecwav-20101023.jar | 1 - api/logic/minecraft/testdata/lib-native-arch.json | 46 - api/logic/minecraft/testdata/lib-native.json | 52 - api/logic/minecraft/testdata/lib-simple.json | 11 - .../testdata/testname-testversion-linux-32.jar | 1 - api/logic/minecraft/update/AssetUpdateTask.cpp | 107 -- api/logic/minecraft/update/AssetUpdateTask.h | 28 - api/logic/minecraft/update/FMLLibrariesTask.cpp | 131 --- api/logic/minecraft/update/FMLLibrariesTask.h | 31 - api/logic/minecraft/update/FoldersTask.cpp | 21 - api/logic/minecraft/update/FoldersTask.h | 17 - api/logic/minecraft/update/LibrariesTask.cpp | 90 -- api/logic/minecraft/update/LibrariesTask.h | 26 - api/logic/modplatform/atlauncher/ATLPackIndex.cpp | 33 - api/logic/modplatform/atlauncher/ATLPackIndex.h | 36 - .../modplatform/atlauncher/ATLPackInstallTask.cpp | 764 ------------ .../modplatform/atlauncher/ATLPackInstallTask.h | 102 -- .../modplatform/atlauncher/ATLPackManifest.cpp | 218 ---- api/logic/modplatform/atlauncher/ATLPackManifest.h | 126 -- api/logic/modplatform/flame/FileResolvingTask.cpp | 63 - api/logic/modplatform/flame/FileResolvingTask.h | 34 - api/logic/modplatform/flame/FlamePackIndex.cpp | 92 -- api/logic/modplatform/flame/FlamePackIndex.h | 43 - api/logic/modplatform/flame/PackManifest.cpp | 126 -- api/logic/modplatform/flame/PackManifest.h | 62 - api/logic/modplatform/legacy_ftb/PackFetchTask.cpp | 172 --- api/logic/modplatform/legacy_ftb/PackFetchTask.h | 44 - api/logic/modplatform/legacy_ftb/PackHelpers.h | 45 - .../modplatform/legacy_ftb/PackInstallTask.cpp | 214 ---- api/logic/modplatform/legacy_ftb/PackInstallTask.h | 55 - .../modplatform/legacy_ftb/PrivatePackManager.cpp | 41 - .../modplatform/legacy_ftb/PrivatePackManager.h | 44 - .../modplatform/modpacksch/FTBPackInstallTask.cpp | 209 ---- .../modplatform/modpacksch/FTBPackInstallTask.h | 47 - .../modplatform/modpacksch/FTBPackManifest.cpp | 156 --- api/logic/modplatform/modpacksch/FTBPackManifest.h | 127 -- .../technic/SingleZipPackInstallTask.cpp | 141 --- .../modplatform/technic/SingleZipPackInstallTask.h | 65 -- .../modplatform/technic/SolderPackInstallTask.cpp | 207 ---- .../modplatform/technic/SolderPackInstallTask.h | 60 - .../modplatform/technic/TechnicPackProcessor.cpp | 208 ---- .../modplatform/technic/TechnicPackProcessor.h | 35 - api/logic/mojang/PackageManifest.cpp | 427 ------- api/logic/mojang/PackageManifest.h | 173 --- api/logic/mojang/PackageManifest_test.cpp | 344 ------ api/logic/mojang/testdata/1.8.0_202-x64.json | 1 - api/logic/mojang/testdata/inspect/a/b.txt | 0 api/logic/mojang/testdata/inspect/a/b/b.txt | 1 - api/logic/mojang/testdata/inspect_win/a/b.txt | 0 api/logic/mojang/testdata/inspect_win/a/b/b.txt | 0 api/logic/net/ByteArraySink.h | 62 - api/logic/net/ChecksumValidator.h | 55 - api/logic/net/Download.cpp | 309 ----- api/logic/net/Download.h | 76 -- api/logic/net/FileSink.cpp | 115 -- api/logic/net/FileSink.h | 28 - api/logic/net/HttpMetaCache.cpp | 273 ----- api/logic/net/HttpMetaCache.h | 125 -- api/logic/net/MetaCacheSink.cpp | 65 -- api/logic/net/MetaCacheSink.h | 22 - api/logic/net/Mode.h | 10 - api/logic/net/NetAction.h | 115 -- api/logic/net/NetJob.cpp | 218 ---- api/logic/net/NetJob.h | 91 -- api/logic/net/PasteUpload.cpp | 104 -- api/logic/net/PasteUpload.h | 49 - api/logic/net/Sink.h | 71 -- api/logic/net/Validator.h | 20 - api/logic/news/NewsChecker.cpp | 131 --- api/logic/news/NewsChecker.h | 105 -- api/logic/news/NewsEntry.cpp | 77 -- api/logic/news/NewsEntry.h | 65 -- api/logic/notifications/NotificationChecker.cpp | 129 --- api/logic/notifications/NotificationChecker.h | 63 - api/logic/pathmatcher/FSTreeMatcher.h | 21 - api/logic/pathmatcher/IPathMatcher.h | 12 - api/logic/pathmatcher/MultiMatcher.h | 31 - api/logic/pathmatcher/RegexpMatcher.h | 42 - api/logic/screenshots/ImgurAlbumCreation.cpp | 88 -- api/logic/screenshots/ImgurAlbumCreation.h | 44 - api/logic/screenshots/ImgurUpload.cpp | 114 -- api/logic/screenshots/ImgurUpload.h | 33 - api/logic/screenshots/Screenshot.h | 20 - api/logic/settings/INIFile.cpp | 163 --- api/logic/settings/INIFile.h | 38 - api/logic/settings/INIFile_test.cpp | 63 - api/logic/settings/INISettingsObject.cpp | 107 -- api/logic/settings/INISettingsObject.h | 66 -- api/logic/settings/OverrideSetting.cpp | 54 - api/logic/settings/OverrideSetting.h | 46 - api/logic/settings/PassthroughSetting.cpp | 69 -- api/logic/settings/PassthroughSetting.h | 45 - api/logic/settings/Setting.cpp | 53 - api/logic/settings/Setting.h | 119 -- api/logic/settings/SettingsObject.cpp | 142 --- api/logic/settings/SettingsObject.h | 214 ---- api/logic/status/StatusChecker.cpp | 148 --- api/logic/status/StatusChecker.h | 60 - api/logic/tasks/SequentialTask.cpp | 55 - api/logic/tasks/SequentialTask.h | 32 - api/logic/tasks/Task.cpp | 168 --- api/logic/tasks/Task.h | 108 -- .../testdata/FileSystem-test_createShortcut-unix | 6 - .../test_folder/assets/minecraft/textures/blah.txt | 1 - api/logic/testdata/test_folder/pack.mcmeta | 6 - api/logic/testdata/test_folder/pack.nfo | 1 - api/logic/tools/BaseExternalTool.cpp | 41 - api/logic/tools/BaseExternalTool.h | 60 - api/logic/tools/BaseProfiler.cpp | 36 - api/logic/tools/BaseProfiler.h | 39 - api/logic/tools/JProfiler.cpp | 116 -- api/logic/tools/JProfiler.h | 15 - api/logic/tools/JVisualVM.cpp | 104 -- api/logic/tools/JVisualVM.h | 15 - api/logic/tools/MCEditTool.cpp | 77 -- api/logic/tools/MCEditTool.h | 17 - api/logic/translations/POTranslator.cpp | 373 ------ api/logic/translations/POTranslator.h | 16 - api/logic/translations/TranslationsModel.cpp | 653 ----------- api/logic/translations/TranslationsModel.h | 65 -- api/logic/updater/DownloadTask.cpp | 173 --- api/logic/updater/DownloadTask.h | 98 -- api/logic/updater/DownloadTask_test.cpp | 195 ---- api/logic/updater/GoUpdate.cpp | 198 ---- api/logic/updater/GoUpdate.h | 127 -- api/logic/updater/UpdateChecker.cpp | 260 ----- api/logic/updater/UpdateChecker.h | 121 -- api/logic/updater/UpdateChecker_test.cpp | 147 --- api/logic/updater/testdata/1.json | 43 - api/logic/updater/testdata/2.json | 31 - api/logic/updater/testdata/channels.json | 23 - api/logic/updater/testdata/errorChannels.json | 23 - api/logic/updater/testdata/fileOneA | 1 - api/logic/updater/testdata/fileOneB | 3 - api/logic/updater/testdata/fileThree | 1 - api/logic/updater/testdata/fileTwo | 1 - api/logic/updater/testdata/garbageChannels.json | 22 - api/logic/updater/testdata/index.json | 9 - api/logic/updater/testdata/noChannels.json | 5 - api/logic/updater/testdata/oneChannel.json | 11 - .../tst_DownloadTask-test_writeInstallScript.xml | 17 - 370 files changed, 43511 deletions(-) delete mode 100644 api/gui/CMakeLists.txt delete mode 100644 api/gui/DesktopServices.cpp delete mode 100644 api/gui/DesktopServices.h delete mode 100644 api/gui/SkinUtils.cpp delete mode 100644 api/gui/SkinUtils.h delete mode 100644 api/gui/icons/IconList.cpp delete mode 100644 api/gui/icons/IconList.h delete mode 100644 api/gui/icons/MMCIcon.cpp delete mode 100644 api/gui/icons/MMCIcon.h delete mode 100644 api/logic/BaseInstaller.cpp delete mode 100644 api/logic/BaseInstaller.h delete mode 100644 api/logic/BaseInstance.cpp delete mode 100644 api/logic/BaseInstance.h delete mode 100644 api/logic/BaseVersion.h delete mode 100644 api/logic/BaseVersionList.cpp delete mode 100644 api/logic/BaseVersionList.h delete mode 100644 api/logic/CMakeLists.txt delete mode 100644 api/logic/Commandline.cpp delete mode 100644 api/logic/Commandline.h delete mode 100644 api/logic/DefaultVariable.h delete mode 100644 api/logic/Env.cpp delete mode 100644 api/logic/Env.h delete mode 100644 api/logic/Exception.h delete mode 100644 api/logic/ExponentialSeries.h delete mode 100644 api/logic/FileSystem.cpp delete mode 100644 api/logic/FileSystem.h delete mode 100644 api/logic/FileSystem_test.cpp delete mode 100644 api/logic/Filter.cpp delete mode 100644 api/logic/Filter.h delete mode 100644 api/logic/GZip.cpp delete mode 100644 api/logic/GZip.h delete mode 100644 api/logic/GZip_test.cpp delete mode 100644 api/logic/InstanceCopyTask.cpp delete mode 100644 api/logic/InstanceCopyTask.h delete mode 100644 api/logic/InstanceCreationTask.cpp delete mode 100644 api/logic/InstanceCreationTask.h delete mode 100644 api/logic/InstanceImportTask.cpp delete mode 100644 api/logic/InstanceImportTask.h delete mode 100644 api/logic/InstanceList.cpp delete mode 100644 api/logic/InstanceList.h delete mode 100644 api/logic/InstanceTask.cpp delete mode 100644 api/logic/InstanceTask.h delete mode 100644 api/logic/Json.cpp delete mode 100644 api/logic/Json.h delete mode 100644 api/logic/LoggedProcess.cpp delete mode 100644 api/logic/LoggedProcess.h delete mode 100644 api/logic/MMCStrings.cpp delete mode 100644 api/logic/MMCStrings.h delete mode 100644 api/logic/MMCZip.cpp delete mode 100644 api/logic/MMCZip.h delete mode 100644 api/logic/MessageLevel.cpp delete mode 100644 api/logic/MessageLevel.h delete mode 100644 api/logic/NullInstance.h delete mode 100644 api/logic/ProblemProvider.h delete mode 100644 api/logic/QObjectPtr.h delete mode 100644 api/logic/RWStorage.h delete mode 100644 api/logic/RecursiveFileSystemWatcher.cpp delete mode 100644 api/logic/RecursiveFileSystemWatcher.h delete mode 100644 api/logic/SeparatorPrefixTree.h delete mode 100644 api/logic/Usable.h delete mode 100644 api/logic/Version.cpp delete mode 100644 api/logic/Version.h delete mode 100644 api/logic/Version_test.cpp delete mode 100644 api/logic/WatchLock.h delete mode 100644 api/logic/icons/IIconList.cpp delete mode 100644 api/logic/icons/IIconList.h delete mode 100644 api/logic/icons/IconUtils.cpp delete mode 100644 api/logic/icons/IconUtils.h delete mode 100644 api/logic/java/JavaChecker.cpp delete mode 100644 api/logic/java/JavaChecker.h delete mode 100644 api/logic/java/JavaCheckerJob.cpp delete mode 100644 api/logic/java/JavaCheckerJob.h delete mode 100644 api/logic/java/JavaInstall.cpp delete mode 100644 api/logic/java/JavaInstall.h delete mode 100644 api/logic/java/JavaInstallList.cpp delete mode 100644 api/logic/java/JavaInstallList.h delete mode 100644 api/logic/java/JavaUtils.cpp delete mode 100644 api/logic/java/JavaUtils.h delete mode 100644 api/logic/java/JavaVersion.cpp delete mode 100644 api/logic/java/JavaVersion.h delete mode 100644 api/logic/java/JavaVersion_test.cpp delete mode 100644 api/logic/java/launch/CheckJava.cpp delete mode 100644 api/logic/java/launch/CheckJava.h delete mode 100644 api/logic/launch/LaunchStep.cpp delete mode 100644 api/logic/launch/LaunchStep.h delete mode 100644 api/logic/launch/LaunchTask.cpp delete mode 100644 api/logic/launch/LaunchTask.h delete mode 100644 api/logic/launch/LogModel.cpp delete mode 100644 api/logic/launch/LogModel.h delete mode 100644 api/logic/launch/steps/LookupServerAddress.cpp delete mode 100644 api/logic/launch/steps/LookupServerAddress.h delete mode 100644 api/logic/launch/steps/PostLaunchCommand.cpp delete mode 100644 api/logic/launch/steps/PostLaunchCommand.h delete mode 100644 api/logic/launch/steps/PreLaunchCommand.cpp delete mode 100644 api/logic/launch/steps/PreLaunchCommand.h delete mode 100644 api/logic/launch/steps/TextPrint.cpp delete mode 100644 api/logic/launch/steps/TextPrint.h delete mode 100644 api/logic/launch/steps/Update.cpp delete mode 100644 api/logic/launch/steps/Update.h delete mode 100644 api/logic/meta/BaseEntity.cpp delete mode 100644 api/logic/meta/BaseEntity.h delete mode 100644 api/logic/meta/Index.cpp delete mode 100644 api/logic/meta/Index.h delete mode 100644 api/logic/meta/Index_test.cpp delete mode 100644 api/logic/meta/JsonFormat.cpp delete mode 100644 api/logic/meta/JsonFormat.h delete mode 100644 api/logic/meta/Version.cpp delete mode 100644 api/logic/meta/Version.h delete mode 100644 api/logic/meta/VersionList.cpp delete mode 100644 api/logic/meta/VersionList.h delete mode 100644 api/logic/minecraft/AssetsUtils.cpp delete mode 100644 api/logic/minecraft/AssetsUtils.h delete mode 100644 api/logic/minecraft/Component.cpp delete mode 100644 api/logic/minecraft/Component.h delete mode 100644 api/logic/minecraft/ComponentUpdateTask.cpp delete mode 100644 api/logic/minecraft/ComponentUpdateTask.h delete mode 100644 api/logic/minecraft/ComponentUpdateTask_p.h delete mode 100644 api/logic/minecraft/GradleSpecifier.h delete mode 100644 api/logic/minecraft/GradleSpecifier_test.cpp delete mode 100644 api/logic/minecraft/LaunchProfile.cpp delete mode 100644 api/logic/minecraft/LaunchProfile.h delete mode 100644 api/logic/minecraft/Library.cpp delete mode 100644 api/logic/minecraft/Library.h delete mode 100644 api/logic/minecraft/Library_test.cpp delete mode 100644 api/logic/minecraft/MinecraftInstance.cpp delete mode 100644 api/logic/minecraft/MinecraftInstance.h delete mode 100644 api/logic/minecraft/MinecraftLoadAndCheck.cpp delete mode 100644 api/logic/minecraft/MinecraftLoadAndCheck.h delete mode 100644 api/logic/minecraft/MinecraftUpdate.cpp delete mode 100644 api/logic/minecraft/MinecraftUpdate.h delete mode 100644 api/logic/minecraft/MojangDownloadInfo.h delete mode 100644 api/logic/minecraft/MojangVersionFormat.cpp delete mode 100644 api/logic/minecraft/MojangVersionFormat.h delete mode 100644 api/logic/minecraft/MojangVersionFormat_test.cpp delete mode 100644 api/logic/minecraft/OneSixVersionFormat.cpp delete mode 100644 api/logic/minecraft/OneSixVersionFormat.h delete mode 100644 api/logic/minecraft/OpSys.cpp delete mode 100644 api/logic/minecraft/OpSys.h delete mode 100644 api/logic/minecraft/PackProfile.cpp delete mode 100644 api/logic/minecraft/PackProfile.h delete mode 100644 api/logic/minecraft/PackProfile_p.h delete mode 100644 api/logic/minecraft/ParseUtils.cpp delete mode 100644 api/logic/minecraft/ParseUtils.h delete mode 100644 api/logic/minecraft/ParseUtils_test.cpp delete mode 100644 api/logic/minecraft/ProfileUtils.cpp delete mode 100644 api/logic/minecraft/ProfileUtils.h delete mode 100644 api/logic/minecraft/Rule.cpp delete mode 100644 api/logic/minecraft/Rule.h delete mode 100644 api/logic/minecraft/VersionFile.cpp delete mode 100644 api/logic/minecraft/VersionFile.h delete mode 100644 api/logic/minecraft/VersionFilterData.cpp delete mode 100644 api/logic/minecraft/VersionFilterData.h delete mode 100644 api/logic/minecraft/World.cpp delete mode 100644 api/logic/minecraft/World.h delete mode 100644 api/logic/minecraft/WorldList.cpp delete mode 100644 api/logic/minecraft/WorldList.h delete mode 100644 api/logic/minecraft/auth-msa/BuildConfig.cpp.in delete mode 100644 api/logic/minecraft/auth-msa/BuildConfig.h delete mode 100644 api/logic/minecraft/auth-msa/CMakeLists.txt delete mode 100644 api/logic/minecraft/auth-msa/context.cpp delete mode 100644 api/logic/minecraft/auth-msa/context.h delete mode 100644 api/logic/minecraft/auth-msa/main.cpp delete mode 100644 api/logic/minecraft/auth-msa/mainwindow.cpp delete mode 100644 api/logic/minecraft/auth-msa/mainwindow.h delete mode 100644 api/logic/minecraft/auth-msa/mainwindow.ui delete mode 100644 api/logic/minecraft/auth/AuthSession.cpp delete mode 100644 api/logic/minecraft/auth/AuthSession.h delete mode 100644 api/logic/minecraft/auth/MojangAccount.cpp delete mode 100644 api/logic/minecraft/auth/MojangAccount.h delete mode 100644 api/logic/minecraft/auth/MojangAccountList.cpp delete mode 100644 api/logic/minecraft/auth/MojangAccountList.h delete mode 100644 api/logic/minecraft/auth/YggdrasilTask.cpp delete mode 100644 api/logic/minecraft/auth/YggdrasilTask.h delete mode 100644 api/logic/minecraft/auth/flows/AuthenticateTask.cpp delete mode 100644 api/logic/minecraft/auth/flows/AuthenticateTask.h delete mode 100644 api/logic/minecraft/auth/flows/RefreshTask.cpp delete mode 100644 api/logic/minecraft/auth/flows/RefreshTask.h delete mode 100644 api/logic/minecraft/auth/flows/ValidateTask.cpp delete mode 100644 api/logic/minecraft/auth/flows/ValidateTask.h delete mode 100644 api/logic/minecraft/gameoptions/GameOptions.cpp delete mode 100644 api/logic/minecraft/gameoptions/GameOptions.h delete mode 100644 api/logic/minecraft/launch/ClaimAccount.cpp delete mode 100644 api/logic/minecraft/launch/ClaimAccount.h delete mode 100644 api/logic/minecraft/launch/CreateGameFolders.cpp delete mode 100644 api/logic/minecraft/launch/CreateGameFolders.h delete mode 100644 api/logic/minecraft/launch/DirectJavaLaunch.cpp delete mode 100644 api/logic/minecraft/launch/DirectJavaLaunch.h delete mode 100644 api/logic/minecraft/launch/ExtractNatives.cpp delete mode 100644 api/logic/minecraft/launch/ExtractNatives.h delete mode 100644 api/logic/minecraft/launch/LauncherPartLaunch.cpp delete mode 100644 api/logic/minecraft/launch/LauncherPartLaunch.h delete mode 100644 api/logic/minecraft/launch/MinecraftServerTarget.cpp delete mode 100644 api/logic/minecraft/launch/MinecraftServerTarget.h delete mode 100644 api/logic/minecraft/launch/ModMinecraftJar.cpp delete mode 100644 api/logic/minecraft/launch/ModMinecraftJar.h delete mode 100644 api/logic/minecraft/launch/PrintInstanceInfo.cpp delete mode 100644 api/logic/minecraft/launch/PrintInstanceInfo.h delete mode 100644 api/logic/minecraft/launch/ReconstructAssets.cpp delete mode 100644 api/logic/minecraft/launch/ReconstructAssets.h delete mode 100644 api/logic/minecraft/launch/ScanModFolders.cpp delete mode 100644 api/logic/minecraft/launch/ScanModFolders.h delete mode 100644 api/logic/minecraft/launch/VerifyJavaInstall.cpp delete mode 100644 api/logic/minecraft/launch/VerifyJavaInstall.h delete mode 100644 api/logic/minecraft/legacy/LegacyInstance.cpp delete mode 100644 api/logic/minecraft/legacy/LegacyInstance.h delete mode 100644 api/logic/minecraft/legacy/LegacyModList.cpp delete mode 100644 api/logic/minecraft/legacy/LegacyModList.h delete mode 100644 api/logic/minecraft/legacy/LegacyUpgradeTask.cpp delete mode 100644 api/logic/minecraft/legacy/LegacyUpgradeTask.h delete mode 100644 api/logic/minecraft/mod/LocalModParseTask.cpp delete mode 100644 api/logic/minecraft/mod/LocalModParseTask.h delete mode 100644 api/logic/minecraft/mod/Mod.cpp delete mode 100644 api/logic/minecraft/mod/Mod.h delete mode 100644 api/logic/minecraft/mod/ModDetails.h delete mode 100644 api/logic/minecraft/mod/ModFolderLoadTask.cpp delete mode 100644 api/logic/minecraft/mod/ModFolderLoadTask.h delete mode 100644 api/logic/minecraft/mod/ModFolderModel.cpp delete mode 100644 api/logic/minecraft/mod/ModFolderModel.h delete mode 100644 api/logic/minecraft/mod/ModFolderModel_test.cpp delete mode 100644 api/logic/minecraft/mod/ResourcePackFolderModel.cpp delete mode 100644 api/logic/minecraft/mod/ResourcePackFolderModel.h delete mode 100644 api/logic/minecraft/mod/TexturePackFolderModel.cpp delete mode 100644 api/logic/minecraft/mod/TexturePackFolderModel.h delete mode 100644 api/logic/minecraft/services/SkinDelete.cpp delete mode 100644 api/logic/minecraft/services/SkinDelete.h delete mode 100644 api/logic/minecraft/services/SkinUpload.cpp delete mode 100644 api/logic/minecraft/services/SkinUpload.h delete mode 100644 api/logic/minecraft/testdata/1.9-simple.json delete mode 100644 api/logic/minecraft/testdata/1.9.json delete mode 100644 api/logic/minecraft/testdata/codecwav-20101023.jar delete mode 100644 api/logic/minecraft/testdata/lib-native-arch.json delete mode 100644 api/logic/minecraft/testdata/lib-native.json delete mode 100644 api/logic/minecraft/testdata/lib-simple.json delete mode 100644 api/logic/minecraft/testdata/testname-testversion-linux-32.jar delete mode 100644 api/logic/minecraft/update/AssetUpdateTask.cpp delete mode 100644 api/logic/minecraft/update/AssetUpdateTask.h delete mode 100644 api/logic/minecraft/update/FMLLibrariesTask.cpp delete mode 100644 api/logic/minecraft/update/FMLLibrariesTask.h delete mode 100644 api/logic/minecraft/update/FoldersTask.cpp delete mode 100644 api/logic/minecraft/update/FoldersTask.h delete mode 100644 api/logic/minecraft/update/LibrariesTask.cpp delete mode 100644 api/logic/minecraft/update/LibrariesTask.h delete mode 100644 api/logic/modplatform/atlauncher/ATLPackIndex.cpp delete mode 100644 api/logic/modplatform/atlauncher/ATLPackIndex.h delete mode 100644 api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp delete mode 100644 api/logic/modplatform/atlauncher/ATLPackInstallTask.h delete mode 100644 api/logic/modplatform/atlauncher/ATLPackManifest.cpp delete mode 100644 api/logic/modplatform/atlauncher/ATLPackManifest.h delete mode 100644 api/logic/modplatform/flame/FileResolvingTask.cpp delete mode 100644 api/logic/modplatform/flame/FileResolvingTask.h delete mode 100644 api/logic/modplatform/flame/FlamePackIndex.cpp delete mode 100644 api/logic/modplatform/flame/FlamePackIndex.h delete mode 100644 api/logic/modplatform/flame/PackManifest.cpp delete mode 100644 api/logic/modplatform/flame/PackManifest.h delete mode 100644 api/logic/modplatform/legacy_ftb/PackFetchTask.cpp delete mode 100644 api/logic/modplatform/legacy_ftb/PackFetchTask.h delete mode 100644 api/logic/modplatform/legacy_ftb/PackHelpers.h delete mode 100644 api/logic/modplatform/legacy_ftb/PackInstallTask.cpp delete mode 100644 api/logic/modplatform/legacy_ftb/PackInstallTask.h delete mode 100644 api/logic/modplatform/legacy_ftb/PrivatePackManager.cpp delete mode 100644 api/logic/modplatform/legacy_ftb/PrivatePackManager.h delete mode 100644 api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp delete mode 100644 api/logic/modplatform/modpacksch/FTBPackInstallTask.h delete mode 100644 api/logic/modplatform/modpacksch/FTBPackManifest.cpp delete mode 100644 api/logic/modplatform/modpacksch/FTBPackManifest.h delete mode 100644 api/logic/modplatform/technic/SingleZipPackInstallTask.cpp delete mode 100644 api/logic/modplatform/technic/SingleZipPackInstallTask.h delete mode 100644 api/logic/modplatform/technic/SolderPackInstallTask.cpp delete mode 100644 api/logic/modplatform/technic/SolderPackInstallTask.h delete mode 100644 api/logic/modplatform/technic/TechnicPackProcessor.cpp delete mode 100644 api/logic/modplatform/technic/TechnicPackProcessor.h delete mode 100644 api/logic/mojang/PackageManifest.cpp delete mode 100644 api/logic/mojang/PackageManifest.h delete mode 100644 api/logic/mojang/PackageManifest_test.cpp delete mode 100644 api/logic/mojang/testdata/1.8.0_202-x64.json delete mode 100755 api/logic/mojang/testdata/inspect/a/b.txt delete mode 120000 api/logic/mojang/testdata/inspect/a/b/b.txt delete mode 100644 api/logic/mojang/testdata/inspect_win/a/b.txt delete mode 100644 api/logic/mojang/testdata/inspect_win/a/b/b.txt delete mode 100644 api/logic/net/ByteArraySink.h delete mode 100644 api/logic/net/ChecksumValidator.h delete mode 100644 api/logic/net/Download.cpp delete mode 100644 api/logic/net/Download.h delete mode 100644 api/logic/net/FileSink.cpp delete mode 100644 api/logic/net/FileSink.h delete mode 100644 api/logic/net/HttpMetaCache.cpp delete mode 100644 api/logic/net/HttpMetaCache.h delete mode 100644 api/logic/net/MetaCacheSink.cpp delete mode 100644 api/logic/net/MetaCacheSink.h delete mode 100644 api/logic/net/Mode.h delete mode 100644 api/logic/net/NetAction.h delete mode 100644 api/logic/net/NetJob.cpp delete mode 100644 api/logic/net/NetJob.h delete mode 100644 api/logic/net/PasteUpload.cpp delete mode 100644 api/logic/net/PasteUpload.h delete mode 100644 api/logic/net/Sink.h delete mode 100644 api/logic/net/Validator.h delete mode 100644 api/logic/news/NewsChecker.cpp delete mode 100644 api/logic/news/NewsChecker.h delete mode 100644 api/logic/news/NewsEntry.cpp delete mode 100644 api/logic/news/NewsEntry.h delete mode 100644 api/logic/notifications/NotificationChecker.cpp delete mode 100644 api/logic/notifications/NotificationChecker.h delete mode 100644 api/logic/pathmatcher/FSTreeMatcher.h delete mode 100644 api/logic/pathmatcher/IPathMatcher.h delete mode 100644 api/logic/pathmatcher/MultiMatcher.h delete mode 100644 api/logic/pathmatcher/RegexpMatcher.h delete mode 100644 api/logic/screenshots/ImgurAlbumCreation.cpp delete mode 100644 api/logic/screenshots/ImgurAlbumCreation.h delete mode 100644 api/logic/screenshots/ImgurUpload.cpp delete mode 100644 api/logic/screenshots/ImgurUpload.h delete mode 100644 api/logic/screenshots/Screenshot.h delete mode 100644 api/logic/settings/INIFile.cpp delete mode 100644 api/logic/settings/INIFile.h delete mode 100644 api/logic/settings/INIFile_test.cpp delete mode 100644 api/logic/settings/INISettingsObject.cpp delete mode 100644 api/logic/settings/INISettingsObject.h delete mode 100644 api/logic/settings/OverrideSetting.cpp delete mode 100644 api/logic/settings/OverrideSetting.h delete mode 100644 api/logic/settings/PassthroughSetting.cpp delete mode 100644 api/logic/settings/PassthroughSetting.h delete mode 100644 api/logic/settings/Setting.cpp delete mode 100644 api/logic/settings/Setting.h delete mode 100644 api/logic/settings/SettingsObject.cpp delete mode 100644 api/logic/settings/SettingsObject.h delete mode 100644 api/logic/status/StatusChecker.cpp delete mode 100644 api/logic/status/StatusChecker.h delete mode 100644 api/logic/tasks/SequentialTask.cpp delete mode 100644 api/logic/tasks/SequentialTask.h delete mode 100644 api/logic/tasks/Task.cpp delete mode 100644 api/logic/tasks/Task.h delete mode 100755 api/logic/testdata/FileSystem-test_createShortcut-unix delete mode 100644 api/logic/testdata/test_folder/assets/minecraft/textures/blah.txt delete mode 100644 api/logic/testdata/test_folder/pack.mcmeta delete mode 100644 api/logic/testdata/test_folder/pack.nfo delete mode 100644 api/logic/tools/BaseExternalTool.cpp delete mode 100644 api/logic/tools/BaseExternalTool.h delete mode 100644 api/logic/tools/BaseProfiler.cpp delete mode 100644 api/logic/tools/BaseProfiler.h delete mode 100644 api/logic/tools/JProfiler.cpp delete mode 100644 api/logic/tools/JProfiler.h delete mode 100644 api/logic/tools/JVisualVM.cpp delete mode 100644 api/logic/tools/JVisualVM.h delete mode 100644 api/logic/tools/MCEditTool.cpp delete mode 100644 api/logic/tools/MCEditTool.h delete mode 100644 api/logic/translations/POTranslator.cpp delete mode 100644 api/logic/translations/POTranslator.h delete mode 100644 api/logic/translations/TranslationsModel.cpp delete mode 100644 api/logic/translations/TranslationsModel.h delete mode 100644 api/logic/updater/DownloadTask.cpp delete mode 100644 api/logic/updater/DownloadTask.h delete mode 100644 api/logic/updater/DownloadTask_test.cpp delete mode 100644 api/logic/updater/GoUpdate.cpp delete mode 100644 api/logic/updater/GoUpdate.h delete mode 100644 api/logic/updater/UpdateChecker.cpp delete mode 100644 api/logic/updater/UpdateChecker.h delete mode 100644 api/logic/updater/UpdateChecker_test.cpp delete mode 100644 api/logic/updater/testdata/1.json delete mode 100644 api/logic/updater/testdata/2.json delete mode 100644 api/logic/updater/testdata/channels.json delete mode 100644 api/logic/updater/testdata/errorChannels.json delete mode 100644 api/logic/updater/testdata/fileOneA delete mode 100644 api/logic/updater/testdata/fileOneB delete mode 100644 api/logic/updater/testdata/fileThree delete mode 100644 api/logic/updater/testdata/fileTwo delete mode 100644 api/logic/updater/testdata/garbageChannels.json delete mode 100644 api/logic/updater/testdata/index.json delete mode 100644 api/logic/updater/testdata/noChannels.json delete mode 100644 api/logic/updater/testdata/oneChannel.json delete mode 100644 api/logic/updater/testdata/tst_DownloadTask-test_writeInstallScript.xml (limited to 'api') diff --git a/api/gui/CMakeLists.txt b/api/gui/CMakeLists.txt deleted file mode 100644 index ad116a43..00000000 --- a/api/gui/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -project(MultiMC_gui LANGUAGES CXX) - -set(GUI_SOURCES - DesktopServices.h - DesktopServices.cpp - - # Icons - icons/MMCIcon.h - icons/MMCIcon.cpp - icons/IconList.h - icons/IconList.cpp - - SkinUtils.cpp - SkinUtils.h -) -################################ COMPILE ################################ - -add_library(MultiMC_gui SHARED ${GUI_SOURCES}) -set_target_properties(MultiMC_gui PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1) - -generate_export_header(MultiMC_gui) - -# Link -target_link_libraries(MultiMC_gui MultiMC_iconfix MultiMC_logic Qt5::Gui) - -# Mark and export headers -target_include_directories(MultiMC_gui PUBLIC "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") - -# Install it -install( - TARGETS MultiMC_gui - RUNTIME DESTINATION ${LIBRARY_DEST_DIR} - LIBRARY DESTINATION ${LIBRARY_DEST_DIR} -) \ No newline at end of file diff --git a/api/gui/DesktopServices.cpp b/api/gui/DesktopServices.cpp deleted file mode 100644 index 5368ddc8..00000000 --- a/api/gui/DesktopServices.cpp +++ /dev/null @@ -1,149 +0,0 @@ -#include "DesktopServices.h" -#include -#include -#include -#include - -/** - * This shouldn't exist, but until QTBUG-9328 and other unreported bugs are fixed, it needs to be a thing. - */ -#if defined(Q_OS_LINUX) - -#include -#include -#include -#include - -template -bool IndirectOpen(T callable, qint64 *pid_forked = nullptr) -{ - auto pid = fork(); - if(pid_forked) - { - if(pid > 0) - *pid_forked = pid; - else - *pid_forked = 0; - } - if(pid == -1) - { - qWarning() << "IndirectOpen failed to fork: " << errno; - return false; - } - // child - do the stuff - if(pid == 0) - { - // unset all this garbage so it doesn't get passed to the child process - qunsetenv("LD_PRELOAD"); - qunsetenv("LD_LIBRARY_PATH"); - qunsetenv("LD_DEBUG"); - qunsetenv("QT_PLUGIN_PATH"); - qunsetenv("QT_FONTPATH"); - - // open the URL - auto status = callable(); - - // detach from the parent process group. - setsid(); - - // die. now. do not clean up anything, it would just hang forever. - _exit(status ? 0 : 1); - } - else - { - //parent - assume it worked. - int status; - while (waitpid(pid, &status, 0)) - { - if(WIFEXITED(status)) - { - return WEXITSTATUS(status) == 0; - } - if(WIFSIGNALED(status)) - { - return false; - } - } - return true; - } -} -#endif - -namespace DesktopServices { -bool openDirectory(const QString &path, bool ensureExists) -{ - qDebug() << "Opening directory" << path; - QDir parentPath; - QDir dir(path); - if (!dir.exists()) - { - parentPath.mkpath(dir.absolutePath()); - } - auto f = [&]() - { - return QDesktopServices::openUrl(QUrl::fromLocalFile(dir.absolutePath())); - }; -#if defined(Q_OS_LINUX) - return IndirectOpen(f); -#else - return f(); -#endif -} - -bool openFile(const QString &path) -{ - qDebug() << "Opening file" << path; - auto f = [&]() - { - return QDesktopServices::openUrl(QUrl::fromLocalFile(path)); - }; -#if defined(Q_OS_LINUX) - return IndirectOpen(f); -#else - return f(); -#endif -} - -bool openFile(const QString &application, const QString &path, const QString &workingDirectory, qint64 *pid) -{ - qDebug() << "Opening file" << path << "using" << application; -#if defined(Q_OS_LINUX) - // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave - return IndirectOpen([&]() - { - return QProcess::startDetached(application, QStringList() << path, workingDirectory); - }, pid); -#else - return QProcess::startDetached(application, QStringList() << path, workingDirectory, pid); -#endif -} - -bool run(const QString &application, const QStringList &args, const QString &workingDirectory, qint64 *pid) -{ - qDebug() << "Running" << application << "with args" << args.join(' '); -#if defined(Q_OS_LINUX) - // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave - return IndirectOpen([&]() - { - return QProcess::startDetached(application, args, workingDirectory); - }, pid); -#else - return QProcess::startDetached(application, args, workingDirectory, pid); -#endif -} - -bool openUrl(const QUrl &url) -{ - qDebug() << "Opening URL" << url.toString(); - auto f = [&]() - { - return QDesktopServices::openUrl(url); - }; -#if defined(Q_OS_LINUX) - return IndirectOpen(f); -#else - return f(); -#endif -} - -} diff --git a/api/gui/DesktopServices.h b/api/gui/DesktopServices.h deleted file mode 100644 index 606fa52c..00000000 --- a/api/gui/DesktopServices.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once - -#include -#include -#include "multimc_gui_export.h" - -/** - * This wraps around QDesktopServices and adds workarounds where needed - * Use this instead of QDesktopServices! - */ -namespace DesktopServices -{ - /** - * Open a file in whatever application is applicable - */ - MULTIMC_GUI_EXPORT bool openFile(const QString &path); - - /** - * Open a file in the specified application - */ - MULTIMC_GUI_EXPORT bool openFile(const QString &application, const QString &path, const QString & workingDirectory = QString(), qint64 *pid = 0); - - /** - * Run an application - */ - MULTIMC_GUI_EXPORT bool run(const QString &application,const QStringList &args, const QString & workingDirectory = QString(), qint64 *pid = 0); - - /** - * Open a directory - */ - MULTIMC_GUI_EXPORT bool openDirectory(const QString &path, bool ensureExists = false); - - /** - * Open the URL, most likely in a browser. Maybe. - */ - MULTIMC_GUI_EXPORT bool openUrl(const QUrl &url); -} diff --git a/api/gui/SkinUtils.cpp b/api/gui/SkinUtils.cpp deleted file mode 100644 index ec969889..00000000 --- a/api/gui/SkinUtils.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright 2013-2021 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 "SkinUtils.h" -#include "net/HttpMetaCache.h" -#include "Env.h" - -#include -#include -#include -#include -#include - -namespace SkinUtils -{ -/* - * Given a username, return a pixmap of the cached skin (if it exists), QPixmap() otherwise - */ -QPixmap getFaceFromCache(QString username, int height, int width) -{ - QFile fskin(ENV.metacache() - ->resolveEntry("skins", username + ".png") - ->getFullPath()); - - if (fskin.exists()) - { - QPixmap skinTexture(fskin.fileName()); - if(!skinTexture.isNull()) - { - QPixmap skin = QPixmap(8, 8); - QPainter painter(&skin); - painter.drawPixmap(0, 0, skinTexture.copy(8, 8, 8, 8)); - painter.drawPixmap(0, 0, skinTexture.copy(40, 8, 8, 8)); - return skin.scaled(height, width, Qt::KeepAspectRatio); - } - } - - return QPixmap(); -} -} diff --git a/api/gui/SkinUtils.h b/api/gui/SkinUtils.h deleted file mode 100644 index b44f4228..00000000 --- a/api/gui/SkinUtils.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2013-2021 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_gui_export.h" - -namespace SkinUtils -{ -QPixmap MULTIMC_GUI_EXPORT getFaceFromCache(QString id, int height = 64, int width = 64); -} diff --git a/api/gui/icons/IconList.cpp b/api/gui/icons/IconList.cpp deleted file mode 100644 index 70350534..00000000 --- a/api/gui/icons/IconList.cpp +++ /dev/null @@ -1,419 +0,0 @@ -/* Copyright 2013-2021 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 "IconList.h" -#include -#include -#include -#include -#include -#include -#include -#include - -#define MAX_SIZE 1024 - -IconList::IconList(const QStringList &builtinPaths, QString path, QObject *parent) : QAbstractListModel(parent) -{ - QSet builtinNames; - - // add builtin icons - for(auto & builtinPath: builtinPaths) - { - QDir instance_icons(builtinPath); - auto file_info_list = instance_icons.entryInfoList(QDir::Files, QDir::Name); - for (auto file_info : file_info_list) - { - builtinNames.insert(file_info.baseName()); - } - } - for(auto & builtinName : builtinNames) - { - addThemeIcon(builtinName); - } - - m_watcher.reset(new QFileSystemWatcher()); - is_watching = false; - connect(m_watcher.get(), SIGNAL(directoryChanged(QString)), - SLOT(directoryChanged(QString))); - connect(m_watcher.get(), SIGNAL(fileChanged(QString)), SLOT(fileChanged(QString))); - - directoryChanged(path); -} - -void IconList::directoryChanged(const QString &path) -{ - QDir new_dir (path); - if(m_dir.absolutePath() != new_dir.absolutePath()) - { - m_dir.setPath(path); - m_dir.refresh(); - if(is_watching) - stopWatching(); - startWatching(); - } - if(!m_dir.exists()) - if(!FS::ensureFolderPathExists(m_dir.absolutePath())) - return; - m_dir.refresh(); - auto new_list = m_dir.entryList(QDir::Files, QDir::Name); - for (auto it = new_list.begin(); it != new_list.end(); it++) - { - QString &foo = (*it); - foo = m_dir.filePath(foo); - } - auto new_set = new_list.toSet(); - QList current_list; - for (auto &it : icons) - { - if (!it.has(IconType::FileBased)) - continue; - current_list.push_back(it.m_images[IconType::FileBased].filename); - } - QSet current_set = current_list.toSet(); - - QSet to_remove = current_set; - to_remove -= new_set; - - QSet to_add = new_set; - to_add -= current_set; - - for (auto remove : to_remove) - { - qDebug() << "Removing " << remove; - QFileInfo rmfile(remove); - QString key = rmfile.baseName(); - int idx = getIconIndex(key); - if (idx == -1) - continue; - icons[idx].remove(IconType::FileBased); - if (icons[idx].type() == IconType::ToBeDeleted) - { - beginRemoveRows(QModelIndex(), idx, idx); - icons.remove(idx); - reindex(); - endRemoveRows(); - } - else - { - dataChanged(index(idx), index(idx)); - } - m_watcher->removePath(remove); - emit iconUpdated(key); - } - - for (auto add : to_add) - { - qDebug() << "Adding " << add; - QFileInfo addfile(add); - QString key = addfile.baseName(); - if (addIcon(key, QString(), addfile.filePath(), IconType::FileBased)) - { - m_watcher->addPath(add); - emit iconUpdated(key); - } - } -} - -void IconList::fileChanged(const QString &path) -{ - qDebug() << "Checking " << path; - QFileInfo checkfile(path); - if (!checkfile.exists()) - return; - QString key = checkfile.baseName(); - int idx = getIconIndex(key); - if (idx == -1) - return; - QIcon icon(path); - if (!icon.availableSizes().size()) - return; - - icons[idx].m_images[IconType::FileBased].icon = icon; - dataChanged(index(idx), index(idx)); - emit iconUpdated(key); -} - -void IconList::SettingChanged(const Setting &setting, QVariant value) -{ - if(setting.id() != "IconsDir") - return; - - directoryChanged(value.toString()); -} - -void IconList::startWatching() -{ - auto abs_path = m_dir.absolutePath(); - FS::ensureFolderPathExists(abs_path); - is_watching = m_watcher->addPath(abs_path); - if (is_watching) - { - qDebug() << "Started watching " << abs_path; - } - else - { - qDebug() << "Failed to start watching " << abs_path; - } -} - -void IconList::stopWatching() -{ - m_watcher->removePaths(m_watcher->files()); - m_watcher->removePaths(m_watcher->directories()); - is_watching = false; -} - -QStringList IconList::mimeTypes() const -{ - QStringList types; - types << "text/uri-list"; - return types; -} -Qt::DropActions IconList::supportedDropActions() const -{ - return Qt::CopyAction; -} - -bool IconList::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) -{ - if (action == Qt::IgnoreAction) - return true; - // check if the action is supported - if (!data || !(action & supportedDropActions())) - return false; - - // files dropped from outside? - if (data->hasUrls()) - { - auto urls = data->urls(); - QStringList iconFiles; - for (auto url : urls) - { - // only local files may be dropped... - if (!url.isLocalFile()) - continue; - iconFiles += url.toLocalFile(); - } - installIcons(iconFiles); - return true; - } - return false; -} - -Qt::ItemFlags IconList::flags(const QModelIndex &index) const -{ - Qt::ItemFlags defaultFlags = QAbstractListModel::flags(index); - if (index.isValid()) - return Qt::ItemIsDropEnabled | defaultFlags; - else - return Qt::ItemIsDropEnabled | defaultFlags; -} - -QVariant IconList::data(const QModelIndex &index, int role) const -{ - if (!index.isValid()) - return QVariant(); - - int row = index.row(); - - if (row < 0 || row >= icons.size()) - return QVariant(); - - switch (role) - { - case Qt::DecorationRole: - return icons[row].icon(); - case Qt::DisplayRole: - return icons[row].name(); - case Qt::UserRole: - return icons[row].m_key; - default: - return QVariant(); - } -} - -int IconList::rowCount(const QModelIndex &parent) const -{ - return icons.size(); -} - -void IconList::installIcons(const QStringList &iconFiles) -{ - for (QString file : iconFiles) - { - QFileInfo fileinfo(file); - if (!fileinfo.isReadable() || !fileinfo.isFile()) - continue; - QString target = FS::PathCombine(m_dir.dirName(), fileinfo.fileName()); - - QString suffix = fileinfo.suffix(); - if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico" && suffix != "svg" && suffix != "gif") - continue; - - if (!QFile::copy(file, target)) - continue; - } -} - -void IconList::installIcon(const QString &file, const QString &name) -{ - QFileInfo fileinfo(file); - if(!fileinfo.isReadable() || !fileinfo.isFile()) - return; - - QString target = FS::PathCombine(m_dir.dirName(), name); - - QFile::copy(file, target); -} - -bool IconList::iconFileExists(const QString &key) const -{ - auto iconEntry = icon(key); - if(!iconEntry) - { - return false; - } - return iconEntry->has(IconType::FileBased); -} - -const MMCIcon *IconList::icon(const QString &key) const -{ - int iconIdx = getIconIndex(key); - if (iconIdx == -1) - return nullptr; - return &icons[iconIdx]; -} - -bool IconList::deleteIcon(const QString &key) -{ - int iconIdx = getIconIndex(key); - if (iconIdx == -1) - return false; - auto &iconEntry = icons[iconIdx]; - if (iconEntry.has(IconType::FileBased)) - { - return QFile::remove(iconEntry.m_images[IconType::FileBased].filename); - } - return false; -} - -bool IconList::addThemeIcon(const QString& key) -{ - auto iter = name_index.find(key); - if (iter != name_index.end()) - { - auto &oldOne = icons[*iter]; - oldOne.replace(Builtin, key); - dataChanged(index(*iter), index(*iter)); - return true; - } - else - { - // add a new icon - beginInsertRows(QModelIndex(), icons.size(), icons.size()); - { - MMCIcon mmc_icon; - mmc_icon.m_name = key; - mmc_icon.m_key = key; - mmc_icon.replace(Builtin, key); - icons.push_back(mmc_icon); - name_index[key] = icons.size() - 1; - } - endInsertRows(); - return true; - } -} - -bool IconList::addIcon(const QString &key, const QString &name, const QString &path, const IconType type) -{ - // replace the icon even? is the input valid? - QIcon icon(path); - if (icon.isNull()) - return false; - auto iter = name_index.find(key); - if (iter != name_index.end()) - { - auto &oldOne = icons[*iter]; - oldOne.replace(type, icon, path); - dataChanged(index(*iter), index(*iter)); - return true; - } - else - { - // add a new icon - beginInsertRows(QModelIndex(), icons.size(), icons.size()); - { - MMCIcon mmc_icon; - mmc_icon.m_name = name; - mmc_icon.m_key = key; - mmc_icon.replace(type, icon, path); - icons.push_back(mmc_icon); - name_index[key] = icons.size() - 1; - } - endInsertRows(); - return true; - } -} - -void IconList::saveIcon(const QString &key, const QString &path, const char * format) const -{ - auto icon = getIcon(key); - auto pixmap = icon.pixmap(128, 128); - pixmap.save(path, format); -} - - -void IconList::reindex() -{ - name_index.clear(); - int i = 0; - for (auto &iter : icons) - { - name_index[iter.m_key] = i; - i++; - } -} - -QIcon IconList::getIcon(const QString &key) const -{ - int icon_index = getIconIndex(key); - - if (icon_index != -1) - return icons[icon_index].icon(); - - // Fallback for icons that don't exist. - icon_index = getIconIndex("infinity"); - - if (icon_index != -1) - return icons[icon_index].icon(); - return QIcon(); -} - -int IconList::getIconIndex(const QString &key) const -{ - auto iter = name_index.find(key == "default" ? "infinity" : key); - if (iter != name_index.end()) - return *iter; - - return -1; -} - -QString IconList::getDirectory() const -{ - return m_dir.absolutePath(); -} - -//#include "IconList.moc" diff --git a/api/gui/icons/IconList.h b/api/gui/icons/IconList.h deleted file mode 100644 index f07415fa..00000000 --- a/api/gui/icons/IconList.h +++ /dev/null @@ -1,88 +0,0 @@ -/* Copyright 2013-2021 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - *