More consistent formatters

sources/awesomewidgets/abstractextitem.cpp

@@ -22,8 +22,8 @@
 #include <QStandardPaths>
 #include <QTime>
 
-#include "awdebug.h"
 #include "abstractextitemaggregator.h"
+#include "awdebug.h"
 
 
 AbstractExtItem::AbstractExtItem(QWidget *parent, const QString filePath)
@@ -44,6 +44,20 @@ AbstractExtItem::~AbstractExtItem()
 }
 
 
+void AbstractExtItem::bumpApi(const int _newVer)
+{
+    qCDebug(LOG_LIB) << "Bump API using new version" << _newVer;
+
+    // update for current API
+    if ((apiVersion() > 0) && (apiVersion() < _newVer)) {
+        qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to"
+                           << _newVer;
+        setApiVersion(_newVer);
+        writeConfiguration();
+    }
+}
+
+
 void AbstractExtItem::copyDefaults(AbstractExtItem *_other) const
 {
     _other->setActive(m_active);

sources/awesomewidgets/abstractextitem.h

@@ -38,6 +38,7 @@ public:
     explicit AbstractExtItem(QWidget *parent = nullptr,
                              const QString filePath = QString());
     virtual ~AbstractExtItem();
+    virtual void bumpApi(const int _newVer);
     virtual AbstractExtItem *copy(const QString _fileName, const int _number)
         = 0;
     virtual void copyDefaults(AbstractExtItem *_other) const;

sources/awesomewidgets/awdatetimeformatter.cpp

@@ -108,6 +108,8 @@ void AWDateTimeFormatter::readConfiguration()
     settings.beginGroup(QString("Desktop Entry"));
     setFormat(settings.value(QString("X-AW-Format"), m_format).toString());
     settings.endGroup();
+
+    bumpApi(AWEFAPI);
 }
 
 

sources/awesomewidgets/awfloatformatter.cpp

@@ -207,6 +207,8 @@ void AWFloatFormatter::readConfiguration()
         settings.value(QString("X-AW-Precision"), m_precision).toInt());
     setSummand(settings.value(QString("X-AW-Summand"), m_summand).toDouble());
     settings.endGroup();
+
+    bumpApi(AWEFAPI);
 }
 
 

sources/awesomewidgets/awscriptformatter.cpp

@@ -165,6 +165,9 @@ void AWScriptFormatter::readConfiguration()
         settings.value(QString("X-AW-HasReturn"), m_hasReturn).toBool());
     settings.endGroup();
 
+    bumpApi(AWEFAPI);
+
+    // init JS code
     initProgram();
 }
 

sources/awesomewidgets/extquotes.cpp

@@ -125,6 +125,8 @@ void ExtQuotes::readConfiguration()
         writeConfiguration();
     }
 
+    bumpApi(AWEQAPI);
+
     // init query
     m_url = QUrl(YAHOO_QUOTES_URL);
     QUrlQuery params;

sources/awesomewidgets/extscript.cpp

@@ -227,13 +227,7 @@ void ExtScript::readConfiguration()
                    .split(QChar(','), QString::SkipEmptyParts));
     settings.endGroup();
 
-    // update for current API
-    if ((apiVersion() > 0) && (apiVersion() < AWESAPI)) {
-        qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to"
-                           << AWESAPI;
-        setApiVersion(AWESAPI);
-        writeConfiguration();
-    }
+    bumpApi(AWESAPI);
 }
 
 

sources/awesomewidgets/extupgrade.cpp

@@ -135,13 +135,7 @@ void ExtUpgrade::readConfiguration()
     setFilter(settings.value(QString("X-AW-Filter"), m_filter).toString());
     settings.endGroup();
 
-    // update for current API
-    if ((apiVersion() > 0) && (apiVersion() < AWEUAPI)) {
-        qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to"
-                           << AWEUAPI;
-        setApiVersion(AWEUAPI);
-        writeConfiguration();
-    }
+    bumpApi(AWEUAPI);
 }
 
 

sources/awesomewidgets/extweather.cpp

@@ -183,6 +183,8 @@ void ExtWeather::readConfiguration()
         writeConfiguration();
     }
 
+    bumpApi(AWEWAPI);
+
     // init query
     m_url = QUrl(YAHOO_WEATHER_URL);
     QUrlQuery params;

sources/awesomewidgets/graphicalitem.cpp

@@ -431,13 +431,7 @@ void GraphicalItem::readConfiguration()
     }
     settings.endGroup();
 
-    // update for current API
-    if ((apiVersion() > 0) && (apiVersion() < AWGIAPI)) {
-        qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to"
-                           << AWGIAPI;
-        setApiVersion(AWGIAPI);
-        writeConfiguration();
-    }
+    bumpApi(AWGIAPI);
 }