From a9929724f495d06ecf27a37c36f53f4e538b679b Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Fri, 12 Aug 2016 07:31:18 +0200 Subject: [PATCH] Fix variable name --- akregator/src/aboutdata.cpp | 2 +- akregator/src/akregator-version.h.cmake | 2 +- akregator/src/akregator_part.cpp | 2 +- blogilo/src/bilboblog.cpp | 3 ++- blogilo/src/blogilo-version.h.cmake | 2 +- blogilo/src/constants.h | 1 - blogilo/src/main.cpp | 3 ++- grantleeeditor/contactprintthemeeditor/main.cpp | 2 +- grantleeeditor/contactthemeeditor/main.cpp | 2 +- grantleeeditor/grantleeeditor-version.h.cmake | 2 +- grantleeeditor/headerthemeeditor/main.cpp | 2 +- kaddressbook/src/aboutdata.cpp | 2 +- kaddressbook/src/kaddressbook-version.h.cmake | 2 +- 13 files changed, 14 insertions(+), 13 deletions(-) diff --git a/akregator/src/aboutdata.cpp b/akregator/src/aboutdata.cpp index 2cf718e1fc..67af6ced82 100644 --- a/akregator/src/aboutdata.cpp +++ b/akregator/src/aboutdata.cpp @@ -33,7 +33,7 @@ using namespace Akregator; AboutData::AboutData() : KAboutData(QStringLiteral("akregator"), i18n("Akregator"), - QStringLiteral(KDEPIM_VERSION), + QStringLiteral(AKREGATOR_VERSION), i18n("A KDE Feed Reader"), KAboutLicense::GPL, i18n("Copyright © 2004–2016 Akregator authors"), diff --git a/akregator/src/akregator-version.h.cmake b/akregator/src/akregator-version.h.cmake index 7c0aa3f0ed..cf56d61d72 100644 --- a/akregator/src/akregator-version.h.cmake +++ b/akregator/src/akregator-version.h.cmake @@ -31,6 +31,6 @@ #define AKREGATOR_VERSION_H -#define KDEPIM_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" +#define AKREGATOR_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" #endif diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index 1841d2ce50..e758b09344 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -300,7 +300,7 @@ Part::Part(QWidget *parentWidget, QObject *parent, const QVariantList &) connect(m_autosaveTimer, &QTimer::timeout, this, &Part::slotSaveFeedList); m_autosaveTimer->start(5 * 60 * 1000); // 5 minutes - QString useragent = QStringLiteral("Akregator/%1; syndication").arg(QStringLiteral(KDEPIM_VERSION)); + QString useragent = QStringLiteral("Akregator/%1; syndication").arg(QStringLiteral(AKREGATOR_VERSION)); if (!Settings::customUserAgent().isEmpty()) { useragent = Settings::customUserAgent(); diff --git a/blogilo/src/bilboblog.cpp b/blogilo/src/bilboblog.cpp index d5c7c35407..23601e0378 100644 --- a/blogilo/src/bilboblog.cpp +++ b/blogilo/src/bilboblog.cpp @@ -22,6 +22,7 @@ */ #include "bilboblog.h" +#include "blogilo-version.h" #include "dbman.h" #include #ifdef HAVE_GAPIBLOGGER_SUPPORT @@ -107,7 +108,7 @@ KBlog::Blog *BilboBlog::blogBackend() #endif break; } - d->kblog->setUserAgent(QLatin1String(APPNAME), VERSION); + d->kblog->setUserAgent(QLatin1String(APPNAME), QStringLiteral(BLOGILO_VERSION)); d->kblog->setUsername(username()); d->kblog->setPassword(password()); d->kblog->setBlogId(blogid()); diff --git a/blogilo/src/blogilo-version.h.cmake b/blogilo/src/blogilo-version.h.cmake index 18c235beea..ede17d3be5 100644 --- a/blogilo/src/blogilo-version.h.cmake +++ b/blogilo/src/blogilo-version.h.cmake @@ -31,6 +31,6 @@ #define BLOGILO_VERSION_H -#define KDEPIM_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" +#define BLOGILO_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" #endif diff --git a/blogilo/src/constants.h b/blogilo/src/constants.h index 566cbd9159..3fefbfe56c 100644 --- a/blogilo/src/constants.h +++ b/blogilo/src/constants.h @@ -32,7 +32,6 @@ Constants. @author Golnaz Nilieh */ -static const QString VERSION = QStringLiteral("1.2"); static const char APPNAME[] = "Blogilo"; #define DATA_DIR QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/blogilo/") #define CONF_DB DATA_DIR+QLatin1String("/blogilo.db") diff --git a/blogilo/src/main.cpp b/blogilo/src/main.cpp index 43c27a59cf..2362c0fe16 100644 --- a/blogilo/src/main.cpp +++ b/blogilo/src/main.cpp @@ -23,6 +23,7 @@ #include "mainwindow.h" #include "global.h" +#include "blogilo-version.h" #include "constants.h" #include "blogilomigrateapplication.h" @@ -45,7 +46,7 @@ int main(int argc, char *argv[]) QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("blogilo"))); KLocalizedString::setApplicationDomain("blogilo"); - KAboutData about(QStringLiteral("blogilo"), i18n("Blogilo"), VERSION, i18n("A KDE Blogging Client"), + KAboutData about(QStringLiteral("blogilo"), i18n("Blogilo"), QStringLiteral(BLOGILO_VERSION), i18n("A KDE Blogging Client"), KAboutLicense::GPL_V2, i18n("Copyright © 2008–2016 Blogilo authors")); about.addAuthor(i18n("Mehrdad Momeny"), i18n("Core Developer"), QStringLiteral("mehrdad.momeny@gmail.com")); about.addAuthor(i18n("Golnaz Nilieh"), i18n("Core Developer"), QStringLiteral("g382nilieh@gmail.com")); diff --git a/grantleeeditor/contactprintthemeeditor/main.cpp b/grantleeeditor/contactprintthemeeditor/main.cpp index 8d9eda7814..b4b315e4a7 100644 --- a/grantleeeditor/contactprintthemeeditor/main.cpp +++ b/grantleeeditor/contactprintthemeeditor/main.cpp @@ -34,7 +34,7 @@ int main(int argc, char **argv) KLocalizedString::setApplicationDomain("contactprintthemeeditor"); KAboutData aboutData(QStringLiteral("contactprintthemeeditor"), i18n("Contact Print Theme Editor"), - QStringLiteral(KDEPIM_VERSION), + QStringLiteral(GRANTLEEEDITOR_VERSION), i18n("Contact Print Theme Editor"), KAboutLicense::GPL_V2, i18n("Copyright © 2015-2016 contactprintthemeeditor authors")); diff --git a/grantleeeditor/contactthemeeditor/main.cpp b/grantleeeditor/contactthemeeditor/main.cpp index 07307de4fa..1c0303cfa8 100644 --- a/grantleeeditor/contactthemeeditor/main.cpp +++ b/grantleeeditor/contactthemeeditor/main.cpp @@ -42,7 +42,7 @@ int main(int argc, char **argv) KLocalizedString::setApplicationDomain("contactthemeeditor"); KAboutData aboutData(QStringLiteral("contactthemeeditor"), i18n("Contact Theme Editor"), - QStringLiteral(KDEPIM_VERSION), + QStringLiteral(GRANTLEEEDITOR_VERSION), i18n("Contact Theme Editor"), KAboutLicense::GPL_V2, i18n("Copyright © 2013-2016 contactthemeeditor authors")); diff --git a/grantleeeditor/grantleeeditor-version.h.cmake b/grantleeeditor/grantleeeditor-version.h.cmake index 58ad55c393..09b55d3cbe 100644 --- a/grantleeeditor/grantleeeditor-version.h.cmake +++ b/grantleeeditor/grantleeeditor-version.h.cmake @@ -31,6 +31,6 @@ #define GRANTLEEEDITOR_VERSION_H -#define KDEPIM_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" +#define GRANTLEEEDITOR_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" #endif diff --git a/grantleeeditor/headerthemeeditor/main.cpp b/grantleeeditor/headerthemeeditor/main.cpp index 25a1639c34..e86089d443 100644 --- a/grantleeeditor/headerthemeeditor/main.cpp +++ b/grantleeeditor/headerthemeeditor/main.cpp @@ -41,7 +41,7 @@ int main(int argc, char **argv) KLocalizedString::setApplicationDomain("headerthemeeditor"); KAboutData aboutData(QStringLiteral("headerthemeeditor"), i18n("Header Theme Editor"), - QStringLiteral(KDEPIM_VERSION), + QStringLiteral(GRANTLEEEDITOR_VERSION), i18n("Messageviewer Header Theme Editor"), KAboutLicense::GPL_V2, i18n("Copyright © 2013-2016 headerthemeeditor authors")); diff --git a/kaddressbook/src/aboutdata.cpp b/kaddressbook/src/aboutdata.cpp index bffa7c342c..281f175345 100644 --- a/kaddressbook/src/aboutdata.cpp +++ b/kaddressbook/src/aboutdata.cpp @@ -27,7 +27,7 @@ AboutData::AboutData() : KAboutData(QStringLiteral("kaddressbook"), i18n("KAddressBook"), - QStringLiteral(KDEPIM_VERSION), + QStringLiteral(KADDRESSBOOK_VERSION), i18n("The KDE Address Book Application"), KAboutLicense::GPL_V2, i18n("Copyright © 2007–2016 KAddressBook authors")) diff --git a/kaddressbook/src/kaddressbook-version.h.cmake b/kaddressbook/src/kaddressbook-version.h.cmake index 80d2eb862b..b52420744c 100644 --- a/kaddressbook/src/kaddressbook-version.h.cmake +++ b/kaddressbook/src/kaddressbook-version.h.cmake @@ -31,6 +31,6 @@ #define KADDRESSBOOK_VERSION_H -#define KDEPIM_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" +#define KADDRESSBOOK_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" #endif -- 2.11.4.GIT