Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 10 insertions, 10 deletions

diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index a916b3741..e069d65de 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <tqtooltip.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbox.h>
 #include <tqbuttongroup.h>
 #include <tqvgroupbox.h>
@@ -193,15 +193,15 @@ void KOEditorGeneralEvent::initClass(TQWidget *parent,TQBoxLayout *topLayout)
   freeTimeLabel->setBuddy( mFreeTimeCombo );
 }
 
-void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * layout)
+void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * tqlayout)
 {
-  TQBoxLayout *topLayout = new TQHBoxLayout( layout );
+  TQBoxLayout *topLayout = new TQHBoxLayout( tqlayout );
   mInvitationBar = new TQFrame( parent );
   mInvitationBar->setPaletteBackgroundColor( KGlobalSettings::alternateBackgroundColor() );
   topLayout->addWidget( mInvitationBar );
 
   TQBoxLayout *barLayout = new TQHBoxLayout( mInvitationBar );
-  barLayout->setSpacing( layout->spacing() );
+  barLayout->setSpacing( tqlayout->spacing() );
   TQLabel *label = new TQLabel( i18n("You have not yet definitely responded to this invitation." ), mInvitationBar );
   barLayout->addWidget( label );
   barLayout->addStretch( 1 );
@@ -479,8 +479,8 @@ void KOEditorGeneralEvent::emitDateTimeStr()
     to = l->formatDateTime(mCurrEndDateTime);
   }
 
-  TQString str = i18n("From: %1   To: %2   %3").arg(from).arg(to)
-                .arg(mDurationLabel->text());
+  TQString str = i18n("From: %1   To: %2   %3").tqarg(from).tqarg(to)
+                .tqarg(mDurationLabel->text());
 
   emit dateTimeStrChanged(str);
 }
@@ -493,14 +493,14 @@ bool KOEditorGeneralEvent::validateInput()
     if (!mStartTimeEdit->inputIsValid()) {
       KMessageBox::sorry( 0,
           i18n("Please specify a valid start time, for example '%1'.")
-          .arg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) );
+          .tqarg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) );
       return false;
     }
 
     if (!mEndTimeEdit->inputIsValid()) {
       KMessageBox::sorry( 0,
           i18n("Please specify a valid end time, for example '%1'.")
-          .arg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) );
+          .tqarg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) );
       return false;
     }
   }
@@ -508,14 +508,14 @@ bool KOEditorGeneralEvent::validateInput()
   if (!mStartDateEdit->date().isValid()) {
     KMessageBox::sorry( 0,
         i18n("Please specify a valid start date, for example '%1'.")
-        .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
+        .tqarg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) );
     return false;
   }
 
   if (!mEndDateEdit->date().isValid()) {
     KMessageBox::sorry( 0,
         i18n("Please specify a valid end date, for example '%1'.")
-        .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
+        .tqarg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) );
     return false;
   }