Commit d69e4225 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/Applications/16.08'

parents 9d2c0ff4 eb205aec
...@@ -45,7 +45,7 @@ int main(int argc, char **argv) ...@@ -45,7 +45,7 @@ int main(int argc, char **argv)
migrate.migrate(); migrate.migrate();
KAboutData aboutData(QStringLiteral("korgac"), i18n("KOrganizer Reminder Daemon"), KAboutData aboutData(QStringLiteral("korgac"), i18n("KOrganizer Reminder Daemon"),
QStringLiteral(KDEPIM_VERSION), i18n("KOrganizer Reminder Daemon"), QStringLiteral(KORGANIZER_VERSION), i18n("KOrganizer Reminder Daemon"),
KAboutLicense::GPL, KAboutLicense::GPL,
i18n("(c) 2003 Cornelius Schumacher"), i18n("(c) 2003 Cornelius Schumacher"),
QString(), QStringLiteral("http://pim.kde.org")); QString(), QStringLiteral("http://pim.kde.org"));
......
...@@ -262,7 +262,7 @@ bool MailClient::send(const KIdentityManagement::Identity &identity, ...@@ -262,7 +262,7 @@ bool MailClient::send(const KIdentityManagement::Identity &identity,
// Set the headers // Set the headers
message->userAgent()->fromUnicodeString( message->userAgent()->fromUnicodeString(
KProtocolManager::userAgentForApplication( KProtocolManager::userAgentForApplication(
QStringLiteral("KOrganizer"), QStringLiteral(KDEPIM_VERSION)), "utf-8"); QStringLiteral("KOrganizer"), QStringLiteral(KORGANIZER_VERSION)), "utf-8");
message->from()->fromUnicodeString(from, "utf-8"); message->from()->fromUnicodeString(from, "utf-8");
message->to()->fromUnicodeString(to, "utf-8"); message->to()->fromUnicodeString(to, "utf-8");
message->cc()->fromUnicodeString(cc, "utf-8"); message->cc()->fromUnicodeString(cc, "utf-8");
......
...@@ -31,6 +31,6 @@ ...@@ -31,6 +31,6 @@
#define KORGANIZER_VERSION_H #define KORGANIZER_VERSION_H
#define KDEPIM_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)" #define KORGANIZER_VERSION "@KDEPIM_VERSION@ (@WEBENGINE_TYPE@)"
#endif #endif
...@@ -32,7 +32,7 @@ using namespace KOrg; ...@@ -32,7 +32,7 @@ using namespace KOrg;
AboutData::AboutData() AboutData::AboutData()
: KAboutData(QStringLiteral("korganizer"), : KAboutData(QStringLiteral("korganizer"),
i18n("KOrganizer"), i18n("KOrganizer"),
QStringLiteral(KDEPIM_VERSION), QStringLiteral(KORGANIZER_VERSION),
i18n("A Personal Organizer"), i18n("A Personal Organizer"),
KAboutLicense::GPL, KAboutLicense::GPL,
i18n("Copyright © 1997–1999 Preston Brown\n" i18n("Copyright © 1997–1999 Preston Brown\n"
......
...@@ -42,7 +42,7 @@ KOrganizerApp::KOrganizerApp(int &argc, char **argv[]) ...@@ -42,7 +42,7 @@ KOrganizerApp::KOrganizerApp(int &argc, char **argv[])
: KontactInterface::PimUniqueApplication(argc, argv) : KontactInterface::PimUniqueApplication(argc, argv)
{ {
QString prodId = QStringLiteral("-//K Desktop Environment//NONSGML KOrganizer %1//EN"); 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() KOrganizerApp::~KOrganizerApp()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment