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

1 files changed, 32 insertions, 32 deletions

diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 2ab850aa6..6d1ce29ea 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;