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

diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp
index 32372cb3..1a0763d5 100644
--- a/kmix/kmixdockwidget.cpp
+++ b/kmix/kmixdockwidget.cpp
@@ -48,8 +48,8 @@
 #include "kwin.h"
 #include "viewdockareapopup.h"
 
-KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *parent, const char *name, bool volumePopup, bool dockIconMuting )
-    : KSystemTray( parent, name ),
+KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *tqparent, const char *name, bool volumePopup, bool dockIconMuting )
+    : KSystemTray( tqparent, name ),
       m_mixer(mixer),
       _dockAreaPopup(0L),
       _audioPlayer(0L),
@@ -81,7 +81,7 @@ KMixDockWidget::~KMixDockWidget()
 void KMixDockWidget::createActions()
 {
   // Put "Mute" selector in context menu
-  (void)new KToggleAction( i18n( "M&ute" ), 0, this, TQT_SLOT( dockMute() ),
+  (void)new KToggleAction( i18n( "M&ute" ), 0, TQT_TQOBJECT(this), TQT_SLOT( dockMute() ),
   actionCollection(), "dock_mute" );
   KAction *a = actionCollection()->action( "dock_mute" );
   KPopupMenu *popupMenu = contextMenu();
@@ -89,7 +89,7 @@ void KMixDockWidget::createActions()
 
   // Put "Select Master Channel" dialog in context menu
   if ( m_mixer != 0 ) {
-  (void)new KAction( i18n("Select Master Channel..."), 0, this, TQT_SLOT(selectMaster()),
+  (void)new KAction( i18n("Select Master Channel..."), 0, TQT_TQOBJECT(this), TQT_SLOT(selectMaster()),
   actionCollection(), "select_master");
   KAction *a2 = actionCollection()->action( "select_master" );
   if (a2) a2->plug( popupMenu );
@@ -123,7 +123,7 @@ KMixDockWidget::createMasterVolWidget()
     m_mixer->readSetFromHWforceUpdate();  // after changing the master device, make sure to re-read (otherwise no "changed()" signals might get sent by the Mixer
     /* With the recently introduced TQSocketNotifier stuff, we can't rely on regular timer updates
        any longer. Also the readSetFromHWforceUpdate() won't be enough. As a workaround, we trigger
-       all "repaints" manually here.
+       all "tqrepaints" manually here.
        The call to m_mixer->readSetFromHWforceUpdate() is most likely superfluous, even if we don't use TQSocketNotifier (e.g. in backends OSS, Solaris, ...)
      */
     setVolumeTip();
@@ -135,8 +135,8 @@ KMixDockWidget::createMasterVolWidget()
      *
      */
     //    connect( m_mixer, TQT_SIGNAL(newVolumeLevels()), _dockAreaPopup, TQT_SLOT(refreshVolumeLevels()) );
-    connect( m_mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(setVolumeTip() ) );
-    connect( m_mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(slotUpdatePixmap() ) );
+    connect( m_mixer, TQT_SIGNAL(newVolumeLevels()), TQT_TQOBJECT(this), TQT_SLOT(setVolumeTip() ) );
+    connect( m_mixer, TQT_SIGNAL(newVolumeLevels()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdatePixmap() ) );
 }
 
 void KMixDockWidget::slotUpdatePixmap()
@@ -191,7 +191,7 @@ KMixDockWidget::setVolumeTip()
         }
 	newToolTipValue = val + 10000*md->isMuted();
 	if ( _oldToolTipValue != newToolTipValue ) {
-	    tip = i18n( "Volume at %1%" ).arg( val );
+	    tip = i18n( "Volume at %1%" ).tqarg( val );
 	    if ( md->isMuted() ) {
 		tip += i18n( " (Muted)" );
 	    }
@@ -267,7 +267,7 @@ KMixDockWidget::mousePressEvent(TQMouseEvent *me)
 
         // esken: Due to overwhelming request, LeftButton shows the ViewDockAreaPopup, if configured
         //        to do so. Otherwise the main window will be shown.
-	if ( me->button() == LeftButton )
+	if ( me->button() == Qt::LeftButton )
 	{
 		if ( ! _volumePopup ) {
                     // Case 1: User wants to show main window => This is the KSystemTray default action
@@ -311,7 +311,7 @@ KMixDockWidget::mousePressEvent(TQMouseEvent *me)
 		TQWidget::mousePressEvent(me); // KSystemTray's shouldn't do the default action for this
 		return;
 	} // LeftMouseButton pressed
-	else if ( me->button() ==  MidButton ) {
+	else if ( me->button() ==  Qt::MidButton ) {
 		if ( ! _dockIconMuting ) {
             toggleActive();
         } else {
@@ -357,10 +357,10 @@ KMixDockWidget::wheelEvent(TQWheelEvent *e)
     }
     md->getVolume().setVolume(vol);
     m_mixer->commitVolumeChange(md);
-    // refresh the toolTip (Qt removes it on a MouseWheel event)
-    // Mhhh, it doesn't work. Qt does not show it again.
+    // refresh the toolTip (TQt removes it on a MouseWheel event)
+    // Mhhh, it doesn't work. TQt does not show it again.
     setVolumeTip();
-    // Simulate a mouse move to make Qt show the tooltip again
+    // Simulate a mouse move to make TQt show the tooltip again
     TQApplication::postEvent( this, new TQMouseEvent( TQEvent::MouseMove, TQCursor::pos(), Qt::NoButton, Qt::NoButton ) );
 
   }
@@ -384,9 +384,9 @@ void
 KMixDockWidget::contextMenuAboutToShow( KPopupMenu* /* menu */ )
 {
     KAction* showAction = actionCollection()->action("minimizeRestore");
-    if ( parentWidget() && showAction )
+    if ( tqparentWidget() && showAction )
     {
-        if ( parentWidget()->isVisible() )
+        if ( tqparentWidget()->isVisible() )
         {
             showAction->setText( i18n("Hide Mixer Window") );
         }