From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:50 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
---
 korganizer/koeditorrecurrence.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'korganizer/koeditorrecurrence.cpp')

diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index a8b6c816..b1174bbb 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -24,7 +24,7 @@
 
 #include <tqtooltip.h>
 #include <tqfiledialog.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbox.h>
 #include <tqbuttongroup.h>
 #include <tqvgroupbox.h>
@@ -135,10 +135,10 @@ TQComboBox *RecurBase::createMonthNameCombo( TQWidget *parent, const char *name
   return combo;
 }
 
-TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *layout,
+TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *tqlayout,
     TQString everyText, TQString unitText )
 {
-  TQBoxLayout *freqLayout = new TQHBoxLayout( layout );
+  TQBoxLayout *freqLayout = new TQHBoxLayout( tqlayout );
 
   TQString whatsThis = i18n("Sets how often this event or to-do should recur.");
   TQLabel *preLabel = new TQLabel( everyText, parent );
@@ -590,7 +590,7 @@ ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) :
   TQWhatsThis::add( mExceptionDateEdit,
        i18n("A date that should be considered an exception "
       "to the recurrence rules for this event or to-do.") );
-  mExceptionDateEdit->setDate( TQDate::currentDate() );
+  mExceptionDateEdit->setDate( TQDate::tqcurrentDate() );
   boxLayout->addWidget( mExceptionDateEdit, 0, 0 );
 
   TQPushButton *addExceptionButton = new TQPushButton(
@@ -824,7 +824,7 @@ void RecurrenceRangeWidget::setDateTimes( const TQDateTime &start,
                                           const TQDateTime & )
 {
   mStartDateLabel->setText( i18n("Begins on: %1")
-      .arg( KGlobal::locale()->formatDate( start.date() ) ) );
+      .tqarg( KGlobal::locale()->formatDate( start.date() ) ) );
 }
 
 ///////////////////////// RecurrenceRangeDialog ///////////////////////////
@@ -1394,8 +1394,8 @@ bool KOEditorRecurrence::validateInput()
        mEventStartDt.isValid() && ((mRecurrenceRange->endDate())<mEventStartDt.date()) ) {
     KMessageBox::sorry( 0,
       i18n("The end date '%1' of the recurrence must be after the start date '%2' of the event.")
-      .arg( KGlobal::locale()->formatDate( mRecurrenceRange->endDate() ) )
-      .arg( KGlobal::locale()->formatDate( mEventStartDt.date() ) ) );
+      .tqarg( KGlobal::locale()->formatDate( mRecurrenceRange->endDate() ) )
+      .tqarg( KGlobal::locale()->formatDate( mEventStartDt.date() ) ) );
     return false;
   }
   int recurrenceType = mRecurrenceChooser->type();
-- 
cgit v1.2.3