Rename a number of classes to enhance compatibility with KDE4

6 files changed, 42 insertions, 42 deletions

diff --git a/arts/gui/kde/dbtest.cpp b/arts/gui/kde/dbtest.cpp
index 9e569567..12e88df6 100644
--- a/arts/gui/kde/dbtest.cpp
+++ b/arts/gui/kde/dbtest.cpp
@@ -12,7 +12,7 @@
 
 dBTestWidget::dBTestWidget( TQWidget* p, const char* n ) : TQWidget( p,n ), dB2VolCalc( -24,6 ) {
 kdDebug() << k_funcinfo << endl;
-	( void* ) KStdAction::quit( this, TQT_SLOT( close() ), new KActionCollection( this ) );
+	( void* ) KStdAction::quit( this, TQT_SLOT( close() ), new TDEActionCollection( this ) );
 
 	for ( float i=0; i<=1; i+=0.25 )
 		kdDebug() << i << " : " << amptodb( i ) << "dB" <<endl;
diff --git a/arts/gui/kde/kpopupbox_impl.cpp b/arts/gui/kde/kpopupbox_impl.cpp
index 23de74fc..a4ac6fa2 100644
--- a/arts/gui/kde/kpopupbox_impl.cpp
+++ b/arts/gui/kde/kpopupbox_impl.cpp
@@ -26,35 +26,35 @@
 
 using namespace Arts;
 
-KPopupBox_impl::KPopupBox_impl( KPopupBox_widget *w ) : KFrame_impl( w ? w : new KPopupBox_widget )
+TDEPopupBox_impl::TDEPopupBox_impl( TDEPopupBox_widget *w ) : KFrame_impl( w ? w : new TDEPopupBox_widget )
 {
 	self().framestyle( Box ); self().margin( 1 ); self().linewidth( 1 );
 	self().vSizePolicy( spFixed ); self().hSizePolicy( spFixed );
 
-	if( !w ) w = static_cast<KPopupBox_widget *>( _qframe );
+	if( !w ) w = static_cast<TDEPopupBox_widget *>( _qframe );
 
 	_widget = w;
-//	_mapper = new KPopupBoxEventMapper( _widget, this );
+//	_mapper = new TDEPopupBoxEventMapper( _widget, this );
 }
-KPopupBox_impl::~KPopupBox_impl() {
+TDEPopupBox_impl::~TDEPopupBox_impl() {
 }
 
-Direction KPopupBox_impl::direction() { return _widget->direction(); }
-void KPopupBox_impl::direction( Direction n ) { _widget->direction( n ); }
+Direction TDEPopupBox_impl::direction() { return _widget->direction(); }
+void TDEPopupBox_impl::direction( Direction n ) { _widget->direction( n ); }
 
-void KPopupBox_impl::widget( Arts::Widget widget ) {
+void TDEPopupBox_impl::widget( Arts::Widget widget ) {
 	widget.parent( self() );
 	this->_addChild( widget, "PopupBox_child" );
 	_widget->setWidget( widget );
 }
-Arts::Widget KPopupBox_impl::widget() { return _widget->getWidget(); }
+Arts::Widget TDEPopupBox_impl::widget() { return _widget->getWidget(); }
 
-std::string KPopupBox_impl::name() { return _name; }
-void KPopupBox_impl::name( const std::string& n ) { _name = ""; _name = n; _widget->name( n ); }
+std::string TDEPopupBox_impl::name() { return _name; }
+void TDEPopupBox_impl::name( const std::string& n ) { _name = ""; _name = n; _widget->name( n ); }
 
 // Following the private class:
 
-KPopupBox_widget::KPopupBox_widget( TQWidget *parent, const char* name ) : TQFrame( parent,name )
+TDEPopupBox_widget::TDEPopupBox_widget( TQWidget *parent, const char* name ) : TQFrame( parent,name )
 {
 	this->setFrameShape( TQFrame::Box );
 	this->setMargin( 1 ); this->setLineWidth( 1 );
@@ -77,14 +77,14 @@ KPopupBox_widget::KPopupBox_widget( TQWidget *parent, const char* name ) : TQFra
 	_layout->addWidget( _artswidget, 20 );
 	_layout->addStretch( 0 );
 }
-KPopupBox_widget::~KPopupBox_widget() {
+TDEPopupBox_widget::~TDEPopupBox_widget() {
 }
 
-Arts::Direction KPopupBox_widget::direction() {
+Arts::Direction TDEPopupBox_widget::direction() {
 	return Arts::Direction( _layout->direction() );
 }
 
-void KPopupBox_widget::direction( Arts::Direction n ) {
+void TDEPopupBox_widget::direction( Arts::Direction n ) {
 	_layout->setDirection( TQBoxLayout::Direction( n ) );
 	_showbutton->direction( TQBoxLayout::Direction( n ) );
 	switch( n ) {
@@ -102,17 +102,17 @@ void KPopupBox_widget::direction( Arts::Direction n ) {
 	}
 }
 
-void KPopupBox_widget::setWidget( Arts::Widget widget ) { _artswidget->setContent( widget ); }
-Arts::Widget KPopupBox_widget::getWidget() { return _artswidget->content(); }
+void TDEPopupBox_widget::setWidget( Arts::Widget widget ) { _artswidget->setContent( widget ); }
+Arts::Widget TDEPopupBox_widget::getWidget() { return _artswidget->content(); }
 
-void KPopupBox_widget::hide( bool n ) {
+void TDEPopupBox_widget::hide( bool n ) {
 	if( n )
 		_artswidget->hide();
 	else
 		_artswidget->show();
 }
 
-void KPopupBox_widget::own( bool n ) {
+void TDEPopupBox_widget::own( bool n ) {
 	if ( n )
 		_artswidget->reparent( 0, _artswidget->mapToGlobal( _artswidget->pos() ), !( _artswidget->isHidden() ) );
 	else
@@ -122,11 +122,11 @@ void KPopupBox_widget::own( bool n ) {
 	}
 }
 
-void KPopupBox_widget::name( std::string n ) {
+void TDEPopupBox_widget::name( std::string n ) {
 	_artswidget->setCaption( n.c_str() );
 }
 
-REGISTER_IMPLEMENTATION( KPopupBox_impl );
+REGISTER_IMPLEMENTATION( TDEPopupBox_impl );
 
 #include "kpopupbox_private.moc"
 
diff --git a/arts/gui/kde/kpopupbox_impl.h b/arts/gui/kde/kpopupbox_impl.h
index ebda82c5..0cd44a4e 100644
--- a/arts/gui/kde/kpopupbox_impl.h
+++ b/arts/gui/kde/kpopupbox_impl.h
@@ -26,21 +26,21 @@
 #include <artsgui.h>
 
 class TQBoxLayout;
-class KPopupBox_widget;
-//class KPopupBoxEventMapper; // The EventMapper isn't needed at present, but perhaps in the future...
+class TDEPopupBox_widget;
+//class TDEPopupBoxEventMapper; // The EventMapper isn't needed at present, but perhaps in the future...
 
 namespace Arts {
 
 /// The PopupBox
 
-class KPopupBox_impl : virtual public Arts::PopupBox_skel, public Arts::KFrame_impl
+class TDEPopupBox_impl : virtual public Arts::PopupBox_skel, public Arts::KFrame_impl
 {
 public:
 	/// selfreference like 'this'
 	PopupBox self() { return PopupBox::_from_base( _copy() ); }
 	/// Constructor
-	KPopupBox_impl( KPopupBox_widget *w=0 );
-	~KPopupBox_impl();
+	TDEPopupBox_impl( TDEPopupBox_widget *w=0 );
+	~TDEPopupBox_impl();
 
 	/// The name of the widget
 	std::string name();
@@ -57,10 +57,10 @@ public:
 private:
 	std::string _name;
 	bool _lefttoright;
-	KPopupBox_widget *_widget;
-//	KPopupBoxEventMapper *_mapper;
+	TDEPopupBox_widget *_widget;
+//	TDEPopupBoxEventMapper *_mapper;
 
-}; // class KPopupBox
+}; // class TDEPopupBox
 
 } // namespace Arts
 
diff --git a/arts/gui/kde/kpopupbox_private.h b/arts/gui/kde/kpopupbox_private.h
index 3b431ddd..9750625b 100644
--- a/arts/gui/kde/kpopupbox_private.h
+++ b/arts/gui/kde/kpopupbox_private.h
@@ -32,13 +32,13 @@ class TQBoxLayout;
 
 #include <tqframe.h>
 
-class KPopupBox_widget : public TQFrame
+class TDEPopupBox_widget : public TQFrame
 {
    Q_OBJECT
   
 public:
-	KPopupBox_widget( TQWidget* =0, const char* =0);
-	~KPopupBox_widget();
+	TDEPopupBox_widget( TQWidget* =0, const char* =0);
+	~TDEPopupBox_widget();
 
 	Arts::Direction direction();
 	void direction( Arts::Direction );
@@ -64,16 +64,16 @@ private:
 
 // See kpopupbox_impl.h - The eventmapper isn't needed at present, but perhaps in the future...
 
-/*class KPopupBoxEventMapper : public TQObject {
+/*class TDEPopupBoxEventMapper : public TQObject {
    Q_OBJECT
   
 public:
-	KPopupBoxEventMapper(  KPopupBox_widget *widget, Arts::KPopupBox_impl *impl )
+	TDEPopupBoxEventMapper(  TDEPopupBox_widget *widget, Arts::TDEPopupBox_impl *impl )
 	  : TQObject(  widget,"" ), _widget(  widget ), _impl(  impl )
 	{}
 private:
-	KPopupBox_widget *_widget;
-	Arts::KPopupBox_impl *_impl;
+	TDEPopupBox_widget *_widget;
+	Arts::TDEPopupBox_impl *_impl;
 };*/
 
 #include <tqpainter.h>
diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp
index 11a94ae0..a6621155 100644
--- a/arts/gui/kde/kvolumefader_impl.cpp
+++ b/arts/gui/kde/kvolumefader_impl.cpp
@@ -120,8 +120,8 @@ KVolumeFader_Widget::KVolumeFader_Widget( TQWidget* p, const char* n )
   , _inupdate( false )
   , _value( -1 )
   , _dir( Arts::BottomToTop )
-  , _menu( new KPopupMenu( this ) )
-  , _aExactValue( new KAction( i18n( "Set Exact Value..." ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( exactValue() ), TQT_TQOBJECT(this) ) )
+  , _menu( new TDEPopupMenu( this ) )
+  , _aExactValue( new TDEAction( i18n( "Set Exact Value..." ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( exactValue() ), TQT_TQOBJECT(this) ) )
 {
 	//kdDebug() << k_funcinfo << endl;
 	setMinimumSize( 10,10 );
diff --git a/arts/gui/kde/kvolumefader_impl.h b/arts/gui/kde/kvolumefader_impl.h
index 6ff5d7e1..cbf4b5b3 100644
--- a/arts/gui/kde/kvolumefader_impl.h
+++ b/arts/gui/kde/kvolumefader_impl.h
@@ -64,8 +64,8 @@ private:
 	int ignoreUpdates;
 };
 
-class KPopupMenu;
-class KAction;
+class TDEPopupMenu;
+class TDEAction;
 
 class KVolumeFader_Widget : public TQFrame {
    Q_OBJECT
@@ -75,8 +75,8 @@ private:
 	bool _inupdate;
 	float _value;
 	Arts::Direction _dir;
-	KPopupMenu *_menu;
-	KAction *_aExactValue;
+	TDEPopupMenu *_menu;
+	TDEAction *_aExactValue;
 	TQColor interpolate( TQColor, TQColor, float );
 public:
 	KVolumeFader_Widget( TQWidget* =0, const char* =0 );