Addons: remove defaultOptions

Author: u-235

addons/src/bhc/addons-bhc.cpp

@@ -23,7 +23,6 @@
 
 #include "addons-bhc.h"
 #include "bhcdialog.h"  // for BHCDialog
-#include "bhcoptions.h" // for BHCOptions
 
 
 void Addons::doBhc(QWidget* parent, QSettings* settings)
@@ -35,7 +34,7 @@ void Addons::doBhc(QWidget* parent, QSettings* settings)
 	if (!dlg) {
 		dlg = new BHCDialog(parent, settings);
 		dlg->setObjectName(key);
-		dlg->loadSettings(BHCOptions());
+		dlg->loadSettings();
 	}
 
 	dlg->show();

addons/src/bhc/bhcdialog.cpp

@@ -505,7 +505,7 @@ BHCOptions BHCDialog::options()
 	return options;
 }
 
-void BHCDialog::loadSettings(const BHCOptions& defaultOptions)
+void BHCDialog::loadSettings()
 {
 	if (mSettings.isNull()) {
 		return;
@@ -520,7 +520,7 @@ void BHCDialog::loadSettings(const BHCOptions& defaultOptions)
 	}
 
 	BHCOptions opt;
-	opt.load(mSettings, defaultOptions);
+	opt.load(mSettings);
 
 	mSettings->endGroup();
 

addons/src/bhc/bhcdialog.h

@@ -50,7 +50,7 @@ class BHCDialog : public QDialog, private Ui::BHCDialog
 	void setOptions(const BHCOptions& options);
 	BHCOptions options();
 
-	void loadSettings(const BHCOptions& defaultOptions);
+	void loadSettings();
 	void saveSettings(bool saveOptions = true);
 
 protected:

addons/src/bhc/bhcoptions.cpp

@@ -37,22 +37,22 @@ BHCOptions::BHCOptions() :
 {
 }
 
-void BHCOptions::load(QSettings* settings, const BHCOptions& defaultOptions)
+void BHCOptions::load(QSettings* settings)
 {
 	settings->beginGroup(CFG_SECTION_GREEN);
-	green.load(settings, defaultOptions.green);
+	green.load(settings);
 	settings->endGroup();
 
 	settings->beginGroup(CFG_SECTION_BLUE);
-	blue.load(settings, defaultOptions.blue);
+	blue.load(settings);
 	settings->endGroup();
 
 	settings->beginGroup(CFG_SECTION_RED);
-	red.load(settings, defaultOptions.red);
+	red.load(settings);
 	settings->endGroup();
 
 	settings->beginGroup(CFG_SECTION_YELLOW);
-	yellow.load(settings, defaultOptions.yellow);
+	yellow.load(settings);
 	settings->endGroup();
 }
 

addons/src/bhc/bhcoptions.h

@@ -33,7 +33,7 @@ struct BHCOptions {
 	BHCTabOptions   red;
 	BHCTabOptions   yellow;
 
-	void load(QSettings* settings, const BHCOptions& defaultOptions);
+	void load(QSettings* settings);
 	void save(QSettings* settings);
 };
 

addons/src/bhc/bhctaboptions.cpp

@@ -49,18 +49,18 @@ BHCTabOptions::BHCTabOptions() :
 {
 }
 
-void BHCTabOptions::load(QSettings* settings, const BHCTabOptions& defaultOptions)
+void BHCTabOptions::load(QSettings* settings)
 {
-	x = settings->value(CFG_KEY_X, defaultOptions.x).toDouble();
-	y = settings->value(CFG_KEY_Y, defaultOptions.y).toDouble();
-	diam = settings->value(CFG_KEY_DIAM, defaultOptions.diam).toDouble();
-	start = settings->value(CFG_KEY_START, defaultOptions.start).toDouble();
-	step = settings->value(CFG_KEY_STEP, defaultOptions.step).toDouble();
-	count = settings->value(CFG_KEY_COUNT, defaultOptions.count).toInt();
-	rotate = settings->value(CFG_KEY_ROTATE, defaultOptions.rotate).toInt();
-	mirrorX = settings->value(CFG_KEY_MIRRORX, defaultOptions.mirrorX).toBool();
-	mirrorY = settings->value(CFG_KEY_MIRRORY, defaultOptions.mirrorY).toBool();
-	common = settings->value(CFG_KEY_COMMON, defaultOptions.common).toBool();
+	x = settings->value(CFG_KEY_X, x).toDouble();
+	y = settings->value(CFG_KEY_Y, y).toDouble();
+	diam = settings->value(CFG_KEY_DIAM, diam).toDouble();
+	start = settings->value(CFG_KEY_START, start).toDouble();
+	step = settings->value(CFG_KEY_STEP, step).toDouble();
+	count = settings->value(CFG_KEY_COUNT, count).toInt();
+	rotate = settings->value(CFG_KEY_ROTATE, rotate).toInt();
+	mirrorX = settings->value(CFG_KEY_MIRRORX, mirrorX).toBool();
+	mirrorY = settings->value(CFG_KEY_MIRRORY, mirrorY).toBool();
+	common = settings->value(CFG_KEY_COMMON, common).toBool();
 }
 
 void BHCTabOptions::save(QSettings* settings)

addons/src/bhc/bhctaboptions.h

@@ -37,7 +37,7 @@ struct BHCTabOptions {
 	bool    mirrorY;
 	bool    common;
 
-	void load(QSettings* settings, const BHCTabOptions& defaultOptions);
+	void load(QSettings* settings);
 	void save(QSettings* settings);
 };
 

addons/src/chamfer/addons-chamfer.cpp

@@ -23,7 +23,6 @@
 
 #include "addons-chamfer.h"
 #include "chamferdialog.h"  // for ChamferDialog
-#include "chamferoptions.h" // for ChamferOptions
 
 
 void Addons::doChamfer(QWidget* parent, QSettings* settings)
@@ -35,7 +34,7 @@ void Addons::doChamfer(QWidget* parent, QSettings* settings)
 	if (!dlg) {
 		dlg = new ChamferDialog(parent, settings);
 		dlg->setObjectName(key);
-		dlg->loadSettings(ChamferOptions());
+		dlg->loadSettings();
 	}
 
 	dlg->show();

addons/src/chamfer/chamferdialog.cpp

@@ -324,7 +324,7 @@ ChamferOptions ChamferDialog::options()
 	return options;
 }
 
-void ChamferDialog::loadSettings(const ChamferOptions& defaultOptions)
+void ChamferDialog::loadSettings()
 {
 	if (mSettings.isNull()) {
 		return;
@@ -339,7 +339,7 @@ void ChamferDialog::loadSettings(const ChamferOptions& defaultOptions)
 	}
 
 	ChamferOptions opt;
-	opt.load(mSettings, defaultOptions);
+	opt.load(mSettings);
 
 	mSettings->endGroup();
 

addons/src/chamfer/chamferdialog.h

@@ -48,7 +48,7 @@ class ChamferDialog : public QDialog, private Ui::ChamferDialog
 	void setOptions(const ChamferOptions& options);
 	ChamferOptions options();
 
-	void loadSettings(const ChamferOptions& defaultOptions);
+	void loadSettings();
 	void saveSettings(bool saveOptions = true);
 
 protected slots: