summaryrefslogtreecommitdiffstats
path: root/tdeui/kdatewidget.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:57:34 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:57:34 -0600
commit7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch)
treec76702a7f6310fbe9d437e347535422e836e94e9 /tdeui/kdatewidget.cpp
parenta2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff)
parent27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff)
downloadtdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz
tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdeui/kdatewidget.cpp')
-rw-r--r--tdeui/kdatewidget.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tdeui/kdatewidget.cpp b/tdeui/kdatewidget.cpp
index ba46a599b..e9185a9c1 100644
--- a/tdeui/kdatewidget.cpp
+++ b/tdeui/kdatewidget.cpp
@@ -23,8 +23,8 @@
#include <tqlineedit.h>
#include "knuminput.h"
-#include "kglobal.h"
-#include "klocale.h"
+#include "tdeglobal.h"
+#include "tdelocale.h"
#include "kcalendarsystem.h"
//#include "kdatepicker.h"
#include "kdialog.h"
@@ -72,7 +72,7 @@ KDateWidget::KDateWidget( TQDate date, TQWidget *parent,
void KDateWidget::init()
{
d = new KDateWidgetPrivate;
- KLocale *locale = KGlobal::locale();
+ TDELocale *locale = TDEGlobal::locale();
TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
layout->setAutoAdd(true);
d->m_day = new KDateWidgetSpinBox(1, 1, this);
@@ -96,7 +96,7 @@ void KDateWidget::init()
void KDateWidget::init(const TQDate& date)
{
d = new KDateWidgetPrivate;
- KLocale *locale = KGlobal::locale();
+ TDELocale *locale = TDEGlobal::locale();
TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
layout->setAutoAdd(true);
d->m_day = new KDateWidgetSpinBox(1, 1, this);
@@ -125,7 +125,7 @@ KDateWidget::~KDateWidget()
// ### HPB change TQDate to const TQDate & in KDE 4.0
void KDateWidget::setDate( TQDate date )
{
- const KCalendarSystem * calendar = KGlobal::locale()->calendar();
+ const KCalendarSystem * calendar = TDEGlobal::locale()->calendar();
d->m_day->blockSignals(true);
d->m_month->blockSignals(true);
@@ -151,7 +151,7 @@ TQDate KDateWidget::date() const
void KDateWidget::slotDateChanged( )
{
- const KCalendarSystem * calendar = KGlobal::locale()->calendar();
+ const KCalendarSystem * calendar = TDEGlobal::locale()->calendar();
TQDate date;
int y,m,day;