From bbb3b3e6f6e3c0f95873f22e6d0a4aaf350f49d9 Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Sun, 15 Jul 2018 14:51:05 +0200 Subject: NOISSUE tabs -> spaces --- .arcconfig | 4 +- .clang-format | 2 +- .gitmodules | 8 +- CMakeLists.txt | 180 +- COPYING.md | 350 +- api/gui/CMakeLists.txt | 24 +- api/gui/DesktopServices.cpp | 174 +- api/gui/DesktopServices.h | 40 +- api/gui/SkinUtils.cpp | 24 +- api/gui/icons/IconList.cpp | 578 +- api/gui/icons/IconList.h | 72 +- api/gui/icons/MMCIcon.cpp | 108 +- api/gui/icons/MMCIcon.h | 36 +- api/logic/BaseInstaller.cpp | 36 +- api/logic/BaseInstaller.h | 18 +- api/logic/BaseInstance.cpp | 240 +- api/logic/BaseInstance.h | 398 +- api/logic/BaseInstanceProvider.h | 64 +- api/logic/BaseVersion.h | 54 +- api/logic/BaseVersionList.cpp | 86 +- api/logic/BaseVersionList.h | 134 +- api/logic/CMakeLists.txt | 748 +- api/logic/Commandline.cpp | 730 +- api/logic/Commandline.h | 324 +- api/logic/DefaultVariable.h | 54 +- api/logic/Env.cpp | 208 +- api/logic/Env.h | 38 +- api/logic/Exception.h | 36 +- api/logic/FileSystem.cpp | 634 +- api/logic/FileSystem.h | 50 +- api/logic/FileSystem_test.cpp | 274 +- api/logic/Filter.cpp | 16 +- api/logic/Filter.h | 30 +- api/logic/FolderInstanceProvider.cpp | 726 +- api/logic/FolderInstanceProvider.h | 88 +- api/logic/GZip.cpp | 208 +- api/logic/GZip.h | 4 +- api/logic/GZip_test.cpp | 74 +- api/logic/InstanceCopyTask.cpp | 64 +- api/logic/InstanceCopyTask.h | 20 +- api/logic/InstanceCreationTask.cpp | 34 +- api/logic/InstanceCreationTask.h | 10 +- api/logic/InstanceImportTask.cpp | 676 +- api/logic/InstanceImportTask.h | 52 +- api/logic/InstanceList.cpp | 460 +- api/logic/InstanceList.h | 118 +- api/logic/InstanceTask.h | 82 +- api/logic/Json.cpp | 268 +- api/logic/Json.h | 160 +- api/logic/LoggedProcess.cpp | 214 +- api/logic/LoggedProcess.h | 70 +- api/logic/MMCStrings.cpp | 126 +- api/logic/MMCStrings.h | 2 +- api/logic/MMCZip.cpp | 398 +- api/logic/MMCZip.h | 68 +- api/logic/MessageLevel.cpp | 54 +- api/logic/MessageLevel.h | 20 +- api/logic/NullInstance.h | 140 +- api/logic/ProblemProvider.h | 52 +- api/logic/QObjectPtr.h | 104 +- api/logic/RWStorage.h | 108 +- api/logic/RecursiveFileSystemWatcher.cpp | 142 +- api/logic/RecursiveFileSystemWatcher.h | 80 +- api/logic/SeparatorPrefixTree.h | 544 +- api/logic/Usable.h | 58 +- api/logic/Version.cpp | 94 +- api/logic/Version.h | 176 +- api/logic/Version_test.cpp | 96 +- api/logic/icons/IIconList.h | 24 +- api/logic/java/JavaChecker.cpp | 250 +- api/logic/java/JavaChecker.h | 66 +- api/logic/java/JavaCheckerJob.cpp | 32 +- api/logic/java/JavaCheckerJob.h | 52 +- api/logic/java/JavaInstall.cpp | 28 +- api/logic/java/JavaInstall.h | 48 +- api/logic/java/JavaInstallList.cpp | 222 +- api/logic/java/JavaInstallList.h | 58 +- api/logic/java/JavaUtils.cpp | 514 +- api/logic/java/JavaUtils.h | 12 +- api/logic/java/JavaVersion.cpp | 164 +- api/logic/java/JavaVersion.h | 68 +- api/logic/java/JavaVersion_test.cpp | 194 +- api/logic/java/launch/CheckJava.cpp | 194 +- api/logic/java/launch/CheckJava.h | 28 +- api/logic/launch/LaunchStep.cpp | 12 +- api/logic/launch/LaunchStep.h | 30 +- api/logic/launch/LaunchTask.cpp | 324 +- api/logic/launch/LaunchTask.h | 134 +- api/logic/launch/LogModel.cpp | 218 +- api/logic/launch/LogModel.h | 70 +- api/logic/launch/steps/PostLaunchCommand.cpp | 94 +- api/logic/launch/steps/PostLaunchCommand.h | 26 +- api/logic/launch/steps/PreLaunchCommand.cpp | 96 +- api/logic/launch/steps/PreLaunchCommand.h | 26 +- api/logic/launch/steps/TextPrint.cpp | 18 +- api/logic/launch/steps/TextPrint.h | 18 +- api/logic/launch/steps/Update.cpp | 84 +- api/logic/launch/steps/Update.h | 22 +- api/logic/meta/BaseEntity.cpp | 200 +- api/logic/meta/BaseEntity.h | 52 +- api/logic/meta/Index.cpp | 162 +- api/logic/meta/Index.h | 48 +- api/logic/meta/Index_test.cpp | 52 +- api/logic/meta/JsonFormat.cpp | 258 +- api/logic/meta/JsonFormat.h | 42 +- api/logic/meta/Version.cpp | 104 +- api/logic/meta/Version.h | 136 +- api/logic/meta/VersionList.cpp | 276 +- api/logic/meta/VersionList.h | 116 +- api/logic/minecraft/AssetsUtils.cpp | 340 +- api/logic/minecraft/AssetsUtils.h | 20 +- api/logic/minecraft/Component.cpp | 604 +- api/logic/minecraft/Component.h | 138 +- api/logic/minecraft/ComponentList.cpp | 1896 ++--- api/logic/minecraft/ComponentList.h | 138 +- api/logic/minecraft/ComponentList_p.h | 44 +- api/logic/minecraft/ComponentUpdateTask.cpp | 1120 +-- api/logic/minecraft/ComponentUpdateTask.h | 30 +- api/logic/minecraft/ComponentUpdateTask_p.h | 32 +- api/logic/minecraft/GradleSpecifier.h | 266 +- api/logic/minecraft/GradleSpecifier_test.cpp | 126 +- api/logic/minecraft/LaunchProfile.cpp | 324 +- api/logic/minecraft/LaunchProfile.h | 140 +- api/logic/minecraft/Library.cpp | 538 +- api/logic/minecraft/Library.h | 330 +- api/logic/minecraft/Library_test.cpp | 498 +- api/logic/minecraft/MinecraftInstance.cpp | 1410 ++-- api/logic/minecraft/MinecraftInstance.h | 174 +- api/logic/minecraft/MinecraftLoadAndCheck.cpp | 50 +- api/logic/minecraft/MinecraftLoadAndCheck.h | 20 +- api/logic/minecraft/MinecraftUpdate.cpp | 234 +- api/logic/minecraft/MinecraftUpdate.h | 32 +- api/logic/minecraft/Mod.cpp | 572 +- api/logic/minecraft/Mod.h | 228 +- api/logic/minecraft/ModsModel.cpp | 548 +- api/logic/minecraft/ModsModel.h | 152 +- api/logic/minecraft/MojangDownloadInfo.h | 110 +- api/logic/minecraft/MojangVersionFormat.cpp | 578 +- api/logic/minecraft/MojangVersionFormat.h | 20 +- api/logic/minecraft/MojangVersionFormat_test.cpp | 76 +- api/logic/minecraft/OneSixVersionFormat.cpp | 650 +- api/logic/minecraft/OneSixVersionFormat.h | 28 +- api/logic/minecraft/OpSys.cpp | 36 +- api/logic/minecraft/OpSys.h | 8 +- api/logic/minecraft/ParseUtils.cpp | 36 +- api/logic/minecraft/ParseUtils_test.cpp | 56 +- api/logic/minecraft/ProfileUtils.cpp | 264 +- api/logic/minecraft/Rule.cpp | 106 +- api/logic/minecraft/Rule.h | 94 +- api/logic/minecraft/SimpleModList.cpp | 552 +- api/logic/minecraft/SimpleModList.h | 152 +- api/logic/minecraft/SimpleModList_test.cpp | 70 +- api/logic/minecraft/SkinUpload.cpp | 80 +- api/logic/minecraft/SkinUpload.h | 32 +- api/logic/minecraft/VersionFile.cpp | 68 +- api/logic/minecraft/VersionFile.h | 118 +- api/logic/minecraft/VersionFilterData.cpp | 104 +- api/logic/minecraft/VersionFilterData.h | 24 +- api/logic/minecraft/World.cpp | 560 +- api/logic/minecraft/World.h | 102 +- api/logic/minecraft/WorldList.cpp | 510 +- api/logic/minecraft/WorldList.h | 174 +- api/logic/minecraft/auth/AuthSession.cpp | 32 +- api/logic/minecraft/auth/AuthSession.h | 70 +- api/logic/minecraft/auth/MojangAccount.cpp | 442 +- api/logic/minecraft/auth/MojangAccount.h | 170 +- api/logic/minecraft/auth/MojangAccountList.cpp | 682 +- api/logic/minecraft/auth/MojangAccountList.h | 304 +- api/logic/minecraft/auth/YggdrasilTask.cpp | 356 +- api/logic/minecraft/auth/YggdrasilTask.h | 212 +- .../minecraft/auth/flows/AuthenticateTask.cpp | 312 +- api/logic/minecraft/auth/flows/AuthenticateTask.h | 14 +- api/logic/minecraft/auth/flows/RefreshTask.cpp | 188 +- api/logic/minecraft/auth/flows/RefreshTask.h | 12 +- api/logic/minecraft/auth/flows/ValidateTask.cpp | 32 +- api/logic/minecraft/auth/flows/ValidateTask.h | 12 +- api/logic/minecraft/forge/ForgeXzDownload.cpp | 640 +- api/logic/minecraft/forge/ForgeXzDownload.h | 46 +- api/logic/minecraft/launch/ClaimAccount.cpp | 20 +- api/logic/minecraft/launch/ClaimAccount.h | 22 +- .../launch/CreateServerResourcePacksFolder.cpp | 14 +- .../launch/CreateServerResourcePacksFolder.h | 16 +- api/logic/minecraft/launch/DirectJavaLaunch.cpp | 196 +- api/logic/minecraft/launch/DirectJavaLaunch.h | 38 +- api/logic/minecraft/launch/ExtractNatives.cpp | 120 +- api/logic/minecraft/launch/ExtractNatives.h | 18 +- api/logic/minecraft/launch/LauncherPartLaunch.cpp | 292 +- api/logic/minecraft/launch/LauncherPartLaunch.h | 42 +- api/logic/minecraft/launch/ModMinecraftJar.cpp | 90 +- api/logic/minecraft/launch/ModMinecraftJar.h | 20 +- api/logic/minecraft/launch/PrintInstanceInfo.h | 18 +- api/logic/minecraft/legacy/LegacyInstance.cpp | 226 +- api/logic/minecraft/legacy/LegacyInstance.h | 216 +- api/logic/minecraft/legacy/LegacyModList.cpp | 262 +- api/logic/minecraft/legacy/LegacyModList.h | 28 +- api/logic/minecraft/legacy/LegacyUpgradeTask.cpp | 200 +- api/logic/minecraft/legacy/LegacyUpgradeTask.h | 18 +- api/logic/minecraft/testdata/lib-native-arch.json | 88 +- api/logic/minecraft/testdata/lib-native.json | 100 +- api/logic/minecraft/testdata/lib-simple.json | 18 +- api/logic/minecraft/update/AssetUpdateTask.cpp | 124 +- api/logic/minecraft/update/AssetUpdateTask.h | 22 +- api/logic/minecraft/update/FMLLibrariesTask.cpp | 190 +- api/logic/minecraft/update/FMLLibrariesTask.h | 22 +- api/logic/minecraft/update/FoldersTask.cpp | 20 +- api/logic/minecraft/update/FoldersTask.h | 10 +- api/logic/minecraft/update/LibrariesTask.cpp | 124 +- api/logic/minecraft/update/LibrariesTask.h | 18 +- api/logic/modplatform/flame/FileResolvingTask.cpp | 202 +- api/logic/modplatform/flame/FileResolvingTask.h | 24 +- api/logic/modplatform/flame/PackManifest.cpp | 88 +- api/logic/modplatform/flame/PackManifest.h | 64 +- api/logic/modplatform/ftb/FtbPackFetchTask.cpp | 168 +- api/logic/modplatform/ftb/FtbPackFetchTask.h | 28 +- api/logic/modplatform/ftb/FtbPackInstallTask.cpp | 280 +- api/logic/modplatform/ftb/FtbPackInstallTask.h | 46 +- api/logic/modplatform/ftb/PackHelpers.h | 40 +- api/logic/net/ByteArraySink.h | 88 +- api/logic/net/ChecksumValidator.h | 76 +- api/logic/net/Download.cpp | 406 +- api/logic/net/Download.h | 60 +- api/logic/net/FileSink.cpp | 138 +- api/logic/net/FileSink.h | 24 +- api/logic/net/HttpMetaCache.cpp | 366 +- api/logic/net/HttpMetaCache.h | 152 +- api/logic/net/MetaCacheSink.cpp | 74 +- api/logic/net/MetaCacheSink.h | 14 +- api/logic/net/Mode.h | 4 +- api/logic/net/NetAction.h | 132 +- api/logic/net/NetJob.cpp | 312 +- api/logic/net/NetJob.h | 96 +- api/logic/net/PasteUpload.cpp | 128 +- api/logic/net/PasteUpload.h | 62 +- api/logic/net/Sink.h | 102 +- api/logic/net/URLConstants.cpp | 4 +- api/logic/net/Validator.h | 12 +- api/logic/news/NewsChecker.cpp | 144 +- api/logic/news/NewsChecker.h | 116 +- api/logic/news/NewsEntry.cpp | 72 +- api/logic/news/NewsEntry.h | 52 +- api/logic/notifications/NotificationChecker.cpp | 158 +- api/logic/notifications/NotificationChecker.h | 74 +- api/logic/pathmatcher/FSTreeMatcher.h | 18 +- api/logic/pathmatcher/IPathMatcher.h | 6 +- api/logic/pathmatcher/MultiMatcher.h | 42 +- api/logic/pathmatcher/RegexpMatcher.h | 66 +- api/logic/screenshots/ImgurAlbumCreation.cpp | 112 +- api/logic/screenshots/ImgurAlbumCreation.h | 46 +- api/logic/screenshots/ImgurUpload.cpp | 160 +- api/logic/screenshots/ImgurUpload.h | 28 +- api/logic/screenshots/Screenshot.h | 16 +- api/logic/settings/INIFile.cpp | 180 +- api/logic/settings/INIFile.h | 16 +- api/logic/settings/INIFile_test.cpp | 96 +- api/logic/settings/INISettingsObject.cpp | 108 +- api/logic/settings/INISettingsObject.h | 48 +- api/logic/settings/OverrideSetting.cpp | 28 +- api/logic/settings/OverrideSetting.h | 18 +- api/logic/settings/PassthroughSetting.cpp | 58 +- api/logic/settings/PassthroughSetting.h | 18 +- api/logic/settings/Setting.cpp | 32 +- api/logic/settings/Setting.h | 146 +- api/logic/settings/SettingsObject.cpp | 140 +- api/logic/settings/SettingsObject.h | 312 +- api/logic/status/StatusChecker.cpp | 166 +- api/logic/status/StatusChecker.h | 36 +- api/logic/tasks/SequentialTask.cpp | 56 +- api/logic/tasks/SequentialTask.h | 22 +- api/logic/tasks/Task.cpp | 144 +- api/logic/tasks/Task.h | 98 +- api/logic/tools/BaseExternalTool.cpp | 10 +- api/logic/tools/BaseExternalTool.h | 34 +- api/logic/tools/BaseProfiler.cpp | 24 +- api/logic/tools/BaseProfiler.h | 20 +- api/logic/tools/JProfiler.cpp | 114 +- api/logic/tools/JProfiler.h | 10 +- api/logic/tools/JVisualVM.cpp | 98 +- api/logic/tools/JVisualVM.h | 10 +- api/logic/tools/MCEditTool.cpp | 84 +- api/logic/tools/MCEditTool.h | 12 +- api/logic/translations/TranslationsModel.cpp | 458 +- api/logic/translations/TranslationsModel.h | 48 +- api/logic/updater/DownloadTask.cpp | 182 +- api/logic/updater/DownloadTask.h | 110 +- api/logic/updater/DownloadTask_test.cpp | 336 +- api/logic/updater/GoUpdate.cpp | 382 +- api/logic/updater/GoUpdate.h | 138 +- api/logic/updater/UpdateChecker.cpp | 398 +- api/logic/updater/UpdateChecker.h | 168 +- api/logic/updater/UpdateChecker_test.cpp | 242 +- api/logic/updater/testdata/1.json | 82 +- api/logic/updater/testdata/2.json | 58 +- api/logic/updater/testdata/channels.json | 42 +- api/logic/updater/testdata/errorChannels.json | 42 +- api/logic/updater/testdata/garbageChannels.json | 40 +- api/logic/updater/testdata/index.json | 14 +- api/logic/updater/testdata/noChannels.json | 6 +- api/logic/updater/testdata/oneChannel.json | 18 +- application/BuildConfig.cpp.in | 84 +- application/BuildConfig.h | 90 +- application/ColorCache.cpp | 30 +- application/ColorCache.h | 178 +- application/ColumnResizer.cpp | 280 +- application/ColumnResizer.h | 20 +- application/GuiUtil.cpp | 192 +- application/HoeDown.h | 94 +- application/InstancePageProvider.h | 98 +- application/InstanceProxyModel.cpp | 36 +- application/InstanceProxyModel.h | 6 +- application/InstanceWindow.cpp | 270 +- application/InstanceWindow.h | 52 +- application/JavaCommon.cpp | 142 +- application/JavaCommon.h | 74 +- application/KonamiCode.cpp | 50 +- application/KonamiCode.h | 10 +- application/LaunchController.cpp | 482 +- application/LaunchController.h | 84 +- application/MainWindow.cpp | 2830 +++---- application/MainWindow.h | 210 +- application/MultiMC.cpp | 2008 ++--- application/MultiMC.h | 266 +- application/SettingsUI.h | 16 +- application/UpdateController.cpp | 736 +- application/UpdateController.h | 54 +- application/VersionProxyModel.cpp | 664 +- application/VersionProxyModel.h | 78 +- application/dialogs/AboutDialog.cpp | 156 +- application/dialogs/AboutDialog.h | 22 +- application/dialogs/CopyInstanceDialog.cpp | 92 +- application/dialogs/CopyInstanceDialog.h | 30 +- application/dialogs/CustomMessageBox.cpp | 22 +- application/dialogs/CustomMessageBox.h | 6 +- application/dialogs/EditAccountDialog.cpp | 24 +- application/dialogs/EditAccountDialog.h | 34 +- application/dialogs/ExportInstanceDialog.cpp | 810 +- application/dialogs/ExportInstanceDialog.h | 24 +- application/dialogs/IconPickerDialog.cpp | 186 +- application/dialogs/IconPickerDialog.h | 26 +- application/dialogs/LoginDialog.cpp | 82 +- application/dialogs/LoginDialog.h | 30 +- application/dialogs/ModEditDialogCommon.cpp | 58 +- application/dialogs/NewComponentDialog.cpp | 86 +- application/dialogs/NewComponentDialog.h | 20 +- application/dialogs/NewInstanceDialog.cpp | 198 +- application/dialogs/NewInstanceDialog.h | 52 +- application/dialogs/NotificationDialog.cpp | 114 +- application/dialogs/NotificationDialog.h | 32 +- application/dialogs/ProfileSelectDialog.cpp | 124 +- application/dialogs/ProfileSelectDialog.h | 98 +- application/dialogs/ProgressDialog.cpp | 208 +- application/dialogs/ProgressDialog.h | 40 +- application/dialogs/SkinUploadDialog.cpp | 180 +- application/dialogs/SkinUploadDialog.h | 18 +- application/dialogs/UpdateDialog.cpp | 258 +- application/dialogs/UpdateDialog.h | 40 +- application/dialogs/VersionSelectDialog.cpp | 100 +- application/dialogs/VersionSelectDialog.h | 48 +- application/groupview/GroupView.cpp | 1474 ++-- application/groupview/GroupView.h | 184 +- application/groupview/GroupedProxyModel.cpp | 34 +- application/groupview/GroupedProxyModel.h | 8 +- application/groupview/InstanceDelegate.cpp | 550 +- application/groupview/InstanceDelegate.h | 8 +- application/groupview/VisualGroup.cpp | 462 +- application/groupview/VisualGroup.h | 106 +- application/install_prereqs.cmake.in | 28 +- application/main.cpp | 62 +- application/package/linux/MultiMC | 116 +- application/pagedialog/PageDialog.cpp | 44 +- application/pagedialog/PageDialog.h | 10 +- application/pages/BasePage.h | 54 +- application/pages/BasePageContainer.h | 8 +- application/pages/BasePageProvider.h | 66 +- application/pages/global/AccountListPage.cpp | 140 +- application/pages/global/AccountListPage.h | 72 +- application/pages/global/CustomCommandsPage.cpp | 48 +- application/pages/global/CustomCommandsPage.h | 46 +- application/pages/global/ExternalToolsPage.cpp | 304 +- application/pages/global/ExternalToolsPage.h | 70 +- application/pages/global/JavaPage.cpp | 164 +- application/pages/global/JavaPage.h | 56 +- application/pages/global/MinecraftPage.cpp | 42 +- application/pages/global/MinecraftPage.h | 50 +- application/pages/global/MultiMCPage.cpp | 774 +- application/pages/global/MultiMCPage.h | 98 +- application/pages/global/PackagesPage.cpp | 286 +- application/pages/global/PackagesPage.h | 38 +- application/pages/global/PasteEEPage.cpp | 60 +- application/pages/global/PasteEEPage.h | 50 +- application/pages/global/ProxyPage.cpp | 88 +- application/pages/global/ProxyPage.h | 50 +- .../pages/instance/InstanceSettingsPage.cpp | 388 +- application/pages/instance/InstanceSettingsPage.h | 62 +- application/pages/instance/LegacyUpgradePage.cpp | 42 +- application/pages/instance/LegacyUpgradePage.h | 48 +- application/pages/instance/LogPage.cpp | 442 +- application/pages/instance/LogPage.h | 80 +- application/pages/instance/ModFolderPage.cpp | 220 +- application/pages/instance/ModFolderPage.h | 110 +- application/pages/instance/NewModFolderPage.cpp | 168 +- application/pages/instance/NewModFolderPage.h | 96 +- application/pages/instance/NotesPage.cpp | 14 +- application/pages/instance/NotesPage.h | 50 +- application/pages/instance/OtherLogsPage.cpp | 418 +- application/pages/instance/OtherLogsPage.h | 76 +- application/pages/instance/ResourcePackPage.h | 24 +- application/pages/instance/ScreenshotsPage.cpp | 538 +- application/pages/instance/ScreenshotsPage.h | 80 +- application/pages/instance/ServersPage.cpp | 1278 +-- application/pages/instance/ServersPage.h | 78 +- application/pages/instance/TexturePackPage.h | 22 +- application/pages/instance/VersionPage.cpp | 788 +- application/pages/instance/VersionPage.h | 96 +- application/pages/instance/WorldListPage.cpp | 396 +- application/pages/instance/WorldListPage.h | 98 +- application/pages/modplatform/FTBPage.cpp | 292 +- application/pages/modplatform/FTBPage.h | 80 +- application/pages/modplatform/FtbListModel.cpp | 208 +- application/pages/modplatform/FtbListModel.h | 62 +- application/pages/modplatform/ImportPage.cpp | 152 +- application/pages/modplatform/ImportPage.h | 54 +- application/pages/modplatform/TechnicPage.cpp | 10 +- application/pages/modplatform/TechnicPage.h | 48 +- application/pages/modplatform/TwitchPage.cpp | 10 +- application/pages/modplatform/TwitchPage.h | 48 +- application/pages/modplatform/VanillaPage.cpp | 88 +- application/pages/modplatform/VanillaPage.h | 62 +- application/resources/OSX/OSX.qrc | 66 +- application/resources/assets/assets.qrc | 2 +- application/resources/documents/documents.qrc | 6 +- application/resources/flat/flat.qrc | 82 +- application/resources/iOS/iOS.qrc | 68 +- application/resources/multimc/multimc.qrc | 556 +- application/resources/pe_blue/pe_blue.qrc | 68 +- application/resources/pe_colored/pe_colored.qrc | 68 +- application/resources/pe_dark/pe_dark.qrc | 68 +- application/resources/pe_light/pe_light.qrc | 68 +- application/setupwizard/AnalyticsWizardPage.cpp | 74 +- application/setupwizard/AnalyticsWizardPage.h | 16 +- application/setupwizard/BaseWizardPage.h | 42 +- application/setupwizard/JavaWizardPage.cpp | 90 +- application/setupwizard/JavaWizardPage.h | 24 +- application/setupwizard/LanguageWizardPage.cpp | 62 +- application/setupwizard/LanguageWizardPage.h | 20 +- application/setupwizard/SetupWizard.cpp | 90 +- application/setupwizard/SetupWizard.h | 16 +- application/themes/BrightTheme.cpp | 44 +- application/themes/BrightTheme.h | 18 +- application/themes/CustomTheme.cpp | 368 +- application/themes/CustomTheme.h | 38 +- application/themes/DarkTheme.cpp | 44 +- application/themes/DarkTheme.h | 18 +- application/themes/FusionTheme.cpp | 2 +- application/themes/FusionTheme.h | 4 +- application/themes/ITheme.cpp | 68 +- application/themes/ITheme.h | 32 +- application/themes/SystemTheme.cpp | 62 +- application/themes/SystemTheme.h | 28 +- application/widgets/Common.cpp | 42 +- application/widgets/Common.h | 2 +- application/widgets/CustomCommands.cpp | 34 +- application/widgets/CustomCommands.h | 18 +- application/widgets/FocusLineEdit.cpp | 22 +- application/widgets/FocusLineEdit.h | 16 +- application/widgets/IconLabel.cpp | 40 +- application/widgets/IconLabel.h | 16 +- application/widgets/JavaSettingsWidget.cpp | 654 +- application/widgets/JavaSettingsWidget.h | 122 +- application/widgets/LabeledToolButton.cpp | 102 +- application/widgets/LabeledToolButton.h | 20 +- application/widgets/LineSeparator.cpp | 30 +- application/widgets/LineSeparator.h | 14 +- application/widgets/LogView.cpp | 186 +- application/widgets/LogView.h | 38 +- application/widgets/MCModInfoFrame.cpp | 210 +- application/widgets/MCModInfoFrame.h | 26 +- application/widgets/ModListView.cpp | 74 +- application/widgets/ModListView.h | 6 +- application/widgets/PageContainer.cpp | 310 +- application/widgets/PageContainer.h | 80 +- application/widgets/PageContainer_p.h | 156 +- application/widgets/ProgressWidget.cpp | 80 +- application/widgets/ProgressWidget.h | 22 +- application/widgets/ServerStatus.cpp | 214 +- application/widgets/ServerStatus.h | 34 +- application/widgets/VersionListView.cpp | 162 +- application/widgets/VersionListView.h | 44 +- application/widgets/VersionSelectWidget.cpp | 212 +- application/widgets/VersionSelectWidget.h | 68 +- libraries/LocalPeer/CMakeLists.txt | 12 +- libraries/LocalPeer/include/LocalPeer.h | 58 +- libraries/LocalPeer/src/LocalPeer.cpp | 248 +- libraries/LocalPeer/src/LockedFile.cpp | 152 +- libraries/LocalPeer/src/LockedFile.h | 34 +- libraries/LocalPeer/src/LockedFile_unix.cpp | 96 +- libraries/LocalPeer/src/LockedFile_win.cpp | 272 +- libraries/classparser/CMakeLists.txt | 2 +- libraries/classparser/src/annotations.cpp | 132 +- libraries/classparser/src/annotations.h | 384 +- libraries/classparser/src/classfile.h | 272 +- libraries/classparser/src/classparser.cpp | 92 +- libraries/classparser/src/constants.h | 384 +- libraries/classparser/src/javaendian.h | 32 +- libraries/classparser/src/membuffer.h | 94 +- libraries/ganalytics/include/ganalytics.h | 72 +- libraries/ganalytics/src/ganalytics.cpp | 152 +- libraries/ganalytics/src/ganalytics_worker.cpp | 280 +- libraries/ganalytics/src/ganalytics_worker.h | 70 +- libraries/hoedown/include/hoedown/autolink.h | 8 +- libraries/hoedown/include/hoedown/buffer.h | 32 +- libraries/hoedown/include/hoedown/document.h | 188 +- libraries/hoedown/include/hoedown/html.h | 40 +- libraries/hoedown/include/hoedown/stack.h | 6 +- libraries/hoedown/src/autolink.c | 414 +- libraries/hoedown/src/buffer.c | 310 +- libraries/hoedown/src/document.c | 4030 +++++----- libraries/hoedown/src/escape.c | 218 +- libraries/hoedown/src/html.c | 914 +-- libraries/hoedown/src/html_smartypants.c | 546 +- libraries/hoedown/src/stack.c | 56 +- libraries/hoedown/src/version.c | 6 +- libraries/iconfix/CMakeLists.txt | 6 +- libraries/iconfix/internal/qhexstring_p.h | 60 +- libraries/iconfix/internal/qiconloader.cpp | 934 +-- libraries/iconfix/internal/qiconloader_p.h | 222 +- libraries/iconfix/xdgicon.cpp | 106 +- libraries/iconfix/xdgicon.h | 12 +- libraries/javacheck/CMakeLists.txt | 2 +- libraries/javacheck/JavaCheck.java | 38 +- libraries/launcher/CMakeLists.txt | 18 +- libraries/launcher/net/minecraft/Launcher.java | 268 +- libraries/launcher/org/multimc/EntryPoint.java | 232 +- libraries/launcher/org/multimc/Launcher.java | 2 +- libraries/launcher/org/multimc/ParamBucket.java | 108 +- libraries/launcher/org/multimc/Utils.java | 150 +- .../org/multimc/onesix/OneSixLauncher.java | 408 +- libraries/pack200/CMakeLists.txt | 42 +- libraries/pack200/anti200.cpp | 62 +- libraries/pack200/src/bands.cpp | 642 +- libraries/pack200/src/bands.h | 604 +- libraries/pack200/src/bytes.cpp | 246 +- libraries/pack200/src/bytes.h | 472 +- libraries/pack200/src/coding.cpp | 1762 ++--- libraries/pack200/src/coding.h | 348 +- libraries/pack200/src/constants.h | 712 +- libraries/pack200/src/unpack.cpp | 8346 ++++++++++---------- libraries/pack200/src/unpack.h | 990 +-- libraries/pack200/src/unpack200.cpp | 188 +- libraries/pack200/src/utils.cpp | 28 +- libraries/pack200/src/utils.h | 6 +- libraries/pack200/src/zip.cpp | 838 +- libraries/pack200/src/zip.h | 132 +- libraries/rainbow/CMakeLists.txt | 6 +- libraries/rainbow/include/rainbow.h | 12 +- libraries/rainbow/include/rainbow_config.h | 12 +- libraries/rainbow/src/rainbow.cpp | 504 +- libraries/systeminfo/CMakeLists.txt | 16 +- libraries/systeminfo/include/distroutils.h | 8 +- libraries/systeminfo/include/sys.h | 50 +- libraries/systeminfo/src/distroutils.cpp | 418 +- libraries/systeminfo/src/sys_apple.cpp | 44 +- libraries/systeminfo/src/sys_test.cpp | 28 +- libraries/systeminfo/src/sys_unix.cpp | 98 +- libraries/systeminfo/src/sys_win32.cpp | 50 +- libraries/xz-embedded/CMakeLists.txt | 16 +- libraries/xz-embedded/include/xz.h | 36 +- libraries/xz-embedded/src/xz_config.h | 24 +- libraries/xz-embedded/src/xz_crc32.c | 38 +- libraries/xz-embedded/src/xz_crc64.c | 38 +- libraries/xz-embedded/src/xz_dec_bcj.c | 902 +-- libraries/xz-embedded/src/xz_dec_lzma2.c | 1810 ++--- libraries/xz-embedded/src/xz_dec_stream.c | 1198 +-- libraries/xz-embedded/src/xz_lzma2.h | 46 +- libraries/xz-embedded/src/xz_private.h | 6 +- libraries/xz-embedded/src/xz_stream.h | 8 +- libraries/xz-embedded/xzminidec.c | 216 +- travis/prepare.sh | 68 +- 577 files changed, 54550 insertions(+), 54550 deletions(-) diff --git a/.arcconfig b/.arcconfig index 0e628a13..ab5cbe89 100644 --- a/.arcconfig +++ b/.arcconfig @@ -1,5 +1,5 @@ { - "project_id": "MultiMC5", - "conduit_uri": "http://ph.multimc.org" + "project_id": "MultiMC5", + "conduit_uri": "http://ph.multimc.org" } diff --git a/.clang-format b/.clang-format index 8e33c4d1..f4732803 100644 --- a/.clang-format +++ b/.clang-format @@ -1,4 +1,4 @@ -UseTab: true +UseTab: false IndentWidth: 4 TabWidth: 4 ConstructorInitializerIndentWidth: 4 diff --git a/.gitmodules b/.gitmodules index 5f2a1b8f..bd51ef80 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "depends/libnbtplusplus"] - path = libraries/libnbtplusplus - url = https://github.com/MultiMC/libnbtplusplus.git + path = libraries/libnbtplusplus + url = https://github.com/MultiMC/libnbtplusplus.git [submodule "libraries/quazip"] - path = libraries/quazip - url = https://github.com/MultiMC/quazip.git + path = libraries/quazip + url = https://github.com/MultiMC/quazip.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 33a53da0..bfc9527a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 3.1) string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BUILD_DIR}" IS_IN_SOURCE_BUILD) if(IS_IN_SOURCE_BUILD) - message(AUTHOR_WARNING "You are building MultiMC in-source. This is NOT recommended!") + message(AUTHOR_WARNING "You are building MultiMC in-source. This is NOT recommended!") endif() if(WIN32) - # In Qt 5.1+ we have our own main() function, don't autolink to qtmain on Windows - cmake_policy(SET CMP0020 OLD) + # In Qt 5.1+ we have our own main() function, don't autolink to qtmain on Windows + cmake_policy(SET CMP0020 OLD) endif() project(MultiMC) @@ -22,7 +22,7 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/") # Output all executables and shared libs in the main build folder, not in subfolders. set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) if(UNIX) - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) endif() set(CMAKE_JAVA_TARGET_OUTPUT_DIR ${PROJECT_BINARY_DIR}/jars) @@ -34,7 +34,7 @@ set(CMAKE_C_STANDARD 11) include(GenerateExportHeader) set(CMAKE_CXX_FLAGS " -Wall -pedantic -Werror -D_GLIBCXX_USE_CXX11_ABI=0 -fstack-protector-strong --param=ssp-buffer-size=4 -O3 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS}") if(UNIX AND APPLE) - set(CMAKE_CXX_FLAGS " -stdlib=libc++ ${CMAKE_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS " -stdlib=libc++ ${CMAKE_CXX_FLAGS}") endif() set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror=return-type") @@ -108,124 +108,124 @@ set(MultiMC_LAYOUT "auto" CACHE STRING "The layout for MultiMC installation (aut set_property(CACHE MultiMC_LAYOUT PROPERTY STRINGS auto win-bundle lin-bundle lin-nodeps lin-system mac-bundle) if(MultiMC_LAYOUT STREQUAL "auto") - if(UNIX AND APPLE) - set(MultiMC_LAYOUT_REAL "mac-bundle") - elseif(UNIX) - set(MultiMC_LAYOUT_REAL "lin-nodeps") - elseif(WIN32) - set(MultiMC_LAYOUT_REAL "win-bundle") - else() - message(FATAL_ERROR "Cannot choose a sensible install layout for your platform.") - endif() + if(UNIX AND APPLE) + set(MultiMC_LAYOUT_REAL "mac-bundle") + elseif(UNIX) + set(MultiMC_LAYOUT_REAL "lin-nodeps") + elseif(WIN32) + set(MultiMC_LAYOUT_REAL "win-bundle") + else() + message(FATAL_ERROR "Cannot choose a sensible install layout for your platform.") + endif() else() - set(MultiMC_LAYOUT_REAL ${MultiMC_LAYOUT}) + set(MultiMC_LAYOUT_REAL ${MultiMC_LAYOUT}) endif() if(MultiMC_LAYOUT_REAL STREQUAL "mac-bundle") - set(BINARY_DEST_DIR "MultiMC.app/Contents/MacOS") - set(LIBRARY_DEST_DIR "MultiMC.app/Contents/MacOS") - set(PLUGIN_DEST_DIR "MultiMC.app/Contents/MacOS") - set(RESOURCES_DEST_DIR "MultiMC.app/Contents/Resources") - set(JARS_DEST_DIR "MultiMC.app/Contents/MacOS/jars") + set(BINARY_DEST_DIR "MultiMC.app/Contents/MacOS") + set(LIBRARY_DEST_DIR "MultiMC.app/Contents/MacOS") + set(PLUGIN_DEST_DIR "MultiMC.app/Contents/MacOS") + set(RESOURCES_DEST_DIR "MultiMC.app/Contents/Resources") + set(JARS_DEST_DIR "MultiMC.app/Contents/MacOS/jars") - set(BUNDLE_DEST_DIR ".") + set(BUNDLE_DEST_DIR ".") - # Apps to bundle - set(APPS "\${CMAKE_INSTALL_PREFIX}/MultiMC.app") + # Apps to bundle + set(APPS "\${CMAKE_INSTALL_PREFIX}/MultiMC.app") - # Mac bundle settings - set(MACOSX_BUNDLE_BUNDLE_NAME "MultiMC") - set(MACOSX_BUNDLE_INFO_STRING "MultiMC Minecraft launcher and management utility.") - set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.multimc.MultiMC5") - set(MACOSX_BUNDLE_BUNDLE_VERSION "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_HOTFIX}.${MultiMC_VERSION_BUILD}") - set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_HOTFIX}.${MultiMC_VERSION_BUILD}") - set(MACOSX_BUNDLE_LONG_VERSION_STRING "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_HOTFIX}.${MultiMC_VERSION_BUILD}") - set(MACOSX_BUNDLE_ICON_FILE MultiMC.icns) - set(MACOSX_BUNDLE_COPYRIGHT "Copyright 2015-2018 MultiMC Contributors") + # Mac bundle settings + set(MACOSX_BUNDLE_BUNDLE_NAME "MultiMC") + set(MACOSX_BUNDLE_INFO_STRING "MultiMC Minecraft launcher and management utility.") + set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.multimc.MultiMC5") + set(MACOSX_BUNDLE_BUNDLE_VERSION "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_HOTFIX}.${MultiMC_VERSION_BUILD}") + set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_HOTFIX}.${MultiMC_VERSION_BUILD}") + set(MACOSX_BUNDLE_LONG_VERSION_STRING "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_HOTFIX}.${MultiMC_VERSION_BUILD}") + set(MACOSX_BUNDLE_ICON_FILE MultiMC.icns) + set(MACOSX_BUNDLE_COPYRIGHT "Copyright 2015-2018 MultiMC Contributors") - # directories to look for dependencies - set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + # directories to look for dependencies + set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) - # install as bundle - set(INSTALL_BUNDLE "full") + # install as bundle + set(INSTALL_BUNDLE "full") - # Add the icon - install(FILES application/resources/MultiMC.icns DESTINATION ${RESOURCES_DEST_DIR}) + # Add the icon + install(FILES application/resources/MultiMC.icns DESTINATION ${RESOURCES_DEST_DIR}) elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-bundle") - set(BINARY_DEST_DIR "bin") - set(LIBRARY_DEST_DIR "bin") - set(PLUGIN_DEST_DIR "plugins") - set(BUNDLE_DEST_DIR ".") - set(RESOURCES_DEST_DIR ".") - set(JARS_DEST_DIR "bin/jars") + set(BINARY_DEST_DIR "bin") + set(LIBRARY_DEST_DIR "bin") + set(PLUGIN_DEST_DIR "plugins") + set(BUNDLE_DEST_DIR ".") + set(RESOURCES_DEST_DIR ".") + set(JARS_DEST_DIR "bin/jars") - # Apps to bundle - set(APPS "\${CMAKE_INSTALL_PREFIX}/bin/MultiMC") + # Apps to bundle + set(APPS "\${CMAKE_INSTALL_PREFIX}/bin/MultiMC") - # directories to look for dependencies - set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + # directories to look for dependencies + set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) - # install as bundle - set(INSTALL_BUNDLE "full") + # install as bundle + set(INSTALL_BUNDLE "full") - # Set RPATH - SET(MultiMC_BINARY_RPATH "$ORIGIN/") + # Set RPATH + SET(MultiMC_BINARY_RPATH "$ORIGIN/") - # Install basic runner script - install(PROGRAMS application/package/linux/MultiMC DESTINATION ${BUNDLE_DEST_DIR}) + # Install basic runner script + install(PROGRAMS application/package/linux/MultiMC DESTINATION ${BUNDLE_DEST_DIR}) elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-nodeps") - set(BINARY_DEST_DIR "bin") - set(LIBRARY_DEST_DIR "bin") - set(PLUGIN_DEST_DIR "plugins") - set(BUNDLE_DEST_DIR ".") - set(RESOURCES_DEST_DIR ".") - set(JARS_DEST_DIR "bin/jars") + set(BINARY_DEST_DIR "bin") + set(LIBRARY_DEST_DIR "bin") + set(PLUGIN_DEST_DIR "plugins") + set(BUNDLE_DEST_DIR ".") + set(RESOURCES_DEST_DIR ".") + set(JARS_DEST_DIR "bin/jars") - # install as bundle with no dependencies included - set(INSTALL_BUNDLE "nodeps") + # install as bundle with no dependencies included + set(INSTALL_BUNDLE "nodeps") - # Set RPATH - SET(MultiMC_BINARY_RPATH "$ORIGIN/") + # Set RPATH + SET(MultiMC_BINARY_RPATH "$ORIGIN/") - # Install basic runner script - install(PROGRAMS application/package/linux/MultiMC DESTINATION ${BUNDLE_DEST_DIR}) + # Install basic runner script + install(PROGRAMS application/package/linux/MultiMC DESTINATION ${BUNDLE_DEST_DIR}) elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-system") - set(MultiMC_APP_BINARY_NAME "multimc" CACHE STRING "Name of the MultiMC binary") - set(MultiMC_BINARY_DEST_DIR "bin" CACHE STRING "Path to the binary directory") - set(MultiMC_LIBRARY_DEST_DIR "lib${LIB_SUFFIX}" CACHE STRING "Path to the library directory") - set(MultiMC_SHARE_DEST_DIR "share/multimc" CACHE STRING "Path to the shared data directory") - set(JARS_DEST_DIR "${MultiMC_SHARE_DEST_DIR}/jars") + set(MultiMC_APP_BINARY_NAME "multimc" CACHE STRING "Name of the MultiMC binary") + set(MultiMC_BINARY_DEST_DIR "bin" CACHE STRING "Path to the binary directory") + set(MultiMC_LIBRARY_DEST_DIR "lib${LIB_SUFFIX}" CACHE STRING "Path to the library directory") + set(MultiMC_SHARE_DEST_DIR "share/multimc" CACHE STRING "Path to the shared data directory") + set(JARS_DEST_DIR "${MultiMC_SHARE_DEST_DIR}/jars") - set(BINARY_DEST_DIR ${MultiMC_BINARY_DEST_DIR}) - set(LIBRARY_DEST_DIR ${MultiMC_LIBRARY_DEST_DIR}) + set(BINARY_DEST_DIR ${MultiMC_BINARY_DEST_DIR}) + set(LIBRARY_DEST_DIR ${MultiMC_LIBRARY_DEST_DIR}) - MESSAGE(STATUS "Compiling for linux system with ${MultiMC_SHARE_DEST_DIR} and MULTIMC_LINUX_DATADIR") - SET(MultiMC_APP_BINARY_DEFS "-DMULTIMC_JARS_LOCATION=${CMAKE_INSTALL_PREFIX}/${JARS_DEST_DIR}" "-DMULTIMC_LINUX_DATADIR") + MESSAGE(STATUS "Compiling for linux system with ${MultiMC_SHARE_DEST_DIR} and MULTIMC_LINUX_DATADIR") + SET(MultiMC_APP_BINARY_DEFS "-DMULTIMC_JARS_LOCATION=${CMAKE_INSTALL_PREFIX}/${JARS_DEST_DIR}" "-DMULTIMC_LINUX_DATADIR") - # install as bundle with no dependencies included - set(INSTALL_BUNDLE "nodeps") + # install as bundle with no dependencies included + set(INSTALL_BUNDLE "nodeps") elseif(MultiMC_LAYOUT_REAL STREQUAL "win-bundle") - set(BINARY_DEST_DIR ".") - set(LIBRARY_DEST_DIR ".") - set(PLUGIN_DEST_DIR ".") - set(BUNDLE_DEST_DIR ".") - set(RESOURCES_DEST_DIR ".") - set(JARS_DEST_DIR "jars") + set(BINARY_DEST_DIR ".") + set(LIBRARY_DEST_DIR ".") + set(PLUGIN_DEST_DIR ".") + set(BUNDLE_DEST_DIR ".") + set(RESOURCES_DEST_DIR ".") + set(JARS_DEST_DIR "jars") - # Apps to bundle - set(APPS "\${CMAKE_INSTALL_PREFIX}/MultiMC.exe") + # Apps to bundle + set(APPS "\${CMAKE_INSTALL_PREFIX}/MultiMC.exe") - # directories to look for dependencies - set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + # directories to look for dependencies + set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) - # install as bundle - set(INSTALL_BUNDLE "full") + # install as bundle + set(INSTALL_BUNDLE "full") else() - message(FATAL_ERROR "No sensible install layout set.") + message(FATAL_ERROR "No sensible install layout set.") endif() ################################ Included Libs ################################ diff --git a/COPYING.md b/COPYING.md index ca367df3..21c773b7 100644 --- a/COPYING.md +++ b/COPYING.md @@ -1,254 +1,254 @@ # MultiMC - Copyright 2012-2018 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 + Copyright 2012-2018 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 + 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. + 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. # MinGW runtime (Windows) - Copyright (c) 2012 MinGW.org project + Copyright (c) 2012 MinGW.org project - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: - The above copyright notice, this permission notice and the below disclaimer - shall be included in all copies or substantial portions of the Software. + The above copyright notice, this permission notice and the below disclaimer + shall be included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. # Qt 5 - Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). - Contact: http://www.qt-project.org/legal + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). + Contact: http://www.qt-project.org/legal - Licensed under LGPL v2.1 + Licensed under LGPL v2.1 # libnbt++ - libnbt++ - A library for the Minecraft Named Binary Tag format. - Copyright (C) 2013, 2015 ljfa-ag + libnbt++ - A library for the Minecraft Named Binary Tag format. + Copyright (C) 2013, 2015 ljfa-ag - libnbt++ is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. + libnbt++ is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - libnbt++ is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. + libnbt++ is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with libnbt++. If not, see . + You should have received a copy of the GNU Lesser General Public License + along with libnbt++. If not, see . # rainbow (KGuiAddons) - Copyright (C) 2007 Matthew Woehlke - Copyright (C) 2007 Olaf Schmidt - Copyright (C) 2007 Thomas Zander - Copyright (C) 2007 Zack Rusin - Copyright (C) 2015 Petr Mrazek + Copyright (C) 2007 Matthew Woehlke + Copyright (C) 2007 Olaf Schmidt + Copyright (C) 2007 Thomas Zander + Copyright (C) 2007 Zack Rusin + Copyright (C) 2015 Petr Mrazek - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. # Hoedown - Copyright (c) 2008, Natacha Porté - Copyright (c) 2011, Vicent Martí - Copyright (c) 2014, Xavier Mendez, Devin Torres and the Hoedown authors + Copyright (c) 2008, Natacha Porté + Copyright (c) 2011, Vicent Martí + Copyright (c) 2014, Xavier Mendez, Devin Torres and the Hoedown authors - Permission to use, copy, modify, and distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # Batch icon set - You are free to use Batch (the "icon set") or any part thereof (the "icons") - in any personal, open-source or commercial work without obligation of payment - (monetary or otherwise) or attribution. Do not sell the icon set, host - the icon set or rent the icon set (either in existing or modified form). + You are free to use Batch (the "icon set") or any part thereof (the "icons") + in any personal, open-source or commercial work without obligation of payment + (monetary or otherwise) or attribution. Do not sell the icon set, host + the icon set or rent the icon set (either in existing or modified form). - While attribution is optional, it is always appreciated. + While attribution is optional, it is always appreciated. - Intellectual property rights are not transferred with the download of the icons. + Intellectual property rights are not transferred with the download of the icons. - EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL ADAM WHITCROFT - BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, - PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THE USE OF THE ICONS, - EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL ADAM WHITCROFT + BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, + PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THE USE OF THE ICONS, + EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. # Material Design Icons - Copyright (c) 2014, Austin Andrews (http://materialdesignicons.com/), - with Reserved Font Name Material Design Icons. - Copyright (c) 2014, Google (http://www.google.com/design/) - uses the license at https://github.com/google/material-design-icons/blob/master/LICENSE + Copyright (c) 2014, Austin Andrews (http://materialdesignicons.com/), + with Reserved Font Name Material Design Icons. + Copyright (c) 2014, Google (http://www.google.com/design/) + uses the license at https://github.com/google/material-design-icons/blob/master/LICENSE - This Font Software is licensed under the SIL Open Font License, Version 1.1. - This license is copied below, and is also available with a FAQ at: - http://scripts.sil.org/OFL + This Font Software is licensed under the SIL Open Font License, Version 1.1. + This license is copied below, and is also available with a FAQ at: + http://scripts.sil.org/OFL # Pack200 - The GNU General Public License (GPL) + The GNU General Public License (GPL) - Version 2, June 1991 + Version 2, June 1991 - + "CLASSPATH" EXCEPTION TO THE GPL + + "CLASSPATH" EXCEPTION TO THE GPL - Certain source files distributed by Oracle America and/or its affiliates are - subject to the following clarification and special exception to the GPL, but - only where Oracle has expressly included in the particular source file's header - the words "Oracle designates this particular file as subject to the "Classpath" - exception as provided by Oracle in the LICENSE file that accompanied this code." + Certain source files distributed by Oracle America and/or its affiliates are + subject to the following clarification and special exception to the GPL, but + only where Oracle has expressly included in the particular source file's header + the words "Oracle designates this particular file as subject to the "Classpath" + exception as provided by Oracle in the LICENSE file that accompanied this code." - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. + Linking this library statically or dynamically with other modules is making + a combined work based on this library. Thus, the terms and conditions of + the GNU General Public License cover the whole combination. - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent modules, + and to copy and distribute the resulting executable under terms of your + choice, provided that you also meet, for each linked independent module, + the terms and conditions of the license of that module. An independent + module is a module which is not derived from or based on this library. If + you modify this library, you may extend this exception to your version of + the library, but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. # Quazip - Copyright (C) 2005-2011 Sergey A. Tachenov + Copyright (C) 2005-2011 Sergey A. Tachenov - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2 of the License, or (at - your option) any later version. + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at + your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser - General Public License for more details. + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser + General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU Lesser General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - See COPYING file for the full LGPL text. + See COPYING file for the full LGPL text. - Original ZIP package is copyrighted by Gilles Vollant, see - quazip/(un)zip.h files for details, basically it's zlib license. + Original ZIP package is copyrighted by Gilles Vollant, see + quazip/(un)zip.h files for details, basically it's zlib license. # xz-minidec - XZ decompressor + XZ decompressor - Authors: Lasse Collin - Igor Pavlov + Authors: Lasse Collin + Igor Pavlov - This file has been put into the public domain. - You can do whatever you want with this file. + This file has been put into the public domain. + Y