From 6dea9442526e5ebacf313ad387c7dff4b87a53bf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 08:19:44 -0600 Subject: [PATCH] Rename KLocale to enhance compatibility with KDE4 --- kaddressbook/main.cpp | 2 +- kalarm/alarmlistview.cpp | 2 +- kmail/configuredialog.cpp | 2 +- kmail/headerstyle.cpp | 8 ++++---- kmail/kmcomposewin.cpp | 2 +- kmail/kmstartup.cpp | 2 +- kmail/templateparser.cpp | 8 ++++---- kmailcvt/main.cpp | 2 +- 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 +- libkmime/kmime_util.cpp | 6 +++--- libkmime/kmime_util.h | 12 ++++++------ libtdepim/broadcaststatus.cpp | 2 +- libtdepim/ktimeedit.cpp | 8 ++++---- tdeioslaves/mbox/mbox.cc | 2 +- wizards/egroupwaremain.cpp | 2 +- wizards/exchangemain.cpp | 2 +- wizards/groupwisemain.cpp | 2 +- wizards/kolabmain.cpp | 2 +- wizards/main.cpp | 2 +- wizards/scalixmain.cpp | 2 +- wizards/sloxmain.cpp | 2 +- 27 files changed, 45 insertions(+), 45 deletions(-) diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp index 16c5156e..fa2d03bf 100644 --- a/kaddressbook/main.cpp +++ b/kaddressbook/main.cpp @@ -111,7 +111,7 @@ int KAddressBookApp::newInstance() int main( int argc, char *argv[] ) { - KLocale::setMainCatalogue( "kaddressbook" ); + TDELocale::setMainCatalogue( "kaddressbook" ); TDECmdLineArgs::init( argc, argv, KABCore::createAboutData() ); TDECmdLineArgs::addCmdLineOptions( kaddressbook_options ); diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp index bf90dd86..6f88d3e4 100644 --- a/kalarm/alarmlistview.cpp +++ b/kalarm/alarmlistview.cpp @@ -493,7 +493,7 @@ TQString AlarmListViewItem::alarmText(const KAEvent& event) const */ TQString AlarmListViewItem::alarmTimeText(const DateTime& dateTime) const { - KLocale* locale = TDEGlobal::locale(); + TDELocale* locale = TDEGlobal::locale(); TQString dateTimeText = locale->formatDate(dateTime.date(), true); if (!dateTime.isDateOnly()) { diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 61e131b2..6c961518 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -3028,7 +3028,7 @@ void ComposerPage::PhrasesTab::slotAddNewLanguage( const TQString& lang ) { mPhraseLanguageCombo->setCurrentItem( mPhraseLanguageCombo->insertLanguage( lang ) ); - KLocale locale("kmail"); + TDELocale locale("kmail"); locale.setLanguage( lang ); mLanguageList.append( LanguageItem( lang, diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp index 1bf75f09..a762a7db 100644 --- a/kmail/headerstyle.cpp +++ b/kmail/headerstyle.cpp @@ -144,7 +144,7 @@ namespace KMail { TQString dateString; if( printing ) { TQDateTime dateTime; - KLocale * locale = TDEGlobal::locale(); + TDELocale * locale = TDEGlobal::locale(); dateTime.setTime_t( message->date() ); dateString = locale->formatDateTime( dateTime ); } else { @@ -243,7 +243,7 @@ namespace KMail { TQString dateString; if( printing ) { TQDateTime dateTime; - KLocale* locale = TDEGlobal::locale(); + TDELocale* locale = TDEGlobal::locale(); dateTime.setTime_t( message->date() ); dateString = locale->formatDateTime( dateTime ); } @@ -448,7 +448,7 @@ namespace KMail { TQString dateString; if( printing ) { TQDateTime dateTime; - KLocale* locale = TDEGlobal::locale(); + TDELocale* locale = TDEGlobal::locale(); dateTime.setTime_t( message->date() ); dateString = locale->formatDateTime( dateTime ); } @@ -914,7 +914,7 @@ namespace KMail { TQString dateString; if( printing ) { TQDateTime dateTime; - KLocale * locale = TDEGlobal::locale(); + TDELocale * locale = TDEGlobal::locale(); dateTime.setTime_t( message->date() ); dateString = locale->formatDateTime( dateTime ); } else { diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index fe145b82..636da6d3 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -2821,7 +2821,7 @@ void KMComposeWin::slotAttachFileResult(TDEIO::Job *job) partCharset = TQCString( ( *it ).url.fileEncoding().latin1() ); } else { EncodingDetector ed; - KLocale *loc = TDEGlobal::locale(); + TDELocale *loc = TDEGlobal::locale(); ed.setAutoDetectLanguage( EncodingDetector::scriptForLanguageCode ( loc->language() ) ); ed.analyze( (*it).data ); partCharset = ed.encoding(); diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp index 43346fbc..2473c871 100644 --- a/kmail/kmstartup.cpp +++ b/kmail/kmstartup.cpp @@ -250,7 +250,7 @@ void insertLibraryCataloguesAndIcons() { "libkmime" }; - KLocale * l = TDEGlobal::locale(); + TDELocale * l = TDEGlobal::locale(); KIconLoader * il = TDEGlobal::iconLoader(); for ( unsigned int i = 0 ; i < sizeof catalogues / sizeof *catalogues ; ++i ) { l->insertCatalogue( catalogues[i] ); diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp index 9f9a80cd..2ff9f56a 100644 --- a/kmail/templateparser.cpp +++ b/kmail/templateparser.cpp @@ -694,7 +694,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) kdDebug() << "Command: DATEEN" << endl; i += strlen( "DATEEN" ); TQDateTime date = TQDateTime::currentDateTime(); - KLocale locale( "C" ); + TDELocale locale( "C" ); TQString str = locale.formatDate( date.date(), false ); body.append( str ); @@ -723,7 +723,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) kdDebug() << "Command: TIMELONGEN" << endl; i += strlen( "TIMELONGEN" ); TQDateTime date = TQDateTime::currentDateTime(); - KLocale locale( "C"); + TDELocale locale( "C"); TQString str = locale.formatTime( date.time(), true ); body.append( str ); @@ -747,7 +747,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) if ( mOrigMsg ) { TQDateTime date; date.setTime_t( mOrigMsg->date() ); - KLocale locale( "C"); + TDELocale locale( "C"); TQString str = locale.formatDate( date.date(), false ); body.append( str ); } @@ -788,7 +788,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) if ( mOrigMsg ) { TQDateTime date; date.setTime_t( mOrigMsg->date() ); - KLocale locale( "C"); + TDELocale locale( "C"); TQString str = locale.formatTime( date.time(), true ); body.append( str ); } diff --git a/kmailcvt/main.cpp b/kmailcvt/main.cpp index e6c4e243..c18dff15 100644 --- a/kmailcvt/main.cpp +++ b/kmailcvt/main.cpp @@ -28,7 +28,7 @@ static const KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KLocale::setMainCatalogue("kmailcvt"); + TDELocale::setMainCatalogue("kmailcvt"); TDEAboutData aboutData( "kmailcvt", I18N_NOOP("KMailCVT"), "3", I18N_NOOP("KMail Import Filters"), TDEAboutData::License_GPL_V2, 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; } diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp index 60140181..38f28275 100644 --- a/libkmime/kmime_util.cpp +++ b/libkmime/kmime_util.cpp @@ -636,7 +636,7 @@ DateFormatter::qdateToTimeT(const TQDateTime& dt) const TQString DateFormatter::fancy(time_t otime) const { - KLocale *locale = TDEGlobal::locale(); + TDELocale *locale = TDEGlobal::locale(); if ( otime <= 0 ) return i18n( "unknown" ); @@ -691,13 +691,13 @@ DateFormatter::localized(time_t otime, bool shortFormat, bool includeSecs, { TQDateTime tmp; TQString ret; - KLocale *locale = TDEGlobal::locale(); + TDELocale *locale = TDEGlobal::locale(); tmp.setTime_t( otime ); if ( !localeLanguage.isEmpty() ) { - locale=new KLocale(localeLanguage); + locale=new TDELocale(localeLanguage); locale->setLanguage(localeLanguage); locale->setCountry(localeLanguage); ret = locale->formatDateTime( tmp, shortFormat, includeSecs ); diff --git a/libkmime/kmime_util.h b/libkmime/kmime_util.h index 34f8bd5d..4619446a 100644 --- a/libkmime/kmime_util.h +++ b/libkmime/kmime_util.h @@ -223,8 +223,8 @@ namespace KMime { * set format. * @param otime time to format * @param lang used only by the Localized format, sets the used language - * @param shortFormat used only by the Localized format, is passed to KLocale::formatDateTime - * @param includeSecs used only by the Localized format, is passed to KLocale::formatDateTime + * @param shortFormat used only by the Localized format, is passed to TDELocale::formatDateTime + * @param includeSecs used only by the Localized format, is passed to TDELocale::formatDateTime */ TQString dateString(time_t otime, const TQString& lang = TQString(), bool shortFormat = true, bool includeSecs=false) const; @@ -263,8 +263,8 @@ namespace KMime { * @param time time to format * @param data is either the format when FormatType is Custom, or language * when FormatType is Localized - * @param shortFormat used only by the Localized format, is passed to KLocale::formatDateTime - * @param includeSecs used only by the Localized format, is passed to KLocale::formatDateTime + * @param shortFormat used only by the Localized format, is passed to TDELocale::formatDateTime + * @param includeSecs used only by the Localized format, is passed to TDELocale::formatDateTime */ static TQString formatDate( DateFormatter::FormatType t, time_t time, const TQString& data = TQString(), @@ -275,8 +275,8 @@ namespace KMime { * @param t specifies the FormatType to use * @param data is either the format when FormatType is Custom, or language * when FormatType is Localized - * @param shortFormat used only by the Localized format, is passed to KLocale::formatDateTime - * @param includeSecs used only by the Localized format, is passed to KLocale::formatDateTime + * @param shortFormat used only by the Localized format, is passed to TDELocale::formatDateTime + * @param includeSecs used only by the Localized format, is passed to TDELocale::formatDateTime */ static TQString formatCurrentDate( DateFormatter::FormatType t, const TQString& data = TQString(), diff --git a/libtdepim/broadcaststatus.cpp b/libtdepim/broadcaststatus.cpp index 45a7b51c..d7a26944 100644 --- a/libtdepim/broadcaststatus.cpp +++ b/libtdepim/broadcaststatus.cpp @@ -55,7 +55,7 @@ void BroadcastStatus::setStatusMsg( const TQString& message ) void BroadcastStatus::setStatusMsgWithTimestamp( const TQString& message ) { - KLocale* locale = TDEGlobal::locale(); + TDELocale* locale = TDEGlobal::locale(); setStatusMsg( i18n( "%1 is a time, %2 is a status message", "[%1] %2" ) .arg( locale->formatTime( TQTime::currentTime(), true /* with seconds */ ) ) diff --git a/libtdepim/ktimeedit.cpp b/libtdepim/ktimeedit.cpp index 2a58fc54..2fe849c5 100644 --- a/libtdepim/ktimeedit.cpp +++ b/libtdepim/ktimeedit.cpp @@ -53,7 +53,7 @@ public: return Intermediate; bool ok = false; - /*TQTime time =*/ TDEGlobal::locale()->readTime(str, KLocale::WithoutSeconds, &ok); + /*TQTime time =*/ TDEGlobal::locale()->readTime(str, TDELocale::WithoutSeconds, &ok); if ( ok ) return Acceptable; // kdDebug(5300)<<"Time "<readTime( input, KLocale::WithoutSeconds, &ok ); + TDEGlobal::locale()->readTime( input, TDELocale::WithoutSeconds, &ok ); if ( !ok ) { // Also try to accept times in "military format", i.e. no delimiter, like 1200 int tm = input.toInt( &ok ); @@ -149,9 +149,9 @@ bool KTimeEdit::hasTime() const TQTime KTimeEdit::getTime() const { //kdDebug(5300) << "KTimeEdit::getTime(), currentText() = " << currentText() << endl; - // TODO use KLocale::WithoutSeconds in HEAD + // TODO use TDELocale::WithoutSeconds in HEAD bool ok = false; - TQTime time = TDEGlobal::locale()->readTime( currentText(), KLocale::WithoutSeconds, &ok ); + TQTime time = TDEGlobal::locale()->readTime( currentText(), TDELocale::WithoutSeconds, &ok ); if ( !ok ) { // Also try to accept times in "military format", i.e. no delimiter, like 1200 int tm = currentText().toInt( &ok ); diff --git a/tdeioslaves/mbox/mbox.cc b/tdeioslaves/mbox/mbox.cc index 3236e14c..91a32488 100644 --- a/tdeioslaves/mbox/mbox.cc +++ b/tdeioslaves/mbox/mbox.cc @@ -42,7 +42,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char* argv[]); } int kdemain( int argc, char * argv[] ) { - KLocale::setMainCatalogue("tdelibs"); + TDELocale::setMainCatalogue("tdelibs"); TDEInstance instance("tdeio_mbox"); (void) TDEGlobal::locale(); diff --git a/wizards/egroupwaremain.cpp b/wizards/egroupwaremain.cpp index aa115cc8..59a16d03 100644 --- a/wizards/egroupwaremain.cpp +++ b/wizards/egroupwaremain.cpp @@ -34,7 +34,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KLocale::setMainCatalogue( "tdepimwizards" ); + TDELocale::setMainCatalogue( "tdepimwizards" ); TDEAboutData aboutData( "egroupwarewizard", "eGroupware Server Configuration Wizard", diff --git a/wizards/exchangemain.cpp b/wizards/exchangemain.cpp index a3d78909..3f10b871 100644 --- a/wizards/exchangemain.cpp +++ b/wizards/exchangemain.cpp @@ -35,7 +35,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KLocale::setMainCatalogue( "tdepimwizards" ); + TDELocale::setMainCatalogue( "tdepimwizards" ); TDEAboutData aboutData( "exchangewizard", I18N_NOOP( "Microsoft Exchange Server Configuration Wizard" ), "0.1" ); diff --git a/wizards/groupwisemain.cpp b/wizards/groupwisemain.cpp index f7eab0be..407551b6 100644 --- a/wizards/groupwisemain.cpp +++ b/wizards/groupwisemain.cpp @@ -35,7 +35,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KLocale::setMainCatalogue( "tdepimwizards" ); + TDELocale::setMainCatalogue( "tdepimwizards" ); TDEAboutData aboutData( "groupwisewizard", I18N_NOOP( "Novell GroupWise Configuration Wizard" ), diff --git a/wizards/kolabmain.cpp b/wizards/kolabmain.cpp index 8b316a45..f094b64f 100644 --- a/wizards/kolabmain.cpp +++ b/wizards/kolabmain.cpp @@ -36,7 +36,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KLocale::setMainCatalogue( "tdepimwizards" ); + TDELocale::setMainCatalogue( "tdepimwizards" ); TDEAboutData aboutData( "kolabwizard", I18N_NOOP( "Kolab Configuration Wizard" ), "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/wizards/main.cpp b/wizards/main.cpp index 4b66356c..3c45aae4 100644 --- a/wizards/main.cpp +++ b/wizards/main.cpp @@ -14,7 +14,7 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { - KLocale::setMainCatalogue( "tdepimwizards" ); + TDELocale::setMainCatalogue( "tdepimwizards" ); TDEAboutData aboutData( "groupwarewizard", I18N_NOOP( "TDE-PIM Groupware Configuration Wizard" ), "0.1" ); diff --git a/wizards/scalixmain.cpp b/wizards/scalixmain.cpp index 06fa5341..feca97f6 100644 --- a/wizards/scalixmain.cpp +++ b/wizards/scalixmain.cpp @@ -36,7 +36,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KLocale::setMainCatalogue( "tdepimwizards" ); + TDELocale::setMainCatalogue( "tdepimwizards" ); TDEAboutData aboutData( "scalixwizard", I18N_NOOP( "Scalix Configuration Wizard" ), "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/wizards/sloxmain.cpp b/wizards/sloxmain.cpp index d63c43ae..f9ec84bf 100644 --- a/wizards/sloxmain.cpp +++ b/wizards/sloxmain.cpp @@ -35,7 +35,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KLocale::setMainCatalogue( "tdepimwizards" ); + TDELocale::setMainCatalogue( "tdepimwizards" ); TDEAboutData aboutData( "sloxwizard", I18N_NOOP( "SUSE LINUX Openexchange Server Configuration Wizard" ), "0.1" );