From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- karm/csvexportdialog_base.ui | 10 ++--- karm/desktoptracker.cpp | 2 +- karm/desktoptracker.h | 2 +- karm/edittaskdialog.cpp | 12 +++--- karm/idletimedetector.cpp | 6 +-- karm/karm_part.cpp | 36 ++++++++--------- karm/karm_part.h | 4 +- karm/karmstorage.cpp | 78 +++++++++++++++++------------------ karm/karmstorage.h | 2 +- karm/karmutility.cpp | 2 +- karm/ktimewidget.cpp | 18 ++++----- karm/mainwindow.cpp | 52 ++++++++++++------------ karm/mainwindow.h | 4 +- karm/plannerparser.cpp | 8 ++-- karm/preferences.cpp | 96 ++++++++++++++++++++++---------------------- karm/print.cpp | 2 +- karm/printdialog.cpp | 26 ++++++------ karm/reportcriteria.h | 2 +- karm/task.cpp | 14 +++---- karm/task.h | 4 +- karm/taskview.cpp | 2 +- karm/taskview.h | 4 +- karm/test/lockerthread.cpp | 2 +- karm/test/locking.cpp | 6 +-- karm/test/script.cpp | 2 +- karm/timekard.cpp | 48 +++++++++++----------- 26 files changed, 222 insertions(+), 222 deletions(-) (limited to 'karm') diff --git a/karm/csvexportdialog_base.ui b/karm/csvexportdialog_base.ui index 45ecde5de..0c985127a 100644 --- a/karm/csvexportdialog_base.ui +++ b/karm/csvexportdialog_base.ui @@ -4,7 +4,7 @@ CSVExportDialogBase - + 0 0 @@ -29,7 +29,7 @@ Expanding - + 20 29 @@ -46,7 +46,7 @@ Expanding - + 160 20 @@ -317,7 +317,7 @@ 0 - + 30 32767 @@ -405,7 +405,7 @@ enableExportButton() - + kdateedit.h kdateedit.h diff --git a/karm/desktoptracker.cpp b/karm/desktoptracker.cpp index deab87548..04f4d9d13 100644 --- a/karm/desktoptracker.cpp +++ b/karm/desktoptracker.cpp @@ -96,7 +96,7 @@ void DesktopTracker::registerForDesktops( Task* task, DesktopList desktopList) return; } - // If desktop contains entries then configure desktopTracker + // If desktop tqcontains entries then configure desktopTracker // If a desktop was disabled, it will not be stopped automatically. // If enabled: Start it now. if (desktopList.size()>0) { diff --git a/karm/desktoptracker.h b/karm/desktoptracker.h index aa8de2e27..f7fdd69c7 100644 --- a/karm/desktoptracker.h +++ b/karm/desktoptracker.h @@ -33,7 +33,7 @@ class DesktopTracker: public QObject KWinModule kWinModule; // define vectors for at most 16 virtual desktops - // E.g.: desktopTrackerStop[3] contains a vector with + // E.g.: desktopTrackerStop[3] tqcontains a vector with // all tasks to be notified, when switching to/from desk 3. TaskVector desktopTracker[maxDesktops]; int _previousDesktop; diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp index 74d3417bd..b7b1abe75 100644 --- a/karm/edittaskdialog.cpp +++ b/karm/edittaskdialog.cpp @@ -87,7 +87,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg, // Time _timeLA = new TQLabel( i18n("&Time:"), page, "time" ); lay3->addWidget( _timeLA, 0, 0 ); - _timeLA->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, + _timeLA->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, @@ -110,7 +110,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg, _sessionTW = new KArmTimeWidget( page, "_sessionTW" ); lay3->addWidget( _sessionTW, 1, 1 ); _sessionLA->setBuddy( _sessionTW ); - _sessionLA->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, + _sessionLA->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, @@ -132,9 +132,9 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg, lay4->addSpacing(20); _operator = new TQComboBox(page); - _operator->insertItem( TQString::fromLatin1( "+" ) ); - _operator->insertItem( TQString::fromLatin1( "-" ) ); - _operator->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, + _operator->insertItem( TQString::tqfromLatin1( "+" ) ); + _operator->insertItem( TQString::tqfromLatin1( "-" ) ); + _operator->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, @@ -148,7 +148,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg, desktopCount = kwinmodule.numberOfDesktops(); - // If desktopList contains higher numbered desktops than desktopCount then + // If desktopList tqcontains higher numbered desktops than desktopCount then // delete those from desktopList. This may be the case if the user has // configured virtual desktops. The values in desktopList are sorted. if ( (desktopList != 0) && (desktopList->size() > 0) ) diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp index b2b17a29c..53f17c8c6 100644 --- a/karm/idletimedetector.cpp +++ b/karm/idletimedetector.cpp @@ -67,7 +67,7 @@ void IdleTimeDetector::informOverrun(int idleSeconds) _timer->stop(); - TQDateTime idleStart = TQDateTime::currentDateTime().addSecs(-idleSeconds); + TQDateTime idleStart = TQDateTime::tqcurrentDateTime().addSecs(-idleSeconds); TQString idleStartQString = KGlobal::locale()->formatTime(idleStart.time()); int id = TQMessageBox::warning( 0, i18n("Idle Detection"), @@ -76,13 +76,13 @@ void IdleTimeDetector::informOverrun(int idleSeconds) i18n("Revert && Stop"), i18n("Revert && Continue"), i18n("Continue Timing"),0,2); - TQDateTime end = TQDateTime::currentDateTime(); + TQDateTime end = TQDateTime::tqcurrentDateTime(); int diff = idleStart.secsTo(end)/secsPerMinute; if (id == 0) { // Revert And Stop - kdDebug(5970) << "Now it is " << TQDateTime::currentDateTime() << endl; + kdDebug(5970) << "Now it is " << TQDateTime::tqcurrentDateTime() << endl; kdDebug(5970) << "Reverting timer to " << KGlobal::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 c535bec41..d44c4ac14 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -21,17 +21,17 @@ #include #include "mainwindow.h" -karmPart::karmPart( TQWidget *parentWidget, const char *widgetName, +karmPart::karmPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name ) : DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(parent, name), - _accel ( new KAccel( parentWidget ) ), - _watcher ( new KAccelMenuWatch( _accel, parentWidget ) ) + _accel ( new KAccel( tqparentWidget ) ), + _watcher ( new KAccelMenuWatch( _accel, tqparentWidget ) ) { // we need an instance setInstance( karmPartFactory::instance() ); // this should be your custom internal widget - _taskView = new TaskView( parentWidget, widgetName ); + _taskView = new TaskView( tqparentWidget, widgetName ); // setup PreferenceDialog. _preferences = Preferences::instance(); @@ -134,12 +134,12 @@ void karmPart::makeMenus() actionCollection(), "reset_all_times"); actionStart = new KAction( i18n("&Start"), - TQString::fromLatin1("1rightarrow"), Key_S, + TQString::tqfromLatin1("1rightarrow"), Key_S, _taskView, TQT_SLOT( startCurrentTimer() ), actionCollection(), "start"); actionStop = new KAction( i18n("S&top"), - TQString::fromLatin1("stop"), 0, + TQString::tqfromLatin1("stop"), 0, _taskView, TQT_SLOT( stopCurrentTimer() ), actionCollection(), "stop"); @@ -151,55 +151,55 @@ void karmPart::makeMenus() actionStopAll->setEnabled(false); actionNew = new KAction( i18n("&New..."), - TQString::fromLatin1("filenew"), CTRL+Key_N, + TQString::tqfromLatin1("filenew"), CTRL+Key_N, _taskView, TQT_SLOT( newTask() ), actionCollection(), "new_task"); actionNewSub = new KAction( i18n("New &Subtask..."), - TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N, + TQString::tqfromLatin1("kmultiple"), CTRL+ALT+Key_N, _taskView, TQT_SLOT( newSubTask() ), actionCollection(), "new_sub_task"); actionDelete = new KAction( i18n("&Delete"), - TQString::fromLatin1("editdelete"), Key_Delete, + TQString::tqfromLatin1("editdelete"), Key_Delete, _taskView, TQT_SLOT( deleteTask() ), actionCollection(), "delete_task"); actionEdit = new KAction( i18n("&Edit..."), - TQString::fromLatin1("edit"), CTRL + Key_E, + TQString::tqfromLatin1("edit"), CTRL + Key_E, _taskView, TQT_SLOT( editTask() ), actionCollection(), "edit_task"); // actionAddComment = new KAction( i18n("&Add Comment..."), -// TQString::fromLatin1("document"), +// TQString::tqfromLatin1("document"), // CTRL+ALT+Key_E, // _taskView, // TQT_SLOT( addCommentToTask() ), // actionCollection(), // "add_comment_to_task"); actionMarkAsComplete = new KAction( i18n("&Mark as Complete"), - TQString::fromLatin1("document"), + TQString::tqfromLatin1("document"), CTRL+Key_M, _taskView, TQT_SLOT( markTaskAsComplete() ), actionCollection(), "mark_as_complete"); actionMarkAsIncomplete = new KAction( i18n("&Mark as Incomplete"), - TQString::fromLatin1("document"), + TQString::tqfromLatin1("document"), CTRL+Key_M, _taskView, TQT_SLOT( markTaskAsIncomplete() ), actionCollection(), "mark_as_incomplete"); actionClipTotals = new KAction( i18n("&Copy Totals to Clipboard"), - TQString::fromLatin1("klipper"), + TQString::tqfromLatin1("klipper"), CTRL+Key_C, _taskView, TQT_SLOT( clipTotals() ), actionCollection(), "clip_totals"); actionClipHistory = new KAction( i18n("Copy &History to Clipboard"), - TQString::fromLatin1("klipper"), + TQString::tqfromLatin1("klipper"), CTRL+ALT+Key_C, _taskView, TQT_SLOT( clipHistory() ), @@ -322,7 +322,7 @@ bool karmPart::openFile() _taskView->load(m_file); // just for fun, set the status bar - emit setStatusBarText( m_url.prettyURL() ); + emit seStatusBarText( m_url.prettyURL() ); return true; } @@ -387,12 +387,12 @@ karmPartFactory::~karmPartFactory() s_instance = 0L; } -KParts::Part* karmPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, +KParts::Part* karmPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ) { // Create an instance of our Part - karmPart* obj = new karmPart( parentWidget, widgetName, parent, name ); + karmPart* obj = new karmPart( tqparentWidget, widgetName, parent, name ); // See if we are to be read-write or not if (TQCString(classname) == "KParts::ReadOnlyPart") diff --git a/karm/karm_part.h b/karm/karm_part.h index ed0098ad8..2d5b98bfe 100644 --- a/karm/karm_part.h +++ b/karm/karm_part.h @@ -58,7 +58,7 @@ class karmPart : public KParts::ReadWritePart, virtual public KarmDCOPIface friend class KarmTray; public: - karmPart(TQWidget *parentWidget, const char *widgetName, + karmPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name); // DCOP void quit(); @@ -124,7 +124,7 @@ class karmPartFactory : public KParts::Factory public: karmPartFactory(); virtual ~karmPartFactory(); - virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, + virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ); static KInstance* instance(); diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp index e895d2639..7a6bfcb9b 100644 --- a/karm/karmstorage.cpp +++ b/karm/karmstorage.cpp @@ -102,7 +102,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt // If file doesn't exist, create a blank one to avoid ResourceLocal load // error. We make it user and group read/write, others read. This is - // masked by the users umask. (See man creat) + // tqmasked by the users umask. (See man creat) if ( ! remoteResource( _icalfile ) ) { int handle; @@ -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::fromLatin1("KArm") ); + _calendar->setResourceName( TQString::tqfromLatin1("KArm") ); _calendar->open(); _calendar->load(); @@ -608,7 +608,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview, while ( tasknr < taskview->count() && !dialog.wasCancelled() ) { dialog.progressBar()->advance( 1 ); - if ( tasknr % 15 == 0 ) kapp->processEvents(); // repainting is slow + if ( tasknr % 15 == 0 ) kapp->processEvents(); // tqrepainting is slow if ( taskview->item_at_index(tasknr)->depth() > maxdepth ) maxdepth = taskview->item_at_index(tasknr)->depth(); tasknr++; @@ -627,9 +627,9 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview, /* // CSV compliance - // Surround the field with quotes if the field contains + // Surround the field with quotes if the field tqcontains // a comma (delim) or a double quote - if (task->name().contains(delim) || task->name().contains(dquote)) + if (task->name().tqcontains(delim) || task->name().tqcontains(dquote)) to_quote = true; else to_quote = false; @@ -639,8 +639,8 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview, if (to_quote) retval += dquote; - // Double quotes replaced by a pair of consecutive double quotes - retval += task->name().replace( dquote, double_dquote ); + // Double quotes tqreplaced by a pair of consecutive double quotes + retval += task->name().tqreplace( dquote, double_dquote ); if (to_quote) retval += dquote; @@ -661,7 +661,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview, } // save, either locally or remote - if ((rc.url.isLocalFile()) || (!rc.url.url().contains("/"))) + if ((rc.url.isLocalFile()) || (!rc.url.url().tqcontains("/"))) { TQString filename=rc.url.path(); if (filename.isEmpty()) filename=rc.url.url(); @@ -680,13 +680,13 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview, else // use remote file { KTempFile tmpFile; - if ( tmpFile.status() != 0 ) err = TQString::fromLatin1( "Unable to get temporary file" ); + if ( tmpFile.status() != 0 ) err = TQString::tqfromLatin1( "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::fromLatin1("Could not upload"); + if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::tqfromLatin1("Could not upload"); } } @@ -794,7 +794,7 @@ long KarmStorage::printTaskHistory ( TQString double_dquote = dquote + dquote; bool to_quote = true; - const TQString cr = TQString::fromLatin1("\n"); + const TQString cr = TQString::tqfromLatin1("\n"); TQString buf; TQString daytaskkey, daykey; TQDate day; @@ -807,19 +807,19 @@ 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::fromLatin1("yyyyMMdd")); - daytaskkey = TQString::fromLatin1("%1_%2") + daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd")); + daytaskkey = TQString::tqfromLatin1("%1_%2") .arg(daykey) .arg(task->uid()); - if (taskdaytotals.contains(daytaskkey)) + if (taskdaytotals.tqcontains(daytaskkey)) { - cell.push_back(TQString::fromLatin1("%1") + cell.push_back(TQString::tqfromLatin1("%1") .arg(formatTime(taskdaytotals[daytaskkey]/60, rc.decimalMinutes))); sum += taskdaytotals[daytaskkey]; // in seconds - if (daytotals.contains(daykey)) - daytotals.replace(daykey, daytotals[daykey]+taskdaytotals[daytaskkey]); + if (daytotals.tqcontains(daykey)) + daytotals.tqreplace(daykey, daytotals[daykey]+taskdaytotals[daytaskkey]); else daytotals.insert(daykey, taskdaytotals[daytaskkey]); } @@ -829,7 +829,7 @@ long KarmStorage::printTaskHistory ( } // Total for task - cell.push_back(TQString::fromLatin1("%1").arg(formatTime(sum/60, rc.decimalMinutes))); + cell.push_back(TQString::tqfromLatin1("%1").arg(formatTime(sum/60, rc.decimalMinutes))); // room for the recursive total time (that cannot be calculated now) cell.push_back(delim); @@ -842,16 +842,16 @@ long KarmStorage::printTaskHistory ( /* // CSV compliance - // Surround the field with quotes if the field contains + // Surround the field with quotes if the field tqcontains // a comma (delim) or a double quote - to_quote = task->name().contains(delim) || task->name().contains(dquote); + to_quote = task->name().tqcontains(delim) || task->name().tqcontains(dquote); */ to_quote = true; if ( to_quote) cell.push_back(dquote); - // Double quotes replaced by a pair of consecutive double quotes - cell.push_back(task->name().replace( dquote, double_dquote )); + // Double quotes tqreplaced by a pair of consecutive double quotes + cell.push_back(task->name().tqreplace( dquote, double_dquote )); if ( to_quote) cell.push_back(dquote); @@ -865,7 +865,7 @@ long KarmStorage::printTaskHistory ( add += printTaskHistory( subTask, taskdaytotals, daytotals, from, to , level+1, matrix, rc ); } - cell[colrectot]=(TQString::fromLatin1("%1").arg(formatTime((add+sum)/60, rc.decimalMinutes ))); + cell[colrectot]=(TQString::tqfromLatin1("%1").arg(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::fromLatin1("\n"); + const TQString cr = TQString::tqfromLatin1("\n"); TQString err; // below taken from timekard.cpp @@ -910,7 +910,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, // parameter-plausi if ( from > to ) { - err = TQString::fromLatin1 ( + err = TQString::tqfromLatin1 ( "'to' has to be a date later than or equal to 'from'."); } @@ -921,7 +921,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, .arg(KGlobal::locale()->formatDate(to)); retval += cr; retval += i18n("Printed on: %1") - .arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); + .arg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime())); retval += cr; day=from; @@ -936,13 +936,13 @@ 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::fromLatin1("yyyyMMdd")); - daytaskkey = TQString(TQString::fromLatin1("%1_%2")) + daykey = (*event).start().date().toString(TQString::tqfromLatin1("yyyyMMdd")); + daytaskkey = TQString(TQString::tqfromLatin1("%1_%2")) .arg(daykey) .arg((*event).todoUid()); - if (taskdaytotals.contains(daytaskkey)) - taskdaytotals.replace(daytaskkey, + if (taskdaytotals.tqcontains(daytaskkey)) + taskdaytotals.tqreplace(daytaskkey, taskdaytotals[daytaskkey] + (*event).duration()); else taskdaytotals.insert(daytaskkey, (*event).duration()); @@ -953,7 +953,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, while ( dayheading <= to ) { // Use ISO 8601 format for date. - retval += dayheading.toString(TQString::fromLatin1("yyyy-MM-dd")); + retval += dayheading.toString(TQString::tqfromLatin1("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::fromLatin1("yyyyMMdd")); + daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd")); - if (daytotals.contains(daykey)) + if (daytotals.tqcontains(daykey)) { - retval += TQString::fromLatin1("%1") + retval += TQString::tqfromLatin1("%1") .arg(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::fromLatin1("%1%2%3%4") + retval += TQString::tqfromLatin1("%1%2%3%4") .arg( formatTime( sum/60, rc.decimalMinutes ) ) .arg( delim ).arg( delim ) .arg( i18n( "Total" ) ); @@ -1015,7 +1015,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, // save, either locally or remote - if ((rc.url.isLocalFile()) || (!rc.url.url().contains("/"))) + if ((rc.url.isLocalFile()) || (!rc.url.url().tqcontains("/"))) { TQString filename=rc.url.path(); if (filename.isEmpty()) filename=rc.url.url(); @@ -1036,14 +1036,14 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, KTempFile tmpFile; if ( tmpFile.status() != 0 ) { - err = TQString::fromLatin1( "Unable to get temporary file" ); + err = TQString::tqfromLatin1( "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::fromLatin1("Could not upload"); + if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::tqfromLatin1("Could not upload"); } } return err; @@ -1166,7 +1166,7 @@ TQValueList KarmStorage::getHistory(const TQDate& from, { // KArm events have the custom property X-KDE-Karm-duration - if (! processed.contains( (*event)->uid())) + if (! processed.tqcontains( (*event)->uid())) { // If an event spans multiple days, CalendarLocal::rawEventsForDate // will return the same event on both days. To avoid double-counting diff --git a/karm/karmstorage.h b/karm/karmstorage.h index c9d91e15f..d94064f60 100644 --- a/karm/karmstorage.h +++ b/karm/karmstorage.h @@ -239,7 +239,7 @@ class KarmStorage * * @param task The task the timer was stopped for. */ - void stopTimer(const Task* task, TQDateTime when=TQDateTime::currentDateTime()); + void stopTimer(const Task* task, TQDateTime when=TQDateTime::tqcurrentDateTime()); /** * Log a new comment for this task. diff --git a/karm/karmutility.cpp b/karm/karmutility.cpp index 8a2de530a..d13a3f6ed 100644 --- a/karm/karmutility.cpp +++ b/karm/karmutility.cpp @@ -12,7 +12,7 @@ TQString formatTime( long minutes, bool decimal ) TQString time; if ( decimal ) { time.sprintf("%.2f", minutes / 60.0); - time.replace( '.', KGlobal::locale()->decimalSymbol() ); + time.tqreplace( '.', KGlobal::locale()->decimalSymbol() ); } else time.sprintf("%s%ld:%02ld", (minutes < 0) ? KGlobal::locale()->negativeSign().utf8().data() : "", diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp index 9de79d9dd..dba305fef 100644 --- a/karm/ktimewidget.cpp +++ b/karm/ktimewidget.cpp @@ -63,38 +63,38 @@ protected: KArmTimeWidget::KArmTimeWidget( TQWidget* parent, const char* name ) : TQWidget(parent, name) { - TQHBoxLayout *layout = new TQHBoxLayout(this); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); _hourLE = new TQLineEdit( this); // 9999 hours > 1 year! // 999 hours = 41 days (That should be enough ...) _hourLE->setFixedWidth( fontMetrics().maxWidth() * 3 + 2 * _hourLE->frameWidth() + 2); - layout->addWidget(_hourLE); + tqlayout->addWidget(_hourLE); TimeValidator *validator = new TimeValidator( HOUR, _hourLE, "Validator for _hourLE"); _hourLE->setValidator( validator ); - _hourLE->setAlignment( Qt::AlignRight ); + _hourLE->tqsetAlignment( Qt::AlignRight ); TQLabel *hr = new TQLabel( i18n( "abbreviation for hours", " hr. " ), this ); - layout->addWidget( hr ); + tqlayout->addWidget( hr ); _minuteLE = new KarmLineEdit(this); // Minutes lineedit: Make room for 2 digits _minuteLE->setFixedWidth( fontMetrics().maxWidth() * 2 + 2 * _minuteLE->frameWidth() + 2); - layout->addWidget(_minuteLE); + tqlayout->addWidget(_minuteLE); validator = new TimeValidator( MINUTE, _minuteLE, "Validator for _minuteLE"); _minuteLE->setValidator( validator ); _minuteLE->setMaxLength(2); - _minuteLE->setAlignment( Qt::AlignRight ); + _minuteLE->tqsetAlignment( Qt::AlignRight ); TQLabel *min = new TQLabel( i18n( "abbreviation for minutes", " min. " ), this ); - layout->addWidget( min ); + tqlayout->addWidget( min ); - layout->addStretch(1); + tqlayout->addStretch(1); setFocusProxy( _hourLE ); } @@ -111,7 +111,7 @@ void KArmTimeWidget::setTime( long minutes ) dummy.setNum( minutepart ); if (minutepart < 10 ) { - dummy = TQString::fromLatin1( "0" ) + dummy; + dummy = TQString::tqfromLatin1( "0" ) + dummy; } _minuteLE->setText( dummy ); } diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp index 6a80fa009..4440ab1a5 100644 --- a/karm/mainwindow.cpp +++ b/karm/mainwindow.cpp @@ -47,7 +47,7 @@ MainWindow::MainWindow( const TQString &icsfile ) setCentralWidget( _taskView ); // status bar - startStatusBar(); + starStatusBar(); // setup PreferenceDialog. _preferences = Preferences::instance(); @@ -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( setStatusBar( TQString ) ), - this, TQT_SLOT(setStatusBar( TQString ))); + connect( _taskView, TQT_SIGNAL( seStatusBar( TQString ) ), + this, TQT_SLOT(seStatusBar( TQString ))); loadGeometry(); @@ -134,7 +134,7 @@ void MainWindow::slotSelectionChanged() // actionAddComment->setEnabled( on ); //} -void MainWindow::setStatusBar(TQString qs) +void MainWindow::seStatusBar(TQString qs) { statusBar()->message(i18n(qs.ascii())); } @@ -208,7 +208,7 @@ void MainWindow::updateStatusBar( ) statusBar()->changeItem( i18n("Total: %1" ).arg(time), 1); } -void MainWindow::startStatusBar() +void MainWindow::starStatusBar() { statusBar()->insertItem( i18n("Session"), 0, 0, true ); statusBar()->insertItem( i18n("Total" ), 1, 0, true ); @@ -272,12 +272,12 @@ void MainWindow::makeMenus() actionCollection(), "reset_all_times"); actionStart = new KAction( i18n("&Start"), - TQString::fromLatin1("1rightarrow"), Key_S, + TQString::tqfromLatin1("1rightarrow"), Key_S, _taskView, TQT_SLOT( startCurrentTimer() ), actionCollection(), "start"); actionStop = new KAction( i18n("S&top"), - TQString::fromLatin1("stop"), Key_S, + TQString::tqfromLatin1("stop"), Key_S, _taskView, TQT_SLOT( stopCurrentTimer() ), actionCollection(), "stop"); @@ -289,48 +289,48 @@ void MainWindow::makeMenus() actionStopAll->setEnabled(false); actionNew = new KAction( i18n("&New..."), - TQString::fromLatin1("filenew"), CTRL+Key_N, + TQString::tqfromLatin1("filenew"), CTRL+Key_N, _taskView, TQT_SLOT( newTask() ), actionCollection(), "new_task"); actionNewSub = new KAction( i18n("New &Subtask..."), - TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N, + TQString::tqfromLatin1("kmultiple"), CTRL+ALT+Key_N, _taskView, TQT_SLOT( newSubTask() ), actionCollection(), "new_sub_task"); actionDelete = new KAction( i18n("&Delete"), - TQString::fromLatin1("editdelete"), Key_Delete, + TQString::tqfromLatin1("editdelete"), Key_Delete, _taskView, TQT_SLOT( deleteTask() ), actionCollection(), "delete_task"); actionEdit = new KAction( i18n("&Edit..."), - TQString::fromLatin1("edit"), CTRL + Key_E, + TQString::tqfromLatin1("edit"), CTRL + Key_E, _taskView, TQT_SLOT( editTask() ), actionCollection(), "edit_task"); // actionAddComment = new KAction( i18n("&Add Comment..."), -// TQString::fromLatin1("document"), +// TQString::tqfromLatin1("document"), // CTRL+ALT+Key_E, // _taskView, // TQT_SLOT( addCommentToTask() ), // actionCollection(), // "add_comment_to_task"); actionMarkAsComplete = new KAction( i18n("&Mark as Complete"), - TQString::fromLatin1("document"), + TQString::tqfromLatin1("document"), CTRL+Key_M, _taskView, TQT_SLOT( markTaskAsComplete() ), actionCollection(), "mark_as_complete"); actionMarkAsIncomplete = new KAction( i18n("&Mark as Incomplete"), - TQString::fromLatin1("document"), + TQString::tqfromLatin1("document"), CTRL+Key_M, _taskView, TQT_SLOT( markTaskAsIncomplete() ), actionCollection(), "mark_as_incomplete"); actionClipTotals = new KAction( i18n("&Copy Totals to Clipboard"), - TQString::fromLatin1("klipper"), + TQString::tqfromLatin1("klipper"), CTRL+Key_C, _taskView, TQT_SLOT( clipTotals() ), @@ -338,14 +338,14 @@ void MainWindow::makeMenus() "clip_totals"); // actionClipTotals will never be used again, overwrite it actionClipTotals = new KAction( i18n("&Copy Session Time to Clipboard"), - TQString::fromLatin1("klipper"), + TQString::tqfromLatin1("klipper"), 0, _taskView, TQT_SLOT( clipSession() ), actionCollection(), "clip_session"); actionClipHistory = new KAction( i18n("Copy &History to Clipboard"), - TQString::fromLatin1("klipper"), + TQString::tqfromLatin1("klipper"), CTRL+ALT+Key_C, _taskView, TQT_SLOT( clipHistory() ), @@ -372,7 +372,7 @@ void MainWindow::makeMenus() "import_korg_events"); */ - setXMLFile( TQString::fromLatin1("karmui.rc") ); + setXMLFile( TQString::tqfromLatin1("karmui.rc") ); createGUI( 0 ); // Tool tips must be set after the createGUI. @@ -442,11 +442,11 @@ void MainWindow::loadGeometry() { KConfig &config = *kapp->config(); - config.setGroup( TQString::fromLatin1("Main Window Geometry") ); - int w = config.readNumEntry( TQString::fromLatin1("Width"), 100 ); - int h = config.readNumEntry( TQString::fromLatin1("Height"), 100 ); - w = QMAX( w, sizeHint().width() ); - h = QMAX( h, sizeHint().height() ); + config.setGroup( TQString::tqfromLatin1("Main Window Geometry") ); + int w = config.readNumEntry( TQString::tqfromLatin1("Width"), 100 ); + int h = config.readNumEntry( TQString::tqfromLatin1("Height"), 100 ); + w = QMAX( w, tqsizeHint().width() ); + h = QMAX( h, tqsizeHint().height() ); resize(w, h); } } @@ -455,9 +455,9 @@ void MainWindow::loadGeometry() void MainWindow::saveGeometry() { KConfig &config = *KGlobal::config(); - config.setGroup( TQString::fromLatin1("Main Window Geometry")); - config.writeEntry( TQString::fromLatin1("Width"), width()); - config.writeEntry( TQString::fromLatin1("Height"), height()); + config.setGroup( TQString::tqfromLatin1("Main Window Geometry")); + config.writeEntry( TQString::tqfromLatin1("Width"), width()); + config.writeEntry( TQString::tqfromLatin1("Height"), height()); config.sync(); } diff --git a/karm/mainwindow.h b/karm/mainwindow.h index b6d77e8a3..2f275be16 100644 --- a/karm/mainwindow.h +++ b/karm/mainwindow.h @@ -88,7 +88,7 @@ class MainWindow : public KParts::MainWindow, virtual public KarmDCOPIface TQString importplannerfile( TQString filename ); public slots: - void setStatusBar( TQString ); + void seStatusBar( TQString ); void quit(); protected slots: @@ -107,7 +107,7 @@ class MainWindow : public KParts::MainWindow, virtual public KarmDCOPIface // void timeLoggingChanged( bool on ); protected: - void startStatusBar(); + void starStatusBar(); virtual void saveProperties( KConfig* ); virtual void readProperties( KConfig* ); void saveGeometry(); diff --git a/karm/plannerparser.cpp b/karm/plannerparser.cpp index 67f7bd53f..7ac13a5e3 100644 --- a/karm/plannerparser.cpp +++ b/karm/plannerparser.cpp @@ -55,15 +55,15 @@ test cases: int taskComplete=0; // only s within are processed - if (qName == TQString::fromLatin1("tasks")) withInTasks=true; - if ((qName == TQString::fromLatin1("task")) && (withInTasks)) + if (qName == TQString::tqfromLatin1("tasks")) withInTasks=true; + if ((qName == TQString::tqfromLatin1("task")) && (withInTasks)) { // find out name and percent-complete for (int i=0; isetColStretch( 1, 1 ); + TQGridLayout* tqlayout = new TQGridLayout( topLevel, 2, 2 ); + tqlayout->setColStretch( 1, 1 ); _doIdleDetectionW = new QCheckBox ( i18n("Detect desktop as idle after"), behaviorPage, "_doIdleDetectionW"); @@ -62,9 +62,9 @@ void Preferences::makeBehaviorPage() _promptDeleteW = new QCheckBox ( i18n( "Prompt before deleting tasks" ), behaviorPage, "_promptDeleteW" ); - layout->addWidget(_doIdleDetectionW, 0, 0 ); - layout->addWidget(_idleDetectValueW, 0, 1 ); - layout->addWidget(_promptDeleteW, 1, 0 ); + tqlayout->addWidget(_doIdleDetectionW, 0, 0 ); + tqlayout->addWidget(_idleDetectValueW, 0, 1 ); + tqlayout->addWidget(_promptDeleteW, 1, 0 ); topLevel->addStretch(); @@ -79,8 +79,8 @@ void Preferences::makeDisplayPage() icon ); TQVBoxLayout* topLevel = new TQVBoxLayout( displayPage, 0, spacingHint() ); - TQGridLayout* layout = new TQGridLayout( topLevel, 5, 2 ); - layout->setColStretch( 1, 1 ); + TQGridLayout* tqlayout = new TQGridLayout( topLevel, 5, 2 ); + tqlayout->setColStretch( 1, 1 ); TQLabel* _displayColumnsLabelW = new TQLabel( i18n("Columns displayed:"), displayPage ); @@ -93,11 +93,11 @@ void Preferences::makeDisplayPage() _displayTotalTimeW = new TQCheckBox ( i18n("Total task time"), displayPage, "_displayTotalTimeW"); - layout->addMultiCellWidget( _displayColumnsLabelW, 0, 0, 0, 1 ); - layout->addWidget(_displaySessionW, 1, 1 ); - layout->addWidget(_displayTimeW, 2, 1 ); - layout->addWidget(_displayTotalSessionW, 3, 1 ); - layout->addWidget(_displayTotalTimeW, 4, 1 ); + tqlayout->addMultiCellWidget( _displayColumnsLabelW, 0, 0, 0, 1 ); + tqlayout->addWidget(_displaySessionW, 1, 1 ); + tqlayout->addWidget(_displayTimeW, 2, 1 ); + tqlayout->addWidget(_displayTotalSessionW, 3, 1 ); + tqlayout->addWidget(_displayTotalTimeW, 4, 1 ); topLevel->addStretch(); } @@ -109,8 +109,8 @@ void Preferences::makeStoragePage() icon ); TQVBoxLayout* topLevel = new TQVBoxLayout( storagePage, 0, spacingHint() ); - TQGridLayout* layout = new TQGridLayout( topLevel, 4, 2 ); - layout->setColStretch( 1, 1 ); + TQGridLayout* tqlayout = new TQGridLayout( topLevel, 4, 2 ); + tqlayout->setColStretch( 1, 1 ); // autosave _doAutoSaveW = new QCheckBox @@ -121,19 +121,19 @@ void Preferences::makeStoragePage() // iCalendar TQLabel* _iCalFileLabel = new TQLabel( i18n("iCalendar file:"), storagePage); _iCalFileW = new KURLRequester(storagePage, "_iCalFileW"); - _iCalFileW->setFilter(TQString::fromLatin1("*.ics")); + _iCalFileW->setFilter(TQString::tqfromLatin1("*.ics")); _iCalFileW->setMode(KFile::File); // Log time? _loggingW = new TQCheckBox ( i18n("Log history"), storagePage, "_loggingW" ); - // add widgets to layout - layout->addWidget(_doAutoSaveW, 0, 0); - layout->addWidget(_autoSaveValueW, 0, 1); - layout->addWidget(_iCalFileLabel, 1, 0 ); - layout->addWidget(_iCalFileW, 1, 1 ); - layout->addWidget(_loggingW, 2, 0 ); + // add widgets to tqlayout + tqlayout->addWidget(_doAutoSaveW, 0, 0); + tqlayout->addWidget(_autoSaveValueW, 0, 1); + tqlayout->addWidget(_iCalFileLabel, 1, 0 ); + tqlayout->addWidget(_iCalFileW, 1, 1 ); + tqlayout->addWidget(_loggingW, 2, 0 ); topLevel->addStretch(); @@ -253,32 +253,32 @@ void Preferences::load() { KConfig &config = *kapp->config(); - config.setGroup( TQString::fromLatin1("Idle detection") ); - _doIdleDetectionV = config.readBoolEntry( TQString::fromLatin1("enabled"), + config.setGroup( TQString::tqfromLatin1("Idle detection") ); + _doIdleDetectionV = config.readBoolEntry( TQString::tqfromLatin1("enabled"), true ); - _idleDetectValueV = config.readNumEntry(TQString::fromLatin1("period"), 15); + _idleDetectValueV = config.readNumEntry(TQString::tqfromLatin1("period"), 15); - config.setGroup( TQString::fromLatin1("Saving") ); + config.setGroup( TQString::tqfromLatin1("Saving") ); _iCalFileV = config.readPathEntry - ( TQString::fromLatin1("ical file"), - locateLocal( "appdata", TQString::fromLatin1( "karm.ics"))); + ( TQString::tqfromLatin1("ical file"), + locateLocal( "appdata", TQString::tqfromLatin1( "karm.ics"))); _doAutoSaveV = config.readBoolEntry - ( TQString::fromLatin1("auto save"), true); + ( TQString::tqfromLatin1("auto save"), true); _autoSaveValueV = config.readNumEntry - ( TQString::fromLatin1("auto save period"), 5); + ( TQString::tqfromLatin1("auto save period"), 5); _promptDeleteV = config.readBoolEntry - ( TQString::fromLatin1("prompt delete"), true); + ( TQString::tqfromLatin1("prompt delete"), true); _loggingV = config.readBoolEntry - ( TQString::fromLatin1("logging"), true); + ( TQString::tqfromLatin1("logging"), true); _displayColumnV[0] = config.readBoolEntry - ( TQString::fromLatin1("display session time"), true); + ( TQString::tqfromLatin1("display session time"), true); _displayColumnV[1] = config.readBoolEntry - ( TQString::fromLatin1("display time"), true); + ( TQString::tqfromLatin1("display time"), true); _displayColumnV[2] = config.readBoolEntry - ( TQString::fromLatin1("display total session time"), true); + ( TQString::tqfromLatin1("display total session time"), true); _displayColumnV[3] = config.readBoolEntry - ( TQString::fromLatin1("display total time"), true); + ( TQString::tqfromLatin1("display total time"), true); KEMailSettings settings; _userRealName = settings.getSetting( KEMailSettings::RealName ); @@ -288,24 +288,24 @@ void Preferences::save() { KConfig &config = *KGlobal::config(); - config.setGroup( TQString::fromLatin1("Idle detection")); - config.writeEntry( TQString::fromLatin1("enabled"), _doIdleDetectionV); - config.writeEntry( TQString::fromLatin1("period"), _idleDetectValueV); + config.setGroup( TQString::tqfromLatin1("Idle detection")); + config.writeEntry( TQString::tqfromLatin1("enabled"), _doIdleDetectionV); + config.writeEntry( TQString::tqfromLatin1("period"), _idleDetectValueV); - config.setGroup( TQString::fromLatin1("Saving")); - config.writePathEntry( TQString::fromLatin1("ical file"), _iCalFileV); - config.writeEntry( TQString::fromLatin1("auto save"), _doAutoSaveV); - config.writeEntry( TQString::fromLatin1("logging"), _loggingV); - config.writeEntry( TQString::fromLatin1("auto save period"), _autoSaveValueV); - config.writeEntry( TQString::fromLatin1("prompt delete"), _promptDeleteV); + config.setGroup( TQString::tqfromLatin1("Saving")); + config.writePathEntry( TQString::tqfromLatin1("ical file"), _iCalFileV); + config.writeEntry( TQString::tqfromLatin1("auto save"), _doAutoSaveV); + config.writeEntry( TQString::tqfromLatin1("logging"), _loggingV); + config.writeEntry( TQString::tqfromLatin1("auto save period"), _autoSaveValueV); + config.writeEntry( TQString::tqfromLatin1("prompt delete"), _promptDeleteV); - config.writeEntry( TQString::fromLatin1("display session time"), + config.writeEntry( TQString::tqfromLatin1("display session time"), _displayColumnV[0]); - config.writeEntry( TQString::fromLatin1("display time"), + config.writeEntry( TQString::tqfromLatin1("display time"), _displayColumnV[1]); - config.writeEntry( TQString::fromLatin1("display total session time"), + config.writeEntry( TQString::tqfromLatin1("display total session time"), _displayColumnV[2]); - config.writeEntry( TQString::fromLatin1("display total time"), + config.writeEntry( TQString::tqfromLatin1("display total time"), _displayColumnV[3]); config.sync(); diff --git a/karm/print.cpp b/karm/print.cpp index 1badb4f9f..a7ddd4ba9 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 = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()); painter.drawText(xMargin, yoff, pageWidth, height, TQPainter::AlignCenter, diff --git a/karm/printdialog.cpp b/karm/printdialog.cpp index 92a306a01..6b3ca85b4 100644 --- a/karm/printdialog.cpp +++ b/karm/printdialog.cpp @@ -48,14 +48,14 @@ PrintDialog::PrintDialog() setMainWidget(page); int year, month; - TQVBoxLayout *layout = new TQVBoxLayout(page, KDialog::spacingHint()); - layout->addSpacing(10); - layout->addStretch(1); + TQVBoxLayout *tqlayout = new TQVBoxLayout(page, KDialog::spacingHint()); + tqlayout->addSpacing(10); + tqlayout->addStretch(1); // Date Range TQGroupBox *rangeGroup = new TQGroupBox(1, Horizontal, i18n("Date Range"), page); - layout->addWidget(rangeGroup); + tqlayout->addWidget(rangeGroup); TQWidget *rangeWidget = new TQWidget(rangeGroup); TQHBoxLayout *rangeLayout = new TQHBoxLayout(rangeWidget, 0, spacingHint()); @@ -64,29 +64,29 @@ PrintDialog::PrintDialog() _from = new KDateEdit(rangeWidget); // Default from date to beginning of the month - year = TQDate::currentDate().year(); - month = TQDate::currentDate().month(); + year = TQDate::tqcurrentDate().year(); + month = TQDate::tqcurrentDate().month(); _from->setDate(TQDate(year, month, 1)); rangeLayout->addWidget(_from); rangeLayout->addWidget(new TQLabel(i18n("To:"), rangeWidget)); _to = new KDateEdit(rangeWidget); rangeLayout->addWidget(_to); - layout->addSpacing(10); - layout->addStretch(1); + tqlayout->addSpacing(10); + tqlayout->addStretch(1); _allTasks = new TQComboBox( page ); _allTasks->insertItem( i18n( "Selected Task" ) ); _allTasks->insertItem( i18n( "All Tasks" ) ); - layout->addWidget( _allTasks ); + tqlayout->addWidget( _allTasks ); _perWeek = new TQCheckBox( i18n( "Summarize per week" ), page ); - layout->addWidget( _perWeek ); + tqlayout->addWidget( _perWeek ); _totalsOnly = new TQCheckBox( i18n( "Totals only" ), page ); - layout->addWidget( _totalsOnly ); + tqlayout->addWidget( _totalsOnly ); - layout->addSpacing(10); - layout->addStretch(1); + tqlayout->addSpacing(10); + tqlayout->addStretch(1); } TQDate PrintDialog::from() const diff --git a/karm/reportcriteria.h b/karm/reportcriteria.h index c6c1106e5..dae6a48e4 100644 --- a/karm/reportcriteria.h +++ b/karm/reportcriteria.h @@ -29,7 +29,7 @@ class TQString; Stores entries from export dialog. Keeps details (like CSV export dialog control names) out of the TaskView - class, which contains the slot triggered by the export action. + class, which tqcontains the slot triggered by the export action. The dialog and the report logic can change all they want and the TaskView logic can stay the same. diff --git a/karm/task.cpp b/karm/task.cpp index 7d84bcd2c..b150a94db 100644 --- a/karm/task.cpp +++ b/karm/task.cpp @@ -75,13 +75,13 @@ void Task::init( const TQString& taskName, long minutes, long sessionTime, _removing = false; _name = taskName.stripWhiteSpace(); - _lastStart = TQDateTime::currentDateTime(); + _lastStart = TQDateTime::tqcurrentDateTime(); _totalTime = _time = minutes; _totalSessionTime = _sessionTime = sessionTime; _timer = new TQTimer(this); _desktops = desktops; connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateActiveIcon())); - setPixmap(1, UserIcon(TQString::fromLatin1("empty-watch.xpm"))); + setPixmap(1, UserIcon(TQString::tqfromLatin1("empty-watch.xpm"))); _currentPic = 0; _percentcomplete = percent_complete; @@ -119,7 +119,7 @@ void Task::setRunning( bool on, KarmStorage* storage, TQDateTime whenStarted, TQ if ( ! _removing ) { storage->stopTimer(this, whenStopped); - setPixmap(1, UserIcon(TQString::fromLatin1("empty-watch.xpm"))); + setPixmap(1, UserIcon(TQString::tqfromLatin1("empty-watch.xpm"))); } } } @@ -290,7 +290,7 @@ TQString Task::fullName() const if (isRoot()) return name(); else - return parent()->fullName() + TQString::fromLatin1("/") + name(); + return parent()->fullName() + TQString::tqfromLatin1("/") + name(); } KCal::Todo* Task::asTodo(KCal::Todo* todo) const @@ -349,7 +349,7 @@ bool Task::parseIncidence( KCal::Incidence* incident, long& minutes, TQString desktopList = incident->customProperty( kapp->instanceName(), TQCString( "desktopList" ) ); - TQStringList desktopStrList = TQStringList::split( TQString::fromLatin1(","), + TQStringList desktopStrList = TQStringList::split( TQString::tqfromLatin1(","), desktopList ); desktops.clear(); @@ -380,7 +380,7 @@ TQString Task::getDesktopStr() const for ( DesktopList::const_iterator iter = _desktops.begin(); iter != _desktops.end(); ++iter ) { - desktopstr += TQString::number( *iter ) + TQString::fromLatin1( "," ); + desktopstr += TQString::number( *iter ) + TQString::tqfromLatin1( "," ); } desktopstr.remove( desktopstr.length() - 1, 1 ); return desktopstr; @@ -419,7 +419,7 @@ void Task::update() void Task::addComment( TQString comment, KarmStorage* storage ) { - _comment = _comment + TQString::fromLatin1("\n") + comment; + _comment = _comment + TQString::tqfromLatin1("\n") + comment; storage->addComment(this, comment); } diff --git a/karm/task.h b/karm/task.h index 8114b3cb6..276b25034 100644 --- a/karm/task.h +++ b/karm/task.h @@ -179,11 +179,11 @@ class Task : public TQObject, public QListViewItem * @param on true or false for starting or stopping a task * @param storage a pointer to a KarmStorage object. * @param whenStarted time when the task was started. Normally - TQDateTime::currentDateTime, but if calendar has + TQDateTime::tqcurrentDateTime, but if calendar has been changed by another program and being reloaded the task is set to running with another start date */ - void setRunning( bool on, KarmStorage* storage, TQDateTime whenStarted=TQDateTime::currentDateTime(), TQDateTime whenStopped=TQDateTime::currentDateTime()); + void setRunning( bool on, KarmStorage* storage, TQDateTime whenStarted=TQDateTime::tqcurrentDateTime(), TQDateTime whenStopped=TQDateTime::tqcurrentDateTime()); /** return the state of a task - if it's running or not * @return true or false depending on whether the task is running diff --git a/karm/taskview.cpp b/karm/taskview.cpp index 0af5c7bd4..a410806a0 100644 --- a/karm/taskview.cpp +++ b/karm/taskview.cpp @@ -367,7 +367,7 @@ TQString TaskView::save() { kdDebug(5970) << "Entering TaskView::save" << endl; TQString err = _storage->save(this); - emit(setStatusBar(err)); + emit(seStatusBar(err)); return err; } diff --git a/karm/taskview.h b/karm/taskview.h index a3a1a6769..a3b88413d 100644 --- a/karm/taskview.h +++ b/karm/taskview.h @@ -172,7 +172,7 @@ class TaskView : public KListView * @param task task to start timer of * @param startTime if taskview has been modified by another program, we have to set the starting time to not-now. */ - void startTimerFor( Task* task, TQDateTime startTime = TQDateTime::currentDateTime() ); + void startTimerFor( Task* task, TQDateTime startTime = TQDateTime::tqcurrentDateTime() ); void stopTimerFor( Task* task ); /** clears all active tasks. Needed e.g. if iCal file was modified by @@ -200,7 +200,7 @@ class TaskView : public KListView void timersActive(); void timersInactive(); void tasksChanged( TQPtrList activeTasks ); - void setStatusBar( TQString ); + void seStatusBar( TQString ); private: // member variables IdleTimeDetector *_idleTimeDetector; diff --git a/karm/test/lockerthread.cpp b/karm/test/lockerthread.cpp index 914682210..aeff6cc76 100644 --- a/karm/test/lockerthread.cpp +++ b/karm/test/lockerthread.cpp @@ -26,7 +26,7 @@ void LockerThread::run() KCal::ResourceCalendar *calendar = 0; KCal::CalendarResources::Ticket *lock = 0; - calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) ); + calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) ); calendar = new KCal::ResourceLocal( m_icsfile ); lock = calendars->requestSaveTicket( calendar ); if ( lock ) diff --git a/karm/test/locking.cpp b/karm/test/locking.cpp index 940a344d1..2c18d4fed 100644 --- a/karm/test/locking.cpp +++ b/karm/test/locking.cpp @@ -23,7 +23,7 @@ short test1() KCal::ResourceCalendar *calendar = 0; KCal::CalendarResources::Ticket *lock = 0; - calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) ); + calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) ); calendar = new KCal::ResourceLocal( icalfilename ); lock = calendars->requestSaveTicket( calendar ); @@ -62,7 +62,7 @@ short test2() KCal::ResourceCalendar *calendar = 0; KCal::CalendarResources::Ticket *lock = 0; - calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) ); + calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) ); calendar = new KCal::ResourceLocal( icalfilename ); LockerThread thread( icalfilename ); @@ -88,7 +88,7 @@ short test3() KCal::ResourceCalendar *calendar = 0; KCal::CalendarResources::Ticket *lock = 0; - calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) ); + calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) ); calendar = new KCal::ResourceLocal( icalfilename ); // lock then unlock diff --git a/karm/test/script.cpp b/karm/test/script.cpp index f9fa9d9e0..816314368 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->exitStatus(); + m_status = m_proc->exiStatus(); delete m_proc; m_proc = 0; } diff --git a/karm/timekard.cpp b/karm/timekard.cpp index 984baf741..d7de48402 100644 --- a/karm/timekard.cpp +++ b/karm/timekard.cpp @@ -43,7 +43,7 @@ const int timeWidth = 6; const int totalTimeWidth = 7; const int reportWidth = taskWidth + timeWidth; -const TQString cr = TQString::fromLatin1("\n"); +const TQString cr = TQString::tqfromLatin1("\n"); TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime which) // Print the total Times as text. If justThisTask, use activeTask, else, all tasks @@ -59,9 +59,9 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime // header retval += i18n("Task Totals") + cr; - retval += KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); + retval += KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()); retval += cr + cr; - retval += TQString(TQString::fromLatin1("%1 %2")) + retval += TQString(TQString::tqfromLatin1("%1 %2")) .arg(i18n("Time"), timeWidth) .arg(i18n("Task")); retval += cr; @@ -92,8 +92,8 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime // total buf.fill('-', reportWidth); - retval += TQString(TQString::fromLatin1("%1")).arg(buf, timeWidth) + cr; - retval += TQString(TQString::fromLatin1("%1 %2")) + retval += TQString(TQString::tqfromLatin1("%1")).arg(buf, timeWidth) + cr; + retval += TQString(TQString::tqfromLatin1("%1 %2")) .arg(formatTime(sum),timeWidth) .arg(i18n("Total")); } @@ -109,7 +109,7 @@ void TimeKard::printTask(Task *task, TQString &s, int level, WhichTime which) TQString buf; s += buf.fill(' ', level); - s += TQString(TQString::fromLatin1("%1 %2")) + s += TQString(TQString::tqfromLatin1("%1 %2")) .arg(formatTime(which == TotalTime?task->totalTime():task->totalSessionTime()), timeWidth) .arg(task->name()); s += cr; @@ -134,22 +134,22 @@ void TimeKard::printTaskHistory(const Task *task, long sectionsum = 0; for ( TQDate day = from; day <= to; day = day.addDays(1) ) { - TQString daykey = day.toString(TQString::fromLatin1("yyyyMMdd")); - TQString daytaskkey = TQString::fromLatin1("%1_%2") + TQString daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd")); + TQString daytaskkey = TQString::tqfromLatin1("%1_%2") .arg(daykey) .arg(task->uid()); - if (taskdaytotals.contains(daytaskkey)) + if (taskdaytotals.tqcontains(daytaskkey)) { if ( !totalsOnly ) { - s += TQString::fromLatin1("%1") + s += TQString::tqfromLatin1("%1") .arg(formatTime(taskdaytotals[daytaskkey]/60), timeWidth); } sectionsum += taskdaytotals[daytaskkey]; // in seconds - if (daytotals.contains(daykey)) - daytotals.replace(daykey, daytotals[daykey] + taskdaytotals[daytaskkey]); + if (daytotals.tqcontains(daykey)) + daytotals.tqreplace(daykey, daytotals[daykey] + taskdaytotals[daytaskkey]); else daytotals.insert(daykey, taskdaytotals[daytaskkey]); } @@ -162,12 +162,12 @@ void TimeKard::printTaskHistory(const Task *task, } // Total for task this section (e.g. week) - s += TQString::fromLatin1("%1").arg(formatTime(sectionsum/60), totalTimeWidth); + s += TQString::tqfromLatin1("%1").arg(formatTime(sectionsum/60), totalTimeWidth); // Task name TQString buf; s += buf.fill(' ', level + 1); - s += TQString::fromLatin1("%1").arg(task->name()); + s += TQString::tqfromLatin1("%1").arg(task->name()); s += cr; for (Task* subTask = task->firstChild(); @@ -221,13 +221,13 @@ TQString TimeKard::sectionHistoryAsText( // so times are accumulated for each task. for (TQValueList::iterator event = events.begin(); event != events.end(); ++event) { - TQString daykey = (*event).start().date().toString(TQString::fromLatin1("yyyyMMdd")); - TQString daytaskkey = TQString::fromLatin1("%1_%2") + TQString daykey = (*event).start().date().toString(TQString::tqfromLatin1("yyyyMMdd")); + TQString daytaskkey = TQString::tqfromLatin1("%1_%2") .arg(daykey) .arg((*event).todoUid()); - if (taskdaytotals.contains(daytaskkey)) - taskdaytotals.replace(daytaskkey, + if (taskdaytotals.tqcontains(daytaskkey)) + taskdaytotals.tqreplace(daytaskkey, taskdaytotals[daytaskkey] + (*event).duration()); else taskdaytotals.insert(daytaskkey, (*event).duration()); @@ -246,7 +246,7 @@ TQString TimeKard::sectionHistoryAsText( // day headings for (TQDate day = sectionFrom; day <= sectionTo; day = day.addDays(1)) { - retval += TQString::fromLatin1("%1").arg(day.day(), timeWidth); + retval += TQString::tqfromLatin1("%1").arg(day.day(), timeWidth); } retval += cr; retval += line; @@ -280,13 +280,13 @@ TQString TimeKard::sectionHistoryAsText( long sum = 0; for (TQDate day = sectionFrom; day <= sectionTo; day = day.addDays(1)) { - TQString daykey = day.toString(TQString::fromLatin1("yyyyMMdd")); + TQString daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd")); - if (daytotals.contains(daykey)) + if (daytotals.tqcontains(daykey)) { if ( !totalsOnly ) { - retval += TQString::fromLatin1("%1") + retval += TQString::tqfromLatin1("%1") .arg(formatTime(daytotals[daykey]/60), timeWidth); } sum += daytotals[daykey]; // in seconds @@ -298,7 +298,7 @@ TQString TimeKard::sectionHistoryAsText( } } - retval += TQString::fromLatin1("%1 %2") + retval += TQString::tqfromLatin1("%1 %2") .arg(formatTime(sum/60), totalTimeWidth) .arg(i18n("Total")); } @@ -317,7 +317,7 @@ TQString TimeKard::historyAsText(TaskView* taskview, const TQDate& from, .arg(KGlobal::locale()->formatDate(to)); retval += cr; retval += i18n("Printed on: %1") - .arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); + .arg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime())); if ( perWeek ) { -- cgit v1.2.1