From 087f8d4521b0bc6614dc4b664b23674a7f5f5020 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 08:20:07 -0600 Subject: [PATCH] Rename KLocale to enhance compatibility with KDE4 --- cervisia/loginfo.h | 2 +- kbabel/catalogmanager/catalogmanagerview.cpp | 2 +- kbabel/catalogmanager/main.cpp | 2 +- kbabel/catalogmanager/multiroughtransdlg.cpp | 2 +- kbabel/common/catalog.cpp | 2 +- kbabel/common/catalogsettings.cpp | 2 +- kbabel/commonui/roughtransdlg.cpp | 2 +- kbabel/kbabel/kbabelview.cpp | 2 +- kbabel/kbabeldict/main.cpp | 2 +- kbugbuster/gui/cwbugdetailscontainer.cpp | 2 +- scripts/fixheaders | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cervisia/loginfo.h b/cervisia/loginfo.h index e75df840..df88947f 100644 --- a/cervisia/loginfo.h +++ b/cervisia/loginfo.h @@ -101,7 +101,7 @@ struct LogInfo TQString createToolTipText(bool showTime = true) const; /** - * Calls KLocale::formatDateTime() to create a formatted string. + * Calls TDELocale::formatDateTime() to create a formatted string. * * @param showTime show commit time in tooltip. * @param shortFormat using the short date format. diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp index eab6c00e..5543c0f6 100644 --- a/kbabel/catalogmanager/catalogmanagerview.cpp +++ b/kbabel/catalogmanager/catalogmanagerview.cpp @@ -715,7 +715,7 @@ void CatalogManagerView::markedStatistics() void CatalogManagerView::showStatistics( CatManListItem *i, TQStringList &childrenList ) { - KLocale *locale = TDEGlobal::locale(); + TDELocale *locale = TDEGlobal::locale(); TQString msg; int totalPackages=0; diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp index b7d04b43..d28425a6 100644 --- a/kbabel/catalogmanager/main.cpp +++ b/kbabel/catalogmanager/main.cpp @@ -182,7 +182,7 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KLocale::setMainCatalogue("kbabel"); + TDELocale::setMainCatalogue("kbabel"); TDEAboutData about("catalogmanager",I18N_NOOP("KBabel - Catalog Manager"),VERSION, I18N_NOOP("An advanced catalog manager for KBabel"),TDEAboutData::License_GPL, I18N_NOOP("(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"),0,"http://kbabel.kde.org"); diff --git a/kbabel/catalogmanager/multiroughtransdlg.cpp b/kbabel/catalogmanager/multiroughtransdlg.cpp index a8e5d4d9..6f3b750c 100644 --- a/kbabel/catalogmanager/multiroughtransdlg.cpp +++ b/kbabel/catalogmanager/multiroughtransdlg.cpp @@ -125,7 +125,7 @@ void MultiRoughTransDlg::showAllStatistics() if( tt == 0 ) tt = 1; int nothing=tt-ptc-etc; - KLocale *locale = TDEGlobal::locale(); + TDELocale *locale = TDEGlobal::locale(); TQString statMsg = i18n("Result of the translation:\n" "Edited entries: %1\n" "Exact translations: %2 (%3%)\n" diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp index 86f47c29..601f113f 100644 --- a/kbabel/common/catalog.cpp +++ b/kbabel/common/catalog.cpp @@ -3313,7 +3313,7 @@ int Catalog::getNumberOfPluralForms(const TQString& lang) { int nr=-1; - KLocale locale("tdelibs"); + TDELocale locale("tdelibs"); locale.setLanguage(lang); const char* formsString = diff --git a/kbabel/common/catalogsettings.cpp b/kbabel/common/catalogsettings.cpp index 64185d09..b217d9c2 100644 --- a/kbabel/common/catalogsettings.cpp +++ b/kbabel/common/catalogsettings.cpp @@ -200,7 +200,7 @@ TQString Defaults::Identity::mailingList() TQString Defaults::Identity::languageCode() { // first try to get the language from KDE settings - KLocale *locale = TDEGlobal::locale(); + TDELocale *locale = TDEGlobal::locale(); TQString lang; if(locale) { diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp index caf919e3..bc251a93 100644 --- a/kbabel/commonui/roughtransdlg.cpp +++ b/kbabel/commonui/roughtransdlg.cpp @@ -667,7 +667,7 @@ void RoughTransDlg::translate() void RoughTransDlg::showStatistics() { int nothing=totalTried-partTransCounter-exactTransCounter; - KLocale *locale = TDEGlobal::locale(); + TDELocale *locale = TDEGlobal::locale(); TQString statMsg = i18n("Result of the translation:\n" "Edited entries: %1\n" "Exact translations: %2 (%3%)\n" diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp index 4a73b8bc..8cf98335 100644 --- a/kbabel/kbabel/kbabelview.cpp +++ b/kbabel/kbabel/kbabelview.cpp @@ -3590,7 +3590,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged) TQString msg = ""; // ### TODO: whynot use i18n("context",text) directly? - KLocale* locale=TDEGlobal::locale(); + TDELocale* locale=TDEGlobal::locale(); for( TQStringList::iterator it=status.begin() ; it != status.end() ; ++it ) { diff --git a/kbabel/kbabeldict/main.cpp b/kbabel/kbabeldict/main.cpp index 9cdffa29..579b1eb1 100644 --- a/kbabel/kbabeldict/main.cpp +++ b/kbabel/kbabeldict/main.cpp @@ -109,7 +109,7 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KLocale::setMainCatalogue("kbabel"); + TDELocale::setMainCatalogue("kbabel"); TDEAboutData about("kbabeldict",I18N_NOOP("KBabel - Dictionary"),VERSION, I18N_NOOP("A dictionary for translators"),TDEAboutData::License_GPL, diff --git a/kbugbuster/gui/cwbugdetailscontainer.cpp b/kbugbuster/gui/cwbugdetailscontainer.cpp index 7b57ec1b..6ad503cc 100644 --- a/kbugbuster/gui/cwbugdetailscontainer.cpp +++ b/kbugbuster/gui/cwbugdetailscontainer.cpp @@ -110,7 +110,7 @@ void CWBugDetailsContainer::setBug( const Bug &bug, const BugDetails &details ) if ( bug.mergedWith().size() ) { - //FIXME: What should the separator be for lists? Don't see anything in KLocale for that + //FIXME: What should the separator be for lists? Don't see anything in TDELocale for that TQString list; Bug::BugMergeList mergedWith = bug.mergedWith(); for (Bug::BugMergeList::ConstIterator i = mergedWith.begin(); i != mergedWith.end(); ++i) diff --git a/scripts/fixheaders b/scripts/fixheaders index 12cf1a2a..91358097 100644 --- a/scripts/fixheaders +++ b/scripts/fixheaders @@ -22,7 +22,7 @@ $lastdir = '.'; '`i18n\' undeclared \(first use this function\)' => "klocale", 'variable `class QPixmap \S*\' has initializer but incomplete type' => "qpixmap", '`kapp\' undeclared \(first use this function\)' => "kapplication", - 'no matching function for call to `KLocale::' => "klocale", + 'no matching function for call to `TDELocale::' => "klocale", '`klocale\' undeclared \(first use this function\)' => "klocale", 'no matching function for call to `QPopupMenu::' => "qpopupmenu", '`QTextStream\' undeclared \(first use this function\)' => "qtextstream",