summaryrefslogtreecommitdiff
path: root/kolabformatV2
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-03-20 00:16:36 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-03-20 00:16:36 (GMT)
commited95547d29ea00519e9ea1f317f8717b91b2d9ad (patch)
treeaa75f7b102e8fdd19336b194e48b6d07e8de6d86 /kolabformatV2
parenta6c64f52fea90968477e554b51883224c7b4144a (diff)
downloadlibkolab-ed95547d29ea00519e9ea1f317f8717b91b2d9ad.tar.gz
Changed namespace to KolabV2 to avoid conflicts.
Diffstat (limited to 'kolabformatV2')
-rw-r--r--kolabformatV2/contact.cpp6
-rw-r--r--kolabformatV2/contact.h6
-rw-r--r--kolabformatV2/distributionlist.cpp4
-rw-r--r--kolabformatV2/distributionlist.h6
-rw-r--r--kolabformatV2/event.cpp2
-rw-r--r--kolabformatV2/event.h6
-rw-r--r--kolabformatV2/incidence.cpp2
-rw-r--r--kolabformatV2/incidence.h6
-rw-r--r--kolabformatV2/journal.cpp2
-rw-r--r--kolabformatV2/journal.h6
-rw-r--r--kolabformatV2/kolabbase.cpp2
-rw-r--r--kolabformatV2/kolabbase.h6
-rw-r--r--kolabformatV2/note.cpp2
-rw-r--r--kolabformatV2/note.h6
-rw-r--r--kolabformatV2/task.cpp2
-rw-r--r--kolabformatV2/task.h6
16 files changed, 35 insertions, 35 deletions
diff --git a/kolabformatV2/contact.cpp b/kolabformatV2/contact.cpp
index e421629..16ace5c 100644
--- a/kolabformatV2/contact.cpp
+++ b/kolabformatV2/contact.cpp
@@ -39,7 +39,7 @@
#include <QFile>
#include <float.h>
-using namespace Kolab;
+using namespace KolabV2;
static const char* s_pictureAttachmentName = "kolab-picture.png";
static const char* s_logoAttachmentName = "kolab-logo.png";
@@ -1182,7 +1182,7 @@ QImage Contact::loadPictureFromAddressee( const KABC::Picture& picture )
return img;
}
-QByteArray Kolab::Contact::loadSoundFromAddressee( const KABC::Sound& sound )
+QByteArray KolabV2::Contact::loadSoundFromAddressee( const KABC::Sound& sound )
{
QByteArray data;
if ( !sound.isIntern() && !sound.url().isEmpty() ) {
@@ -1200,7 +1200,7 @@ QByteArray Kolab::Contact::loadSoundFromAddressee( const KABC::Sound& sound )
return data;
}
-QString Kolab::Contact::productID() const
+QString KolabV2::Contact::productID() const
{
// TODO: When KAB has the version number in a header file, don't hardcode (Bo)
// Or we could use Addressee::productID? (David)
diff --git a/kolabformatV2/contact.h b/kolabformatV2/contact.h
index ba88a77..96f954a 100644
--- a/kolabformatV2/contact.h
+++ b/kolabformatV2/contact.h
@@ -30,8 +30,8 @@
your version.
*/
-#ifndef KOLABCONTACT_H
-#define KOLABCONTACT_H
+#ifndef KOLABV2CONTACT_H
+#define KOLABV2CONTACT_H
#include "kolabbase.h"
#include <qimage.h>
@@ -42,7 +42,7 @@ namespace KABC {
class Sound;
}
-namespace Kolab {
+namespace KolabV2 {
class Contact : public KolabBase {
public:
diff --git a/kolabformatV2/distributionlist.cpp b/kolabformatV2/distributionlist.cpp
index 840c5a8..f011458 100644
--- a/kolabformatV2/distributionlist.cpp
+++ b/kolabformatV2/distributionlist.cpp
@@ -37,7 +37,7 @@
#include <kabc/contactgroup.h>
#include <kdebug.h>
-using namespace Kolab;
+using namespace KolabV2;
static const char* s_unhandledTagAppName = "KOLABUNHANDLED"; // no hyphens in appnames!
@@ -67,7 +67,7 @@ QString DistributionList::name() const
return mName;
}
-void Kolab::DistributionList::loadDistrListMember( const QDomElement& element )
+void KolabV2::DistributionList::loadDistrListMember( const QDomElement& element )
{
Member member;
for ( QDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
diff --git a/kolabformatV2/distributionlist.h b/kolabformatV2/distributionlist.h
index 33dc61d..c0a42e0 100644
--- a/kolabformatV2/distributionlist.h
+++ b/kolabformatV2/distributionlist.h
@@ -29,8 +29,8 @@
your version.
*/
-#ifndef KOLABDISTRIBUTIONLIST_H
-#define KOLABDISTRIBUTIONLIST_H
+#ifndef KOLABV2DISTRIBUTIONLIST_H
+#define KOLABV2DISTRIBUTIONLIST_H
#include "kolabbase.h"
@@ -38,7 +38,7 @@ namespace KABC {
class ContactGroup;
}
-namespace Kolab {
+namespace KolabV2 {
class DistributionList : public KolabBase {
public:
diff --git a/kolabformatV2/event.cpp b/kolabformatV2/event.cpp
index 103ced3..b09612d 100644
--- a/kolabformatV2/event.cpp
+++ b/kolabformatV2/event.cpp
@@ -36,7 +36,7 @@
#include <kcalcore/event.h>
#include <kdebug.h>
-using namespace Kolab;
+using namespace KolabV2;
KCalCore::Event::Ptr Event::fromXml( const QDomDocument& xmlDoc, const QString& tz)
diff --git a/kolabformatV2/event.h b/kolabformatV2/event.h
index acc327b..be0d4bf 100644
--- a/kolabformatV2/event.h
+++ b/kolabformatV2/event.h
@@ -31,8 +31,8 @@
your version.
*/
-#ifndef KOLAB_EVENT_H
-#define KOLAB_EVENT_H
+#ifndef KOLABV2_EVENT_H
+#define KOLABV2_EVENT_H
#include "incidence.h"
@@ -41,7 +41,7 @@
class QDomElement;
-namespace Kolab {
+namespace KolabV2 {
/**
* This class represents an event, and knows how to load/save it
diff --git a/kolabformatV2/incidence.cpp b/kolabformatV2/incidence.cpp
index 9f4323f..fcd5803 100644
--- a/kolabformatV2/incidence.cpp
+++ b/kolabformatV2/incidence.cpp
@@ -43,7 +43,7 @@
#include <QBitArray>
-using namespace Kolab;
+using namespace KolabV2;
Incidence::Incidence( const QString& tz, const KCalCore::Incidence::Ptr &incidence )
diff --git a/kolabformatV2/incidence.h b/kolabformatV2/incidence.h
index 2b96776..ad1fa72 100644
--- a/kolabformatV2/incidence.h
+++ b/kolabformatV2/incidence.h
@@ -31,8 +31,8 @@
your version.
*/
-#ifndef KOLAB_INCIDENCE_H
-#define KOLAB_INCIDENCE_H
+#ifndef KOLABV2_INCIDENCE_H
+#define KOLABV2_INCIDENCE_H
#include <kcalcore/incidence.h>
@@ -40,7 +40,7 @@
class QDomElement;
-namespace Kolab {
+namespace KolabV2 {
/**
* This abstract class represents an incidence which has the shared
diff --git a/kolabformatV2/journal.cpp b/kolabformatV2/journal.cpp
index c9c2c1b..471b05f 100644
--- a/kolabformatV2/journal.cpp
+++ b/kolabformatV2/journal.cpp
@@ -36,7 +36,7 @@
#include <kdebug.h>
-using namespace Kolab;
+using namespace KolabV2;
KCalCore::Journal::Ptr Journal::fromXml( const QDomDocument& xmlDoc, const QString& tz )
diff --git a/kolabformatV2/journal.h b/kolabformatV2/journal.h
index a049c86..bcd3e30 100644
--- a/kolabformatV2/journal.h
+++ b/kolabformatV2/journal.h
@@ -31,8 +31,8 @@
your version.
*/
-#ifndef KOLAB_JOURNAL_H
-#define KOLAB_JOURNAL_H
+#ifndef KOLABV2_JOURNAL_H
+#define KOLABV2_JOURNAL_H
#include <kcalcore/journal.h>
@@ -40,7 +40,7 @@
class QDomElement;
-namespace Kolab {
+namespace KolabV2 {
/**
* This class represents a journal entry, and knows how to load/save it
diff --git a/kolabformatV2/kolabbase.cpp b/kolabformatV2/kolabbase.cpp
index 4315f3e..a51d254 100644
--- a/kolabformatV2/kolabbase.cpp
+++ b/kolabformatV2/kolabbase.cpp
@@ -40,7 +40,7 @@
#include <ksystemtimezone.h>
#include <kdebug.h>
-using namespace Kolab;
+using namespace KolabV2;
KolabBase::KolabBase( const QString& tz )
: mCreationDate( QDateTime::currentDateTime() ),
diff --git a/kolabformatV2/kolabbase.h b/kolabformatV2/kolabbase.h
index 5044bc3..a1c3db9 100644
--- a/kolabformatV2/kolabbase.h
+++ b/kolabformatV2/kolabbase.h
@@ -31,8 +31,8 @@
your version.
*/
-#ifndef KOLABBASE_H
-#define KOLABBASE_H
+#ifndef KOLABV2BASE_H
+#define KOLABV2BASE_H
#include <kcalcore/incidence.h>
@@ -48,7 +48,7 @@ namespace KABC {
class ContactGroup;
}
-namespace Kolab {
+namespace KolabV2 {
class KolabBase {
public:
diff --git a/kolabformatV2/note.cpp b/kolabformatV2/note.cpp
index 65afebe..419fa5c 100644
--- a/kolabformatV2/note.cpp
+++ b/kolabformatV2/note.cpp
@@ -37,7 +37,7 @@
#include <kcalcore/journal.h>
#include <kdebug.h>
-using namespace Kolab;
+using namespace KolabV2;
KCalCore::Journal::Ptr Note::xmlToJournal( const QString& xml )
diff --git a/kolabformatV2/note.h b/kolabformatV2/note.h
index b0291c4..c88c659 100644
--- a/kolabformatV2/note.h
+++ b/kolabformatV2/note.h
@@ -31,8 +31,8 @@
your version.
*/
-#ifndef KOLAB_NOTE_H
-#define KOLAB_NOTE_H
+#ifndef KOLABV2_NOTE_H
+#define KOLABV2_NOTE_H
#include <kcalcore/journal.h>
@@ -40,7 +40,7 @@
class QDomElement;
-namespace Kolab {
+namespace KolabV2 {
/**
* This class represents a note, and knows how to load/save it
diff --git a/kolabformatV2/task.cpp b/kolabformatV2/task.cpp
index 974fdb2..fef0d30 100644
--- a/kolabformatV2/task.cpp
+++ b/kolabformatV2/task.cpp
@@ -36,7 +36,7 @@
#include <kcalcore/todo.h>
#include <kdebug.h>
-using namespace Kolab;
+using namespace KolabV2;
// Kolab Storage Specification:
// "The priority can be a number between 1 and 5, with 1 being the highest priority."
diff --git a/kolabformatV2/task.h b/kolabformatV2/task.h
index bafc160..148d164 100644
--- a/kolabformatV2/task.h
+++ b/kolabformatV2/task.h
@@ -31,8 +31,8 @@
your version.
*/
-#ifndef KOLAB_TASK_H
-#define KOLAB_TASK_H
+#ifndef KOLABV2_TASK_H
+#define KOLABV2_TASK_H
#include <incidence.h>
@@ -45,7 +45,7 @@ namespace KCal {
class ResourceKolab;
}
-namespace Kolab {
+namespace KolabV2 {
/**
* This class represents a task, and knows how to load/save it