diff options
Diffstat (limited to 'kexi')
| -rw-r--r-- | kexi/3rdparty/kolibs/koGlobal.cc | 2 | ||||
| -rw-r--r-- | kexi/3rdparty/kolibs/koUnitWidgets.cc | 2 | ||||
| -rw-r--r-- | kexi/kexidb/utils.h | 2 | ||||
| -rw-r--r-- | kexi/main/printing/kexisimpleprintingpagesetup.cpp | 2 | ||||
| -rw-r--r-- | kexi/widget/utils/kexidatetimeformatter.cpp | 4 | ||||
| -rw-r--r-- | kexi/widget/utils/kexidatetimeformatter.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc index fc21f3a5..24aa75ed 100644 --- a/kexi/3rdparty/kolibs/koGlobal.cc +++ b/kexi/3rdparty/kolibs/koGlobal.cc @@ -109,7 +109,7 @@ TQStringList KoGlobal::_listOfLanguages() void KoGlobal::createListOfLanguages() { TDEConfig config( "all_languages", true, false, "locale" ); - // Note that we could also use KLocale::allLanguagesTwoAlpha + // Note that we could also use TDELocale::allLanguagesTwoAlpha TQMap<TQString, bool> seenLanguages; const TQStringList langlist = config.groupList(); diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cc index 13ddf55b..3f6fb09e 100644 --- a/kexi/3rdparty/kolibs/koUnitWidgets.cc +++ b/kexi/3rdparty/kolibs/koUnitWidgets.cc @@ -97,7 +97,7 @@ TQString KoUnitDoubleBase::getVisibleText( double value ) const double KoUnitDoubleBase::toDouble( const TQString& str, bool* ok ) const { TQString str2( str ); - /* KLocale::readNumber wants the thousand separator exactly at 1000. + /* TDELocale::readNumber wants the thousand separator exactly at 1000. But when editing, it might be anywhere. So we need to remove it. */ const TQString sep( TDEGlobal::locale()->thousandsSeparator() ); if ( !sep.isEmpty() ) diff --git a/kexi/kexidb/utils.h b/kexi/kexidb/utils.h index 334ea20c..e535cd4b 100644 --- a/kexi/kexidb/utils.h +++ b/kexi/kexidb/utils.h @@ -304,7 +304,7 @@ namespace KexiDB For example, "12.345" becomes "12.345000" if N=6. No rounding is actually performed. - KLocale::formatNumber() and KLocale::decimalSymbol() are used to get locale settings. + TDELocale::formatNumber() and TDELocale::decimalSymbol() are used to get locale settings. @see KexiDB::Field::visibleDecimalPlaces() */ KEXI_DB_EXPORT TQString formatNumberForVisibleDecimalPlaces(double value, int decimalPlaces); diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp index 158c3ffc..5d823a13 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp +++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp @@ -324,7 +324,7 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi // settings //! @todo default? - m_unit = KLocale::Metric == TDEGlobal::locale()->measureSystem() ? KoUnit::U_CM : KoUnit::U_INCH; + m_unit = TDELocale::Metric == TDEGlobal::locale()->measureSystem() ? KoUnit::U_CM : KoUnit::U_INCH; // GUI TQVBoxLayout *lyr = new TQVBoxLayout(this); diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp index c6fe3460..6582b321 100644 --- a/kexi/widget/utils/kexidatetimeformatter.cpp +++ b/kexi/widget/utils/kexidatetimeformatter.cpp @@ -45,8 +45,8 @@ KexiDateFormatter::KexiDateFormatter() bool ok = df.length()>=8; int yearpos, monthpos, daypos; //result of df.find() if (ok) {//look at % variables -//! @todo more variables are possible here, see void KLocale::setDateFormatShort() docs -//! http://developer.kde.org/documentation/library/3.5-api/tdelibs-apidocs/tdecore/html/classKLocale.html#a59 +//! @todo more variables are possible here, see void TDELocale::setDateFormatShort() docs +//! http://developer.kde.org/documentation/library/3.5-api/tdelibs-apidocs/tdecore/html/classTDELocale.html#a59 yearpos = df.find("%y", 0, false); //&y or %y m_longYear = !(yearpos>=0 && df.mid(yearpos+1, 1)=="y"); if (!m_longYear) { diff --git a/kexi/widget/utils/kexidatetimeformatter.h b/kexi/widget/utils/kexidatetimeformatter.h index f011a0e2..4e916026 100644 --- a/kexi/widget/utils/kexidatetimeformatter.h +++ b/kexi/widget/utils/kexidatetimeformatter.h @@ -131,7 +131,7 @@ class KEXIGUIUTILS_EXPORT KexiTimeFormatter bool m_hoursWithLeadingZero; - //! Time format used in timeToString(). Notation from KLocale::setTimeFormat() is used. + //! Time format used in timeToString(). Notation from TDELocale::setTimeFormat() is used. TQString m_outputFormat; //! Used in stringToTime() to convert string back to TQTime |