summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-07-29 06:27:26 (GMT)
committerMontel Laurent <montel@kde.org>2016-07-29 06:27:26 (GMT)
commitac9b701b47c4150b21b19fda1ab6a73b61458a47 (patch)
tree8387b50dc858504037dc17f06b37ab130966b5a5
parent24d2288d5d245b69e34c2646bc9b0004b209a327 (diff)
It was moved here without change namespace...
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/freebusymodel/autotests/testfreebusyitemmodel.cpp2
-rw-r--r--src/freebusymodel/autotests/testfreebusyitemmodel.h2
-rw-r--r--src/freebusymodel/autotests/testfreeperiodmodel.cpp2
-rw-r--r--src/freebusymodel/autotests/testfreeperiodmodel.h2
-rw-r--r--src/freebusymodel/freebusycalendar.cpp6
-rw-r--r--src/freebusymodel/freebusycalendar.h2
-rw-r--r--src/freebusymodel/freebusyitem.cpp2
-rw-r--r--src/freebusymodel/freebusyitem.h2
-rw-r--r--src/freebusymodel/freebusyitemmodel.cpp6
-rw-r--r--src/freebusymodel/freebusyitemmodel.h2
-rw-r--r--src/freebusymodel/freeperiodmodel.cpp2
-rw-r--r--src/freebusymodel/freeperiodmodel.h2
-rw-r--r--src/kcalprefs.cpp2
14 files changed, 18 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e47c371..fac9acd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
-set(PIM_VERSION "5.3.40")
+set(PIM_VERSION "5.3.41")
set(CALENDARSUPPORT_LIB_VERSION ${PIM_VERSION})
set(AKONADI_MIMELIB_VERSION "5.3.40")
diff --git a/src/freebusymodel/autotests/testfreebusyitemmodel.cpp b/src/freebusymodel/autotests/testfreebusyitemmodel.cpp
index 21a12a1..a0ddb95 100644
--- a/src/freebusymodel/autotests/testfreebusyitemmodel.cpp
+++ b/src/freebusymodel/autotests/testfreebusyitemmodel.cpp
@@ -27,7 +27,7 @@
#include <qtest.h>
-using namespace KPIM;
+using namespace CalendarSupport;
// Workaround QTBUG-51789 causing a crash when QtWebEngineWidgets
// is linked into a QCoreApplication.
diff --git a/src/freebusymodel/autotests/testfreebusyitemmodel.h b/src/freebusymodel/autotests/testfreebusyitemmodel.h
index 8459970..c2a93b8 100644
--- a/src/freebusymodel/autotests/testfreebusyitemmodel.h
+++ b/src/freebusymodel/autotests/testfreebusyitemmodel.h
@@ -22,7 +22,7 @@
#include <QObject>
-namespace KPIM
+namespace CalendarSupport
{
class FreeBusyItemModelTest: public QObject
diff --git a/src/freebusymodel/autotests/testfreeperiodmodel.cpp b/src/freebusymodel/autotests/testfreeperiodmodel.cpp
index c52b1ae..bc51dc3 100644
--- a/src/freebusymodel/autotests/testfreeperiodmodel.cpp
+++ b/src/freebusymodel/autotests/testfreeperiodmodel.cpp
@@ -27,7 +27,7 @@
#include <qtest.h>
-using namespace KPIM;
+using namespace CalendarSupport;
// Workaround QTBUG-51789 causing a crash when QtWebEngineWidgets
// is linked into a QCoreApplication.
diff --git a/src/freebusymodel/autotests/testfreeperiodmodel.h b/src/freebusymodel/autotests/testfreeperiodmodel.h
index aa970da..efc02fb 100644
--- a/src/freebusymodel/autotests/testfreeperiodmodel.h
+++ b/src/freebusymodel/autotests/testfreeperiodmodel.h
@@ -22,7 +22,7 @@
#include <QObject>
-namespace KPIM
+namespace CalendarSupport
{
class FreePeriodModelTest: public QObject
diff --git a/src/freebusymodel/freebusycalendar.cpp b/src/freebusymodel/freebusycalendar.cpp
index 2849e4c..f13e727 100644
--- a/src/freebusymodel/freebusycalendar.cpp
+++ b/src/freebusymodel/freebusycalendar.cpp
@@ -32,9 +32,9 @@
#include <QStringList>
-using namespace KPIM;
+using namespace CalendarSupport;
-class KPIM::FreeBusyCalendarPrivate
+class CalendarSupport::FreeBusyCalendarPrivate
{
public:
FreeBusyCalendarPrivate()
@@ -50,7 +50,7 @@ public:
FreeBusyCalendar::FreeBusyCalendar(QObject *parent)
: QObject(parent)
- , d(new KPIM::FreeBusyCalendarPrivate)
+ , d(new CalendarSupport::FreeBusyCalendarPrivate)
{
d->mCalendar = KCalCore::Calendar::Ptr(new KCalCore::MemoryCalendar(KSystemTimeZones::local()));
qCDebug(CALENDARSUPPORT_LOG) << "creating" << this;
diff --git a/src/freebusymodel/freebusycalendar.h b/src/freebusymodel/freebusycalendar.h
index 213a2bb..2a29615 100644
--- a/src/freebusymodel/freebusycalendar.h
+++ b/src/freebusymodel/freebusycalendar.h
@@ -29,7 +29,7 @@
#include <KCalCore/Calendar>
#include <KCalCore/Event>
-namespace KPIM
+namespace CalendarSupport
{
class FreeBusyCalendarPrivate;
class CALENDARSUPPORT_EXPORT FreeBusyCalendar : public QObject
diff --git a/src/freebusymodel/freebusyitem.cpp b/src/freebusymodel/freebusyitem.cpp
index 660fa7f..a2bdd9e 100644
--- a/src/freebusymodel/freebusyitem.cpp
+++ b/src/freebusymodel/freebusyitem.cpp
@@ -24,7 +24,7 @@
#include <Akonadi/Calendar/FreeBusyManager>
-using namespace KPIM;
+using namespace CalendarSupport;
FreeBusyItem::FreeBusyItem(const KCalCore::Attendee::Ptr &attendee, QWidget *parentWidget)
: mAttendee(attendee)
diff --git a/src/freebusymodel/freebusyitem.h b/src/freebusymodel/freebusyitem.h
index 5523669..40e703d 100644
--- a/src/freebusymodel/freebusyitem.h
+++ b/src/freebusymodel/freebusyitem.h
@@ -27,7 +27,7 @@
#include <KCalCore/FreeBusy>
-namespace KPIM
+namespace CalendarSupport
{
/**
diff --git a/src/freebusymodel/freebusyitemmodel.cpp b/src/freebusymodel/freebusyitemmodel.cpp
index 5db48a6..e65d78c 100644
--- a/src/freebusymodel/freebusyitemmodel.cpp
+++ b/src/freebusymodel/freebusyitemmodel.cpp
@@ -26,7 +26,7 @@
#include <QTimerEvent>
-using namespace KPIM;
+using namespace CalendarSupport;
class ItemPrivateData
{
@@ -78,7 +78,7 @@ private:
ItemPrivateData *parentItem;
};
-class KPIM::FreeBusyItemModelPrivate
+class CalendarSupport::FreeBusyItemModelPrivate
{
public:
FreeBusyItemModelPrivate()
@@ -98,7 +98,7 @@ public:
};
FreeBusyItemModel::FreeBusyItemModel(QObject *parent)
- : QAbstractItemModel(parent), d(new KPIM::FreeBusyItemModelPrivate)
+ : QAbstractItemModel(parent), d(new CalendarSupport::FreeBusyItemModelPrivate)
{
qRegisterMetaType<KCalCore::Attendee::Ptr>("KCalCore::Attendee::Ptr");
qRegisterMetaType<KCalCore::FreeBusy::Ptr>("KCalCore::FreeBusy::Ptr");
diff --git a/src/freebusymodel/freebusyitemmodel.h b/src/freebusymodel/freebusyitemmodel.h
index 0742be3..485b711 100644
--- a/src/freebusymodel/freebusyitemmodel.h
+++ b/src/freebusymodel/freebusyitemmodel.h
@@ -30,7 +30,7 @@
class ItemPrivateData;
-namespace KPIM
+namespace CalendarSupport
{
/**
diff --git a/src/freebusymodel/freeperiodmodel.cpp b/src/freebusymodel/freeperiodmodel.cpp
index 343f954..b594535 100644
--- a/src/freebusymodel/freeperiodmodel.cpp
+++ b/src/freebusymodel/freeperiodmodel.cpp
@@ -29,7 +29,7 @@
#include <QLocale>
#include <QSet>
-using namespace KPIM;
+using namespace CalendarSupport;
FreePeriodModel::FreePeriodModel(QObject *parent)
: QAbstractTableModel(parent)
diff --git a/src/freebusymodel/freeperiodmodel.h b/src/freebusymodel/freeperiodmodel.h
index 2a19b61..66d5f06 100644
--- a/src/freebusymodel/freeperiodmodel.h
+++ b/src/freebusymodel/freeperiodmodel.h
@@ -27,7 +27,7 @@
#include <QAbstractTableModel>
-namespace KPIM
+namespace CalendarSupport
{
class CALENDARSUPPORT_EXPORT FreePeriodModel : public QAbstractTableModel
diff --git a/src/kcalprefs.cpp b/src/kcalprefs.cpp
index b31afec..5425c46 100644
--- a/src/kcalprefs.cpp
+++ b/src/kcalprefs.cpp
@@ -281,7 +281,7 @@ bool KCalPrefs::thatIsMe(const QString &_email)
// in case email contains a full name, strip it out.
// the below is the simpler but slower version of the following code:
- // const QString email = KPIM::getEmailAddress( _email );
+ // const QString email = CalendarSupport::getEmailAddress( _email );
const QByteArray tmp = _email.toUtf8();
const char *cursor = tmp.constData();
const char *end = tmp.data() + tmp.length();