2 commits - calendaring/calendaring.cpp calendaring/event.cpp conversion/kabcconversion.cpp freebusy/freebusy.cpp icalendar/icalendar.cpp kolabformat/kolabobject.cpp kolabformat/v2helpers.cpp tests/calendaringtest.cpp tests/freebusytest.cpp tests/testhelpers.h tests/testutils.h
Christian Mollekopf
mollekopf at kolabsys.com
Thu Nov 8 20:09:51 CET 2012
calendaring/calendaring.cpp | 6 +++---
calendaring/event.cpp | 4 ++--
conversion/kabcconversion.cpp | 6 +++---
freebusy/freebusy.cpp | 9 +++++++--
icalendar/icalendar.cpp | 9 ++++-----
kolabformat/kolabobject.cpp | 28 ++++++++++++++--------------
kolabformat/v2helpers.cpp | 2 +-
tests/calendaringtest.cpp | 4 ++--
tests/freebusytest.cpp | 2 +-
tests/testhelpers.h | 8 ++++----
tests/testutils.h | 4 ++--
11 files changed, 43 insertions(+), 39 deletions(-)
New commits:
commit 930653df0206c78f8b7003c85141a448151e2aac
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date: Thu Nov 8 20:09:36 2012 +0100
Fixed a bunch of warnings.
diff --git a/calendaring/calendaring.cpp b/calendaring/calendaring.cpp
index b7ad0e3..204353c 100644
--- a/calendaring/calendaring.cpp
+++ b/calendaring/calendaring.cpp
@@ -44,17 +44,17 @@ bool conflicts(const Kolab::Event &e1, const Kolab::Event &e2)
std::vector< std::vector< Event > > getConflictingSets(const std::vector< Event > &events, const std::vector< Event > &events2)
{
std::vector< std::vector< Kolab::Event > > ret;
- for(int i = 0; i < events.size(); i++) {
+ for(std::size_t i = 0; i < events.size(); i++) {
std::vector<Kolab::Event> set;
const Kolab::Event &event = events.at(i);
set.push_back(event);
- for(int q = i+1; q < events.size(); q++) {
+ for(std::size_t q = i+1; q < events.size(); q++) {
const Kolab::Event &e2 = events.at(q);
if (conflicts(event, e2)) {
set.push_back(e2);
}
}
- for(int m = 0; m < events2.size(); m++) {
+ for(std::size_t m = 0; m < events2.size(); m++) {
const Kolab::Event &e2 = events2.at(m);
if (conflicts(event, e2)) {
set.push_back(e2);
diff --git a/calendaring/event.cpp b/calendaring/event.cpp
index 29f7017..259a463 100644
--- a/calendaring/event.cpp
+++ b/calendaring/event.cpp
@@ -121,8 +121,8 @@ std::string Event::toIMip(ITipMethod method) const
Calendaring::Event::ITipMethod Event::getSchedulingMethod() const
{
- Q_ASSERT(iTIPPublish == ITipHandler::iTIPPublish);
- Q_ASSERT(iTIPNoMethod == ITipHandler::iTIPNoMethod);
+ Q_ASSERT((int)iTIPPublish == (int)ITipHandler::iTIPPublish);
+ Q_ASSERT((int)iTIPNoMethod == (int)ITipHandler::iTIPNoMethod);
return static_cast<ITipMethod>(mITipHandler.method());
}
diff --git a/conversion/kabcconversion.cpp b/conversion/kabcconversion.cpp
index 2134d2d..1be0df8 100644
--- a/conversion/kabcconversion.cpp
+++ b/conversion/kabcconversion.cpp
@@ -423,7 +423,7 @@ KABC::Addressee toKABC(const Kolab::Contact &contact)
if (!contact.emailAddresses().empty()) {
addressee.setEmails(toStringList(contact.emailAddresses()));
- if ((contact.emailAddressPreferredIndex() >= 0) && (contact.emailAddressPreferredIndex() < contact.emailAddresses().size())) {
+ if ((contact.emailAddressPreferredIndex() >= 0) && (contact.emailAddressPreferredIndex() < static_cast<int>(contact.emailAddresses().size()))) {
preferredEmail = fromStdString(contact.emailAddresses().at(contact.emailAddressPreferredIndex()));
} else {
preferredEmail = fromStdString(contact.emailAddresses().at(0));
@@ -811,11 +811,11 @@ DistList fromKABC(const KABC::ContactGroup &cg)
dl.setUid(toStdString(cg.id()));
std::vector <Kolab::ContactReference > members;
- for (int i = 0; i < cg.dataCount(); i++) {
+ for (unsigned int i = 0; i < cg.dataCount(); i++) {
const KABC::ContactGroup::Data &data = cg.data(i);
members.push_back(Kolab::ContactReference(Kolab::ContactReference::EmailReference, toStdString(data.email()), toStdString(data.name())));
}
- for (int i = 0; i < cg.contactReferenceCount(); i++) {
+ for (unsigned int i = 0; i < cg.contactReferenceCount(); i++) {
const KABC::ContactGroup::ContactReference &ref = cg.contactReference(i);
members.push_back(Kolab::ContactReference(Kolab::ContactReference::UidReference, toStdString(ref.uid())));
}
diff --git a/icalendar/icalendar.cpp b/icalendar/icalendar.cpp
index 03c360b..77aa01a 100644
--- a/icalendar/icalendar.cpp
+++ b/icalendar/icalendar.cpp
@@ -68,15 +68,15 @@ ITipHandler::ITipHandler()
ITipHandler::ITipMethod mapFromKCalCore(KCalCore::iTIPMethod method)
{
- Q_ASSERT(KCalCore::iTIPPublish == ITipHandler::iTIPPublish);
- Q_ASSERT(KCalCore::iTIPNoMethod == ITipHandler::iTIPNoMethod);
+ Q_ASSERT((int)KCalCore::iTIPPublish == (int)ITipHandler::iTIPPublish);
+ Q_ASSERT((int)KCalCore::iTIPNoMethod == (int)ITipHandler::iTIPNoMethod);
return static_cast<ITipHandler::ITipMethod>(method);
}
KCalCore::iTIPMethod mapToKCalCore(ITipHandler::ITipMethod method)
{
- Q_ASSERT(KCalCore::iTIPPublish == ITipHandler::iTIPPublish);
- Q_ASSERT(KCalCore::iTIPNoMethod == ITipHandler::iTIPNoMethod);
+ Q_ASSERT((int)KCalCore::iTIPPublish == (int)ITipHandler::iTIPPublish);
+ Q_ASSERT((int)KCalCore::iTIPNoMethod == (int)ITipHandler::iTIPNoMethod);
return static_cast<KCalCore::iTIPMethod>(method);
}
@@ -128,7 +128,6 @@ std::string ITipHandler::toIMip(const Event &event , ITipHandler::ITipMethod m,
KCalCore::iTIPMethod method = mapToKCalCore(m);
const QString &messageText = format.createScheduleMessage( e, method );
//This code is mostly from MailScheduler::performTransaction
- bool status;
if ( method == KCalCore::iTIPRequest ||
method == KCalCore::iTIPCancel ||
method == KCalCore::iTIPAdd ||
diff --git a/kolabformat/kolabobject.cpp b/kolabformat/kolabobject.cpp
index cdaab74..6377968 100644
--- a/kolabformat/kolabobject.cpp
+++ b/kolabformat/kolabobject.cpp
@@ -41,20 +41,20 @@
namespace Kolab {
-static QString eventKolabType() { return QString::fromLatin1(KOLAB_TYPE_EVENT); };
-static QString todoKolabType() { return QString::fromLatin1(KOLAB_TYPE_TASK); };
-static QString journalKolabType() { return QString::fromLatin1(KOLAB_TYPE_JOURNAL); };
-static QString contactKolabType() { return QString::fromLatin1(KOLAB_TYPE_CONTACT); };
-static QString distlistKolabType() { return QString::fromLatin1(KOLAB_TYPE_DISTLIST); }
-static QString distlistKolabTypeCompat() { return QString::fromLatin1(KOLAB_TYPE_DISTLIST_COMPAT); }
-static QString noteKolabType() { return QString::fromLatin1(KOLAB_TYPE_NOTE); }
-static QString configurationKolabType() { return QString::fromLatin1(KOLAB_TYPE_CONFIGURATION); }
-static QString dictKolabType() { return QString::fromLatin1(KOLAB_TYPE_DICT); }
-static QString freebusyKolabType() { return QString::fromLatin1(KOLAB_TYPE_FREEBUSY); }
-
-static QString xCalMimeType() { return QString::fromLatin1(MIME_TYPE_XCAL); };
-static QString xCardMimeType() { return QString::fromLatin1(MIME_TYPE_XCARD); };
-static QString kolabMimeType() { return QString::fromLatin1(MIME_TYPE_KOLAB); };
+static inline QString eventKolabType() { return QString::fromLatin1(KOLAB_TYPE_EVENT); };
+static inline QString todoKolabType() { return QString::fromLatin1(KOLAB_TYPE_TASK); };
+static inline QString journalKolabType() { return QString::fromLatin1(KOLAB_TYPE_JOURNAL); };
+static inline QString contactKolabType() { return QString::fromLatin1(KOLAB_TYPE_CONTACT); };
+static inline QString distlistKolabType() { return QString::fromLatin1(KOLAB_TYPE_DISTLIST); }
+static inline QString distlistKolabTypeCompat() { return QString::fromLatin1(KOLAB_TYPE_DISTLIST_COMPAT); }
+static inline QString noteKolabType() { return QString::fromLatin1(KOLAB_TYPE_NOTE); }
+static inline QString configurationKolabType() { return QString::fromLatin1(KOLAB_TYPE_CONFIGURATION); }
+static inline QString dictKolabType() { return QString::fromLatin1(KOLAB_TYPE_DICT); }
+static inline QString freebusyKolabType() { return QString::fromLatin1(KOLAB_TYPE_FREEBUSY); }
+
+static inline QString xCalMimeType() { return QString::fromLatin1(MIME_TYPE_XCAL); };
+static inline QString xCardMimeType() { return QString::fromLatin1(MIME_TYPE_XCARD); };
+static inline QString kolabMimeType() { return QString::fromLatin1(MIME_TYPE_KOLAB); };
KCalCore::Event::Ptr readV2EventXML(const QByteArray& xmlData, QStringList& attachments)
{
diff --git a/kolabformat/v2helpers.cpp b/kolabformat/v2helpers.cpp
index 9093b4d..d023a6a 100644
--- a/kolabformat/v2helpers.cpp
+++ b/kolabformat/v2helpers.cpp
@@ -120,7 +120,7 @@ KABC::Addressee addresseeFromKolab(const QByteArray &xmlData, QString &pictureAt
return addressee;
}
-static QByteArray createPicture(const QImage &img, const QString &format, QString &type)
+static QByteArray createPicture(const QImage &img, const QString &/*format*/, QString &type)
{
QByteArray pic;
QBuffer buffer(&pic);
diff --git a/tests/calendaringtest.cpp b/tests/calendaringtest.cpp
index 2694c33..d1ed07e 100644
--- a/tests/calendaringtest.cpp
+++ b/tests/calendaringtest.cpp
@@ -31,7 +31,7 @@
void compareEvents(const std::vector<Kolab::Event> &list1, const std::vector<Kolab::Event> &list2)
{
QCOMPARE(list1.size(), list2.size());
- for (int i = 0; i < list1.size(); i++) {
+ for (std::size_t i = 0; i < list1.size(); i++) {
const Kolab::Event &e1 = list1.at(i);
const Kolab::Event &e2 = list2.at(i);
// qDebug() << i;
@@ -150,7 +150,7 @@ void CalendaringTest::testEventConflictSet()
r2.push_back(createEvent(Kolab::cDateTime(2011,10,9,12,1,1,true), Kolab::cDateTime(2011,10,11,12,1,1,true)));
expectedResult.push_back(r2);
- for (int i = 0; i < result.size(); i++) {
+ for (std::size_t i = 0; i < result.size(); i++) {
const std::vector<Kolab::Event> &list = result.at(i);
qDebug() << "---------_Set--------------";
diff --git a/tests/freebusytest.cpp b/tests/freebusytest.cpp
index 26afe39..500275c 100644
--- a/tests/freebusytest.cpp
+++ b/tests/freebusytest.cpp
@@ -123,7 +123,7 @@ void FreebusyTest::testFB()
Kolab::Freebusy fb = Kolab::FreebusyUtils::generateFreeBusy(events, start, end);
QCOMPARE((int)fb.periods().size(), (int)output.size());
- for (int i = 0; i<output.size(); i++) {
+ for (std::size_t i = 0; i<output.size(); i++) {
std::cout << i;
QCOMPARE(fb.periods().at(i), output.at(i));
}
diff --git a/tests/testhelpers.h b/tests/testhelpers.h
index 1d70126..84a2e46 100644
--- a/tests/testhelpers.h
+++ b/tests/testhelpers.h
@@ -214,7 +214,7 @@ namespace QTest {
char *toString(const std::vector<Kolab::ContactReference> &v)
{
QByteArray ba = "vector<Kolab::ContactReference>(";
- for (int i = 0; i < v.size(); i++) {
+ for (std::size_t i = 0; i < v.size(); i++) {
ba += QByteArray(toString(v.at(i)))+ "\n";
}
ba += ")";
@@ -242,7 +242,7 @@ namespace QTest {
char *toString(const std::vector<Kolab::Attendee> &v)
{
QByteArray ba = "vector<Kolab::Attendee>(";
- for (int i = 0; i < v.size(); i++) {
+ for (std::size_t i = 0; i < v.size(); i++) {
ba += QByteArray(toString(v.at(i)))+ "\n";
ba += QByteArray("#######################")+ "\n";
}
@@ -264,7 +264,7 @@ namespace QTest {
char *toString(const std::vector<Kolab::CustomProperty> &v)
{
QByteArray ba = "vector<Kolab::CustomProperty>(";
- for (int i = 0; i < v.size(); i++) {
+ for (std::size_t i = 0; i < v.size(); i++) {
ba += QByteArray(toString(v.at(i)))+ "\n";
}
ba += ")";
@@ -285,7 +285,7 @@ namespace QTest {
char *toString(const std::vector<Kolab::Period> &v)
{
QByteArray ba = "vector<Kolab::Period>(";
- for (int i = 0; i < v.size(); i++) {
+ for (std::size_t i = 0; i < v.size(); i++) {
ba += QByteArray(toString(v.at(i)))+ "\n";
}
ba += ")";
diff --git a/tests/testutils.h b/tests/testutils.h
index 5056587..e6bb15c 100644
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -69,7 +69,7 @@ void showDiff(const QString &expected, const QString &converted)
// qDebug() << "CONVERTED: " << converted;
}
-static KMime::Message::Ptr readMimeFile( const QString &fileName, bool &ok)
+KMime::Message::Ptr readMimeFile( const QString &fileName, bool &ok)
{
// qDebug() << fileName;
QFile file( fileName );
@@ -88,7 +88,7 @@ static KMime::Message::Ptr readMimeFile( const QString &fileName, bool &ok)
}
//Normalize incidences for comparison
-static void normalizeIncidence( KCalCore::Incidence::Ptr incidence)
+void normalizeIncidence( KCalCore::Incidence::Ptr incidence)
{
//The UID is not persistent (it's just the internal pointer), therefore we clear it
//TODO make sure that the UID does really not need to be persistent
commit c6b26b9d79a7234129b1e3f702914f18f2fc419d
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date: Thu Nov 8 17:19:36 2012 +0100
Also don't use braces in uids for f/b objects.
diff --git a/freebusy/freebusy.cpp b/freebusy/freebusy.cpp
index ae7bb98..878904b 100644
--- a/freebusy/freebusy.cpp
+++ b/freebusy/freebusy.cpp
@@ -127,6 +127,11 @@
namespace Kolab {
namespace FreebusyUtils {
+static QString createUuid()
+{
+ const QString uuid = QUuid::createUuid().toString();
+ return uuid.mid(1, uuid.size()-2);
+}
Kolab::Period addLocalPeriod( const KDateTime &eventStart, const KDateTime &eventEnd, const KDateTime &mDtStart, const KDateTime &mDtEnd)
{
@@ -238,7 +243,7 @@ Freebusy generateFreeBusy(const QList<KCalCore::Event::Ptr>& events, const KDate
freebusy.setStart(Kolab::Conversion::fromDate(start));
freebusy.setEnd(Kolab::Conversion::fromDate(end));
freebusy.setPeriods(freebusyPeriods);
- freebusy.setUid(QUuid::createUuid().toString().toStdString());
+ freebusy.setUid(createUuid().toStdString());
freebusy.setTimestamp(Kolab::Conversion::fromDate(KDateTime::currentUtcDateTime()));
if (organizer) {
freebusy.setOrganizer(ContactReference(Kolab::ContactReference::EmailReference, Kolab::Conversion::toStdString(organizer->email()), Kolab::Conversion::toStdString(organizer->name())));
@@ -280,7 +285,7 @@ Freebusy aggregateFreeBusy(const std::vector< Freebusy >& fbList, const std::str
aggregateFB.setStart(Kolab::Conversion::fromDate(start));
aggregateFB.setEnd(Kolab::Conversion::fromDate(end));
aggregateFB.setPeriods(periods);
- aggregateFB.setUid(QUuid::createUuid().toString().toStdString());
+ aggregateFB.setUid(createUuid().toStdString());
aggregateFB.setTimestamp(Kolab::Conversion::fromDate(KDateTime::currentUtcDateTime()));
aggregateFB.setOrganizer(ContactReference(Kolab::ContactReference::EmailReference, organizerEmail, organizerName));
return aggregateFB;
More information about the commits
mailing list