summaryrefslogtreecommitdiffstats
path: root/karm
diff options
context:
space:
mode:
Diffstat (limited to 'karm')
-rw-r--r--karm/desktoptracker.cpp6
-rw-r--r--karm/edittaskdialog.cpp4
-rw-r--r--karm/idletimedetector.cpp2
-rw-r--r--karm/kaccelmenuwatch.cpp4
-rw-r--r--karm/karm_part.cpp48
-rw-r--r--karm/karmstorage.cpp44
-rw-r--r--karm/ktimewidget.cpp2
-rw-r--r--karm/mainwindow.cpp64
-rw-r--r--karm/print.cpp2
-rw-r--r--karm/printdialog.cpp2
-rw-r--r--karm/taskview.cpp28
-rw-r--r--karm/timekard.cpp44
-rw-r--r--karm/tray.cpp4
13 files changed, 127 insertions, 127 deletions
diff --git a/karm/desktoptracker.cpp b/karm/desktoptracker.cpp
index 3c9e5e84..773f6aea 100644
--- a/karm/desktoptracker.cpp
+++ b/karm/desktoptracker.cpp
@@ -84,7 +84,7 @@ void DesktopTracker::registerForDesktops( Task* task, DesktopList desktopList)
if (desktopList.size()==0) {
for (int i=0; i<maxDesktops; i++) {
TaskVector *v = &(desktopTracker[i]);
- TaskVector::iterator tit = std::tqfind(v->begin(), v->end(), task);
+ TaskVector::iterator tit = std::find(v->begin(), v->end(), task);
if (tit != v->end())
desktopTracker[i].erase(tit);
// if the task was priviously tracking this desktop then
@@ -102,9 +102,9 @@ void DesktopTracker::registerForDesktops( Task* task, DesktopList desktopList)
if (desktopList.size()>0) {
for (int i=0; i<maxDesktops; i++) {
TaskVector& v = desktopTracker[i];
- TaskVector::iterator tit = std::tqfind(v.begin(), v.end(), task);
+ TaskVector::iterator tit = std::find(v.begin(), v.end(), task);
// Is desktop i in the desktop list?
- if ( std::tqfind( desktopList.begin(), desktopList.end(), i)
+ if ( std::find( desktopList.begin(), desktopList.end(), i)
!= desktopList.end()) {
if (tit == v.end()) // not yet in start vector
v.push_back(task); // track in desk i
diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp
index a556550a..8c165154 100644
--- a/karm/edittaskdialog.cpp
+++ b/karm/edittaskdialog.cpp
@@ -1,7 +1,7 @@
/*
* karm
* This file only: Copyright (C) 1999 Espen Sand, espensa@online.no
- * Modifications (see CVS log) Copyright (C) 2000 Klarälvdalens
+ * Modifications (see CVS log) Copyright (C) 2000 Klar�lvdalens
* Datakonsult AB <kalle@dalheimer.de>, Jesper Pedersen <blackie@kde.org>
*
*
@@ -173,7 +173,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
{
int lines = (int)(desktopCount/2);
if (lines*2 != desktopCount) lines++;
- groupBox = new TQButtonGroup( lines, TQGroupBox::Horizontal,
+ groupBox = new TQButtonGroup( lines, Qt::Horizontal,
i18n("In Desktop"), page, "_desktopsGB");
}
lay1->addWidget(groupBox);
diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp
index 46ae03e9..38ae04d7 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?").arg(idleStartTQString),
+ " What should we do?").tqarg(idleStartTQString),
i18n("Revert && Stop"),
i18n("Revert && Continue"),
i18n("Continue Timing"),0,2);
diff --git a/karm/kaccelmenuwatch.cpp b/karm/kaccelmenuwatch.cpp
index 75e4854e..18a0f511 100644
--- a/karm/kaccelmenuwatch.cpp
+++ b/karm/kaccelmenuwatch.cpp
@@ -25,7 +25,7 @@ void KAccelMenuWatch::setMenu( TQPopupMenu *menu )
// we use _menuList to ensure that the signal is
// connected only once per menu.
- if ( !_menuList.findRef( menu ) ) {
+ if ( !_menuList.tqfindRef( menu ) ) {
_menuList.append( menu );
connect( menu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(removeDeadMenu()) );
}
@@ -74,7 +74,7 @@ void KAccelMenuWatch::removeDeadMenu()
TQPopupMenu *sdr = (TQPopupMenu *) sender();
assert( sdr );
- if ( !_menuList.findRef( sdr ) )
+ if ( !_menuList.tqfindRef( sdr ) )
return;
// remove all accels
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index d8982e2e..abe8fed6 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -25,7 +25,7 @@ karmPart::karmPart( TQWidget *tqparentWidget, const char *widgetName,
TQObject *tqparent, const char *name )
: DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(tqparent, name),
_accel ( new KAccel( tqparentWidget ) ),
- _watcher ( new KAccelMenuWatch( _accel, tqparentWidget ) )
+ _watcher ( new KAccelMenuWatch( _accel, TQT_TQOBJECT(tqparentWidget) ) )
{
// we need an instance
setInstance( karmPartFactory::instance() );
@@ -117,109 +117,109 @@ void karmPart::makeMenus()
(void) KStdAction::print( this, TQT_SLOT( print() ), actionCollection());
actionKeyBindings = KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ),
actionCollection() );
- actionPreferences = KStdAction::preferences(_preferences,
+ actionPreferences = KStdAction::preferences(TQT_TQOBJECT(_preferences),
TQT_SLOT(showDialog()),
actionCollection() );
(void) KStdAction::save( this, TQT_SLOT( save() ), actionCollection() );
KAction* actionStartNewSession = new KAction( i18n("Start &New Session"),
0,
- this,
+ TQT_TQOBJECT(this),
TQT_SLOT( startNewSession() ),
actionCollection(),
"start_new_session");
KAction* actionResetAll = new KAction( i18n("&Reset All Times"),
0,
- this,
+ TQT_TQOBJECT(this),
TQT_SLOT( resetAllTimes() ),
actionCollection(),
"reset_all_times");
actionStart = new KAction( i18n("&Start"),
TQString::tqfromLatin1("1rightarrow"), Key_S,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( startCurrentTimer() ), actionCollection(),
"start");
actionStop = new KAction( i18n("S&top"),
TQString::tqfromLatin1("stop"), 0,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( stopCurrentTimer() ), actionCollection(),
"stop");
actionStopAll = new KAction( i18n("Stop &All Timers"),
Key_Escape,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( stopAllTimers() ), actionCollection(),
"stopAll");
actionStopAll->setEnabled(false);
actionNew = new KAction( i18n("&New..."),
TQString::tqfromLatin1("filenew"), CTRL+Key_N,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( newTask() ), actionCollection(),
"new_task");
actionNewSub = new KAction( i18n("New &Subtask..."),
TQString::tqfromLatin1("kmultiple"), CTRL+ALT+Key_N,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( newSubTask() ), actionCollection(),
"new_sub_task");
actionDelete = new KAction( i18n("&Delete"),
TQString::tqfromLatin1("editdelete"), Key_Delete,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( deleteTask() ), actionCollection(),
"delete_task");
actionEdit = new KAction( i18n("&Edit..."),
TQString::tqfromLatin1("edit"), CTRL + Key_E,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( editTask() ), actionCollection(),
"edit_task");
// actionAddComment = new KAction( i18n("&Add Comment..."),
// TQString::tqfromLatin1("document"),
// CTRL+ALT+Key_E,
-// _taskView,
+// TQT_TQOBJECT(_taskView),
// TQT_SLOT( addCommentToTask() ),
// actionCollection(),
// "add_comment_to_task");
actionMarkAsComplete = new KAction( i18n("&Mark as Complete"),
TQString::tqfromLatin1("document"),
CTRL+Key_M,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( markTaskAsComplete() ),
actionCollection(),
"mark_as_complete");
actionMarkAsIncomplete = new KAction( i18n("&Mark as Incomplete"),
TQString::tqfromLatin1("document"),
CTRL+Key_M,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( markTaskAsIncomplete() ),
actionCollection(),
"mark_as_incomplete");
actionClipTotals = new KAction( i18n("&Copy Totals to Clipboard"),
TQString::tqfromLatin1("klipper"),
CTRL+Key_C,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( clipTotals() ),
actionCollection(),
"clip_totals");
actionClipHistory = new KAction( i18n("Copy &History to Clipboard"),
TQString::tqfromLatin1("klipper"),
CTRL+ALT+Key_C,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( clipHistory() ),
actionCollection(),
"clip_history");
new KAction( i18n("Import &Legacy Flat File..."), 0,
- _taskView, TQT_SLOT(loadFromFlatFile()), actionCollection(),
+ TQT_TQOBJECT(_taskView), TQT_SLOT(loadFromFlatFile()), actionCollection(),
"import_flatfile");
new KAction( i18n("&Export to CSV File..."), 0,
- _taskView, TQT_SLOT(exportcsvFile()), actionCollection(),
+ TQT_TQOBJECT(_taskView), TQT_SLOT(exportcsvFile()), actionCollection(),
"export_csvfile");
new KAction( i18n("Export &History to CSV File..."), 0,
- this, TQT_SLOT(exportcsvHistory()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(exportcsvHistory()), actionCollection(),
"export_csvhistory");
new KAction( i18n("Import Tasks From &Planner..."), 0,
- _taskView, TQT_SLOT(importPlanner()), actionCollection(),
+ TQT_TQOBJECT(_taskView), TQT_SLOT(importPlanner()), actionCollection(),
"import_planner");
new KAction( i18n("Configure KArm..."), 0,
- _preferences, TQT_SLOT(showDialog()), actionCollection(),
+ TQT_TQOBJECT(_preferences), TQT_SLOT(showDialog()), actionCollection(),
"configure_karm");
/*
@@ -544,10 +544,10 @@ int karmPart::bookTime
// Parse datetime
if ( !rval )
{
- startDate = TQDate::fromString( datetime, TQt::ISODate );
+ startDate = TQDate::fromString( datetime, Qt::ISODate );
if ( datetime.length() > 10 ) // "YYYY-MM-DD".length() = 10
{
- startTime = TQTime::fromString( datetime, TQt::ISODate );
+ startTime = TQTime::fromString( datetime, Qt::ISODate );
}
else startTime = TQTime( 12, 0 );
if ( startDate.isValid() && startTime.isValid() )
@@ -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" ).arg( mkb );
+ else return i18n( "Invalid error number: %1" ).tqarg( mkb );
}
int karmPart::totalMinutesForTaskId( const TQString& taskId )
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index 4a7dabc2..7dc025c2 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 tqparent (uid=%2)")
- .arg(task->name())
- .arg((*todo)->relatedToUid());
+ .tqarg(task->name())
+ .tqarg((*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 tqparent (uid=%2)")
- .arg(task->name())
- .arg((*todo)->relatedToUid());
+ .tqarg(task->name())
+ .tqarg((*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.").arg(filename);
+ err = i18n("File \"%1\" not found.").tqarg(filename);
if (!err)
{
if( !f.open( IO_ReadOnly ) )
- err = i18n("Could not open \"%1\".").arg(filename);
+ err = i18n("Could not open \"%1\".").tqarg(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\"." ).arg( filename );
+ err = i18n( "Could not open \"%1\"." ).tqarg( 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::tqfromLatin1("yyyyMMdd"));
daytaskkey = TQString::tqfromLatin1("%1_%2")
- .arg(daykey)
- .arg(task->uid());
+ .tqarg(daykey)
+ .tqarg(task->uid());
if (taskdaytotals.tqcontains(daytaskkey))
{
cell.push_back(TQString::tqfromLatin1("%1")
- .arg(formatTime(taskdaytotals[daytaskkey]/60, rc.decimalMinutes)));
+ .tqarg(formatTime(taskdaytotals[daytaskkey]/60, rc.decimalMinutes)));
sum += taskdaytotals[daytaskkey]; // in seconds
if (daytotals.tqcontains(daykey))
@@ -829,7 +829,7 @@ long KarmStorage::printTaskHistory (
}
// Total for task
- cell.push_back(TQString::tqfromLatin1("%1").arg(formatTime(sum/60, rc.decimalMinutes)));
+ cell.push_back(TQString::tqfromLatin1("%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").arg(formatTime((add+sum)/60, rc.decimalMinutes )));
+ cell[colrectot]=(TQString::tqfromLatin1("%1").tqarg(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")
- .arg(KGlobal::locale()->formatDate(from))
- .arg(KGlobal::locale()->formatDate(to));
+ .tqarg(KGlobal::locale()->formatDate(from))
+ .tqarg(KGlobal::locale()->formatDate(to));
retval += cr;
retval += i18n("Printed on: %1")
- .arg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()));
+ .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()));
retval += cr;
day=from;
@@ -938,8 +938,8 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview,
{
daykey = (*event).start().date().toString(TQString::tqfromLatin1("yyyyMMdd"));
daytaskkey = TQString(TQString::tqfromLatin1("%1_%2"))
- .arg(daykey)
- .arg((*event).todoUid());
+ .tqarg(daykey)
+ .tqarg((*event).todoUid());
if (taskdaytotals.tqcontains(daytaskkey))
taskdaytotals.tqreplace(daytaskkey,
@@ -998,7 +998,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview,
if (daytotals.tqcontains(daykey))
{
retval += TQString::tqfromLatin1("%1")
- .arg(formatTime(daytotals[daykey]/60, rc.decimalMinutes));
+ .tqarg(formatTime(daytotals[daykey]/60, rc.decimalMinutes));
sum += daytotals[daykey]; // in seconds
}
retval += delim;
@@ -1006,9 +1006,9 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview,
}
retval += TQString::tqfromLatin1("%1%2%3%4")
- .arg( formatTime( sum/60, rc.decimalMinutes ) )
- .arg( delim ).arg( delim )
- .arg( i18n( "Total" ) );
+ .tqarg( formatTime( sum/60, rc.decimalMinutes ) )
+ .tqarg( delim ).tqarg( delim )
+ .tqarg( 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\"." ).arg( filename );
+ err = i18n( "Could not open \"%1\"." ).tqarg( filename );
}
if (!err)
{
diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp
index b1f7790f..e480dea4 100644
--- a/karm/ktimewidget.cpp
+++ b/karm/ktimewidget.cpp
@@ -17,7 +17,7 @@ class TimeValidator : public TQValidator
{
public:
TimeValidator( ValidatorType tp, TQWidget *tqparent=0, const char *name=0)
- : TQValidator(tqparent, name)
+ : TQValidator(TQT_TQOBJECT(tqparent), name)
{
_tp = tp;
}
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 2ab850aa..6d1ce29e 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -38,7 +38,7 @@ MainWindow::MainWindow( const TQString &icsfile )
: DCOPObject ( "KarmDCOPIface" ),
KParts::MainWindow(0,TQt::WStyle_ContextHelp),
_accel ( new KAccel( this ) ),
- _watcher ( new KAccelMenuWatch( _accel, this ) ),
+ _watcher ( new KAccelMenuWatch( _accel, TQT_TQOBJECT(this) ) ),
_totalSum ( 0 ),
_sessionSum( 0 )
{
@@ -202,10 +202,10 @@ void MainWindow::updateStatusBar( )
TQString time;
time = formatTime( _sessionSum );
- statusBar()->changeItem( i18n("Session: %1").arg(time), 0 );
+ statusBar()->changeItem( i18n("Session: %1").tqarg(time), 0 );
time = formatTime( _totalSum );
- statusBar()->changeItem( i18n("Total: %1" ).arg(time), 1);
+ statusBar()->changeItem( i18n("Total: %1" ).tqarg(time), 1);
}
void MainWindow::starStatusBar()
@@ -251,88 +251,88 @@ void MainWindow::makeMenus()
*actionNew,
*actionNewSub;
- (void) KStdAction::quit( this, TQT_SLOT( quit() ), actionCollection());
- (void) KStdAction::print( this, TQT_SLOT( print() ), actionCollection());
- actionKeyBindings = KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ),
+ (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( quit() ), actionCollection());
+ (void) KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection());
+ actionKeyBindings = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ),
actionCollection() );
- actionPreferences = KStdAction::preferences(_preferences,
+ actionPreferences = KStdAction::preferences(TQT_TQOBJECT(_preferences),
TQT_SLOT(showDialog()),
actionCollection() );
- (void) KStdAction::save( this, TQT_SLOT( save() ), actionCollection() );
+ (void) KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( save() ), actionCollection() );
KAction* actionStartNewSession = new KAction( i18n("Start &New Session"),
0,
- this,
+ TQT_TQOBJECT(this),
TQT_SLOT( startNewSession() ),
actionCollection(),
"start_new_session");
KAction* actionResetAll = new KAction( i18n("&Reset All Times"),
0,
- this,
+ TQT_TQOBJECT(this),
TQT_SLOT( resetAllTimes() ),
actionCollection(),
"reset_all_times");
actionStart = new KAction( i18n("&Start"),
TQString::tqfromLatin1("1rightarrow"), Key_S,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( startCurrentTimer() ), actionCollection(),
"start");
actionStop = new KAction( i18n("S&top"),
TQString::tqfromLatin1("stop"), Key_S,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( stopCurrentTimer() ), actionCollection(),
"stop");
actionStopAll = new KAction( i18n("Stop &All Timers"),
Key_Escape,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( stopAllTimers() ), actionCollection(),
"stopAll");
actionStopAll->setEnabled(false);
actionNew = new KAction( i18n("&New..."),
TQString::tqfromLatin1("filenew"), CTRL+Key_N,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( newTask() ), actionCollection(),
"new_task");
actionNewSub = new KAction( i18n("New &Subtask..."),
TQString::tqfromLatin1("kmultiple"), CTRL+ALT+Key_N,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( newSubTask() ), actionCollection(),
"new_sub_task");
actionDelete = new KAction( i18n("&Delete"),
TQString::tqfromLatin1("editdelete"), Key_Delete,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( deleteTask() ), actionCollection(),
"delete_task");
actionEdit = new KAction( i18n("&Edit..."),
TQString::tqfromLatin1("edit"), CTRL + Key_E,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( editTask() ), actionCollection(),
"edit_task");
// actionAddComment = new KAction( i18n("&Add Comment..."),
// TQString::tqfromLatin1("document"),
// CTRL+ALT+Key_E,
-// _taskView,
+// TQT_TQOBJECT(_taskView),
// TQT_SLOT( addCommentToTask() ),
// actionCollection(),
// "add_comment_to_task");
actionMarkAsComplete = new KAction( i18n("&Mark as Complete"),
TQString::tqfromLatin1("document"),
CTRL+Key_M,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( markTaskAsComplete() ),
actionCollection(),
"mark_as_complete");
actionMarkAsIncomplete = new KAction( i18n("&Mark as Incomplete"),
TQString::tqfromLatin1("document"),
CTRL+Key_M,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( markTaskAsIncomplete() ),
actionCollection(),
"mark_as_incomplete");
actionClipTotals = new KAction( i18n("&Copy Totals to Clipboard"),
TQString::tqfromLatin1("klipper"),
CTRL+Key_C,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( clipTotals() ),
actionCollection(),
"clip_totals");
@@ -340,29 +340,29 @@ void MainWindow::makeMenus()
actionClipTotals = new KAction( i18n("&Copy Session Time to Clipboard"),
TQString::tqfromLatin1("klipper"),
0,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( clipSession() ),
actionCollection(),
"clip_session");
actionClipHistory = new KAction( i18n("Copy &History to Clipboard"),
TQString::tqfromLatin1("klipper"),
CTRL+ALT+Key_C,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( clipHistory() ),
actionCollection(),
"clip_history");
new KAction( i18n("Import &Legacy Flat File..."), 0,
- _taskView, TQT_SLOT(loadFromFlatFile()), actionCollection(),
+ TQT_TQOBJECT(_taskView), TQT_SLOT(loadFromFlatFile()), actionCollection(),
"import_flatfile");
new KAction( i18n("&Export to CSV File..."), 0,
- _taskView, TQT_SLOT(exportcsvFile()), actionCollection(),
+ TQT_TQOBJECT(_taskView), TQT_SLOT(exportcsvFile()), actionCollection(),
"export_csvfile");
new KAction( i18n("Export &History to CSV File..."), 0,
- this, TQT_SLOT(exportcsvHistory()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(exportcsvHistory()), actionCollection(),
"export_csvhistory");
new KAction( i18n("Import Tasks From &Planner..."), 0,
- _taskView, TQT_SLOT(importPlanner()), actionCollection(),
+ TQT_TQOBJECT(_taskView), TQT_SLOT(importPlanner()), actionCollection(),
"import_planner");
/*
@@ -578,10 +578,10 @@ int MainWindow::bookTime
// Parse datetime
if ( !rval )
{
- startDate = TQDate::fromString( datetime, TQt::ISODate );
+ startDate = TQDate::fromString( datetime, Qt::ISODate );
if ( datetime.length() > 10 ) // "YYYY-MM-DD".length() = 10
{
- startTime = TQTime::fromString( datetime, TQt::ISODate );
+ startTime = TQTime::fromString( datetime, Qt::ISODate );
}
else startTime = TQTime( 12, 0 );
if ( startDate.isValid() && startTime.isValid() )
@@ -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" ).arg( mkb );
+ else return i18n( "Invalid error number: %1" ).tqarg( mkb );
}
int MainWindow::totalMinutesForTaskId( const TQString& taskId )
@@ -718,10 +718,10 @@ TQString MainWindow::exportcsvfile( TQString filename, TQString from, TQString t
ReportCriteria rc;
rc.url=filename;
rc.from=TQDate::fromString( from );
- if ( rc.from.isNull() ) rc.from=TQDate::fromString( from, TQt::ISODate );
+ if ( rc.from.isNull() ) rc.from=TQDate::fromString( from, Qt::ISODate );
kdDebug(5970) << "rc.from " << rc.from << endl;
rc.to=TQDate::fromString( to );
- if ( rc.to.isNull() ) rc.to=TQDate::fromString( to, TQt::ISODate );
+ if ( rc.to.isNull() ) rc.to=TQDate::fromString( to, Qt::ISODate );
kdDebug(5970) << "rc.to " << rc.to << endl;
rc.reportType=(ReportCriteria::REPORTTYPE) type; // history report or totals report
rc.decimalMinutes=decimalMinutes;
diff --git a/karm/print.cpp b/karm/print.cpp
index 891c06fe..d045a665 100644
--- a/karm/print.cpp
+++ b/karm/print.cpp
@@ -79,7 +79,7 @@ void MyPrinter::print()
painter.drawText(xMargin, yoff, pageWidth, height,
TQPainter::AlignCenter,
- i18n("KArm - %1").arg(now));
+ i18n("KArm - %1").tqarg(now));
painter.setFont(origFont);
yoff += height + 10;
diff --git a/karm/printdialog.cpp b/karm/printdialog.cpp
index 6b3ca85b..b8d05ace 100644
--- a/karm/printdialog.cpp
+++ b/karm/printdialog.cpp
@@ -53,7 +53,7 @@ PrintDialog::PrintDialog()
tqlayout->addStretch(1);
// Date Range
- TQGroupBox *rangeGroup = new TQGroupBox(1, Horizontal, i18n("Date Range"),
+ TQGroupBox *rangeGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Date Range"),
page);
tqlayout->addWidget(rangeGroup);
diff --git a/karm/taskview.cpp b/karm/taskview.cpp
index 1ac108e0..6a8f6e05 100644
--- a/karm/taskview.cpp
+++ b/karm/taskview.cpp
@@ -131,7 +131,7 @@ void TaskView::contentsMousePressEvent ( TQMouseEvent * e )
int leftborder = treeStepSize() * ( task->depth() + ( rootIsDecorated() ? 1 : 0)) + itemMargin();
if ((leftborder < e->x()) && (e->x() < 19 + leftborder ))
{
- if ( e->button() == LeftButton )
+ if ( e->button() == Qt::LeftButton )
if ( task->isComplete() ) task->setPercentComplete( 0, _storage );
else task->setPercentComplete( 100, _storage );
}
@@ -154,7 +154,7 @@ void TaskView::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
if ( e->pos().y() >= task->itemPos() && // doubleclick was onto current_item()
e->pos().y() < task->itemPos()+task->height() )
{
- if ( activeTasks.findRef(task) == -1 ) // task is active
+ if ( activeTasks.tqfindRef(task) == -1 ) // task is active
{
stopAllTimers();
startCurrentTimer();
@@ -388,7 +388,7 @@ void TaskView::startTimerFor(Task* task, TQDateTime startTime )
kdDebug(5970) << "Entering TaskView::startTimerFor" << endl;
if (save()==TQString())
{
- if (task != 0 && activeTasks.findRef(task) == -1)
+ if (task != 0 && activeTasks.tqfindRef(task) == -1)
{
_idleTimeDetector->startIdleDetection();
if (!task->isComplete())
@@ -462,7 +462,7 @@ void TaskView::resetTimeForAllTasks()
void TaskView::stopTimerFor(Task* task)
{
kdDebug(5970) << "Entering stopTimerFor. task = " << task->name() << endl;
- if ( task != 0 && activeTasks.findRef(task) != -1 ) {
+ if ( task != 0 && activeTasks.tqfindRef(task) != -1 ) {
activeTasks.removeRef(task);
task->setRunning(false, _storage);
if ( activeTasks.count() == 0 ) {
@@ -613,7 +613,7 @@ void TaskView::editTask()
// bool ok;
// TQString comment = KLineEditDlg::getText(i18n("Comment"),
-// i18n("Log comment for task '%1':").arg(task->name()),
+// i18n("Log comment for task '%1':").tqarg(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?")
- .arg(task->name()),
+ .tqarg(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.").arg(task->name()),
+ "be deleted.").tqarg(task->name()),
i18n( "Deleting Task"), KStdGuiItem::del());
}
}
@@ -820,16 +820,16 @@ void TaskView::clipTotals()
i18n("Copy This Task"), i18n("Copy All Tasks") );
if (response == KMessageBox::Yes) // This task only
{
- KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime));
+ KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime));
}
else // All tasks
{
- KApplication::clipboard()->setText(t.totalsAsText(this, false, TimeKard::TotalTime));
+ KApplication::tqclipboard()->setText(t.totalsAsText(this, false, TimeKard::TotalTime));
}
}
else
{
- KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime));
+ KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime));
}
}
@@ -844,16 +844,16 @@ void TaskView::clipSession()
i18n("Copy This Task"), i18n("Copy All Tasks") );
if (response == KMessageBox::Yes) // this task only
{
- KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime));
+ KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime));
}
else // only task
{
- KApplication::clipboard()->setText(t.totalsAsText(this, false, TimeKard::SessionTime));
+ KApplication::tqclipboard()->setText(t.totalsAsText(this, false, TimeKard::SessionTime));
}
}
else
{
- KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime));
+ KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime));
}
}
@@ -863,7 +863,7 @@ void TaskView::clipHistory()
if (dialog.exec()== TQDialog::Accepted)
{
TimeKard t;
- KApplication::clipboard()->
+ KApplication::tqclipboard()->
setText( t.historyAsText(this, dialog.from(), dialog.to(), !dialog.allTasks(), dialog.perWeek(), dialog.totalsOnly() ) );
}
}
diff --git a/karm/timekard.cpp b/karm/timekard.cpp
index d7de4840..c5016857 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::tqcurrentDateTime());
retval += cr + cr;
retval += TQString(TQString::tqfromLatin1("%1 %2"))
- .arg(i18n("Time"), timeWidth)
- .arg(i18n("Task"));
+ .tqarg(i18n("Time"), timeWidth)
+ .tqarg(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::tqfromLatin1("%1")).arg(buf, timeWidth) + cr;
+ retval += TQString(TQString::tqfromLatin1("%1")).tqarg(buf, timeWidth) + cr;
retval += TQString(TQString::tqfromLatin1("%1 %2"))
- .arg(formatTime(sum),timeWidth)
- .arg(i18n("Total"));
+ .tqarg(formatTime(sum),timeWidth)
+ .tqarg(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::tqfromLatin1("%1 %2"))
- .arg(formatTime(which == TotalTime?task->totalTime():task->totalSessionTime()), timeWidth)
- .arg(task->name());
+ .tqarg(formatTime(which == TotalTime?task->totalTime():task->totalSessionTime()), timeWidth)
+ .tqarg(task->name());
s += cr;
for (Task* subTask = task->firstChild();
@@ -136,15 +136,15 @@ void TimeKard::printTaskHistory(const Task *task,
{
TQString daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd"));
TQString daytaskkey = TQString::tqfromLatin1("%1_%2")
- .arg(daykey)
- .arg(task->uid());
+ .tqarg(daykey)
+ .tqarg(task->uid());
if (taskdaytotals.tqcontains(daytaskkey))
{
if ( !totalsOnly )
{
s += TQString::tqfromLatin1("%1")
- .arg(formatTime(taskdaytotals[daytaskkey]/60), timeWidth);
+ .tqarg(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::tqfromLatin1("%1").arg(formatTime(sectionsum/60), totalTimeWidth);
+ s += TQString::tqfromLatin1("%1").tqarg(formatTime(sectionsum/60), totalTimeWidth);
// Task name
TQString buf;
s += buf.fill(' ', level + 1);
- s += TQString::tqfromLatin1("%1").arg(task->name());
+ s += TQString::tqfromLatin1("%1").tqarg(task->name());
s += cr;
for (Task* subTask = task->firstChild();
@@ -223,8 +223,8 @@ TQString TimeKard::sectionHistoryAsText(
{
TQString daykey = (*event).start().date().toString(TQString::tqfromLatin1("yyyyMMdd"));
TQString daytaskkey = TQString::tqfromLatin1("%1_%2")
- .arg(daykey)
- .arg((*event).todoUid());
+ .tqarg(daykey)
+ .tqarg((*event).todoUid());
if (taskdaytotals.tqcontains(daytaskkey))
taskdaytotals.tqreplace(daytaskkey,
@@ -246,7 +246,7 @@ TQString TimeKard::sectionHistoryAsText(
// day headings
for (TQDate day = sectionFrom; day <= sectionTo; day = day.addDays(1))
{
- retval += TQString::tqfromLatin1("%1").arg(day.day(), timeWidth);
+ retval += TQString::tqfromLatin1("%1").tqarg(day.day(), timeWidth);
}
retval += cr;
retval += line;
@@ -287,7 +287,7 @@ TQString TimeKard::sectionHistoryAsText(
if ( !totalsOnly )
{
retval += TQString::tqfromLatin1("%1")
- .arg(formatTime(daytotals[daykey]/60), timeWidth);
+ .tqarg(formatTime(daytotals[daykey]/60), timeWidth);
}
sum += daytotals[daykey]; // in seconds
}
@@ -299,8 +299,8 @@ TQString TimeKard::sectionHistoryAsText(
}
retval += TQString::tqfromLatin1("%1 %2")
- .arg(formatTime(sum/60), totalTimeWidth)
- .arg(i18n("Total"));
+ .tqarg(formatTime(sum/60), totalTimeWidth)
+ .tqarg(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")
- .arg(KGlobal::locale()->formatDate(from))
- .arg(KGlobal::locale()->formatDate(to));
+ .tqarg(KGlobal::locale()->formatDate(from))
+ .tqarg(KGlobal::locale()->formatDate(to));
retval += cr;
retval += i18n("Printed on: %1")
- .arg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()));
+ .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()));
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").tqarg(KGlobal::locale()->formatDate(start()));
}
TQValueList<Week> Week::weeksFromDateRange(const TQDate& from, const TQDate& to)
diff --git a/karm/tray.cpp b/karm/tray.cpp
index 3758dd7f..20486b4b 100644
--- a/karm/tray.cpp
+++ b/karm/tray.cpp
@@ -59,9 +59,9 @@ KarmTray::KarmTray(MainWindow* tqparent)
// this are experiments/tests
/*
for (int i=0; i<30; i++)
- _tray->insertTitle(i 18n("bla ").arg(i));
+ _tray->insertTitle(i 18n("bla ").tqarg(i));
for (int i=0; i<30; i++)
- _tray->insertTitle2(i 18n("bli ").arg(i));
+ _tray->insertTitle2(i 18n("bli ").tqarg(i));
*/
// experimenting with menus for the tray
/*
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 07:28:54 +0000