diff options
Diffstat (limited to 'karm')
-rw-r--r-- | karm/csvexportdialog.cpp | 2 | ||||
-rw-r--r-- | karm/idletimedetector.cpp | 4 | ||||
-rw-r--r-- | karm/karm_part.cpp | 2 | ||||
-rw-r--r-- | karm/karmstorage.cpp | 6 | ||||
-rw-r--r-- | karm/karmutility.cpp | 4 | ||||
-rw-r--r-- | karm/ktimewidget.cpp | 4 | ||||
-rw-r--r-- | karm/mainwindow.cpp | 2 | ||||
-rw-r--r-- | karm/preferences.cpp | 8 | ||||
-rw-r--r-- | karm/print.cpp | 2 | ||||
-rw-r--r-- | karm/timekard.cpp | 12 | ||||
-rw-r--r-- | karm/tray.cpp | 2 |
11 files changed, 24 insertions, 24 deletions
diff --git a/karm/csvexportdialog.cpp b/karm/csvexportdialog.cpp index f1e0fce66..2bf6d9e26 100644 --- a/karm/csvexportdialog.cpp +++ b/karm/csvexportdialog.cpp @@ -55,7 +55,7 @@ CSVExportDialog::CSVExportDialog( ReportCriteria::REPORTTYPE rt, // If decimal symbol is a comma, then default field seperator to semi-colon. // In France and Germany, one-and-a-half is written as 1,5 not 1.5 - TQString d = KGlobal::locale()->decimalSymbol(); + TQString d = TDEGlobal::locale()->decimalSymbol(); if ( "," == d ) CSVExportDialogBase::radioSemicolon->setChecked(true); else CSVExportDialogBase::radioComma->setChecked(true); diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp index 03aba9216..911d1b2fa 100644 --- a/karm/idletimedetector.cpp +++ b/karm/idletimedetector.cpp @@ -68,7 +68,7 @@ void IdleTimeDetector::informOverrun(int idleSeconds) _timer->stop(); TQDateTime idleStart = TQDateTime::currentDateTime().addSecs(-idleSeconds); - TQString idleStartTQString = KGlobal::locale()->formatTime(idleStart.time()); + TQString idleStartTQString = TDEGlobal::locale()->formatTime(idleStart.time()); int id = TQMessageBox::warning( 0, i18n("Idle Detection"), i18n("Desktop has been idle since %1." @@ -83,7 +83,7 @@ void IdleTimeDetector::informOverrun(int idleSeconds) { // Revert And Stop kdDebug(5970) << "Now it is " << TQDateTime::currentDateTime() << endl; - kdDebug(5970) << "Reverting timer to " << KGlobal::locale()->formatTime(idleStart.time()).ascii() << endl; + kdDebug(5970) << "Reverting timer to " << TDEGlobal::locale()->formatTime(idleStart.time()).ascii() << endl; emit(extractTime(idleSeconds/60+diff)); // we need to subtract the time that has been added during idleness. emit(stopAllTimersAt(idleStart)); } diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index a81873731..b278d9f25 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -416,7 +416,7 @@ extern "C" { KDE_EXPORT void* init_libkarmpart() { - KGlobal::locale()->insertCatalogue("karm"); + TDEGlobal::locale()->insertCatalogue("karm"); return new karmPartFactory; } } diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp index 153a8f33a..85c1bab49 100644 --- a/karm/karmstorage.cpp +++ b/karm/karmstorage.cpp @@ -917,11 +917,11 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, // header retval += i18n("Task History\n"); retval += i18n("From %1 to %2") - .arg(KGlobal::locale()->formatDate(from)) - .arg(KGlobal::locale()->formatDate(to)); + .arg(TDEGlobal::locale()->formatDate(from)) + .arg(TDEGlobal::locale()->formatDate(to)); retval += cr; retval += i18n("Printed on: %1") - .arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); + .arg(TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); retval += cr; day=from; diff --git a/karm/karmutility.cpp b/karm/karmutility.cpp index 8a2de530a..39b1865a8 100644 --- a/karm/karmutility.cpp +++ b/karm/karmutility.cpp @@ -12,10 +12,10 @@ TQString formatTime( long minutes, bool decimal ) TQString time; if ( decimal ) { time.sprintf("%.2f", minutes / 60.0); - time.replace( '.', KGlobal::locale()->decimalSymbol() ); + time.replace( '.', TDEGlobal::locale()->decimalSymbol() ); } else time.sprintf("%s%ld:%02ld", - (minutes < 0) ? KGlobal::locale()->negativeSign().utf8().data() : "", + (minutes < 0) ? TDEGlobal::locale()->negativeSign().utf8().data() : "", labs(minutes / 60), labs(minutes % 60)); return time; } diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp index 879386ada..112812b24 100644 --- a/karm/ktimewidget.cpp +++ b/karm/ktimewidget.cpp @@ -106,7 +106,7 @@ void KArmTimeWidget::setTime( long minutes ) dummy.setNum( hourpart ); if (minutes < 0) - dummy = KGlobal::locale()->negativeSign() + dummy; + dummy = TDEGlobal::locale()->negativeSign() + dummy; _hourLE->setText( dummy ); dummy.setNum( minutepart ); @@ -123,7 +123,7 @@ long KArmTimeWidget::time() const h = abs(_hourLE->text().toInt( &ok )); m = _minuteLE->text().toInt( &ok ); - isNegative = _hourLE->text().startsWith(KGlobal::locale()->negativeSign()); + isNegative = _hourLE->text().startsWith(TDEGlobal::locale()->negativeSign()); return (h * 60 + m) * ((isNegative) ? -1 : 1); } diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp index eb6bd4fa9..738924429 100644 --- a/karm/mainwindow.cpp +++ b/karm/mainwindow.cpp @@ -454,7 +454,7 @@ void MainWindow::loadGeometry() void MainWindow::saveGeometry() { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.setGroup( TQString::fromLatin1("Main Window Geometry")); config.writeEntry( TQString::fromLatin1("Width"), width()); config.writeEntry( TQString::fromLatin1("Height"), height()); diff --git a/karm/preferences.cpp b/karm/preferences.cpp index c242fa6ab..6544931ae 100644 --- a/karm/preferences.cpp +++ b/karm/preferences.cpp @@ -286,7 +286,7 @@ void Preferences::load() void Preferences::save() { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.setGroup( TQString::fromLatin1("Idle detection")); config.writeEntry( TQString::fromLatin1("enabled"), _doIdleDetectionV); @@ -314,20 +314,20 @@ void Preferences::save() // HACK: this entire config dialog should be upgraded to KConfigXT bool Preferences::readBoolEntry( const TQString& key ) { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); return config.readBoolEntry ( key, true ); } void Preferences::writeEntry( const TQString &key, bool value) { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.writeEntry( key, value ); config.sync(); } void Preferences::deleteEntry( const TQString &key ) { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.deleteEntry( key ); config.sync(); } diff --git a/karm/print.cpp b/karm/print.cpp index 536883687..c540663be 100644 --- a/karm/print.cpp +++ b/karm/print.cpp @@ -75,7 +75,7 @@ void MyPrinter::print() painter.setFont(newFont); int height = metrics.height(); - TQString now = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); + TQString now = TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); painter.drawText(xMargin, yoff, pageWidth, height, TQPainter::AlignCenter, diff --git a/karm/timekard.cpp b/karm/timekard.cpp index 984baf741..1be72b961 100644 --- a/karm/timekard.cpp +++ b/karm/timekard.cpp @@ -59,7 +59,7 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime // header retval += i18n("Task Totals") + cr; - retval += KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); + retval += TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); retval += cr + cr; retval += TQString(TQString::fromLatin1("%1 %2")) .arg(i18n("Time"), timeWidth) @@ -313,11 +313,11 @@ TQString TimeKard::historyAsText(TaskView* taskview, const TQDate& from, retval += totalsOnly ? i18n("Task Totals") : i18n("Task History"); retval += cr; retval += i18n("From %1 to %2") - .arg(KGlobal::locale()->formatDate(from)) - .arg(KGlobal::locale()->formatDate(to)); + .arg(TDEGlobal::locale()->formatDate(from)) + .arg(TDEGlobal::locale()->formatDate(to)); retval += cr; retval += i18n("Printed on: %1") - .arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); + .arg(TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); if ( perWeek ) { @@ -353,7 +353,7 @@ TQDate Week::end() const TQString Week::name() const { - return i18n("Week of %1").arg(KGlobal::locale()->formatDate(start())); + return i18n("Week of %1").arg(TDEGlobal::locale()->formatDate(start())); } TQValueList<Week> Week::weeksFromDateRange(const TQDate& from, const TQDate& to) @@ -372,7 +372,7 @@ TQValueList<Week> Week::weeksFromDateRange(const TQDate& from, const TQDate& to) // even if from and to are the same date. The week starts on the day // that is set in the locale settings. start = from.addDays( - -((7 - KGlobal::locale()->weekStartDay() + from.dayOfWeek()) % 7)); + -((7 - TDEGlobal::locale()->weekStartDay() + from.dayOfWeek()) % 7)); for (TQDate d = start; d <= to; d = d.addDays(7)) weeks.append(Week(d)); diff --git a/karm/tray.cpp b/karm/tray.cpp index ac820abbb..2933b8ae8 100644 --- a/karm/tray.cpp +++ b/karm/tray.cpp @@ -138,7 +138,7 @@ void KarmTray::updateToolTip(TQPtrList<Task> activeTasks) TQFontMetrics fm( TQToolTip::font() ); const TQString continued = i18n( ", ..." ); const int buffer = fm.boundingRect( continued ).width(); - const int desktopWidth = KGlobalSettings::desktopGeometry(this).width(); + const int desktopWidth = TDEGlobalSettings::desktopGeometry(this).width(); const int maxWidth = desktopWidth - buffer; TQString qTip; |