From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 14 Apr 2011 20:16:30 +0000 Subject: Enable kdepim compilation under Qt4 This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- karm/karm_part.cpp | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'karm/karm_part.cpp') diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index d8982e2eb..abe8fed61 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 ) -- cgit v1.2.1