1 files changed, 21 insertions, 21 deletions

diff --git a/kmix/viewsurround.cpp b/kmix/viewsurround.cpp
index 02a7aace..7e653b32 100644
--- a/kmix/viewsurround.cpp
+++ b/kmix/viewsurround.cpp
@@ -21,7 +21,7 @@
 
 #include "viewsurround.h"
 
-// Qt
+// TQt
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqwidget.h>
@@ -39,8 +39,8 @@
  * Demonstration verion of a "surround view"
  * Not really usable right now.
  */
-ViewSurround::ViewSurround(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
-      : ViewBase(parent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags)
+ViewSurround::ViewSurround(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
+      : ViewBase(tqparent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags)
 {
     _mdSurroundFront = 0;
     _mdSurroundBack  = 0;
@@ -135,26 +135,26 @@ TQWidget* ViewSurround::add(MixDevice *md)
 
     switch ( md->type() ) {
     case MixDevice::VOLUME:
-	_layoutSurround->addWidget(mdw ,0,0, Qt::AlignBottom | Qt::AlignLeft);
+	_layoutSurround->addWidget(mdw ,0,0, TQt::AlignBottom | TQt::AlignLeft);
 	break;
 	
     case MixDevice::SURROUND_BACK:
-	_layoutSurround->addWidget(mdw ,2,0, Qt::AlignTop | Qt::AlignLeft);
+	_layoutSurround->addWidget(mdw ,2,0, TQt::AlignTop | TQt::AlignLeft);
 	break;
     case MixDevice::SURROUND_LFE:
-	_layoutSurround->addWidget(mdw,1,3,  Qt::AlignVCenter | Qt::AlignRight ); break;
+	_layoutSurround->addWidget(mdw,1,3,  TQt::AlignVCenter | TQt::AlignRight ); break;
 	break;
     case MixDevice::SURROUND_CENTERFRONT:
-	_layoutSurround->addWidget(mdw,0,2,  Qt::AlignTop | Qt::AlignHCenter); break;
+	_layoutSurround->addWidget(mdw,0,2,  TQt::AlignTop | TQt::AlignHCenter); break;
 	break;
     case MixDevice::SURROUND_CENTERBACK:
-	_layoutSurround->addWidget(mdw,2,2,  Qt::AlignBottom | Qt::AlignHCenter); break;
+	_layoutSurround->addWidget(mdw,2,2,  TQt::AlignBottom | TQt::AlignHCenter); break;
 	break;
 
     case MixDevice::SURROUND:
     case MixDevice::AC97:
     default:
-	// Add as slider to the layout on the left side
+	// Add as slider to the tqlayout on the left side
 	_layoutSliders->add(mdw);
 	break;
     } // switch(type)
@@ -162,9 +162,9 @@ TQWidget* ViewSurround::add(MixDevice *md)
     return mdw;
 }
 
-TQSize ViewSurround::sizeHint() const {
-    //    kdDebug(67100) << "ViewSurround::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n";
-    return( _layoutMDW->sizeHint() );
+TQSize ViewSurround::tqsizeHint() const {
+    //    kdDebug(67100) << "ViewSurround::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n";
+    return( _layoutMDW->tqsizeHint() );
 }
 
 void ViewSurround::constructionFinished() {
@@ -180,39 +180,39 @@ void ViewSurround::constructionFinished() {
        // rear speaker support in this sound card
        rowOfSpeaker = 1;
     }
-    _layoutSurround->addWidget(personLabel ,rowOfSpeaker, 2, Qt::AlignHCenter | Qt::AlignVCenter);
+    _layoutSurround->addWidget(personLabel ,rowOfSpeaker, 2, TQt::AlignHCenter | TQt::AlignVCenter);
 
     if ( _mdSurroundFront != 0 ) {
 	MixDeviceWidget *mdw = createMDW(_mdSurroundFront, true, Qt::Vertical);
-	_layoutSurround->addWidget(mdw,0,4, Qt::AlignBottom | Qt::AlignRight);
+	_layoutSurround->addWidget(mdw,0,4, TQt::AlignBottom | TQt::AlignRight);
 	_mdws.append(mdw);
 
 	TQLabel* speakerIcon = new TQLabel("Speaker", this);
         icon = UserIcon( "SpeakerFrontLeft" );
 	if ( ! icon.isNull()) speakerIcon->setPixmap(icon);
-        _layoutSurround->addWidget(speakerIcon,0,1, Qt::AlignTop | Qt::AlignLeft);
+        _layoutSurround->addWidget(speakerIcon,0,1, TQt::AlignTop | TQt::AlignLeft);
 
         speakerIcon = new TQLabel("Speaker", this);
         icon = UserIcon( "SpeakerFrontRight" );
         if ( ! icon.isNull()) speakerIcon->setPixmap(icon);
-	_layoutSurround->addWidget(speakerIcon,0,3, Qt::AlignTop | Qt::AlignRight);
+	_layoutSurround->addWidget(speakerIcon,0,3, TQt::AlignTop | TQt::AlignRight);
 
     }
 
     if ( _mdSurroundBack != 0 ) {
 	MixDeviceWidget *mdw = createMDW(_mdSurroundBack, true, Qt::Vertical);
-	_layoutSurround->addWidget(mdw,2,4, Qt::AlignTop | Qt::AlignRight);
+	_layoutSurround->addWidget(mdw,2,4, TQt::AlignTop | TQt::AlignRight);
 	_mdws.append(mdw);
 
         TQLabel* speakerIcon = new TQLabel("Speaker", this);
         icon = UserIcon( "SpeakerRearLeft" );
         if ( ! icon.isNull()) speakerIcon->setPixmap(icon);
-        _layoutSurround->addWidget(speakerIcon,2,1, Qt::AlignBottom | Qt::AlignLeft);
+        _layoutSurround->addWidget(speakerIcon,2,1, TQt::AlignBottom | TQt::AlignLeft);
 
         speakerIcon = new TQLabel("Speaker", this);
         icon = UserIcon( "SpeakerRearRight" );
         if ( ! icon.isNull()) speakerIcon->setPixmap(icon);
-        _layoutSurround->addWidget(speakerIcon,2,3, Qt::AlignBottom | Qt::AlignRight);
+        _layoutSurround->addWidget(speakerIcon,2,3, TQt::AlignBottom | TQt::AlignRight);
 
 
     }
@@ -259,8 +259,8 @@ MixDeviceWidget* ViewSurround::createMDW(MixDevice *md, bool small, Qt::Orientat
 			    false,         // Show Mute LED
 			    false,        // Show Record LED
 			    small,        // Small
-			    orientation,  // Orientation
-			    this,         // parent
+			    orientation,  // Qt::Orientation
+			    this,         // tqparent
 			    this,         // View widget
 			    md->name().latin1()
 			    );