summaryrefslogtreecommitdiffstats
path: root/libtdeedu
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 08:15:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 08:15:31 -0600
commit088cc453ec425bf86d610880d09645ea166a14fa (patch)
tree6e7daebcbfb5e5a1a079c26254156995c849b3e7 /libtdeedu
parenteb973d5c889d9c1e859ecdd682e9c05d22599920 (diff)
downloadtdeedu-088cc453ec425bf86d610880d09645ea166a14fa.tar.gz
tdeedu-088cc453ec425bf86d610880d09645ea166a14fa.zip
Rename KLocale to enhance compatibility with KDE4
Diffstat (limited to 'libtdeedu')
-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
5 files changed, 11 insertions, 11 deletions
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 <cfmoro@correo.uniovi.es>
* @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);