[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: =?utf-8?q?=5Bkdepim/4=2E4=5D_kalarm=3A_Replace_initialised_libra?=
From: David Jarvie <djarvie () kde ! org>
Date: 2011-02-05 20:27:03
Message-ID: 20110205202703.66B97A609B () git ! kde ! org
[Download RAW message or body]
Git commit a6ecc8fd0ac6feca533f55a07e95ae55fabfe8b9 by David Jarvie.
Committed on 05/02/11 at 21:16.
Pushed by djarvie into branch '4.4'.
Replace initialised library global statics by static class members.
Backport of commit c0c0efa40cf8a86cd90a4a09531e5d72439ab516
M +4 -1 kalarm/Changelog
M +40 -40 kalarm/cal/kaeventdata.cpp
M +42 -1 kalarm/cal/kaeventdata.h
M +2 -2 kalarm/kalarm.h
http://commits.kde.org/kdepim/a6ecc8fd0ac6feca533f55a07e95ae55fabfe8b9
diff --git a/kalarm/Changelog b/kalarm/Changelog
index 813130d..9bc2be6 100644
--- a/kalarm/Changelog
+++ b/kalarm/Changelog
@@ -1,6 +1,9 @@
KAlarm Change Log
-=== Version 2.4.10 --- 2 December 2010 ===
+=== Version 2.4.11 --- 5 February 2011 ===
+- Fix initialisation of library global statics.
+
+=== Version 2.4.10 (KDEPIM 4.4.8) --- 2 December 2010 ===
- Fix KAlarm showing in system tray at login when configured not to show in tray.
- Fix working-time-only alarms not triggering if KAlarm is started up outside
working hours, after the last trigger time during working hours was missed.
diff --git a/kalarm/cal/kaeventdata.cpp b/kalarm/cal/kaeventdata.cpp
index 103e244..e0c5f1a 100644
--- a/kalarm/cal/kaeventdata.cpp
+++ b/kalarm/cal/kaeventdata.cpp
@@ -47,58 +47,58 @@ QByteArray KAEventData::icalProductId()
// Note that all custom property names are prefixed with X-KDE-KALARM- in the \
calendar file.
// Event properties
-static const QByteArray FLAGS_PROPERTY("FLAGS"); // X-KDE-KALARM-FLAGS \
property
-static const QString DATE_ONLY_FLAG = QLatin1String("DATE");
-static const QString EMAIL_BCC_FLAG = QLatin1String("BCC");
-static const QString CONFIRM_ACK_FLAG = QLatin1String("ACKCONF");
-static const QString KORGANIZER_FLAG = QLatin1String("KORG");
-static const QString EXCLUDE_HOLIDAYS_FLAG = QLatin1String("EXHOLIDAYS");
-static const QString WORK_TIME_ONLY_FLAG = QLatin1String("WORKTIME");
-static const QString DEFER_FLAG = QLatin1String("DEFER"); // default \
defer interval for this alarm
-static const QString LATE_CANCEL_FLAG = QLatin1String("LATECANCEL");
-static const QString AUTO_CLOSE_FLAG = QLatin1String("LATECLOSE");
-static const QString TEMPL_AFTER_TIME_FLAG = QLatin1String("TMPLAFTTIME");
-static const QString KMAIL_SERNUM_FLAG = QLatin1String("KMAIL");
-
-static const QByteArray NEXT_RECUR_PROPERTY("NEXTRECUR"); // \
X-KDE-KALARM-NEXTRECUR property
-static const QByteArray REPEAT_PROPERTY("REPEAT"); // X-KDE-KALARM-REPEAT \
property
-static const QByteArray ARCHIVE_PROPERTY("ARCHIVE"); // \
X-KDE-KALARM-ARCHIVE property
-static const QString ARCHIVE_REMINDER_ONCE_TYPE = QLatin1String("ONCE");
-static const QByteArray LOG_PROPERTY("LOG"); // X-KDE-KALARM-LOG \
property
-static const QString xtermURL = QLatin1String("xterm:");
-static const QString displayURL = QLatin1String("display:");
+const QByteArray KAEventData::FLAGS_PROPERTY("FLAGS"); // \
X-KDE-KALARM-FLAGS property +const QString KAEventData::DATE_ONLY_FLAG = \
QLatin1String("DATE"); +const QString KAEventData::EMAIL_BCC_FLAG = \
QLatin1String("BCC"); +const QString KAEventData::CONFIRM_ACK_FLAG = \
QLatin1String("ACKCONF"); +const QString KAEventData::KORGANIZER_FLAG = \
QLatin1String("KORG"); +const QString KAEventData::EXCLUDE_HOLIDAYS_FLAG = \
QLatin1String("EXHOLIDAYS"); +const QString KAEventData::WORK_TIME_ONLY_FLAG = \
QLatin1String("WORKTIME"); +const QString KAEventData::DEFER_FLAG = \
QLatin1String("DEFER"); // default defer interval for this alarm +const QString \
KAEventData::LATE_CANCEL_FLAG = QLatin1String("LATECANCEL"); +const QString \
KAEventData::AUTO_CLOSE_FLAG = QLatin1String("LATECLOSE"); +const QString \
KAEventData::TEMPL_AFTER_TIME_FLAG = QLatin1String("TMPLAFTTIME"); +const QString \
KAEventData::KMAIL_SERNUM_FLAG = QLatin1String("KMAIL"); +
+const QByteArray KAEventData::NEXT_RECUR_PROPERTY("NEXTRECUR"); // \
X-KDE-KALARM-NEXTRECUR property +const QByteArray \
KAEventData::REPEAT_PROPERTY("REPEAT"); // X-KDE-KALARM-REPEAT property \
+const QByteArray KAEventData::ARCHIVE_PROPERTY("ARCHIVE"); // \
X-KDE-KALARM-ARCHIVE property +const QString \
KAEventData::ARCHIVE_REMINDER_ONCE_TYPE = QLatin1String("ONCE"); +const QByteArray \
KAEventData::LOG_PROPERTY("LOG"); // X-KDE-KALARM-LOG property \
+const QString KAEventData::xtermURL = QLatin1String("xterm:"); +const QString \
KAEventData::displayURL = QLatin1String("display:");
// - General alarm properties
-static const QByteArray TYPE_PROPERTY("TYPE"); // X-KDE-KALARM-TYPE \
property
-static const QString FILE_TYPE = QLatin1String("FILE");
-static const QString AT_LOGIN_TYPE = QLatin1String("LOGIN");
-static const QString REMINDER_TYPE = QLatin1String("REMINDER");
-static const QString REMINDER_ONCE_TYPE = QLatin1String("REMINDER_ONCE");
-static const QString TIME_DEFERRAL_TYPE = QLatin1String("DEFERRAL");
-static const QString DATE_DEFERRAL_TYPE = QLatin1String("DATE_DEFERRAL");
-static const QString DISPLAYING_TYPE = QLatin1String("DISPLAYING"); // \
used only in displaying calendar
-static const QString PRE_ACTION_TYPE = QLatin1String("PRE");
-static const QString POST_ACTION_TYPE = QLatin1String("POST");
-static const QString SOUND_REPEAT_TYPE = QLatin1String("SOUNDREPEAT");
-static const QByteArray NEXT_REPEAT_PROPERTY("NEXTREPEAT"); // \
X-KDE-KALARM-NEXTREPEAT property +const QByteArray \
KAEventData::TYPE_PROPERTY("TYPE"); // X-KDE-KALARM-TYPE property \
+const QString KAEventData::FILE_TYPE = QLatin1String("FILE"); \
+const QString KAEventData::AT_LOGIN_TYPE = QLatin1String("LOGIN"); \
+const QString KAEventData::REMINDER_TYPE = \
QLatin1String("REMINDER"); +const QString KAEventData::REMINDER_ONCE_TYPE \
= QLatin1String("REMINDER_ONCE"); +const QString KAEventData::TIME_DEFERRAL_TYPE \
= QLatin1String("DEFERRAL"); +const QString KAEventData::DATE_DEFERRAL_TYPE \
= QLatin1String("DATE_DEFERRAL"); +const QString KAEventData::DISPLAYING_TYPE \
= QLatin1String("DISPLAYING"); // used only in displaying calendar +const QString \
KAEventData::PRE_ACTION_TYPE = QLatin1String("PRE"); +const QString \
KAEventData::POST_ACTION_TYPE = QLatin1String("POST"); +const QString \
KAEventData::SOUND_REPEAT_TYPE = QLatin1String("SOUNDREPEAT"); +const \
QByteArray KAEventData::NEXT_REPEAT_PROPERTY("NEXTREPEAT"); // \
X-KDE-KALARM-NEXTREPEAT property // - Display alarm properties
-static const QByteArray FONT_COLOUR_PROPERTY("FONTCOLOR"); // \
X-KDE-KALARM-FONTCOLOR property +const QByteArray \
KAEventData::FONT_COLOUR_PROPERTY("FONTCOLOR"); // X-KDE-KALARM-FONTCOLOR property \
// - Email alarm properties
-static const QByteArray EMAIL_ID_PROPERTY("EMAILID"); // \
X-KDE-KALARM-EMAILID property +const QByteArray \
KAEventData::EMAIL_ID_PROPERTY("EMAILID"); // X-KDE-KALARM-EMAILID property \
// - Audio alarm properties
-static const QByteArray VOLUME_PROPERTY("VOLUME"); // X-KDE-KALARM-VOLUME \
property
-static const QByteArray SPEAK_PROPERTY("SPEAK"); // X-KDE-KALARM-SPEAK \
property +const QByteArray KAEventData::VOLUME_PROPERTY("VOLUME"); // \
X-KDE-KALARM-VOLUME property +const QByteArray KAEventData::SPEAK_PROPERTY("SPEAK"); \
// X-KDE-KALARM-SPEAK property // - Command alarm properties
-static const QByteArray CANCEL_ON_ERROR_PROPERTY("ERRCANCEL");// \
X-KDE-KALARM-ERRCANCEL property +const QByteArray \
KAEventData::CANCEL_ON_ERROR_PROPERTY("ERRCANCEL");// X-KDE-KALARM-ERRCANCEL property \
// Event status strings
-static const QString DISABLED_STATUS = QLatin1String("DISABLED");
+const QString KAEventData::DISABLED_STATUS = \
QLatin1String("DISABLED");
// Displaying event ID identifier
-static const QString DISP_DEFER = QLatin1String("DEFER");
-static const QString DISP_EDIT = QLatin1String("EDIT");
+const QString KAEventData::DISP_DEFER = QLatin1String("DEFER");
+const QString KAEventData::DISP_EDIT = QLatin1String("EDIT");
-static const QString SC = QLatin1String(";");
+const QString KAEventData::SC = QLatin1String(";");
struct AlarmData
{
diff --git a/kalarm/cal/kaeventdata.h b/kalarm/cal/kaeventdata.h
index 04c4a48..8604822 100644
--- a/kalarm/cal/kaeventdata.h
+++ b/kalarm/cal/kaeventdata.h
@@ -1,7 +1,7 @@
/*
* kaeventdata.h - represents calendar alarm and event data
* Program: kalarm
- * Copyright © 2001-2010 by David Jarvie <djarvie@kde.org>
+ * Copyright © 2001-2011 by David Jarvie <djarvie@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -518,6 +518,47 @@ public:
bool mDisplayingEdit; // show Edit button (applies to displaying \
calendar only) bool mEnabled; // false if event is disabled
mutable bool mUpdated; // event has been updated but not written to \
calendar file +
+ static const QByteArray FLAGS_PROPERTY;
+ static const QString DATE_ONLY_FLAG;
+ static const QString EMAIL_BCC_FLAG;
+ static const QString CONFIRM_ACK_FLAG;
+ static const QString KORGANIZER_FLAG;
+ static const QString EXCLUDE_HOLIDAYS_FLAG;
+ static const QString WORK_TIME_ONLY_FLAG;
+ static const QString DEFER_FLAG;
+ static const QString LATE_CANCEL_FLAG;
+ static const QString AUTO_CLOSE_FLAG;
+ static const QString TEMPL_AFTER_TIME_FLAG;
+ static const QString KMAIL_SERNUM_FLAG;
+ static const QByteArray NEXT_RECUR_PROPERTY;
+ static const QByteArray REPEAT_PROPERTY;
+ static const QByteArray ARCHIVE_PROPERTY;
+ static const QString ARCHIVE_REMINDER_ONCE_TYPE;
+ static const QByteArray LOG_PROPERTY;
+ static const QString xtermURL;
+ static const QString displayURL;
+ static const QByteArray TYPE_PROPERTY;
+ static const QString FILE_TYPE;
+ static const QString AT_LOGIN_TYPE;
+ static const QString REMINDER_TYPE;
+ static const QString REMINDER_ONCE_TYPE;
+ static const QString TIME_DEFERRAL_TYPE;
+ static const QString DATE_DEFERRAL_TYPE;
+ static const QString DISPLAYING_TYPE;
+ static const QString PRE_ACTION_TYPE;
+ static const QString POST_ACTION_TYPE;
+ static const QString SOUND_REPEAT_TYPE;
+ static const QByteArray NEXT_REPEAT_PROPERTY;
+ static const QByteArray FONT_COLOUR_PROPERTY;
+ static const QByteArray EMAIL_ID_PROPERTY;
+ static const QByteArray VOLUME_PROPERTY;
+ static const QByteArray SPEAK_PROPERTY;
+ static const QByteArray CANCEL_ON_ERROR_PROPERTY;
+ static const QString DISABLED_STATUS;
+ static const QString DISP_DEFER;
+ static const QString DISP_EDIT;
+ static const QString SC;
};
#endif // KAEVENTDATA_H
diff --git a/kalarm/kalarm.h b/kalarm/kalarm.h
index 7790770..63333b2 100644
--- a/kalarm/kalarm.h
+++ b/kalarm/kalarm.h
@@ -1,7 +1,7 @@
/*
* kalarm.h - global header file
* Program: kalarm
- * Copyright © 2001-2010 by David Jarvie <djarvie@kde.org>
+ * Copyright © 2001-2011 by David Jarvie <djarvie@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
#undef QT3_SUPPORT
-#define KALARM_VERSION "2.4.10"
+#define KALARM_VERSION "2.4.11"
#define KALARM_NAME "KAlarm"
#define KALARM_DBUS_SERVICE "org.kde.kalarm" // D-Bus service name of KAlarm \
application
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic