From 716a5de8870d7c02bb4d0aed72f30291b17b763a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:59:01 -0600 Subject: Remove additional unneeded tq method conversions --- karm/doc/design | 4 ++-- karm/idletimedetector.cpp | 2 +- karm/karm_part.cpp | 2 +- karm/karmstorage.cpp | 44 ++++++++++++++++++++++---------------------- karm/karmstorage.h | 4 ++-- karm/mainwindow.cpp | 12 ++++++------ karm/mainwindow.h | 2 +- karm/print.cpp | 10 +++++----- karm/task.cpp | 6 +++--- karm/task.h | 4 ++-- karm/taskview.cpp | 12 ++++++------ karm/taskview.h | 8 ++++---- karm/test/README | 2 +- karm/test/lifetest.php | 2 +- karm/test/script.cpp | 2 +- karm/timekard.cpp | 44 ++++++++++++++++++++++---------------------- karm/tray.cpp | 4 ++-- 17 files changed, 82 insertions(+), 82 deletions(-) (limited to 'karm') diff --git a/karm/doc/design b/karm/doc/design index b647f282..be9a425f 100644 --- a/karm/doc/design +++ b/karm/doc/design @@ -36,7 +36,7 @@ On Thursday 24 October 2002 06:37 pm, tomas pospisek wrote: > > --------------------------------------------------------------------- > > 1 Karm shall provide a hierarchical structure of tasks. If a task > > has at least one subtask it will be referred to as a parent task. -> > If a task has no tqchildren it will be referred to as a leaf task. +> > If a task has no children it will be referred to as a leaf task. > > If a task has no parent tasks it will be referred to as a root > > task. > > 2 A new task can be created as a child of any existing task. @@ -63,7 +63,7 @@ On Thursday 24 October 2002 06:37 pm, tomas pospisek wrote: > > --------------------------------------------------------------------- > > 1 Karm shall provide a hierarchical structure of tasks. If a task > > has at least one subtask it will be referred to as a parent task. -> > If a task has no tqchildren it will be referred to as a leaf task. +> > If a task has no children it will be referred to as a leaf task. > > If a task has no parent tasks it will be referred to as a root > > task. > > 2 A new task can be created as a child of any existing task. diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp index c969bf14..bd0b253c 100644 --- a/karm/idletimedetector.cpp +++ b/karm/idletimedetector.cpp @@ -72,7 +72,7 @@ void IdleTimeDetector::informOverrun(int idleSeconds) int id = TQMessageBox::warning( 0, i18n("Idle Detection"), i18n("Desktop has been idle since %1." - " What should we do?").tqarg(idleStartTQString), + " What should we do?").arg(idleStartTQString), i18n("Revert && Stop"), i18n("Revert && Continue"), i18n("Continue Timing"),0,2); diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index 7a392ab4..4cf84190 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -576,7 +576,7 @@ int karmPart::bookTime TQString karmPart::getError( int mkb ) const { if ( mkb <= KARM_MAX_ERROR_NO ) return m_error[ mkb ]; - else return i18n( "Invalid error number: %1" ).tqarg( mkb ); + else return i18n( "Invalid error number: %1" ).arg( mkb ); } int karmPart::totalMinutesForTaskId( const TQString& taskId ) diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp index aecee470..e895d263 100644 --- a/karm/karmstorage.cpp +++ b/karm/karmstorage.cpp @@ -199,8 +199,8 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt // Complete the loading but return a message if ( !newParent ) err = i18n("Error loading \"%1\": could not find parent (uid=%2)") - .tqarg(task->name()) - .tqarg((*todo)->relatedToUid()); + .arg(task->name()) + .arg((*todo)->relatedToUid()); if (!err) task->move( newParent); } @@ -268,8 +268,8 @@ TQString KarmStorage::buildTaskView(KCal::ResourceCalendar *rc, TaskView *view) // Complete the loading but return a message if ( !newParent ) err = i18n("Error loading \"%1\": could not find parent (uid=%2)") - .tqarg(task->name()) - .tqarg((*todo)->relatedToUid()); + .arg(task->name()) + .arg((*todo)->relatedToUid()); if (!err) task->move( newParent); } @@ -391,12 +391,12 @@ TQString KarmStorage::loadFromFlatFile(TaskView* taskview, TQFile f(filename); if( !f.exists() ) - err = i18n("File \"%1\" not found.").tqarg(filename); + err = i18n("File \"%1\" not found.").arg(filename); if (!err) { if( !f.open( IO_ReadOnly ) ) - err = i18n("Could not open \"%1\".").tqarg(filename); + err = i18n("Could not open \"%1\".").arg(filename); } if (!err) @@ -667,7 +667,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview, if (filename.isEmpty()) filename=rc.url.url(); TQFile f( filename ); if( !f.open( IO_WriteOnly ) ) { - err = i18n( "Could not open \"%1\"." ).tqarg( filename ); + err = i18n( "Could not open \"%1\"." ).arg( filename ); } if (!err) { @@ -809,13 +809,13 @@ long KarmStorage::printTaskHistory ( // write the time in seconds for the given task for the given day to s daykey = day.toString(TQString::fromLatin1("yyyyMMdd")); daytaskkey = TQString::fromLatin1("%1_%2") - .tqarg(daykey) - .tqarg(task->uid()); + .arg(daykey) + .arg(task->uid()); if (taskdaytotals.contains(daytaskkey)) { cell.push_back(TQString::fromLatin1("%1") - .tqarg(formatTime(taskdaytotals[daytaskkey]/60, rc.decimalMinutes))); + .arg(formatTime(taskdaytotals[daytaskkey]/60, rc.decimalMinutes))); sum += taskdaytotals[daytaskkey]; // in seconds if (daytotals.contains(daykey)) @@ -829,7 +829,7 @@ long KarmStorage::printTaskHistory ( } // Total for task - cell.push_back(TQString::fromLatin1("%1").tqarg(formatTime(sum/60, rc.decimalMinutes))); + cell.push_back(TQString::fromLatin1("%1").arg(formatTime(sum/60, rc.decimalMinutes))); // room for the recursive total time (that cannot be calculated now) cell.push_back(delim); @@ -865,7 +865,7 @@ long KarmStorage::printTaskHistory ( add += printTaskHistory( subTask, taskdaytotals, daytotals, from, to , level+1, matrix, rc ); } - cell[colrectot]=(TQString::fromLatin1("%1").tqarg(formatTime((add+sum)/60, rc.decimalMinutes ))); + cell[colrectot]=(TQString::fromLatin1("%1").arg(formatTime((add+sum)/60, rc.decimalMinutes ))); for (unsigned int i=0; i < cell.size(); i++) matrix[ownline]+=cell[i]; return add+sum; } @@ -917,11 +917,11 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, // header retval += i18n("Task History\n"); retval += i18n("From %1 to %2") - .tqarg(KGlobal::locale()->formatDate(from)) - .tqarg(KGlobal::locale()->formatDate(to)); + .arg(KGlobal::locale()->formatDate(from)) + .arg(KGlobal::locale()->formatDate(to)); retval += cr; retval += i18n("Printed on: %1") - .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); + .arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); retval += cr; day=from; @@ -938,8 +938,8 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, { daykey = (*event).start().date().toString(TQString::fromLatin1("yyyyMMdd")); daytaskkey = TQString(TQString::fromLatin1("%1_%2")) - .tqarg(daykey) - .tqarg((*event).todoUid()); + .arg(daykey) + .arg((*event).todoUid()); if (taskdaytotals.contains(daytaskkey)) taskdaytotals.replace(daytaskkey, @@ -998,7 +998,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, if (daytotals.contains(daykey)) { retval += TQString::fromLatin1("%1") - .tqarg(formatTime(daytotals[daykey]/60, rc.decimalMinutes)); + .arg(formatTime(daytotals[daykey]/60, rc.decimalMinutes)); sum += daytotals[daykey]; // in seconds } retval += delim; @@ -1006,9 +1006,9 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, } retval += TQString::fromLatin1("%1%2%3%4") - .tqarg( formatTime( sum/60, rc.decimalMinutes ) ) - .tqarg( delim ).tqarg( delim ) - .tqarg( i18n( "Total" ) ); + .arg( formatTime( sum/60, rc.decimalMinutes ) ) + .arg( delim ).arg( delim ) + .arg( i18n( "Total" ) ); } // above taken from timekard.cpp @@ -1021,7 +1021,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, if (filename.isEmpty()) filename=rc.url.url(); TQFile f( filename ); if( !f.open( IO_WriteOnly ) ) { - err = i18n( "Could not open \"%1\"." ).tqarg( filename ); + err = i18n( "Could not open \"%1\"." ).arg( filename ); } if (!err) { diff --git a/karm/karmstorage.h b/karm/karmstorage.h index 3f03ddff..7e8b04b1 100644 --- a/karm/karmstorage.h +++ b/karm/karmstorage.h @@ -132,7 +132,7 @@ class KarmStorage * Read tasks and their total times from a text file (legacy storage). * * This reads from one of the two legacy file formats. In this version, - * the parent task times do not include the sum of all their tqchildren's + * the parent task times do not include the sum of all their children's * times. * * The format of the file is zero or more lines of: @@ -147,7 +147,7 @@ class KarmStorage * Reads tasks and their total times from text file (legacy). * * This is the older legacy format, where the task totals included the - * tqchildren totals. + * children totals. * * @see loadFromFlatFile */ diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp index 8307dd1f..eb6bd4fa 100644 --- a/karm/mainwindow.cpp +++ b/karm/mainwindow.cpp @@ -63,8 +63,8 @@ MainWindow::MainWindow( const TQString &icsfile ) this, TQT_SLOT(slotSelectionChanged())); connect( _taskView, TQT_SIGNAL( updateButtons() ), this, TQT_SLOT(slotSelectionChanged())); - connect( _taskView, TQT_SIGNAL( seStatusBar( TQString ) ), - this, TQT_SLOT(seStatusBar( TQString ))); + connect( _taskView, TQT_SIGNAL( setStatusBar( TQString ) ), + this, TQT_SLOT(setStatusBar( TQString ))); loadGeometry(); @@ -134,7 +134,7 @@ void MainWindow::slotSelectionChanged() // actionAddComment->setEnabled( on ); //} -void MainWindow::seStatusBar(TQString qs) +void MainWindow::setStatusBar(TQString qs) { statusBar()->message(i18n(qs.ascii())); } @@ -202,10 +202,10 @@ void MainWindow::updateStatusBar( ) TQString time; time = formatTime( _sessionSum ); - statusBar()->changeItem( i18n("Session: %1").tqarg(time), 0 ); + statusBar()->changeItem( i18n("Session: %1").arg(time), 0 ); time = formatTime( _totalSum ); - statusBar()->changeItem( i18n("Total: %1" ).tqarg(time), 1); + statusBar()->changeItem( i18n("Total: %1" ).arg(time), 1); } void MainWindow::starStatusBar() @@ -610,7 +610,7 @@ int MainWindow::bookTime TQString MainWindow::getError( int mkb ) const { if ( mkb <= KARM_MAX_ERROR_NO ) return m_error[ mkb ]; - else return i18n( "Invalid error number: %1" ).tqarg( mkb ); + else return i18n( "Invalid error number: %1" ).arg( mkb ); } int MainWindow::totalMinutesForTaskId( const TQString& taskId ) diff --git a/karm/mainwindow.h b/karm/mainwindow.h index 9ff525b0..63479c92 100644 --- a/karm/mainwindow.h +++ b/karm/mainwindow.h @@ -89,7 +89,7 @@ class MainWindow : public KParts::MainWindow, virtual public KarmDCOPIface TQString importplannerfile( TQString filename ); public slots: - void seStatusBar( TQString ); + void setStatusBar( TQString ); void quit(); protected slots: diff --git a/karm/print.cpp b/karm/print.cpp index df8aabf5..53688368 100644 --- a/karm/print.cpp +++ b/karm/print.cpp @@ -25,10 +25,10 @@ void MyPrinter::print() if (setup(0L, i18n("Print Times"))) { // setup TQPainter painter(this); - TQPaintDeviceMetrics tqdeviceMetrics(this); + TQPaintDeviceMetrics deviceMetrics(this); TQFontMetrics metrics = painter.fontMetrics(); - pageHeight = tqdeviceMetrics.height(); - int pageWidth = tqdeviceMetrics.width(); + pageHeight = deviceMetrics.height(); + int pageWidth = deviceMetrics.width(); xMargin = margins().width(); yMargin = margins().height(); yoff = yMargin; @@ -36,7 +36,7 @@ void MyPrinter::print() // Calculate the totals // Note the totals are only calculated at the top most levels, as the - // totals are increased together with its tqchildren. + // totals are increased together with its children. int totalTotal = 0; int sessionTotal = 0; for (Task* task = _taskView->first_child(); @@ -79,7 +79,7 @@ void MyPrinter::print() painter.drawText(xMargin, yoff, pageWidth, height, TQPainter::AlignCenter, - i18n("KArm - %1").tqarg(now)); + i18n("KArm - %1").arg(now)); painter.setFont(origFont); yoff += height + 10; diff --git a/karm/task.cpp b/karm/task.cpp index 0750c720..7d84bcd2 100644 --- a/karm/task.cpp +++ b/karm/task.cpp @@ -164,13 +164,13 @@ void Task::setPercentComplete(const int percent, KarmStorage *storage) setPixmapProgress(); - // When parent marked as complete, mark all tqchildren as complete as well. + // When parent marked as complete, mark all children as complete as well. // Complete tasks are not displayed in the task view, so if a parent is - // marked as complete and some of the tqchildren are not, then we get an error + // marked as complete and some of the children are not, then we get an error // message. KArm actually keep chugging along in this case and displays the // child tasks just fine, so an alternative solution is to remove that error // message (from KarmStorage::load). But I think it makes more sense that - // if you mark a parent task as complete, then all tqchildren should be + // if you mark a parent task as complete, then all children should be // complete as well. // // This behavior is consistent with KOrganizer (as of 2003-09-24). diff --git a/karm/task.h b/karm/task.h index 165d60a8..2d3d5a55 100644 --- a/karm/task.h +++ b/karm/task.h @@ -208,7 +208,7 @@ class Task : public TQObject, public TQListViewItem /** tells you whether this task is the root of the task tree */ bool isRoot() const { return parent() == 0; } - /** remove Task with all it's tqchildren + /** remove Task with all it's children * @param activeTasks - list of aktive tasks * @param storage a pointer to a KarmStorage object. */ @@ -231,7 +231,7 @@ class Task : public TQObject, public TQListViewItem /** Return true if task is complete (percent complete equals 100). */ bool isComplete(); - /** Remove current task and all it's tqchildren from the view. */ + /** Remove current task and all it's children from the view. */ void removeFromView(); /** delivers when the task was started last */ diff --git a/karm/taskview.cpp b/karm/taskview.cpp index b4f655ff..a7aff406 100644 --- a/karm/taskview.cpp +++ b/karm/taskview.cpp @@ -255,7 +255,7 @@ void TaskView::refresh() t->setPixmapProgress(); } - // remove root decoration if there is no more tqchildren. + // remove root decoration if there is no more children. bool anyChilds = false; for(Task* child = first_child(); child; @@ -367,7 +367,7 @@ TQString TaskView::save() { kdDebug(5970) << "Entering TaskView::save" << endl; TQString err = _storage->save(this); - emit(seStatusBar(err)); + emit(setStatusBar(err)); return err; } @@ -613,7 +613,7 @@ void TaskView::editTask() // bool ok; // TQString comment = KLineEditDlg::getText(i18n("Comment"), -// i18n("Log comment for task '%1':").tqarg(task->name()), +// i18n("Log comment for task '%1':").arg(task->name()), // TQString(), &ok, this); // if ( ok ) // task->addComment( comment, _storage ); @@ -651,7 +651,7 @@ void TaskView::deleteTask(bool markingascomplete) response = KMessageBox::warningContinueCancel( 0, i18n( "Are you sure you want to delete " "the task named\n\"%1\" and its entire history?") - .tqarg(task->name()), + .arg(task->name()), i18n( "Deleting Task"), KStdGuiItem::del()); } else { @@ -659,7 +659,7 @@ void TaskView::deleteTask(bool markingascomplete) i18n( "Are you sure you want to delete the task named" "\n\"%1\" and its entire history?\n" "NOTE: all its subtasks and their history will also " - "be deleted.").tqarg(task->name()), + "be deleted.").arg(task->name()), i18n( "Deleting Task"), KStdGuiItem::del()); } } @@ -688,7 +688,7 @@ void TaskView::deleteTask(bool markingascomplete) save(); } - // remove root decoration if there is no more tqchildren. + // remove root decoration if there is no more children. refresh(); // Stop idle detection if no more counters are running diff --git a/karm/taskview.h b/karm/taskview.h index 988ad154..9d6d84c0 100644 --- a/karm/taskview.h +++ b/karm/taskview.h @@ -142,11 +142,11 @@ class TaskView : public KListView KarmStorage* storage(); /** - * Delete task (and tqchildren) from view. + * Delete task (and children) from view. * * @param markingascomplete If false (the default), deletes history for - * current task and all tqchildren. If markingascomplete is true, then sets - * percent complete to 100 and removes task and all it's tqchildren from the + * current task and all children. If markingascomplete is true, then sets + * percent complete to 100 and removes task and all it's children from the * list view. */ void deleteTask(bool markingascomplete=false); @@ -201,7 +201,7 @@ class TaskView : public KListView void timersActive(); void timersInactive(); void tasksChanged( TQPtrList activeTasks ); - void seStatusBar( TQString ); + void setStatusBar( TQString ); private: // member variables IdleTimeDetector *_idleTimeDetector; diff --git a/karm/test/README b/karm/test/README index a5307e6e..32a32f6e 100644 --- a/karm/test/README +++ b/karm/test/README @@ -1,6 +1,6 @@ This directory holds automated tests for karm. -It's in very rough tqshape. +It's in very rough shape. How you start: diff --git a/karm/test/lifetest.php b/karm/test/lifetest.php index afd423cc..1d809bdf 100644 --- a/karm/test/lifetest.php +++ b/karm/test/lifetest.php @@ -132,7 +132,7 @@ else // the mouse can be in the way, so, move it out. This here even works with "focus strictly under mouse". system("xte 'mousemove 1 1'"); echo "\nStarting karm"; - $process=popen("karm --tqgeometry 200x100+0+0 /tmp/karmtest.ics >/dev/null 2>&1", 'w'); + $process=popen("karm --geometry 200x100+0+0 /tmp/karmtest.ics >/dev/null 2>&1", 'w'); $rc=1; while ($rc==1) system("dcop `dcop 2>/dev/null | grep karm` KarmDCOPIface version",$rc); echo "mainwindow is ready"; diff --git a/karm/test/script.cpp b/karm/test/script.cpp index 81631436..f9fa9d9e 100644 --- a/karm/test/script.cpp +++ b/karm/test/script.cpp @@ -94,7 +94,7 @@ void Script::terminate() void Script::exit() { - m_status = m_proc->exiStatus(); + m_status = m_proc->exitStatus(); delete m_proc; m_proc = 0; } diff --git a/karm/timekard.cpp b/karm/timekard.cpp index 6ac410a2..984baf74 100644 --- a/karm/timekard.cpp +++ b/karm/timekard.cpp @@ -62,8 +62,8 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime retval += KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); retval += cr + cr; retval += TQString(TQString::fromLatin1("%1 %2")) - .tqarg(i18n("Time"), timeWidth) - .tqarg(i18n("Task")); + .arg(i18n("Time"), timeWidth) + .arg(i18n("Task")); retval += cr; retval += line; @@ -92,10 +92,10 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime // total buf.fill('-', reportWidth); - retval += TQString(TQString::fromLatin1("%1")).tqarg(buf, timeWidth) + cr; + retval += TQString(TQString::fromLatin1("%1")).arg(buf, timeWidth) + cr; retval += TQString(TQString::fromLatin1("%1 %2")) - .tqarg(formatTime(sum),timeWidth) - .tqarg(i18n("Total")); + .arg(formatTime(sum),timeWidth) + .arg(i18n("Total")); } else retval += i18n("No tasks."); @@ -110,8 +110,8 @@ void TimeKard::printTask(Task *task, TQString &s, int level, WhichTime which) s += buf.fill(' ', level); s += TQString(TQString::fromLatin1("%1 %2")) - .tqarg(formatTime(which == TotalTime?task->totalTime():task->totalSessionTime()), timeWidth) - .tqarg(task->name()); + .arg(formatTime(which == TotalTime?task->totalTime():task->totalSessionTime()), timeWidth) + .arg(task->name()); s += cr; for (Task* subTask = task->firstChild(); @@ -136,15 +136,15 @@ void TimeKard::printTaskHistory(const Task *task, { TQString daykey = day.toString(TQString::fromLatin1("yyyyMMdd")); TQString daytaskkey = TQString::fromLatin1("%1_%2") - .tqarg(daykey) - .tqarg(task->uid()); + .arg(daykey) + .arg(task->uid()); if (taskdaytotals.contains(daytaskkey)) { if ( !totalsOnly ) { s += TQString::fromLatin1("%1") - .tqarg(formatTime(taskdaytotals[daytaskkey]/60), timeWidth); + .arg(formatTime(taskdaytotals[daytaskkey]/60), timeWidth); } sectionsum += taskdaytotals[daytaskkey]; // in seconds @@ -162,12 +162,12 @@ void TimeKard::printTaskHistory(const Task *task, } // Total for task this section (e.g. week) - s += TQString::fromLatin1("%1").tqarg(formatTime(sectionsum/60), totalTimeWidth); + s += TQString::fromLatin1("%1").arg(formatTime(sectionsum/60), totalTimeWidth); // Task name TQString buf; s += buf.fill(' ', level + 1); - s += TQString::fromLatin1("%1").tqarg(task->name()); + s += TQString::fromLatin1("%1").arg(task->name()); s += cr; for (Task* subTask = task->firstChild(); @@ -223,8 +223,8 @@ TQString TimeKard::sectionHistoryAsText( { TQString daykey = (*event).start().date().toString(TQString::fromLatin1("yyyyMMdd")); TQString daytaskkey = TQString::fromLatin1("%1_%2") - .tqarg(daykey) - .tqarg((*event).todoUid()); + .arg(daykey) + .arg((*event).todoUid()); if (taskdaytotals.contains(daytaskkey)) taskdaytotals.replace(daytaskkey, @@ -246,7 +246,7 @@ TQString TimeKard::sectionHistoryAsText( // day headings for (TQDate day = sectionFrom; day <= sectionTo; day = day.addDays(1)) { - retval += TQString::fromLatin1("%1").tqarg(day.day(), timeWidth); + retval += TQString::fromLatin1("%1").arg(day.day(), timeWidth); } retval += cr; retval += line; @@ -287,7 +287,7 @@ TQString TimeKard::sectionHistoryAsText( if ( !totalsOnly ) { retval += TQString::fromLatin1("%1") - .tqarg(formatTime(daytotals[daykey]/60), timeWidth); + .arg(formatTime(daytotals[daykey]/60), timeWidth); } sum += daytotals[daykey]; // in seconds } @@ -299,8 +299,8 @@ TQString TimeKard::sectionHistoryAsText( } retval += TQString::fromLatin1("%1 %2") - .tqarg(formatTime(sum/60), totalTimeWidth) - .tqarg(i18n("Total")); + .arg(formatTime(sum/60), totalTimeWidth) + .arg(i18n("Total")); } return retval; } @@ -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") - .tqarg(KGlobal::locale()->formatDate(from)) - .tqarg(KGlobal::locale()->formatDate(to)); + .arg(KGlobal::locale()->formatDate(from)) + .arg(KGlobal::locale()->formatDate(to)); retval += cr; retval += i18n("Printed on: %1") - .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); + .arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); if ( perWeek ) { @@ -353,7 +353,7 @@ TQDate Week::end() const TQString Week::name() const { - return i18n("Week of %1").tqarg(KGlobal::locale()->formatDate(start())); + return i18n("Week of %1").arg(KGlobal::locale()->formatDate(start())); } TQValueList Week::weeksFromDateRange(const TQDate& from, const TQDate& to) diff --git a/karm/tray.cpp b/karm/tray.cpp index 20c2f51e..ac820abb 100644 --- a/karm/tray.cpp +++ b/karm/tray.cpp @@ -59,9 +59,9 @@ KarmTray::KarmTray(MainWindow* parent) // this are experiments/tests /* for (int i=0; i<30; i++) - _tray->insertTitle(i 18n("bla ").tqarg(i)); + _tray->insertTitle(i 18n("bla ").arg(i)); for (int i=0; i<30; i++) - _tray->insertTitle2(i 18n("bli ").tqarg(i)); + _tray->insertTitle2(i 18n("bli ").arg(i)); */ // experimenting with menus for the tray /* -- cgit v1.2.3