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, 13 insertions, 13 deletions

diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp
index 60289aad..38b942dc 100644
--- a/kmix/viewdockareapopup.cpp
+++ b/kmix/viewdockareapopup.cpp
@@ -21,7 +21,7 @@
 
 #include "viewdockareapopup.h"
 
-// Qt
+// TQt
 #include <tqwidget.h>
 #include <tqevent.h>
 #include <tqlayout.h>
@@ -40,15 +40,15 @@
 #include "mixer.h"
 #include "kmixdockwidget.h"
 
-// !! Do NOT remove or mask out "WType_Popup"
+// !! Do NOT remove or tqmask out "WType_Popup"
 //    Users will not be able to close the Popup without opening the KMix main window then.
 //    See Bug #93443, #96332 and #96404 for further details. -- esken
-ViewDockAreaPopup::ViewDockAreaPopup(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW )
-      : ViewBase(parent, name, TQString::null, mixer, WStyle_Customize | WType_Popup | Qt::WStyle_DialogBorder, vflags), _mdw(0), _dock(dockW)
+ViewDockAreaPopup::ViewDockAreaPopup(TQWidget* tqparent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW )
+      : ViewBase(tqparent, name, TQString(), mixer, WStyle_Customize | WType_Popup | TQt::WStyle_DialogBorder, vflags), _mdw(0), _dock(dockW)
 {
-    TQBoxLayout *layout = new TQHBoxLayout( this );
+    TQBoxLayout *tqlayout = new TQHBoxLayout( this );
     _frame = new TQFrame( this );
-    layout->addWidget( _frame );
+    tqlayout->addWidget( _frame );
 
     _frame->setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised );
     _frame->setLineWidth( 1 );
@@ -70,7 +70,7 @@ void ViewDockAreaPopup::mousePressEvent(TQMouseEvent *)
        Hide the popup:
        This should work automatically, when the user clicks outside the bounds of this popup:
        Alas - it does not work.
-       Why it does not work, I do not know: this->isPopup() returns "true", so Qt should
+       Why it does not work, I do not know: this->isPopup() returns "true", so TQt should
        properly take care of it in TQWidget.
     */
     if ( ! this->hasMouse() ) {
@@ -128,7 +128,7 @@ TQWidget* ViewDockAreaPopup::add(MixDevice *md)
 			    false,        // Show Record LED
                             false,        // Small
 			    Qt::Vertical, // Direction: only 1 device, so doesn't matter
-			    _frame,       // parent
+			    _frame,       // tqparent
 			    0,            // Is "NULL", so that there is no RMB-popup
 			    _dockDevice->name().latin1() );
 	 _layoutMDW->addItem( new TQSpacerItem( 5, 20 ), 0, 2 );
@@ -163,9 +163,9 @@ int ViewDockAreaPopup::advice() {
     }
 }
 
-TQSize ViewDockAreaPopup::sizeHint() const {
-    //    kdDebug(67100) << "ViewDockAreaPopup::sizeHint(): NewSize is " << _mdw->sizeHint() << "\n";
-    return( _mdw->sizeHint() );
+TQSize ViewDockAreaPopup::tqsizeHint() const {
+    //    kdDebug(67100) << "ViewDockAreaPopup::tqsizeHint(): NewSize is " << _mdw->tqsizeHint() << "\n";
+    return( _mdw->tqsizeHint() );
 }
 
 void ViewDockAreaPopup::constructionFinished() {
@@ -173,8 +173,8 @@ void ViewDockAreaPopup::constructionFinished() {
 
     _mdw->move(0,0);
     _mdw->show();
-    _mdw->resize(_mdw->sizeHint() );
-    resize(sizeHint());
+    _mdw->resize(_mdw->tqsizeHint() );
+    resize(tqsizeHint());
 	 
 }