1 files changed, 22 insertions, 22 deletions

diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index 0411c2f8..3466e412 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -104,36 +104,36 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout)
 
   TQFrame *timeBoxFrame = new TQFrame(timeGroupBox);
 
-  TQGridLayout *layoutTimeBox = new TQGridLayout( timeBoxFrame );
-  layoutTimeBox->setSpacing(topLayout->spacing());
-  layoutTimeBox->setColStretch( 3, 1 );
+  TQGridLayout *tqlayoutTimeBox = new TQGridLayout( timeBoxFrame );
+  tqlayoutTimeBox->setSpacing(topLayout->spacing());
+  tqlayoutTimeBox->setColStretch( 3, 1 );
 
   mStartDateLabel = new TQLabel(i18n("&Start:"),timeBoxFrame);
-  layoutTimeBox->addWidget(mStartDateLabel,0,0);
+  tqlayoutTimeBox->addWidget(mStartDateLabel,0,0);
 
   mStartDateEdit = new KDateEdit(timeBoxFrame);
-  layoutTimeBox->addWidget(mStartDateEdit,0,1);
+  tqlayoutTimeBox->addWidget(mStartDateEdit,0,1);
   mStartDateLabel->setBuddy( mStartDateEdit );
 
   mStartTimeEdit = new KTimeEdit(timeBoxFrame);
-  layoutTimeBox->addWidget(mStartTimeEdit,0,2);
+  tqlayoutTimeBox->addWidget(mStartTimeEdit,0,2);
 
   mEndDateLabel = new TQLabel(i18n("&End:"),timeBoxFrame);
-  layoutTimeBox->addWidget(mEndDateLabel,1,0);
+  tqlayoutTimeBox->addWidget(mEndDateLabel,1,0);
 
   mEndDateEdit = new KDateEdit(timeBoxFrame);
-  layoutTimeBox->addWidget(mEndDateEdit,1,1);
+  tqlayoutTimeBox->addWidget(mEndDateEdit,1,1);
   mEndDateLabel->setBuddy( mEndDateEdit );
 
   mEndTimeEdit = new KTimeEdit(timeBoxFrame);
-  layoutTimeBox->addWidget(mEndTimeEdit,1,2);
+  tqlayoutTimeBox->addWidget(mEndTimeEdit,1,2);
 
   mAlldayEventCheckbox = new TQCheckBox(i18n("All-&day"),timeBoxFrame);
-  layoutTimeBox->addWidget( mAlldayEventCheckbox, 0, 3 );
+  tqlayoutTimeBox->addWidget( mAlldayEventCheckbox, 0, 3 );
   connect(mAlldayEventCheckbox, TQT_SIGNAL(toggled(bool)),TQT_SLOT(associateTime(bool)));
 
   mDurationLabel = new TQLabel( timeBoxFrame );
-  layoutTimeBox->addWidget( mDurationLabel, 1, 3 );
+  tqlayoutTimeBox->addWidget( mDurationLabel, 1, 3 );
 
   // time widgets are checked if they contain a valid time
   connect(mStartTimeEdit, TQT_SIGNAL(timeChanged(TQTime)),
@@ -148,9 +148,9 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout)
           this, TQT_SLOT(endDateChanged(const TQDate&)));
 
   TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame );
-  layoutTimeBox->addWidget( label, 2, 0 );
+  tqlayoutTimeBox->addWidget( label, 2, 0 );
   TQBoxLayout *recLayout = new TQHBoxLayout();
-  layoutTimeBox->addMultiCellLayout( recLayout, 2, 2, 1, 4 );
+  tqlayoutTimeBox->addMultiCellLayout( recLayout, 2, 2, 1, 4 );
   mRecEditButton = new TQPushButton( timeBoxFrame );
   mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) );
   recLayout->addWidget( mRecEditButton );
@@ -160,18 +160,18 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout)
   recLayout->addStretch( 1 );
 
   label = new TQLabel( i18n("Reminder:"), timeBoxFrame );
-  layoutTimeBox->addWidget( label, 3, 0 );
+  tqlayoutTimeBox->addWidget( label, 3, 0 );
   TQBoxLayout *alarmLineLayout = new TQHBoxLayout();
-  layoutTimeBox->addMultiCellLayout( alarmLineLayout, 3, 3, 1, 4 );
+  tqlayoutTimeBox->addMultiCellLayout( alarmLineLayout, 3, 3, 1, 4 );
   initAlarm( timeBoxFrame, alarmLineLayout );
   alarmLineLayout->addStretch( 1 );
 
   TQBoxLayout *secLayout = new TQHBoxLayout();
-  layoutTimeBox->addLayout( secLayout, 0, 4 );
+  tqlayoutTimeBox->addLayout( secLayout, 0, 4 );
   initSecrecy( timeBoxFrame, secLayout );
 
   TQBoxLayout *classLayout = new TQHBoxLayout();
-  layoutTimeBox->addLayout( classLayout, 1, 4 );
+  tqlayoutTimeBox->addLayout( classLayout, 1, 4 );
   initClass( timeBoxFrame, classLayout );
 }
 
@@ -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 );
@@ -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() ) ) );
+        .arg( 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() ) ) );
+        .arg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) );
     return false;
   }