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

diff --git a/kaboodle/controls.cpp b/kaboodle/controls.cpp
index 305ae661..b718b659 100644
--- a/kaboodle/controls.cpp
+++ b/kaboodle/controls.cpp
@@ -23,15 +23,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "controls.h"
 
-Kaboodle::L33tSlider::L33tSlider(TQWidget * parent, const char * name) :
-	TQSlider(parent,name), pressed(false)
+Kaboodle::L33tSlider::L33tSlider(TQWidget * tqparent, const char * name) :
+	TQSlider(tqparent,name), pressed(false)
 {}
-Kaboodle::L33tSlider::L33tSlider(Orientation o, TQWidget * parent, const char * name) :
-	TQSlider(o,parent,name), pressed(false)
+Kaboodle::L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * tqparent, const char * name) :
+	TQSlider(o,tqparent,name), pressed(false)
 {}
 Kaboodle::L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value,
-	                   Orientation o, TQWidget * parent, const char * name) :
-	TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false)
+	                   Qt::Orientation o, TQWidget * tqparent, const char * name) :
+	TQSlider(minValue, maxValue, pageStep, value, o, tqparent,name), pressed(false)
 {}
 
 bool Kaboodle::L33tSlider::currentlyPressed() const
@@ -47,7 +47,7 @@ void Kaboodle::L33tSlider::setValue(int i)
 
 void Kaboodle::L33tSlider::mousePressEvent(TQMouseEvent*e)
 {
-	if (e->button()!=RightButton)
+	if (e->button()!=Qt::RightButton)
 	{
 		pressed=true;
 		TQSlider::mousePressEvent(e);
@@ -76,8 +76,8 @@ void Kaboodle::L33tSlider::wheelEvent(TQWheelEvent *e)
 }
 
 Kaboodle::SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver,
-                                 const char *member, TQObject* parent, const char* name )
-	: KAction( text, accel, parent, name )
+                                 const char *member, TQObject* tqparent, const char* name )
+	: KAction( text, accel, tqparent, name )
 {
 	m_receiver = receiver;
 	m_member = member;
@@ -91,7 +91,7 @@ int Kaboodle::SliderAction::plug( TQWidget *w, int index )
 	int id = KAction::getToolButtonID();
 	
 	//Create it.
-	m_slider=new L33tSlider(0, 1000, 100, 0, Horizontal, toolBar);
+	m_slider=new L33tSlider(0, 1000, 100, 0,Qt::Horizontal, toolBar);
 	m_slider->setMinimumWidth(10);
 	toolBar->insertWidget(id, 10, m_slider, index );
 
@@ -115,12 +115,12 @@ return;
 /*
 	if (pos == KToolBar::Left || pos == KToolBar::Right)
 	{
-		m_slider->setOrientation(Vertical);
+		m_slider->setOrientationVertical);
 		m_slider->setFixedWidth(m_slider->height());
 	}
 	else
 	{
-		m_slider->setOrientation(Horizontal);
+		m_slider->setOrientationHorizontal);
 		m_slider->resize(m_slider->height(), m_slider->height());
 	}
 */