TQt4 port kdemultimedia

This enables compilation under both Qt3 and Qt4


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

1 files changed, 21 insertions, 21 deletions

diff --git a/kmix/viewgrid.cpp b/kmix/viewgrid.cpp
index 59f03906..360953f8 100644
--- a/kmix/viewgrid.cpp
+++ b/kmix/viewgrid.cpp
@@ -21,7 +21,7 @@
 
 #include "viewgrid.h"
 
-// Qt
+// TQt
 #include <tqwidget.h>
 
 // KDE
@@ -35,8 +35,8 @@
 
 /**
  */
-ViewGrid::ViewGrid(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
-      : ViewBase(parent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags)
+ViewGrid::ViewGrid(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
+      : ViewBase(tqparent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags)
 {
    m_spacingHorizontal = 5;
    m_spacingVertical = 5;
@@ -88,8 +88,8 @@ TQWidget* ViewGrid::add(MixDevice *md)
     mdw = new MDWEnum(
 	_mixer,       // the mixer for this device
     md,           // MixDevice (parameter)
-    orientation,  // Orientation
-    this,         // parent
+    orientation,  // Qt::Orientation
+    this,         // tqparent
     this,         // View widget
     md->name().latin1()
 		     );
@@ -101,8 +101,8 @@ TQWidget* ViewGrid::add(MixDevice *md)
 	_mixer,       // the mixer for this device
     md,           // MixDevice (parameter)
     false,        // Small
-    orientation,  // Orientation
-    this,         // parent
+    orientation,  // Qt::Orientation
+    this,         // tqparent
     this,         // View widget
     md->name().latin1()
 		     );
@@ -117,8 +117,8 @@ TQWidget* ViewGrid::add(MixDevice *md)
 			    true,         // Show Mute LED
 			    true,         // Show Record LED
 			    false,        // Small
-			    orientation,  // Orientation
-			    this,         // parent
+			    orientation,  // Qt::Orientation
+			    this,         // tqparent
 			    this,         // View widget
 			    md->name().latin1()
 			    );
@@ -126,23 +126,23 @@ TQWidget* ViewGrid::add(MixDevice *md)
   return mdw;
 }
 
-TQSize ViewGrid::sizeHint() const {
-    //    kdDebug(67100) << "ViewGrid::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n";
-    return( m_sizeHint);
+TQSize ViewGrid::tqsizeHint() const {
+    //    kdDebug(67100) << "ViewGrid::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n";
+    return( m_tqsizeHint);
 }
 
 void ViewGrid::constructionFinished() {
     //_layoutMDW->activate();
 
-    // do a manual layout
+    // do a manual tqlayout
     configurationUpdate();
 }
 
 void ViewGrid::refreshVolumeLevels() {
     //     kdDebug(67100) << "ViewGrid::refreshVolumeLevels()\n";
 
-   m_sizeHint.setWidth (0);
-   m_sizeHint.setHeight(0);
+   m_tqsizeHint.setWidth (0);
+   m_tqsizeHint.setHeight(0);
 
    m_testingX = 0;
    m_testingY = 0;
@@ -178,12 +178,12 @@ void ViewGrid::refreshVolumeLevels() {
 }
 
 /**
-   This implementation makes sure the Grid's geometry is updated
+   This implementation makes sure the Grid's tqgeometry is updated
    after hiding/showing channels.
 */
 void ViewGrid::configurationUpdate() {
-    m_sizeHint.setWidth (0);
-    m_sizeHint.setHeight(0);
+    m_tqsizeHint.setWidth (0);
+    m_tqsizeHint.setHeight(0);
 
     m_testingX = 0;
     m_testingY = 0;
@@ -195,9 +195,9 @@ void ViewGrid::configurationUpdate() {
       int xPos = m_testingX * m_spacingHorizontal;
       int yPos = m_testingY * m_spacingVertical ;
       mdw->move( xPos, yPos );
-      mdw->resize( mdw->sizeHint() );
-      int xMax = xPos + mdw->width() ; if ( xMax > m_sizeHint.width()  ) m_sizeHint.setWidth(xMax);
-      int yMax = yPos + mdw->height(); if ( yMax > m_sizeHint.height() ) m_sizeHint.setHeight(yMax);
+      mdw->resize( mdw->tqsizeHint() );
+      int xMax = xPos + mdw->width() ; if ( xMax > m_tqsizeHint.width()  ) m_tqsizeHint.setWidth(xMax);
+      int yMax = yPos + mdw->height(); if ( yMax > m_tqsizeHint.height() ) m_tqsizeHint.setHeight(yMax);
 
       m_testingX += 5;
       if ( m_testingX > 50 ) {