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

diff --git a/kmix/dialogviewconfiguration.cpp b/kmix/dialogviewconfiguration.cpp
index 09e88d23..948df8fe 100644
--- a/kmix/dialogviewconfiguration.cpp
+++ b/kmix/dialogviewconfiguration.cpp
@@ -50,7 +50,7 @@ DialogViewConfiguration::DialogViewConfiguration( TQWidget*, ViewBase& view)
 	if ( qw->inherits("MixDeviceWidget") ) {
 	    MixDeviceWidget *mdw = static_cast<MixDeviceWidget*>(qw);
 	    TQString mdName = mdw->mixDevice()->name();
-            mdName.replace('&', "&&"); // Quoting the '&' needed, to prevent TQCheckBox creating an accelerator
+            mdName.tqreplace('&', "&&"); // Quoting the '&' needed, to prevent TQCheckBox creating an accelerator
 	    TQCheckBox* cb = new TQCheckBox( mdName, plainPage() );
 	    _qEnabledCB.append(cb);
 	    cb->setChecked( !mdw->isDisabled() ); //mdw->isVisible() );
@@ -58,7 +58,7 @@ DialogViewConfiguration::DialogViewConfiguration( TQWidget*, ViewBase& view)
 	}
     }
     _layout->activate();
-    resize(_layout->sizeHint() );
+    resize(_layout->tqsizeHint() );
     connect( this, TQT_SIGNAL(okClicked())   , this, TQT_SLOT(apply()) );
 }
 
@@ -93,9 +93,9 @@ void DialogViewConfiguration::apply()
     _view.configurationUpdate();
 }
 
-TQSize DialogViewConfiguration::sizeHint() const {
-    //    kdDebug(67100) << "DialogViewConfiguration::sizeHint() is (100,500)\n";
-    return _layout->sizeHint();
+TQSize DialogViewConfiguration::tqsizeHint() const {
+    //    kdDebug(67100) << "DialogViewConfiguration::tqsizeHint() is (100,500)\n";
+    return _layout->tqsizeHint();
 }
 
 #include "dialogviewconfiguration.moc"