games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

ExtractionOptions extractionOptions is no longer global in mainwindow.h

Browse Source
This commit is contained in:
krs
2022-11-27 19:14:14 +02:00
parent 7aa30a5d7a
commit 82c1bb5c93
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mapeditor/mainwindow.cpp
View File

@@ -38,12 +38,9 @@
#include "mapsettings.h" #include "mapsettings.h"
#include "playersettings.h" #include "playersettings.h"
#include "validator.h" #include "validator.h"
#include "resourceExtractor/ResourceConverter.h"
static CBasicLogConfigurator * logConfig; static CBasicLogConfigurator * logConfig;
ExtractionOptions extractionOptions;
QJsonValue jsonFromPixmap(const QPixmap &p) QJsonValue jsonFromPixmap(const QPixmap &p)
{ {
QBuffer buffer; QBuffer buffer;
@@ -91,7 +88,7 @@ void MainWindow::saveUserSettings()
s.setValue(mainWindowPositionSetting, pos()); s.setValue(mainWindowPositionSetting, pos());
} }
void MainWindow::parseCommandLine() void MainWindow::parseCommandLine(ExtractionOptions & extractionOptions)
{ {
QCommandLineParser parser; QCommandLineParser parser;
parser.addHelpOption(); parser.addHelpOption();
@@ -131,7 +128,8 @@ MainWindow::MainWindow(QWidget* parent) :
// This is important on Mac for relative paths to work inside DMG. // This is important on Mac for relative paths to work inside DMG.
QDir::setCurrent(QApplication::applicationDirPath()); QDir::setCurrent(QApplication::applicationDirPath());
parseCommandLine(); ExtractionOptions extractionOptions;
parseCommandLine(extractionOptions);
//configure logging //configure logging
const boost::filesystem::path logPath = VCMIDirs::get().userLogsPath() / "VCMI_Editor_log.txt"; const boost::filesystem::path logPath = VCMIDirs::get().userLogsPath() / "VCMI_Editor_log.txt";

4
mapeditor/mainwindow.h
View File

@@ -5,7 +5,7 @@
#include <QStandardItemModel> #include <QStandardItemModel>
#include "mapcontroller.h" #include "mapcontroller.h"
#include "../lib/Terrain.h" #include "../lib/Terrain.h"
#include "resourceExtractor/ResourceConverter.h"
class CMap; class CMap;
class ObjectBrowser; class ObjectBrowser;
@@ -129,7 +129,7 @@ private:
void loadUserSettings(); void loadUserSettings();
void saveUserSettings(); void saveUserSettings();
void parseCommandLine(); void parseCommandLine(ExtractionOptions & extractionOptions);
private: private:
Ui::MainWindow * ui; Ui::MainWindow * ui;