summaryrefslogtreecommitdiffstats
path: root/libtdepim
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 08:19:44 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 08:19:44 -0600
commit6dea9442526e5ebacf313ad387c7dff4b87a53bf (patch)
treed400e34cbe644bd98c7f0d08e2e83b43597dd3ee /libtdepim
parent339bb51ad3721e188a57c529828a55400213ff70 (diff)
downloadtdepim-6dea9442526e5ebacf313ad387c7dff4b87a53bf.tar.gz
tdepim-6dea9442526e5ebacf313ad387c7dff4b87a53bf.zip
Rename KLocale to enhance compatibility with KDE4
Diffstat (limited to 'libtdepim')
-rw-r--r--libtdepim/broadcaststatus.cpp2
-rw-r--r--libtdepim/ktimeedit.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/libtdepim/broadcaststatus.cpp b/libtdepim/broadcaststatus.cpp
index 45a7b51cc..d7a26944e 100644
--- a/libtdepim/broadcaststatus.cpp
+++ b/libtdepim/broadcaststatus.cpp
@@ -55,7 +55,7 @@ void BroadcastStatus::setStatusMsg( const TQString& message )
void BroadcastStatus::setStatusMsgWithTimestamp( const TQString& message )
{
- KLocale* locale = TDEGlobal::locale();
+ TDELocale* locale = TDEGlobal::locale();
setStatusMsg( i18n( "%1 is a time, %2 is a status message", "[%1] %2" )
.arg( locale->formatTime( TQTime::currentTime(),
true /* with seconds */ ) )
diff --git a/libtdepim/ktimeedit.cpp b/libtdepim/ktimeedit.cpp
index 2a58fc54c..2fe849c5f 100644
--- a/libtdepim/ktimeedit.cpp
+++ b/libtdepim/ktimeedit.cpp
@@ -53,7 +53,7 @@ public:
return Intermediate;
bool ok = false;
- /*TQTime time =*/ TDEGlobal::locale()->readTime(str, KLocale::WithoutSeconds, &ok);
+ /*TQTime time =*/ TDEGlobal::locale()->readTime(str, TDELocale::WithoutSeconds, &ok);
if ( ok )
return Acceptable;
// kdDebug(5300)<<"Time "<<str<<" not directly acceptable, trying military format "<<endl;
@@ -91,7 +91,7 @@ public:
}
virtual void fixup ( TQString & input ) const {
bool ok = false;
- TDEGlobal::locale()->readTime( input, KLocale::WithoutSeconds, &ok );
+ TDEGlobal::locale()->readTime( input, TDELocale::WithoutSeconds, &ok );
if ( !ok ) {
// Also try to accept times in "military format", i.e. no delimiter, like 1200
int tm = input.toInt( &ok );
@@ -149,9 +149,9 @@ bool KTimeEdit::hasTime() const
TQTime KTimeEdit::getTime() const
{
//kdDebug(5300) << "KTimeEdit::getTime(), currentText() = " << currentText() << endl;
- // TODO use KLocale::WithoutSeconds in HEAD
+ // TODO use TDELocale::WithoutSeconds in HEAD
bool ok = false;
- TQTime time = TDEGlobal::locale()->readTime( currentText(), KLocale::WithoutSeconds, &ok );
+ TQTime time = TDEGlobal::locale()->readTime( currentText(), TDELocale::WithoutSeconds, &ok );
if ( !ok ) {
// Also try to accept times in "military format", i.e. no delimiter, like 1200
int tm = currentText().toInt( &ok );