From e71da9bdfb8c807823f711a6a9740b2adb82a257 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Thu, 19 May 2016 16:28:19 +0300 Subject: [PATCH] use overloaded constructors to create tests --- sources/awesomewidgets/abstractextitem.h | 2 +- sources/awesomewidgets/awabstractformatter.h | 2 +- .../awesomewidgets/awdatetimeformatter.cpp | 16 ++----------- sources/awesomewidgets/awdatetimeformatter.h | 3 +-- sources/awesomewidgets/awfloatformatter.cpp | 24 ++----------------- sources/awesomewidgets/awfloatformatter.h | 6 +---- sources/awesomewidgets/awnoformatter.cpp | 14 ++--------- sources/awesomewidgets/awnoformatter.h | 3 +-- sources/awesomewidgets/awscriptformatter.cpp | 20 ++-------------- sources/awesomewidgets/awscriptformatter.h | 4 +--- sources/awesomewidgets/extquotes.cpp | 3 ++- sources/awesomewidgets/extquotes.h | 2 +- sources/awesomewidgets/extscript.cpp | 3 ++- sources/awesomewidgets/extscript.h | 2 +- sources/awesomewidgets/extupgrade.cpp | 3 ++- sources/awesomewidgets/extupgrade.h | 2 +- sources/awesomewidgets/extweather.cpp | 3 ++- sources/awesomewidgets/extweather.h | 2 +- sources/awesomewidgets/graphicalitem.cpp | 3 ++- sources/awesomewidgets/graphicalitem.h | 2 +- 20 files changed, 29 insertions(+), 90 deletions(-) diff --git a/sources/awesomewidgets/abstractextitem.h b/sources/awesomewidgets/abstractextitem.h index 4a19168..7c27fae 100644 --- a/sources/awesomewidgets/abstractextitem.h +++ b/sources/awesomewidgets/abstractextitem.h @@ -35,7 +35,7 @@ class AbstractExtItem : public QDialog Q_PROPERTY(QString uniq READ uniq) public: - explicit AbstractExtItem(QWidget *parent = nullptr, + explicit AbstractExtItem(QWidget *parent, const QString filePath = QString()); virtual ~AbstractExtItem(); virtual void bumpApi(const int _newVer); diff --git a/sources/awesomewidgets/awabstractformatter.h b/sources/awesomewidgets/awabstractformatter.h index b91bef6..3fcd8e4 100644 --- a/sources/awesomewidgets/awabstractformatter.h +++ b/sources/awesomewidgets/awabstractformatter.h @@ -27,7 +27,7 @@ class AWAbstractFormatter : public AbstractExtItem Q_PROPERTY(QString type READ type WRITE setType) public: - explicit AWAbstractFormatter(QWidget *parent = nullptr, + explicit AWAbstractFormatter(QWidget *parent, const QString filePath = QString()); virtual ~AWAbstractFormatter(); virtual QString convert(const QVariant &_value) const = 0; diff --git a/sources/awesomewidgets/awdatetimeformatter.cpp b/sources/awesomewidgets/awdatetimeformatter.cpp index fbc220c..0a99eb2 100644 --- a/sources/awesomewidgets/awdatetimeformatter.cpp +++ b/sources/awesomewidgets/awdatetimeformatter.cpp @@ -35,20 +35,8 @@ AWDateTimeFormatter::AWDateTimeFormatter(QWidget *parent, { qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; - readConfiguration(); - ui->setupUi(this); - translate(); -} - - -AWDateTimeFormatter::AWDateTimeFormatter(const QString format, QWidget *parent) - : AWAbstractFormatter(parent) - , ui(new Ui::AWDateTimeFormatter) -{ - qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; - - setFormat(format); - + if (!filePath.isEmpty()) + readConfiguration(); ui->setupUi(this); translate(); } diff --git a/sources/awesomewidgets/awdatetimeformatter.h b/sources/awesomewidgets/awdatetimeformatter.h index d908a73..0605fcf 100644 --- a/sources/awesomewidgets/awdatetimeformatter.h +++ b/sources/awesomewidgets/awdatetimeformatter.h @@ -32,8 +32,7 @@ class AWDateTimeFormatter : public AWAbstractFormatter Q_PROPERTY(QString format READ format WRITE setFormat) public: - explicit AWDateTimeFormatter(QWidget *parent, const QString filePath); - explicit AWDateTimeFormatter(const QString format, QWidget *parent); + explicit AWDateTimeFormatter(QWidget *parent, const QString filePath = QString()); virtual ~AWDateTimeFormatter(); QString convert(const QVariant &_value) const; AWDateTimeFormatter *copy(const QString _fileName, const int _number); diff --git a/sources/awesomewidgets/awfloatformatter.cpp b/sources/awesomewidgets/awfloatformatter.cpp index af69075..088bd51 100644 --- a/sources/awesomewidgets/awfloatformatter.cpp +++ b/sources/awesomewidgets/awfloatformatter.cpp @@ -33,28 +33,8 @@ AWFloatFormatter::AWFloatFormatter(QWidget *parent, const QString filePath) { qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; - readConfiguration(); - ui->setupUi(this); - translate(); -} - - -AWFloatFormatter::AWFloatFormatter(const int count, const QChar fillChar, - const char format, const double multiplier, - const int precision, const double summand, - QWidget *parent) - : AWAbstractFormatter(parent) - , ui(new Ui::AWFloatFormatter) -{ - qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; - - setCount(count); - setFillChar(fillChar); - setFormat(format); - setMultiplier(multiplier); - setPrecision(precision); - setSummand(summand); - + if (!filePath.isEmpty()) + readConfiguration(); ui->setupUi(this); translate(); } diff --git a/sources/awesomewidgets/awfloatformatter.h b/sources/awesomewidgets/awfloatformatter.h index 1087214..310cae9 100644 --- a/sources/awesomewidgets/awfloatformatter.h +++ b/sources/awesomewidgets/awfloatformatter.h @@ -37,11 +37,7 @@ class AWFloatFormatter : public AWAbstractFormatter Q_PROPERTY(double summand READ summand WRITE setSummand) public: - explicit AWFloatFormatter(QWidget *parent, const QString filePath); - explicit AWFloatFormatter(const int count, const QChar fillChar, - const char format, const double multiplier, - const int precision, const double summand, - QWidget *parent); + explicit AWFloatFormatter(QWidget *parent, const QString filePath = QString()); virtual ~AWFloatFormatter(); QString convert(const QVariant &_value) const; AWFloatFormatter *copy(const QString _fileName, const int _number); diff --git a/sources/awesomewidgets/awnoformatter.cpp b/sources/awesomewidgets/awnoformatter.cpp index dd801d4..1a6aa81 100644 --- a/sources/awesomewidgets/awnoformatter.cpp +++ b/sources/awesomewidgets/awnoformatter.cpp @@ -30,18 +30,8 @@ AWNoFormatter::AWNoFormatter(QWidget *parent, const QString filePath) { qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; - readConfiguration(); - ui->setupUi(this); - translate(); -} - - -AWNoFormatter::AWNoFormatter(QWidget *parent) - : AWAbstractFormatter(parent) - , ui(new Ui::AWNoFormatter) -{ - qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; - + if (!filePath.isEmpty()) + readConfiguration(); ui->setupUi(this); translate(); } diff --git a/sources/awesomewidgets/awnoformatter.h b/sources/awesomewidgets/awnoformatter.h index d8efab5..de79817 100644 --- a/sources/awesomewidgets/awnoformatter.h +++ b/sources/awesomewidgets/awnoformatter.h @@ -31,8 +31,7 @@ class AWNoFormatter : public AWAbstractFormatter Q_OBJECT public: - explicit AWNoFormatter(QWidget *parent, const QString filePath); - explicit AWNoFormatter(QWidget *parent); + explicit AWNoFormatter(QWidget *parent, const QString filePath = QString()); virtual ~AWNoFormatter(); QString convert(const QVariant &_value) const; AWNoFormatter *copy(const QString _fileName, const int _number); diff --git a/sources/awesomewidgets/awscriptformatter.cpp b/sources/awesomewidgets/awscriptformatter.cpp index f01cbc6..89c404d 100644 --- a/sources/awesomewidgets/awscriptformatter.cpp +++ b/sources/awesomewidgets/awscriptformatter.cpp @@ -34,24 +34,8 @@ AWScriptFormatter::AWScriptFormatter(QWidget *parent, const QString filePath) { qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; - readConfiguration(); - ui->setupUi(this); - translate(); -} - - -AWScriptFormatter::AWScriptFormatter(const bool appendCode, const QString code, - const bool hasReturn, QWidget *parent) - : AWAbstractFormatter(parent) - , ui(new Ui::AWScriptFormatter) -{ - qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; - - setAppendCode(appendCode); - setCode(code); - setHasReturn(hasReturn); - initProgram(); - + if (!filePath.isEmpty()) + readConfiguration(); ui->setupUi(this); translate(); } diff --git a/sources/awesomewidgets/awscriptformatter.h b/sources/awesomewidgets/awscriptformatter.h index 3af8ade..f950990 100644 --- a/sources/awesomewidgets/awscriptformatter.h +++ b/sources/awesomewidgets/awscriptformatter.h @@ -35,9 +35,7 @@ class AWScriptFormatter : public AWAbstractFormatter Q_PROPERTY(QString program READ program) public: - explicit AWScriptFormatter(QWidget *parent, const QString filePath); - explicit AWScriptFormatter(const bool appendCode, const QString code, - const bool hasReturn, QWidget *parent); + explicit AWScriptFormatter(QWidget *parent, const QString filePath = QString()); virtual ~AWScriptFormatter(); QString convert(const QVariant &_value) const; AWScriptFormatter *copy(const QString _fileName, const int _number); diff --git a/sources/awesomewidgets/extquotes.cpp b/sources/awesomewidgets/extquotes.cpp index 785f0f4..8cab854 100644 --- a/sources/awesomewidgets/extquotes.cpp +++ b/sources/awesomewidgets/extquotes.cpp @@ -39,7 +39,8 @@ ExtQuotes::ExtQuotes(QWidget *parent, const QString filePath) { qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; - readConfiguration(); + if (!filePath.isEmpty()) + readConfiguration(); ui->setupUi(this); translate(); diff --git a/sources/awesomewidgets/extquotes.h b/sources/awesomewidgets/extquotes.h index 38e0057..3001bad 100644 --- a/sources/awesomewidgets/extquotes.h +++ b/sources/awesomewidgets/extquotes.h @@ -38,7 +38,7 @@ class ExtQuotes : public AbstractExtItem Q_PROPERTY(QString ticker READ ticker WRITE setTicker) public: - explicit ExtQuotes(QWidget *parent = nullptr, + explicit ExtQuotes(QWidget *parent, const QString filePath = QString()); virtual ~ExtQuotes(); ExtQuotes *copy(const QString _fileName, const int _number); diff --git a/sources/awesomewidgets/extscript.cpp b/sources/awesomewidgets/extscript.cpp index 683e9d1..39a3045 100644 --- a/sources/awesomewidgets/extscript.cpp +++ b/sources/awesomewidgets/extscript.cpp @@ -36,7 +36,8 @@ ExtScript::ExtScript(QWidget *parent, const QString filePath) { qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; - readConfiguration(); + if (!filePath.isEmpty()) + readConfiguration(); readJsonFilters(); ui->setupUi(this); translate(); diff --git a/sources/awesomewidgets/extscript.h b/sources/awesomewidgets/extscript.h index e4e8a45..283289b 100644 --- a/sources/awesomewidgets/extscript.h +++ b/sources/awesomewidgets/extscript.h @@ -39,7 +39,7 @@ class ExtScript : public AbstractExtItem public: enum class Redirect { stdout2stderr, nothing, stderr2stdout, swap }; - explicit ExtScript(QWidget *parent = nullptr, + explicit ExtScript(QWidget *parent, const QString filePath = QString()); virtual ~ExtScript(); ExtScript *copy(const QString _fileName, const int _number); diff --git a/sources/awesomewidgets/extupgrade.cpp b/sources/awesomewidgets/extupgrade.cpp index e996dbd..41bb731 100644 --- a/sources/awesomewidgets/extupgrade.cpp +++ b/sources/awesomewidgets/extupgrade.cpp @@ -34,7 +34,8 @@ ExtUpgrade::ExtUpgrade(QWidget *parent, const QString filePath) { qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; - readConfiguration(); + if (!filePath.isEmpty()) + readConfiguration(); ui->setupUi(this); translate(); diff --git a/sources/awesomewidgets/extupgrade.h b/sources/awesomewidgets/extupgrade.h index ad981a9..9a5a63b 100644 --- a/sources/awesomewidgets/extupgrade.h +++ b/sources/awesomewidgets/extupgrade.h @@ -36,7 +36,7 @@ class ExtUpgrade : public AbstractExtItem Q_PROPERTY(int null READ null WRITE setNull) public: - explicit ExtUpgrade(QWidget *parent = nullptr, + explicit ExtUpgrade(QWidget *parent, const QString filePath = QString()); virtual ~ExtUpgrade(); ExtUpgrade *copy(const QString _fileName, const int _number); diff --git a/sources/awesomewidgets/extweather.cpp b/sources/awesomewidgets/extweather.cpp index 0f82ba5..6fda40b 100644 --- a/sources/awesomewidgets/extweather.cpp +++ b/sources/awesomewidgets/extweather.cpp @@ -40,7 +40,8 @@ ExtWeather::ExtWeather(QWidget *parent, const QString filePath) { qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; - readConfiguration(); + if (!filePath.isEmpty()) + readConfiguration(); readJsonMap(); ui->setupUi(this); translate(); diff --git a/sources/awesomewidgets/extweather.h b/sources/awesomewidgets/extweather.h index 0f4d87d..825ae41 100644 --- a/sources/awesomewidgets/extweather.h +++ b/sources/awesomewidgets/extweather.h @@ -42,7 +42,7 @@ class ExtWeather : public AbstractExtItem Q_PROPERTY(int ts READ ts WRITE setTs) public: - explicit ExtWeather(QWidget *parent = nullptr, + explicit ExtWeather(QWidget *parent, const QString filePath = QString()); virtual ~ExtWeather(); ExtWeather *copy(const QString _fileName, const int _number); diff --git a/sources/awesomewidgets/graphicalitem.cpp b/sources/awesomewidgets/graphicalitem.cpp index 886e495..52354ef 100644 --- a/sources/awesomewidgets/graphicalitem.cpp +++ b/sources/awesomewidgets/graphicalitem.cpp @@ -38,7 +38,8 @@ GraphicalItem::GraphicalItem(QWidget *parent, const QString filePath) { qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; - readConfiguration(); + if (!filePath.isEmpty()) + readConfiguration(); ui->setupUi(this); translate(); diff --git a/sources/awesomewidgets/graphicalitem.h b/sources/awesomewidgets/graphicalitem.h index 89afaba..de512c9 100644 --- a/sources/awesomewidgets/graphicalitem.h +++ b/sources/awesomewidgets/graphicalitem.h @@ -52,7 +52,7 @@ public: enum class Direction { LeftToRight = 0, RightToLeft = 1 }; enum class Type { Horizontal, Vertical, Circle, Graph, Bars }; - explicit GraphicalItem(QWidget *parent = nullptr, + explicit GraphicalItem(QWidget *parent, const QString filePath = QString()); virtual ~GraphicalItem(); GraphicalItem *copy(const QString _fileName, const int _number);