Rename obsolete tq methods to standard names

1 files changed, 28 insertions, 28 deletions

diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp
index a4fa0bcc..f2ff1b1f 100644
--- a/kmix/mdwslider.cpp
+++ b/kmix/mdwslider.cpp
@@ -133,7 +133,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 		 slidersLayout->setAlignment(TQt::AlignHCenter);
 	 }
 
-	 /* cesken: This is inconsistent. Why should vertical and horizontal tqlayout differ?
+	 /* cesken: This is inconsistent. Why should vertical and horizontal layout differ?
 	  *         Also it eats too much space - especially when you don't show sliders at all.
 	  *         Even more on the vertical panel applet (see Bug #97667)
 	     if ( _orientation == Qt::Horizontal )
@@ -213,36 +213,36 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 
 	 // --- MUTE LED
 	 if ( showMuteLED ) {
-		 TQBoxLayout *ledtqlayout;
+		 TQBoxLayout *ledlayout;
 		 if ( _orientation == Qt::Vertical ) {
-			 ledtqlayout = new TQHBoxLayout( sliLayout );
-			 ledtqlayout->setAlignment(TQt::AlignVCenter);
+			 ledlayout = new TQHBoxLayout( sliLayout );
+			 ledlayout->setAlignment(TQt::AlignVCenter);
 		 }
 		 else {
-			 ledtqlayout = new TQVBoxLayout( sliLayout );
-			 ledtqlayout->setAlignment(TQt::AlignHCenter);
+			 ledlayout = new TQVBoxLayout( sliLayout );
+			 ledlayout->setAlignment(TQt::AlignHCenter);
 		 }
 
 		 if( m_mixdevice->hasMute() )
 		 {
-			 ledtqlayout->addStretch();
+			 ledlayout->addStretch();
 			 // create mute LED
 			 m_muteLED = new KLedButton( TQt::green, KLed::On, KLed::Sunken,
 					 KLed::Circular, this, "MuteLED" );
 			 m_muteLED->setFixedSize( TQSize(16, 16) );
 			 m_muteLED->resize( TQSize(16, 16) );
-			 ledtqlayout->addWidget( m_muteLED );
+			 ledlayout->addWidget( m_muteLED );
 			 TQToolTip::add( m_muteLED, i18n( "Mute" ) );
 			 connect( m_muteLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(toggleMuted()) );
 			 m_muteLED->installEventFilter( this );
-			 ledtqlayout->addStretch();
+			 ledlayout->addStretch();
 		 } // has Mute LED
 		 else {
 			 // we don't have a MUTE LED. We create a dummy widget
 			 // !! possibly not neccesary any more (we are layouted)
 			 TQWidget *qw = new TQWidget(this, "Spacer");
 			 qw->setFixedSize( TQSize(16, 16) );
-			 ledtqlayout->addWidget(qw);
+			 ledlayout->addWidget(qw);
 			 qw->installEventFilter( this );
 		 } // has no Mute LED
 
@@ -314,7 +314,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 			 slider->hide();
 			 number->hide();
 		 }
-		 slinumLayout->addWidget( slider );  // add to tqlayout
+		 slinumLayout->addWidget( slider );  // add to layout
 		 m_sliders.append ( slider );   // add to list
 		 _slidersChids.append(chid);        // Remember slider-chid association
 		 connect( slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(volumeChange(int)) );
@@ -327,27 +327,27 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 		 sliLayout->addSpacing( 5 );
 
 		 // --- LED LAYOUT TO CENTER ---
-		 TQBoxLayout *rectqlayout;
+		 TQBoxLayout *reclayout;
 		 if ( _orientation == Qt::Vertical ) {
-			 rectqlayout = new TQHBoxLayout( sliLayout );
-			 rectqlayout->setAlignment(TQt::AlignVCenter);
+			 reclayout = new TQHBoxLayout( sliLayout );
+			 reclayout->setAlignment(TQt::AlignVCenter);
 		 }
 		 else {
-			 rectqlayout = new TQVBoxLayout( sliLayout );
-			 rectqlayout->setAlignment(TQt::AlignHCenter);
+			 reclayout = new TQVBoxLayout( sliLayout );
+			 reclayout->setAlignment(TQt::AlignHCenter);
 		 }
 
 		 if( m_mixdevice->isRecordable() ) {
-			 rectqlayout->addStretch();
+			 reclayout->addStretch();
 			 m_recordLED = new KLedButton( TQt::red,
 					 m_mixdevice->isRecSource()?KLed::On:KLed::Off,
 					 KLed::Sunken, KLed::Circular, this, "RecordLED" );
 			 m_recordLED->setFixedSize( TQSize(16, 16) );
-			 rectqlayout->addWidget( m_recordLED );
+			 reclayout->addWidget( m_recordLED );
 			 connect(m_recordLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(setRecsrc(bool)));
 			 m_recordLED->installEventFilter( this );
                          TQToolTip::add( m_recordLED, i18n( "Record" ) );
-			 rectqlayout->addStretch();
+			 reclayout->addStretch();
 		 }
 		 else
 		 {
@@ -355,12 +355,12 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 			 // !! possibly not neccesary any more (we are layouted)
 			 TQWidget *qw = new TQWidget(this, "Spacer");
 			 qw->setFixedSize( TQSize(16, 16) );
-			 rectqlayout->addWidget(qw);
+			 reclayout->addWidget(qw);
 			 qw->installEventFilter( this );
 		 } // has no Record LED
 	 } // showRecordLED
 
-	tqlayout()->activate();
+	layout()->activate();
 }
 
 
@@ -438,7 +438,7 @@ MDWSlider::setIcon( int icontype )
       kdError(67100) << "Pixmap missing." << endl;
    }
 
-   tqlayout()->activate();
+   layout()->activate();
 }
 
 bool
@@ -514,7 +514,7 @@ MDWSlider::setStereoLinked(bool value)
    if( slider && static_cast<TQSlider *>(slider)->tickmarks() )
       setTicks( true );
 
-   tqlayout()->activate();
+   layout()->activate();
 }
 
 
@@ -529,7 +529,7 @@ MDWSlider::setLabeled(bool value)
    else
       m_label->hide();
 
-   tqlayout()->activate();
+   layout()->activate();
 }
 
 void
@@ -558,7 +558,7 @@ MDWSlider::setTicks( bool ticks )
 		}
 	}
 
-	tqlayout()->activate();
+	layout()->activate();
 }
 
 void
@@ -579,7 +579,7 @@ MDWSlider::setValueStyle( ValueStyle valueStyle )
 	    }
 	}
     }
-    tqlayout()->activate();
+    layout()->activate();
 }
 
 void
@@ -592,7 +592,7 @@ MDWSlider::setIcons(bool value)
 	    else
 		m_iconLabel->hide();
 
-	    tqlayout()->activate();
+	    layout()->activate();
 	}
     } // if it has an icon
 }
@@ -939,7 +939,7 @@ TQSize MDWSlider::sizeHint() const {
 		return _layout->sizeHint();
 	}
 	else {
-		// tqlayout not (yet) created
+		// layout not (yet) created
 		return TQWidget::sizeHint();
 	}
 }