From 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:34:45 -0600 Subject: Rename old tq methods that no longer need a unique name --- karm/karmstorage.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'karm/karmstorage.cpp') diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp index 1e4f92a1f..aecee470d 100644 --- a/karm/karmstorage.cpp +++ b/karm/karmstorage.cpp @@ -135,7 +135,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt TQObject::connect (_calendar, TQT_SIGNAL(resourceChanged(ResourceCalendar *)), view, TQT_SLOT(iCalFileModified(ResourceCalendar *))); _calendar->setTimeZoneId( KPimPrefs::timezone() ); - _calendar->setResourceName( TQString::tqfromLatin1("KArm") ); + _calendar->setResourceName( TQString::fromLatin1("KArm") ); _calendar->open(); _calendar->load(); @@ -680,13 +680,13 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview, else // use remote file { KTempFile tmpFile; - if ( tmpFile.status() != 0 ) err = TQString::tqfromLatin1( "Unable to get temporary file" ); + if ( tmpFile.status() != 0 ) err = TQString::fromLatin1( "Unable to get temporary file" ); else { TQTextStream *stream=tmpFile.textStream(); *stream << retval; tmpFile.close(); - if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::tqfromLatin1("Could not upload"); + if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload"); } } @@ -794,7 +794,7 @@ long KarmStorage::printTaskHistory ( TQString double_dquote = dquote + dquote; bool to_quote = true; - const TQString cr = TQString::tqfromLatin1("\n"); + const TQString cr = TQString::fromLatin1("\n"); TQString buf; TQString daytaskkey, daykey; TQDate day; @@ -807,14 +807,14 @@ long KarmStorage::printTaskHistory ( while (day <= to) { // write the time in seconds for the given task for the given day to s - daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd")); - daytaskkey = TQString::tqfromLatin1("%1_%2") + daykey = day.toString(TQString::fromLatin1("yyyyMMdd")); + daytaskkey = TQString::fromLatin1("%1_%2") .tqarg(daykey) .tqarg(task->uid()); if (taskdaytotals.contains(daytaskkey)) { - cell.push_back(TQString::tqfromLatin1("%1") + cell.push_back(TQString::fromLatin1("%1") .tqarg(formatTime(taskdaytotals[daytaskkey]/60, rc.decimalMinutes))); sum += taskdaytotals[daytaskkey]; // in seconds @@ -829,7 +829,7 @@ long KarmStorage::printTaskHistory ( } // Total for task - cell.push_back(TQString::tqfromLatin1("%1").tqarg(formatTime(sum/60, rc.decimalMinutes))); + cell.push_back(TQString::fromLatin1("%1").tqarg(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::tqfromLatin1("%1").tqarg(formatTime((add+sum)/60, rc.decimalMinutes ))); + cell[colrectot]=(TQString::fromLatin1("%1").tqarg(formatTime((add+sum)/60, rc.decimalMinutes ))); for (unsigned int i=0; i < cell.size(); i++) matrix[ownline]+=cell[i]; return add+sum; } @@ -890,7 +890,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, const ReportCriteria &rc) { TQString delim = rc.delimiter; - const TQString cr = TQString::tqfromLatin1("\n"); + const TQString cr = TQString::fromLatin1("\n"); TQString err; // below taken from timekard.cpp @@ -910,7 +910,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, // parameter-plausi if ( from > to ) { - err = TQString::tqfromLatin1 ( + err = TQString::fromLatin1 ( "'to' has to be a date later than or equal to 'from'."); } @@ -921,7 +921,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, .tqarg(KGlobal::locale()->formatDate(to)); retval += cr; retval += i18n("Printed on: %1") - .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime())); + .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); retval += cr; day=from; @@ -936,8 +936,8 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, // so times are accumulated for each task. for (event = events.begin(); event != events.end(); ++event) { - daykey = (*event).start().date().toString(TQString::tqfromLatin1("yyyyMMdd")); - daytaskkey = TQString(TQString::tqfromLatin1("%1_%2")) + daykey = (*event).start().date().toString(TQString::fromLatin1("yyyyMMdd")); + daytaskkey = TQString(TQString::fromLatin1("%1_%2")) .tqarg(daykey) .tqarg((*event).todoUid()); @@ -953,7 +953,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, while ( dayheading <= to ) { // Use ISO 8601 format for date. - retval += dayheading.toString(TQString::tqfromLatin1("yyyy-MM-dd")); + retval += dayheading.toString(TQString::fromLatin1("yyyy-MM-dd")); retval += delim; dayheading=dayheading.addDays(1); } @@ -993,11 +993,11 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, day = from; while (day<=to) { - daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd")); + daykey = day.toString(TQString::fromLatin1("yyyyMMdd")); if (daytotals.contains(daykey)) { - retval += TQString::tqfromLatin1("%1") + retval += TQString::fromLatin1("%1") .tqarg(formatTime(daytotals[daykey]/60, rc.decimalMinutes)); sum += daytotals[daykey]; // in seconds } @@ -1005,7 +1005,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, day = day.addDays(1); } - retval += TQString::tqfromLatin1("%1%2%3%4") + retval += TQString::fromLatin1("%1%2%3%4") .tqarg( formatTime( sum/60, rc.decimalMinutes ) ) .tqarg( delim ).tqarg( delim ) .tqarg( i18n( "Total" ) ); @@ -1036,14 +1036,14 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, KTempFile tmpFile; if ( tmpFile.status() != 0 ) { - err = TQString::tqfromLatin1( "Unable to get temporary file" ); + err = TQString::fromLatin1( "Unable to get temporary file" ); } else { TQTextStream *stream=tmpFile.textStream(); *stream << retval; tmpFile.close(); - if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::tqfromLatin1("Could not upload"); + if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload"); } } return err; -- cgit v1.2.1