Rename obsolete tq methods to standard names

25 files changed, 51 insertions, 51 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 84af159b..ab725b4c 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -137,7 +137,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
 #ifndef KORG_NOSPLITTER
-  // create the main tqlayout frames.
+  // create the main layout frames.
   mPanner = new TQSplitter( Qt::Horizontal, this,
                            "CalendarView::Panner" );
   topLayout->addWidget( mPanner );
@@ -277,7 +277,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
   KOGlobals::self()->
       setHolidays( new KHolidays( KOPrefs::instance()->mHolidays ) );
 
-  connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
+  connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
            TQT_SLOT( checkClipboard() ) );
 
   connect( mTodoList, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
@@ -1934,7 +1934,7 @@ void CalendarView::processIncidenceSelection( Incidence *incidence, const TQDate
 void CalendarView::checkClipboard()
 {
 #ifndef KORG_NODND
-  if (ICalDrag::canDecode(TQApplication::tqclipboard()->data())) {
+  if (ICalDrag::canDecode(TQApplication::clipboard()->data())) {
     kdDebug(5850) << "CalendarView::checkClipboard() true" << endl;
     emit pasteEnabled(true);
   } else {
diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui
index bfab5207..a5c3f792 100644
--- a/korganizer/filteredit_base.ui
+++ b/korganizer/filteredit_base.ui
@@ -50,7 +50,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -95,7 +95,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="3" column="0">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 346bb9d8..6c1c7952 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1300,11 +1300,11 @@ void KOAgenda::placeAgendaItem( KOAgendaItem *item, double subCellWidth )
     xpos = pt.x() + int( subCellPos );
     ypos = pt.y();
   }
-  if ( KOGlobals::self()->reverseLayout() ) { // RTL language/tqlayout
+  if ( KOGlobals::self()->reverseLayout() ) { // RTL language/layout
     xpos += width;
     width = -width;
   }
-  if ( height<0 ) { // BTT (bottom-to-top) tqlayout ?!?
+  if ( height<0 ) { // BTT (bottom-to-top) layout ?!?
     ypos += height;
     height = -height;
   }
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 751c9659..f11ea8c0 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -746,7 +746,7 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev )
   }
 
   TQPainter p( this );
-  const int ft = 2; // frame thickness for tqlayout, see paintFrame()
+  const int ft = 2; // frame thickness for layout, see paintFrame()
   const int margin = 1 + ft; // frame + space between frame and content
 
   // General idea is to always show the icons (even in the all-day events).
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index e48796c7..5b46fedb 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -1343,7 +1343,7 @@ void KOAgendaView::changeIncidenceDisplay( Incidence *incidence, int mode )
   }
 
   // HACK: Update the view if the all-day agenda has been modified.
-  // Do this because there are some tqlayout problems in the
+  // Do this because there are some layout problems in the
   // all-day agenda that are not easily solved, but clearing
   // and redrawing works ok.
   if ( incidence->doesFloat() ) {
diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp
index 36037ea9..b0cdc295 100644
--- a/korganizer/koattendeeeditor.cpp
+++ b/korganizer/koattendeeeditor.cpp
@@ -61,10 +61,10 @@ KOAttendeeEditor::KOAttendeeEditor( TQWidget * parent, const char *name ) :
 {
 }
 
-void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * tqlayout)
+void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * layout)
 {
   mOrganizerHBox = new TQHBox( parent );
-  tqlayout->addWidget( mOrganizerHBox );
+  layout->addWidget( mOrganizerHBox );
   // If creating a new event, then the user is the organizer -> show the
   // identity combo
   // readEvent will delete it and set another label text instead, if the user
@@ -91,10 +91,10 @@ void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * tql
   mOrganizerHBox->setStretchFactor( mOrganizerCombo, 100 );
 }
 
-void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout)
+void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout)
 {
   TQGridLayout *topLayout = new TQGridLayout();
-  tqlayout->addLayout( topLayout );
+  layout->addLayout( topLayout );
 
   TQString whatsThis = i18n("Edits the name of the attendee selected in the list "
                            "above, or adds a new attendee if there are no attendees"
diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h
index 828bf479..0719744b 100644
--- a/korganizer/koattendeeeditor.h
+++ b/korganizer/koattendeeeditor.h
@@ -68,8 +68,8 @@ class KOAttendeeEditor : public TQWidget
     void updateAttendeeSummary( int count );
 
   protected:
-    void initOrganizerWidgets( TQWidget *parent, TQBoxLayout *tqlayout );
-    void initEditWidgets( TQWidget *parent, TQBoxLayout *tqlayout );
+    void initOrganizerWidgets( TQWidget *parent, TQBoxLayout *layout );
+    void initEditWidgets( TQWidget *parent, TQBoxLayout *layout );
 
     /** Reads values from a KABC::Addressee and inserts a new Attendee
      * item into the listview with those items. Used when adding attendees
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 431b4b3d..1ced5338 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -562,7 +562,7 @@ void KODayMatrix::paintEvent( TQPaintEvent * )
   int selw, selh;
   bool isRTL = KOGlobals::self()->reverseLayout();
 
-  TQColorGroup cg = tqpalette().active();
+  TQColorGroup cg = palette().active();
 
   p.begin(  &pm, this );
   pm.fill( cg.base() );
diff --git a/korganizer/koeditoralarms_base.ui b/korganizer/koeditoralarms_base.ui
index cc062528..716252f2 100644
--- a/korganizer/koeditoralarms_base.ui
+++ b/korganizer/koeditoralarms_base.ui
@@ -35,7 +35,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -109,7 +109,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -530,7 +530,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp
index ed358947..ec23e9ee 100644
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@@ -874,7 +874,7 @@ void KOEditorAttachments::writeIncidence( KCal::Incidence *i )
 
 void KOEditorAttachments::slotCopy()
 {
-    TQApplication::tqclipboard()->setData( mAttachments->mimeData(), TQClipboard::Clipboard );
+    TQApplication::clipboard()->setData( mAttachments->mimeData(), TQClipboard::Clipboard );
 }
 
 void KOEditorAttachments::slotCut()
@@ -885,7 +885,7 @@ void KOEditorAttachments::slotCut()
 
 void KOEditorAttachments::slotPaste()
 {
-    handlePasteOrDrop( TQApplication::tqclipboard()->data() );
+    handlePasteOrDrop( TQApplication::clipboard()->data() );
 }
 
 void KOEditorAttachments::selectionChanged()
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index cec2e721..a5dd834f 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -193,15 +193,15 @@ void KOEditorGeneralEvent::initClass(TQWidget *parent,TQBoxLayout *topLayout)
   freeTimeLabel->setBuddy( mFreeTimeCombo );
 }
 
-void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * tqlayout)
+void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * layout)
 {
-  TQBoxLayout *topLayout = new TQHBoxLayout( tqlayout );
+  TQBoxLayout *topLayout = new TQHBoxLayout( layout );
   mInvitationBar = new TQFrame( parent );
   mInvitationBar->setPaletteBackgroundColor( KGlobalSettings::alternateBackgroundColor() );
   topLayout->addWidget( mInvitationBar );
 
   TQBoxLayout *barLayout = new TQHBoxLayout( mInvitationBar );
-  barLayout->setSpacing( tqlayout->spacing() );
+  barLayout->setSpacing( layout->spacing() );
   TQLabel *label = new TQLabel( i18n("You have not yet definitely responded to this invitation." ), mInvitationBar );
   barLayout->addWidget( label );
   barLayout->addStretch( 1 );
diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h
index 734826eb..037b2323 100644
--- a/korganizer/koeditorgeneralevent.h
+++ b/korganizer/koeditorgeneralevent.h
@@ -49,7 +49,7 @@ class KOEditorGeneralEvent : public KOEditorGeneral
 
     void initTime(TQWidget *,TQBoxLayout *);
     void initClass(TQWidget *,TQBoxLayout *);
-    void initInvitationBar( TQWidget* parent, TQBoxLayout *tqlayout );
+    void initInvitationBar( TQWidget* parent, TQBoxLayout *layout );
 
     void finishSetup();
 
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index c2e108a8..4b5889a8 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 *tqlayout,
+TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *layout,
     TQString everyText, TQString unitText )
 {
-  TQBoxLayout *freqLayout = new TQHBoxLayout( tqlayout );
+  TQBoxLayout *freqLayout = new TQHBoxLayout( layout );
 
   TQString whatsThis = i18n("Sets how often this event or to-do should recur.");
   TQLabel *preLabel = new TQLabel( everyText, parent );
diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h
index 1592f427..f3aeeb41 100644
--- a/korganizer/koeditorrecurrence.h
+++ b/korganizer/koeditorrecurrence.h
@@ -61,7 +61,7 @@ class RecurBase : public TQWidget
     static TQComboBox *createWeekCountCombo( TQWidget *parent=0, const char *name=0 );
     static TQComboBox *createWeekdayCombo( TQWidget *parent=0, const char *name=0 );
     static TQComboBox *createMonthNameCombo( TQWidget *parent=0, const char *name=0 );
-    TQBoxLayout *createFrequencySpinBar( TQWidget *parent, TQLayout *tqlayout,
+    TQBoxLayout *createFrequencySpinBar( TQWidget *parent, TQLayout *layout,
     TQString everyText, TQString unitText );
 
   private:
diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui
index 76bd7c6c..24cf9bbf 100644
--- a/korganizer/kogroupwareprefspage.ui
+++ b/korganizer/kogroupwareprefspage.ui
@@ -60,7 +60,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout8</cstring>
+                            <cstring>layout8</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -422,7 +422,7 @@ For example: "https://kolab2.example.com/freebusy/user.xfb"</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout13</cstring>
+                                    <cstring>layout13</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index f6b12b59..fb333674 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -502,6 +502,6 @@ void KOListView::clear()
 TQSize KOListView::sizeHint() const
 {
   const TQSize s = KOEventView::sizeHint();
-  return TQSize( s.width() + tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) + 1,
+  return TQSize( s.width() + style().pixelMetric( TQStyle::PM_ScrollBarExtent ) + 1,
                 s.height() );
 }
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 5c9edbca..6bb94f5c 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -835,7 +835,7 @@ KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name
   dayLayout->addMultiCellWidget( mLabel, 0, 0, 0, mDaysPerWeek );
 
   // create the day of the week labels (Sun, Mon, etc) and add them to
-  // the tqlayout.
+  // the layout.
   mDayLabels.resize( mDaysPerWeek );
   int i;
   for( i = 0; i < mDaysPerWeek; i++ ) {
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 322daf92..f14176fb 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -107,7 +107,7 @@ NavigatorBar::NavigatorBar( TQWidget *parent, const char *name )
   mYear->setMinimumHeight( mPrevYear->sizeHint().height() );
   TQToolTip::add( mYear, i18n( "Select a year" ) );
 
-  // set up control frame tqlayout
+  // set up control frame layout
   TQHBoxLayout *ctrlLayout = new TQHBoxLayout( this );
   ctrlLayout->addWidget( mPrevYear );
   ctrlLayout->addWidget( mPrevMonth );
diff --git a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
index e5fc832c..6868729b 100644
--- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
+++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
@@ -65,7 +65,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/korganizer/plugins/printing/list/calprintlistconfig_base.ui b/korganizer/plugins/printing/list/calprintlistconfig_base.ui
index ecd2a848..249531df 100644
--- a/korganizer/plugins/printing/list/calprintlistconfig_base.ui
+++ b/korganizer/plugins/printing/list/calprintlistconfig_base.ui
@@ -40,7 +40,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
index b8ad273f..a3d4fb69 100644
--- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
+++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
@@ -40,7 +40,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp
index 22d6a065..99d57395 100644
--- a/korganizer/printing/calprintpluginbase.cpp
+++ b/korganizer/printing/calprintpluginbase.cpp
@@ -128,7 +128,7 @@ CalPrintPluginBase::~CalPrintPluginBase()
 TQWidget *CalPrintPluginBase::createConfigWidget( TQWidget *w )
 {
   TQFrame *wdg = new TQFrame( w );
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( wdg );
+  TQVBoxLayout *layout = new TQVBoxLayout( wdg );
 
   TQLabel *title = new TQLabel( description(), wdg );
   TQFont titleFont( title->font() );
@@ -136,13 +136,13 @@ TQWidget *CalPrintPluginBase::createConfigWidget( TQWidget *w )
   titleFont.setBold( true );
   title->setFont( titleFont );
 
-  tqlayout->addWidget( title );
-  tqlayout->addWidget( new TQLabel( info(), wdg ) );
-  tqlayout->addSpacing( 20 );
-  tqlayout->addWidget( new TQLabel( i18n("This printing style does not "
+  layout->addWidget( title );
+  layout->addWidget( new TQLabel( info(), wdg ) );
+  layout->addSpacing( 20 );
+  layout->addWidget( new TQLabel( i18n("This printing style does not "
                                       "have any configuration options."),
                                  wdg ) );
-  tqlayout->addStretch();
+  layout->addStretch();
   return wdg;
 }
 
diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui
index ed2cf4b9..106ffd7d 100644
--- a/korganizer/printing/calprinttodoconfig_base.ui
+++ b/korganizer/printing/calprinttodoconfig_base.ui
@@ -86,7 +86,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/korganizer/printing/calprintweekconfig_base.ui b/korganizer/printing/calprintweekconfig_base.ui
index 505f4f14..0be844ab 100644
--- a/korganizer/printing/calprintweekconfig_base.ui
+++ b/korganizer/printing/calprintweekconfig_base.ui
@@ -246,7 +246,7 @@
                         <string>Print as &amp;timetable view</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>This view is similar to the weekview in KOrganizer. The week is printed in landscape tqlayout. You can even use the same colors for the items if you check &lt;i&gt;Use Colors&lt;/i&gt;.</string>
+                        <string>This view is similar to the weekview in KOrganizer. The week is printed in landscape layout. You can even use the same colors for the items if you check &lt;i&gt;Use Colors&lt;/i&gt;.</string>
                     </property>
                 </widget>
                 <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="3">
@@ -257,7 +257,7 @@
                         <string>Print as split week view</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page tqlayout. Timetables are printed in landscape, the split week view in portrait.</string>
+                        <string>This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page layout. Timetables are printed in landscape, the split week view in portrait.</string>
                     </property>
                 </widget>
             </grid>
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index e278d5fb..6d315c50 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -52,11 +52,11 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
   mCalendar = calendar;
 
   TQFrame *topFrame = plainPage();
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(topFrame,0,spacingHint());
+  TQVBoxLayout *layout = new TQVBoxLayout(topFrame,0,spacingHint());
 
   // Search expression
   TQHBoxLayout *subLayout = new TQHBoxLayout();
-  tqlayout->addLayout(subLayout);
+  layout->addLayout(subLayout);
 
   searchEdit = new TQLineEdit( "*", topFrame ); // Find all events by default
   searchLabel = new TQLabel( searchEdit, i18n("&Search for:"), topFrame );
@@ -68,7 +68,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
 
 
   TQHButtonGroup *itemsGroup = new TQHButtonGroup( i18n("Search For"), topFrame );
-  tqlayout->addWidget( itemsGroup );
+  layout->addWidget( itemsGroup );
   mEventsCheck = new TQCheckBox( i18n("&Events"), itemsGroup );
   mTodosCheck = new TQCheckBox( i18n("To-&dos"), itemsGroup );
   mJournalsCheck = new TQCheckBox( i18n("&Journal entries"), itemsGroup );
@@ -78,7 +78,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
   // Date range
   TQGroupBox *rangeGroup = new TQGroupBox( 1, Qt::Horizontal, i18n( "Date Range" ),
                                         topFrame );
-  tqlayout->addWidget( rangeGroup );
+  layout->addWidget( rangeGroup );
 
   TQWidget *rangeWidget = new TQWidget( rangeGroup );
   TQHBoxLayout *rangeLayout = new TQHBoxLayout( rangeWidget, 0, spacingHint() );
@@ -100,7 +100,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
 
   // Subjects to search
   TQHButtonGroup *subjectGroup = new TQHButtonGroup( i18n("Search In"), topFrame );
-  tqlayout->addWidget(subjectGroup);
+  layout->addWidget(subjectGroup);
 
   mSummaryCheck = new TQCheckBox( i18n("Su&mmaries"), subjectGroup );
   mSummaryCheck->setChecked( true );
@@ -111,7 +111,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
   // Results list view
   listView = new KOListView( mCalendar, topFrame );
   listView->showDates();
-  tqlayout->addWidget( listView );
+  layout->addWidget( listView );
 
   if ( KOPrefs::instance()->mCompactDialogs ) {
     KOGlobals::fitDialogToScreen( this, true );