diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:13:25 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:13:25 -0600 |
commit | 940c092f32d40263ad6b24f948eaf4c48b01e99a (patch) | |
tree | f5235b5c44e8aaedd3484a00551e29993d548590 /arts | |
parent | ced2058eaf8e5af831ebc02812a18937ff7e1de3 (diff) | |
download | tdemultimedia-940c092f32d40263ad6b24f948eaf4c48b01e99a.tar.gz tdemultimedia-940c092f32d40263ad6b24f948eaf4c48b01e99a.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'arts')
-rw-r--r-- | arts/builder/main.cpp | 38 | ||||
-rw-r--r-- | arts/builder/main.h | 4 | ||||
-rw-r--r-- | arts/builder/menumaker.cpp | 20 | ||||
-rw-r--r-- | arts/builder/menumaker.h | 12 | ||||
-rw-r--r-- | arts/gui/kde/dbtest.cpp | 2 | ||||
-rw-r--r-- | arts/gui/kde/kpopupbox_impl.cpp | 40 | ||||
-rw-r--r-- | arts/gui/kde/kpopupbox_impl.h | 16 | ||||
-rw-r--r-- | arts/gui/kde/kpopupbox_private.h | 14 | ||||
-rw-r--r-- | arts/gui/kde/kvolumefader_impl.cpp | 4 | ||||
-rw-r--r-- | arts/gui/kde/kvolumefader_impl.h | 8 | ||||
-rw-r--r-- | arts/tools/artsactions.cpp | 64 | ||||
-rw-r--r-- | arts/tools/artsactions.h | 52 | ||||
-rw-r--r-- | arts/tools/artscontrolapplet_private.h | 10 | ||||
-rw-r--r-- | arts/tools/audiomanager.cpp | 2 | ||||
-rw-r--r-- | arts/tools/audiomanager.h | 4 | ||||
-rw-r--r-- | arts/tools/environmentview.cpp | 2 | ||||
-rw-r--r-- | arts/tools/environmentview.h | 4 | ||||
-rw-r--r-- | arts/tools/fftscopeview.cpp | 4 | ||||
-rw-r--r-- | arts/tools/fftscopeview.h | 12 | ||||
-rw-r--r-- | arts/tools/main.cpp | 6 | ||||
-rw-r--r-- | arts/tools/main.h | 4 | ||||
-rw-r--r-- | arts/tools/mediatypesview.cpp | 2 | ||||
-rw-r--r-- | arts/tools/midimanagerview.cpp | 4 | ||||
-rw-r--r-- | arts/tools/midimanagerview.h | 2 |
24 files changed, 165 insertions, 165 deletions
diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp index 87783267..f33d360a 100644 --- a/arts/builder/main.cpp +++ b/arts/builder/main.cpp @@ -189,7 +189,7 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name) mbroker_updateCount = 0; arts_debug("PORT: menumaker"); - menumaker = new MenuMaker(new KActionMenu(i18n("Modules"), actionCollection(), "modulesmenu")); + menumaker = new MenuMaker(new TDEActionMenu(i18n("Modules"), actionCollection(), "modulesmenu")); //menumaker->addCategory("&Gui", "Gui_"); menumaker->addCategory(i18n("&Synthesis"), "Arts::Synth_"); menumaker->addCategory(i18n("&Synthesis/&Arithmetic + Mixing"), "Arts::Synth_ADD$"); @@ -294,53 +294,53 @@ void ArtsBuilderWindow::setupActions() // File menu KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); - (void)new KAction(i18n("Open Session..."), 0, TQT_TQOBJECT(this), TQT_SLOT(openSession()), + (void)new TDEAction(i18n("Open Session..."), 0, TQT_TQOBJECT(this), TQT_SLOT(openSession()), actionCollection(), "file_open_session"); KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection()); - (void)new KAction(i18n("Open E&xample..."), TQt::CTRL + TQt::Key_X, TQT_TQOBJECT(this), TQT_SLOT(openExample()), + (void)new TDEAction(i18n("Open E&xample..."), TQt::CTRL + TQt::Key_X, TQT_TQOBJECT(this), TQT_SLOT(openExample()), actionCollection(), "file_open_example"); KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection()); - (void)new KAction(i18n("&Retrieve From Server..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(retrieve()), + (void)new TDEAction(i18n("&Retrieve From Server..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(retrieve()), actionCollection(), "file_retrieve_from_server"); - (void)new KAction(i18n("&Execute Structure"), "artsbuilderexecute", TQt::CTRL + TQt::Key_E, TQT_TQOBJECT(this), TQT_SLOT(execute()), + (void)new TDEAction(i18n("&Execute Structure"), "artsbuilderexecute", TQt::CTRL + TQt::Key_E, TQT_TQOBJECT(this), TQT_SLOT(execute()), actionCollection(), "file_execute_structure"); - (void)new KAction(i18n("&Rename Structure..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(rename()), + (void)new TDEAction(i18n("&Rename Structure..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(rename()), actionCollection(), "file_rename_structure"); - (void)new KAction(i18n("&Publish Structure"), TQt::CTRL + TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT(publish()), + (void)new TDEAction(i18n("&Publish Structure"), TQt::CTRL + TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT(publish()), actionCollection(), "file_publish_structure"); KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); // Edit menu - (void)new KAction(i18n("&Delete"), TQt::Key_Delete, TQT_TQOBJECT(modulewidget), TQT_SLOT(delModule()), + (void)new TDEAction(i18n("&Delete"), TQt::Key_Delete, TQT_TQOBJECT(modulewidget), TQT_SLOT(delModule()), actionCollection(), "edit_delete"); KStdAction::selectAll(TQT_TQOBJECT(modulewidget), TQT_SLOT(selectAll()), actionCollection()); // View menu - viewPropertiesAction= new KToggleAction(i18n("&Property Panel"), 0, + viewPropertiesAction= new TDEToggleAction(i18n("&Property Panel"), 0, TQT_TQOBJECT(propertyDock), TQT_SLOT(changeHideShowState()), actionCollection(), "view_properties"); - (void)new KAction(i18n("200%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt200()), + (void)new TDEAction(i18n("200%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt200()), actionCollection(), "view_200"); - (void)new KAction(i18n("150%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt150()), + (void)new TDEAction(i18n("150%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt150()), actionCollection(), "view_150"); - (void)new KAction(i18n("100%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt100()), + (void)new TDEAction(i18n("100%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt100()), actionCollection(), "view_100"); - (void)new KAction(i18n("50%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt50()), + (void)new TDEAction(i18n("50%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt50()), actionCollection(), "view_50"); // Ports menu - (void)new KAction(i18n("Create IN Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioSignal()), + (void)new TDEAction(i18n("Create IN Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioSignal()), actionCollection(), "ports_create_in_audio_signal"); - (void)new KAction(i18n("Create OUT Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createOutAudioSignal()), + (void)new TDEAction(i18n("Create OUT Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createOutAudioSignal()), actionCollection(), "ports_create_out_audio_signal"); - (void)new KAction(i18n("Create IN String Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInStringProperty()), + (void)new TDEAction(i18n("Create IN String Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInStringProperty()), actionCollection(), "ports_create_in_string_property"); - (void)new KAction(i18n("Create IN Audio Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioProperty()), + (void)new TDEAction(i18n("Create IN Audio Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioProperty()), actionCollection(), "ports_create_in_audio_property"); - (void)new KAction(i18n("Implement Interface..."), 0, TQT_TQOBJECT(this), TQT_SLOT(addInterface()), + (void)new TDEAction(i18n("Implement Interface..."), 0, TQT_TQOBJECT(this), TQT_SLOT(addInterface()), actionCollection(), "ports_implement_interface"); - (void)new KAction(i18n("Change Positions/Names..."), 0, TQT_TQOBJECT(this), TQT_SLOT(changePortPositions()), + (void)new TDEAction(i18n("Change Positions/Names..."), 0, TQT_TQOBJECT(this), TQT_SLOT(changePortPositions()), actionCollection(), "ports_change_positions"); } diff --git a/arts/builder/main.h b/arts/builder/main.h index 5098ff60..dd8c1c51 100644 --- a/arts/builder/main.h +++ b/arts/builder/main.h @@ -35,7 +35,7 @@ class PropertyPanel; class Structure; class MenuMaker; class ExecDlg; -class KToggleAction; +class TDEToggleAction; class ArtsBuilderWindow: public KDockMainWindow { @@ -48,7 +48,7 @@ protected: KDockWidget* propertyDock; PropertyPanel *propertyPanel; - KToggleAction *viewPropertiesAction; + TDEToggleAction *viewPropertiesAction; MenuMaker *menumaker; diff --git a/arts/builder/menumaker.cpp b/arts/builder/menumaker.cpp index 2aed8401..8045091b 100644 --- a/arts/builder/menumaker.cpp +++ b/arts/builder/menumaker.cpp @@ -5,10 +5,10 @@ using namespace std; -MenuEntry::MenuEntry(MenuMaker *menumaker, KActionMenu *parent, const char *text) +MenuEntry::MenuEntry(MenuMaker *menumaker, TDEActionMenu *parent, const char *text) : menumaker(menumaker), text(text) { - action = new KAction(TQString::fromLocal8Bit(text)); + action = new TDEAction(TQString::fromLocal8Bit(text)); parent->insert(action); connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(activated())); } @@ -18,7 +18,7 @@ void MenuEntry::activated() menumaker->menuActivated(text); } -MenuCategory::MenuCategory(const TQString& name, const char *prefix, KActionMenu *menu) +MenuCategory::MenuCategory(const TQString& name, const char *prefix, TDEActionMenu *menu) { _menu = menu; _name = name; @@ -60,12 +60,12 @@ bool MenuCategory::matches(const char *item) return false; } -KActionMenu *MenuCategory::menu() +TDEActionMenu *MenuCategory::menu() { return _menu; } -MenuMaker::MenuMaker(KActionMenu *root) +MenuMaker::MenuMaker(TDEActionMenu *root) { categories.push_back(new MenuCategory("","",root)); } @@ -90,7 +90,7 @@ void MenuMaker::addCategory(const TQString& name, const char *prefix) pc = lookupCategoryByName(basename(name)); if(pc) { - KActionMenu *newMenu = new KActionMenu(catname(name)); + TDEActionMenu *newMenu = new TDEActionMenu(catname(name)); pc->menu()->insert(newMenu); /* 000 */ /*connect(newMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(menuactivated(int))); @@ -134,14 +134,14 @@ void MenuMaker::addItem(const char *name, int index) if((*i)->catchall()) mc = (*i); } //mc->menu()->insertItem(name,index); 000 - //mc->menu()->insert(new KAction(name)); // index?? + //mc->menu()->insert(new TDEAction(name)); // index?? new MenuEntry(this, mc->menu(), name); /* - KAction *action = new KAction(TQString(name)); + TDEAction *action = new TDEAction(TQString(name)); mc->menu()->insert(action); */ //action->plug(mc->menu()); - //mc->menu()->insert(new KAction(name)); // index?? + //mc->menu()->insert(new TDEAction(name)); // index?? } TQString MenuMaker::basename(const TQString& name) @@ -172,7 +172,7 @@ void MenuMaker::clear() for(i=categories.begin();i != categories.end();++i) { /* 000 - KActionMenu *m = (*i)->menu(); + TDEActionMenu *m = (*i)->menu(); unsigned int k; k = 0; diff --git a/arts/builder/menumaker.h b/arts/builder/menumaker.h index 3cf32304..f1368d73 100644 --- a/arts/builder/menumaker.h +++ b/arts/builder/menumaker.h @@ -15,11 +15,11 @@ class MenuEntry : public TQObject protected: MenuMaker *menumaker; - KAction *action; + TDEAction *action; TQCString text; public: - MenuEntry(MenuMaker *menumaker, KActionMenu *parent, const char *text); + MenuEntry(MenuMaker *menumaker, TDEActionMenu *parent, const char *text); public slots: void activated(); @@ -28,17 +28,17 @@ public slots: class MenuCategory { protected: - KActionMenu *_menu; + TDEActionMenu *_menu; TQString _name; std::list<std::string> prefixList; bool _catchall; public: - MenuCategory(const TQString& name, const char *prefix, KActionMenu *menu); + MenuCategory(const TQString& name, const char *prefix, TDEActionMenu *menu); void addPrefix(const char *prefix); TQString name(); - KActionMenu *menu(); + TDEActionMenu *menu(); bool catchall(); bool matches(const char *item); @@ -53,7 +53,7 @@ class MenuMaker :public TQObject public: enum { CAT_MAGIC_ID = 10000 }; - MenuMaker(KActionMenu *root); + MenuMaker(TDEActionMenu *root); void addCategory(const TQString& name, const char *prefix); MenuCategory *lookupCategoryByName(const TQString& name); 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 ); diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp index 2a85fc45..4dd331b8 100644 --- a/arts/tools/artsactions.cpp +++ b/arts/tools/artsactions.cpp @@ -36,7 +36,7 @@ #include "environmentview.h" #include "mediatypesview.h" -ArtsActions::ArtsActions( KArtsServer* server, KActionCollection* col, TQWidget* parent, const char* name ) +ArtsActions::ArtsActions( KArtsServer* server, TDEActionCollection* col, TQWidget* parent, const char* name ) : TQObject( parent,name ) , _kartsserver( server ) , _actioncollection( col ) @@ -61,59 +61,59 @@ ArtsActions::~ArtsActions() { if ( _mtv ) viewMediaTypesView(); } -KAction* ArtsActions::actionScopeView() { - if ( !_a_sv ) _a_sv = new KAction( i18n( "&FFT Scope" ), "artsfftscope", KShortcut(), this, TQT_SLOT( viewScopeView() ), _actioncollection, "artssupport_view_scopeview" ); +TDEAction* ArtsActions::actionScopeView() { + if ( !_a_sv ) _a_sv = new TDEAction( i18n( "&FFT Scope" ), "artsfftscope", TDEShortcut(), this, TQT_SLOT( viewScopeView() ), _actioncollection, "artssupport_view_scopeview" ); return _a_sv; } -KAction* ArtsActions::actionAudioManager() { - if ( !_a_am ) _a_am = new KAction( i18n( "&Audio Manager" ), "artsaudiomanager", KShortcut(), this, TQT_SLOT( viewAudioManager() ), _actioncollection, "artssupport_view_audiomanager" ); +TDEAction* ArtsActions::actionAudioManager() { + if ( !_a_am ) _a_am = new TDEAction( i18n( "&Audio Manager" ), "artsaudiomanager", TDEShortcut(), this, TQT_SLOT( viewAudioManager() ), _actioncollection, "artssupport_view_audiomanager" ); return _a_am; } -KAction* ArtsActions::actionArtsStatusView() { - if ( !_a_asv ) _a_asv = new KAction( i18n( "aRts &Status" ), "artscontrol", KShortcut(), this, TQT_SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" ); +TDEAction* ArtsActions::actionArtsStatusView() { + if ( !_a_asv ) _a_asv = new TDEAction( i18n( "aRts &Status" ), "artscontrol", TDEShortcut(), this, TQT_SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" ); return _a_asv; } -KAction* ArtsActions::actionMidiManagerView() { - if ( !_a_mmv ) _a_mmv = new KAction( i18n( "&MIDI Manager" ), "artsmidimanager", KShortcut(), this, TQT_SLOT( viewMidiManagerView() ), _actioncollection, "artssupport_view_midimanager" ); +TDEAction* ArtsActions::actionMidiManagerView() { + if ( !_a_mmv ) _a_mmv = new TDEAction( i18n( "&MIDI Manager" ), "artsmidimanager", TDEShortcut(), this, TQT_SLOT( viewMidiManagerView() ), _actioncollection, "artssupport_view_midimanager" ); return _a_mmv; } -KAction* ArtsActions::actionEnvironmentView() { - if ( !_a_ev ) _a_ev = new KAction( i18n( "&Environment" ), "artsenvironment", KShortcut(), this, TQT_SLOT( viewEnvironmentView() ), _actioncollection, "artssupport_view_environment" ); +TDEAction* ArtsActions::actionEnvironmentView() { + if ( !_a_ev ) _a_ev = new TDEAction( i18n( "&Environment" ), "artsenvironment", TDEShortcut(), this, TQT_SLOT( viewEnvironmentView() ), _actioncollection, "artssupport_view_environment" ); return _a_ev; } -KAction* ArtsActions::actionMediaTypesView() { - if ( !_a_mtv ) _a_mtv = new KAction( i18n( "Available Media &Types" ), "artsmediatypes", KShortcut(), this, TQT_SLOT( viewMediaTypesView() ), _actioncollection, "artssupport_view_mediatypes" ); +TDEAction* ArtsActions::actionMediaTypesView() { + if ( !_a_mtv ) _a_mtv = new TDEAction( i18n( "Available Media &Types" ), "artsmediatypes", TDEShortcut(), this, TQT_SLOT( viewMediaTypesView() ), _actioncollection, "artssupport_view_mediatypes" ); return _a_mtv; } -KAction* ArtsActions::actionStyleNormal() { - if ( !_a_style_normal ) _a_style_normal = new KAction( i18n( "Style: NormalBars" ), "", KShortcut(), this, TQT_SLOT( _p_style_normal() ), _actioncollection, "artssupport_style_normal" ); +TDEAction* ArtsActions::actionStyleNormal() { + if ( !_a_style_normal ) _a_style_normal = new TDEAction( i18n( "Style: NormalBars" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_normal() ), _actioncollection, "artssupport_style_normal" ); return _a_style_normal; } -KAction* ArtsActions::actionStyleFire() { - if ( !_a_style_fire ) _a_style_fire = new KAction( i18n( "Style: FireBars" ), "", KShortcut(), this, TQT_SLOT( _p_style_fire() ), _actioncollection, "artssupport_style_fire" ); +TDEAction* ArtsActions::actionStyleFire() { + if ( !_a_style_fire ) _a_style_fire = new TDEAction( i18n( "Style: FireBars" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_fire() ), _actioncollection, "artssupport_style_fire" ); return _a_style_fire; } -KAction* ArtsActions::actionStyleLine() { - if ( !_a_style_line ) _a_style_line = new KAction( i18n( "Style: LineBars" ), "", KShortcut(), this, TQT_SLOT( _p_style_line() ), _actioncollection, "artssupport_style_line" ); +TDEAction* ArtsActions::actionStyleLine() { + if ( !_a_style_line ) _a_style_line = new TDEAction( i18n( "Style: LineBars" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_line() ), _actioncollection, "artssupport_style_line" ); return _a_style_line; } -KAction* ArtsActions::actionStyleLED() { - if ( !_a_style_led ) _a_style_led = new KAction( i18n( "Style: LEDs" ), "", KShortcut(), this, TQT_SLOT( _p_style_led() ), _actioncollection, "artssupport_style_led" ); +TDEAction* ArtsActions::actionStyleLED() { + if ( !_a_style_led ) _a_style_led = new TDEAction( i18n( "Style: LEDs" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_led() ), _actioncollection, "artssupport_style_led" ); return _a_style_led; } -KAction* ArtsActions::actionStyleAnalog() { - if ( !_a_style_analog ) _a_style_analog = new KAction( i18n( "Style: Analog" ), "", KShortcut(), this, TQT_SLOT( _p_style_analog() ), _actioncollection, "artssupport_style_analog" ); +TDEAction* ArtsActions::actionStyleAnalog() { + if ( !_a_style_analog ) _a_style_analog = new TDEAction( i18n( "Style: Analog" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_analog() ), _actioncollection, "artssupport_style_analog" ); return _a_style_analog; } -KAction* ArtsActions::actionStyleSmall() { - if ( !_a_style_small ) _a_style_small = new KAction( i18n( "Style: Small" ), "", KShortcut(), this, TQT_SLOT( _p_style_small() ), _actioncollection, "artssupport_style_small" ); +TDEAction* ArtsActions::actionStyleSmall() { + if ( !_a_style_small ) _a_style_small = new TDEAction( i18n( "Style: Small" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_small() ), _actioncollection, "artssupport_style_small" ); return _a_style_small; } -KPopupMenu* ArtsActions::stylemenu() { +TDEPopupMenu* ArtsActions::stylemenu() { if ( !_stylemenu ) { - _stylemenu = new KPopupMenu(); - KAction *tmp; + _stylemenu = new TDEPopupMenu(); + TDEAction *tmp; tmp = actionStyleNormal(); tmp->plug( _stylemenu ); tmp = actionStyleFire(); tmp->plug( _stylemenu ); tmp = actionStyleLine(); tmp->plug( _stylemenu ); @@ -124,12 +124,12 @@ KPopupMenu* ArtsActions::stylemenu() { return _stylemenu; } -KAction* ArtsActions::actionMoreBars( const TQObject* receiver, const char* slot, KActionCollection *actioncollection ) { - static KAction *_a_morebars = new KAction( i18n( "More Bars in VU-Meters" ), "up", KShortcut(), receiver, slot, actioncollection, "artssupport_morebars" ); +TDEAction* ArtsActions::actionMoreBars( const TQObject* receiver, const char* slot, TDEActionCollection *actioncollection ) { + static TDEAction *_a_morebars = new TDEAction( i18n( "More Bars in VU-Meters" ), "up", TDEShortcut(), receiver, slot, actioncollection, "artssupport_morebars" ); return _a_morebars; } -KAction* ArtsActions::actionLessBars( const TQObject* receiver, const char* slot, KActionCollection *actioncollection ) { - static KAction *_a_lessbars = new KAction( i18n( "Less Bars in VU-Meters" ), "down", KShortcut(), receiver, slot, actioncollection, "artssupport_lessbars" ); +TDEAction* ArtsActions::actionLessBars( const TQObject* receiver, const char* slot, TDEActionCollection *actioncollection ) { + static TDEAction *_a_lessbars = new TDEAction( i18n( "Less Bars in VU-Meters" ), "down", TDEShortcut(), receiver, slot, actioncollection, "artssupport_lessbars" ); return _a_lessbars; } diff --git a/arts/tools/artsactions.h b/arts/tools/artsactions.h index ea290f8c..b3005aa6 100644 --- a/arts/tools/artsactions.h +++ b/arts/tools/artsactions.h @@ -24,9 +24,9 @@ #include <tqwidget.h> #include <tdelibs_export.h> class KArtsServer; -class KAction; -class KActionCollection; -class KPopupMenu; +class TDEAction; +class TDEActionCollection; +class TDEPopupMenu; class FFTScopeView; class Gui_AUDIO_MANAGER; class ArtsStatusView; @@ -42,42 +42,42 @@ public: /** Constructs a ArtsActions-object. - Use the KActions you get from it to obtain a unique Style for all menus. + Use the TDEActions you get from it to obtain a unique Style for all menus. It also provides an easy way to have FFT-ScopeView, Audiomanager and other things available. @param artsserver a pointer to a existing KArtsServer. If 0 a new is created. - @param actioncollection the KActionCollection all the actions should belong to. Names of the actions are then: artssupport_* + @param actioncollection the TDEActionCollection all the actions should belong to. Names of the actions are then: artssupport_* @param qwidget the parent TQWidget @param name the name of the object */ - ArtsActions( KArtsServer* artsserver, KActionCollection* actioncollection, TQWidget* qwidget, const char* name=0 ); + ArtsActions( KArtsServer* artsserver, TDEActionCollection* actioncollection, TQWidget* qwidget, const char* name=0 ); /** Destructor */ ~ArtsActions(); /** Returns an Action for showing the ScopeView. Unless otherwise connected it also toggles a ScopeView. */ - KAction* actionScopeView(); + TDEAction* actionScopeView(); /** Returns an Action for showing the Audiomanager. Unless otherwise connected it also toggles a Audiomanager. */ - KAction* actionAudioManager(); + TDEAction* actionAudioManager(); /** Returns an Action for showing the StatusView. Unless otherwise connected it also toggles a StatusView. */ - KAction* actionArtsStatusView(); + TDEAction* actionArtsStatusView(); /** Returns an Action for showing the MidiManager. Unless otherwise connected it also toggles a MidiManager. */ - KAction* actionMidiManagerView(); + TDEAction* actionMidiManagerView(); /** Returns an Action for showing the EnvironmentView. Unless otherwise connected it also toggles a EnvironmentView. */ - KAction* actionEnvironmentView(); + TDEAction* actionEnvironmentView(); /** Returns an Action for showing the MediaTypesView. Unless otherwise connected it also toggles a MediaTypesView. */ - KAction* actionMediaTypesView(); + TDEAction* actionMediaTypesView(); - KAction* actionStyleNormal(); - KAction* actionStyleFire(); - KAction* actionStyleLine(); - KAction* actionStyleLED(); - KAction* actionStyleAnalog(); - KAction* actionStyleSmall(); - KPopupMenu* stylemenu(); + TDEAction* actionStyleNormal(); + TDEAction* actionStyleFire(); + TDEAction* actionStyleLine(); + TDEAction* actionStyleLED(); + TDEAction* actionStyleAnalog(); + TDEAction* actionStyleSmall(); + TDEPopupMenu* stylemenu(); - static KAction* actionMoreBars( const TQObject*, const char*, KActionCollection* ); - static KAction* actionLessBars( const TQObject*, const char*, KActionCollection* ); + static TDEAction* actionMoreBars( const TQObject*, const char*, TDEActionCollection* ); + static TDEAction* actionLessBars( const TQObject*, const char*, TDEActionCollection* ); public slots: void viewScopeView(); @@ -102,11 +102,11 @@ signals: void styleSmall(); private: KArtsServer* _kartsserver; - KActionCollection* _actioncollection; - KAction *_a_sv, *_a_am, *_a_asv, *_a_mmv, *_a_ev, *_a_mtv; - //KAction *_a_morebars, *_a_lessbars; - KAction *_a_style_normal, *_a_style_fire, *_a_style_line, *_a_style_led, *_a_style_analog, *_a_style_small; - KPopupMenu* _stylemenu; + TDEActionCollection* _actioncollection; + TDEAction *_a_sv, *_a_am, *_a_asv, *_a_mmv, *_a_ev, *_a_mtv; + //TDEAction *_a_morebars, *_a_lessbars; + TDEAction *_a_style_normal, *_a_style_fire, *_a_style_line, *_a_style_led, *_a_style_analog, *_a_style_small; + TDEPopupMenu* _stylemenu; FFTScopeView *_sv; Gui_AUDIO_MANAGER *_am; ArtsStatusView *_asv; diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h index b602d8f4..08959f16 100644 --- a/arts/tools/artscontrolapplet_private.h +++ b/arts/tools/artscontrolapplet_private.h @@ -62,9 +62,9 @@ public: KArtsWidget *vuw; Arts::StereoVolumeControlGui vu; - KPopupMenu *menu; - KAction *_showSV, *_showSVinline, *_showAM, *_showArtsStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars; - KAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall; + TDEPopupMenu *menu; + TDEAction *_showSV, *_showSVinline, *_showAM, *_showArtsStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars; + TDEAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall; ArtsControlAppletPrivate( ArtsControlApplet *parent ) : TQObject(parent) @@ -80,10 +80,10 @@ public: _artsactions = new ArtsActions( arts, 0, parent ); - menu = new KPopupMenu( 0 ); + menu = new TDEPopupMenu( 0 ); _showSV = _artsactions->actionScopeView(); _showSV->plug( menu ); - _showSVinline = new KAction( i18n( "Toggle &Inline FFT Scope" ), "artscontrol", KShortcut(), this, TQT_SLOT( SVinline() ), this ); + _showSVinline = new TDEAction( i18n( "Toggle &Inline FFT Scope" ), "artscontrol", TDEShortcut(), this, TQT_SLOT( SVinline() ), this ); _showSVinline->plug( menu ); _showAM = _artsactions->actionAudioManager(); _showAM->plug( menu ); diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp index eff4f6f9..25acaf5a 100644 --- a/arts/tools/audiomanager.cpp +++ b/arts/tools/audiomanager.cpp @@ -95,7 +95,7 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/) // list - listview = new KListView(parent); + listview = new TDEListView(parent); listview->addColumn(i18n("Title"),175); listview->addColumn(i18n("Type"),50); diff --git a/arts/tools/audiomanager.h b/arts/tools/audiomanager.h index fea2ae53..d787cf37 100644 --- a/arts/tools/audiomanager.h +++ b/arts/tools/audiomanager.h @@ -30,7 +30,7 @@ #include "templateview.h" -class KListView; +class TDEListView; class GuiAudioManagerProxy; class TQBoxLayout; @@ -40,7 +40,7 @@ class Gui_AUDIO_MANAGER : public Template_ArtsView protected: TQWidget *ParentWidget; - KListView *listview; + TDEListView *listview; GuiAudioManagerProxy *proxy; Arts::AudioManager AudioManager; diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp index 9cedfed1..d8c21224 100644 --- a/arts/tools/environmentview.cpp +++ b/arts/tools/environmentview.cpp @@ -69,7 +69,7 @@ EnvironmentView::EnvironmentView( Container container, TQWidget* parent, const c _layout->setAutoAdd( true ); defaultEnvFileName = DEFAULT_ENV_FILENAME; defaultEnvFileName.replace('~', TQDir::homeDirPath()); - listBox = new KListBox(this); + listBox = new TDEListBox(this); update(); connect(listBox,TQT_SIGNAL(executed(TQListBoxItem*)), this,TQT_SLOT(view(TQListBoxItem*))); diff --git a/arts/tools/environmentview.h b/arts/tools/environmentview.h index 8ef82184..792ae2f8 100644 --- a/arts/tools/environmentview.h +++ b/arts/tools/environmentview.h @@ -29,14 +29,14 @@ #include "templateview.h" class TQListBoxItem; -class KListBox; +class TDEListBox; class EnvironmentView : public Template_ArtsView { Q_OBJECT protected: Arts::Environment::Container container; - KListBox *listBox; + TDEListBox *listBox; TQString defaultEnvFileName; public: diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp index ab15dc59..9eb1c019 100644 --- a/arts/tools/fftscopeview.cpp +++ b/arts/tools/fftscopeview.cpp @@ -82,9 +82,9 @@ kdDebug()<<k_funcinfo<<endl; _artsactions = new ArtsActions( 0, 0, this ); _moreBars = ArtsActions::actionMoreBars( TQT_TQOBJECT(this), TQT_SLOT( moreBars() ), 0 ); _lessBars = ArtsActions::actionLessBars( TQT_TQOBJECT(this), TQT_SLOT( lessBars() ), 0 ); - _menu = new KPopupMenu( 0 ); + _menu = new TDEPopupMenu( 0 ); _moreBars->plug( _menu ); _lessBars->plug( _menu ); - _substyle = new KAction( i18n( "Substyle" ), "", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( substyle() ), TQT_TQOBJECT(this) ); + _substyle = new TDEAction( i18n( "Substyle" ), "", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( substyle() ), TQT_TQOBJECT(this) ); _substyle->plug( _menu ); _menu->insertItem( i18n("VU-Style"), _artsactions->stylemenu() ); diff --git a/arts/tools/fftscopeview.h b/arts/tools/fftscopeview.h index b5662297..723f14a4 100644 --- a/arts/tools/fftscopeview.h +++ b/arts/tools/fftscopeview.h @@ -33,8 +33,8 @@ #include <tdelibs_export.h> class TQTimer; -class KPopupMenu; -class KAction; +class TDEPopupMenu; +class TDEAction; class KArtsWidget; class ArtsActions; @@ -53,10 +53,10 @@ protected: TQTimer *updatetimer; ArtsActions* _artsactions; - KPopupMenu *_menu, *_stylemenu; - KAction *_moreBars, *_lessBars; - KAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall; - KAction *_substyle; + TDEPopupMenu *_menu, *_stylemenu; + TDEAction *_moreBars, *_lessBars; + TDEAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall; + TDEAction *_substyle; void mousePressEvent( TQMouseEvent* ); public: diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp index 0037be6e..4f508d98 100644 --- a/arts/tools/main.cpp +++ b/arts/tools/main.cpp @@ -158,7 +158,7 @@ void MainWindow::toggleVolumeBar() { vc->useOldVolumeBar(showOldVolumeDisplay->isChecked()); } -MainWindow::MainWindow() : KMainWindow(0), kartsserver( new KArtsServer( TQT_TQOBJECT(this) ) ) { +MainWindow::MainWindow() : TDEMainWindow(0), kartsserver( new KArtsServer( TQT_TQOBJECT(this) ) ) { kdDebug() << k_funcinfo << endl; connect( kartsserver, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( serverRestarted() ) ); @@ -172,9 +172,9 @@ kdDebug() << k_funcinfo << endl; ( void ) artsactions->actionMidiManagerView(); ( void ) artsactions->actionEnvironmentView(); ( void ) artsactions->actionMediaTypesView(); - ( void ) new KAction( i18n("Toggle Free&Verb"), 0, TQT_TQOBJECT(vc), TQT_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" ); + ( void ) new TDEAction( i18n("Toggle Free&Verb"), 0, TQT_TQOBJECT(vc), TQT_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" ); showOldVolumeDisplay= - new KToggleAction( i18n( "Old aRts-Control-Style for VU-Meter" /*"&LED-Style Volume Display"*/ ), 0, TQT_TQOBJECT(this), + new TDEToggleAction( i18n( "Old aRts-Control-Style for VU-Meter" /*"&LED-Style Volume Display"*/ ), 0, TQT_TQOBJECT(this), TQT_SLOT( toggleVolumeBar() ), actionCollection(), "old_volume_display" ); ( void ) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit_artscontrol" ); diff --git a/arts/tools/main.h b/arts/tools/main.h index 5019e535..a92c4061 100644 --- a/arts/tools/main.h +++ b/arts/tools/main.h @@ -91,12 +91,12 @@ private slots: #include "artsactions.h" -class MainWindow : public KMainWindow { +class MainWindow : public TDEMainWindow { Q_OBJECT protected: VControl *vc; - KToggleAction *showOldVolumeDisplay; + TDEToggleAction *showOldVolumeDisplay; ArtsActions* artsactions; KArtsServer *kartsserver; diff --git a/arts/tools/mediatypesview.cpp b/arts/tools/mediatypesview.cpp index 9353cda6..683e8152 100644 --- a/arts/tools/mediatypesview.cpp +++ b/arts/tools/mediatypesview.cpp @@ -40,7 +40,7 @@ MediaTypesView::MediaTypesView( TQWidget* parent, const char* name ) : Template_ TQBoxLayout *l= new TQHBoxLayout(this); l->setAutoAdd(true); - KListView *listView = new KListView(this); + TDEListView *listView = new TDEListView(this); listView->addColumn(i18n("Media Type")); Arts::TraderQuery q; diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp index 270df3c6..ae729347 100644 --- a/arts/tools/midimanagerview.cpp +++ b/arts/tools/midimanagerview.cpp @@ -122,9 +122,9 @@ MidiManagerView::MidiManagerView() setCaption(i18n("MIDI Manager")); setIcon( MainBarIcon( "artsfftscope", 32 ) ); - (void)new KAction(i18n("&System MIDI Port (OSS)"), 0, TQT_TQOBJECT(this), TQT_SLOT(addOSSMidiPort()), + (void)new TDEAction(i18n("&System MIDI Port (OSS)"), 0, TQT_TQOBJECT(this), TQT_SLOT(addOSSMidiPort()), actionCollection(), "add_oss_midi_port"); - (void)new KAction(i18n("&aRts Synthesis MIDI Output"), 0, TQT_TQOBJECT(this), + (void)new TDEAction(i18n("&aRts Synthesis MIDI Output"), 0, TQT_TQOBJECT(this), TQT_SLOT(addArtsMidiOutput()), actionCollection(), "add_arts_midi_output"); (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); diff --git a/arts/tools/midimanagerview.h b/arts/tools/midimanagerview.h index 660c00c3..5b05936d 100644 --- a/arts/tools/midimanagerview.h +++ b/arts/tools/midimanagerview.h @@ -34,7 +34,7 @@ class ConnectionWidget; class MidiManagerItem; class MidiManagerWidget; -class MidiManagerView : public KMainWindow { +class MidiManagerView : public TDEMainWindow { Q_OBJECT protected: |