1 files changed, 14 insertions, 14 deletions

diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index fe2fbe2b..f9cb9d7e 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -24,7 +24,7 @@
 
 #include <tqtooltip.h>
 #include <tqfiledialog.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqbuttongroup.h>
 #include <tqvgroupbox.h>
@@ -206,7 +206,7 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayo
                    i18n( "Use this combobox to set the completion percentage of the to-do." ) );
   for ( int i = 0; i <= 100; i+=10 ) {
     // xgettext:no-c-format
-    TQString label = i18n( "Percent complete", "%1 %" ).tqarg( i );
+    TQString label = i18n( "Percent complete", "%1 %" ).arg( i );
     mCompletedCombo->insertItem( label );
   }
   connect( mCompletedCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(completedChanged(int)) );
@@ -252,7 +252,7 @@ void KOEditorGeneralTodo::initPriority(TQWidget *parent, TQBoxLayout *topLayout)
   priorityLabel->setBuddy( mPriorityCombo );
 }
 
-void KOEditorGeneralTodo::initqStatus(TQWidget *parent,TQBoxLayout *topLayout)
+void KOEditorGeneralTodo::iniStatus(TQWidget *parent,TQBoxLayout *topLayout)
 {
   TQBoxLayout *statusLayout = new TQHBoxLayout(topLayout);
 
@@ -284,12 +284,12 @@ void KOEditorGeneralTodo::setDefaults( const TQDateTime &due, bool allDay )
     mDueTimeEdit->setTime( due.time() );
   } else {
     // Make it due tomorrow.
-    mDueDateEdit->setDate( TQDate::tqcurrentDate().addDays(1) );
+    mDueDateEdit->setDate( TQDate::currentDate().addDays(1) );
     mDueTimeEdit->setTime( TQTime::currentTime() );
   }
 
-  if ( !due.isValid() || (TQDateTime::tqcurrentDateTime() < due) ) {
-    mStartDateEdit->setDate( TQDate::tqcurrentDate() );
+  if ( !due.isValid() || (TQDateTime::currentDateTime() < due) ) {
+    mStartDateEdit->setDate( TQDate::currentDate() );
     mStartTimeEdit->setTime( TQTime::currentTime() );
   } else {
     mStartDateEdit->setDate( due.date().addDays( -1 ) );
@@ -322,7 +322,7 @@ void KOEditorGeneralTodo::readTodo(Todo *todo, Calendar *calendar, const TQDate
   } else {
     mDueDateEdit->setEnabled(false);
     mDueTimeEdit->setEnabled(false);
-    mDueDateEdit->setDate(TQDate::tqcurrentDate());
+    mDueDateEdit->setDate(TQDate::currentDate());
     mDueTimeEdit->setTime(TQTime::currentTime());
     mDueCheck->setChecked(false);
   }
@@ -339,7 +339,7 @@ void KOEditorGeneralTodo::readTodo(Todo *todo, Calendar *calendar, const TQDate
   } else {
     mStartDateEdit->setEnabled(false);
     mStartTimeEdit->setEnabled(false);
-    mStartDateEdit->setDate(TQDate::tqcurrentDate());
+    mStartDateEdit->setDate(TQDate::currentDate());
     mStartTimeEdit->setTime(TQTime::currentTime());
     mStartCheck->setChecked(false);
   }
@@ -545,7 +545,7 @@ void KOEditorGeneralTodo::completedChanged( int index )
 {
   if ( index == 10 ) {
     mCompletedToggle->setChecked( true );
-    mCompletedDateTime = TQDateTime::tqcurrentDateTime();
+    mCompletedDateTime = TQDateTime::currentDateTime();
   } else {
     mCompletedToggle->setChecked( false );
   }
@@ -556,7 +556,7 @@ void KOEditorGeneralTodo::completedChanged()
 {
   if ( mCompletedToggle->isChecked() ) {
     mCompletedCombo->setCurrentItem( 10 );
-    mCompletedDateTime = TQDateTime::tqcurrentDateTime();
+    mCompletedDateTime = TQDateTime::currentDateTime();
   } else {
     mCompletedCombo->setCurrentItem( 0 );
   }
@@ -569,18 +569,18 @@ void KOEditorGeneralTodo::dateChanged()
   TQString dateTimeStr = "";
 
   if ( mStartCheck->isChecked() ) {
-    dateTimeStr += i18n("Start: %1").tqarg(
+    dateTimeStr += i18n("Start: %1").arg(
                                      l->formatDate( mStartDateEdit->date() ) );
     if ( mTimeButton->isChecked() )
-      dateTimeStr += TQString(" %1").tqarg(
+      dateTimeStr += TQString(" %1").arg(
                                    l->formatTime( mStartTimeEdit->getTime() ) );
   }
 
   if ( mDueCheck->isChecked() ) {
-    dateTimeStr += i18n("   Due: %1").tqarg(
+    dateTimeStr += i18n("   Due: %1").arg(
                                       l->formatDate( mDueDateEdit->date() ) );
     if ( mTimeButton->isChecked() )
-      dateTimeStr += TQString(" %1").tqarg(
+      dateTimeStr += TQString(" %1").arg(
                                     l->formatTime( mDueTimeEdit->getTime() ) );
   }