diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:50 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:50 -0600 |
commit | 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch) | |
tree | ab537a329b9613e11dce8195761f93ffe82aed24 /karm/mainwindow.cpp | |
parent | 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff) | |
download | tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'karm/mainwindow.cpp')
-rw-r--r-- | karm/mainwindow.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp index 287c5a96f..6d1ce29ea 100644 --- a/karm/mainwindow.cpp +++ b/karm/mainwindow.cpp @@ -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() @@ -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, TQT_TQOBJECT(_taskView), TQT_SLOT( startCurrentTimer() ), actionCollection(), "start"); actionStop = new KAction( i18n("S&top"), - TQString::fromLatin1("stop"), Key_S, + TQString::tqfromLatin1("stop"), Key_S, TQT_TQOBJECT(_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, TQT_TQOBJECT(_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, TQT_TQOBJECT(_taskView), TQT_SLOT( newSubTask() ), actionCollection(), "new_sub_task"); actionDelete = new KAction( i18n("&Delete"), - TQString::fromLatin1("editdelete"), Key_Delete, + TQString::tqfromLatin1("editdelete"), Key_Delete, TQT_TQOBJECT(_taskView), TQT_SLOT( deleteTask() ), actionCollection(), "delete_task"); actionEdit = new KAction( i18n("&Edit..."), - TQString::fromLatin1("edit"), CTRL + Key_E, + TQString::tqfromLatin1("edit"), CTRL + Key_E, TQT_TQOBJECT(_taskView), TQT_SLOT( editTask() ), actionCollection(), "edit_task"); // actionAddComment = new KAction( i18n("&Add Comment..."), -// TQString::fromLatin1("document"), +// TQString::tqfromLatin1("document"), // CTRL+ALT+Key_E, // TQT_TQOBJECT(_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, TQT_TQOBJECT(_taskView), TQT_SLOT( markTaskAsComplete() ), actionCollection(), "mark_as_complete"); actionMarkAsIncomplete = new KAction( i18n("&Mark as Incomplete"), - TQString::fromLatin1("document"), + TQString::tqfromLatin1("document"), CTRL+Key_M, TQT_TQOBJECT(_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, TQT_TQOBJECT(_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, TQT_TQOBJECT(_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, TQT_TQOBJECT(_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 = TQMAX( w, sizeHint().width() ); - h = TQMAX( 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 = TQMAX( w, tqsizeHint().width() ); + h = TQMAX( 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(); } @@ -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 ) |