diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
| commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
| tree | c76702a7f6310fbe9d437e347535422e836e94e9 /tdecore/kcalendarsystem.cpp | |
| parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
| parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
| download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdecore/kcalendarsystem.cpp')
| -rw-r--r-- | tdecore/kcalendarsystem.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tdecore/kcalendarsystem.cpp b/tdecore/kcalendarsystem.cpp index 57898da84..20d00d181 100644 --- a/tdecore/kcalendarsystem.cpp +++ b/tdecore/kcalendarsystem.cpp @@ -22,18 +22,18 @@ // systems. // Also default gregorian and factory classes -#include <kglobal.h> +#include <tdeglobal.h> #include "kcalendarsystem.h" -#include "klocale.h" +#include "tdelocale.h" class KCalendarSystemPrivate { public: - const KLocale * locale; + const TDELocale * locale; }; -KCalendarSystem::KCalendarSystem(const KLocale * locale) +KCalendarSystem::KCalendarSystem(const TDELocale * locale) : d(new KCalendarSystemPrivate) { d->locale = locale; @@ -44,12 +44,12 @@ KCalendarSystem::~KCalendarSystem() delete d; } -const KLocale * KCalendarSystem::locale() const +const TDELocale * KCalendarSystem::locale() const { if ( d->locale ) return d->locale; - return KGlobal::locale(); + return TDEGlobal::locale(); } TQString KCalendarSystem::dayString(const TQDate & pDate, bool bShort) const |