[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] kalarm: move the statics for the Formats out of the
From: Allen Winter <allen.winter () kdab ! com>
Date: 2011-09-01 0:10:57
Message-ID: 20110901001057.17AF5A60A6 () git ! kde ! org
[Download RAW message or body]
Git commit 5ddb60bfe0c7aef3ec470d7e657aeef1d0b06535 by Allen Winter.
Committed on 01/09/2011 at 02:10.
Pushed by winterz into branch 'master'.
move the statics for the Formats out of the KAlarm::Calendar class
so they can be found at link time.
CCMAIL: djarvie@kde.org
M +1 -1 kalarm/cal/compatibilityattribute.cpp
M +7 -7 kalarm/akonadi/kalarmdir/kalarmdirresource.cpp
M +12 -10 kalarm/cal/kacalendar.h
M +2 -2 kalarm/akonadi/common/kalarmresourcecommon.cpp
M +2 -2 kalarm/akonadi/kalarm/kalarmresource.cpp
M +2 -2 kalarm/cal/compatibilityattribute.h
http://commits.kde.org/kdepim/5ddb60bfe0c7aef3ec470d7e657aeef1d0b06535
diff --git a/kalarm/akonadi/common/kalarmresourcecommon.cpp \
b/kalarm/akonadi/common/kalarmresourcecommon.cpp index 915c6c2..4bbbad0 100644
--- a/kalarm/akonadi/common/kalarmresourcecommon.cpp
+++ b/kalarm/akonadi/common/kalarmresourcecommon.cpp
@@ -101,9 +101,9 @@ KAlarm::Calendar::Compat getCompatibility(const FileStorage::Ptr& \
fileStorage, i
version = KAlarm::Calendar::updateVersion(fileStorage, versionString);
switch (version)
{
- case KAlarm::Calendar::IncompatibleFormat:
+ case KAlarm::IncompatibleFormat:
return KAlarm::Calendar::Incompatible; // calendar is not in KAlarm \
format, or is in a future format
- case KAlarm::Calendar::CurrentFormat:
+ case KAlarm::CurrentFormat:
return KAlarm::Calendar::Current; // calendar is in the current \
format default:
return KAlarm::Calendar::Convertible; // calendar is in an out of date \
format
diff --git a/kalarm/akonadi/kalarm/kalarmresource.cpp \
b/kalarm/akonadi/kalarm/kalarmresource.cpp index 98f65c1..0da6506 100644
--- a/kalarm/akonadi/kalarm/kalarmresource.cpp
+++ b/kalarm/akonadi/kalarm/kalarmresource.cpp
@@ -43,7 +43,7 @@ using KAlarmResourceCommon::errorMessage;
KAlarmResource::KAlarmResource(const QString& id)
: ICalResourceBase(id),
mCompatibility(KAlarm::Calendar::Incompatible),
- mVersion(KAlarm::Calendar::MixedFormat)
+ mVersion(KAlarm::MixedFormat)
{
kDebug() << id;
KAlarmResourceCommon::initialise(this);
@@ -338,7 +338,7 @@ void KAlarmResource::doRetrieveItems(const Akonadi::Collection& \
collection) kWarning() << "KAEvent has no alarms:" << event.id();
continue; // event has no usable alarms
}
-
+
Item item(mime);
item.setRemoteId(kcalEvent->uid());
item.setPayload(event);
diff --git a/kalarm/akonadi/kalarmdir/kalarmdirresource.cpp \
b/kalarm/akonadi/kalarmdir/kalarmdirresource.cpp index d385085..10362cb 100644
--- a/kalarm/akonadi/kalarmdir/kalarmdirresource.cpp
+++ b/kalarm/akonadi/kalarmdir/kalarmdirresource.cpp
@@ -130,8 +130,8 @@ void KAlarmDirResource::collectionsReceived(const \
Akonadi::Collection::List& col
// Set collection's format compatibility flag now that the \
collection // and its attributes have been fetched.
KAlarmResourceCommon::setCollectionCompatibility(collections[i], \
mCompatibility,
- (mCompatibility == \
KAlarm::Calendar::Current ? KAlarm::Calendar::CurrentFormat
- \
: KAlarm::Calendar::MixedFormat)); + \
(mCompatibility == KAlarm::Calendar::Current ? KAlarm::CurrentFormat + \
: KAlarm::MixedFormat)); break;
}
}
@@ -354,7 +354,7 @@ kDebug()<<"Monitored changed";
mCompatibility = KAlarm::Calendar::Current;
const Collection c(mCollectionId);
if (c.isValid())
- KAlarmResourceCommon::setCollectionCompatibility(c, \
mCompatibility, KAlarm::Calendar::CurrentFormat); + \
KAlarmResourceCommon::setCollectionCompatibility(c, mCompatibility, \
KAlarm::CurrentFormat); }
}
mSettings->setUpdateStorageFormat(false);
@@ -750,8 +750,8 @@ void KAlarmDirResource::retrieveItems(const Akonadi::Collection& \
collection)
// Set the collection's compatibility status
KAlarmResourceCommon::setCollectionCompatibility(collection, mCompatibility,
- (mCompatibility == \
KAlarm::Calendar::Current ? KAlarm::Calendar::CurrentFormat
- \
: KAlarm::Calendar::MixedFormat)); + \
(mCompatibility == KAlarm::Calendar::Current ? KAlarm::CurrentFormat + \
: KAlarm::MixedFormat));
// Fetch the list of valid mime types
const QStringList mimeTypes = mSettings->alarmTypes();
@@ -1109,8 +1109,8 @@ void KAlarmDirResource::setCompatibility(bool writeAttr)
const Collection c(mCollectionId);
if (c.isValid())
KAlarmResourceCommon::setCollectionCompatibility(c, mCompatibility,
- (mCompatibility == \
KAlarm::Calendar::Current ? KAlarm::Calendar::CurrentFormat
- \
: KAlarm::Calendar::MixedFormat)); + \
(mCompatibility == KAlarm::Calendar::Current ? KAlarm::CurrentFormat + \
: KAlarm::MixedFormat)); }
}
diff --git a/kalarm/cal/compatibilityattribute.cpp \
b/kalarm/cal/compatibilityattribute.cpp index 2a93fa3..a82a2f3 100644
--- a/kalarm/cal/compatibilityattribute.cpp
+++ b/kalarm/cal/compatibilityattribute.cpp
@@ -48,7 +48,7 @@ void CompatibilityAttribute::deserialize(const QByteArray& data)
{
// Set default values
mCompatibility = KAlarm::Calendar::Incompatible;
- mVersion = KAlarm::Calendar::IncompatibleFormat;
+ mVersion = KAlarm::IncompatibleFormat;
bool ok;
const QList<QByteArray> items = data.simplified().split(' ');
diff --git a/kalarm/cal/compatibilityattribute.h \
b/kalarm/cal/compatibilityattribute.h index d02b3d7..aa416a6 100644
--- a/kalarm/cal/compatibilityattribute.h
+++ b/kalarm/cal/compatibilityattribute.h
@@ -40,8 +40,8 @@ class KALARM_CAL_EXPORT CompatibilityAttribute : public \
Akonadi::Attribute {
public:
CompatibilityAttribute()
- : mCompatibility(KAlarm::Calendar::Incompatible),
- mVersion(KAlarm::Calendar::IncompatibleFormat) { }
+ : mCompatibility(KAlarm::Calendar::Incompatible),
+ mVersion(KAlarm::IncompatibleFormat) { }
/** Return the compatibility status for the entity. */
KAlarm::Calendar::Compat compatibility() const { return mCompatibility; \
}
diff --git a/kalarm/cal/kacalendar.h b/kalarm/cal/kacalendar.h
index e9e380f..fcd09d2 100644
--- a/kalarm/cal/kacalendar.h
+++ b/kalarm/cal/kacalendar.h
@@ -44,6 +44,16 @@ namespace KCal {
}
#endif
+namespace KAlarm {
+// Special calendar storage format version codes.
+// Positive version values are actual KAlarm format version numbers.
+static const int CurrentFormat = 0; // current KAlarm format
+static const int IncompatibleFormat = -1; // not written by KAlarm, or a newer \
KAlarm version +#ifdef USE_AKONADI
+static const int MixedFormat = -2; // calendar may contain more than one \
version +#endif
+}
+
namespace KAlarm
{
@@ -117,16 +127,8 @@ class KALARM_CAL_EXPORT Calendar
};
#endif
- // Special calendar storage format version codes.
- // Positive version values are actual KAlarm format version numbers.
- static const int CurrentFormat = 0; // current KAlarm format
- static const int IncompatibleFormat = -1; // not written by KAlarm, or a \
newer KAlarm version
-#ifdef USE_AKONADI
- static const int MixedFormat = -2; // calendar may contain more \
than one version
-#endif
-
/** Check the version of KAlarm which wrote a calendar file, and convert
- * it in memory to the current KAlarm format if possible. The storage
+ * it in memory to the current KAlarm format if possible. The storage
* file is not updated. The compatibility of the calendar format is
* indicated by the return value.
*
@@ -148,7 +150,7 @@ class KALARM_CAL_EXPORT Calendar
/** Whether the fix function should convert old format KAlarm calendars. */
enum FixFunc { PROMPT, PROMPT_PART, CONVERT, NO_CONVERT };
- static Compat fix(const KCalCore::FileStorage::Ptr&,
+ static Compat fix(const KCalCore::FileStorage::Ptr&,
const Akonadi::Collection& = Akonadi::Collection(),
FixFunc = PROMPT, bool* wrongType = 0);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic