diff options
| -rw-r--r-- | kcoloredit/kcolorchooser.cpp | 2 | ||||
| -rw-r--r-- | kghostview/infodialog.cpp | 2 | ||||
| -rw-r--r-- | kghostview/kgv_miniwidget.cpp | 2 | ||||
| -rw-r--r-- | kmrml/kmrml/mrml.cpp | 2 | ||||
| -rw-r--r-- | kooka/kocrkadmos.cpp | 4 | ||||
| -rw-r--r-- | kviewshell/kviewpart.cpp | 2 | ||||
| -rw-r--r-- | kviewshell/pageSize.cpp | 4 |
7 files changed, 9 insertions, 9 deletions
diff --git a/kcoloredit/kcolorchooser.cpp b/kcoloredit/kcolorchooser.cpp index 2d260c14..350069d8 100644 --- a/kcoloredit/kcolorchooser.cpp +++ b/kcoloredit/kcolorchooser.cpp @@ -43,7 +43,7 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KLocale::setMainCatalogue("tdelibs"); + TDELocale::setMainCatalogue("tdelibs"); TDEAboutData aboutData( "kcolorchooser", I18N_NOOP("KColorChooser"), version, description, TDEAboutData::License_BSD, "(c) 2000, Waldo Bastian"); diff --git a/kghostview/infodialog.cpp b/kghostview/infodialog.cpp index e429d712..70826c11 100644 --- a/kghostview/infodialog.cpp +++ b/kghostview/infodialog.cpp @@ -110,7 +110,7 @@ namespace { // FIXME: this ignores the timezone TQDate date( year, month, day ); TQTime time( hour, min, sec ); - KLocale locale( "kghostview" ); + TDELocale locale( "kghostview" ); return locale.formatDateTime( TQDateTime( date, time ) ); } kdDebug( 4500 ) << "parseDate failed." << endl; diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp index b226bb78..d8210cdf 100644 --- a/kghostview/kgv_miniwidget.cpp +++ b/kghostview/kgv_miniwidget.cpp @@ -61,7 +61,7 @@ KGVMiniWidget::KGVMiniWidget( KGVPart* part, const char* name ) : _usePageLabels( true ), _visiblePage( -1 ) { - KLocale locale( "kghostview" ); + TDELocale locale( "kghostview" ); _fallBackPageMedia = pageSizeToString( static_cast< TQPrinter::PageSize >( locale.pageSize() ) ); _thumbnailService = new ThumbnailService( this ); diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp index 12855164..19560cec 100644 --- a/kmrml/kmrml/mrml.cpp +++ b/kmrml/kmrml/mrml.cpp @@ -38,7 +38,7 @@ extern "C" { KDE_EXPORT int kdemain( int argc, char **argv ) { - KLocale::setMainCatalogue("tdelibs"); + TDELocale::setMainCatalogue("tdelibs"); TDEInstance instance( "tdeio_mrml" ); TDEGlobal::locale()->insertCatalogue( "kmrml" ); diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp index 0e2ebdf7..2d306b07 100644 --- a/kooka/kocrkadmos.cpp +++ b/kooka/kocrkadmos.cpp @@ -100,7 +100,7 @@ EngineError KadmosDialog::findClassifiers() { findClassifierPath(); - KLocale *locale = TDEGlobal::locale(); + TDELocale *locale = TDEGlobal::locale(); TQStringList allCountries = locale->allLanguagesTwoAlpha (); for ( TQStringList::Iterator it = allCountries.begin(); it != allCountries.end(); ++it ) @@ -289,7 +289,7 @@ EngineError KadmosDialog::setupGui() m_cbLang = new TQComboBox( m_gbLang ); - m_cbLang->setCurrentText( KLocale::defaultCountry() ); + m_cbLang->setCurrentText( TDELocale::defaultCountry() ); connect( m_bbFont, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slFontChanged(int) )); m_rbMachine->setChecked(true); diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp index 017d3e17..23c68b2e 100644 --- a/kviewshell/kviewpart.cpp +++ b/kviewshell/kviewpart.cpp @@ -419,7 +419,7 @@ TQString KViewPart::pageSizeDescription() TQString size = " "; if (s.formatNumber() == -1) { - if (TDEGlobal::locale()-> measureSystem() == KLocale::Metric) + if (TDEGlobal::locale()-> measureSystem() == TDELocale::Metric) size += TQString("%1x%2 mm").arg(s.width().getLength_in_mm(), 0, 'f', 0).arg(s.height().getLength_in_mm(), 0, 'f', 0); else size += TQString("%1x%2 in").arg(s.width().getLength_in_inch(), 0, 'g', 2).arg(s.height().getLength_in_inch(), 0, 'g', 2); diff --git a/kviewshell/pageSize.cpp b/kviewshell/pageSize.cpp index c1a99744..9e59da04 100644 --- a/kviewshell/pageSize.cpp +++ b/kviewshell/pageSize.cpp @@ -210,7 +210,7 @@ TQString pageSize::preferredUnit() const return staticList[currentSize].preferredUnit; // User-defined size. Give a preferred unit depening on the locale. - if (TDEGlobal::locale()-> measureSystem() == KLocale::Metric) + if (TDEGlobal::locale()-> measureSystem() == TDELocale::Metric) return "mm"; else return "in"; @@ -333,7 +333,7 @@ int pageSize::defaultPageSize() // FIXME: static_cast<TQPrinter::PageSize>(TDEGlobal::locale()->pageSize()) // is the proper solution here. Then you can determine the values // without using your hardcoded table too! - if (TDEGlobal::locale()-> measureSystem() == KLocale::Metric) + if (TDEGlobal::locale()-> measureSystem() == TDELocale::Metric) return defaultMetricPaperSize; else return defaultImperialPaperSize; |