Rename a few stragglers

lib/compatibility/kmdi/qextmdi/kdockwidget.cpp

@@ -266,7 +266,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
   layout->addWidget( closeButton );
   layout->activate();
   d->dummy->hide();
-  drag->setFixedHeight( tqlayout->minimumSize().height() );
+  drag->setFixedHeight( layout->minimumSize().height() );
 }
 
 void KDockWidgetHeader::setTopLevel( bool isTopLevel )
@@ -344,11 +344,11 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd )
   if (dontShowDummy) d->dummy->hide(); else d->dummy->show();
   layout->addWidget( closeButton );
   layout->activate();
-  kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<tqlayout->minimumSize().height()<<endl;
+  kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<layout->minimumSize().height()<<endl;
 #ifdef __GNUC__
 #warning FIXME
 #endif
-  drag->setFixedHeight( closeButton->height()); // /*tqlayout->minimumS*/sizeHint().height() );
+  drag->setFixedHeight( closeButton->height()); // /*layout->minimumS*/sizeHint().height() );
 }
 
 void KDockWidgetHeader::addButton(KDockButton_Private* btn) {
@@ -381,7 +381,7 @@ void KDockWidgetHeader::addButton(KDockButton_Private* btn) {
   	if (dontShowDummy) d->dummy->hide(); else d->dummy->show();
 	layout->addWidget( closeButton );
 	layout->activate();
-	drag->setFixedHeight( tqlayout->minimumSize().height() );
+	drag->setFixedHeight( layout->minimumSize().height() );
 }
 
 void KDockWidgetHeader::removeButton(KDockButton_Private* btn) {

lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp

@@ -651,8 +651,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
 
 	if (isOn()) st|=TQStyle::Style_On;
 
-	tqstyle().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
-	tqstyle().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
+	style().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
+	style().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
 
 	switch (m_position) {
 		case KMultiTabBar::Left:
@@ -668,7 +668,7 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
 			paint->drawPixmap(0,0,pixmap);
 			break;
 	}
-//	tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
+//	style().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
 //		colorGroup(),TQStyle::Style_Enabled);