Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 6 insertions, 6 deletions

diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index 564c39534..46038834e 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -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(
@@ -991,12 +991,12 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) :
   }
 
 //  TQFrame *timeFrame = new TQFrame( mTimeGroupBox );
-//  TQBoxLayout *layoutTimeFrame = new TQHBoxLayout( timeFrame );
-//  layoutTimeFrame->setSpacing( KDialog::spacingHint() );
+//  TQBoxLayout *tqlayoutTimeFrame = new TQHBoxLayout( timeFrame );
+//  tqlayoutTimeFrame->setSpacing( KDialog::spacingHint() );
 
   mDateTimeLabel = new TQLabel( mTimeGroupBox );
 //  mDateTimeLabel = new TQLabel( timeFrame );
-//  layoutTimeFrame->addWidget( mDateTimeLabel );
+//  tqlayoutTimeFrame->addWidget( mDateTimeLabel );
 
   Qt::Orientation orientation;
   if ( KOPrefs::instance()->mCompactDialogs ) orientation = Horizontal;