natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix circular dependancy, credit Kaev

Browse Source
This commit is contained in:
T1ti
2024-12-24 01:25:32 +01:00
parent 9831b5c04a
commit ba19b06156
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/noggit/ui/tools/MapCreationWizard/Ui/MapCreationWizard.cpp
View File

@@ -3,7 +3,6 @@
#include "MapCreationWizard.hpp" #include "MapCreationWizard.hpp"
#include <noggit/ui/FontAwesome.hpp> #include <noggit/ui/FontAwesome.hpp>
#include <noggit/ui/windows/noggitWindow/NoggitWindow.hpp>
#include <noggit/ui/widgets/Vector3Widget.hpp> #include <noggit/ui/widgets/Vector3Widget.hpp>
#include <noggit/project/CurrentProject.hpp> #include <noggit/project/CurrentProject.hpp>
#include <blizzard-database-library/include/structures/Types.h> #include <blizzard-database-library/include/structures/Types.h>
@@ -11,6 +10,7 @@
#include <noggit/World.h> #include <noggit/World.h>
#include <noggit/application/Utils.hpp> #include <noggit/application/Utils.hpp>
#include <noggit/Log.h> #include <noggit/Log.h>
#include <noggit/ui/windows/noggitWindow/NoggitWindow.hpp>
#include <util/qt/overload.hpp> #include <util/qt/overload.hpp>

1
src/noggit/ui/tools/MapCreationWizard/Ui/MapCreationWizard.hpp
View File

@@ -24,7 +24,6 @@
#include <noggit/World.h> #include <noggit/World.h>
#include <noggit/application/NoggitApplication.hpp> #include <noggit/application/NoggitApplication.hpp>
namespace Noggit namespace Noggit
{ {
namespace Ui namespace Ui

12
src/noggit/ui/windows/noggitWindow/NoggitWindow.cpp
View File

@@ -10,7 +10,6 @@
#include <noggit/ui/minimap_widget.hpp> #include <noggit/ui/minimap_widget.hpp>
#include <noggit/ui/UidFixWindow.hpp> #include <noggit/ui/UidFixWindow.hpp>
#include <noggit/uid_storage.hpp> #include <noggit/uid_storage.hpp>
#include <noggit/ui/tools/MapCreationWizard/Ui/MapCreationWizard.hpp>
#include <noggit/ui/FontAwesome.hpp> #include <noggit/ui/FontAwesome.hpp>
#include <noggit/ui/FramelessWindow.hpp> #include <noggit/ui/FramelessWindow.hpp>
#include <noggit/ui/tools/UiCommon/StackedWidget.hpp> #include <noggit/ui/tools/UiCommon/StackedWidget.hpp>
@@ -20,6 +19,7 @@
#include <noggit/ui/windows/noggitWindow/components/BuildMapListComponent.hpp> #include <noggit/ui/windows/noggitWindow/components/BuildMapListComponent.hpp>
#include <noggit/application/Utils.hpp> #include <noggit/application/Utils.hpp>
#include <noggit/application/NoggitApplication.hpp> #include <noggit/application/NoggitApplication.hpp>
#include <noggit/ui/tools/MapCreationWizard/Ui/MapCreationWizard.hpp>
#include <BlizzardDatabase.h> #include <BlizzardDatabase.h>
#include <QtGui/QCloseEvent> #include <QtGui/QCloseEvent>
#include <QtWidgets/QHBoxLayout> #include <QtWidgets/QHBoxLayout>
@@ -141,6 +141,8 @@ namespace Noggit::Ui::Windows
_buildMapListComponent = std::make_unique<Component::BuildMapListComponent>(); _buildMapListComponent = std::make_unique<Component::BuildMapListComponent>();
_map_creation_wizard = new Noggit::Ui::Tools::MapCreationWizard::Ui::MapCreationWizard(_project, this);
buildMenu(); buildMenu();
} }
@@ -486,8 +488,6 @@ namespace Noggit::Ui::Windows
_right_side->addTab(minimap_holder, "Enter map"); _right_side->addTab(minimap_holder, "Enter map");
minimap_holder->setAccessibleName("main_menu_minimap_holder"); minimap_holder->setAccessibleName("main_menu_minimap_holder");
_map_creation_wizard = new Noggit::Ui::Tools::MapCreationWizard::Ui::MapCreationWizard(_project, this);
_map_wizard_connection = connect(_map_creation_wizard, _map_wizard_connection = connect(_map_creation_wizard,
&Noggit::Ui::Tools::MapCreationWizard::Ui::MapCreationWizard::map_dbc_updated, &Noggit::Ui::Tools::MapCreationWizard::Ui::MapCreationWizard::map_dbc_updated,
[this](int map_id = -1) [this](int map_id = -1)
@@ -560,6 +560,12 @@ namespace Noggit::Ui::Windows
_buildMapListComponent->buildMapList(this); _buildMapListComponent->buildMapList(this);
} }
World* NoggitWindow::getWorld()
{
return _map_creation_wizard->getWorld();
}
void NoggitWindow::promptExit(QCloseEvent* event) void NoggitWindow::promptExit(QCloseEvent* event)
{ {
emit exitPromptOpened(); emit exitPromptOpened();

8
src/noggit/ui/windows/noggitWindow/NoggitWindow.hpp
View File

@@ -5,7 +5,6 @@
#include <noggit/World.h> #include <noggit/World.h>
#include <noggit/MapView.h> #include <noggit/MapView.h>
#include <noggit/ui/UidFixWindow.hpp> #include <noggit/ui/UidFixWindow.hpp>
#include <noggit/ui/tools/MapCreationWizard/Ui/MapCreationWizard.hpp>
#include <noggit/application/Configuration/NoggitApplicationConfiguration.hpp> #include <noggit/application/Configuration/NoggitApplicationConfiguration.hpp>
#include <noggit/ui/windows/noggitWindow/components/BuildMapListComponent.hpp> #include <noggit/ui/windows/noggitWindow/components/BuildMapListComponent.hpp>
#include <noggit/project/ApplicationProject.h> #include <noggit/project/ApplicationProject.h>
@@ -18,6 +17,11 @@
class StackedWidget; class StackedWidget;
namespace Noggit::Ui::Tools::MapCreationWizard::Ui
{
class MapCreationWizard;
}
namespace Noggit::Ui namespace Noggit::Ui
{ {
class minimap_widget; class minimap_widget;
@@ -67,7 +71,7 @@ namespace Noggit::Ui::Windows
void handleEventMapListContextMenuPinMap(int mapId, std::string MapName); void handleEventMapListContextMenuPinMap(int mapId, std::string MapName);
void handleEventMapListContextMenuUnpinMap(int mapId); void handleEventMapListContextMenuUnpinMap(int mapId);
World* getWorld() { return _map_creation_wizard->getWorld(); }; World* getWorld();
void loadMap (int map_id); void loadMap (int map_id);