From d692dcc3427bb2e72b03f76ffc6d3a44fab7a63e Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Fri, 12 Aug 2016 15:45:44 +0200 Subject: [PATCH] Fix variable --- knotes/knotes-version.h.cmake | 2 +- knotes/notesagent/notesagentsettingsdialog.cpp | 2 +- knotes/src/apps/main.cpp | 2 +- knotes/src/kontactplugin/knotes_plugin.cpp | 2 +- kontact/src/kontact-version.h.cmake | 2 +- kontact/src/main.cpp | 2 +- korganizer/korgac/korgacmain.cpp | 2 +- korganizer/korgac/mailclient.cpp | 2 +- korganizer/korganizer-version.h.cmake | 2 +- korganizer/src/aboutdata.cpp | 2 +- korganizer/src/koapp.cpp | 2 +- ktnef/src/ktnef-version.h.cmake | 2 +- ktnef/src/main.cpp | 2 +- mboximporter/src/main.cpp | 2 +- mboximporter/src/mboximporter-version.h.cmake | 2 +- pimsettingexporter/console/main.cpp | 2 +- pimsettingexporter/gui/pimsettingcommandlineoption.cpp | 2 +- pimsettingexporter/pimsettingexporter-version.h.cmake | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/knotes/knotes-version.h.cmake b/knotes/knotes-version.h.cmake index e55442d6fd..3ec7584fe7 100644 --- a/knotes/knotes-version.h.cmake +++ b/knotes/knotes-version.h.cmake @@ -31,6 +31,6 @@ #define KNOTES_VERSION_H -#define KDEPIM_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" +#define KNOTES_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" #endif diff --git a/knotes/notesagent/notesagentsettingsdialog.cpp b/knotes/notesagent/notesagentsettingsdialog.cpp index c0ccbd593b..a2e7e908bf 100644 --- a/knotes/notesagent/notesagentsettingsdialog.cpp +++ b/knotes/notesagent/notesagentsettingsdialog.cpp @@ -74,7 +74,7 @@ NotesAgentSettingsDialog::NotesAgentSettingsDialog(QWidget *parent) KAboutData aboutData = KAboutData( QStringLiteral("notesagent"), i18n("Notes Agent"), - QStringLiteral(KDEPIM_VERSION), + QStringLiteral(KNOTES_VERSION), i18n("Notes Agent."), KAboutLicense::GPL_V2, i18n("Copyright (C) 2013-2016 Laurent Montel")); diff --git a/knotes/src/apps/main.cpp b/knotes/src/apps/main.cpp index 733aa19759..e5ac39ec41 100644 --- a/knotes/src/apps/main.cpp +++ b/knotes/src/apps/main.cpp @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) KAboutData aboutData(QStringLiteral("knotes"), i18n("KNotes"), - QStringLiteral(KDEPIM_VERSION), + QStringLiteral(KNOTES_VERSION), i18n("KDE Notes"), KAboutLicense::GPL, i18n("Copyright © 1997–2016 KNotes authors")); diff --git a/knotes/src/kontactplugin/knotes_plugin.cpp b/knotes/src/kontactplugin/knotes_plugin.cpp index bb0bba9f4a..20d38c0b20 100644 --- a/knotes/src/kontactplugin/knotes_plugin.cpp +++ b/knotes/src/kontactplugin/knotes_plugin.cpp @@ -101,7 +101,7 @@ const KAboutData KNotesPlugin::aboutData() { KAboutData aboutData = KAboutData(QStringLiteral("knotes"), xi18nc("@title", "KNotes"), - QStringLiteral(KDEPIM_VERSION), + QStringLiteral(KNOTES_VERSION), xi18nc("@title", "Popup Notes"), KAboutLicense::GPL_V2, xi18nc("@info:credit", "Copyright © 2003–2016 Kontact authors")); diff --git a/kontact/src/kontact-version.h.cmake b/kontact/src/kontact-version.h.cmake index 30a0fefb27..6e2ab83c3a 100644 --- a/kontact/src/kontact-version.h.cmake +++ b/kontact/src/kontact-version.h.cmake @@ -31,6 +31,6 @@ #define KONTACT_VERSION_H -#define KDEPIM_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" +#define KONTACT_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" #endif diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index 8125228e84..cae919106f 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -46,7 +46,7 @@ using namespace Kontact; #include using namespace std; -static const char version[] = KDEPIM_VERSION; +static const char version[] = KONTACT_VERSION; class KontactApp : public KontactInterface::PimUniqueApplication { diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp index 2e8bd8af54..5c8b9d39c2 100644 --- a/korganizer/korgac/korgacmain.cpp +++ b/korganizer/korgac/korgacmain.cpp @@ -45,7 +45,7 @@ int main(int argc, char **argv) migrate.migrate(); KAboutData aboutData(QStringLiteral("korgac"), i18n("KOrganizer Reminder Daemon"), - QStringLiteral(KDEPIM_VERSION), i18n("KOrganizer Reminder Daemon"), + QStringLiteral(KORGANIZER_VERSION), i18n("KOrganizer Reminder Daemon"), KAboutLicense::GPL, i18n("(c) 2003 Cornelius Schumacher"), QString(), QStringLiteral("http://pim.kde.org")); diff --git a/korganizer/korgac/mailclient.cpp b/korganizer/korgac/mailclient.cpp index 500f4c789a..e38b17e144 100644 --- a/korganizer/korgac/mailclient.cpp +++ b/korganizer/korgac/mailclient.cpp @@ -262,7 +262,7 @@ bool MailClient::send(const KIdentityManagement::Identity &identity, // Set the headers message->userAgent()->fromUnicodeString( KProtocolManager::userAgentForApplication( - QStringLiteral("KOrganizer"), QStringLiteral(KDEPIM_VERSION)), "utf-8"); + QStringLiteral("KOrganizer"), QStringLiteral(KORGANIZER_VERSION)), "utf-8"); message->from()->fromUnicodeString(from, "utf-8"); message->to()->fromUnicodeString(to, "utf-8"); message->cc()->fromUnicodeString(cc, "utf-8"); diff --git a/korganizer/korganizer-version.h.cmake b/korganizer/korganizer-version.h.cmake index 18b8012c06..dbad270f09 100644 --- a/korganizer/korganizer-version.h.cmake +++ b/korganizer/korganizer-version.h.cmake @@ -31,6 +31,6 @@ #define KORGANIZER_VERSION_H -#define KDEPIM_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" +#define KORGANIZER_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" #endif diff --git a/korganizer/src/aboutdata.cpp b/korganizer/src/aboutdata.cpp index fa332090e9..13b20d3b36 100644 --- a/korganizer/src/aboutdata.cpp +++ b/korganizer/src/aboutdata.cpp @@ -32,7 +32,7 @@ using namespace KOrg; AboutData::AboutData() : KAboutData(QStringLiteral("korganizer"), i18n("KOrganizer"), - QStringLiteral(KDEPIM_VERSION), + QStringLiteral(KORGANIZER_VERSION), i18n("A Personal Organizer"), KAboutLicense::GPL, i18n("Copyright © 1997–1999 Preston Brown\n" diff --git a/korganizer/src/koapp.cpp b/korganizer/src/koapp.cpp index cc34db6fff..58659575b5 100644 --- a/korganizer/src/koapp.cpp +++ b/korganizer/src/koapp.cpp @@ -42,7 +42,7 @@ KOrganizerApp::KOrganizerApp(int &argc, char **argv[]) : KontactInterface::PimUniqueApplication(argc, argv) { QString prodId = QStringLiteral("-//K Desktop Environment//NONSGML KOrganizer %1//EN"); - KCalCore::CalFormat::setApplication(QStringLiteral("KOrganizer"), prodId.arg(QStringLiteral(KDEPIM_VERSION))); + KCalCore::CalFormat::setApplication(QStringLiteral("KOrganizer"), prodId.arg(QStringLiteral(KORGANIZER_VERSION))); } KOrganizerApp::~KOrganizerApp() diff --git a/ktnef/src/ktnef-version.h.cmake b/ktnef/src/ktnef-version.h.cmake index 5f8eb53705..783e9338c8 100644 --- a/ktnef/src/ktnef-version.h.cmake +++ b/ktnef/src/ktnef-version.h.cmake @@ -31,6 +31,6 @@ #define KTNEF_VERSION_H -#define KDEPIM_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" +#define KTNEF_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" #endif diff --git a/ktnef/src/main.cpp b/ktnef/src/main.cpp index 1347059a54..da6ffef38f 100644 --- a/ktnef/src/main.cpp +++ b/ktnef/src/main.cpp @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) KAboutData aboutData(QStringLiteral("ktnef"), i18n("KTnef"), - QStringLiteral(KDEPIM_VERSION), + QStringLiteral(KTNEF_VERSION), i18n("Viewer for mail attachments using TNEF format"), KAboutLicense::GPL, i18n("Copyright 2000 Michael Goffioul\nCopyright 2012 Allen Winter")); diff --git a/mboximporter/src/main.cpp b/mboximporter/src/main.cpp index e8485e8e6b..0cc0e9418a 100644 --- a/mboximporter/src/main.cpp +++ b/mboximporter/src/main.cpp @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) KAboutData aboutData(QStringLiteral("mboximporter"), i18n("MBox importer tool"), - QStringLiteral(KDEPIM_VERSION), + QStringLiteral(MBOXIMPORTER_VERSION), i18n("MBox Import Tool"), KAboutLicense::GPL_V2, i18n("Copyright © 2013-2016 MBoxImporter authors")); diff --git a/mboximporter/src/mboximporter-version.h.cmake b/mboximporter/src/mboximporter-version.h.cmake index 4421faf8f6..a8c4e0b9c2 100644 --- a/mboximporter/src/mboximporter-version.h.cmake +++ b/mboximporter/src/mboximporter-version.h.cmake @@ -31,6 +31,6 @@ #define MBOXEXPORTER_VERSION_H -#define KDEPIM_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" +#define MBOXIMPORTER_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" #endif diff --git a/pimsettingexporter/console/main.cpp b/pimsettingexporter/console/main.cpp index c378c21ca1..8c9d79e2fb 100644 --- a/pimsettingexporter/console/main.cpp +++ b/pimsettingexporter/console/main.cpp @@ -35,7 +35,7 @@ int main(int argc, char *argv[]) QCommandLineParser parser; KAboutData aboutData(QStringLiteral("pimsettingexporterconsole"), i18n("PIM Setting Exporter Console"), - QStringLiteral(KDEPIM_VERSION), i18n("PIM Setting Exporter Console"), KAboutLicense::GPL_V2, + QStringLiteral(PIMSETTINGEXPORTER_VERSION), i18n("PIM Setting Exporter Console"), KAboutLicense::GPL_V2, i18n("Copyright © 2015-2016 pimsettingexporter authors")); aboutData.addAuthor(i18n("Laurent Montel"), i18n("Maintainer"), QStringLiteral("montel@kde.org")); parser.addVersionOption(); diff --git a/pimsettingexporter/gui/pimsettingcommandlineoption.cpp b/pimsettingexporter/gui/pimsettingcommandlineoption.cpp index 76b68d27a9..e33391e074 100644 --- a/pimsettingexporter/gui/pimsettingcommandlineoption.cpp +++ b/pimsettingexporter/gui/pimsettingcommandlineoption.cpp @@ -51,7 +51,7 @@ void PimSettingCommandLineOption::slotActivateRequested(const QStringList &argum void PimSettingCommandLineOption::createParser(const QApplication &app) { KAboutData aboutData(QStringLiteral("pimsettingexporter"), i18n("PIM Setting Exporter"), - QStringLiteral(KDEPIM_VERSION), i18n("PIM Setting Exporter"), KAboutLicense::GPL_V2, + QStringLiteral(PIMSETTINGEXPORTER_VERSION), i18n("PIM Setting Exporter"), KAboutLicense::GPL_V2, i18n("Copyright © 2012-2016 pimsettingexporter authors")); aboutData.addAuthor(i18n("Laurent Montel"), i18n("Maintainer"), QStringLiteral("montel@kde.org")); mParser.addVersionOption(); diff --git a/pimsettingexporter/pimsettingexporter-version.h.cmake b/pimsettingexporter/pimsettingexporter-version.h.cmake index 4bf2d2ff37..7ab2020180 100644 --- a/pimsettingexporter/pimsettingexporter-version.h.cmake +++ b/pimsettingexporter/pimsettingexporter-version.h.cmake @@ -31,6 +31,6 @@ #define PIMSETTINGEXPORTER_VERSION_H -#define KDEPIM_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" +#define PIMSETTINGEXPORTER_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" #endif -- 2.11.4.GIT