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

fix build on linux, ambigious name

Browse Source
This commit is contained in:
Skarn
2022-03-04 23:44:43 +03:00
parent c9b78b47cb
commit 9ec611c221
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/noggit/project/ApplicationProject.h
View File

@@ -88,7 +88,7 @@ namespace Noggit::Project
std::string ProjectPath;
std::string ProjectName;
std::string ClientPath;
ProjectVersion ProjectVersion;
ProjectVersion projectVersion;
std::vector<NoggitProjectPinnedMap> PinnedMaps;
std::vector<NoggitProjectBookmarkMap> Bookmarks;
std::shared_ptr<BlizzardDatabaseLib::BlizzardDatabase> ClientDatabase;
@@ -168,7 +168,7 @@ namespace Noggit::Project
auto project = NoggitProject();
project.ProjectName = projectName;
project.ProjectVersion = ClientVersionFactory::MapToEnumVersion(clientVersion);
project.projectVersion = ClientVersionFactory::MapToEnumVersion(clientVersion);
project.ClientPath = clientPath.generic_string();
auto projectWriter = ApplicationProjectWriter();
@@ -189,7 +189,7 @@ namespace Noggit::Project
"DBFilesClient/LiquidType.dbc",
};
if (project.ProjectVersion == ProjectVersion::WOTLK)
if (project.projectVersion == ProjectVersion::WOTLK)
{
auto clientData = BlizzardArchive::ClientData(clientPath.generic_string(), BlizzardArchive::ClientVersion::WOTLK,
BlizzardArchive::Locale::AUTO, workspaceDirectory.generic_string());
@@ -230,7 +230,7 @@ namespace Noggit::Project
//"DBFilesClient/LiquidType.db2",
};
if (project.ProjectVersion == ProjectVersion::SL)
if (project.projectVersion == ProjectVersion::SL)
{
auto clientData = BlizzardArchive::ClientData(clientPath.generic_string(), BlizzardArchive::ClientVersion::SL,
BlizzardArchive::Locale::enUS, std::string(""));
@@ -270,14 +270,14 @@ namespace Noggit::Project
auto clientBuild = BlizzardDatabaseLib::Structures::Build("3.3.5.12340");
auto clientArchiveVersion = BlizzardArchive::ClientVersion::WOTLK;
auto clientArchiveLocale = BlizzardArchive::Locale::AUTO;
if (project->ProjectVersion == ProjectVersion::SL)
if (project->projectVersion == ProjectVersion::SL)
{
clientArchiveVersion = BlizzardArchive::ClientVersion::SL;
clientBuild = BlizzardDatabaseLib::Structures::Build("9.1.0.39584");
clientArchiveLocale = BlizzardArchive::Locale::enUS;
}
if (project->ProjectVersion == ProjectVersion::WOTLK)
if (project->projectVersion == ProjectVersion::WOTLK)
{
clientArchiveVersion = BlizzardArchive::ClientVersion::WOTLK;
clientBuild = BlizzardDatabaseLib::Structures::Build("3.3.5.12340");

2
src/noggit/project/ApplicationProjectReader.cpp
View File

@@ -90,7 +90,7 @@ namespace Noggit::Project
clientVersionEnum = Noggit::Project::ProjectVersion::WOTLK;
}
project.ProjectVersion = clientVersionEnum;
project.projectVersion = clientVersionEnum;
}
}
}

2
src/noggit/project/ApplicationProjectWriter.cpp
View File

@@ -23,7 +23,7 @@ namespace Noggit::Project
auto clientConfiguration = QJsonObject();
clientConfiguration.insert("ClientPath", project->ClientPath.c_str());
clientConfiguration.insert("ClientVersion", ClientVersionFactory::MapToStringVersion(project->ProjectVersion).c_str());
clientConfiguration.insert("ClientVersion", ClientVersionFactory::MapToStringVersion(project->projectVersion).c_str());
auto pinnedMaps = QJsonArray();
for(auto const &pinnedMap : project->PinnedMaps)

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

@@ -62,7 +62,7 @@ namespace Noggit::Ui::Windows
setWindowTitle (QString::fromStdString (title.str()));
setWindowIcon (QIcon (":/icon"));
if(project->ProjectVersion == Project::ProjectVersion::WOTLK)
if(project->projectVersion == Project::ProjectVersion::WOTLK)
{
OpenDBs(project->ClientData);
}

2
src/noggit/ui/windows/projectSelection/components/ExistingProjectEnumerationComponent.hpp
View File

@@ -27,7 +27,7 @@ namespace Noggit::Ui::Component
continue;
auto projectData = Noggit::Ui::Widget::ProjectListItemData();
projectData.ProjectVersion = project->ProjectVersion;
projectData.ProjectVersion = project->projectVersion;
projectData.ProjectDirectory = QString::fromStdString(dirEntry.path().generic_string());
projectData.ProjectName = QString::fromStdString(project->ProjectName);
projectData.ProjectLastEdited = QDateTime::currentDateTime().date().toString();