Commit ac9b701b authored by Laurent Montel's avatar Laurent Montel 😁

It was moved here without change namespace...

parent 24d2288d
......@@ -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")
......
......@@ -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.
......
......@@ -22,7 +22,7 @@
#include <QObject>
namespace KPIM
namespace CalendarSupport
{
class FreeBusyItemModelTest: public QObject
......
......@@ -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.
......
......@@ -22,7 +22,7 @@
#include <QObject>
namespace KPIM
namespace CalendarSupport
{
class FreePeriodModelTest: public QObject
......
......@@ -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;
......
......@@ -29,7 +29,7 @@
#include <KCalCore/Calendar>
#include <KCalCore/Event>
namespace KPIM
namespace CalendarSupport
{
class FreeBusyCalendarPrivate;
class CALENDARSUPPORT_EXPORT FreeBusyCalendar : public QObject
......
......@@ -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)
......
......@@ -27,7 +27,7 @@
#include <KCalCore/FreeBusy>
namespace KPIM
namespace CalendarSupport
{
/**
......
......@@ -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");
......
......@@ -30,7 +30,7 @@
class ItemPrivateData;
namespace KPIM
namespace CalendarSupport
{
/**
......
......@@ -29,7 +29,7 @@
#include <QLocale>
#include <QSet>
using namespace KPIM;
using namespace CalendarSupport;
FreePeriodModel::FreePeriodModel(QObject *parent)
: QAbstractTableModel(parent)
......
......@@ -27,7 +27,7 @@
#include <QAbstractTableModel>
namespace KPIM
namespace CalendarSupport
{
class CALENDARSUPPORT_EXPORT FreePeriodModel : public QAbstractTableModel
......
......@@ -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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment