diff options
| -rw-r--r-- | CMakeLists.txt | 22 | ||||
| -rw-r--r-- | MultiMC.cpp | 6 | ||||
| -rw-r--r-- | gui/MainWindow.cpp | 2 | ||||
| -rw-r--r-- | gui/dialogs/SettingsDialog.cpp | 2 | ||||
| -rw-r--r-- | logic/tools/BaseExternalTool.cpp (renamed from logic/BaseExternalTool.cpp) | 2 | ||||
| -rw-r--r-- | logic/tools/BaseExternalTool.h (renamed from logic/BaseExternalTool.h) | 0 | ||||
| -rw-r--r-- | logic/tools/BaseProfiler.cpp (renamed from logic/profiler/BaseProfiler.cpp) | 0 | ||||
| -rw-r--r-- | logic/tools/BaseProfiler.h (renamed from logic/profiler/BaseProfiler.h) | 2 | ||||
| -rw-r--r-- | logic/tools/JProfiler.cpp (renamed from logic/profiler/JProfiler.cpp) | 0 | ||||
| -rw-r--r-- | logic/tools/JProfiler.h (renamed from logic/profiler/JProfiler.h) | 0 | ||||
| -rw-r--r-- | logic/tools/JVisualVM.cpp (renamed from logic/profiler/JVisualVM.cpp) | 0 | ||||
| -rw-r--r-- | logic/tools/JVisualVM.h (renamed from logic/profiler/JVisualVM.h) | 0 | ||||
| -rw-r--r-- | logic/tools/MCEditTool.cpp (renamed from logic/MCEditTool.cpp) | 0 | ||||
| -rw-r--r-- | logic/tools/MCEditTool.h (renamed from logic/MCEditTool.h) | 0 |
14 files changed, 18 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 58d01eb8..43c02efc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -499,17 +499,17 @@ logic/assets/AssetsMigrateTask.cpp logic/assets/AssetsUtils.h logic/assets/AssetsUtils.cpp -# Profiling and tools -logic/BaseExternalTool.h -logic/BaseExternalTool.cpp -logic/MCEditTool.h -logic/MCEditTool.cpp -logic/profiler/BaseProfiler.h -logic/profiler/BaseProfiler.cpp -logic/profiler/JProfiler.h -logic/profiler/JProfiler.cpp -logic/profiler/JVisualVM.h -logic/profiler/JVisualVM.cpp +# Tools +logic/tools/BaseExternalTool.h +logic/tools/BaseExternalTool.cpp +logic/tools/MCEditTool.h +logic/tools/MCEditTool.cpp +logic/tools/BaseProfiler.h +logic/tools/BaseProfiler.cpp +logic/tools/JProfiler.h +logic/tools/JProfiler.cpp +logic/tools/JVisualVM.h +logic/tools/JVisualVM.cpp ) diff --git a/MultiMC.cpp b/MultiMC.cpp index c813c425..294a4926 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -31,9 +31,9 @@ #include "logic/updater/UpdateChecker.h" #include "logic/updater/NotificationChecker.h" -#include "logic/profiler/JProfiler.h" -#include "logic/profiler/JVisualVM.h" -#include "logic/MCEditTool.h" +#include "logic/tools/JProfiler.h" +#include "logic/tools/JVisualVM.h" +#include "logic/tools/MCEditTool.h" #include "pathutils.h" #include "cmdutils.h" diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index 16c88201..ebbace52 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -98,7 +98,7 @@ #include <logic/updater/NotificationChecker.h> #include <logic/tasks/ThreadTask.h> -#include "logic/profiler/BaseProfiler.h" +#include "logic/tools/BaseProfiler.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { diff --git a/gui/dialogs/SettingsDialog.cpp b/gui/dialogs/SettingsDialog.cpp index d20c0aa7..cd5aba74 100644 --- a/gui/dialogs/SettingsDialog.cpp +++ b/gui/dialogs/SettingsDialog.cpp @@ -29,7 +29,7 @@ #include "logic/updater/UpdateChecker.h" -#include "logic/profiler/BaseProfiler.h" +#include "logic/tools/BaseProfiler.h" #include <settingsobject.h> #include <pathutils.h> diff --git a/logic/BaseExternalTool.cpp b/logic/tools/BaseExternalTool.cpp index 081c3ef0..69cddd00 100644 --- a/logic/BaseExternalTool.cpp +++ b/logic/tools/BaseExternalTool.cpp @@ -8,7 +8,7 @@ #include <windows.h> #endif -#include "BaseInstance.h" +#include "logic/BaseInstance.h" #include "MultiMC.h" BaseExternalTool::BaseExternalTool(BaseInstance *instance, QObject *parent) diff --git a/logic/BaseExternalTool.h b/logic/tools/BaseExternalTool.h index e8965bfd..e8965bfd 100644 --- a/logic/BaseExternalTool.h +++ b/logic/tools/BaseExternalTool.h diff --git a/logic/profiler/BaseProfiler.cpp b/logic/tools/BaseProfiler.cpp index 9aaca793..9aaca793 100644 --- a/logic/profiler/BaseProfiler.cpp +++ b/logic/tools/BaseProfiler.cpp diff --git a/logic/profiler/BaseProfiler.h b/logic/tools/BaseProfiler.h index 082cb65a..ec57578e 100644 --- a/logic/profiler/BaseProfiler.h +++ b/logic/tools/BaseProfiler.h @@ -1,6 +1,6 @@ #pragma once -#include "logic/BaseExternalTool.h" +#include "BaseExternalTool.h" class BaseInstance; class SettingsObject; diff --git a/logic/profiler/JProfiler.cpp b/logic/tools/JProfiler.cpp index bb851f0b..bb851f0b 100644 --- a/logic/profiler/JProfiler.cpp +++ b/logic/tools/JProfiler.cpp diff --git a/logic/profiler/JProfiler.h b/logic/tools/JProfiler.h index 88a02462..88a02462 100644 --- a/logic/profiler/JProfiler.h +++ b/logic/tools/JProfiler.h diff --git a/logic/profiler/JVisualVM.cpp b/logic/tools/JVisualVM.cpp index 02938028..02938028 100644 --- a/logic/profiler/JVisualVM.cpp +++ b/logic/tools/JVisualVM.cpp diff --git a/logic/profiler/JVisualVM.h b/logic/tools/JVisualVM.h index af94fe55..af94fe55 100644 --- a/logic/profiler/JVisualVM.h +++ b/logic/tools/JVisualVM.h diff --git a/logic/MCEditTool.cpp b/logic/tools/MCEditTool.cpp index c4edece5..c4edece5 100644 --- a/logic/MCEditTool.cpp +++ b/logic/tools/MCEditTool.cpp diff --git a/logic/MCEditTool.h b/logic/tools/MCEditTool.h index b0ed1ad4..b0ed1ad4 100644 --- a/logic/MCEditTool.h +++ b/logic/tools/MCEditTool.h |