Rename a number of classes to enhance compatibility with KDE4

6 files changed, 22 insertions, 22 deletions

diff --git a/kaboodle/controls.cpp b/kaboodle/controls.cpp
index 896d77cb..c6b0a4a8 100644
--- a/kaboodle/controls.cpp
+++ b/kaboodle/controls.cpp
@@ -77,7 +77,7 @@ 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 )
+	: TDEAction( text, accel, parent, name )
 {
 	m_receiver = receiver;
 	m_member = member;
@@ -85,10 +85,10 @@ Kaboodle::SliderAction::SliderAction(const TQString& text, int accel, const TQOb
 
 int Kaboodle::SliderAction::plug( TQWidget *w, int index )
 {
-	if (!w->inherits("KToolBar")) return -1;
+	if (!w->inherits("TDEToolBar")) return -1;
 
-	KToolBar *toolBar = (KToolBar *)w;
-	int id = KAction::getToolButtonID();
+	TDEToolBar *toolBar = (TDEToolBar *)w;
+	int id = TDEAction::getToolButtonID();
 	
 	//Create it.
 	m_slider=new L33tSlider(0, 1000, 100, 0,Qt::Horizontal, toolBar);
@@ -100,20 +100,20 @@ int Kaboodle::SliderAction::plug( TQWidget *w, int index )
 	connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
 	toolBar->setItemAutoSized( id, true );
 
-	if (w->inherits( "KToolBar" ))
-		connect(toolBar, TQT_SIGNAL(moved(KToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(KToolBar::BarPosition)));
+	if (w->inherits( "TDEToolBar" ))
+		connect(toolBar, TQT_SIGNAL(moved(TDEToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(TDEToolBar::BarPosition)));
 	
 	emit plugged();
 
 	return containerCount() - 1;
 }
 
-void Kaboodle::SliderAction::toolbarMoved(KToolBar::BarPosition)
+void Kaboodle::SliderAction::toolbarMoved(TDEToolBar::BarPosition)
 {
 // I wish this worked :)
 return;	
 /*
-	if (pos == KToolBar::Left || pos == KToolBar::Right)
+	if (pos == TDEToolBar::Left || pos == TDEToolBar::Right)
 	{
 		m_slider->setOrientationVertical);
 		m_slider->setFixedWidth(m_slider->height());
@@ -128,7 +128,7 @@ return;
 
 void Kaboodle::SliderAction::unplug( TQWidget *w )
 {
-	KToolBar *toolBar = (KToolBar *)w;
+	TDEToolBar *toolBar = (TDEToolBar *)w;
 	int idx = findContainer( w );
 
 	toolBar->removeItem( itemId( idx ) );
diff --git a/kaboodle/controls.h b/kaboodle/controls.h
index 97540b80..9b6d97aa 100644
--- a/kaboodle/controls.h
+++ b/kaboodle/controls.h
@@ -71,7 +71,7 @@ private:
 /**
  * A slider for your toolbar
  **/
-class SliderAction : public KAction
+class SliderAction : public TDEAction
 {
 Q_OBJECT
   
@@ -86,7 +86,7 @@ signals:
 	void plugged();
 
 public slots:
-	void toolbarMoved(KToolBar::BarPosition pos);
+	void toolbarMoved(TDEToolBar::BarPosition pos);
 private:
 	TQGuardedPtr<TQSlider> m_slider;
 	TQStringList m_items;
diff --git a/kaboodle/player.cpp b/kaboodle/player.cpp
index 70517c2d..798cf782 100644
--- a/kaboodle/player.cpp
+++ b/kaboodle/player.cpp
@@ -60,10 +60,10 @@ Kaboodle::Player::Player(TQWidget *widgetParent, const char *widgetName,
 	ticker.start(500);
 	setState(Empty);
 
-	playAction = new KAction(i18n("&Play"), 0, this, TQT_SLOT(play()), actionCollection(), "play");
-	pauseAction = new KAction(i18n("&Pause"), 0, this, TQT_SLOT(pause()), actionCollection(), "pause");
-	stopAction = new KAction(i18n("&Stop"), 0, this, TQT_SLOT(stop()), actionCollection(), "stop");
-	loopAction = new KToggleAction(i18n("&Looping"), 0, this, TQT_SLOT(loop()), actionCollection(), "loop");
+	playAction = new TDEAction(i18n("&Play"), 0, this, TQT_SLOT(play()), actionCollection(), "play");
+	pauseAction = new TDEAction(i18n("&Pause"), 0, this, TQT_SLOT(pause()), actionCollection(), "pause");
+	stopAction = new TDEAction(i18n("&Stop"), 0, this, TQT_SLOT(stop()), actionCollection(), "stop");
+	loopAction = new TDEToggleAction(i18n("&Looping"), 0, this, TQT_SLOT(loop()), actionCollection(), "loop");
 	stopAction->setEnabled(false);
 	playAction->setEnabled(false);
 	pauseAction->setEnabled(false);
diff --git a/kaboodle/player.h b/kaboodle/player.h
index f269dbbf..b528fa9d 100644
--- a/kaboodle/player.h
+++ b/kaboodle/player.h
@@ -31,8 +31,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqobject.h>
 #include <tqtimer.h>
 
-class KAction;
-class KToggleAction;
+class TDEAction;
+class TDEToggleAction;
 
 namespace Kaboodle
 {
@@ -104,8 +104,8 @@ private:
 
 	BrowserExtension *extension;
 
-	KAction *playAction, *pauseAction, *stopAction;
-	KToggleAction *loopAction;
+	TDEAction *playAction, *pauseAction, *stopAction;
+	TDEToggleAction *loopAction;
 
 	TQTimer ticker;
 	KURL current;
diff --git a/kaboodle/userinterface.cpp b/kaboodle/userinterface.cpp
index ffc04c48..49303b66 100644
--- a/kaboodle/userinterface.cpp
+++ b/kaboodle/userinterface.cpp
@@ -60,7 +60,7 @@ Kaboodle::UserInterface::UserInterface(TQWidget *parent, const KURL &initialFile
         KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys() ), actionCollection() );
 
 	menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()), actionCollection());
-	propertiesAction = new KAction(i18n("Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(properties()), actionCollection(), "properties");
+	propertiesAction = new TDEAction(i18n("Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(properties()), actionCollection(), "properties");
 	propertiesAction->setEnabled(false);
 
 	part = new Player(this, "KaboodlePlayer", TQT_TQOBJECT(this), "KaboodleView");
diff --git a/kaboodle/userinterface.h b/kaboodle/userinterface.h
index f786ad81..62395098 100644
--- a/kaboodle/userinterface.h
+++ b/kaboodle/userinterface.h
@@ -66,8 +66,8 @@ private slots:
     void slotConfigureKeys();
 private:
 	Player *part;
-	KToggleAction *menubarAction;
-	KAction *propertiesAction;
+	TDEToggleAction *menubarAction;
+	TDEAction *propertiesAction;
 };
 }
 #endif