1 files changed, 16 insertions, 16 deletions

diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 4440ab1a..2ab850aa 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -36,7 +36,7 @@
 
 MainWindow::MainWindow( const TQString &icsfile )
   : DCOPObject ( "KarmDCOPIface" ),
-    KParts::MainWindow(0,Qt::WStyle_ContextHelp), 
+    KParts::MainWindow(0,TQt::WStyle_ContextHelp), 
     _accel     ( new KAccel( this ) ),
     _watcher   ( new KAccelMenuWatch( _accel, this ) ),
     _totalSum  ( 0 ),
@@ -445,8 +445,8 @@ void MainWindow::loadGeometry()
     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() );
+    w = TQMAX( w, tqsizeHint().width() );
+    h = TQMAX( h, tqsizeHint().height() );
     resize(w, h);
   }
 }
@@ -543,11 +543,11 @@ TQString MainWindow::setPerCentComplete( const TQString& taskName, int perCent )
     if ((_taskView->item_at_index(i)->name()==taskName))
     {
       index=i;
-      if (err==TQString::null) err="task name is abigious";
-      if (err=="no such task") err=TQString::null;
+      if (err==TQString()) err="task name is abigious";
+      if (err=="no such task") err=TQString();
     }
   }
-  if (err==TQString::null) 
+  if (err==TQString()) 
   {
     _taskView->item_at_index(index)->setPercentComplete( perCent, _taskView->storage() );
   }
@@ -578,10 +578,10 @@ int MainWindow::bookTime
   // Parse datetime
   if ( !rval ) 
   {
-    startDate = TQDate::fromString( datetime, Qt::ISODate );
+    startDate = TQDate::fromString( datetime, TQt::ISODate );
     if ( datetime.length() > 10 )  // "YYYY-MM-DD".length() = 10
     {
-      startTime = TQTime::fromString( datetime, Qt::ISODate );
+      startTime = TQTime::fromString( datetime, TQt::ISODate );
     }
     else startTime = TQTime( 12, 0 );
     if ( startDate.isValid() && startTime.isValid() )
@@ -688,11 +688,11 @@ TQString MainWindow::starttimerfor( const TQString& taskname )
     if ((_taskView->item_at_index(i)->name()==taskname))
     {
       index=i;
-      if (err==TQString::null) err="task name is abigious";
-      if (err=="no such task") err=TQString::null;
+      if (err==TQString()) err="task name is abigious";
+      if (err=="no such task") err=TQString();
     }
   }
-  if (err==TQString::null) _taskView->startTimerFor( _taskView->item_at_index(index) );
+  if (err==TQString()) _taskView->startTimerFor( _taskView->item_at_index(index) );
   return err;
 }
 
@@ -705,11 +705,11 @@ TQString MainWindow::stoptimerfor( const TQString& taskname )
     if ((_taskView->item_at_index(i)->name()==taskname))
     {
       index=i;
-      if (err==TQString::null) err="task name is abigious";
-      if (err=="no such task") err=TQString::null;
+      if (err==TQString()) err="task name is abigious";
+      if (err=="no such task") err=TQString();
     }
   }
-  if (err==TQString::null) _taskView->stopTimerFor( _taskView->item_at_index(index) );
+  if (err==TQString()) _taskView->stopTimerFor( _taskView->item_at_index(index) );
   return err;
 }
 
@@ -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, Qt::ISODate );
+  if ( rc.from.isNull() ) rc.from=TQDate::fromString( from, TQt::ISODate );
   kdDebug(5970) << "rc.from " << rc.from << endl;
   rc.to=TQDate::fromString( to );
-  if ( rc.to.isNull() ) rc.to=TQDate::fromString( to, Qt::ISODate );
+  if ( rc.to.isNull() ) rc.to=TQDate::fromString( to, TQt::ISODate );
   kdDebug(5970) << "rc.to " << rc.to << endl;
   rc.reportType=(ReportCriteria::REPORTTYPE) type;  // history report or totals report 
   rc.decimalMinutes=decimalMinutes;