From 6dea9442526e5ebacf313ad387c7dff4b87a53bf Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 08:19:44 -0600
Subject: Rename KLocale to enhance compatibility with KDE4

---
 korganizer/koeditorgeneralevent.cpp            | 2 +-
 korganizer/koeditorgeneraltodo.cpp             | 2 +-
 korganizer/korgac/korgacmain.cpp               | 2 +-
 korganizer/plugins/printing/year/yearprint.cpp | 2 +-
 korganizer/printing/calprintdefaultplugins.cpp | 4 ++--
 korganizer/printing/calprintpluginbase.cpp     | 4 ++--
 korganizer/timezone.cpp                        | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'korganizer')

diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index 67c0654b..47cb603a 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -468,7 +468,7 @@ void KOEditorGeneralEvent::setDuration()
 
 void KOEditorGeneralEvent::emitDateTimeStr()
 {
-  KLocale *l = TDEGlobal::locale();
+  TDELocale *l = TDEGlobal::locale();
 
   TQString from,to;
   if (mAlldayEventCheckbox->isChecked()) {
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index 22667c46..132c3290 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -565,7 +565,7 @@ void KOEditorGeneralTodo::completedChanged()
 
 void KOEditorGeneralTodo::dateChanged()
 {
-  KLocale *l = TDEGlobal::locale();
+  TDELocale *l = TDEGlobal::locale();
   TQString dateTimeStr = "";
 
   if ( mStartCheck->isChecked() ) {
diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp
index afa7fe45..0db40fed 100644
--- a/korganizer/korgac/korgacmain.cpp
+++ b/korganizer/korgac/korgacmain.cpp
@@ -61,7 +61,7 @@ static const KCmdLineOptions options[] =
 
 int main( int argc, char **argv )
 {
-  KLocale::setMainCatalogue( "korganizer" );
+  TDELocale::setMainCatalogue( "korganizer" );
   TDEAboutData aboutData( "korgac", I18N_NOOP("KOrganizer Reminder Daemon"),
                         korgacVersion, I18N_NOOP("KOrganizer Reminder Daemon"),
                         TDEAboutData::License_GPL,
diff --git a/korganizer/plugins/printing/year/yearprint.cpp b/korganizer/plugins/printing/year/yearprint.cpp
index bf039d2d..41d54c24 100644
--- a/korganizer/plugins/printing/year/yearprint.cpp
+++ b/korganizer/plugins/printing/year/yearprint.cpp
@@ -138,7 +138,7 @@ void CalPrintYear::setDateRange( const TQDate& from, const TQDate& to )
 void CalPrintYear::print( TQPainter &p, int width, int height )
 {
   const KCalendarSystem *calsys = calendarSystem();
-  KLocale *locale = TDEGlobal::locale();
+  TDELocale *locale = TDEGlobal::locale();
   if ( !calsys || !locale ) return;
 
   TQRect headerBox( 0, 0, width, headerHeight() );
diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp
index 8ed37660..6491e548 100644
--- a/korganizer/printing/calprintdefaultplugins.cpp
+++ b/korganizer/printing/calprintdefaultplugins.cpp
@@ -705,7 +705,7 @@ void CalPrintDay::print( TQPainter &p, int width, int height )
   TQRect footerBox( 0, height - footerHeight(), width, footerHeight() );
   height -= footerHeight();
 
-  KLocale *local = TDEGlobal::locale();
+  TDELocale *local = TDEGlobal::locale();
 
   do {
     TQTime curStartTime( mStartTime );
@@ -915,7 +915,7 @@ void CalPrintWeek::print( TQPainter &p, int width, int height )
   toWeek = mToDate.addDays( 6 - weekdayCol );
 
   curWeek = fromWeek.addDays( 6 );
-  KLocale *local = TDEGlobal::locale();
+  TDELocale *local = TDEGlobal::locale();
 
   TQString line1, line2, title;
   TQRect headerBox( 0, 0, width, headerHeight() );
diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp
index f754e52d..9eecda39 100644
--- a/korganizer/printing/calprintpluginbase.cpp
+++ b/korganizer/printing/calprintpluginbase.cpp
@@ -927,7 +927,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
     bool fullDate, bool printRecurDaily, bool printRecurWeekly )
 {
   TQString dayNumStr;
-  const KLocale*local = TDEGlobal::locale();
+  const TDELocale*local = TDEGlobal::locale();
 
   // This has to be localized
   if ( fullDate && mCalSys ) {
@@ -1423,7 +1423,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
                                TodoParentStart *r )
 {
   TQString outStr;
-  const KLocale *local = TDEGlobal::locale();
+  const TDELocale *local = TDEGlobal::locale();
   TQRect rect;
   TodoParentStart startpt;
 
diff --git a/korganizer/timezone.cpp b/korganizer/timezone.cpp
index 73891c2d..69e0b4f0 100644
--- a/korganizer/timezone.cpp
+++ b/korganizer/timezone.cpp
@@ -58,6 +58,6 @@ int main(int argc,char **argv)
   kdDebug(5850) << "TQDateTime::currentTime(): "
             << qtime.toString( TQt::ISODate ) << endl;
 
-  kdDebug(5850) << "KLocale::formatTime(): "
+  kdDebug(5850) << "TDELocale::formatTime(): "
             << TDEGlobal::locale()->formatTime( qtime ) << endl;
 }
-- 
cgit v1.2.3