summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kig/misc/coordinate_system.cpp4
-rw-r--r--kstars/kstars/detaildialog.cpp2
-rw-r--r--kstars/kstars/infoboxes.cpp2
-rw-r--r--kstars/kstars/kstarsdata.cpp2
-rw-r--r--kstars/kstars/kstarsdata.h6
-rw-r--r--kstars/kstars/tools/altvstime.h2
-rw-r--r--kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp6
-rw-r--r--libtdeedu/extdate/extcalendarsystem.cpp6
-rw-r--r--libtdeedu/extdate/extcalendarsystem.h6
-rw-r--r--libtdeedu/extdate/extcalendarsystemgregorian.cpp2
-rw-r--r--libtdeedu/extdate/extcalendarsystemgregorian.h4
-rw-r--r--libtdeedu/extdate/extdatewidget.cpp4
12 files changed, 23 insertions, 23 deletions
diff --git a/kig/misc/coordinate_system.cpp b/kig/misc/coordinate_system.cpp
index 35269399..33ec67ce 100644
--- a/kig/misc/coordinate_system.cpp
+++ b/kig/misc/coordinate_system.cpp
@@ -114,7 +114,7 @@ void CoordinateValidator::fixup( TQString & input ) const
if ( sc == -1 )
{
sc = input.length();
- KLocale* l = TDEGlobal::locale();
+ TDELocale* l = TDEGlobal::locale();
if ( mpolar )
input.append( TQString::fromLatin1( ";" ) + l->positiveSign() +
TQString::fromLatin1( "0�" ) );
@@ -157,7 +157,7 @@ Coordinate EuclideanCoords::toScreen(const TQString& s, bool& ok) const
{
TQString xs = r.cap(1);
TQString ys = r.cap(2);
- KLocale* l = TDEGlobal::locale();
+ TDELocale* l = TDEGlobal::locale();
double x = l->readNumber( xs, &ok );
if ( ! ok ) x = xs.toDouble( &ok );
if ( ! ok ) return Coordinate();
diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp
index b4fd1b75..e8817ab7 100644
--- a/kstars/kstars/detaildialog.cpp
+++ b/kstars/kstars/detaildialog.cpp
@@ -309,7 +309,7 @@ void DetailDialog::createPositionTab( const KStarsDateTime &ut, GeoLocation *geo
vlay->addWidget( Pos );
//Coordinates Section:
- //Don't use KLocale::formatNumber() for the epoch string,
+ //Don't use TDELocale::formatNumber() for the epoch string,
//because we don't want a thousands-place separator!
TQString sEpoch = TQString::number( ut.epoch(), 'f', 1 );
//Replace the decimal point with localized decimal symbol
diff --git a/kstars/kstars/infoboxes.cpp b/kstars/kstars/infoboxes.cpp
index 922380da..34ba2175 100644
--- a/kstars/kstars/infoboxes.cpp
+++ b/kstars/kstars/infoboxes.cpp
@@ -348,7 +348,7 @@ bool InfoBoxes::timeChanged( const KStarsDateTime &ut, const KStarsDateTime &lt,
TQString STString;
STString = STString.sprintf( "%02d:%02d:%02d ", lst->hour(), lst->minute(), lst->second() );
- //Don't use KLocale::formatNumber() for Julian Day because we don't want
+ //Don't use TDELocale::formatNumber() for Julian Day because we don't want
//thousands-place separators
TQString JDString = TQString::number( ut.djd(), 'f', 2 );
JDString.replace( ".", TDEGlobal::locale()->decimalSymbol() );
diff --git a/kstars/kstars/kstarsdata.cpp b/kstars/kstars/kstarsdata.cpp
index 93a2c0f4..73e85d6c 100644
--- a/kstars/kstars/kstarsdata.cpp
+++ b/kstars/kstars/kstarsdata.cpp
@@ -71,7 +71,7 @@ KStarsData::KStarsData() : stdDirs(0), locale(0),
//standard directories and locale objects
stdDirs = new TDEStandardDirs();
- locale = new KLocale( "kstars" );
+ locale = new TDELocale( "kstars" );
//Check to see if config file already exists. If not, set
//useDefaultOptions = true
diff --git a/kstars/kstars/kstarsdata.h b/kstars/kstars/kstarsdata.h
index 22f9b273..652113bf 100644
--- a/kstars/kstars/kstarsdata.h
+++ b/kstars/kstars/kstarsdata.h
@@ -441,9 +441,9 @@ public:
*/
bool isTimeRunningForward() { return TimeRunsForward; }
- /**@return pointer to the localization (KLocale) object
+ /**@return pointer to the localization (TDELocale) object
*/
- KLocale *getLocale() { return locale; }
+ TDELocale *getLocale() { return locale; }
/**@return pointer to the Earth object
*/
@@ -736,7 +736,7 @@ private:
TQString cnameFile;
TDEStandardDirs *stdDirs;
- KLocale *locale;
+ TDELocale *locale;
dms *LST, *HourAngle;
diff --git a/kstars/kstars/tools/altvstime.h b/kstars/kstars/tools/altvstime.h
index 654c3f3c..f68d1612 100644
--- a/kstars/kstars/tools/altvstime.h
+++ b/kstars/kstars/tools/altvstime.h
@@ -25,7 +25,7 @@ class TQTime;
class TQVariant;
class TQVBoxLayout;
class KDialogBase;
-class KLocale;
+class TDELocale;
class SkyObject;
class SkyPoint;
class dms;
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
index 8ec23d7c..3ef07c2b 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
@@ -1007,11 +1007,11 @@ LangSet LanguageOptions::getLangSet () const
void LanguageOptions::loadCountryData()
{
// temperary use of our locale as the global locale
- KLocale *lsave = TDEGlobal::_locale;
+ TDELocale *lsave = TDEGlobal::_locale;
TQString curr_lang = lsave->language();
-// KLocale locale("kvoctrain");
- KLocale locale(TQString::null);
+// TDELocale locale("kvoctrain");
+ TDELocale locale(TQString::null);
locale.setLanguage(curr_lang);
TDEGlobal::_locale = &locale;
diff --git a/libtdeedu/extdate/extcalendarsystem.cpp b/libtdeedu/extdate/extcalendarsystem.cpp
index 38465749..98bf1818 100644
--- a/libtdeedu/extdate/extcalendarsystem.cpp
+++ b/libtdeedu/extdate/extcalendarsystem.cpp
@@ -35,10 +35,10 @@
class ExtCalendarSystemPrivate
{
public:
- const KLocale * locale;
+ const TDELocale * locale;
};
-ExtCalendarSystem::ExtCalendarSystem(const KLocale * locale)
+ExtCalendarSystem::ExtCalendarSystem(const TDELocale * locale)
: d(new ExtCalendarSystemPrivate)
{
d->locale = locale;
@@ -49,7 +49,7 @@ ExtCalendarSystem::~ExtCalendarSystem()
delete d;
}
-const KLocale * ExtCalendarSystem::locale() const
+const TDELocale * ExtCalendarSystem::locale() const
{
if ( d->locale )
return d->locale;
diff --git a/libtdeedu/extdate/extcalendarsystem.h b/libtdeedu/extdate/extcalendarsystem.h
index 4607fc1d..82b35a37 100644
--- a/libtdeedu/extdate/extcalendarsystem.h
+++ b/libtdeedu/extdate/extcalendarsystem.h
@@ -28,7 +28,7 @@
#include "extdatetime.h"
-class KLocale;
+class TDELocale;
class ExtCalendarSystemPrivate;
@@ -51,7 +51,7 @@ public:
*
* @param locale It will use this locale for translations, 0 means global.
*/
- ExtCalendarSystem(const KLocale * locale = 0);
+ ExtCalendarSystem(const TDELocale * locale = 0);
/**
* Descructor.
@@ -348,7 +348,7 @@ public:
virtual bool isSolar() const = 0;
protected:
- const KLocale * locale() const;
+ const TDELocale * locale() const;
private:
ExtCalendarSystemPrivate * d;
diff --git a/libtdeedu/extdate/extcalendarsystemgregorian.cpp b/libtdeedu/extdate/extcalendarsystemgregorian.cpp
index fc3fe51a..c37b7c6d 100644
--- a/libtdeedu/extdate/extcalendarsystemgregorian.cpp
+++ b/libtdeedu/extdate/extcalendarsystemgregorian.cpp
@@ -32,7 +32,7 @@
#include "extcalendarsystemgregorian.h"
-ExtCalendarSystemGregorian::ExtCalendarSystemGregorian(const KLocale * locale)
+ExtCalendarSystemGregorian::ExtCalendarSystemGregorian(const TDELocale * locale)
: ExtCalendarSystem(locale)
{
}
diff --git a/libtdeedu/extdate/extcalendarsystemgregorian.h b/libtdeedu/extdate/extcalendarsystemgregorian.h
index 6d1035c9..6c3dabc7 100644
--- a/libtdeedu/extdate/extcalendarsystemgregorian.h
+++ b/libtdeedu/extdate/extcalendarsystemgregorian.h
@@ -38,7 +38,7 @@ class ExtCalendarSystemGregorianPrivate;
* The Gregorian calender is the most used calendar today. The first year in
* the calendar is set to the birth of Christ.
*
- * @see KLocale,ExtCalendarSystem,ExtCalendarSystemFactory
+ * @see TDELocale,ExtCalendarSystem,ExtCalendarSystemFactory
*
* @author Carlos Moro <[email protected]>
* @license GNU-GPL v.2
@@ -48,7 +48,7 @@ class ExtCalendarSystemGregorianPrivate;
class ExtCalendarSystemGregorian: public ExtCalendarSystem
{
public:
- ExtCalendarSystemGregorian (const KLocale * locale = 0);
+ ExtCalendarSystemGregorian (const TDELocale * locale = 0);
virtual ~ExtCalendarSystemGregorian ();
virtual int year (const ExtDate & date) const;
diff --git a/libtdeedu/extdate/extdatewidget.cpp b/libtdeedu/extdate/extdatewidget.cpp
index 014c8568..5d790bf4 100644
--- a/libtdeedu/extdate/extdatewidget.cpp
+++ b/libtdeedu/extdate/extdatewidget.cpp
@@ -73,7 +73,7 @@ ExtDateWidget::ExtDateWidget( const ExtDate &date, TQWidget *parent,
// void ExtDateWidget::init()
// {
// d = new ExtDateWidgetPrivate;
-// KLocale *locale = TDEGlobal::locale();
+// TDELocale *locale = TDEGlobal::locale();
// TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
// layout->setAutoAdd(true);
// d->m_day = new ExtDateWidgetSpinBox(1, 1, this);
@@ -97,7 +97,7 @@ ExtDateWidget::ExtDateWidget( const ExtDate &date, TQWidget *parent,
void ExtDateWidget::init(const ExtDate& date)
{
d = new ExtDateWidgetPrivate;
- //KLocale *locale = TDEGlobal::locale();
+ //TDELocale *locale = TDEGlobal::locale();
TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
layout->setAutoAdd(true);
d->m_day = new ExtDateWidgetSpinBox(1, 1, this);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-11 22:16:49 +0000