summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:13:25 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:13:25 -0600
commit940c092f32d40263ad6b24f948eaf4c48b01e99a (patch)
treef5235b5c44e8aaedd3484a00551e29993d548590
parentced2058eaf8e5af831ebc02812a18937ff7e1de3 (diff)
downloadtdemultimedia-940c092f32d40263ad6b24f948eaf4c48b01e99a.tar.gz
tdemultimedia-940c092f32d40263ad6b24f948eaf4c48b01e99a.zip
Rename a number of classes to enhance compatibility with KDE4
-rw-r--r--arts/builder/main.cpp38
-rw-r--r--arts/builder/main.h4
-rw-r--r--arts/builder/menumaker.cpp20
-rw-r--r--arts/builder/menumaker.h12
-rw-r--r--arts/gui/kde/dbtest.cpp2
-rw-r--r--arts/gui/kde/kpopupbox_impl.cpp40
-rw-r--r--arts/gui/kde/kpopupbox_impl.h16
-rw-r--r--arts/gui/kde/kpopupbox_private.h14
-rw-r--r--arts/gui/kde/kvolumefader_impl.cpp4
-rw-r--r--arts/gui/kde/kvolumefader_impl.h8
-rw-r--r--arts/tools/artsactions.cpp64
-rw-r--r--arts/tools/artsactions.h52
-rw-r--r--arts/tools/artscontrolapplet_private.h10
-rw-r--r--arts/tools/audiomanager.cpp2
-rw-r--r--arts/tools/audiomanager.h4
-rw-r--r--arts/tools/environmentview.cpp2
-rw-r--r--arts/tools/environmentview.h4
-rw-r--r--arts/tools/fftscopeview.cpp4
-rw-r--r--arts/tools/fftscopeview.h12
-rw-r--r--arts/tools/main.cpp6
-rw-r--r--arts/tools/main.h4
-rw-r--r--arts/tools/mediatypesview.cpp2
-rw-r--r--arts/tools/midimanagerview.cpp4
-rw-r--r--arts/tools/midimanagerview.h2
-rw-r--r--juk/actioncollection.cpp12
-rw-r--r--juk/actioncollection.h10
-rw-r--r--juk/cache.cpp6
-rw-r--r--juk/collectionlist.cpp6
-rw-r--r--juk/coverdialog.cpp12
-rw-r--r--juk/coverdialogbase.ui2
-rw-r--r--juk/deletedialog.h2
-rw-r--r--juk/deletedialogbase.ui2
-rw-r--r--juk/directorylist.cpp4
-rw-r--r--juk/directorylistbase.ui2
-rw-r--r--juk/filerenamer.cpp8
-rw-r--r--juk/juk.cpp80
-rw-r--r--juk/juk.h24
-rw-r--r--juk/k3bexporter.cpp16
-rw-r--r--juk/k3bexporter.h6
-rw-r--r--juk/keydialog.cpp36
-rw-r--r--juk/keydialog.h10
-rw-r--r--juk/musicbrainzquery.cpp2
-rw-r--r--juk/playermanager.cpp22
-rw-r--r--juk/playermanager.h4
-rw-r--r--juk/playlist.cpp60
-rw-r--r--juk/playlist.h20
-rw-r--r--juk/playlistbox.cpp32
-rw-r--r--juk/playlistbox.h16
-rw-r--r--juk/playlistcollection.cpp36
-rw-r--r--juk/playlistcollection.h6
-rw-r--r--juk/playlistexporter.h10
-rw-r--r--juk/playlistitem.cpp18
-rw-r--r--juk/playlistitem.h6
-rw-r--r--juk/playlistsplitter.cpp14
-rw-r--r--juk/playlistsplitter.h2
-rw-r--r--juk/searchwidget.cpp2
-rw-r--r--juk/searchwidget.h2
-rw-r--r--juk/slideraction.cpp20
-rw-r--r--juk/slideraction.h4
-rw-r--r--juk/systemtray.cpp8
-rw-r--r--juk/tageditor.cpp8
-rw-r--r--juk/tagguesserconfigdlg.cpp4
-rw-r--r--juk/tagguesserconfigdlgwidget.ui2
-rw-r--r--juk/trackpickerdialog.cpp6
-rw-r--r--juk/trackpickerdialogbase.ui2
-rw-r--r--juk/tracksequenceiterator.cpp14
-rw-r--r--juk/tracksequencemanager.h8
-rw-r--r--juk/viewmode.cpp2
-rw-r--r--juk/viewmode.h2
-rw-r--r--juk/webimagefetcher.cpp2
-rw-r--r--kaboodle/controls.cpp18
-rw-r--r--kaboodle/controls.h4
-rw-r--r--kaboodle/player.cpp8
-rw-r--r--kaboodle/player.h8
-rw-r--r--kaboodle/userinterface.cpp2
-rw-r--r--kaboodle/userinterface.h4
-rw-r--r--kaudiocreator/kaudiocreator.cpp22
-rw-r--r--kaudiocreator/kaudiocreator.h6
-rw-r--r--kaudiocreator/tracks.ui2
-rw-r--r--kaudiocreator/tracksimp.h6
-rw-r--r--kmix/KMixApp.cpp2
-rw-r--r--kmix/kmix.cpp20
-rw-r--r--kmix/kmix.h6
-rw-r--r--kmix/kmixdockwidget.cpp16
-rw-r--r--kmix/kmixdockwidget.h2
-rw-r--r--kmix/kmixerwidget.h10
-rw-r--r--kmix/mdwenum.cpp10
-rw-r--r--kmix/mdwenum.h6
-rw-r--r--kmix/mdwslider.cpp36
-rw-r--r--kmix/mdwslider.h6
-rw-r--r--kmix/mdwswitch.cpp10
-rw-r--r--kmix/mdwswitch.h6
-rw-r--r--kmix/mixdevicewidget.cpp4
-rw-r--r--kmix/mixdevicewidget.h8
-rw-r--r--kmix/viewapplet.cpp2
-rw-r--r--kmix/viewbase.cpp12
-rw-r--r--kmix/viewbase.h10
-rw-r--r--krec/krecfileviewhelpers.cpp8
-rw-r--r--krec/krecfileviewhelpers.h4
-rw-r--r--krec/krecfilewidgets.cpp10
-rw-r--r--krec/krecfilewidgets.h4
-rw-r--r--krec/krecord.cpp24
-rw-r--r--krec/krecord.h2
-rw-r--r--krec/krecord_private.h16
-rw-r--r--kscd/configWidgetUI.ui2
-rw-r--r--kscd/docking.cpp2
-rw-r--r--kscd/docking.h8
-rw-r--r--kscd/kscd.cpp28
-rw-r--r--kscd/kscd.h10
-rw-r--r--libkcddb/cdinfodialogbase.ui2
-rw-r--r--noatun/FILES2
-rw-r--r--noatun/library/app.cpp2
-rw-r--r--noatun/library/cmodule.h2
-rw-r--r--noatun/library/controls.cpp18
-rw-r--r--noatun/library/effectview.cpp2
-rw-r--r--noatun/library/effectview.h2
-rw-r--r--noatun/library/equalizerview.cpp8
-rw-r--r--noatun/library/equalizerview.h2
-rw-r--r--noatun/library/mimetypetree.cpp2
-rw-r--r--noatun/library/mimetypetree.h2
-rw-r--r--noatun/library/noatun/app.h8
-rw-r--r--noatun/library/noatun/controls.h4
-rw-r--r--noatun/library/noatun/stdaction.h62
-rw-r--r--noatun/library/noatun/stereobuttonaction.h2
-rw-r--r--noatun/library/noatunstdaction.cpp62
-rw-r--r--noatun/library/pluginmodule.cpp8
-rw-r--r--noatun/library/pluginmodule.h2
-rw-r--r--noatun/library/stereobuttonaction.cpp12
-rw-r--r--noatun/modules/excellent/userinterface.cpp8
-rw-r--r--noatun/modules/excellent/userinterface.h10
-rw-r--r--noatun/modules/htmlexport/htmlexport.cpp2
-rw-r--r--noatun/modules/htmlexport/htmlexport.h4
-rw-r--r--noatun/modules/infrared/irprefs.cpp2
-rw-r--r--noatun/modules/infrared/irprefs.h4
-rw-r--r--noatun/modules/kaiman/pref.cpp2
-rw-r--r--noatun/modules/kaiman/pref.h4
-rw-r--r--noatun/modules/kaiman/userinterface.cpp4
-rw-r--r--noatun/modules/kaiman/userinterface.h2
-rw-r--r--noatun/modules/kjofol-skin/kjbutton.cpp2
-rw-r--r--noatun/modules/kjofol-skin/kjguisettingswidget.ui2
-rw-r--r--noatun/modules/marquis/marquis.cpp6
-rw-r--r--noatun/modules/marquis/marquis.h2
-rw-r--r--noatun/modules/metatag/metatag.cpp2
-rw-r--r--noatun/modules/metatag/metatag.h4
-rw-r--r--noatun/modules/monoscope/monoscope.cpp2
-rw-r--r--noatun/modules/monoscope/monoscope.h4
-rw-r--r--noatun/modules/simple/userinterface.cpp4
-rw-r--r--noatun/modules/simple/userinterface.h6
-rw-r--r--noatun/modules/splitplaylist/view.cpp24
-rw-r--r--noatun/modules/splitplaylist/view.h14
-rw-r--r--noatun/modules/systray/kitsystemtray.cpp4
-rw-r--r--noatun/modules/systray/kitsystemtray.h8
-rw-r--r--noatun/modules/systray/systray.cpp2
-rw-r--r--noatun/modules/systray/systray.h2
-rw-r--r--tdemid/channelview.cpp2
-rw-r--r--tdemid/channelview.h2
-rw-r--r--tdemid/history.txt2
-rw-r--r--tdemid/tdemid_part.cpp8
-rw-r--r--tdemid/tdemidclient.cpp12
-rw-r--r--tdemid/tdemidclient.h4
-rw-r--r--tdemid/tdemidframe.cpp86
-rw-r--r--tdemid/tdemidframe.h8
162 files changed, 862 insertions, 862 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:
diff --git a/juk/actioncollection.cpp b/juk/actioncollection.cpp
index 6290d6ee..6ec753fd 100644
--- a/juk/actioncollection.cpp
+++ b/juk/actioncollection.cpp
@@ -20,19 +20,19 @@
namespace ActionCollection
{
- KActionCollection *actions()
+ TDEActionCollection *actions()
{
- static KActionCollection *a =
- new KActionCollection(static_cast<TQWidget *>(0), "JuK Action Collection");
+ static TDEActionCollection *a =
+ new TDEActionCollection(static_cast<TQWidget *>(0), "JuK Action Collection");
return a;
}
- KAction *action(const char *key)
+ TDEAction *action(const char *key)
{
#ifndef NO_DEBUG
- KAction *a = actions()->action(key);
+ TDEAction *a = actions()->action(key);
if(!a)
- kdWarning(65432) << "KAction \"" << key << "\" is not defined yet." << endl;
+ kdWarning(65432) << "TDEAction \"" << key << "\" is not defined yet." << endl;
return a;
#else
return actions()->action(key);
diff --git a/juk/actioncollection.h b/juk/actioncollection.h
index 22eddd54..930f12aa 100644
--- a/juk/actioncollection.h
+++ b/juk/actioncollection.h
@@ -16,25 +16,25 @@
#ifndef JUK_ACTIONCOLLECTION_H
#define JUK_ACTIONCOLLECTION_H
-class KActionCollection;
-class KAction;
+class TDEActionCollection;
+class TDEAction;
namespace ActionCollection
{
/**
* The global action collection for JuK.
*/
- KActionCollection *actions();
+ TDEActionCollection *actions();
/**
* Returns the action for the associated key from the global action
* collection.
*/
- KAction *action(const char *key);
+ TDEAction *action(const char *key);
/**
* Returns the action for the associated key but includes a cast to the
- * type \a T. i.e. KSelectAction *a = action<KSelectAction>("chooser");
+ * type \a T. i.e. TDESelectAction *a = action<TDESelectAction>("chooser");
*/
template <class T> T *action(const char *key)
{
diff --git a/juk/cache.cpp b/juk/cache.cpp
index bb7c2956..4bd917f8 100644
--- a/juk/cache.cpp
+++ b/juk/cache.cpp
@@ -144,7 +144,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static
}
case History:
{
- action<KToggleAction>("showHistory")->setChecked(true);
+ action<TDEToggleAction>("showHistory")->setChecked(true);
collection->setHistoryPlaylistEnabled(true);
s >> *collection->historyPlaylist();
playlist = collection->historyPlaylist();
@@ -155,7 +155,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static
/*
collection->setUpcomingPlaylistEnabled(true);
Playlist *p = collection->upcomingPlaylist();
- action<KToggleAction>("saveUpcomingTracks")->setChecked(true);
+ action<TDEToggleAction>("saveUpcomingTracks")->setChecked(true);
s >> *p;
playlist = p;
*/
@@ -225,7 +225,7 @@ void Cache::savePlaylists(const PlaylistList &playlists)
<< *static_cast<SearchPlaylist *>(*it);
}
else if(dynamic_cast<UpcomingPlaylist *>(*it)) {
- if(!action<KToggleAction>("saveUpcomingTracks")->isChecked())
+ if(!action<TDEToggleAction>("saveUpcomingTracks")->isChecked())
continue;
s << TQ_INT32(Upcoming)
<< *static_cast<UpcomingPlaylist *>(*it);
diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp
index 7b22542e..d55d80c1 100644
--- a/juk/collectionlist.cpp
+++ b/juk/collectionlist.cpp
@@ -228,13 +228,13 @@ CollectionList::CollectionList(PlaylistCollection *collection) :
m_itemsDict(5003),
m_columnTags(15, 0)
{
- new KAction(i18n("Show Playing"), KShortcut(), ActionCollection::actions(), "showPlaying");
+ new TDEAction(i18n("Show Playing"), TDEShortcut(), ActionCollection::actions(), "showPlaying");
connect(action("showPlaying"), TQT_SIGNAL(activated()), this, TQT_SLOT(slotShowPlaying()));
- connect(action<KToolBarPopupAction>("back")->popupMenu(), TQT_SIGNAL(aboutToShow()),
+ connect(action<TDEToolBarPopupAction>("back")->popupMenu(), TQT_SIGNAL(aboutToShow()),
this, TQT_SLOT(slotPopulateBackMenu()));
- connect(action<KToolBarPopupAction>("back")->popupMenu(), TQT_SIGNAL(activated(int)),
+ connect(action<TDEToolBarPopupAction>("back")->popupMenu(), TQT_SIGNAL(activated(int)),
this, TQT_SLOT(slotPlayFromBackMenu(int)));
setSorting(-1); // Temporarily disable sorting to add items faster.
diff --git a/juk/coverdialog.cpp b/juk/coverdialog.cpp
index 509f0695..8c2ae390 100644
--- a/juk/coverdialog.cpp
+++ b/juk/coverdialog.cpp
@@ -31,11 +31,11 @@
using CoverUtility::CoverIconViewItem;
-class AllArtistsListViewItem : public KListViewItem
+class AllArtistsListViewItem : public TDEListViewItem
{
public:
AllArtistsListViewItem(TQListView *parent) :
- KListViewItem(parent, i18n("<All Artists>"))
+ TDEListViewItem(parent, i18n("<All Artists>"))
{
}
@@ -45,11 +45,11 @@ public:
}
};
-class CaseInsensitiveItem : public KListViewItem
+class CaseInsensitiveItem : public TDEListViewItem
{
public:
CaseInsensitiveItem(TQListView *parent, const TQString &text) :
- KListViewItem(parent, text)
+ TDEListViewItem(parent, text)
{
}
@@ -135,13 +135,13 @@ void CoverDialog::slotArtistClicked(TQListViewItem *item)
void CoverDialog::slotContextRequested(TQIconViewItem *item, const TQPoint &pt)
{
- static KPopupMenu *menu = 0;
+ static TDEPopupMenu *menu = 0;
if(!item)
return;
if(!menu) {
- menu = new KPopupMenu(this);
+ menu = new TDEPopupMenu(this);
menu->insertItem(i18n("Remove Cover"), this, TQT_SLOT(removeSelectedCover()));
}
diff --git a/juk/coverdialogbase.ui b/juk/coverdialogbase.ui
index dbdcda9c..0cad4e4f 100644
--- a/juk/coverdialogbase.ui
+++ b/juk/coverdialogbase.ui
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Artist</string>
diff --git a/juk/deletedialog.h b/juk/deletedialog.h
index 0e51a385..61e6255f 100644
--- a/juk/deletedialog.h
+++ b/juk/deletedialog.h
@@ -22,7 +22,7 @@
#include "deletedialogbase.h"
class TQStringList;
-class KListBox;
+class TDEListBox;
class TQLabel;
class TQWidgetStack;
diff --git a/juk/deletedialogbase.ui b/juk/deletedialogbase.ui
index 2a7837af..c1fbc200 100644
--- a/juk/deletedialogbase.ui
+++ b/juk/deletedialogbase.ui
@@ -80,7 +80,7 @@
</widget>
</hbox>
</widget>
- <widget class="KListBox">
+ <widget class="TDEListBox">
<property name="name">
<cstring>ddFileList</cstring>
</property>
diff --git a/juk/directorylist.cpp b/juk/directorylist.cpp
index c368a6c3..8dfdc27e 100644
--- a/juk/directorylist.cpp
+++ b/juk/directorylist.cpp
@@ -46,7 +46,7 @@ DirectoryList::DirectoryList(const TQStringList &directories, bool importPlaylis
TQStringList::ConstIterator it = directories.begin();
for(; it != directories.end(); ++it)
- new KListViewItem(m_base->directoryListView, *it);
+ new TDEListViewItem(m_base->directoryListView, *it);
m_base->importPlaylistsCheckBox->setChecked(importPlaylists);
@@ -80,7 +80,7 @@ void DirectoryList::slotAddDirectory()
TQString dir = KFileDialog::getExistingDirectory();
if(!dir.isEmpty() && m_dirList.find(dir) == m_dirList.end()) {
m_dirList.append(dir);
- new KListViewItem(m_base->directoryListView, dir);
+ new TDEListViewItem(m_base->directoryListView, dir);
m_result.addedDirs.append(dir);
}
}
diff --git a/juk/directorylistbase.ui b/juk/directorylistbase.ui
index 02aae023..281aa6fd 100644
--- a/juk/directorylistbase.ui
+++ b/juk/directorylistbase.ui
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Folders</string>
diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp
index ca9bbce0..e9202f2e 100644
--- a/juk/filerenamer.cpp
+++ b/juk/filerenamer.cpp
@@ -73,7 +73,7 @@ public:
"Are you sure you want to continue?"), hbox);
hbox->setStretchFactor(l, 1);
- KListView *lv = new KListView(vbox);
+ TDEListView *lv = new TDEListView(vbox);
lv->addColumn(i18n("Original Name"));
lv->addColumn(i18n("New Name"));
@@ -82,9 +82,9 @@ public:
TQMap<TQString, TQString>::ConstIterator it = files.begin();
for(; it != files.end(); ++it) {
- KListViewItem *i = it.key() != it.data()
- ? new KListViewItem(lv, it.key(), it.data())
- : new KListViewItem(lv, it.key(), i18n("No Change"));
+ TDEListViewItem *i = it.key() != it.data()
+ ? new TDEListViewItem(lv, it.key(), it.data())
+ : new TDEListViewItem(lv, it.key(), i18n("No Change"));
lvHeight += i->height();
}
diff --git a/juk/juk.cpp b/juk/juk.cpp
index 69b65c0b..e4238416 100644
--- a/juk/juk.cpp
+++ b/juk/juk.cpp
@@ -44,7 +44,7 @@ using namespace ActionCollection;
////////////////////////////////////////////////////////////////////////////////
JuK::JuK(TQWidget *parent, const char *name) :
- KMainWindow(parent, name, WDestructiveClose),
+ TDEMainWindow(parent, name, WDestructiveClose),
m_player(PlayerManager::instance()),
m_shuttingDown(false)
{
@@ -82,7 +82,7 @@ JuK::~JuK()
kdDebug(65432) << k_funcinfo << endl;
}
-KActionCollection *JuK::actionCollection() const
+TDEActionCollection *JuK::actionCollection() const
{
return ActionCollection::actions();
}
@@ -120,64 +120,64 @@ void JuK::setupActions()
KStdAction::clear(TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions());
KStdAction::selectAll(TQT_TQOBJECT(kapp), TQT_SLOT(selectAll()), ActionCollection::actions());
- new KAction(i18n("Remove From Playlist"), "edit_remove", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist");
+ new TDEAction(i18n("Remove From Playlist"), "edit_remove", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist");
- KActionMenu *actionMenu = new KActionMenu(i18n("&Random Play"), "roll", ActionCollection::actions(), "actionMenu");
+ TDEActionMenu *actionMenu = new TDEActionMenu(i18n("&Random Play"), "roll", ActionCollection::actions(), "actionMenu");
actionMenu->setDelayed(false);
- KRadioAction *ka = new KRadioAction(i18n("&Disable Random Play"), "player_playlist", 0, ActionCollection::actions(), "disableRandomPlay");
+ TDERadioAction *ka = new TDERadioAction(i18n("&Disable Random Play"), "player_playlist", 0, ActionCollection::actions(), "disableRandomPlay");
ka->setExclusiveGroup("randomPlayGroup");
actionMenu->insert(ka);
- m_randomPlayAction = new KRadioAction(i18n("Use &Random Play"), "roll", 0, ActionCollection::actions(), "randomPlay");
+ m_randomPlayAction = new TDERadioAction(i18n("Use &Random Play"), "roll", 0, ActionCollection::actions(), "randomPlay");
m_randomPlayAction->setExclusiveGroup("randomPlayGroup");
actionMenu->insert(m_randomPlayAction);
- ka = new KRadioAction(i18n("Use &Album Random Play"), "roll", 0, ActionCollection::actions(), "albumRandomPlay");
+ ka = new TDERadioAction(i18n("Use &Album Random Play"), "roll", 0, ActionCollection::actions(), "albumRandomPlay");
ka->setExclusiveGroup("randomPlayGroup");
connect(ka, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckAlbumNextAction(bool)));
actionMenu->insert(ka);
- new KAction(i18n("&Play"), "player_play", 0, TQT_TQOBJECT(m_player), TQT_SLOT(play()), ActionCollection::actions(), "play");
- new KAction(i18n("P&ause"), "player_pause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(pause()), ActionCollection::actions(), "pause");
- new KAction(i18n("&Stop"), "player_stop", 0, TQT_TQOBJECT(m_player), TQT_SLOT(stop()), ActionCollection::actions(), "stop");
+ new TDEAction(i18n("&Play"), "player_play", 0, TQT_TQOBJECT(m_player), TQT_SLOT(play()), ActionCollection::actions(), "play");
+ new TDEAction(i18n("P&ause"), "player_pause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(pause()), ActionCollection::actions(), "pause");
+ new TDEAction(i18n("&Stop"), "player_stop", 0, TQT_TQOBJECT(m_player), TQT_SLOT(stop()), ActionCollection::actions(), "stop");
- new KToolBarPopupAction(i18n("previous track", "Previous"), "player_start", KShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(back()), ActionCollection::actions(), "back");
- new KAction(i18n("next track", "&Next"), "player_end", KShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(forward()), ActionCollection::actions(), "forward");
- new KToggleAction(i18n("&Loop Playlist"), 0, KShortcut(), ActionCollection::actions(), "loopPlaylist");
- KToggleAction *resizeColumnAction =
- new KToggleAction(i18n("&Resize Playlist Columns Manually"),
- KShortcut(), ActionCollection::actions(), "resizeColumnsManually");
+ new TDEToolBarPopupAction(i18n("previous track", "Previous"), "player_start", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(back()), ActionCollection::actions(), "back");
+ new TDEAction(i18n("next track", "&Next"), "player_end", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(forward()), ActionCollection::actions(), "forward");
+ new TDEToggleAction(i18n("&Loop Playlist"), 0, TDEShortcut(), ActionCollection::actions(), "loopPlaylist");
+ TDEToggleAction *resizeColumnAction =
+ new TDEToggleAction(i18n("&Resize Playlist Columns Manually"),
+ TDEShortcut(), ActionCollection::actions(), "resizeColumnsManually");
resizeColumnAction->setCheckedState(i18n("&Resize Column Headers Automatically"));
// the following are not visible by default
- new KAction(i18n("Mute"), "mute", 0, TQT_TQOBJECT(m_player), TQT_SLOT(mute()), ActionCollection::actions(), "mute");
- new KAction(i18n("Volume Up"), "volumeUp", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeUp()), ActionCollection::actions(), "volumeUp");
- new KAction(i18n("Volume Down"), "volumeDown", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeDown()), ActionCollection::actions(), "volumeDown");
- new KAction(i18n("Play / Pause"), "playPause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(playPause()), ActionCollection::actions(), "playPause");
- new KAction(i18n("Seek Forward"), "seekForward", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekForward()), ActionCollection::actions(), "seekForward");
- new KAction(i18n("Seek Back"), "seekBack", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekBack()), ActionCollection::actions(), "seekBack");
+ new TDEAction(i18n("Mute"), "mute", 0, TQT_TQOBJECT(m_player), TQT_SLOT(mute()), ActionCollection::actions(), "mute");
+ new TDEAction(i18n("Volume Up"), "volumeUp", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeUp()), ActionCollection::actions(), "volumeUp");
+ new TDEAction(i18n("Volume Down"), "volumeDown", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeDown()), ActionCollection::actions(), "volumeDown");
+ new TDEAction(i18n("Play / Pause"), "playPause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(playPause()), ActionCollection::actions(), "playPause");
+ new TDEAction(i18n("Seek Forward"), "seekForward", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekForward()), ActionCollection::actions(), "seekForward");
+ new TDEAction(i18n("Seek Back"), "seekBack", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekBack()), ActionCollection::actions(), "seekBack");
//////////////////////////////////////////////////
// settings menu
//////////////////////////////////////////////////
m_toggleSplashAction =
- new KToggleAction(i18n("Show Splash Screen on Startup"),
- KShortcut(), ActionCollection::actions(), "showSplashScreen");
+ new TDEToggleAction(i18n("Show Splash Screen on Startup"),
+ TDEShortcut(), ActionCollection::actions(), "showSplashScreen");
m_toggleSplashAction->setCheckedState(i18n("Hide Splash Screen on Startup"));
m_toggleSystemTrayAction =
- new KToggleAction(i18n("&Dock in System Tray"),
- KShortcut(), ActionCollection::actions(), "toggleSystemTray");
+ new TDEToggleAction(i18n("&Dock in System Tray"),
+ TDEShortcut(), ActionCollection::actions(), "toggleSystemTray");
m_toggleDockOnCloseAction =
- new KToggleAction(i18n("&Stay in System Tray on Close"),
- KShortcut(), ActionCollection::actions(), "dockOnClose");
+ new TDEToggleAction(i18n("&Stay in System Tray on Close"),
+ TDEShortcut(), ActionCollection::actions(), "dockOnClose");
m_togglePopupsAction =
- new KToggleAction(i18n("Popup &Track Announcement"),
- KShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "togglePopups");
- new KToggleAction(i18n("Save &Play Queue on Exit"),
- KShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "saveUpcomingTracks");
+ new TDEToggleAction(i18n("Popup &Track Announcement"),
+ TDEShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "togglePopups");
+ new TDEToggleAction(i18n("Save &Play Queue on Exit"),
+ TDEShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "saveUpcomingTracks");
connect(m_toggleSystemTrayAction, TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(slotToggleSystemTray(bool)));
@@ -188,10 +188,10 @@ void JuK::setupActions()
if(m_outputSelectAction)
m_outputSelectAction->setCurrentItem(0);
- new KAction(i18n("&Tag Guesser..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureTagGuesser()),
+ new TDEAction(i18n("&Tag Guesser..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureTagGuesser()),
ActionCollection::actions(), "tagGuesserConfig");
- new KAction(i18n("&File Renamer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureFileRenamer()),
+ new TDEAction(i18n("&File Renamer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureFileRenamer()),
ActionCollection::actions(), "fileRenamerConfig");
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), ActionCollection::actions());
@@ -269,7 +269,7 @@ void JuK::keyPressEvent(TQKeyEvent *e)
{
if (e->key() >= TQt::Key_Back && e->key() <= TQt::Key_MediaLast)
e->accept();
- KMainWindow::keyPressEvent(e);
+ TDEMainWindow::keyPressEvent(e);
}
/**
@@ -297,16 +297,16 @@ void JuK::readConfig()
// Default to no random play
- ActionCollection::action<KToggleAction>("disableRandomPlay")->setChecked(true);
+ ActionCollection::action<TDEToggleAction>("disableRandomPlay")->setChecked(true);
TQString randomPlayMode = playerConfig.readEntry("RandomPlay", "Disabled");
if(randomPlayMode == "true" || randomPlayMode == "Normal")
m_randomPlayAction->setChecked(true);
else if(randomPlayMode == "AlbumRandomPlay")
- ActionCollection::action<KToggleAction>("albumRandomPlay")->setChecked(true);
+ ActionCollection::action<TDEToggleAction>("albumRandomPlay")->setChecked(true);
bool loopPlaylist = playerConfig.readBoolEntry("LoopPlaylist", false);
- ActionCollection::action<KToggleAction>("loopPlaylist")->setChecked(loopPlaylist);
+ ActionCollection::action<TDEToggleAction>("loopPlaylist")->setChecked(loopPlaylist);
// general settings
@@ -340,10 +340,10 @@ void JuK::saveConfig()
playerConfig.writeEntry("RandomPlay", m_randomPlayAction->isChecked());
- KToggleAction *a = ActionCollection::action<KToggleAction>("loopPlaylist");
+ TDEToggleAction *a = ActionCollection::action<TDEToggleAction>("loopPlaylist");
playerConfig.writeEntry("LoopPlaylist", a->isChecked());
- a = ActionCollection::action<KToggleAction>("albumRandomPlay");
+ a = ActionCollection::action<TDEToggleAction>("albumRandomPlay");
if(a->isChecked())
playerConfig.writeEntry("RandomPlay", "AlbumRandomPlay");
else if(m_randomPlayAction->isChecked())
diff --git a/juk/juk.h b/juk/juk.h
index de51350f..4db7c13f 100644
--- a/juk/juk.h
+++ b/juk/juk.h
@@ -23,9 +23,9 @@
class TQTimer;
class TQListViewItem;
-class KToggleAction;
-class KSelectAction;
-class KToolBarPopupAction;
+class TDEToggleAction;
+class TDESelectAction;
+class TDEToolBarPopupAction;
class TDEGlobalAccel;
class SliderAction;
@@ -34,7 +34,7 @@ class SystemTray;
class PlayerManager;
class PlaylistSplitter;
-class JuK : public KMainWindow
+class JuK : public TDEMainWindow
{
Q_OBJECT
@@ -42,7 +42,7 @@ class JuK : public KMainWindow
public:
JuK(TQWidget* parent = 0, const char *name = 0);
virtual ~JuK();
- virtual KActionCollection *actionCollection() const;
+ virtual TDEActionCollection *actionCollection() const;
private:
void setupLayout();
@@ -82,13 +82,13 @@ private:
SystemTray *m_systemTray;
SliderAction *m_sliderAction;
- KToggleAction *m_randomPlayAction;
- KToggleAction *m_toggleSystemTrayAction;
- KToggleAction *m_toggleDockOnCloseAction;
- KToggleAction *m_togglePopupsAction;
- KToggleAction *m_toggleSplashAction;
- KToggleAction *m_loopPlaylistAction;
- KSelectAction *m_outputSelectAction;
+ TDEToggleAction *m_randomPlayAction;
+ TDEToggleAction *m_toggleSystemTrayAction;
+ TDEToggleAction *m_toggleDockOnCloseAction;
+ TDEToggleAction *m_togglePopupsAction;
+ TDEToggleAction *m_toggleSplashAction;
+ TDEToggleAction *m_loopPlaylistAction;
+ TDESelectAction *m_outputSelectAction;
PlayerManager *m_player;
TDEGlobalAccel *m_accel;
diff --git a/juk/k3bexporter.cpp b/juk/k3bexporter.cpp
index 6aec012f..aa89b005 100644
--- a/juk/k3bexporter.cpp
+++ b/juk/k3bexporter.cpp
@@ -41,20 +41,20 @@ using ActionCollection::actions;
PlaylistAction *K3bExporter::m_action = 0;
-// Special KAction subclass used to automatically call a slot when activated,
+// Special TDEAction subclass used to automatically call a slot when activated,
// depending on the visible playlist at the time. In other words, use *one*
// instance of this action for many playlists.
//
// This is used to handle some actions in the Playlist context menu.
-class PlaylistAction : public KAction
+class PlaylistAction : public TDEAction
{
public:
PlaylistAction(const char *name,
const TQString &userText,
const TQIconSet &pix,
const char *slot,
- const KShortcut &cut = 0) :
- KAction(userText, pix, cut, 0 /* receiver */, 0 /* slot */, actions(), name),
+ const TDEShortcut &cut = 0) :
+ TDEAction(userText, pix, cut, 0 /* receiver */, 0 /* slot */, actions(), name),
m_slot(slot)
{
}
@@ -101,7 +101,7 @@ K3bExporter::K3bExporter(Playlist *parent) : PlaylistExporter(parent), m_parent(
{
}
-KAction *K3bExporter::action()
+TDEAction *K3bExporter::action()
{
if(!m_action && !TDEStandardDirs::findExe("k3b").isNull()) {
m_action = new PlaylistAction(
@@ -116,7 +116,7 @@ KAction *K3bExporter::action()
// Tell the action to let us know when it is activated when
// m_parent is the visible playlist. This allows us to reuse the
- // action to avoid duplicate entries in KActionCollection.
+ // action to avoid duplicate entries in TDEActionCollection.
if(m_action)
m_action->addCallMapping(m_parent, this);
@@ -268,10 +268,10 @@ K3bPlaylistExporter::K3bPlaylistExporter(PlaylistBox *parent) : K3bExporter(0),
{
}
-KAction *K3bPlaylistExporter::action()
+TDEAction *K3bPlaylistExporter::action()
{
if(!TDEStandardDirs::findExe("k3b").isNull()) {
- return new KAction(
+ return new TDEAction(
i18n("Add Playlist to Audio or Data CD"),
SmallIconSet("k3b"),
0,
diff --git a/juk/k3bexporter.h b/juk/k3bexporter.h
index 922694a1..a6b1c27f 100644
--- a/juk/k3bexporter.h
+++ b/juk/k3bexporter.h
@@ -36,11 +36,11 @@ public:
K3bExporter(Playlist *parent = 0);
/**
- * Returns a KAction that can be used to invoke the export.
+ * Returns a TDEAction that can be used to invoke the export.
*
* @return action used to start the export.
*/
- virtual KAction *action();
+ virtual TDEAction *action();
Playlist *playlist() const { return m_parent; }
void setPlaylist(Playlist *playlist) { m_parent = playlist; }
@@ -82,7 +82,7 @@ class K3bPlaylistExporter : public K3bExporter
public:
K3bPlaylistExporter(PlaylistBox *parent = 0);
- virtual KAction *action();
+ virtual TDEAction *action();
private slots:
void slotExport();
diff --git a/juk/keydialog.cpp b/juk/keydialog.cpp
index ea73277f..3e8d7e83 100644
--- a/juk/keydialog.cpp
+++ b/juk/keydialog.cpp
@@ -27,54 +27,54 @@
const KeyDialog::KeyInfo KeyDialog::keyInfo[] = {
{ "PlayPause",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::ALT+TQt::Key_P, KKey::QtWIN+TQt::ALT+TQt::Key_P },
{ TQt::Key_MediaPlay, TQt::Key_MediaPlay } } },
{ "Stop",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::ALT+TQt::Key_S, KKey::QtWIN+TQt::ALT+TQt::Key_S },
{ TQt::Key_MediaStop, TQt::Key_MediaStop } } },
{ "Back",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::ALT+TQt::Key_Left, KKey::QtWIN+TQt::ALT+TQt::Key_Left },
{ TQt::Key_MediaPrev, TQt::Key_MediaPrev } } },
{ "Forward",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::ALT+TQt::Key_Right, KKey::QtWIN+TQt::ALT+TQt::Key_Right },
{ TQt::Key_MediaNext, TQt::Key_MediaNext } } },
{ "ForwardAlbum",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::ALT+TQt::Key_Up, KKey::QtWIN+TQt::ALT+TQt::Key_Up },
{ TQt::CTRL+TQt::Key_MediaNext, TQt::CTRL+TQt::Key_MediaNext } } },
{ "SeekBack",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_Left, KKey::QtWIN+TQt::SHIFT+TQt::ALT+TQt::Key_Left },
{ TQt::SHIFT+TQt::Key_MediaPrev, TQt::SHIFT+TQt::Key_MediaPrev } } },
{ "SeekForward",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_Right, KKey::QtWIN+TQt::SHIFT+TQt::ALT+TQt::Key_Right },
{ TQt::SHIFT+TQt::Key_MediaNext, TQt::SHIFT+TQt::Key_MediaNext } } },
{ "VolumeUp",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::ALT+TQt::SHIFT+TQt::Key_Up, KKey::QtWIN+TQt::ALT+TQt::SHIFT+TQt::Key_Up },
{ TQt::Key_VolumeUp, TQt::Key_VolumeUp } } },
{ "VolumeDown",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::ALT+TQt::SHIFT+TQt::Key_Down, KKey::QtWIN+TQt::ALT+TQt::SHIFT+TQt::Key_Down },
{ TQt::Key_VolumeDown, TQt::Key_VolumeDown } } },
{ "Mute",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::ALT+TQt::Key_M, KKey::QtWIN+TQt::ALT+TQt::Key_M },
{ TQt::Key_VolumeMute, TQt::Key_VolumeMute } } },
{ "ShowHide",
- { { KShortcut::null(), KShortcut::null() },
- { KShortcut::null(), KShortcut::null() },
- { KShortcut::null(), KShortcut::null() } } }
+ { { TDEShortcut::null(), TDEShortcut::null() },
+ { TDEShortcut::null(), TDEShortcut::null() },
+ { TDEShortcut::null(), TDEShortcut::null() } } }
};
const uint KeyDialog::keyInfoCount = sizeof(KeyDialog::keyInfo) / sizeof(KeyDialog::keyInfo[0]);
-KeyDialog::KeyDialog(TDEGlobalAccel *keys, KActionCollection *actionCollection,
+KeyDialog::KeyDialog(TDEGlobalAccel *keys, TDEActionCollection *actionCollection,
TQWidget *parent, const char *name)
: KDialogBase(parent, name, true, i18n("Configure Shortcuts"), Default | Ok | Cancel, Ok)
{
@@ -114,7 +114,7 @@ KeyDialog::~KeyDialog()
}
-void KeyDialog::newDialog(TDEGlobalAccel *keys, KActionCollection *actionCollection,
+void KeyDialog::newDialog(TDEGlobalAccel *keys, TDEActionCollection *actionCollection,
int selectedButton)
{
m_keys = keys;
@@ -171,7 +171,7 @@ void KeyDialog::slotDefault()
m_pKeyChooser->allDefault();
}
-int KeyDialog::configure(TDEGlobalAccel *keys, KActionCollection *actionCollection,
+int KeyDialog::configure(TDEGlobalAccel *keys, TDEActionCollection *actionCollection,
TQWidget *parent)
{
// Create and show dialog - update connections if accepted
@@ -186,8 +186,8 @@ int KeyDialog::configure(TDEGlobalAccel *keys, KActionCollection *actionCollecti
void KeyDialog::insert(TDEGlobalAccel *keys, const TQString &action, const TQString &label,
const TQObject *objSlot, const char *methodSlot)
{
- KShortcut def3 = KShortcut::null();
- KShortcut def4 = KShortcut::null();
+ TDEShortcut def3 = TDEShortcut::null();
+ TDEShortcut def4 = TDEShortcut::null();
// Find and insert a standard key
diff --git a/juk/keydialog.h b/juk/keydialog.h
index 09c4853a..a974598b 100644
--- a/juk/keydialog.h
+++ b/juk/keydialog.h
@@ -32,7 +32,7 @@ public:
/**
* Constructs a KeyDialog called @p name as a child of @p parent.
*/
- KeyDialog(TDEGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *parent = 0, const char* name = 0);
+ KeyDialog(TDEGlobalAccel *keys, TDEActionCollection *actionCollection, TQWidget *parent = 0, const char* name = 0);
/**
* Destructor. Deletes all resources used by a KeyDialog object.
@@ -44,7 +44,7 @@ public:
* accelerators and actions. It behaves essentially like the functions
* in KKeyDialog.
*/
- static int configure(TDEGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *parent = 0);
+ static int configure(TDEGlobalAccel *keys, TDEActionCollection *actionCollection, TQWidget *parent = 0);
/**
* This is a member function, provided to create a global accelerator with
@@ -62,10 +62,10 @@ private:
struct KeyInfo {
TQString action;
- KShortcut shortcut[3][2];
+ TDEShortcut shortcut[3][2];
};
- void newDialog(TDEGlobalAccel *keys, KActionCollection *actionCollection, int selectedButton = 0);
+ void newDialog(TDEGlobalAccel *keys, TDEActionCollection *actionCollection, int selectedButton = 0);
int configure();
private slots:
@@ -73,7 +73,7 @@ private slots:
void slotDefault();
private:
- KActionCollection *m_actionCollection;
+ TDEActionCollection *m_actionCollection;
TDEGlobalAccel *m_keys;
KKeyChooser *m_pKeyChooser;
TQHButtonGroup *m_group;
diff --git a/juk/musicbrainzquery.cpp b/juk/musicbrainzquery.cpp
index c87a883c..3337ff81 100644
--- a/juk/musicbrainzquery.cpp
+++ b/juk/musicbrainzquery.cpp
@@ -67,7 +67,7 @@ void MusicBrainzLookup::error()
void MusicBrainzLookup::message(const TQString &s) const
{
- KMainWindow *w = static_cast<KMainWindow *>(kapp->mainWidget());
+ TDEMainWindow *w = static_cast<TDEMainWindow *>(kapp->mainWidget());
w->statusBar()->message(TQString("%1 (%2)").arg(s).arg(m_file.fileInfo().fileName()), 3000);
}
diff --git a/juk/playermanager.cpp b/juk/playermanager.cpp
index 0ecc9e84..26fde611 100644
--- a/juk/playermanager.cpp
+++ b/juk/playermanager.cpp
@@ -239,10 +239,10 @@ void PlayerManager::setStatusLabel(StatusLabel *label)
m_statusLabel = label;
}
-KSelectAction *PlayerManager::playerSelectAction(TQObject *parent) // static
+TDESelectAction *PlayerManager::playerSelectAction(TQObject *parent) // static
{
- KSelectAction *action = 0;
- action = new KSelectAction(i18n("&Output To"), 0, parent, "outputSelect");
+ TDESelectAction *action = 0;
+ action = new TDESelectAction(i18n("&Output To"), 0, parent, "outputSelect");
TQStringList l;
#if HAVE_ARTS
@@ -305,7 +305,7 @@ void PlayerManager::play(const FileHandle &file)
action("pause")->setEnabled(true);
action("stop")->setEnabled(true);
action("forward")->setEnabled(true);
- if(action<KToggleAction>("albumRandomPlay")->isChecked())
+ if(action<TDEToggleAction>("albumRandomPlay")->isChecked())
action("forwardAlbum")->setEnabled(true);
action("back")->setEnabled(true);
@@ -651,10 +651,10 @@ void PlayerManager::setup()
// Call this method manually to avoid warnings.
- KAction *outputAction = actions()->action("outputSelect");
+ TDEAction *outputAction = actions()->action("outputSelect");
if(outputAction) {
- setOutput(static_cast<KSelectAction *>(outputAction)->currentText());
+ setOutput(static_cast<TDESelectAction *>(outputAction)->currentText());
connect(outputAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSetOutput(const TQString &)));
}
else
@@ -678,9 +678,9 @@ void PlayerManager::setup()
TQString PlayerManager::randomPlayMode() const
{
- if(action<KToggleAction>("randomPlay")->isChecked())
+ if(action<TDEToggleAction>("randomPlay")->isChecked())
return "Random";
- if(action<KToggleAction>("albumRandomPlay")->isChecked())
+ if(action<TDEToggleAction>("albumRandomPlay")->isChecked())
return "AlbumRandom";
return "NoRandom";
}
@@ -688,11 +688,11 @@ TQString PlayerManager::randomPlayMode() const
void PlayerManager::setRandomPlayMode(const TQString &randomMode)
{
if(randomMode.lower() == "random")
- action<KToggleAction>("randomPlay")->setChecked(true);
+ action<TDEToggleAction>("randomPlay")->setChecked(true);
if(randomMode.lower() == "albumrandom")
- action<KToggleAction>("albumRandomPlay")->setChecked(true);
+ action<TDEToggleAction>("albumRandomPlay")->setChecked(true);
if(randomMode.lower() == "norandom")
- action<KToggleAction>("disableRandomPlay")->setChecked(true);
+ action<TDEToggleAction>("disableRandomPlay")->setChecked(true);
}
#include "playermanager.moc"
diff --git a/juk/playermanager.h b/juk/playermanager.h
index 62a33308..e8f6e528 100644
--- a/juk/playermanager.h
+++ b/juk/playermanager.h
@@ -20,7 +20,7 @@
#include "jukIface.h"
class TQTimer;
-class KSelectAction;
+class TDESelectAction;
class SliderAction;
class StatusLabel;
class PlaylistInterface;
@@ -62,7 +62,7 @@ public:
TQString randomPlayMode() const;
- static KSelectAction *playerSelectAction(TQObject *parent);
+ static TDESelectAction *playerSelectAction(TQObject *parent);
public slots:
diff --git a/juk/playlist.cpp b/juk/playlist.cpp
index 1f33b4be..94d41a04 100644
--- a/juk/playlist.cpp
+++ b/juk/playlist.cpp
@@ -73,7 +73,7 @@ using namespace ActionCollection;
static bool manualResize()
{
- return action<KToggleAction>("resizeColumnsManually")->isChecked();
+ return action<TDEToggleAction>("resizeColumnsManually")->isChecked();
}
/**
@@ -238,7 +238,7 @@ Playlist::SharedSettings::SharedSettings()
TDEConfigGroup config(TDEGlobal::config(), "PlaylistShared");
bool resizeColumnsManually = config.readBoolEntry("ResizeColumnsManually", false);
- action<KToggleAction>("resizeColumnsManually")->setChecked(resizeColumnsManually);
+ action<TDEToggleAction>("resizeColumnsManually")->setChecked(resizeColumnsManually);
// save column order
m_columnOrder = config.readIntListEntry("ColumnOrder");
@@ -310,7 +310,7 @@ int Playlist::m_leftColumn = 0;
Playlist::Playlist(PlaylistCollection *collection, const TQString &name,
const TQString &iconName) :
- KListView(collection->playlistStack(), name.latin1()),
+ TDEListView(collection->playlistStack(), name.latin1()),
m_collection(collection),
m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))),
m_selectedCount(0),
@@ -334,7 +334,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQString &name,
Playlist::Playlist(PlaylistCollection *collection, const PlaylistItemList &items,
const TQString &name, const TQString &iconName) :
- KListView(collection->playlistStack(), name.latin1()),
+ TDEListView(collection->playlistStack(), name.latin1()),
m_collection(collection),
m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))),
m_selectedCount(0),
@@ -359,7 +359,7 @@ Playlist::Playlist(PlaylistCollection *collection, const PlaylistItemList &items
Playlist::Playlist(PlaylistCollection *collection, const TQFileInfo &playlistFile,
const TQString &iconName) :
- KListView(collection->playlistStack()),
+ TDEListView(collection->playlistStack()),
m_collection(collection),
m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))),
m_selectedCount(0),
@@ -383,7 +383,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQFileInfo &playlistFil
}
Playlist::Playlist(PlaylistCollection *collection, bool delaySetup) :
- KListView(collection->playlistStack()),
+ TDEListView(collection->playlistStack()),
m_collection(collection),
m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))),
m_selectedCount(0),
@@ -506,7 +506,7 @@ void Playlist::playPrevious()
if(!playingItem())
return;
- bool random = action("randomPlay") && action<KToggleAction>("randomPlay")->isChecked();
+ bool random = action("randomPlay") && action<TDEToggleAction>("randomPlay")->isChecked();
PlaylistItem *previous = 0;
@@ -644,7 +644,7 @@ PlaylistItemList Playlist::selectedItems()
PlaylistItem *Playlist::firstChild() const
{
- return static_cast<PlaylistItem *>(KListView::firstChild());
+ return static_cast<PlaylistItem *>(TDEListView::firstChild());
}
void Playlist::updateLeftColumn()
@@ -1033,7 +1033,7 @@ TQDragObject *Playlist::dragObject(TQWidget *parent)
void Playlist::contentsDragEnterEvent(TQDragEnterEvent *e)
{
- KListView::contentsDragEnterEvent(e);
+ TDEListView::contentsDragEnterEvent(e);
if(CoverDrag::canDecode(e)) {
setDropHighlighter(true);
@@ -1115,11 +1115,11 @@ bool Playlist::eventFilter(TQObject *watched, TQEvent *e)
case TQEvent::MouseMove:
{
if((TQT_TQMOUSEEVENT(e)->state() & Qt::LeftButton) == Qt::LeftButton &&
- !action<KToggleAction>("resizeColumnsManually")->isChecked())
+ !action<TDEToggleAction>("resizeColumnsManually")->isChecked())
{
m_columnWidthModeChanged = true;
- action<KToggleAction>("resizeColumnsManually")->setChecked(true);
+ action<TDEToggleAction>("resizeColumnsManually")->setChecked(true);
slotColumnResizeModeChanged();
}
@@ -1148,7 +1148,7 @@ bool Playlist::eventFilter(TQObject *watched, TQEvent *e)
}
}
- return KListView::eventFilter(watched, e);
+ return TDEListView::eventFilter(watched, e);
}
void Playlist::keyPressEvent(TQKeyEvent *event)
@@ -1166,7 +1166,7 @@ void Playlist::keyPressEvent(TQKeyEvent *event)
}
- KListView::keyPressEvent(event);
+ TDEListView::keyPressEvent(event);
}
void Playlist::contentsDropEvent(TQDropEvent *e)
@@ -1215,7 +1215,7 @@ void Playlist::contentsDropEvent(TQDropEvent *e)
setSorting(columns() + 1);
- TQPtrList<TQListViewItem> items = KListView::selectedItems();
+ TQPtrList<TQListViewItem> items = TDEListView::selectedItems();
for(TQPtrListIterator<TQListViewItem> it(items); it.current(); ++it) {
if(!item) {
@@ -1239,7 +1239,7 @@ void Playlist::contentsDropEvent(TQDropEvent *e)
dataChanged();
emit signalPlaylistItemsDropped(this);
- KListView::contentsDropEvent(e);
+ TDEListView::contentsDropEvent(e);
}
void Playlist::contentsMouseDoubleClickEvent(TQMouseEvent *e)
@@ -1248,7 +1248,7 @@ void Playlist::contentsMouseDoubleClickEvent(TQMouseEvent *e)
// weird experience of switching songs from a double right-click.
if(e->button() == Qt::LeftButton)
- KListView::contentsMouseDoubleClickEvent(e);
+ TDEListView::contentsMouseDoubleClickEvent(e);
}
void Playlist::showEvent(TQShowEvent *e)
@@ -1257,7 +1257,7 @@ void Playlist::showEvent(TQShowEvent *e)
SharedSettings::instance()->apply(this);
m_applySharedSettings = false;
}
- KListView::showEvent(e);
+ TDEListView::showEvent(e);
}
void Playlist::applySharedSettings()
@@ -1298,7 +1298,7 @@ void Playlist::viewportPaintEvent(TQPaintEvent *pe)
slotUpdateColumnWidths();
}
- KListView::viewportPaintEvent(pe);
+ TDEListView::viewportPaintEvent(pe);
}
void Playlist::viewportResizeEvent(TQResizeEvent *re)
@@ -1309,7 +1309,7 @@ void Playlist::viewportResizeEvent(TQResizeEvent *re)
if(re->size().width() != re->oldSize().width() && !manualResize())
slotUpdateColumnWidths();
- KListView::viewportResizeEvent(re);
+ TDEListView::viewportResizeEvent(re);
}
void Playlist::insertItem(TQListViewItem *item)
@@ -1320,7 +1320,7 @@ void Playlist::insertItem(TQListViewItem *item)
// you need to use the PlaylistItem from here.
m_addTime.append(static_cast<PlaylistItem *>(item));
- KListView::insertItem(item);
+ TDEListView::insertItem(item);
}
void Playlist::takeItem(TQListViewItem *item)
@@ -1328,13 +1328,13 @@ void Playlist::takeItem(TQListViewItem *item)
// See the warning in Playlist::insertItem.
m_subtractTime.append(static_cast<PlaylistItem *>(item));
- KListView::takeItem(item);
+ TDEListView::takeItem(item);
}
void Playlist::addColumn(const TQString &label)
{
slotWeightDirty(columns());
- KListView::addColumn(label, 30);
+ TDEListView::addColumn(label, 30);
}
PlaylistItem *Playlist::createItem(const FileHandle &file,
@@ -1507,7 +1507,7 @@ bool Playlist::isColumnVisible(int c) const
void Playlist::polish()
{
- KListView::polish();
+ TDEListView::polish();
if(m_polished)
return;
@@ -1545,7 +1545,7 @@ void Playlist::polish()
// setup header RMB menu
//////////////////////////////////////////////////
- m_columnVisibleAction = new KActionMenu(i18n("&Show Columns"), TQT_TQOBJECT(this), "showColumns");
+ m_columnVisibleAction = new TDEActionMenu(i18n("&Show Columns"), TQT_TQOBJECT(this), "showColumns");
m_headerMenu = m_columnVisibleAction->popupMenu();
m_headerMenu->insertTitle(i18n("Show"));
@@ -1579,7 +1579,7 @@ void Playlist::polish()
connect(action("resizeColumnsManually"), TQT_SIGNAL(activated()),
this, TQT_SLOT(slotColumnResizeModeChanged()));
- if(action<KToggleAction>("resizeColumnsManually")->isChecked())
+ if(action<TDEToggleAction>("resizeColumnsManually")->isChecked())
setHScrollBarMode(Auto);
else
setHScrollBarMode(AlwaysOff);
@@ -1619,7 +1619,7 @@ void Playlist::slotPopulateBackMenu() const
if(!playingItem())
return;
- KPopupMenu *menu = action<KToolBarPopupAction>("back")->popupMenu();
+ TDEPopupMenu *menu = action<TDEToolBarPopupAction>("back")->popupMenu();
menu->clear();
m_backMenuItems.clear();
@@ -1733,7 +1733,7 @@ void Playlist::setPlaying(PlaylistItem *item, bool addToHistory)
item->setPlaying(true);
bool enableBack = !m_history.isEmpty();
- action<KToolBarPopupAction>("back")->popupMenu()->setEnabled(enableBack);
+ action<TDEToolBarPopupAction>("back")->popupMenu()->setEnabled(enableBack);
}
bool Playlist::playing() const
@@ -2071,9 +2071,9 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c
if(!m_rmbMenu) {
// A bit of a hack to get a pointer to the action collection.
- // Probably more of these actions should be ported over to using KActions.
+ // Probably more of these actions should be ported over to using TDEActions.
- m_rmbMenu = new KPopupMenu(this);
+ m_rmbMenu = new TDEPopupMenu(this);
m_rmbUpcomingID = m_rmbMenu->insertItem(SmallIcon("today"),
i18n("Add to Play Queue"), this, TQT_SLOT(slotAddToUpcoming()));
@@ -2108,7 +2108,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c
SmallIcon("folder_new"), i18n("Create Playlist From Selected Items..."), this, TQT_SLOT(slotCreateGroup()));
K3bExporter *exporter = new K3bExporter(this);
- KAction *k3bAction = exporter->action();
+ TDEAction *k3bAction = exporter->action();
if(k3bAction)
k3bAction->plug(m_rmbMenu);
}
diff --git a/juk/playlist.h b/juk/playlist.h
index 6016a3cb..348dda24 100644
--- a/juk/playlist.h
+++ b/juk/playlist.h
@@ -31,8 +31,8 @@
#include "playlistinterface.h"
#include "playlistitem.h"
-class KPopupMenu;
-class KActionMenu;
+class TDEPopupMenu;
+class TDEActionMenu;
class TQEvent;
@@ -43,7 +43,7 @@ class UpcomingPlaylist;
typedef TQValueList<PlaylistItem *> PlaylistItemList;
-class Playlist : public KListView, public PlaylistInterface
+class Playlist : public TDEListView, public PlaylistInterface
{
Q_OBJECT
@@ -224,10 +224,10 @@ public:
void setName(const TQString &n);
/**
- * Returns the KActionMenu that allows this to be embedded in menus outside
+ * Returns the TDEActionMenu that allows this to be embedded in menus outside
* of the playlist.
*/
- KActionMenu *columnVisibleAction() const { return m_columnVisibleAction; }
+ TDEActionMenu *columnVisibleAction() const { return m_columnVisibleAction; }
/**
* Set item to be the playing item. If \a item is null then this will clear
@@ -353,7 +353,7 @@ public slots:
* @see clearItems()
*/
virtual void clear();
- virtual void selectAll() { KListView::selectAll(true); }
+ virtual void selectAll() { TDEListView::selectAll(true); }
/**
* Refreshes the tags of the selection from disk, or all of the files in the
@@ -612,7 +612,7 @@ private slots:
void slotColumnOrderChanged(int, int from, int to);
/**
- * Toggles a columns visible status. Useful for KActions.
+ * Toggles a columns visible status. Useful for TDEActions.
*
* \see hideColumn()
* \see showColumn()
@@ -693,9 +693,9 @@ private:
TQString m_playlistName;
TQString m_fileName;
- KPopupMenu *m_rmbMenu;
- KPopupMenu *m_headerMenu;
- KActionMenu *m_columnVisibleAction;
+ TDEPopupMenu *m_rmbMenu;
+ TDEPopupMenu *m_headerMenu;
+ TDEActionMenu *m_columnVisibleAction;
PlaylistToolTip *m_toolTip;
/**
diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp
index 94e1cd91..71329ae1 100644
--- a/juk/playlistbox.cpp
+++ b/juk/playlistbox.cpp
@@ -48,7 +48,7 @@ using namespace ActionCollection;
PlaylistBox::PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack,
const char *name) :
- KListView(parent, name),
+ TDEListView(parent, name),
PlaylistCollection(playlistStack),
m_viewModeIndex(0),
m_hasSelection(false),
@@ -70,7 +70,7 @@ PlaylistBox::PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack,
setAcceptDrops(true);
setSelectionModeExt(Extended);
- m_contextMenu = new KPopupMenu(this);
+ m_contextMenu = new TDEPopupMenu(this);
K3bPlaylistExporter *exporter = new K3bPlaylistExporter(this);
m_k3bAction = exporter->action();
@@ -90,8 +90,8 @@ PlaylistBox::PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack,
// add the view modes stuff
- KSelectAction *viewModeAction =
- new KSelectAction(i18n("View Modes"), "view_choose", KShortcut(), ActionCollection::actions(), "viewModeMenu");
+ TDESelectAction *viewModeAction =
+ new TDESelectAction(i18n("View Modes"), "view_choose", TDEShortcut(), ActionCollection::actions(), "viewModeMenu");
m_viewModes.append(new ViewMode(this));
m_viewModes.append(new CompactViewMode(this));
@@ -263,7 +263,7 @@ void PlaylistBox::readConfig()
void PlaylistBox::saveConfig()
{
TDEConfigGroup config(TDEGlobal::config(), "PlaylistBox");
- config.writeEntry("ViewMode", action<KSelectAction>("viewModeMenu")->currentItem());
+ config.writeEntry("ViewMode", action<TDESelectAction>("viewModeMenu")->currentItem());
TDEGlobal::config()->sync();
}
@@ -344,7 +344,7 @@ void PlaylistBox::remove()
if(*it != upcomingPlaylist())
delete *it;
else {
- action<KToggleAction>("showUpcoming")->setChecked(false);
+ action<TDEToggleAction>("showUpcoming")->setChecked(false);
setUpcomingPlaylistEnabled(false);
}
}
@@ -519,14 +519,14 @@ void PlaylistBox::contentsDragLeaveEvent(TQDragLeaveEvent *e)
m_dropItem = 0;
old->repaint();
}
- KListView::contentsDragLeaveEvent(e);
+ TDEListView::contentsDragLeaveEvent(e);
}
void PlaylistBox::contentsMousePressEvent(TQMouseEvent *e)
{
if(e->button() == Qt::LeftButton)
m_doingMultiSelect = true;
- KListView::contentsMousePressEvent(e);
+ TDEListView::contentsMousePressEvent(e);
}
void PlaylistBox::contentsMouseReleaseEvent(TQMouseEvent *e)
@@ -535,14 +535,14 @@ void PlaylistBox::contentsMouseReleaseEvent(TQMouseEvent *e)
m_doingMultiSelect = false;
slotPlaylistChanged();
}
- KListView::contentsMouseReleaseEvent(e);
+ TDEListView::contentsMouseReleaseEvent(e);
}
void PlaylistBox::keyPressEvent(TQKeyEvent *e)
{
if((e->key() == Key_Up || e->key() == Key_Down) && e->state() == ShiftButton)
m_doingMultiSelect = true;
- KListView::keyPressEvent(e);
+ TDEListView::keyPressEvent(e);
}
void PlaylistBox::keyReleaseEvent(TQKeyEvent *e)
@@ -551,7 +551,7 @@ void PlaylistBox::keyReleaseEvent(TQKeyEvent *e)
m_doingMultiSelect = false;
slotPlaylistChanged();
}
- KListView::keyReleaseEvent(e);
+ TDEListView::keyReleaseEvent(e);
}
PlaylistBox::ItemList PlaylistBox::selectedItems() const
@@ -568,7 +568,7 @@ PlaylistBox::ItemList PlaylistBox::selectedItems() const
void PlaylistBox::setSingleItem(TQListViewItem *item)
{
setSelectionModeExt(Single);
- KListView::setCurrentItem(item);
+ TDEListView::setCurrentItem(item);
setSelectionModeExt(Extended);
}
@@ -676,7 +676,7 @@ void PlaylistBox::setupUpcomingPlaylist()
bool enable = config.readBoolEntry("showUpcoming", false);
setUpcomingPlaylistEnabled(enable);
- action<KToggleAction>("showUpcoming")->setChecked(enable);
+ action<TDEToggleAction>("showUpcoming")->setChecked(enable);
}
////////////////////////////////////////////////////////////////////////////////
@@ -686,14 +686,14 @@ void PlaylistBox::setupUpcomingPlaylist()
PlaylistBox::Item *PlaylistBox::Item::m_collectionItem = 0;
PlaylistBox::Item::Item(PlaylistBox *listBox, const TQString &icon, const TQString &text, Playlist *l)
- : TQObject(listBox), KListViewItem(listBox, 0, text),
+ : TQObject(listBox), TDEListViewItem(listBox, 0, text),
m_playlist(l), m_text(text), m_iconName(icon), m_sortedFirst(false)
{
init();
}
PlaylistBox::Item::Item(Item *parent, const TQString &icon, const TQString &text, Playlist *l)
- : TQObject(parent->listView()), KListViewItem(parent, text),
+ : TQObject(parent->listView()), TDEListViewItem(parent, text),
m_playlist(l), m_text(text), m_iconName(icon), m_sortedFirst(false)
{
init();
@@ -731,7 +731,7 @@ void PlaylistBox::Item::paintCell(TQPainter *painter, const TQColorGroup &colorG
void PlaylistBox::Item::setText(int column, const TQString &text)
{
m_text = text;
- KListViewItem::setText(column, text);
+ TDEListViewItem::setText(column, text);
}
void PlaylistBox::Item::setup()
diff --git a/juk/playlistbox.h b/juk/playlistbox.h
index bf1965d1..de06dbc8 100644
--- a/juk/playlistbox.h
+++ b/juk/playlistbox.h
@@ -28,8 +28,8 @@ class ViewMode;
class PlaylistSearch;
class SearchPlaylist;
-class KPopupMenu;
-class KSelectAction;
+class TDEPopupMenu;
+class TDESelectAction;
typedef TQValueList<Playlist *> PlaylistList;
@@ -38,7 +38,7 @@ typedef TQValueList<Playlist *> PlaylistList;
* JuK's main widget (PlaylistSplitter).
*/
-class PlaylistBox : public KListView, public PlaylistCollection
+class PlaylistBox : public TDEListView, public PlaylistCollection
{
Q_OBJECT
@@ -121,11 +121,11 @@ private slots:
void slotRemoveItem(const TQString &tag, unsigned column);
private:
- KPopupMenu *m_contextMenu;
+ TDEPopupMenu *m_contextMenu;
TQPtrDict<Item> m_playlistDict;
int m_viewModeIndex;
TQValueList<ViewMode *> m_viewModes;
- KAction *m_k3bAction;
+ TDEAction *m_k3bAction;
bool m_hasSelection;
bool m_doingMultiSelect;
Item *m_dropItem;
@@ -134,7 +134,7 @@ private:
-class PlaylistBox::Item : public TQObject, public KListViewItem
+class PlaylistBox::Item : public TQObject, public TDEListViewItem
{
friend class PlaylistBox;
friend class ViewMode;
@@ -156,7 +156,7 @@ protected:
Item(Item *parent, const TQString &icon, const TQString &text, Playlist *l = 0);
Playlist *playlist() const { return m_playlist; }
- PlaylistBox *listView() const { return static_cast<PlaylistBox *>(KListViewItem::listView()); }
+ PlaylistBox *listView() const { return static_cast<PlaylistBox *>(TDEListViewItem::listView()); }
TQString iconName() const { return m_iconName; }
TQString text() const { return m_text; }
void setSortedFirst(bool first = true) { m_sortedFirst = first; }
@@ -166,7 +166,7 @@ protected:
virtual void paintFocus(TQPainter *, const TQColorGroup &, const TQRect &) {}
virtual void setText(int column, const TQString &text);
- virtual TQString text(int column) const { return KListViewItem::text(column); }
+ virtual TQString text(int column) const { return TDEListViewItem::text(column); }
virtual void setup();
diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp
index bff1e7c9..c2b2d80b 100644
--- a/juk/playlistcollection.cpp
+++ b/juk/playlistcollection.cpp
@@ -547,7 +547,7 @@ void PlaylistCollection::setHistoryPlaylistEnabled(bool enable)
return;
if(enable) {
- action<KToggleAction>("showHistory")->setChecked(true);
+ action<TDEToggleAction>("showHistory")->setChecked(true);
m_historyPlaylist = new HistoryPlaylist(this);
m_historyPlaylist->setName(i18n("History"));
setupPlaylist(m_historyPlaylist, "history");
@@ -569,14 +569,14 @@ void PlaylistCollection::setUpcomingPlaylistEnabled(bool enable)
return;
if(enable) {
- action<KToggleAction>("showUpcoming")->setChecked(true);
+ action<TDEToggleAction>("showUpcoming")->setChecked(true);
if(!m_upcomingPlaylist)
m_upcomingPlaylist = new UpcomingPlaylist(this);
setupPlaylist(m_upcomingPlaylist, "today");
}
else {
- action<KToggleAction>("showUpcoming")->setChecked(false);
+ action<TDEToggleAction>("showUpcoming")->setChecked(false);
bool raiseCollection = m_playlistStack->visibleWidget() == m_upcomingPlaylist;
delete m_upcomingPlaylist;
m_upcomingPlaylist = 0;
@@ -824,7 +824,7 @@ void PlaylistCollection::saveConfig()
{
TDEConfigGroup config(TDEGlobal::config(), "Playlists");
config.writeEntry("ImportPlaylists", m_importPlaylists);
- config.writeEntry("showUpcoming", action<KToggleAction>("showUpcoming")->isChecked());
+ config.writeEntry("showUpcoming", action<TDEToggleAction>("showUpcoming")->isChecked());
config.writePathEntry("DirectoryList", m_folderList);
}
@@ -836,11 +836,11 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
TQObject(0, "ActionHandler"),
m_collection(collection)
{
- KActionMenu *menu;
+ TDEActionMenu *menu;
// "New" menu
- menu = new KActionMenu(i18n("&New"), "filenew", actions(), "file_new");
+ menu = new TDEActionMenu(i18n("&New"), "filenew", actions(), "file_new");
menu->insert(createAction(i18n("&Empty Playlist..."), TQT_SLOT(slotCreatePlaylist()),
"newPlaylist", "window_new", "CTRL+n"));
@@ -852,7 +852,7 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
// Guess tag info menu
#if HAVE_MUSICBRAINZ
- menu = new KActionMenu(i18n("&Guess Tag Information"), TQString(), actions(), "guessTag");
+ menu = new TDEActionMenu(i18n("&Guess Tag Information"), TQString(), actions(), "guessTag");
menu->setIconSet(SmallIconSet("wizard"));
menu->insert(createAction(i18n("From &File Name"), TQT_SLOT(slotGuessTagFromFile()),
@@ -882,7 +882,7 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
createAction(i18n("Refresh"), TQT_SLOT(slotRefreshItems()), "refresh", "reload");
createAction(i18n("&Rename File"), TQT_SLOT(slotRenameItems()), "renameFile", "filesaveas", "CTRL+r");
- menu = new KActionMenu(i18n("Cover Manager"), TQString(), actions(), "coverManager");
+ menu = new TDEActionMenu(i18n("Cover Manager"), TQString(), actions(), "coverManager");
menu->setIconSet(SmallIconSet("image"));
menu->insert(createAction(i18n("&View Cover"),
TQT_SLOT(slotViewCovers()), "viewCover", "viewmag"));
@@ -897,30 +897,30 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
menu->insert(createAction(i18n("Show Cover &Manager"),
TQT_SLOT(slotShowCoverManager()), "showCoverManager"));
- KToggleAction *historyAction =
- new KToggleAction(i18n("Show &History"), "history", 0, actions(), "showHistory");
+ TDEToggleAction *historyAction =
+ new TDEToggleAction(i18n("Show &History"), "history", 0, actions(), "showHistory");
historyAction->setCheckedState(i18n("Hide &History"));
- KToggleAction *upcomingAction =
- new KToggleAction(i18n("Show &Play Queue"), "today", 0, actions(), "showUpcoming");
+ TDEToggleAction *upcomingAction =
+ new TDEToggleAction(i18n("Show &Play Queue"), "today", 0, actions(), "showUpcoming");
upcomingAction->setCheckedState(i18n("Hide &Play Queue"));
- connect(action<KToggleAction>("showHistory"), TQT_SIGNAL(toggled(bool)),
+ connect(action<TDEToggleAction>("showHistory"), TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(slotSetHistoryPlaylistEnabled(bool)));
- connect(action<KToggleAction>("showUpcoming"), TQT_SIGNAL(toggled(bool)),
+ connect(action<TDEToggleAction>("showUpcoming"), TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(slotSetUpcomingPlaylistEnabled(bool)));
}
-KAction *PlaylistCollection::ActionHandler::createAction(const TQString &text,
+TDEAction *PlaylistCollection::ActionHandler::createAction(const TQString &text,
const char *slot,
const char *name,
const TQString &icon,
- const KShortcut &shortcut)
+ const TDEShortcut &shortcut)
{
if(icon.isNull())
- return new KAction(text, shortcut, this, slot, actions(), name);
+ return new TDEAction(text, shortcut, this, slot, actions(), name);
else
- return new KAction(text, icon, shortcut, this, slot, actions(), name);
+ return new TDEAction(text, icon, shortcut, this, slot, actions(), name);
}
#undef widget
diff --git a/juk/playlistcollection.h b/juk/playlistcollection.h
index 93fa71f7..2105b9cf 100644
--- a/juk/playlistcollection.h
+++ b/juk/playlistcollection.h
@@ -26,7 +26,7 @@
#include <tqguardedptr.h>
class TQWidgetStack;
-class KAction;
+class TDEAction;
class Playlist;
class PlaylistItem;
class HistoryPlaylist;
@@ -215,11 +215,11 @@ public:
ActionHandler(PlaylistCollection *collection);
private:
- KAction *createAction(const TQString &text,
+ TDEAction *createAction(const TQString &text,
const char *slot,
const char *name,
const TQString &icon = TQString(),
- const KShortcut &shortcut = KShortcut());
+ const TDEShortcut &shortcut = TDEShortcut());
private slots:
void slotPlayFirst() { m_collection->playFirst(); }
void slotPlayNextAlbum() { m_collection->playNextAlbum(); }
diff --git a/juk/playlistexporter.h b/juk/playlistexporter.h
index 3caae65f..39f13605 100644
--- a/juk/playlistexporter.h
+++ b/juk/playlistexporter.h
@@ -18,8 +18,8 @@
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
/**
* Abstract base class to define an interface for classes that export
@@ -35,13 +35,13 @@ public:
virtual ~PlaylistExporter() { }
/**
- * Returns a KAction that can be used to invoke the export.
+ * Returns a TDEAction that can be used to invoke the export.
* Returns 0 if it is not possible.
*
- * @return pointer to a KAction that can invoke the export, or 0 on
+ * @return pointer to a TDEAction that can invoke the export, or 0 on
* failure.
*/
- virtual KAction *action() = 0;
+ virtual TDEAction *action() = 0;
};
#endif /* PLAYLISTEXPORTER_H */
diff --git a/juk/playlistitem.cpp b/juk/playlistitem.cpp
index 2a9a2412..67ba4034 100644
--- a/juk/playlistitem.cpp
+++ b/juk/playlistitem.cpp
@@ -97,7 +97,7 @@ const TQPixmap *PlaylistItem::pixmap(int column) const
m_playingItems.contains(const_cast<PlaylistItem *>(this)))
return &playing;
- return KListViewItem::pixmap(column);
+ return TDEListViewItem::pixmap(column);
}
TQString PlaylistItem::text(int column) const
@@ -137,7 +137,7 @@ TQString PlaylistItem::text(int column) const
case FullPathColumn:
return d->fileHandle.fileInfo().absFilePath();
default:
- return KListViewItem::text(column);
+ return TDEListViewItem::text(column);
}
}
@@ -145,11 +145,11 @@ void PlaylistItem::setText(int column, const TQString &text)
{
int offset = playlist()->columnOffset();
if(column - offset >= 0 && column + offset <= lastColumn()) {
- KListViewItem::setText(column, TQString());
+ TDEListViewItem::setText(column, TQString());
return;
}
- KListViewItem::setText(column, text);
+ TDEListViewItem::setText(column, text);
playlist()->slotWeightDirty(column);
}
@@ -178,7 +178,7 @@ void PlaylistItem::setPlaying(bool playing, bool master)
void PlaylistItem::setSelected(bool selected)
{
playlist()->markItemSelected(this, selected);
- KListViewItem::setSelected(selected);
+ TDEListViewItem::setSelected(selected);
}
void PlaylistItem::guessTagInfo(TagGuesser::Type type)
@@ -240,7 +240,7 @@ void PlaylistItem::clear()
////////////////////////////////////////////////////////////////////////////////
PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent) :
- KListViewItem(parent),
+ TDEListViewItem(parent),
d(0),
m_watched(0)
{
@@ -248,7 +248,7 @@ PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent) :
}
PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after) :
- KListViewItem(parent, after),
+ TDEListViewItem(parent, after),
d(0),
m_watched(0)
{
@@ -259,7 +259,7 @@ PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent, TQListVie
// This constructor should only be used by the CollectionList subclass.
PlaylistItem::PlaylistItem(CollectionList *parent) :
- KListViewItem(parent),
+ TDEListViewItem(parent),
m_watched(0)
{
d = new Data;
@@ -270,7 +270,7 @@ PlaylistItem::PlaylistItem(CollectionList *parent) :
void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align)
{
if(!m_playingItems.contains(this))
- return KListViewItem::paintCell(p, cg, column, width, align);
+ return TDEListViewItem::paintCell(p, cg, column, width, align);
TQColorGroup colorGroup = cg;
diff --git a/juk/playlistitem.h b/juk/playlistitem.h
index bcacc4e5..343a3c7c 100644
--- a/juk/playlistitem.h
+++ b/juk/playlistitem.h
@@ -41,7 +41,7 @@ typedef TQValueList<PlaylistItem *> PlaylistItemList;
* Playlist::clearItem().
*/
-class PlaylistItem : public KListViewItem
+class PlaylistItem : public TDEListViewItem
{
friend class Playlist;
friend class SearchPlaylist;
@@ -137,12 +137,12 @@ public:
/**
* Returns properly casted item below this one.
*/
- PlaylistItem *itemBelow() { return static_cast<PlaylistItem *>(KListViewItem::itemBelow()); }
+ PlaylistItem *itemBelow() { return static_cast<PlaylistItem *>(TDEListViewItem::itemBelow()); }
/**
* Returns properly casted item above this one.
*/
- PlaylistItem *itemAbove() { return static_cast<PlaylistItem *>(KListViewItem::itemAbove()); }
+ PlaylistItem *itemAbove() { return static_cast<PlaylistItem *>(TDEListViewItem::itemAbove()); }
/**
* Returns a reference to the list of the currnetly playing items, with the
diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp
index 613ee2cc..e4042ae8 100644
--- a/juk/playlistsplitter.cpp
+++ b/juk/playlistsplitter.cpp
@@ -85,7 +85,7 @@ void PlaylistSplitter::slotFocusCurrentPlaylist()
if(playlist) {
playlist->setFocus();
- playlist->KListView::selectAll(false);
+ playlist->TDEListView::selectAll(false);
// Select the top visible (and matching) item.
@@ -117,11 +117,11 @@ Playlist *PlaylistSplitter::visiblePlaylist() const
void PlaylistSplitter::setupActions()
{
- KToggleAction *showSearch =
- new KToggleAction(i18n("Show &Search Bar"), "filefind", 0, ActionCollection::actions(), "showSearch");
+ TDEToggleAction *showSearch =
+ new TDEToggleAction(i18n("Show &Search Bar"), "filefind", 0, ActionCollection::actions(), "showSearch");
showSearch->setCheckedState(i18n("Hide &Search Bar"));
- new KAction(i18n("Edit Track Search"), "edit_clear", "F6", TQT_TQOBJECT(this), TQT_SLOT(setFocus()), ActionCollection::actions(), "editTrackSearch");
+ new TDEAction(i18n("Edit Track Search"), "edit_clear", "F6", TQT_TQOBJECT(this), TQT_SLOT(setFocus()), ActionCollection::actions(), "editTrackSearch");
}
void PlaylistSplitter::setupLayout()
@@ -175,7 +175,7 @@ void PlaylistSplitter::setupLayout()
m_playlistBox->object(), TQT_SLOT(slotCreateSearchPlaylist()));
connect(m_searchWidget, TQT_SIGNAL(signalShown(bool)),
m_playlistBox->object(), TQT_SLOT(slotSetSearchEnabled(bool)));
- connect(action<KToggleAction>("showSearch"), TQT_SIGNAL(toggled(bool)),
+ connect(action<TDEToggleAction>("showSearch"), TQT_SIGNAL(toggled(bool)),
m_searchWidget, TQT_SLOT(setEnabled(bool)));
topLayout->addWidget(nowPlaying);
@@ -198,7 +198,7 @@ void PlaylistSplitter::readConfig()
setSizes(splitterSizes);
bool showSearch = config.readBoolEntry("ShowSearch", true);
- action<KToggleAction>("showSearch")->setChecked(showSearch);
+ action<TDEToggleAction>("showSearch")->setChecked(showSearch);
m_searchWidget->setShown(showSearch);
}
@@ -206,7 +206,7 @@ void PlaylistSplitter::saveConfig()
{
TDEConfigGroup config(TDEGlobal::config(), "Splitter");
config.writeEntry("PlaylistSplitterSizes", sizes());
- config.writeEntry("ShowSearch", action<KToggleAction>("showSearch")->isChecked());
+ config.writeEntry("ShowSearch", action<TDEToggleAction>("showSearch")->isChecked());
}
void PlaylistSplitter::slotShowSearchResults()
diff --git a/juk/playlistsplitter.h b/juk/playlistsplitter.h
index 8e9f0e0f..8c6216ac 100644
--- a/juk/playlistsplitter.h
+++ b/juk/playlistsplitter.h
@@ -22,7 +22,7 @@
#include "playlistbox.h"
-class KActionMenu;
+class TDEActionMenu;
class PlaylistItem;
class SearchWidget;
class HistoryPlaylist;
diff --git a/juk/searchwidget.cpp b/juk/searchwidget.cpp
index 7f2ca315..13766ed0 100644
--- a/juk/searchwidget.cpp
+++ b/juk/searchwidget.cpp
@@ -188,7 +188,7 @@ void SearchLine::updateColumns()
// SearchWidget public methods
////////////////////////////////////////////////////////////////////////////////
-SearchWidget::SearchWidget(TQWidget *parent, const char *name) : KToolBar(parent, name)
+SearchWidget::SearchWidget(TQWidget *parent, const char *name) : TDEToolBar(parent, name)
{
setupLayout();
updateColumns();
diff --git a/juk/searchwidget.h b/juk/searchwidget.h
index cc82140b..b8990107 100644
--- a/juk/searchwidget.h
+++ b/juk/searchwidget.h
@@ -70,7 +70,7 @@ private:
TQValueList<int> m_columnList;
};
-class SearchWidget : public KToolBar, public SearchIface
+class SearchWidget : public TDEToolBar, public SearchIface
{
Q_OBJECT
diff --git a/juk/slideraction.cpp b/juk/slideraction.cpp
index cf68043c..c62aba90 100644
--- a/juk/slideraction.cpp
+++ b/juk/slideraction.cpp
@@ -127,7 +127,7 @@ const int SliderAction::minPosition = 0;
const int SliderAction::maxPosition = 1000;
SliderAction::SliderAction(const TQString &text, TQObject *parent, const char *name)
- : KAction(text, 0, parent, name),
+ : TDEAction(text, 0, parent, name),
m_toolBar(0),
m_layout(0),
m_trackPositionSlider(0),
@@ -153,10 +153,10 @@ int SliderAction::plug(TQWidget *parent, int index)
// the check for null makes sure that there is only one toolbar that this is
// "plugged" in to
- if(parent->inherits("KToolBar") && !m_toolBar) {
- m_toolBar = static_cast<KToolBar *>(parent);
+ if(parent->inherits("TDEToolBar") && !m_toolBar) {
+ m_toolBar = static_cast<TDEToolBar *>(parent);
- int id = KAction::getToolButtonID();
+ int id = TDEAction::getToolButtonID();
m_toolBar->insertWidget(id, w->width(), w, index);
@@ -180,8 +180,8 @@ int SliderAction::plug(TQWidget *parent, int index)
void SliderAction::unplug(TQWidget *parent)
{
- if (parent->inherits("KToolBar")) {
- m_toolBar = static_cast<KToolBar *>(parent);
+ if (parent->inherits("TDEToolBar")) {
+ m_toolBar = static_cast<TDEToolBar *>(parent);
int index = findContainer(m_toolBar);
if (index != -1) {
@@ -204,7 +204,7 @@ void SliderAction::slotUpdateOrientation()
if(!m_toolBar)
return;
- if(m_toolBar->barPos() == KToolBar::Right || m_toolBar->barPos() == KToolBar::Left) {
+ if(m_toolBar->barPos() == TDEToolBar::Right || m_toolBar->barPos() == TDEToolBar::Left) {
m_trackPositionSlider->setOrientation(Qt::Vertical);
m_volumeSlider->setOrientation(Qt::Vertical);
m_layout->setDirection(TQBoxLayout::TopToBottom);
@@ -228,14 +228,14 @@ TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by bas
base->setBackgroundMode(parent->backgroundMode());
base->setName("kde toolbar widget");
- KToolBar *toolBar = dynamic_cast<KToolBar *>(parent);
+ TDEToolBar *toolBar = dynamic_cast<TDEToolBar *>(parent);
if(toolBar)
toolBar->setStretchableWidget(base);
Qt::Orientation orientation;
- if(toolBar && toolBar->barPos() == KToolBar::Right || toolBar->barPos() == KToolBar::Left)
+ if(toolBar && toolBar->barPos() == TDEToolBar::Right || toolBar->barPos() == TDEToolBar::Left)
orientation =Qt::Vertical;
else
orientation =Qt::Horizontal;
@@ -299,7 +299,7 @@ void SliderAction::slotUpdateSize()
if(!m_toolBar)
return;
- if(m_toolBar->barPos() == KToolBar::Right || m_toolBar->barPos() == KToolBar::Left) {
+ if(m_toolBar->barPos() == TDEToolBar::Right || m_toolBar->barPos() == TDEToolBar::Left) {
m_volumeSlider->setMaximumWidth(m_toolBar->iconSize() - offset);
m_volumeSlider->setMaximumHeight(volumeMax);
diff --git a/juk/slideraction.h b/juk/slideraction.h
index 0f4244da..5ce19eb3 100644
--- a/juk/slideraction.h
+++ b/juk/slideraction.h
@@ -46,7 +46,7 @@ private slots:
void slotValueChanged(int value);
};
-class SliderAction : public KAction
+class SliderAction : public TDEAction
{
Q_OBJECT
@@ -86,7 +86,7 @@ private slots:
void slotToolbarDestroyed();
private:
- KToolBar *m_toolBar;
+ TDEToolBar *m_toolBar;
TQBoxLayout *m_layout;
TQSlider *m_trackPositionSlider;
VolumeSlider *m_volumeSlider;
diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp
index e7c2a90e..045b00f0 100644
--- a/juk/systemtray.cpp
+++ b/juk/systemtray.cpp
@@ -162,10 +162,10 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent,
// Just create this here so that it show up in the DCOP interface and the key
// bindings dialog.
- new KAction(i18n("Redisplay Popup"), KShortcut(), TQT_TQOBJECT(this),
+ new TDEAction(i18n("Redisplay Popup"), TDEShortcut(), TQT_TQOBJECT(this),
TQT_SLOT(slotPlay()), ActionCollection::actions(), "showPopup");
- KPopupMenu *cm = contextMenu();
+ TDEPopupMenu *cm = contextMenu();
connect(PlayerManager::instance(), TQT_SIGNAL(signalPlay()), this, TQT_SLOT(slotPlay()));
connect(PlayerManager::instance(), TQT_SIGNAL(signalPause()), this, TQT_SLOT(slotPause()));
@@ -181,7 +181,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent,
// Pity the actionCollection doesn't keep track of what sub-menus it has.
- KActionMenu *menu = new KActionMenu(i18n("&Random Play"), TQT_TQOBJECT(this));
+ TDEActionMenu *menu = new TDEActionMenu(i18n("&Random Play"), TQT_TQOBJECT(this));
menu->insert(action("disableRandomPlay"));
menu->insert(action("randomPlay"));
menu->insert(action("albumRandomPlay"));
@@ -347,7 +347,7 @@ void SystemTray::createPopup()
// If the action exists and it's checked, do our stuff
- if(!action<KToggleAction>("togglePopups")->isChecked())
+ if(!action<TDEToggleAction>("togglePopups")->isChecked())
return;
delete m_popup;
diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index efff323d..7ac38fcd 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -430,7 +430,7 @@ void TagEditor::readConfig()
}
bool show = config.readBoolEntry("Show", false);
- action<KToggleAction>("showEditor")->setChecked(show);
+ action<TDEToggleAction>("showEditor")->setChecked(show);
setShown(show);
TagLib::StringList genres = TagLib::ID3v1::genreList();
@@ -464,16 +464,16 @@ void TagEditor::saveConfig()
config.writeEntry("AlbumNameBoxMode", m_albumNameBox->completionMode());
config.writeEntry("GenreBoxMode", m_genreBox->completionMode());
}
- config.writeEntry("Show", action<KToggleAction>("showEditor")->isChecked());
+ config.writeEntry("Show", action<TDEToggleAction>("showEditor")->isChecked());
}
void TagEditor::setupActions()
{
- KToggleAction *show = new KToggleAction(i18n("Show &Tag Editor"), "edit", 0, ActionCollection::actions(), "showEditor");
+ TDEToggleAction *show = new TDEToggleAction(i18n("Show &Tag Editor"), "edit", 0, ActionCollection::actions(), "showEditor");
show->setCheckedState(i18n("Hide &Tag Editor"));
connect(show, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShown(bool)));
- new KAction(i18n("&Save"), "filesave", "CTRL+t", TQT_TQOBJECT(this), TQT_SLOT(slotSave()), ActionCollection::actions(), "saveItem");
+ new TDEAction(i18n("&Save"), "filesave", "CTRL+t", TQT_TQOBJECT(this), TQT_SLOT(slotSave()), ActionCollection::actions(), "saveItem");
}
void TagEditor::setupLayout()
diff --git a/juk/tagguesserconfigdlg.cpp b/juk/tagguesserconfigdlg.cpp
index 5d85dcc1..5ee2b6aa 100644
--- a/juk/tagguesserconfigdlg.cpp
+++ b/juk/tagguesserconfigdlg.cpp
@@ -37,7 +37,7 @@ TagGuesserConfigDlg::TagGuesserConfigDlg(TQWidget *parent, const char *name)
TQStringList::ConstIterator it = schemes.begin();
TQStringList::ConstIterator end = schemes.end();
for (; it != end; ++it) {
- KListViewItem *item = new KListViewItem(m_child->lvSchemes, *it);
+ TDEListViewItem *item = new TDEListViewItem(m_child->lvSchemes, *it);
item->moveItem(m_child->lvSchemes->lastItem());
}
@@ -105,7 +105,7 @@ void TagGuesserConfigDlg::slotMoveDownClicked()
void TagGuesserConfigDlg::slotAddClicked()
{
- KListViewItem *item = new KListViewItem(m_child->lvSchemes);
+ TDEListViewItem *item = new TDEListViewItem(m_child->lvSchemes);
m_child->lvSchemes->rename(item, 0);
}
diff --git a/juk/tagguesserconfigdlgwidget.ui b/juk/tagguesserconfigdlgwidget.ui
index f3b3b2e5..1a17cffe 100644
--- a/juk/tagguesserconfigdlgwidget.ui
+++ b/juk/tagguesserconfigdlgwidget.ui
@@ -17,7 +17,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView" row="0" column="0" rowspan="5" colspan="1">
+ <widget class="TDEListView" row="0" column="0" rowspan="5" colspan="1">
<column>
<property name="text">
<string>File Name Scheme</string>
diff --git a/juk/trackpickerdialog.cpp b/juk/trackpickerdialog.cpp
index 91e2b012..af9c01c0 100644
--- a/juk/trackpickerdialog.cpp
+++ b/juk/trackpickerdialog.cpp
@@ -27,11 +27,11 @@
#define NUMBER(x) (x == 0 ? TQString() : TQString::number(x))
-class TrackPickerItem : public KListViewItem
+class TrackPickerItem : public TDEListViewItem
{
public:
- TrackPickerItem(KListView *parent, const KTRMResult &result) :
- KListViewItem(parent, parent->lastChild(),
+ TrackPickerItem(TDEListView *parent, const KTRMResult &result) :
+ TDEListViewItem(parent, parent->lastChild(),
result.title(), result.artist(), result.album(),
NUMBER(result.track()), NUMBER(result.year())),
m_result(result) {}
diff --git a/juk/trackpickerdialogbase.ui b/juk/trackpickerdialogbase.ui
index ddf72c2a..5b029b00 100644
--- a/juk/trackpickerdialogbase.ui
+++ b/juk/trackpickerdialogbase.ui
@@ -83,7 +83,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Track Name</string>
diff --git a/juk/tracksequenceiterator.cpp b/juk/tracksequenceiterator.cpp
index b60a68d0..4f9a0313 100644
--- a/juk/tracksequenceiterator.cpp
+++ b/juk/tracksequenceiterator.cpp
@@ -71,9 +71,9 @@ void DefaultSequenceIterator::advance()
if(!current())
return;
- bool isRandom = action("randomPlay") && action<KToggleAction>("randomPlay")->isChecked();
- bool loop = action("loopPlaylist") && action<KToggleAction>("loopPlaylist")->isChecked();
- bool albumRandom = action("albumRandomPlay") && action<KToggleAction>("albumRandomPlay")->isChecked();
+ bool isRandom = action("randomPlay") && action<TDEToggleAction>("randomPlay")->isChecked();
+ bool loop = action("loopPlaylist") && action<TDEToggleAction>("loopPlaylist")->isChecked();
+ bool albumRandom = action("albumRandomPlay") && action<TDEToggleAction>("albumRandomPlay")->isChecked();
if(isRandom || albumRandom) {
if(m_randomItems.isEmpty() && loop) {
@@ -163,8 +163,8 @@ void DefaultSequenceIterator::backup()
void DefaultSequenceIterator::prepareToPlay(Playlist *playlist)
{
- bool random = action("randomPlay") && action<KToggleAction>("randomPlay")->isChecked();
- bool albumRandom = action("albumRandomPlay") && action<KToggleAction>("albumRandomPlay")->isChecked();
+ bool random = action("randomPlay") && action<TDEToggleAction>("randomPlay")->isChecked();
+ bool albumRandom = action("albumRandomPlay") && action<TDEToggleAction>("albumRandomPlay")->isChecked();
if(random || albumRandom) {
PlaylistItemList items = playlist->selectedItems();
@@ -213,8 +213,8 @@ void DefaultSequenceIterator::setCurrent(PlaylistItem *current)
TrackSequenceIterator::setCurrent(current);
- bool random = action("randomPlay") && action<KToggleAction>("randomPlay")->isChecked();
- bool albumRandom = action("albumRandomPlay") && action<KToggleAction>("albumRandomPlay")->isChecked();
+ bool random = action("randomPlay") && action<TDEToggleAction>("randomPlay")->isChecked();
+ bool albumRandom = action("albumRandomPlay") && action<TDEToggleAction>("albumRandomPlay")->isChecked();
if((albumRandom || random) && current && m_randomItems.isEmpty()) {
diff --git a/juk/tracksequencemanager.h b/juk/tracksequencemanager.h
index c21f7d50..4e7f26a7 100644
--- a/juk/tracksequencemanager.h
+++ b/juk/tracksequencemanager.h
@@ -18,7 +18,7 @@
#include <tqobject.h>
-class KPopupMenu;
+class TDEPopupMenu;
class TrackSequenceIterator;
class PlaylistItem;
class Playlist;
@@ -110,10 +110,10 @@ public:
PlaylistItem *currentItem() const;
/**
- * @return the current KPopupMenu used by the manager, or 0 if none is
+ * @return the current TDEPopupMenu used by the manager, or 0 if none is
* set
*/
- KPopupMenu *popupMenu() const { return m_popupMenu; }
+ TDEPopupMenu *popupMenu() const { return m_popupMenu; }
/**
* @return the TrackSequenceManager's idea of the current playlist
@@ -182,7 +182,7 @@ protected slots:
private:
Playlist *m_playlist;
PlaylistItem *m_curItem, *m_playNextItem;
- KPopupMenu *m_popupMenu;
+ TDEPopupMenu *m_popupMenu;
TrackSequenceIterator *m_iterator;
TrackSequenceIterator *m_defaultIterator;
bool m_initialized;
diff --git a/juk/viewmode.cpp b/juk/viewmode.cpp
index d1877730..efb0d06c 100644
--- a/juk/viewmode.cpp
+++ b/juk/viewmode.cpp
@@ -227,7 +227,7 @@ void CompactViewMode::paintCell(PlaylistBox::Item *item,
const TQColorGroup &colorGroup,
int column, int width, int align)
{
- item->KListViewItem::paintCell(painter, colorGroup, column, width, align);
+ item->TDEListViewItem::paintCell(painter, colorGroup, column, width, align);
if(item == item->listView()->dropItem())
paintDropIndicator(painter, width, item->height());
}
diff --git a/juk/viewmode.h b/juk/viewmode.h
index 51c3d096..cf260204 100644
--- a/juk/viewmode.h
+++ b/juk/viewmode.h
@@ -109,7 +109,7 @@ public:
const TQColorGroup &colorGroup,
int column, int width, int align);
- virtual void setupItem(PlaylistBox::Item *item) const { item->KListViewItem::setup(); }
+ virtual void setupItem(PlaylistBox::Item *item) const { item->TDEListViewItem::setup(); }
protected:
virtual void updateHeights();
};
diff --git a/juk/webimagefetcher.cpp b/juk/webimagefetcher.cpp
index a34309d2..7815afff 100644
--- a/juk/webimagefetcher.cpp
+++ b/juk/webimagefetcher.cpp
@@ -201,7 +201,7 @@ void WebImageFetcher::slotNewSearch()
void WebImageFetcher::displayWaitMessage()
{
- KStatusBar *statusBar = static_cast<KMainWindow *>(kapp->mainWidget())->statusBar();
+ KStatusBar *statusBar = static_cast<TDEMainWindow *>(kapp->mainWidget())->statusBar();
statusBar->message(i18n("Searching for Images. Please Wait..."));
slotLoadImageURLs();
statusBar->clear();
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
diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp
index a80cd674..bb25cf4e 100644
--- a/kaudiocreator/kaudiocreator.cpp
+++ b/kaudiocreator/kaudiocreator.cpp
@@ -50,7 +50,7 @@
* Constructor. Connect all of the object and the job control.
*/
KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) :
- KMainWindow(parent, name)
+ TDEMainWindow(parent, name)
{
janusWidget = new KJanusWidget(this, name, KJanusWidget::Tabbed);
setCentralWidget(janusWidget);
@@ -66,20 +66,20 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) :
resize(500, 440);
- /*KAction *eject = */new KAction( i18n("&Eject CD"), 0, TQT_TQOBJECT(tracks),
+ /*TDEAction *eject = */new TDEAction( i18n("&Eject CD"), 0, TQT_TQOBJECT(tracks),
TQT_SLOT( eject() ), actionCollection(), "eject" );
- (void)new KAction( i18n("&Configure KAudioCreator..."), 0, TQT_TQOBJECT(this),
+ (void)new TDEAction( i18n("&Configure KAudioCreator..."), 0, TQT_TQOBJECT(this),
TQT_SLOT( showSettings() ), actionCollection(), "configure_kaudiocreator" );
- KAction *selectAll = new KAction( i18n( "Select &All Tracks"), 0, TQT_TQOBJECT(tracks),
+ TDEAction *selectAll = new TDEAction( i18n( "Select &All Tracks"), 0, TQT_TQOBJECT(tracks),
TQT_SLOT( selectAllTracks() ), actionCollection(), "select_all" ) ;
- KAction *deselectAll = new KAction( i18n( "Deselect &All Tracks"), 0, TQT_TQOBJECT(tracks),
+ TDEAction *deselectAll = new TDEAction( i18n( "Deselect &All Tracks"), 0, TQT_TQOBJECT(tracks),
TQT_SLOT( deselectAllTracks() ), actionCollection(), "deselect_all" );
selectAll->setEnabled( false );
deselectAll->setEnabled( false );
- KActionMenu *actActionMenu = new KActionMenu( i18n("Rip &Selection"), "rip", actionCollection(), "rip" );
+ TDEActionMenu *actActionMenu = new TDEActionMenu( i18n("Rip &Selection"), "rip", actionCollection(), "rip" );
actActionMenu->setDelayed(true); //needed for checking "all accounts"
actActionMenu->setEnabled( false );
connect( actActionMenu, TQT_SIGNAL( activated() ), TQT_TQOBJECT(tracks), TQT_SLOT( startSession() ) );
@@ -88,7 +88,7 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) :
connect( ripMenu, TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), TQT_SLOT( slotRipSelection(int)) );
connect( ripMenu, TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( getRipMenu()) );
- KAction *rip = new KAction( i18n( "Rip &Selection" ), 0, TQT_TQOBJECT(tracks),
+ TDEAction *rip = new TDEAction( i18n( "Rip &Selection" ), 0, TQT_TQOBJECT(tracks),
TQT_SLOT( startSession() ), actionCollection(), "rip_selected" );
rip->setEnabled( false );
@@ -113,18 +113,18 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) :
connect( tracks, TQT_SIGNAL( hasTracks(bool) ), deselectAll, TQT_SLOT( setEnabled(bool)) );
connect( tracks, TQT_SIGNAL( hasTracks(bool) ), selectAll, TQT_SLOT( setEnabled(bool)) );
- (void)new KAction(i18n("Remove &Completed Jobs"), 0, TQT_TQOBJECT(jobQue),
+ (void)new TDEAction(i18n("Remove &Completed Jobs"), 0, TQT_TQOBJECT(jobQue),
TQT_SLOT(clearDoneJobs()), actionCollection(), "clear_done_jobs" );
- KAction *edit = new KAction(i18n("&Edit Album..."), 0, TQT_TQOBJECT(tracks),
+ TDEAction *edit = new TDEAction(i18n("&Edit Album..."), 0, TQT_TQOBJECT(tracks),
TQT_SLOT(editInformation()), actionCollection(), "edit_cd");
connect(tracks, TQT_SIGNAL(hasCD(bool)), edit, TQT_SLOT(setEnabled(bool)));
edit->setEnabled( false );
- (void)new KAction(i18n("Encode &File..."), 0, TQT_TQOBJECT(this),
+ (void)new TDEAction(i18n("Encode &File..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(encodeFile()), actionCollection(), "encode_file");
- KAction *cddb = new KAction(i18n("&CDDB Lookup"), 0, TQT_TQOBJECT(tracks),
+ TDEAction *cddb = new TDEAction(i18n("&CDDB Lookup"), 0, TQT_TQOBJECT(tracks),
TQT_SLOT(performCDDB()), actionCollection(), "cddb_now");
connect(tracks, TQT_SIGNAL(hasCD(bool)), cddb, TQT_SLOT(setEnabled(bool)));
cddb->setEnabled( false );
diff --git a/kaudiocreator/kaudiocreator.h b/kaudiocreator/kaudiocreator.h
index 5624c563..02693150 100644
--- a/kaudiocreator/kaudiocreator.h
+++ b/kaudiocreator/kaudiocreator.h
@@ -31,9 +31,9 @@ class Ripper;
class Encoder;
class TDECModule;
class EncoderConfigImp;
-class KPopupMenu;
+class TDEPopupMenu;
-class KAudioCreator : public KMainWindow {
+class KAudioCreator : public TDEMainWindow {
Q_OBJECT
@@ -62,7 +62,7 @@ private:
JobQueImp *jobQue;
Ripper *ripper;
Encoder *encoder;
- KPopupMenu *ripMenu;
+ TDEPopupMenu *ripMenu;
};
diff --git a/kaudiocreator/tracks.ui b/kaudiocreator/tracks.ui
index 0f9a5743..702be247 100644
--- a/kaudiocreator/tracks.ui
+++ b/kaudiocreator/tracks.ui
@@ -41,7 +41,7 @@
<property name="hAlign" stdset="0">
</property>
</widget>
- <widget class="KListView" row="2" column="0">
+ <widget class="TDEListView" row="2" column="0">
<column>
<property name="text">
<string>Rip</string>
diff --git a/kaudiocreator/tracksimp.h b/kaudiocreator/tracksimp.h
index 3cc2a09e..3e4134a1 100644
--- a/kaudiocreator/tracksimp.h
+++ b/kaudiocreator/tracksimp.h
@@ -41,11 +41,11 @@ class Job;
class TDEProcess;
class KCompactDisc;
-class TracksItem : public KListViewItem
+class TracksItem : public TDEListViewItem
{
public:
- TracksItem( KListView *parent, KListViewItem *after, TQString t, TQString a, int tr, TQString l, TQString c )
- : KListViewItem( parent, after, TQString()/*rip*/, TQString::number(tr), l, t )
+ TracksItem( TDEListView *parent, TDEListViewItem *after, TQString t, TQString a, int tr, TQString l, TQString c )
+ : TDEListViewItem( parent, after, TQString()/*rip*/, TQString::number(tr), l, t )
{
m_title = t;
m_artist = a;
diff --git a/kmix/KMixApp.cpp b/kmix/KMixApp.cpp
index 10e7b6ae..40bf6cfb 100644
--- a/kmix/KMixApp.cpp
+++ b/kmix/KMixApp.cpp
@@ -50,7 +50,7 @@ KMixApp::newInstance()
{
m_kmix = new KMixWindow;
connect(this, TQT_SIGNAL(stopUpdatesOnVisibility()), m_kmix, TQT_SLOT(stopVisibilityUpdates()));
- if ( isRestored() && KMainWindow::canBeRestored(0) )
+ if ( isRestored() && TDEMainWindow::canBeRestored(0) )
{
m_kmix->restore(0, FALSE);
}
diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index f583c352..c0643331 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -61,7 +61,7 @@
* Constructs a mixer window (KMix main window)
*/
KMixWindow::KMixWindow()
- : KMainWindow(0, 0, 0, 0), m_showTicks( true ),
+ : TDEMainWindow(0, 0, 0, 0), m_showTicks( true ),
m_dockWidget( 0L )
{
m_visibilityUpdateAllowed = true;
@@ -112,20 +112,20 @@ KMixWindow::initActions()
// settings menu
KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBar()), actionCollection());
KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection());
- new KAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, TQT_TQOBJECT(this),
+ new TDEAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, TQT_TQOBJECT(this),
TQT_SLOT( configureGlobalShortcuts() ), actionCollection(), "settings_global" );
KStdAction::keyBindings( guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
- (void) new KAction( i18n( "Hardware &Information" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotHWInfo() ), actionCollection(), "hwinfo" );
- (void) new KAction( i18n( "Hide Mixer Window" ), Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(hide()), actionCollection(), "hide_kmixwindow" );
+ (void) new TDEAction( i18n( "Hardware &Information" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotHWInfo() ), actionCollection(), "hwinfo" );
+ (void) new TDEAction( i18n( "Hide Mixer Window" ), Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(hide()), actionCollection(), "hide_kmixwindow" );
m_globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this) );
m_globalAccel->insert( "Increase volume", i18n( "Increase Volume of Master Channel"), TQString(),
- KShortcut(TQString("XF86AudioRaiseVolume")), KShortcut(TQString("XF86AudioRaiseVolume")), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) );
+ TDEShortcut(TQString("XF86AudioRaiseVolume")), TDEShortcut(TQString("XF86AudioRaiseVolume")), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) );
m_globalAccel->insert( "Decrease volume", i18n( "Decrease Volume of Master Channel"), TQString(),
- KShortcut(TQString("XF86AudioLowerVolume")), KShortcut(TQString("XF86AudioLowerVolume")), TQT_TQOBJECT(this), TQT_SLOT( decreaseVolume() ) );
+ TDEShortcut(TQString("XF86AudioLowerVolume")), TDEShortcut(TQString("XF86AudioLowerVolume")), TQT_TQOBJECT(this), TQT_SLOT( decreaseVolume() ) );
m_globalAccel->insert( "Toggle mute", i18n( "Toggle Mute of Master Channel"), TQString(),
- KShortcut(TQString("XF86AudioMute")), KShortcut(TQString("XF86AudioMute")), TQT_TQOBJECT(this), TQT_SLOT( toggleMuted() ) );
+ TDEShortcut(TQString("XF86AudioMute")), TDEShortcut(TQString("XF86AudioMute")), TQT_TQOBJECT(this), TQT_SLOT( toggleMuted() ) );
m_globalAccel->readSettings();
m_globalAccel->updateConnections();
@@ -201,10 +201,10 @@ KMixWindow::updateDocking()
/* Belongs in KMixDockWidget
// create RMB menu
- KPopupMenu *menu = m_dockWidget->contextMenu();
+ TDEPopupMenu *menu = m_dockWidget->contextMenu();
// !! check this
- KAction *a = actionCollection()->action( "dock_mute" );
+ TDEAction *a = actionCollection()->action( "dock_mute" );
if ( a ) a->plug( menu );
*/
@@ -327,7 +327,7 @@ KMixWindow::loadConfig()
// show/hide menu bar
m_showMenubar = config->readBoolEntry("Menubar", true);
- KToggleAction *a = static_cast<KToggleAction*>(actionCollection()->action("options_show_menubar"));
+ TDEToggleAction *a = static_cast<TDEToggleAction*>(actionCollection()->action("options_show_menubar"));
if (a) a->setChecked( m_showMenubar );
// restore window size and position
diff --git a/kmix/kmix.h b/kmix/kmix.h
index 870fcb2e..3b2786c3 100644
--- a/kmix/kmix.h
+++ b/kmix/kmix.h
@@ -37,7 +37,7 @@ class TQWidgetStack;
// include files for KDE
#include <kmainwindow.h>
-class KAccel;
+class TDEAccel;
class TDEGlobalAccel;
class KComboBox;
class KMixerWidget;
@@ -52,7 +52,7 @@ class Mixer;
class
-KMixWindow : public KMainWindow
+KMixWindow : public TDEMainWindow
{
Q_OBJECT
@@ -91,7 +91,7 @@ KMixWindow : public KMainWindow
void stopVisibilityUpdates();
private:
- KAccel *m_keyAccel;
+ TDEAccel *m_keyAccel;
TDEGlobalAccel *m_globalAccel;
TQPopupMenu *m_fileMenu;
TQPopupMenu *m_viewMenu;
diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp
index aff3e500..e4f30b05 100644
--- a/kmix/kmixdockwidget.cpp
+++ b/kmix/kmixdockwidget.cpp
@@ -81,17 +81,17 @@ KMixDockWidget::~KMixDockWidget()
void KMixDockWidget::createActions()
{
// Put "Mute" selector in context menu
- (void)new KToggleAction( i18n( "M&ute" ), 0, TQT_TQOBJECT(this), TQT_SLOT( dockMute() ),
+ (void)new TDEToggleAction( i18n( "M&ute" ), 0, TQT_TQOBJECT(this), TQT_SLOT( dockMute() ),
actionCollection(), "dock_mute" );
- KAction *a = actionCollection()->action( "dock_mute" );
- KPopupMenu *popupMenu = contextMenu();
+ TDEAction *a = actionCollection()->action( "dock_mute" );
+ TDEPopupMenu *popupMenu = contextMenu();
if ( a ) a->plug( popupMenu );
// Put "Select Master Channel" dialog in context menu
if ( m_mixer != 0 ) {
- (void)new KAction( i18n("Select Master Channel..."), 0, TQT_TQOBJECT(this), TQT_SLOT(selectMaster()),
+ (void)new TDEAction( i18n("Select Master Channel..."), 0, TQT_TQOBJECT(this), TQT_SLOT(selectMaster()),
actionCollection(), "select_master");
- KAction *a2 = actionCollection()->action( "select_master" );
+ TDEAction *a2 = actionCollection()->action( "select_master" );
if (a2) a2->plug( popupMenu );
}
@@ -381,9 +381,9 @@ KMixDockWidget::dockMute()
}
void
-KMixDockWidget::contextMenuAboutToShow( KPopupMenu* /* menu */ )
+KMixDockWidget::contextMenuAboutToShow( TDEPopupMenu* /* menu */ )
{
- KAction* showAction = actionCollection()->action("minimizeRestore");
+ TDEAction* showAction = actionCollection()->action("minimizeRestore");
if ( parentWidget() && showAction )
{
if ( parentWidget()->isVisible() )
@@ -401,7 +401,7 @@ KMixDockWidget::contextMenuAboutToShow( KPopupMenu* /* menu */ )
if ( _dockAreaPopup != 0 )
{
md = _dockAreaPopup->dockDevice();
- KToggleAction *dockMuteAction = static_cast<KToggleAction*>(actionCollection()->action("dock_mute"));
+ TDEToggleAction *dockMuteAction = static_cast<TDEToggleAction*>(actionCollection()->action("dock_mute"));
//kdDebug(67100) << "---> md=" << md << "dockMuteAction=" << dockMuteAction << "isMuted=" << md->isMuted() << endl;
if ( md != 0 && dockMuteAction != 0 ) {
dockMuteAction->setChecked( md->isMuted() );
diff --git a/kmix/kmixdockwidget.h b/kmix/kmixdockwidget.h
index 102df725..2315a087 100644
--- a/kmix/kmixdockwidget.h
+++ b/kmix/kmixdockwidget.h
@@ -66,7 +66,7 @@ class KMixDockWidget : public KSystemTray {
void mousePressEvent(TQMouseEvent *);
void mouseReleaseEvent(TQMouseEvent *);
void wheelEvent(TQWheelEvent *);
- void contextMenuAboutToShow( KPopupMenu* menu );
+ void contextMenuAboutToShow( TDEPopupMenu* menu );
void toggleMinimizeRestore();
void resizeEvent ( TQResizeEvent * );
diff --git a/kmix/kmixerwidget.h b/kmix/kmixerwidget.h
index 03e3195e..e07808b6 100644
--- a/kmix/kmixerwidget.h
+++ b/kmix/kmixerwidget.h
@@ -30,7 +30,7 @@ class TQString;
class TQGridLayout;
#include <kpanelapplet.h>
-class KPopupMenu;
+class TDEPopupMenu;
#include "mixer.h"
#include "mixdevicewidget.h"
@@ -40,8 +40,8 @@ class TQSlider;
// KDE
-class KActionCollection;
-class KActionMenu;
+class TDEActionCollection;
+class TDEActionMenu;
class TDEConfig;
class KTabWidget;
@@ -73,7 +73,7 @@ class KMixerWidget : public TQWidget
int id() const { return m_id; };
- KActionCollection* getActionCollection() const { return 0; /* m_actions; */ }
+ TDEActionCollection* getActionCollection() const { return 0; /* m_actions; */ }
signals:
void masterMuted( bool );
@@ -104,7 +104,7 @@ class KMixerWidget : public TQWidget
std::vector<ViewBase*> _views;
int m_id;
- KActionMenu *m_toggleMixerChannels;
+ TDEActionMenu *m_toggleMixerChannels;
bool _iconsEnabled;
bool _labelsEnabled;
diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp
index d4381b04..b4b803e1 100644
--- a/kmix/mdwenum.cpp
+++ b/kmix/mdwenum.cpp
@@ -53,15 +53,15 @@ MDWEnum::MDWEnum(Mixer *mixer, MixDevice* md,
// create actions (on _mdwActions, see MixDeviceWidget)
// KStdAction::showMenubar() is in MixDeviceWidget now
- new KToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" );
- new KAction( i18n("C&onfigure Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" );
+ new TDEToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" );
+ new TDEAction( i18n("C&onfigure Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" );
// create widgets
createWidgets();
/* !!! remove this for production version */
m_keys->insert( "Next Value", i18n( "Next Value" ), TQString(),
- KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( nextEnumId() ) );
+ TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( nextEnumId() ) );
installEventFilter( this ); // filter for popup
}
@@ -121,7 +121,7 @@ void MDWEnum::showContextMenu()
if( m_mixerwidget == NULL )
return;
- KPopupMenu *menu = m_mixerwidget->getPopup();
+ TDEPopupMenu *menu = m_mixerwidget->getPopup();
TQPoint pos = TQCursor::pos();
menu->popup( pos );
@@ -140,7 +140,7 @@ TQSize MDWEnum::sizeHint() const {
/**
This slot is called, when a user has clicked the mute button. Also it is called by any other
- associated KAction like the context menu.
+ associated TDEAction like the context menu.
*/
void MDWEnum::nextEnumId() {
if( m_mixdevice->isEnum() ) {
diff --git a/kmix/mdwenum.h b/kmix/mdwenum.h
index b25b116b..30e3b1a4 100644
--- a/kmix/mdwenum.h
+++ b/kmix/mdwenum.h
@@ -28,8 +28,8 @@
class TQBoxLayout;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
class KComboBox;
class TDEGlobalAccel;
@@ -50,7 +50,7 @@ public:
TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0);
~MDWEnum();
- void addActionToPopup( KAction *action );
+ void addActionToPopup( TDEAction *action );
TQSize sizeHint() const;
bool eventFilter( TQObject* obj, TQEvent* e );
diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp
index 7664811d..3bfb6bdf 100644
--- a/kmix/mdwslider.cpp
+++ b/kmix/mdwslider.cpp
@@ -64,29 +64,29 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md,
{
// create actions (on _mdwActions, see MixDeviceWidget)
- new KToggleAction( i18n("&Split Channels"), 0, TQT_TQOBJECT(this), TQT_SLOT(toggleStereoLinked()),
+ new TDEToggleAction( i18n("&Split Channels"), 0, TQT_TQOBJECT(this), TQT_SLOT(toggleStereoLinked()),
_mdwActions, "stereo" );
- new KToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" );
+ new TDEToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" );
- KToggleAction *a = new KToggleAction(i18n("&Muted"), 0, 0, 0, _mdwActions, "mute" );
+ TDEToggleAction *a = new TDEToggleAction(i18n("&Muted"), 0, 0, 0, _mdwActions, "mute" );
connect( a, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleMuted()) );
if( m_mixdevice->isRecordable() ) {
- a = new KToggleAction( i18n("Set &Record Source"), 0, 0, 0, _mdwActions, "recsrc" );
+ a = new TDEToggleAction( i18n("Set &Record Source"), 0, 0, 0, _mdwActions, "recsrc" );
connect( a, TQT_SIGNAL(toggled(bool)), TQT_SLOT( toggleRecsrc()) );
}
- new KAction( i18n("C&onfigure Global Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" );
+ new TDEAction( i18n("C&onfigure Global Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" );
// create widgets
createWidgets( showMuteLED, showRecordLED );
m_keys->insert( "Increase volume", i18n( "Increase Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
- KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) );
+ TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) );
m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
- KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( decreaseVolume() ) );
+ TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( decreaseVolume() ) );
m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
- KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleMuted() ) );
+ TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleMuted() ) );
installEventFilter( this ); // filter for popup
@@ -708,7 +708,7 @@ void MDWSlider::volumeChange( int )
/**
This slot is called, when a user has clicked the recsrc button. Also it is called by any other
- associated KAction like the context menu.
+ associated TDEAction like the context menu.
*/
void MDWSlider::toggleRecsrc() {
setRecsrc( !m_mixdevice->isRecSource() );
@@ -725,7 +725,7 @@ void MDWSlider::setRecsrc(bool value )
/**
This slot is called, when a user has clicked the mute button. Also it is called by any other
- associated KAction like the context menu.
+ associated TDEAction like the context menu.
*/
void MDWSlider::toggleMuted() {
setMuted( !m_mixdevice->isMuted() );
@@ -756,7 +756,7 @@ void MDWSlider::setDisabled( bool value )
/**
This slot is called on a MouseWheel event. Also it is called by any other
- associated KAction like the context menu.
+ associated TDEAction like the context menu.
*/
void MDWSlider::increaseVolume()
{
@@ -773,7 +773,7 @@ void MDWSlider::increaseVolume()
/**
This slot is called on a MouseWheel event. Also it is called by any other
- associated KAction like the context menu.
+ associated TDEAction like the context menu.
*/
void MDWSlider::decreaseVolume()
{
@@ -894,38 +894,38 @@ void MDWSlider::showContextMenu()
if( m_mixerwidget == NULL )
return;
- KPopupMenu *menu = m_mixerwidget->getPopup();
+ TDEPopupMenu *menu = m_mixerwidget->getPopup();
menu->insertTitle( SmallIcon( "kmix" ), m_mixdevice->name() );
if ( m_sliders.count()>1 ) {
- KToggleAction *stereo = (KToggleAction *)_mdwActions->action( "stereo" );
+ TDEToggleAction *stereo = (TDEToggleAction *)_mdwActions->action( "stereo" );
if ( stereo ) {
stereo->setChecked( !isStereoLinked() );
stereo->plug( menu );
}
}
- KToggleAction *ta = (KToggleAction *)_mdwActions->action( "recsrc" );
+ TDEToggleAction *ta = (TDEToggleAction *)_mdwActions->action( "recsrc" );
if ( ta ) {
ta->setChecked( m_mixdevice->isRecSource() );
ta->plug( menu );
}
if ( m_mixdevice->hasMute() ) {
- ta = ( KToggleAction* )_mdwActions->action( "mute" );
+ ta = ( TDEToggleAction* )_mdwActions->action( "mute" );
if ( ta ) {
ta->setChecked( m_mixdevice->isMuted() );
ta->plug( menu );
}
}
- KAction *a = _mdwActions->action( "hide" );
+ TDEAction *a = _mdwActions->action( "hide" );
if ( a )
a->plug( menu );
a = _mdwActions->action( "keys" );
if ( a && m_keys ) {
- KActionSeparator sep( TQT_TQOBJECT(this) );
+ TDEActionSeparator sep( TQT_TQOBJECT(this) );
sep.plug( menu );
a->plug( menu );
}
diff --git a/kmix/mdwslider.h b/kmix/mdwslider.h
index 0f8c70a5..72b9546c 100644
--- a/kmix/mdwslider.h
+++ b/kmix/mdwslider.h
@@ -39,8 +39,8 @@ class TQSlider;
class KLed;
class KLedButton;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
class KSmallSlider;
class TDEGlobalAccel;
@@ -65,7 +65,7 @@ public:
TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0);
~MDWSlider() {}
- void addActionToPopup( KAction *action );
+ void addActionToPopup( TDEAction *action );
bool isStereoLinked() const { return m_linked; };
bool isLabeled() const;
diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp
index 5c931048..709a6d8c 100644
--- a/kmix/mdwswitch.cpp
+++ b/kmix/mdwswitch.cpp
@@ -54,14 +54,14 @@ MDWSwitch::MDWSwitch(Mixer *mixer, MixDevice* md,
// create actions (on _mdwActions, see MixDeviceWidget)
// KStdAction::showMenubar() is in MixDeviceWidget now
- new KToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" );
- new KAction( i18n("C&onfigure Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" );
+ new TDEToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" );
+ new TDEAction( i18n("C&onfigure Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" );
// create widgets
createWidgets();
m_keys->insert( "Toggle switch", i18n( "Toggle Switch" ), TQString(),
- KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleSwitch() ) );
+ TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleSwitch() ) );
// The keys are loaded in KMixerWidget::loadConfig, see kmixerwidget.cpp (now: kmixtoolbox.cpp)
//m_keys->readSettings();
@@ -158,7 +158,7 @@ void MDWSwitch::showContextMenu()
if( m_mixerwidget == NULL )
return;
- KPopupMenu *menu = m_mixerwidget->getPopup();
+ TDEPopupMenu *menu = m_mixerwidget->getPopup();
TQPoint pos = TQCursor::pos();
menu->popup( pos );
@@ -177,7 +177,7 @@ TQSize MDWSwitch::sizeHint() const {
/**
This slot is called, when a user has clicked the mute button. Also it is called by any other
- associated KAction like the context menu.
+ associated TDEAction like the context menu.
*/
void MDWSwitch::toggleSwitch() {
if( m_mixdevice->isRecordable() )
diff --git a/kmix/mdwswitch.h b/kmix/mdwswitch.h
index d584bda4..e7759546 100644
--- a/kmix/mdwswitch.h
+++ b/kmix/mdwswitch.h
@@ -37,8 +37,8 @@ class TQPopupMenu;
class TQSlider;
class KLedButton;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
class KSmallSlider;
class TDEGlobalAccel;
@@ -60,7 +60,7 @@ public:
TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0);
~MDWSwitch();
- void addActionToPopup( KAction *action );
+ void addActionToPopup( TDEAction *action );
TQSize sizeHint() const;
void setBackgroundMode(BackgroundMode m);
bool eventFilter( TQObject* obj, TQEvent* e );
diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp
index 19b20514..979708ea 100644
--- a/kmix/mixdevicewidget.cpp
+++ b/kmix/mixdevicewidget.cpp
@@ -58,7 +58,7 @@ MixDeviceWidget::MixDeviceWidget(Mixer *mixer, MixDevice* md,
TQWidget( parent, name ), m_mixer(mixer), m_mixdevice( md ), m_mixerwidget( mw ),
m_disabled( false ), _orientation( orientation ), m_small( small )
{
- _mdwActions = new KActionCollection( this );
+ _mdwActions = new TDEActionCollection( this );
m_keys = new TDEGlobalAccel( TQT_TQOBJECT(this), "Keys" );
}
@@ -67,7 +67,7 @@ MixDeviceWidget::~MixDeviceWidget()
}
-void MixDeviceWidget::addActionToPopup( KAction *action )
+void MixDeviceWidget::addActionToPopup( TDEAction *action )
{
_mdwActions->insert( action );
}
diff --git a/kmix/mixdevicewidget.h b/kmix/mixdevicewidget.h
index c9c62d6a..676199e1 100644
--- a/kmix/mixdevicewidget.h
+++ b/kmix/mixdevicewidget.h
@@ -40,8 +40,8 @@ class TQSlider;
class KLed;
class KLedButton;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
class KSmallSlider;
class TDEGlobalAccel;
@@ -64,7 +64,7 @@ public:
TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0);
~MixDeviceWidget();
- void addActionToPopup( KAction *action );
+ void addActionToPopup( TDEAction *action );
virtual bool isDisabled() const;
MixDevice* mixDevice() { return m_mixdevice; };
@@ -102,7 +102,7 @@ protected slots:
protected:
Mixer* m_mixer;
MixDevice* m_mixdevice;
- KActionCollection* _mdwActions;
+ TDEActionCollection* _mdwActions;
TDEGlobalAccel* m_keys;
ViewBase* m_mixerwidget;
bool m_disabled;
diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp
index 702dae82..1d4de379 100644
--- a/kmix/viewapplet.cpp
+++ b/kmix/viewapplet.cpp
@@ -41,7 +41,7 @@ ViewApplet::ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBas
{
setBackgroundOrigin(AncestorOrigin);
// remove the menu bar action, that is put by the "ViewBase" constructor in _actions.
- //KToggleAction *m = static_cast<KToggleAction*>(KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBarSlot()), _actions ));
+ //TDEToggleAction *m = static_cast<TDEToggleAction*>(KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBarSlot()), _actions ));
_actions->remove( KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBarSlot()), _actions) );
diff --git a/kmix/viewbase.cpp b/kmix/viewbase.cpp
index 58767073..01e1b9cf 100644
--- a/kmix/viewbase.cpp
+++ b/kmix/viewbase.cpp
@@ -47,11 +47,11 @@ ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption,
setMixSet( & mixer->getMixSet());
C++ does not use overloaded methods like getMixSet() as long as the constructor has not completed :-(((
*/
- _actions = new KActionCollection( this );
+ _actions = new TDEActionCollection( this );
// Plug in the "showMenubar" action, if the caller wants it. Typically this is only neccesary for views in the KMix main window.
if ( vflags & ViewBase::HasMenuBar ) {
- KToggleAction *m = static_cast<KToggleAction*>(KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBarSlot()), _actions ));
+ TDEToggleAction *m = static_cast<TDEToggleAction*>(KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBarSlot()), _actions ));
if ( vflags & ViewBase::MenuBarVisible ) {
m->setChecked(true);
}
@@ -59,7 +59,7 @@ ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption,
m->setChecked(false);
}
}
- new KAction(i18n("&Channels"), 0, TQT_TQOBJECT(this), TQT_SLOT(configureView()), _actions, "toggle_channels");
+ new TDEAction(i18n("&Channels"), 0, TQT_TQOBJECT(this), TQT_SLOT(configureView()), _actions, "toggle_channels");
connect ( _mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(refreshVolumeLevels()) );
}
@@ -120,7 +120,7 @@ void ViewBase::mousePressEvent( TQMouseEvent *e )
* Return a popup menu. This contains basic entries.
* More can be added by the caller.
*/
-KPopupMenu* ViewBase::getPopup()
+TDEPopupMenu* ViewBase::getPopup()
{
popupReset();
return _popMenu;
@@ -128,9 +128,9 @@ KPopupMenu* ViewBase::getPopup()
void ViewBase::popupReset()
{
- KAction *a;
+ TDEAction *a;
- _popMenu = new KPopupMenu( this );
+ _popMenu = new TDEPopupMenu( this );
_popMenu->insertTitle( SmallIcon( "kmix" ), i18n("Device Settings") );
a = _actions->action( "toggle_channels" );
diff --git a/kmix/viewbase.h b/kmix/viewbase.h
index a514e325..96840d88 100644
--- a/kmix/viewbase.h
+++ b/kmix/viewbase.h
@@ -5,8 +5,8 @@
#include "tqwidget.h"
// KDE
-class KActionCollection;
-class KPopupMenu;
+class TDEActionCollection;
+class TDEPopupMenu;
class MixSet;
class Mixer;
class MixDevice;
@@ -78,7 +78,7 @@ public:
/**
* Popup stuff
*/
- virtual KPopupMenu* getPopup();
+ virtual TDEPopupMenu* getPopup();
virtual void popupReset();
virtual void showContextMenu();
@@ -99,8 +99,8 @@ protected:
Mixer *_mixer;
MixSet *_mixSet;
- KPopupMenu *_popMenu;
- KActionCollection* _actions;
+ TDEPopupMenu *_popMenu;
+ TDEActionCollection* _actions;
ViewFlags _vflags;
public slots:
diff --git a/krec/krecfileviewhelpers.cpp b/krec/krecfileviewhelpers.cpp
index a064dfea..eabd63ef 100644
--- a/krec/krecfileviewhelpers.cpp
+++ b/krec/krecfileviewhelpers.cpp
@@ -220,7 +220,7 @@ void KRecTimeDisplay::timeContextMenu( TQPopupMenu* menu ) {
menu->insertItem( i18n( "[h:]m:s.f %1" ).arg( formatTime( 2, _posvalue ) ), -1, 0 );
menu->insertItem( i18n( "[h:]m:s.s %1" ).arg( formatTime( 1, _posvalue ) ), -1, 0 );
menu->insertItem( i18n( "%1 Samples" ).arg( formatTime( 0, _posvalue ) ), -1, 0 );
- KPopupTitle *tmp = new KPopupTitle( menu );
+ TDEPopupTitle *tmp = new TDEPopupTitle( menu );
tmp->setTitle( i18n( "Position" ) );
menu->insertItem( tmp, -1, 0 );
} else
@@ -228,7 +228,7 @@ void KRecTimeDisplay::timeContextMenu( TQPopupMenu* menu ) {
}
void KRecTimeDisplay::timeContextMenu( const TQPoint &point ) {
if ( _posmenu ) delete _posmenu;
- _posmenu = new KPopupMenu( this );
+ _posmenu = new TDEPopupMenu( this );
timeContextMenu( _posmenu );
_posmenu->exec( point );
}
@@ -239,7 +239,7 @@ void KRecTimeDisplay::sizeContextMenu( TQPopupMenu* menu ) {
menu->insertItem( i18n( "[h:]m:s.f %1" ).arg( formatTime( 2, _sizevalue ) ), -1, 0 );
menu->insertItem( i18n( "[h:]m:s.s %1" ).arg( formatTime( 1, _sizevalue ) ), -1, 0 );
menu->insertItem( i18n( "%1 Samples" ).arg( formatTime( 0, _sizevalue ) ), -1, 0 );
- KPopupTitle *tmp = new KPopupTitle( menu );
+ TDEPopupTitle *tmp = new TDEPopupTitle( menu );
tmp->setTitle( i18n( "Size" ) );
menu->insertItem( tmp, -1, 0 );
} else
@@ -247,7 +247,7 @@ void KRecTimeDisplay::sizeContextMenu( TQPopupMenu* menu ) {
}
void KRecTimeDisplay::sizeContextMenu( const TQPoint &point ) {
if ( _sizemenu ) delete _sizemenu;
- _sizemenu = new KPopupMenu( this );
+ _sizemenu = new TDEPopupMenu( this );
sizeContextMenu( _sizemenu );
_sizemenu->exec( point );
}
diff --git a/krec/krecfileviewhelpers.h b/krec/krecfileviewhelpers.h
index c7f16131..85e0f48e 100644
--- a/krec/krecfileviewhelpers.h
+++ b/krec/krecfileviewhelpers.h
@@ -23,7 +23,7 @@
class TQBoxLayout;
class AKLabel;
class TQPopupMenu;
-class KPopupMenu;
+class TDEPopupMenu;
class KRecTimeBar : public TQFrame {
Q_OBJECT
@@ -86,7 +86,7 @@ private:
TQString _filename;
TQBoxLayout *_layout;
AKLabel *_position, *_size;
- KPopupMenu *_posmenu, *_sizemenu;
+ TDEPopupMenu *_posmenu, *_sizemenu;
int _sizevalue, _posvalue;
int _samplingRate, _bits, _channels;
};
diff --git a/krec/krecfilewidgets.cpp b/krec/krecfilewidgets.cpp
index 82eac246..255eebd2 100644
--- a/krec/krecfilewidgets.cpp
+++ b/krec/krecfilewidgets.cpp
@@ -118,13 +118,13 @@ void KRecFileWidget::deleteBuffer( KRecBuffer* buffer ) {
}
void KRecFileWidget::popupMenu( KRecBufferWidget* bw, TQPoint pos ) {
- KPopupMenu tmp( this );
- KToggleAction* _activeaction = new KToggleAction( i18n( "Toggle Active/Disabled State" ), KShortcut(), TQT_TQOBJECT(this) );
+ TDEPopupMenu tmp( this );
+ TDEToggleAction* _activeaction = new TDEToggleAction( i18n( "Toggle Active/Disabled State" ), TDEShortcut(), TQT_TQOBJECT(this) );
_activeaction->setChecked( bw->buffer()->active() );
connect( _activeaction, TQT_SIGNAL( toggled( bool ) ), bw->buffer(), TQT_SLOT( setActive( bool ) ) );
- KAction* _removeaction = new KAction( i18n( "Remove This Part" ), "fileremove", KShortcut(), bw->buffer(), TQT_SLOT( deleteBuffer() ), TQT_TQOBJECT(this) );
- KAction* _changetitle = new KAction( i18n( "Change Title of This Part" ), KShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeTitle() ), TQT_TQOBJECT(this) );
- KAction* _changecomment = new KAction( i18n( "Change Comment of This Part" ), KShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeComment() ), TQT_TQOBJECT(this) );
+ TDEAction* _removeaction = new TDEAction( i18n( "Remove This Part" ), "fileremove", TDEShortcut(), bw->buffer(), TQT_SLOT( deleteBuffer() ), TQT_TQOBJECT(this) );
+ TDEAction* _changetitle = new TDEAction( i18n( "Change Title of This Part" ), TDEShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeTitle() ), TQT_TQOBJECT(this) );
+ TDEAction* _changecomment = new TDEAction( i18n( "Change Comment of This Part" ), TDEShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeComment() ), TQT_TQOBJECT(this) );
_activeaction->plug( &tmp );
_changetitle->plug( &tmp );
_changecomment->plug( &tmp );
diff --git a/krec/krecfilewidgets.h b/krec/krecfilewidgets.h
index 73a493b4..daea0c41 100644
--- a/krec/krecfilewidgets.h
+++ b/krec/krecfilewidgets.h
@@ -32,8 +32,8 @@ class KRecTimeDisplay;
class TQRegion;
class TQPainter;
-class KAction;
-class KToggleAction;
+class TDEAction;
+class TDEToggleAction;
class KRecFileWidget : public TQFrame {
Q_OBJECT
diff --git a/krec/krecord.cpp b/krec/krecord.cpp
index 164a38df..66737d32 100644
--- a/krec/krecord.cpp
+++ b/krec/krecord.cpp
@@ -265,7 +265,7 @@ void KRecPrivate::execKMix() {
*/
KRecord::KRecord(TQWidget *parent, const char *name )
- : KMainWindow(parent,name)
+ : TDEMainWindow(parent,name)
, d( new KRecPrivate( this ) )
{
kdDebug( 60005 ) << k_funcinfo << endl;
@@ -294,33 +294,33 @@ KRecord::KRecord(TQWidget *parent, const char *name )
KStdAction::tipOfDay( d, TQT_SLOT( forceTipOfDay() ), actionCollection() );
- d->aExportFile = new KAction( i18n( "Export..." ), KShortcut(),
+ d->aExportFile = new TDEAction( i18n( "Export..." ), TDEShortcut(),
d, TQT_SLOT( exportFile() ), actionCollection(), "export_file" );
- d->aRecord = new KAction( i18n( "&Record" ), KShortcut( Key_R ),
+ d->aRecord = new TDEAction( i18n( "&Record" ), TDEShortcut( Key_R ),
TQT_TQOBJECT(this), TQT_SLOT( startRec() ), actionCollection(), "player_record" );
- d->aPlay = new KAction( i18n( "&Play" ), KShortcut( Key_P ),
+ d->aPlay = new TDEAction( i18n( "&Play" ), TDEShortcut( Key_P ),
TQT_TQOBJECT(this), TQT_SLOT( startPlay() ), actionCollection(), "player_play" );
- d->aStop = new KAction( i18n( "&Stop" ), KShortcut( Key_S ),
+ d->aStop = new TDEAction( i18n( "&Stop" ), TDEShortcut( Key_S ),
TQT_TQOBJECT(this), TQT_SLOT( stopRec() ), actionCollection(), "player_stop" );
- d->aThru = new KToggleAction( i18n( "Play Through" ), KShortcut( CTRL + Key_P), actionCollection(), "play_thru" );
+ d->aThru = new TDEToggleAction( i18n( "Play Through" ), TDEShortcut( CTRL + Key_P), actionCollection(), "play_thru" );
connect( d->aThru, TQT_SIGNAL( toggled( bool ) ), d, TQT_SLOT( playthru( bool ) ) );
- d->aBegin = new KAction( i18n( "Go to &Beginning" ), KShortcut( SHIFT + Key_Left ),
+ d->aBegin = new TDEAction( i18n( "Go to &Beginning" ), TDEShortcut( SHIFT + Key_Left ),
d, TQT_SLOT( toBegin() ), actionCollection(), "player_gobegin" );
- d->aEnd = new KAction( i18n( "Go to &End" ), KShortcut( SHIFT + Key_Right ),
+ d->aEnd = new TDEAction( i18n( "Go to &End" ), TDEShortcut( SHIFT + Key_Right ),
d, TQT_SLOT( toEnd() ), actionCollection(), "player_goend" );
( void* ) d->artsactions->actionAudioManager();
- d->aExecaRtsControl = new KAction( i18n( "Start aRts Control Tool" ), KShortcut(),
+ d->aExecaRtsControl = new TDEAction( i18n( "Start aRts Control Tool" ), TDEShortcut(),
d, TQT_SLOT( execaRtsControl() ), actionCollection(), "exec_artscontrol" );
- d->aExecKMix = new KAction( i18n( "Start KMix" ), KShortcut(),
+ d->aExecKMix = new TDEAction( i18n( "Start KMix" ), TDEShortcut(),
d, TQT_SLOT( execKMix() ), actionCollection(), "exec_kmix" );
// * * * GUI * * *
// TODO Fix toolbar config so this line can just be setupGUI()
- setupGUI(KMainWindow::Keys | StatusBar | Save | Create );
+ setupGUI(TDEMainWindow::Keys | StatusBar | Save | Create );
setStandardToolBarMenuEnabled( true );
// TODO Fix the arts toolbar to know it own minium size, this app shouldn't care!
setMinimumWidth( 400 );
@@ -333,7 +333,7 @@ KRecord::KRecord(TQWidget *parent, const char *name )
d->w->setName( "kde toolbar widget" );
toolBar( "compressor" )->insertWidget( 1, 400, d->w );
- toolBar( "compressor" )->setBarPos( KToolBar::Bottom );
+ toolBar( "compressor" )->setBarPos( TDEToolBar::Bottom );
}
else
{
diff --git a/krec/krecord.h b/krec/krecord.h
index f050c2b7..96173238 100644
--- a/krec/krecord.h
+++ b/krec/krecord.h
@@ -29,7 +29,7 @@ class KRecPrivate;
@author Arnold Krille
*/
-class KRecord : public KMainWindow {
+class KRecord : public TDEMainWindow {
Q_OBJECT
public:
diff --git a/krec/krecord_private.h b/krec/krecord_private.h
index e0d80c3e..bf68bfb9 100644
--- a/krec/krecord_private.h
+++ b/krec/krecord_private.h
@@ -36,10 +36,10 @@ class KAudioRecordStream;
class KAudioPlayStream;
class TDEConfig;
class ArtsActions;
-class KAction;
-class KActionMenu;
-class KToggleAction;
-class KRecentFilesAction;
+class TDEAction;
+class TDEActionMenu;
+class TDEToggleAction;
+class TDERecentFilesAction;
namespace KSettings { class Dialog; }
@@ -100,10 +100,10 @@ private:
void pNewFile( KRecFile* );
void pSaveFile( const TQString &);
public:
- KAction *aRecord, *aPlay, *aStop, *aExportFile;
- KAction *aBegin, *aEnd;
- KToggleAction *aThru, *aStartUpWindow;
- KAction *aExecaRtsControl, *aExecKMix;
+ TDEAction *aRecord, *aPlay, *aStop, *aExportFile;
+ TDEAction *aBegin, *aEnd;
+ TDEToggleAction *aThru, *aStartUpWindow;
+ TDEAction *aExecaRtsControl, *aExecKMix;
KSettings::Dialog *_confdlg;
diff --git a/kscd/configWidgetUI.ui b/kscd/configWidgetUI.ui
index de755edf..7631bfde 100644
--- a/kscd/configWidgetUI.ui
+++ b/kscd/configWidgetUI.ui
@@ -113,7 +113,7 @@
<string>The foreground color that will be used in the LCD display.</string>
</property>
</widget>
- <widget class="KFontRequester" row="0" column="1" rowspan="1" colspan="2">
+ <widget class="TDEFontRequester" row="0" column="1" rowspan="1" colspan="2">
<property name="name">
<cstring>kcfg_ledFont</cstring>
</property>
diff --git a/kscd/docking.cpp b/kscd/docking.cpp
index 1483611c..d3c0964f 100644
--- a/kscd/docking.cpp
+++ b/kscd/docking.cpp
@@ -44,7 +44,7 @@ DockWidget::DockWidget( KSCD* parent, const char *name)
m_popup = 0;
setPixmap( loadIcon("cdsmall") );
- KActionCollection* actionCollection = parent->actionCollection();
+ TDEActionCollection* actionCollection = parent->actionCollection();
m_backAction = actionCollection->action("Previous");
m_forwardAction = actionCollection->action("Next");
m_backPix = loadIcon("player_start");
diff --git a/kscd/docking.h b/kscd/docking.h
index 2efeac16..b4f84b1c 100644
--- a/kscd/docking.h
+++ b/kscd/docking.h
@@ -39,8 +39,8 @@
class KSCD;
-class KAction;
-class KToggleAction;
+class TDEAction;
+class TDEToggleAction;
class KPassivePopup;
class DockWidget : public KSystemTray
@@ -61,8 +61,8 @@ private:
KPassivePopup* m_popup;
- KAction* m_forwardAction;
- KAction* m_backAction;
+ TDEAction* m_forwardAction;
+ TDEAction* m_backAction;
TQPixmap m_backPix;
TQPixmap m_forwardPix;
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index 7781601f..581c71e9 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -167,27 +167,27 @@ KSCD::KSCD( TQWidget *parent, const char *name )
// set up the actions and keyboard accels
- m_actions = new KActionCollection(this);
+ m_actions = new TDEActionCollection(this);
- KAction* action;
- action = new KAction(i18n("Play/Pause"), Key_P, TQT_TQOBJECT(this), TQT_SLOT(playClicked()), m_actions, "Play/Pause");
- action = new KAction(i18n("Stop"), Key_S, TQT_TQOBJECT(this), TQT_SLOT(stopClicked()), m_actions, "Stop");
- action = new KAction(i18n("Previous"), Key_B, TQT_TQOBJECT(this), TQT_SLOT(prevClicked()), m_actions, "Previous");
- action = new KAction(i18n("Next"), Key_N, TQT_TQOBJECT(this), TQT_SLOT(nextClicked()), m_actions, "Next");
+ TDEAction* action;
+ action = new TDEAction(i18n("Play/Pause"), Key_P, TQT_TQOBJECT(this), TQT_SLOT(playClicked()), m_actions, "Play/Pause");
+ action = new TDEAction(i18n("Stop"), Key_S, TQT_TQOBJECT(this), TQT_SLOT(stopClicked()), m_actions, "Stop");
+ action = new TDEAction(i18n("Previous"), Key_B, TQT_TQOBJECT(this), TQT_SLOT(prevClicked()), m_actions, "Previous");
+ action = new TDEAction(i18n("Next"), Key_N, TQT_TQOBJECT(this), TQT_SLOT(nextClicked()), m_actions, "Next");
action = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quitClicked()), m_actions);
action = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), m_actions, "options_configure_shortcuts");
action = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureGlobalKeys()), m_actions, "options_configure_globals");
action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showConfig()), m_actions);
- action = new KAction(i18n("Loop"), Key_L, TQT_TQOBJECT(this), TQT_SLOT(loopClicked()), m_actions, "Loop");
- action = new KAction(i18n("Eject"), CTRL + Key_E, TQT_TQOBJECT(this), TQT_SLOT(ejectClicked()), m_actions, "Eject");
- action = new KAction(i18n("Increase Volume"), Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(incVolume()), m_actions, "IncVolume");
- KShortcut increaseVolume = action->shortcut();
+ action = new TDEAction(i18n("Loop"), Key_L, TQT_TQOBJECT(this), TQT_SLOT(loopClicked()), m_actions, "Loop");
+ action = new TDEAction(i18n("Eject"), CTRL + Key_E, TQT_TQOBJECT(this), TQT_SLOT(ejectClicked()), m_actions, "Eject");
+ action = new TDEAction(i18n("Increase Volume"), Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(incVolume()), m_actions, "IncVolume");
+ TDEShortcut increaseVolume = action->shortcut();
increaseVolume.append( KKey( Key_Equal ) );
action->setShortcut( increaseVolume );
- action = new KAction(i18n("Decrease Volume"), Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(decVolume()), m_actions, "DecVolume");
- action = new KAction(i18n("Options"), CTRL + Key_T, TQT_TQOBJECT(this), TQT_SLOT(showConfig()), m_actions, "Options");
- action = new KAction(i18n("Shuffle"), Key_R, TQT_TQOBJECT(this), TQT_SLOT(randomSelected()), m_actions, "Shuffle");
- action = new KAction(i18n("CDDB"), CTRL + Key_D, TQT_TQOBJECT(this), TQT_SLOT(CDDialogSelected()), m_actions, "CDDB");
+ action = new TDEAction(i18n("Decrease Volume"), Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(decVolume()), m_actions, "DecVolume");
+ action = new TDEAction(i18n("Options"), CTRL + Key_T, TQT_TQOBJECT(this), TQT_SLOT(showConfig()), m_actions, "Options");
+ action = new TDEAction(i18n("Shuffle"), Key_R, TQT_TQOBJECT(this), TQT_SLOT(randomSelected()), m_actions, "Shuffle");
+ action = new TDEAction(i18n("CDDB"), CTRL + Key_D, TQT_TQOBJECT(this), TQT_SLOT(CDDialogSelected()), m_actions, "CDDB");
m_actions->readShortcutSettings("Shortcuts");
diff --git a/kscd/kscd.h b/kscd/kscd.h
index fc1ab6ef..9d33b696 100644
--- a/kscd/kscd.h
+++ b/kscd/kscd.h
@@ -62,8 +62,8 @@ class KCompactDisc;
class CDDBDlg;
class DockWidget;
class TQGridLayout;
-class KActionCollection;
-class KToggleAction;
+class TDEActionCollection;
+class TDEToggleAction;
using namespace KCDDB;
@@ -118,7 +118,7 @@ public:
void setDevicePaths();
TQStringList audioSystems() { return audio_systems_list; }
- KActionCollection* actionCollection() { return m_actions; }
+ TDEActionCollection* actionCollection() { return m_actions; }
signals:
void trackChanged(const TQString&);
@@ -223,9 +223,9 @@ private:
KCDDB::CDInfo cddbInfo;
TQStringList playlist;
KCDDB::Client* cddb;
- KActionCollection* m_actions;
+ TDEActionCollection* m_actions;
TDEGlobalAccel* m_globalAccel;
- KToggleAction* m_togglePopupsAction;
+ TDEToggleAction* m_togglePopupsAction;
DockWidget* m_dockWidget;
void lookupDevice();
void initGlobalShortcuts();
diff --git a/libkcddb/cdinfodialogbase.ui b/libkcddb/cdinfodialogbase.ui
index edc6e6fd..9b232ecd 100644
--- a/libkcddb/cdinfodialogbase.ui
+++ b/libkcddb/cdinfodialogbase.ui
@@ -205,7 +205,7 @@
</widget>
</grid>
</widget>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Track</string>
diff --git a/noatun/FILES b/noatun/FILES
index 7f0c67d7..d3cb385a 100644
--- a/noatun/FILES
+++ b/noatun/FILES
@@ -2,7 +2,7 @@ cmodule: Each panel in the settings window
controls: those widgets that appear in the toolbars TODOLATER
downloader: unused broken class for getting files
engine: the only class that communicates to aRts
-klistview_t: like a KListView, but with more functionality, especially DnD TODOSLOWLY
+klistview_t: like a TDEListView, but with more functionality, especially DnD TODOSLOWLY
noatun: all the actions, makes toolbars, e.g., main window
noatunpref: the main settings box (semi-unused) TODOLATER
noatunview.cpp: The main view within the main view, which only contains the videoframe
diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp
index 29478e7b..1f05502a 100644
--- a/noatun/library/app.cpp
+++ b/noatun/library/app.cpp
@@ -367,7 +367,7 @@ NoatunStdAction::PluginActionMenu *NoatunApp::pluginActionMenu()
return mPluginActionMenu;
}
-KPopupMenu *NoatunApp::pluginMenu()
+TDEPopupMenu *NoatunApp::pluginMenu()
{
if(!mPluginMenu)
mPluginMenu = pluginActionMenu()->popupMenu();
diff --git a/noatun/library/cmodule.h b/noatun/library/cmodule.h
index f7fbcd0d..52682084 100644
--- a/noatun/library/cmodule.h
+++ b/noatun/library/cmodule.h
@@ -5,7 +5,7 @@
#include <klistview.h>
#include "noatun/pref.h"
-class KListView;
+class TDEListView;
class TQSplitter;
class TQListViewItem;
class NoatunLibraryInfo;
diff --git a/noatun/library/controls.cpp b/noatun/library/controls.cpp
index 4fbc0a19..4a6ca9a8 100644
--- a/noatun/library/controls.cpp
+++ b/noatun/library/controls.cpp
@@ -53,7 +53,7 @@ void L33tSlider::wheelEvent(TQWheelEvent *e)
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;
@@ -61,10 +61,10 @@ SliderAction::SliderAction(const TQString& text, int accel, const TQObject *rece
int 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);
@@ -76,20 +76,20 @@ int 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 SliderAction::toolbarMoved(KToolBar::BarPosition)
+void 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());
@@ -104,7 +104,7 @@ return;
void SliderAction::unplug( TQWidget *w )
{
- KToolBar *toolBar = (KToolBar *)w;
+ TDEToolBar *toolBar = (TDEToolBar *)w;
int idx = findContainer( w );
toolBar->removeItem( menuId( idx ) );
diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp
index cd9e7d93..5d40e37e 100644
--- a/noatun/library/effectview.cpp
+++ b/noatun/library/effectview.cpp
@@ -56,7 +56,7 @@ private:
};
EffectList::EffectList(TQWidget *parent)
- : KListView(parent)
+ : TDEListView(parent)
{
}
diff --git a/noatun/library/effectview.h b/noatun/library/effectview.h
index 718a2e82..5c45fa40 100644
--- a/noatun/library/effectview.h
+++ b/noatun/library/effectview.h
@@ -72,7 +72,7 @@ private:
EffectList *active;
};
-class EffectList : public KListView
+class EffectList : public TDEListView
{
Q_OBJECT
diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp
index c243a349..69acf562 100644
--- a/noatun/library/equalizerview.cpp
+++ b/noatun/library/equalizerview.cpp
@@ -31,7 +31,7 @@
// PresetList
PresetList::PresetList(TQWidget *parent, const char *name)
- : KListView(parent, name)
+ : TDEListView(parent, name)
{
setItemsRenameable(true);
setRenameable(0, true);
@@ -55,7 +55,7 @@ void PresetList::rename(TQListViewItem *item, int c)
if (!TQFileInfo(item->text(1)).isWritable())
return;
- KListView::rename(item, c);
+ TDEListView::rename(item, c);
}
////////////////////////////////////////////////
@@ -143,7 +143,7 @@ void EqualizerView::show()
connect(mWidget->addPresetButton, TQT_SIGNAL(clicked()), TQT_SLOT(create()));
connect(mWidget->resetEqButton, TQT_SIGNAL(clicked()), TQT_SLOT(reset()));
- new KListViewItem(mPresets, i18n("Custom"));
+ new TDEListViewItem(mPresets, i18n("Custom"));
connect(mPresets, TQT_SIGNAL(currentChanged(TQListViewItem*)),
this, TQT_SLOT(select(TQListViewItem*)));
@@ -250,7 +250,7 @@ void EqualizerView::created(VPreset p)
// store the filename in TQListViewItem::text(0)
TQString n = p.name();
TQString f = p.file();
- new KListViewItem(mPresets, n, f);
+ new TDEListViewItem(mPresets, n, f);
}
void EqualizerView::renamed(VPreset p)
diff --git a/noatun/library/equalizerview.h b/noatun/library/equalizerview.h
index 2c27b45e..ed495a23 100644
--- a/noatun/library/equalizerview.h
+++ b/noatun/library/equalizerview.h
@@ -34,7 +34,7 @@ private:
};
-class PresetList : public KListView
+class PresetList : public TDEListView
{
Q_OBJECT
diff --git a/noatun/library/mimetypetree.cpp b/noatun/library/mimetypetree.cpp
index 0370b048..c89842d0 100644
--- a/noatun/library/mimetypetree.cpp
+++ b/noatun/library/mimetypetree.cpp
@@ -5,7 +5,7 @@
MimeTypeTree::MimeTypeTree(TQWidget *parent)
- : KListView(parent)
+ : TDEListView(parent)
{
KMimeType::List list=KMimeType::allMimeTypes();
TQDict<TQListViewItem> map;
diff --git a/noatun/library/mimetypetree.h b/noatun/library/mimetypetree.h
index 42df2b72..67135c57 100644
--- a/noatun/library/mimetypetree.h
+++ b/noatun/library/mimetypetree.h
@@ -16,7 +16,7 @@
#include <klistview.h>
-class MimeTypeTree : public KListView
+class MimeTypeTree : public TDEListView
{
Q_OBJECT
diff --git a/noatun/library/noatun/app.h b/noatun/library/noatun/app.h
index e337ddd9..49ea0064 100644
--- a/noatun/library/noatun/app.h
+++ b/noatun/library/noatun/app.h
@@ -6,7 +6,7 @@
class Playlist;
class Player;
class LibraryLoader;
-class KPopupMenu;
+class TDEPopupMenu;
class NoatunPreferences;
class Downloader;
class Effects;
@@ -181,7 +181,7 @@ public: //options
void setDisplayRemaining(bool);
/**
- * To insert items use KActions and insert() them into pluginActionMenu().
+ * To insert items use TDEActions and insert() them into pluginActionMenu().
* @return pointer to the actionmenu
*/
NoatunStdAction::PluginActionMenu *pluginActionMenu();
@@ -207,7 +207,7 @@ public: //options
* Use pluginActionMenu() instead
* @return pointer to the plugin menu
*/
- KPopupMenu *pluginMenu();
+ TDEPopupMenu *pluginMenu();
protected:
virtual int newInstance();
@@ -246,7 +246,7 @@ private:
private:
Player *mPlayer;
LibraryLoader *mLibraryLoader;
- KPopupMenu *mPluginMenu;
+ TDEPopupMenu *mPluginMenu;
NoatunStdAction::PluginActionMenu *mPluginActionMenu;
Downloader *mDownloader;
struct Private;
diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h
index 3e5f00c4..dbe249ba 100644
--- a/noatun/library/noatun/controls.h
+++ b/noatun/library/noatun/controls.h
@@ -54,7 +54,7 @@ private:
* @author Charles Samuels
* @version 2.3
**/
-class SliderAction : public KAction
+class SliderAction : public TDEAction
{
Q_OBJECT
@@ -69,7 +69,7 @@ signals:
void plugged();
public slots:
- void toolbarMoved(KToolBar::BarPosition pos);
+ void toolbarMoved(TDEToolBar::BarPosition pos);
private:
TQGuardedPtr<TQSlider> m_slider;
diff --git a/noatun/library/noatun/stdaction.h b/noatun/library/noatun/stdaction.h
index 9f9b639e..2a5ad401 100644
--- a/noatun/library/noatun/stdaction.h
+++ b/noatun/library/noatun/stdaction.h
@@ -4,7 +4,7 @@
#include <kaction.h>
#include <kactionclasses.h>
#include <kdemacros.h>
-class KPopupMenu;
+class TDEPopupMenu;
/**
* Holds all noatun related actions
@@ -17,7 +17,7 @@ namespace NoatunStdAction
/**
* An action starting noatun playback
**/
-class PlayAction : public KAction
+class PlayAction : public TDEAction
{
Q_OBJECT
@@ -31,7 +31,7 @@ private slots:
/**
* An action starting/stopping noatun playback
**/
-class PlaylistAction : public KToggleAction
+class PlaylistAction : public TDEToggleAction
{
Q_OBJECT
@@ -46,7 +46,7 @@ private slots:
* actionmenu that holds all plugin defined actions
* @author Stefan Gehn
*/
-class PluginActionMenu : public KActionMenu
+class PluginActionMenu : public TDEActionMenu
{
Q_OBJECT
@@ -57,11 +57,11 @@ public:
* @param action the action to insert
* @param index defines the place where the action gets displayed in
*/
- virtual void insert (KAction *action, int index=-1);
+ virtual void insert (TDEAction *action, int index=-1);
/**
* removes the given @p action into the action-menu
*/
- virtual void remove(KAction *action);
+ virtual void remove(TDEAction *action);
/**
* Wrapper method for old Noatun API
* <b>DON'T USE</b>
@@ -80,7 +80,7 @@ private:
* actionmenu that holds all vis-plugins for easier enabling/disabling
* @author Stefan Gehn
*/
-class VisActionMenu : public KActionMenu
+class VisActionMenu : public TDEActionMenu
{
Q_OBJECT
@@ -98,7 +98,7 @@ private:
* actionmenu that holds all looping modes
* @author Stefan Gehn
*/
-class LoopActionMenu : public KActionMenu
+class LoopActionMenu : public TDEActionMenu
{
Q_OBJECT
@@ -111,43 +111,43 @@ private slots:
void loopPlaylistSelected();
void loopRandomSelected();
private:
- KRadioAction *mLoopNone;
- KRadioAction *mLoopSong;
- KRadioAction *mLoopPlaylist;
- KRadioAction *mLoopRandom;
+ TDERadioAction *mLoopNone;
+ TDERadioAction *mLoopSong;
+ TDERadioAction *mLoopPlaylist;
+ TDERadioAction *mLoopRandom;
};
/**
- * @return pointer to a KAction which opens the effects dialog on activation
+ * @return pointer to a TDEAction which opens the effects dialog on activation
*/
-KDE_EXPORT KAction *effects(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT TDEAction *effects(TQObject *parent = 0, const char *name = 0);
/**
- * @return pointer to a KAction which opens the equalizer dialog on activation
+ * @return pointer to a TDEAction which opens the equalizer dialog on activation
*/
-KDE_EXPORT KAction *equalizer(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT TDEAction *equalizer(TQObject *parent = 0, const char *name = 0);
/**
- * @return pointer to a KAction which goes back one track on activation
+ * @return pointer to a TDEAction which goes back one track on activation
*/
-KDE_EXPORT KAction *back(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT TDEAction *back(TQObject *parent = 0, const char *name = 0);
/**
- * @return pointer to a KAction which stops playback on activation
+ * @return pointer to a TDEAction which stops playback on activation
*/
-KDE_EXPORT KAction *stop(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT TDEAction *stop(TQObject *parent = 0, const char *name = 0);
/**
- * @return pointer to a KAction which starts/pauses playback on activation
+ * @return pointer to a TDEAction which starts/pauses playback on activation
*/
-KDE_EXPORT KAction *playpause(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT TDEAction *playpause(TQObject *parent = 0, const char *name = 0);
/**
- * @return pointer to a KAction which advances one track on activation
+ * @return pointer to a TDEAction which advances one track on activation
*/
-KDE_EXPORT KAction *forward(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT TDEAction *forward(TQObject *parent = 0, const char *name = 0);
/**
- * @return pointer to a KToggleAction which shows/hides the playlist
+ * @return pointer to a TDEToggleAction which shows/hides the playlist
*/
-KDE_EXPORT KToggleAction *playlist(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT TDEToggleAction *playlist(TQObject *parent = 0, const char *name = 0);
/**
* loop action
@@ -157,12 +157,12 @@ KDE_EXPORT LoopActionMenu *loop(TQObject *parent, const char *name);
/**
* play action
*/
-KDE_EXPORT KAction *play(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT TDEAction *play(TQObject *parent = 0, const char *name = 0);
/**
* pause action
*/
-KDE_EXPORT KAction *pause(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT TDEAction *pause(TQObject *parent = 0, const char *name = 0);
/**
* @return pointer to the global PluginActionMenu object (there is only one instance)
@@ -181,7 +181,7 @@ KDE_EXPORT VisActionMenu *visualizations(TQObject *parent = 0, const char *name
class KDE_EXPORT ContextMenu
{
public:
- static KPopupMenu *createContextMenu(TQWidget *p);
+ static TDEPopupMenu *createContextMenu(TQWidget *p);
/**
* One menu to show them all, One menu to find them
@@ -189,7 +189,7 @@ public:
*
* In the land of Noatun where the oceans die
*/
- static KPopupMenu *contextMenu();
+ static TDEPopupMenu *contextMenu();
/**
* Show the context menu at point
@@ -201,7 +201,7 @@ public:
**/
static void showContextMenu();
private:
- static KPopupMenu *mContextMenu;
+ static TDEPopupMenu *mContextMenu;
};
}
diff --git a/noatun/library/noatun/stereobuttonaction.h b/noatun/library/noatun/stereobuttonaction.h
index 6e5312f9..d3bad3f9 100644
--- a/noatun/library/noatun/stereobuttonaction.h
+++ b/noatun/library/noatun/stereobuttonaction.h
@@ -10,7 +10,7 @@ namespace NoatunStdAction
* No, I never owned StereoButtonAction, but I'm tired
* and PlayAction is already taken.
*/
-class StereoButtonAction : public KAction
+class StereoButtonAction : public TDEAction
{
Q_OBJECT
diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp
index d37adefb..b99c8ef5 100644
--- a/noatun/library/noatunstdaction.cpp
+++ b/noatun/library/noatunstdaction.cpp
@@ -22,7 +22,7 @@ namespace NoatunStdAction
{
/////////////////////////////////////////////////////
PlayAction::PlayAction(TQObject *parent, const char *name)
- : KAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), parent, name)
+ : TDEAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), parent, name)
{
connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(playing()));
connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(notplaying()));
@@ -47,7 +47,7 @@ void PlayAction::notplaying()
/////////////////////////////////////////////////////
PlaylistAction::PlaylistAction(TQObject *parent, const char *name)
- : KToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), parent, name)
+ : TDEToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), parent, name)
{
setCheckedState(i18n("Hide Playlist"));
connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(shown()));
@@ -68,25 +68,25 @@ void PlaylistAction::hidden()
////////////////////////////////////////////////////
PluginActionMenu::PluginActionMenu(TQObject *parent, const char *name)
- : KActionMenu(i18n("&Actions"), parent, name)
+ : TDEActionMenu(i18n("&Actions"), parent, name)
{
// kdDebug(66666) << k_funcinfo << "called" << endl;
setEnabled(false);
mCount=0;
}
-void PluginActionMenu::insert (KAction *action, int index)
+void PluginActionMenu::insert (TDEAction *action, int index)
{
// kdDebug(66666) << k_funcinfo << "called" << endl;
- KActionMenu::insert(action,index);
+ TDEActionMenu::insert(action,index);
setEnabled(true);
mCount++;
}
-void PluginActionMenu::remove(KAction *action)
+void PluginActionMenu::remove(TDEAction *action)
{
// kdDebug(66666) << k_funcinfo << "called" << endl;
- KActionMenu::remove(action);
+ TDEActionMenu::remove(action);
mCount--;
if(mCount==0)
setEnabled(false);
@@ -112,7 +112,7 @@ void PluginActionMenu::menuRemove(int id)
////////////////////////////////////////////////////
VisActionMenu::VisActionMenu(TQObject *parent, const char *name)
- : KActionMenu(i18n("&Visualizations"), parent, name)
+ : TDEActionMenu(i18n("&Visualizations"), parent, name)
{
connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillPopup()));
connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(toggleVisPlugin(int)));
@@ -160,24 +160,24 @@ void VisActionMenu::toggleVisPlugin(int id)
////////////////////////////////////////////////////
LoopActionMenu::LoopActionMenu(TQObject *parent, const char *name)
- : KActionMenu(i18n("&Loop"), parent, name)
+ : TDEActionMenu(i18n("&Loop"), parent, name)
{
- mLoopNone = new KRadioAction(i18n("&None"), TQString::fromLocal8Bit("noatunloopnone"),
+ mLoopNone = new TDERadioAction(i18n("&None"), TQString::fromLocal8Bit("noatunloopnone"),
0, TQT_TQOBJECT(this), TQT_SLOT(loopNoneSelected()), TQT_TQOBJECT(this), "loop_none");
mLoopNone->setExclusiveGroup("loopType");
insert(mLoopNone);
- mLoopSong = new KRadioAction(i18n("&Song"), TQString::fromLocal8Bit("noatunloopsong"),
+ mLoopSong = new TDERadioAction(i18n("&Song"), TQString::fromLocal8Bit("noatunloopsong"),
0, TQT_TQOBJECT(this), TQT_SLOT(loopSongSelected()), TQT_TQOBJECT(this), "loop_song");
mLoopSong->setExclusiveGroup("loopType");
insert(mLoopSong);
- mLoopPlaylist = new KRadioAction(i18n("&Playlist"), TQString::fromLocal8Bit("noatunloopplaylist"),
+ mLoopPlaylist = new TDERadioAction(i18n("&Playlist"), TQString::fromLocal8Bit("noatunloopplaylist"),
0, TQT_TQOBJECT(this), TQT_SLOT(loopPlaylistSelected()), TQT_TQOBJECT(this), "loop_playlist");
mLoopPlaylist->setExclusiveGroup("loopType");
insert(mLoopPlaylist);
- mLoopRandom = new KRadioAction(i18n("&Random"), TQString::fromLocal8Bit("noatunlooprandom"),
+ mLoopRandom = new TDERadioAction(i18n("&Random"), TQString::fromLocal8Bit("noatunlooprandom"),
0, TQT_TQOBJECT(this), TQT_SLOT(loopRandomSelected()), TQT_TQOBJECT(this), "loop_random");
mLoopRandom->setExclusiveGroup("loopType");
insert(mLoopRandom);
@@ -232,27 +232,27 @@ void LoopActionMenu::loopRandomSelected()
////////////////////////////////////////////////////
-KAction *playpause(TQObject *parent, const char *name)
+TDEAction *playpause(TQObject *parent, const char *name)
{
return new PlayAction(parent, name);
}
-KAction *effects(TQObject *parent, const char *name)
+TDEAction *effects(TQObject *parent, const char *name)
{
- return new KAction(i18n("&Effects..."), "effect", 0, TQT_TQOBJECT(napp), TQT_SLOT(effectView()), parent, name);
+ return new TDEAction(i18n("&Effects..."), "effect", 0, TQT_TQOBJECT(napp), TQT_SLOT(effectView()), parent, name);
}
-KAction *equalizer(TQObject *parent, const char *name)
+TDEAction *equalizer(TQObject *parent, const char *name)
{
- return new KAction(i18n("E&qualizer..."), "equalizer", 0, TQT_TQOBJECT(napp), TQT_SLOT(equalizerView()), parent, name);
+ return new TDEAction(i18n("E&qualizer..."), "equalizer", 0, TQT_TQOBJECT(napp), TQT_SLOT(equalizerView()), parent, name);
}
-KAction *back(TQObject *parent, const char *name)
+TDEAction *back(TQObject *parent, const char *name)
{
- return new KAction(i18n("&Back"), "player_start", 0, TQT_TQOBJECT(napp->player()), TQT_SLOT(back()), parent, name);
+ return new TDEAction(i18n("&Back"), "player_start", 0, TQT_TQOBJECT(napp->player()), TQT_SLOT(back()), parent, name);
}
-KAction *stop(TQObject *parent, const char *name)
+TDEAction *stop(TQObject *parent, const char *name)
{
StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "player_stop", 0, napp->player(), TQT_SLOT(stop()), parent, name);
TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable()));
@@ -265,12 +265,12 @@ KAction *stop(TQObject *parent, const char *name)
return action;
}
-KAction *forward(TQObject *parent, const char *name)
+TDEAction *forward(TQObject *parent, const char *name)
{
- return new KAction(i18n("&Forward"), "player_end", 0, napp->player(), TQT_SLOT(forward()), parent, name);
+ return new TDEAction(i18n("&Forward"), "player_end", 0, napp->player(), TQT_SLOT(forward()), parent, name);
}
-KAction *play(TQObject *parent, const char *name)
+TDEAction *play(TQObject *parent, const char *name)
{
StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "player_play", 0, napp->player(), TQT_SLOT(playpause()), parent, name);
TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(disable()));
@@ -283,7 +283,7 @@ KAction *play(TQObject *parent, const char *name)
return action;
}
-KAction *pause(TQObject *parent, const char *name)
+TDEAction *pause(TQObject *parent, const char *name)
{
StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "player_pause", 0, napp->player(), TQT_SLOT(playpause()), parent, name);
TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable()));
@@ -312,26 +312,26 @@ VisActionMenu *visualizations(TQObject *parent, const char *name)
return new VisActionMenu(parent, name);
}
-KToggleAction *playlist(TQObject *parent, const char *name)
+TDEToggleAction *playlist(TQObject *parent, const char *name)
{
return new PlaylistAction(parent, name);
}
-KPopupMenu *ContextMenu::mContextMenu = 0;
+TDEPopupMenu *ContextMenu::mContextMenu = 0;
-KPopupMenu *ContextMenu::contextMenu()
+TDEPopupMenu *ContextMenu::contextMenu()
{
if(!mContextMenu) mContextMenu = createContextMenu(0);
return mContextMenu;
}
-KPopupMenu *ContextMenu::createContextMenu(TQWidget *p)
+TDEPopupMenu *ContextMenu::createContextMenu(TQWidget *p)
{
- KPopupMenu *contextMenu = new KPopupMenu(p, "NoatunContextMenu");
+ TDEPopupMenu *contextMenu = new TDEPopupMenu(p, "NoatunContextMenu");
KHelpMenu *helpmenu = new KHelpMenu(contextMenu, kapp->aboutData(), false);
- KActionCollection* actions = new KActionCollection(helpmenu);
+ TDEActionCollection* actions = new TDEActionCollection(helpmenu);
KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actions)->plug(contextMenu);
KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actions)->plug(contextMenu);
diff --git a/noatun/library/pluginmodule.cpp b/noatun/library/pluginmodule.cpp
index dd30111e..72f58c9b 100644
--- a/noatun/library/pluginmodule.cpp
+++ b/noatun/library/pluginmodule.cpp
@@ -69,7 +69,7 @@ void PluginListItem::paintCell(TQPainter *p, const TQColorGroup &cg, int a, int
}
PluginListView::PluginListView(unsigned _min, unsigned _max, TQWidget *_parent, const char *_name)
- : KListView(_parent, _name)
+ : TDEListView(_parent, _name)
, hasMaximum(true)
, max(_max)
, min(_min <= _max ? _min : _max)
@@ -78,7 +78,7 @@ PluginListView::PluginListView(unsigned _min, unsigned _max, TQWidget *_parent,
}
PluginListView::PluginListView(unsigned _min, TQWidget *_parent, const char *_name)
- : KListView(_parent, _name)
+ : TDEListView(_parent, _name)
, hasMaximum(false)
, min(_min)
, count(0)
@@ -86,7 +86,7 @@ PluginListView::PluginListView(unsigned _min, TQWidget *_parent, const char *_na
}
PluginListView::PluginListView(TQWidget *_parent, const char *_name)
- : KListView(_parent, _name)
+ : TDEListView(_parent, _name)
, hasMaximum(false)
, min(0)
, count(0)
@@ -96,7 +96,7 @@ PluginListView::PluginListView(TQWidget *_parent, const char *_name)
void PluginListView::clear()
{
count = 0;
- KListView::clear();
+ TDEListView::clear();
}
void PluginListView::stateChanged(PluginListItem *item, bool b)
diff --git a/noatun/library/pluginmodule.h b/noatun/library/pluginmodule.h
index d29fe1d1..52113f62 100644
--- a/noatun/library/pluginmodule.h
+++ b/noatun/library/pluginmodule.h
@@ -48,7 +48,7 @@ private:
bool exclusive;
};
-class PluginListView : public KListView
+class PluginListView : public TDEListView
{
Q_OBJECT
diff --git a/noatun/library/stereobuttonaction.cpp b/noatun/library/stereobuttonaction.cpp
index e8df0046..27011708 100644
--- a/noatun/library/stereobuttonaction.cpp
+++ b/noatun/library/stereobuttonaction.cpp
@@ -4,27 +4,27 @@ namespace NoatunStdAction
{
StereoButtonAction::StereoButtonAction(const TQString& text, int accel, TQObject* parent, const char* name )
- : KAction(text, accel, parent, name)
+ : TDEAction(text, accel, parent, name)
{}
StereoButtonAction::StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name )
- : KAction(text, accel, receiver, slot, parent, name)
+ : TDEAction(text, accel, receiver, slot, parent, name)
{}
StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, TQObject* parent, const char* name )
- : KAction(text, pix, accel, parent, name)
+ : TDEAction(text, pix, accel, parent, name)
{}
StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, TQObject* parent, const char* name )
- : KAction(text, pix, accel, parent, name)
+ : TDEAction(text, pix, accel, parent, name)
{}
StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name )
- : KAction(text, pix, accel, receiver, slot, parent, name)
+ : TDEAction(text, pix, accel, receiver, slot, parent, name)
{}
StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name )
- : KAction(text, pix, accel, receiver, slot, parent, name)
+ : TDEAction(text, pix, accel, receiver, slot, parent, name)
{}
void StereoButtonAction::disable(void)
diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp
index f1f64a22..7d6c4bfd 100644
--- a/noatun/modules/excellent/userinterface.cpp
+++ b/noatun/modules/excellent/userinterface.cpp
@@ -62,7 +62,7 @@
#include <tqvbox.h>
Excellent::Excellent()
- : KMainWindow(0, "NoatunExcellent")
+ : TDEMainWindow(0, "NoatunExcellent")
, UserInterface()
{
setAcceptDrops(true);
@@ -82,7 +82,7 @@ Excellent::Excellent()
NoatunStdAction::forward(actionCollection(), "forward");
NoatunStdAction::playlist(actionCollection(), "show_playlist");
- volumeAction = new KToggleAction(i18n("Show &Volume Control"), 0, TQT_TQOBJECT(this), TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol");
+ volumeAction = new TDEToggleAction(i18n("Show &Volume Control"), 0, TQT_TQOBJECT(this), TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol");
volumeAction->setCheckedState(i18n("Hide &Volume Control"));
NoatunStdAction::effects(actionCollection(), "effects");
NoatunStdAction::equalizer(actionCollection(), "equalizer");
@@ -210,7 +210,7 @@ void Excellent::showEvent(TQShowEvent *e)
config->writeEntry("mappingState", NET::Visible);
config->sync();
- KMainWindow::showEvent(e);
+ TDEMainWindow::showEvent(e);
}
void Excellent::hideEvent(TQHideEvent *e)
@@ -220,7 +220,7 @@ void Excellent::hideEvent(TQHideEvent *e)
config->writeEntry("mappingState", NET::Withdrawn);
config->sync();
- KMainWindow::hideEvent(e);
+ TDEMainWindow::hideEvent(e);
}
void Excellent::closeEvent(TQCloseEvent *)
diff --git a/noatun/modules/excellent/userinterface.h b/noatun/modules/excellent/userinterface.h
index 0cd172a6..c47f05f1 100644
--- a/noatun/modules/excellent/userinterface.h
+++ b/noatun/modules/excellent/userinterface.h
@@ -32,22 +32,22 @@
#include <noatun/stdaction.h>
#include <kmainwindow.h>
-class KAction;
-class KPopupMenu;
+class TDEAction;
+class TDEPopupMenu;
class KStatusBar;
class Player;
class TQHBox;
class TQLabel;
class TQSlider;
class L33tSlider;
-class KToggleAction;
+class TDEToggleAction;
/**
* @short Main window class
* @author Neil Stevens <multivac@fcmail.com>
* @author Charles Samuels <charles@kde.org>
*/
-class Excellent : public KMainWindow, public UserInterface
+class Excellent : public TDEMainWindow, public UserInterface
{
Q_OBJECT
@@ -94,7 +94,7 @@ private:
TQHBox *mainFrame;
- KToggleAction *volumeAction, *menubarAction;
+ TDEToggleAction *volumeAction, *menubarAction;
L33tSlider *volumeSlider, *slider;
TQLabel *elapsed, *total;
};
diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp
index ab6c9194..27746b69 100644
--- a/noatun/modules/htmlexport/htmlexport.cpp
+++ b/noatun/modules/htmlexport/htmlexport.cpp
@@ -17,7 +17,7 @@ HTMLExport::HTMLExport(): TQObject(0, "HTMLExport"), Plugin()
{
NOATUNPLUGINC(HTMLExport);
- mAction = new KAction(i18n("&Export Playlist..."), "filesaveas", 0,
+ mAction = new TDEAction(i18n("&Export Playlist..."), "filesaveas", 0,
this, TQT_SLOT(slotExport()), this, "exportlist");
napp->pluginActionMenu()->insert(mAction);
diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h
index 304092fb..0c3de125 100644
--- a/noatun/modules/htmlexport/htmlexport.h
+++ b/noatun/modules/htmlexport/htmlexport.h
@@ -29,7 +29,7 @@
#include <noatun/pref.h>
#include <noatun/plugin.h>
-class KAction;
+class TDEAction;
class HTMLExport : public TQObject, public Plugin
{
@@ -45,7 +45,7 @@ private:
TQString htmlEscape(const TQString &source);
TQString getColorByEntry(TQString s);
TDEConfig *config;
- KAction *mAction;
+ TDEAction *mAction;
private slots:
void slotExport();
diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp
index 36d6a8fb..a504b977 100644
--- a/noatun/modules/infrared/irprefs.cpp
+++ b/noatun/modules/infrared/irprefs.cpp
@@ -60,7 +60,7 @@ IRPrefs::IRPrefs(TQObject *parent)
TQLabel *label = new TQLabel(i18n("Remote control &commands:"), this);
layout->addMultiCellWidget(label, 0, 0, 0, 4);
- label->setBuddy(m_commands = new KListView(this));
+ label->setBuddy(m_commands = new TDEListView(this));
layout->addMultiCellWidget(m_commands, 1, 1, 0, 4);
label = new TQLabel(i18n("&Action:"), this);
diff --git a/noatun/modules/infrared/irprefs.h b/noatun/modules/infrared/irprefs.h
index 3554ae01..6646456e 100644
--- a/noatun/modules/infrared/irprefs.h
+++ b/noatun/modules/infrared/irprefs.h
@@ -7,7 +7,7 @@
class TQCheckBox;
class TQListViewItem;
-class KListView;
+class TDEListView;
class KComboBox;
class KIntSpinBox;
class Lirc;
@@ -45,7 +45,7 @@ private slots:
private:
static void readConfig();
- KListView *m_commands;
+ TDEListView *m_commands;
KComboBox *m_action;
TQCheckBox *m_repeat;
KIntSpinBox *m_interval;
diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp
index cdee37c0..4d74d858 100644
--- a/noatun/modules/kaiman/pref.cpp
+++ b/noatun/modules/kaiman/pref.cpp
@@ -39,7 +39,7 @@ KaimanPrefDlg::KaimanPrefDlg(TQObject *parent )
TQLabel *label = new TQLabel( i18n("Kaiman Skins"), this, "label" );
topLayout->addWidget( label );
- _skinList = new KListBox( this, "skinList" );
+ _skinList = new TDEListBox( this, "skinList" );
topLayout->addWidget( _skinList, 1 );
reopen();
}
diff --git a/noatun/modules/kaiman/pref.h b/noatun/modules/kaiman/pref.h
index 19895bff..50ab3808 100644
--- a/noatun/modules/kaiman/pref.h
+++ b/noatun/modules/kaiman/pref.h
@@ -21,7 +21,7 @@
#include <noatun/pref.h>
-class KListBox;
+class TDEListBox;
class TQLabel;
class KaimanPrefDlg : public CModule
@@ -42,7 +42,7 @@ class KaimanPrefDlg : public CModule
private:
void readSkinDir( const TQString &dir );
- KListBox *_skinList;
+ TDEListBox *_skinList;
};
#endif
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index 56eb389e..ef6d30ce 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -65,7 +65,7 @@ Kaiman* Kaiman::kaiman=0;
const char Kaiman::DEFAULT_SKIN[]="car-preset";
Kaiman::Kaiman()
- : KMainWindow(0, "NoatunKaiman"), UserInterface()
+ : TDEMainWindow(0, "NoatunKaiman"), UserInterface()
{
NOATUNPLUGINC(Kaiman);
kaiman=this;
@@ -531,7 +531,7 @@ void Kaiman::newSong()
#undef None
void Kaiman::toggleLoop()
{
- KPopupMenu *loopMenu = new KPopupMenu(this, "loopMenu");
+ TDEPopupMenu *loopMenu = new TDEPopupMenu(this, "loopMenu");
int selectedItem = 0;
loopMenu->setCheckable(true);
diff --git a/noatun/modules/kaiman/userinterface.h b/noatun/modules/kaiman/userinterface.h
index aac209f3..aa681c3c 100644
--- a/noatun/modules/kaiman/userinterface.h
+++ b/noatun/modules/kaiman/userinterface.h
@@ -32,7 +32,7 @@ class Player;
* @author Stefan Schimanski <1Stein@gmx.de>
* @version 0.1
*/
-class Kaiman : public KMainWindow, public UserInterface
+class Kaiman : public TDEMainWindow, public UserInterface
{
Q_OBJECT
diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp
index 7cdfc0e2..f6c60256 100644
--- a/noatun/modules/kjofol-skin/kjbutton.cpp
+++ b/noatun/modules/kjofol-skin/kjbutton.cpp
@@ -222,7 +222,7 @@ void KJButton::mouseRelease(const TQPoint &, bool in)
napp->player()->toggleListView();
else if (mTitle=="repeatbutton")
{
- KPopupMenu *loopMenu = new KPopupMenu(KJWidget::parent(),"loopMenu");
+ TDEPopupMenu *loopMenu = new TDEPopupMenu(KJWidget::parent(),"loopMenu");
int selectedItem = 0;
loopMenu->setCheckable(true);
diff --git a/noatun/modules/kjofol-skin/kjguisettingswidget.ui b/noatun/modules/kjofol-skin/kjguisettingswidget.ui
index 934285fa..244e67a2 100644
--- a/noatun/modules/kjofol-skin/kjguisettingswidget.ui
+++ b/noatun/modules/kjofol-skin/kjguisettingswidget.ui
@@ -397,7 +397,7 @@
<string>Font:</string>
</property>
</widget>
- <widget class="KFontCombo" row="1" column="1">
+ <widget class="TDEFontCombo" row="1" column="1">
<property name="name">
<cstring>cmbSysFont</cstring>
</property>
diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp
index e3faf8b1..71612174 100644
--- a/noatun/modules/marquis/marquis.cpp
+++ b/noatun/modules/marquis/marquis.cpp
@@ -69,7 +69,7 @@ static void setPlayStatus( Player *player, int status )
Marquis::Marquis()
- : KMainWindow(0, "Marquis")
+ : TDEMainWindow(0, "Marquis")
, SessionManagement()
{
hide();
@@ -78,8 +78,8 @@ Marquis::Marquis()
// for testing: uncomment this and use
// dcop `dcop | grep noatun` Marquis activateAction dynamicRestore
// and dynamicSave accordingly.
-// (void) new KAction("Restore", 0, this, TQT_SLOT( dynamicRestore() ), actionCollection(), "dynamicRestore" );
-// (void) new KAction("Save", 0, this, TQT_SLOT( dynamicSave() ), actionCollection(), "dynamicSave" );
+// (void) new TDEAction("Restore", 0, this, TQT_SLOT( dynamicRestore() ), actionCollection(), "dynamicRestore" );
+// (void) new TDEAction("Save", 0, this, TQT_SLOT( dynamicSave() ), actionCollection(), "dynamicSave" );
connect( napp, TQT_SIGNAL( saveYourself() ), TQT_SLOT( dynamicSave() ));
}
diff --git a/noatun/modules/marquis/marquis.h b/noatun/modules/marquis/marquis.h
index d07ed297..276ebc9a 100644
--- a/noatun/modules/marquis/marquis.h
+++ b/noatun/modules/marquis/marquis.h
@@ -32,7 +32,7 @@
class Player;
-class Marquis : public KMainWindow, public SessionManagement
+class Marquis : public TDEMainWindow, public SessionManagement
{
Q_OBJECT
diff --git a/noatun/modules/metatag/metatag.cpp b/noatun/modules/metatag/metatag.cpp
index 5ffa1e6a..db71f715 100644
--- a/noatun/modules/metatag/metatag.cpp
+++ b/noatun/modules/metatag/metatag.cpp
@@ -32,7 +32,7 @@ extern "C"
MetaTagLoader::MetaTagLoader():Plugin()
{
- mAction = new KAction(i18n("&Tag Editor..."), "edit", 0, this, TQT_SLOT(editTag()), this, "edittag");
+ mAction = new TDEAction(i18n("&Tag Editor..."), "edit", 0, this, TQT_SLOT(editTag()), this, "edittag");
napp->pluginActionMenu()->insert(mAction);
}
diff --git a/noatun/modules/metatag/metatag.h b/noatun/modules/metatag/metatag.h
index af5ed015..43eb9f3c 100644
--- a/noatun/modules/metatag/metatag.h
+++ b/noatun/modules/metatag/metatag.h
@@ -9,7 +9,7 @@
#include <tqobject.h>
class KFileMetaInfo;
-class KAction;
+class TDEAction;
class MetaTagLoader:public TQObject, public Tags, public Plugin {
Q_OBJECT
@@ -25,7 +25,7 @@ class MetaTagLoader:public TQObject, public Tags, public Plugin {
private:
bool setProperty(KFileMetaInfo &info, PlaylistItem &item, const TQString &key, const TQString &property);
int menuID;
- KAction *mAction;
+ TDEAction *mAction;
};
#endif
diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp
index dac87cf2..f7e35778 100644
--- a/noatun/modules/monoscope/monoscope.cpp
+++ b/noatun/modules/monoscope/monoscope.cpp
@@ -40,7 +40,7 @@ Monoscope::~Monoscope()
void Monoscope::init()
{
- mAction = new KToggleAction(i18n("Toggle Monoscope"), 0, 0,
+ mAction = new TDEToggleAction(i18n("Toggle Monoscope"), 0, 0,
TQT_TQOBJECT(this), TQT_SLOT(toggle()), TQT_TQOBJECT(this), "togglemonoscope");
mAction->setChecked(!isHidden());
napp->pluginActionMenu()->insert(mAction);
diff --git a/noatun/modules/monoscope/monoscope.h b/noatun/modules/monoscope/monoscope.h
index fbb61153..7fddb26b 100644
--- a/noatun/modules/monoscope/monoscope.h
+++ b/noatun/modules/monoscope/monoscope.h
@@ -3,7 +3,7 @@
#include <noatun/plugin.h>
-class KToggleAction;
+class TDEToggleAction;
class Monoscope : public TQWidget, public MonoScope, public Plugin
{
@@ -28,7 +28,7 @@ protected:
private:
TQRgb mHighColor, mLowColor;
- KToggleAction *mAction;
+ TDEToggleAction *mAction;
};
#endif
diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp
index 4cda6fe0..52552be8 100644
--- a/noatun/modules/simple/userinterface.cpp
+++ b/noatun/modules/simple/userinterface.cpp
@@ -50,7 +50,7 @@
#include "volume.xpm"
SimpleUI::SimpleUI()
- : KMainWindow(0, "NoatunSimpleUI"), UserInterface()
+ : TDEMainWindow(0, "NoatunSimpleUI"), UserInterface()
{
setAcceptDrops( true );
setCaption( i18n("Noatun") );
@@ -127,7 +127,7 @@ SimpleUI::~SimpleUI()
void SimpleUI::setupActions()
{
KStdAction::open( TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection(), "_file_open" );
- new KAction( i18n("&Properties"), 0, TQT_TQOBJECT(propertiesDialog), TQT_SLOT(show()),
+ new TDEAction( i18n("&Properties"), 0, TQT_TQOBJECT(propertiesDialog), TQT_SLOT(show()),
actionCollection(), "_file_properties" );
KStdAction::quit( TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection(), "_file_quit");
diff --git a/noatun/modules/simple/userinterface.h b/noatun/modules/simple/userinterface.h
index f32fae69..7265fa4e 100644
--- a/noatun/modules/simple/userinterface.h
+++ b/noatun/modules/simple/userinterface.h
@@ -25,7 +25,7 @@
#include "propertiesdialog.h"
-class SimpleUI : public KMainWindow, public UserInterface
+class SimpleUI : public TDEMainWindow, public UserInterface
{
Q_OBJECT
@@ -74,8 +74,8 @@ private:
L33tSlider *slider;
int extra_width;
int extra_height;
- KToggleAction *menubarAction;
- KToggleAction *statusbarAction;
+ TDEToggleAction *menubarAction;
+ TDEToggleAction *statusbarAction;
};
#endif
diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp
index cce64897..8e150cc1 100644
--- a/noatun/modules/splitplaylist/view.cpp
+++ b/noatun/modules/splitplaylist/view.cpp
@@ -49,7 +49,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co
addRef();
setUrl(text);
- static_cast<KListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
+ static_cast<TDEListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
setOn(true);
// is this really needed, it makes the listview too wide for me :(
@@ -91,7 +91,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co
}
}
- static_cast<KListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
+ static_cast<TDEListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
modified();
if (!streamable() && enqueue(url()))
@@ -345,7 +345,7 @@ void SafeListViewItem::remove()
}
List::List(View *parent)
- : KListView(parent), recursiveAddAfter(0), listJob(0)
+ : TDEListView(parent), recursiveAddAfter(0), listJob(0)
{
addColumn(i18n("File"));
addColumn(i18n("Time"));
@@ -372,7 +372,7 @@ void List::move()
bool List::acceptDrag(TQDropEvent *event) const
{
- return KURLDrag::canDecode(event) || KListView::acceptDrag(event);
+ return KURLDrag::canDecode(event) || TDEListView::acceptDrag(event);
}
void List::dropEvent(TQDropEvent *event, TQListViewItem *after)
@@ -396,7 +396,7 @@ void List::keyPressEvent(TQKeyEvent *e)
{
if (currentItem())
{
- emit KListView::executed(currentItem());
+ emit TDEListView::executed(currentItem());
}
return;
@@ -412,7 +412,7 @@ void List::keyPressEvent(TQKeyEvent *e)
return;
}
- KListView::keyPressEvent(e);
+ TDEListView::keyPressEvent(e);
}
@@ -634,7 +634,7 @@ void List::slotRedirection(TDEIO::Job *, const KURL & url)
/////////////////////////////////
View::View(SplitPlaylist *)
- : KMainWindow(0, "NoatunSplitplaylistView")
+ : TDEMainWindow(0, "NoatunSplitplaylistView")
{
list=new List(this);
setCentralWidget(list);
@@ -642,9 +642,9 @@ View::View(SplitPlaylist *)
// connect the click on the header with sorting
connect(list->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(headerClicked(int)) );
- mOpen=new KAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files");
- (void) new KAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir");
- mDelete=new KAction(i18n("Delete"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteSelected()), actionCollection(), "delete");
+ mOpen=new TDEAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files");
+ (void) new TDEAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir");
+ mDelete=new TDEAction(i18n("Delete"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteSelected()), actionCollection(), "delete");
mClose=KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
mFind=KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection());
@@ -655,8 +655,8 @@ View::View(SplitPlaylist *)
mSave=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection());
mSaveAs=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection());
- (void) new KAction(i18n("Shuffle"), "misc", 0, TQT_TQOBJECT(SPL), TQT_SLOT( randomize() ), actionCollection(), "shuffle");
- (void) new KAction(i18n("Clear"), "editclear", 0, TQT_TQOBJECT(list), TQT_SLOT( clear() ), actionCollection(), "clear");
+ (void) new TDEAction(i18n("Shuffle"), "misc", 0, TQT_TQOBJECT(SPL), TQT_SLOT( randomize() ), actionCollection(), "shuffle");
+ (void) new TDEAction(i18n("Clear"), "editclear", 0, TQT_TQOBJECT(list), TQT_SLOT( clear() ), actionCollection(), "clear");
createGUI("splui.rc");
diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h
index 48a0be67..9bff4335 100644
--- a/noatun/modules/splitplaylist/view.h
+++ b/noatun/modules/splitplaylist/view.h
@@ -55,7 +55,7 @@ private:
bool removed;
};
-class List : public KListView
+class List : public TDEListView
{
Q_OBJECT
@@ -100,10 +100,10 @@ protected:
};
class KFileDialog;
-class KToggleAction;
-class KToolBar;
+class TDEToggleAction;
+class TDEToolBar;
-class View : public KMainWindow
+class View : public TDEMainWindow
{
Q_OBJECT
@@ -155,9 +155,9 @@ signals:
private:
List *list;
- KAction *mOpen, *mDelete, *mSave, *mSaveAs, *mOpenpl, *mOpenNew;
- KAction *mClose;
- KAction *mFind;
+ TDEAction *mOpen, *mDelete, *mSave, *mSaveAs, *mOpenpl, *mOpenNew;
+ TDEAction *mClose;
+ TDEAction *mFind;
Finder *mFinder;
KURL mPlaylistFile;
diff --git a/noatun/modules/systray/kitsystemtray.cpp b/noatun/modules/systray/kitsystemtray.cpp
index a0b545ab..63a467b6 100644
--- a/noatun/modules/systray/kitsystemtray.cpp
+++ b/noatun/modules/systray/kitsystemtray.cpp
@@ -44,11 +44,11 @@
#include <fixx11h.h>
-KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name)
+KitSystemTray::KitSystemTray(const TQString &contextMenu, TDEMainWindow *parent, const char *name)
: KSystemTray(parent, name)
{
setAlignment(AlignHCenter | AlignVCenter);
- menu = (KPopupMenu *)parent->guiFactory()->container(contextMenu, parent);
+ menu = (TDEPopupMenu *)parent->guiFactory()->container(contextMenu, parent);
menu->insertTitle(SmallIcon("noatun"), TQString(), 0, 0);
setAcceptDrops(true);
}
diff --git a/noatun/modules/systray/kitsystemtray.h b/noatun/modules/systray/kitsystemtray.h
index d012853e..13a8b518 100644
--- a/noatun/modules/systray/kitsystemtray.h
+++ b/noatun/modules/systray/kitsystemtray.h
@@ -30,8 +30,8 @@
#include <ksystemtray.h>
-class KPopupMenu;
-class KMainWindow;
+class TDEPopupMenu;
+class TDEMainWindow;
class TQPixmap;
class KitSystemTray : public KSystemTray
@@ -40,7 +40,7 @@ Q_OBJECT
public:
- KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name = 0);
+ KitSystemTray(const TQString &contextMenu, TDEMainWindow *parent, const char *name = 0);
void changeTitle(const TQPixmap &, const TQString &);
protected:
virtual void showEvent(TQShowEvent *);
@@ -49,7 +49,7 @@ protected:
virtual void dropEvent(TQDropEvent *);
virtual void wheelEvent(TQWheelEvent *e);
- KPopupMenu *menu;
+ TDEPopupMenu *menu;
};
#endif
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index 27976429..0cfde28e 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/noatun/modules/systray/systray.cpp
@@ -90,7 +90,7 @@ protected:
//NoatunSystray *NoatunSystray::self = 0;
-NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(),
+NoatunSystray::NoatunSystray() : TDEMainWindow(0, "NoatunSystray"), Plugin(),
mTray(0), trayStatus(0), trayBase(0), mPassivePopup(0L)
{
//self = this;
diff --git a/noatun/modules/systray/systray.h b/noatun/modules/systray/systray.h
index 270bef01..b1dd7aad 100644
--- a/noatun/modules/systray/systray.h
+++ b/noatun/modules/systray/systray.h
@@ -38,7 +38,7 @@ class KitSystemTray;
class TQTimer;
class PassivePopup;
-class NoatunSystray : public KMainWindow, public Plugin
+class NoatunSystray : public TDEMainWindow, public Plugin
{
Q_OBJECT
diff --git a/tdemid/channelview.cpp b/tdemid/channelview.cpp
index d97fdee9..3bc76c25 100644
--- a/tdemid/channelview.cpp
+++ b/tdemid/channelview.cpp
@@ -31,7 +31,7 @@
#include <tdeconfig.h>
-ChannelView::ChannelView(void) : KMainWindow(0, "ChannelView")
+ChannelView::ChannelView(void) : TDEMainWindow(0, "ChannelView")
{
setCaption(i18n("Channel View"));
for (int i=0;i<16;i++)
diff --git a/tdemid/channelview.h b/tdemid/channelview.h
index 9ef7301e..a7d6e32d 100644
--- a/tdemid/channelview.h
+++ b/tdemid/channelview.h
@@ -30,7 +30,7 @@
#include "channel.h"
-class ChannelView : public KMainWindow
+class ChannelView : public TDEMainWindow
{
Q_OBJECT
diff --git a/tdemid/history.txt b/tdemid/history.txt
index 896bdeb1..4c19dd76 100644
--- a/tdemid/history.txt
+++ b/tdemid/history.txt
@@ -361,7 +361,7 @@ Saturday 15-8-98
I've finished the changing instrument feature and so the channel view.
I've also improved speed a little by supressing some parses to the midi file.
I have improved consoletdemid, now it is much more usuable.
- Finally, I've changed the sources to use the KAccel class.
+ Finally, I've changed the sources to use the TDEAccel class.
Monday 31-8-98
- I've fixed some bugs, the most important one being that tdemid left its player
diff --git a/tdemid/tdemid_part.cpp b/tdemid/tdemid_part.cpp
index d6e22474..e85281e1 100644
--- a/tdemid/tdemid_part.cpp
+++ b/tdemid/tdemid_part.cpp
@@ -77,20 +77,20 @@ TDEInstance *KMidFactory::instance()
setWidget(widget);
// create and connect our actions
- (void)new KAction(i18n("Play"), "player_play", 0, this,
+ (void)new TDEAction(i18n("Play"), "player_play", 0, this,
TQT_SLOT(slotPlay()), actionCollection(),
"play");
- (void)new KAction(i18n("Stop"), "player_stop", 0, this,
+ (void)new TDEAction(i18n("Stop"), "player_stop", 0, this,
TQT_SLOT(slotStop()), actionCollection(),
"stop");
- (void)new KAction(i18n("Backward"),
+ (void)new TDEAction(i18n("Backward"),
"2leftarrow", 0, this,
TQT_SLOT(slotBackward()), actionCollection(),
"backward");
- (void)new KAction(i18n("Forward"),
+ (void)new TDEAction(i18n("Forward"),
"2rightarrow", 0, this,
TQT_SLOT(slotForward()), actionCollection(),
"forward");
diff --git a/tdemid/tdemidclient.cpp b/tdemid/tdemidclient.cpp
index 07edf700..3450dbf2 100644
--- a/tdemid/tdemidclient.cpp
+++ b/tdemid/tdemidclient.cpp
@@ -65,7 +65,7 @@
//#define TEMPHACK
-tdemidClient::tdemidClient(TQWidget *parent, KActionCollection *ac, const char *name)
+tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char *name)
: DCOPObject("KMidIface"), TQWidget(parent,name)
{
actionCollection=ac;
@@ -1576,15 +1576,15 @@ void tdemidClient::setTempo(int i)
}
void tdemidClient::setSongEncoding( int i )
{
- KListAction *tmplistaction=
- ((KListAction*)actionCollection->action("file_type"));
+ TDEListAction *tmplistaction=
+ ((TDEListAction*)actionCollection->action("file_type"));
tmplistaction->setCurrentItem(i);
}
void tdemidClient::setLyricEvents( int i )
{
- KListAction *tmplistaction=
- ((KListAction*)actionCollection->action("display_events"));
+ TDEListAction *tmplistaction=
+ ((TDEListAction*)actionCollection->action("display_events"));
tmplistaction->setCurrentItem(i);
}
void tdemidClient::setCurrentSong(int i)
@@ -1594,7 +1594,7 @@ void tdemidClient::setCurrentSong(int i)
}
void tdemidClient::setPlayListMode(int i)
{
- ((KListAction*)actionCollection->action("play_order"))->setCurrentItem(i);
+ ((TDEListAction*)actionCollection->action("play_order"))->setCurrentItem(i);
}
void tdemidClient::slotSelectEncoding(int i)
{
diff --git a/tdemid/tdemidclient.h b/tdemid/tdemidclient.h
index 5a6ee79b..65fa4e36 100644
--- a/tdemid/tdemidclient.h
+++ b/tdemid/tdemidclient.h
@@ -96,7 +96,7 @@ private:
int *collectionplaylist; // the list of songs ordered in the
// user selected mode
- class KActionCollection *actionCollection;
+ class TDEActionCollection *actionCollection;
void generateCPL(void);
int searchInCPL(int song); // Returns the index of song
@@ -106,7 +106,7 @@ private:
int openFile(const char *filename);
void allNotesOff(void);
public:
- tdemidClient(TQWidget *parent, KActionCollection *ac, const char *name=0);
+ tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char *name=0);
~tdemidClient();
char *midiFileName(void) {return midifile_opened;};
diff --git a/tdemid/tdemidframe.cpp b/tdemid/tdemidframe.cpp
index edcfbfe0..2b340131 100644
--- a/tdemid/tdemidframe.cpp
+++ b/tdemid/tdemidframe.cpp
@@ -59,14 +59,14 @@
#include "version.h"
tdemidFrame::tdemidFrame(const char *name)
- :KMainWindow(0, name)
+ :TDEMainWindow(0, name)
{
tdemidclient=new tdemidClient(this,actionCollection(), "KMidClient");
tdemidclient->setSongType(1);
tdemidclient->show();
setCentralWidget( tdemidclient );
/*
- kKeysAccel=new KAccel(this);
+ kKeysAccel=new TDEAccel(this);
kKeysAccel->insertItem(i18n("Play/Pause"),"Play/Pause", Key_Space);
kKeysAccel->connectItem("Play/Pause", TQT_TQOBJECT(this), TQT_SLOT(spacePressed()));
kKeysAccel->insertItem(i18n("Stop"),"Stop", Key_Backspace);
@@ -87,52 +87,52 @@ tdemidFrame::tdemidFrame(const char *name)
kKeysAccel->readSettings();
*/
KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_Open()), actionCollection());
- (void)new KAction(i18n("&Save Lyrics..."), 0, TQT_TQOBJECT(this),
+ (void)new TDEAction(i18n("&Save Lyrics..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(file_SaveLyrics()), actionCollection(), "file_save_lyrics");
KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
- (void)new KAction(i18n("&Play"), "player_play", TQt::Key_Space,
+ (void)new TDEAction(i18n("&Play"), "player_play", TQt::Key_Space,
TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotPlay()), actionCollection(), "song_play");
- (void)new KAction(i18n("P&ause"), "player_pause", TQt::Key_P, TQT_TQOBJECT(tdemidclient),
+ (void)new TDEAction(i18n("P&ause"), "player_pause", TQt::Key_P, TQT_TQOBJECT(tdemidclient),
TQT_SLOT(slotPause()), actionCollection(), "song_pause");
- (void)new KAction(i18n("&Stop"), "player_stop", TQt::Key_Backspace,
+ (void)new TDEAction(i18n("&Stop"), "player_stop", TQt::Key_Backspace,
TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotStop()), actionCollection(), "song_stop");
- (void)new KAction(i18n("P&revious Song"), "player_start", Key_Left,
+ (void)new TDEAction(i18n("P&revious Song"), "player_start", Key_Left,
TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotPrevSong()), actionCollection(),
"song_previous");
- (void)new KAction(i18n("&Next Song"), "player_end", Key_Right,
+ (void)new TDEAction(i18n("&Next Song"), "player_end", Key_Right,
TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotNextSong()), actionCollection(),
"song_next");
- (void)new KToggleAction(i18n("&Loop"), 0, TQT_TQOBJECT(this), TQT_SLOT(song_Loop()),
+ (void)new TDEToggleAction(i18n("&Loop"), 0, TQT_TQOBJECT(this), TQT_SLOT(song_Loop()),
actionCollection(), "song_loop");
- (void)new KAction(i18n("Rewind"), "2leftarrow", 0, TQT_TQOBJECT(tdemidclient),
+ (void)new TDEAction(i18n("Rewind"), "2leftarrow", 0, TQT_TQOBJECT(tdemidclient),
TQT_SLOT(slotRewind()), actionCollection(), "song_rewind");
- (void)new KAction(i18n("Forward"), "2rightarrow", 0, TQT_TQOBJECT(tdemidclient),
+ (void)new TDEAction(i18n("Forward"), "2rightarrow", 0, TQT_TQOBJECT(tdemidclient),
TQT_SLOT(slotForward()), actionCollection(), "song_forward");
- (void)new KAction(i18n("&Organize..."), 0, TQT_TQOBJECT(this), TQT_SLOT(collect_organize()),
+ (void)new TDEAction(i18n("&Organize..."), 0, TQT_TQOBJECT(this), TQT_SLOT(collect_organize()),
actionCollection(), "collect_organize");
TQStringList playmodes;
playmodes.append(i18n("In Order"));
playmodes.append(i18n("Shuffle"));
- KSelectAction *act=new KSelectAction(i18n("Play Order"), 0, /*this, TQT_SLOT(collect_PlayOrder(int)),*/
+ TDESelectAction *act=new TDESelectAction(i18n("Play Order"), 0, /*this, TQT_SLOT(collect_PlayOrder(int)),*/
actionCollection(), "play_order");
connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(collect_PlayOrder(int)));
act->setItems(playmodes);
- (void)new KToggleAction(i18n("Auto-Add to Collection"), 0, TQT_TQOBJECT(this),
+ (void)new TDEToggleAction(i18n("Auto-Add to Collection"), 0, TQT_TQOBJECT(this),
TQT_SLOT(collect_AutoAdd()), actionCollection(), "collect_autoadd");
playmodes.clear();
playmodes.append(i18n("&General MIDI"));
playmodes.append(i18n("&MT-32"));
- act=new KSelectAction(i18n("File Type"), 0,/* this, TQT_SLOT(options_FileType(int)),*/
+ act=new TDESelectAction(i18n("File Type"), 0,/* this, TQT_SLOT(options_FileType(int)),*/
actionCollection(), "file_type");
connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(options_FileType(int)));
act->setItems(playmodes);
@@ -141,35 +141,35 @@ tdemidFrame::tdemidFrame(const char *name)
playmodes.append(i18n("&Text Events"));
playmodes.append(i18n("&Lyric Events"));
- act=new KSelectAction(i18n("Display Events"), Key_T, /*this,
+ act=new TDESelectAction(i18n("Display Events"), Key_T, /*this,
TQT_SLOT(options_DisplayEvents(int)),*/ actionCollection(),
"display_events");
connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(options_DisplayEvents(int)));
act->setItems(playmodes);
- (void)new KToggleAction(i18n("Automatic Text Chooser"), 0, TQT_TQOBJECT(this),
+ (void)new TDEToggleAction(i18n("Automatic Text Chooser"), 0, TQT_TQOBJECT(this),
TQT_SLOT(options_AutomaticText()), actionCollection(),
"option_automatictext");
- KToggleAction* togact = new KToggleAction(i18n("Show &Volume Bar"), "volume",
+ TDEToggleAction* togact = new TDEToggleAction(i18n("Show &Volume Bar"), "volume",
0, TQT_TQOBJECT(this), TQT_SLOT(options_ShowVolumeBar()), actionCollection(),
"toggle_volumebar");
togact->setCheckedState(i18n("Hide &Volume Bar"));
- togact = new KToggleAction(i18n("Show &Channel View"), "piano",
+ togact = new TDEToggleAction(i18n("Show &Channel View"), "piano",
0, TQT_TQOBJECT(this), TQT_SLOT(options_ShowChannelView()), actionCollection(),
"toggle_channelview");
togact->setCheckedState(i18n("Hide &Channel View"));
- (void)new KAction(i18n("Channel View &Options..."), 0, TQT_TQOBJECT(this),
+ (void)new TDEAction(i18n("Channel View &Options..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(options_ChannelViewOptions()), actionCollection(),
"channelview_options");
- (void)new KAction(i18n("&Font Change..."), 0, TQT_TQOBJECT(this),
+ (void)new TDEAction(i18n("&Font Change..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(options_FontChange()), actionCollection(),
"change_font");
- (void)new KAction(i18n("MIDI &Setup..."), 0, TQT_TQOBJECT(this),
+ (void)new TDEAction(i18n("MIDI &Setup..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(options_MidiSetup()), actionCollection(), "midi_setup");
@@ -177,38 +177,38 @@ tdemidFrame::tdemidFrame(const char *name)
TDEConfig *cfg=kapp->config();
cfg->setGroup("KMid");
- KSelectAction *tmplistaction=
- ((KSelectAction*)actionCollection()->action("display_events"));
+ TDESelectAction *tmplistaction=
+ ((TDESelectAction*)actionCollection()->action("display_events"));
if (cfg->readNumEntry("TypeOfTextEvents",5)==5)
tmplistaction->setCurrentItem(1);
else
tmplistaction->setCurrentItem(0);
- tmplistaction=((KSelectAction*)actionCollection()->action("file_type"));
+ tmplistaction=((TDESelectAction*)actionCollection()->action("file_type"));
if (cfg->readNumEntry("TypeOfMidiFile",0)==0)
tmplistaction->setCurrentItem(0);
else
tmplistaction->setCurrentItem(1);
if (cfg->readNumEntry("Loop",0)==1)
- ((KToggleAction*)actionCollection()->action("song_loop"))->setChecked(true);
+ ((TDEToggleAction*)actionCollection()->action("song_loop"))->setChecked(true);
if (cfg->readNumEntry("ShowVolumeBar",0)==1)
- ((KToggleAction*)actionCollection()->action("toggle_volumebar"))->setChecked(true);
+ ((TDEToggleAction*)actionCollection()->action("toggle_volumebar"))->setChecked(true);
- tmplistaction=((KSelectAction*)actionCollection()->action("play_order"));
+ tmplistaction=((TDESelectAction*)actionCollection()->action("play_order"));
if (cfg->readNumEntry("CollectionPlayMode",0)==0)
tmplistaction->setCurrentItem(0);
else
tmplistaction->setCurrentItem(1);
if ((cfg->readNumEntry("AutoAddToCollection",0))==1)
- ((KToggleAction*)actionCollection()->action("collect_autoadd"))->setChecked(true);
+ ((TDEToggleAction*)actionCollection()->action("collect_autoadd"))->setChecked(true);
if ((cfg->readNumEntry("AutomaticTextEventChooser",1))==1)
- ((KToggleAction*)actionCollection()->action("option_automatictext"))->setChecked(true);
+ ((TDEToggleAction*)actionCollection()->action("option_automatictext"))->setChecked(true);
setAcceptDrops(true);
@@ -297,7 +297,7 @@ void tdemidFrame::song_stopPause()
if (tdemidclient->isPaused())
{
// song_Pause();
- ((KToggleAction*)actionCollection()->action("song_pause"))->setChecked(false);
+ ((TDEToggleAction*)actionCollection()->action("song_pause"))->setChecked(false);
tdemidclient->pause();
}
}
@@ -328,7 +328,7 @@ void tdemidFrame::options_AutomaticText()
void tdemidFrame::options_FontChange()
{
- KFontDialog *kfd=new KFontDialog(this);
+ TDEFontDialog *kfd=new TDEFontDialog(this);
TQFont font;
font=*tdemidclient->getFont();
kfd->getFont(font);
@@ -516,9 +516,9 @@ void tdemidFrame::rechooseTextEvent()
int t=tdemidclient->ChooseTypeOfTextEvents();
tdemidclient->repaintText(t);
if (t==1)
- ((KSelectAction*)actionCollection()->action("display_events"))->setCurrentItem(0);
+ ((TDESelectAction*)actionCollection()->action("display_events"))->setCurrentItem(0);
else
- ((KSelectAction*)actionCollection()->action("display_events"))->setCurrentItem(1);
+ ((TDESelectAction*)actionCollection()->action("display_events"))->setCurrentItem(1);
}
}
@@ -593,7 +593,7 @@ void tdemidFrame::options_ShowVolumeBar()
void tdemidFrame::options_ShowChannelView()
{
- if (!((KToggleAction*)actionCollection()->action("toggle_channelview"))->isChecked())
+ if (!((TDEToggleAction*)actionCollection()->action("toggle_channelview"))->isChecked())
{
tdemidclient->visibleChannelView(0);
} else
@@ -607,7 +607,7 @@ void tdemidFrame::options_ShowChannelView()
void tdemidFrame::channelViewDestroyed()
{
tdemidclient->channelViewDestroyed();
- ((KToggleAction*)actionCollection()->action("toggle_channelview"))->setChecked(false);
+ ((TDEToggleAction*)actionCollection()->action("toggle_channelview"))->setChecked(false);
}
void tdemidFrame::options_ChannelViewOptions()
@@ -638,7 +638,7 @@ void tdemidFrame::openURL( const TQString url )
void tdemidFrame::pause()
{
// tdemidclient->pause();
- ((KAction*)actionCollection()->action("pause"))->activate();
+ ((TDEAction*)actionCollection()->action("pause"))->activate();
}
void tdemidFrame::stop()
@@ -673,7 +673,7 @@ void tdemidFrame::nextSong()
void tdemidFrame::setSongLoop(int i)
{
- ((KToggleAction*)actionCollection()->action("song_loop"))->setChecked(i!=0);
+ ((TDEToggleAction*)actionCollection()->action("song_loop"))->setChecked(i!=0);
}
void tdemidFrame::setVolume(int i)
@@ -688,16 +688,16 @@ void tdemidFrame::setTempo(int i)
void tdemidFrame::setSongType( int i )
{
- KSelectAction *tmplistaction=
- ((KSelectAction*)actionCollection()->action("file_type"));
+ TDESelectAction *tmplistaction=
+ ((TDESelectAction*)actionCollection()->action("file_type"));
tmplistaction->setCurrentItem(i);
}
void tdemidFrame::setLyricEvents( int i )
{
- KSelectAction *tmplistaction=
- ((KSelectAction*)actionCollection()->action("display_events"));
+ TDESelectAction *tmplistaction=
+ ((TDESelectAction*)actionCollection()->action("display_events"));
tmplistaction->setCurrentItem(i);
}
@@ -714,7 +714,7 @@ void tdemidFrame::setActiveCollection( int i )
void tdemidFrame::setCollectionPlayMode(int i)
{
- ((KSelectAction*)actionCollection()->action("play_order"))->setCurrentItem(i);
+ ((TDESelectAction*)actionCollection()->action("play_order"))->setCurrentItem(i);
}
void tdemidFrame::setMidiDevice(int i)
diff --git a/tdemid/tdemidframe.h b/tdemid/tdemidframe.h
index e146762e..e181b96d 100644
--- a/tdemid/tdemidframe.h
+++ b/tdemid/tdemidframe.h
@@ -35,11 +35,11 @@
class TDEApplication;
class TDEConfig;
class tdemidClient;
-class KToolBar;
+class TDEToolBar;
class TQDragEvent;
-class KAccel;
+class TDEAccel;
-class KDE_EXPORT tdemidFrame : public KMainWindow
+class KDE_EXPORT tdemidFrame : public TDEMainWindow
{
Q_OBJECT
@@ -62,7 +62,7 @@ private:
TQPopupMenu *m_options;
TQPopupMenu *m_help;
*/
- KAccel *kKeysAccel;
+ TDEAccel *kKeysAccel;
protected:
int autoAddSongToCollection(const TQString& filename=TQString(),int setactive=1);