Commit bed8cace authored by Volker Krause's avatar Volker Krause
Browse files

Remove the last traces of KCalendarSystem from KOrganizer.

parent b7f8c7a3
...@@ -37,7 +37,6 @@ public: ...@@ -37,7 +37,6 @@ public:
virtual QColor categoryColor(const QStringList &cats) = 0; virtual QColor categoryColor(const QStringList &cats) = 0;
virtual QString holidayString(const QDate &dt) = 0; virtual QString holidayString(const QDate &dt) = 0;
virtual QTime dayStart() = 0; virtual QTime dayStart() = 0;
virtual const KCalendarSystem *calendarSystem() = 0;
}; };
} }
......
...@@ -45,10 +45,6 @@ public: ...@@ -45,10 +45,6 @@ public:
QTime dayStart() Q_DECL_OVERRIDE { QTime dayStart() Q_DECL_OVERRIDE {
return KOPrefs::instance()->mDayBegins.time(); return KOPrefs::instance()->mDayBegins.time();
} }
const KCalendarSystem *calendarSystem() Q_DECL_OVERRIDE {
return KOGlobals::self()->calendarSystem();
}
}; };
#endif #endif
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <KIconLoader> #include <KIconLoader>
#include <QApplication> #include <QApplication>
#include <KLocale>
class KOGlobalsSingletonPrivate class KOGlobalsSingletonPrivate
{ {
...@@ -54,11 +53,6 @@ KOGlobals::~KOGlobals() ...@@ -54,11 +53,6 @@ KOGlobals::~KOGlobals()
delete mHolidays; delete mHolidays;
} }
const KCalendarSystem *KOGlobals::calendarSystem() const
{
return KLocale::global()->calendar();
}
bool KOGlobals::reverseLayout() bool KOGlobals::reverseLayout()
{ {
return QApplication::isRightToLeft(); return QApplication::isRightToLeft();
......
...@@ -38,8 +38,6 @@ namespace KHolidays ...@@ -38,8 +38,6 @@ namespace KHolidays
class HolidayRegion; class HolidayRegion;
} }
class KCalendarSystem;
class KORGANIZERPRIVATE_EXPORT KOGlobals class KORGANIZERPRIVATE_EXPORT KOGlobals
{ {
friend class KOGlobalsSingletonPrivate; friend class KOGlobalsSingletonPrivate;
...@@ -48,8 +46,6 @@ public: ...@@ -48,8 +46,6 @@ public:
static bool reverseLayout(); static bool reverseLayout();
const KCalendarSystem *calendarSystem() const;
~KOGlobals(); ~KOGlobals();
QPixmap smallIcon(const QString &name) const; QPixmap smallIcon(const QString &name) const;
......
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