summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--amarok/HACKING2
-rw-r--r--amarok/src/Options2.ui6
-rw-r--r--amarok/src/Options5.ui2
-rw-r--r--amarok/src/actionclasses.cpp108
-rw-r--r--amarok/src/actionclasses.h50
-rw-r--r--amarok/src/amarok.h10
-rw-r--r--amarok/src/amarokcore/amarokdcophandler.cpp6
-rw-r--r--amarok/src/analyzers/blockanalyzer.cpp2
-rw-r--r--amarok/src/app.cpp14
-rw-r--r--amarok/src/app.h2
-rw-r--r--amarok/src/browserToolBar.h4
-rw-r--r--amarok/src/collectionbrowser.cpp72
-rw-r--r--amarok/src/collectionbrowser.h54
-rw-r--r--amarok/src/columnlist.cpp2
-rw-r--r--amarok/src/columnlist.h4
-rw-r--r--amarok/src/configdialog.cpp2
-rw-r--r--amarok/src/contextbrowser.cpp16
-rw-r--r--amarok/src/contextbrowser.h8
-rw-r--r--amarok/src/coverfetcher.cpp2
-rw-r--r--amarok/src/covermanager.cpp20
-rw-r--r--amarok/src/covermanager.h10
-rw-r--r--amarok/src/deletedialog.h2
-rw-r--r--amarok/src/deletedialogbase.ui2
-rw-r--r--amarok/src/engine/nmm/HostList.cpp10
-rw-r--r--amarok/src/engine/nmm/HostList.h2
-rw-r--r--amarok/src/engine/nmm/HostListItem.cpp4
-rw-r--r--amarok/src/engine/nmm/HostListItem.h2
-rw-r--r--amarok/src/equalizerpresetmanager.cpp4
-rw-r--r--amarok/src/equalizerpresetmanager.h4
-rw-r--r--amarok/src/equalizersetup.h2
-rw-r--r--amarok/src/filebrowser.cpp70
-rw-r--r--amarok/src/filebrowser.h2
-rw-r--r--amarok/src/htmlview.cpp4
-rw-r--r--amarok/src/htmlview.h6
-rw-r--r--amarok/src/kbookmarkhandler.cpp2
-rw-r--r--amarok/src/kbookmarkhandler.h4
-rw-r--r--amarok/src/konquisidebar/universalamarok.cpp4
-rw-r--r--amarok/src/lastfm.cpp10
-rw-r--r--amarok/src/lastfm.h4
-rw-r--r--amarok/src/magnatunebrowser/magnatunebrowser.cpp2
-rw-r--r--amarok/src/magnatunebrowser/magnatunelistview.cpp4
-rw-r--r--amarok/src/magnatunebrowser/magnatunelistview.h4
-rw-r--r--amarok/src/magnatunebrowser/magnatunelistviewitems.cpp30
-rw-r--r--amarok/src/magnatunebrowser/magnatunelistviewitems.h18
-rw-r--r--amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp2
-rw-r--r--amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui2
-rw-r--r--amarok/src/mediabrowser.cpp44
-rw-r--r--amarok/src/mediabrowser.h18
-rw-r--r--amarok/src/mediadevice/daap/daapclient.cpp10
-rw-r--r--amarok/src/mediadevice/daap/daapclient.h2
-rw-r--r--amarok/src/mediadevice/generic/genericmediadevice.cpp4
-rw-r--r--amarok/src/mediadevice/ifp/ifpmediadevice.cpp4
-rw-r--r--amarok/src/mediadevice/ipod/ipodmediadevice.cpp18
-rw-r--r--amarok/src/mediadevice/ipod/ipodmediadevice.h6
-rw-r--r--amarok/src/mediadevice/mtp/mtpmediadevice.cpp4
-rw-r--r--amarok/src/mediadevice/njb/njbmediadevice.cpp4
-rw-r--r--amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp2
-rw-r--r--amarok/src/multitabbar.cpp4
-rw-r--r--amarok/src/mydiroperator.cpp4
-rw-r--r--amarok/src/mydiroperator.h2
-rw-r--r--amarok/src/playerwindow.cpp4
-rw-r--r--amarok/src/playerwindow.h4
-rw-r--r--amarok/src/playlist.cpp80
-rw-r--r--amarok/src/playlist.h30
-rw-r--r--amarok/src/playlistbrowser.cpp24
-rw-r--r--amarok/src/playlistbrowser.h16
-rw-r--r--amarok/src/playlistbrowseritem.cpp36
-rw-r--r--amarok/src/playlistbrowseritem.h10
-rw-r--r--amarok/src/playlistitem.cpp16
-rw-r--r--amarok/src/playlistitem.h6
-rw-r--r--amarok/src/playlistselection.cpp2
-rw-r--r--amarok/src/playlistselection.h2
-rw-r--r--amarok/src/playlistwindow.cpp92
-rw-r--r--amarok/src/playlistwindow.h12
-rw-r--r--amarok/src/prettypopupmenu.cpp14
-rw-r--r--amarok/src/prettypopupmenu.h6
-rw-r--r--amarok/src/queuemanager.cpp18
-rw-r--r--amarok/src/queuemanager.h6
-rw-r--r--amarok/src/scriptmanager.cpp20
-rw-r--r--amarok/src/scriptmanagerbase.ui2
-rw-r--r--amarok/src/sliderwidget.cpp2
-rw-r--r--amarok/src/socketserver.cpp2
-rw-r--r--amarok/src/statistics.cpp24
-rw-r--r--amarok/src/statistics.h8
-rw-r--r--amarok/src/statusbar/queueLabel.cpp6
-rw-r--r--amarok/src/statusbar/selectLabel.h2
-rw-r--r--amarok/src/statusbar/statusbar.cpp2
-rw-r--r--amarok/src/statusbar/toggleLabel.h4
-rw-r--r--amarok/src/systray.cpp6
-rw-r--r--amarok/src/tagguesserconfigdialog.ui2
-rw-r--r--amarok/src/tagguesserconfigdialog.ui.h4
-rw-r--r--amarok/src/trackpickerdialog.cpp6
-rw-r--r--amarok/src/trackpickerdialogbase.ui2
-rw-r--r--doc/et/develop.docbook2
-rw-r--r--doc/it/develop.docbook2
-rw-r--r--doc/nl/develop.docbook2
-rw-r--r--doc/pt/develop.docbook2
-rw-r--r--doc/sv/develop.docbook2
98 files changed, 601 insertions, 601 deletions
diff --git a/amarok/HACKING b/amarok/HACKING
index 123ca41b..b44a6d06 100644
--- a/amarok/HACKING
+++ b/amarok/HACKING
@@ -117,7 +117,7 @@ great too.
| #ifndef AMAROK_QUEUEMANAGER_H
| #define AMAROK_QUEUEMANAGER_H
- | class QueueList : public KListView
+ | class QueueList : public TDEListView
| {
| Q_OBJECT
|
diff --git a/amarok/src/Options2.ui b/amarok/src/Options2.ui
index 560bcfc4..8b28ef56 100644
--- a/amarok/src/Options2.ui
+++ b/amarok/src/Options2.ui
@@ -135,7 +135,7 @@
<string>The font to use in the playlist window.</string>
</property>
</widget>
- <widget class="KFontRequester" row="0" column="1">
+ <widget class="TDEFontRequester" row="0" column="1">
<property name="name">
<cstring>kcfg_PlaylistWindowFont</cstring>
</property>
@@ -204,7 +204,7 @@
<string>The font to use in the context browser.</string>
</property>
</widget>
- <widget class="KFontRequester" row="2" column="1">
+ <widget class="TDEFontRequester" row="2" column="1">
<property name="name">
<cstring>kcfg_ContextBrowserFont</cstring>
</property>
@@ -226,7 +226,7 @@
<string>The font to use in the context browser.</string>
</property>
</widget>
- <widget class="KFontRequester" row="1" column="1">
+ <widget class="TDEFontRequester" row="1" column="1">
<property name="name">
<cstring>kcfg_PlayerWidgetFont</cstring>
</property>
diff --git a/amarok/src/Options5.ui b/amarok/src/Options5.ui
index 9f3f556d..0f068752 100644
--- a/amarok/src/Options5.ui
+++ b/amarok/src/Options5.ui
@@ -101,7 +101,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KFontRequester">
+ <widget class="TDEFontRequester">
<property name="name">
<cstring>kcfg_OsdFont</cstring>
</property>
diff --git a/amarok/src/actionclasses.cpp b/amarok/src/actionclasses.cpp
index 8b427c16..4f88d91a 100644
--- a/amarok/src/actionclasses.cpp
+++ b/amarok/src/actionclasses.cpp
@@ -53,11 +53,11 @@ using namespace Amarok;
KHelpMenu *Menu::s_helpMenu = 0;
static void
-safePlug( KActionCollection *ac, const char *name, TQWidget *w )
+safePlug( TDEActionCollection *ac, const char *name, TQWidget *w )
{
if( ac )
{
- KAction *a = ac->action( name );
+ TDEAction *a = ac->action( name );
if( a ) a->plug( w );
}
}
@@ -65,11 +65,11 @@ safePlug( KActionCollection *ac, const char *name, TQWidget *w )
//////////////////////////////////////////////////////////////////////////////////////////
// MenuAction && Menu
-// KActionMenu doesn't work very well, so we derived our own
+// TDEActionMenu doesn't work very well, so we derived our own
//////////////////////////////////////////////////////////////////////////////////////////
-MenuAction::MenuAction( KActionCollection *ac )
- : KAction( i18n( "Amarok Menu" ), 0, ac, "amarok_menu" )
+MenuAction::MenuAction( TDEActionCollection *ac )
+ : TDEAction( i18n( "Amarok Menu" ), 0, ac, "amarok_menu" )
{
setShortcutConfigurable ( false ); //FIXME disabled as it doesn't work, should use TQCursor::pos()
}
@@ -77,11 +77,11 @@ MenuAction::MenuAction( KActionCollection *ac )
int
MenuAction::plug( TQWidget *w, int index )
{
- KToolBar *bar = dynamic_cast<KToolBar*>(w);
+ TDEToolBar *bar = dynamic_cast<TDEToolBar*>(w);
- if( bar && kapp->authorizeKAction( name() ) )
+ if( bar && kapp->authorizeTDEAction( name() ) )
{
- const int id = KAction::getToolButtonID();
+ const int id = TDEAction::getToolButtonID();
addContainer( bar, id );
connect( bar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotDestroyed() ) );
@@ -92,7 +92,7 @@ MenuAction::plug( TQWidget *w, int index )
bar->insertButton( TQString(), id, true, i18n( "Menu" ), index );
bar->alignItemRight( id );
- KToolBarButton* button = bar->getButton( id );
+ TDEToolBarButton* button = bar->getButton( id );
button->setPopup( Amarok::Menu::instance() );
button->setName( "toolbutton_amarok_menu" );
button->setIcon( "amarok" );
@@ -104,7 +104,7 @@ MenuAction::plug( TQWidget *w, int index )
Menu::Menu()
{
- KActionCollection *ac = Amarok::actionCollection();
+ TDEActionCollection *ac = Amarok::actionCollection();
setCheckable( true );
@@ -170,7 +170,7 @@ Menu::instance()
return &menu;
}
-KPopupMenu*
+TDEPopupMenu*
Menu::helpMenu( TQWidget *parent ) //STATIC
{
if ( s_helpMenu == 0 )
@@ -207,8 +207,8 @@ Menu::slotActivated( int index )
// PlayPauseAction
//////////////////////////////////////////////////////////////////////////////////////////
-PlayPauseAction::PlayPauseAction( KActionCollection *ac )
- : KToggleAction( i18n( "Play/Pause" ), 0, ac, "play_pause" )
+PlayPauseAction::PlayPauseAction( TDEActionCollection *ac )
+ : TDEToggleAction( i18n( "Play/Pause" ), 0, ac, "play_pause" )
, EngineObserver( EngineController::instance() )
{
engineStateChanged( EngineController::engine()->state() );
@@ -246,9 +246,9 @@ PlayPauseAction::engineStateChanged( Engine::State state, Engine::State /*oldSt
TQWidget *w = container( x );
if( w->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
static_cast<TQPopupMenu*>(w)->changeItem( itemId( x ), text );
- //TODO KToolBar sucks so much
-// else if( w->inherits( "KToolBar" ) )
-// static_cast<KToolBar*>(w)->getButton( itemId( x ) )->setText( text );
+ //TODO TDEToolBar sucks so much
+// else if( w->inherits( "TDEToolBar" ) )
+// static_cast<TDEToolBar*>(w)->getButton( itemId( x ) )->setText( text );
}
}
@@ -257,8 +257,8 @@ PlayPauseAction::engineStateChanged( Engine::State state, Engine::State /*oldSt
//////////////////////////////////////////////////////////////////////////////////////////
#include "analyzerbase.h"
-AnalyzerAction::AnalyzerAction( KActionCollection *ac )
- : KAction( i18n( "Analyzer" ), 0, ac, "toolbar_analyzer" )
+AnalyzerAction::AnalyzerAction( TDEActionCollection *ac )
+ : TDEAction( i18n( "Analyzer" ), 0, ac, "toolbar_analyzer" )
{
setShortcutConfigurable( false );
}
@@ -270,11 +270,11 @@ AnalyzerAction::plug( TQWidget *w, int index )
//we are not designed for unplugging() yet so there would be a leak if that happens
//but it's a rare event and unplugging is complicated.
- KToolBar *bar = dynamic_cast<KToolBar*>(w);
+ TDEToolBar *bar = dynamic_cast<TDEToolBar*>(w);
- if( bar && kapp->authorizeKAction( name() ) )
+ if( bar && kapp->authorizeTDEAction( name() ) )
{
- const int id = KAction::getToolButtonID();
+ const int id = TDEAction::getToolButtonID();
addContainer( w, id );
connect( w, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotDestroyed() ) );
@@ -324,7 +324,7 @@ void
AnalyzerContainer::contextMenuEvent( TQContextMenuEvent *e)
{
#if defined HAVE_LIBVISUAL
- KPopupMenu menu;
+ TDEPopupMenu menu;
menu.insertItem( SmallIconSet( Amarok::icon( "visualizations" ) ), i18n("&Visualizations"), Menu::ID_SHOW_VIS_SELECTOR );
if( menu.exec( mapToGlobal( e->pos() ) ) == Menu::ID_SHOW_VIS_SELECTOR )
@@ -338,8 +338,8 @@ AnalyzerContainer::contextMenuEvent( TQContextMenuEvent *e)
// ToggleAction
//////////////////////////////////////////////////////////////////////////////////////////
-ToggleAction::ToggleAction( const TQString &text, void ( *f ) ( bool ), KActionCollection* const ac, const char *name )
- : KToggleAction( text, 0, ac, name )
+ToggleAction::ToggleAction( const TQString &text, void ( *f ) ( bool ), TDEActionCollection* const ac, const char *name )
+ : TDEToggleAction( text, 0, ac, name )
, m_function( f )
{}
@@ -348,9 +348,9 @@ void ToggleAction::setChecked( bool b )
const bool announce = b != isChecked();
m_function( b );
- KToggleAction::setChecked( b );
+ TDEToggleAction::setChecked( b );
AmarokConfig::writeConfig(); //So we don't lose the setting when crashing
- if( announce ) emit toggled( b ); //KToggleAction doesn't do this for us. How gay!
+ if( announce ) emit toggled( b ); //TDEToggleAction doesn't do this for us. How gay!
}
void ToggleAction::setEnabled( bool b )
@@ -359,7 +359,7 @@ void ToggleAction::setEnabled( bool b )
if( !b )
setChecked( false );
- KToggleAction::setEnabled( b );
+ TDEToggleAction::setEnabled( b );
AmarokConfig::writeConfig(); //So we don't lose the setting when crashing
if( announce ) emit enabled( b );
}
@@ -368,8 +368,8 @@ void ToggleAction::setEnabled( bool b )
// SelectAction
//////////////////////////////////////////////////////////////////////////////////////////
-SelectAction::SelectAction( const TQString &text, void ( *f ) ( int ), KActionCollection* const ac, const char *name )
- : KSelectAction( text, 0, ac, name )
+SelectAction::SelectAction( const TQString &text, void ( *f ) ( int ), TDEActionCollection* const ac, const char *name )
+ : TDESelectAction( text, 0, ac, name )
, m_function( f )
{ }
@@ -378,7 +378,7 @@ void SelectAction::setCurrentItem( int n )
const bool announce = n != currentItem();
m_function( n );
- KSelectAction::setCurrentItem( n );
+ TDESelectAction::setCurrentItem( n );
AmarokConfig::writeConfig(); //So we don't lose the setting when crashing
if( announce ) emit activated( n );
}
@@ -389,7 +389,7 @@ void SelectAction::setEnabled( bool b )
if( !b )
setCurrentItem( 0 );
- KSelectAction::setEnabled( b );
+ TDESelectAction::setEnabled( b );
AmarokConfig::writeConfig(); //So we don't lose the setting when crashing
if( announce ) emit enabled( b );
}
@@ -411,15 +411,15 @@ TQString SelectAction::currentIcon() const
}
TQString SelectAction::currentText() const {
- return KSelectAction::currentText() + "<br /><br />" + i18n("Click to change");
+ return TDESelectAction::currentText() + "<br /><br />" + i18n("Click to change");
}
//////////////////////////////////////////////////////////////////////////////////////////
// VolumeAction
//////////////////////////////////////////////////////////////////////////////////////////
-VolumeAction::VolumeAction( KActionCollection *ac )
- : KAction( i18n( "Volume" ), 0, ac, "toolbar_volume" )
+VolumeAction::VolumeAction( TDEActionCollection *ac )
+ : TDEAction( i18n( "Volume" ), 0, ac, "toolbar_volume" )
, EngineObserver( EngineController::instance() )
, m_slider( 0 ) //is TQGuardedPtr
{}
@@ -442,7 +442,7 @@ VolumeAction::plug( TQWidget *w, int index )
connect( m_slider, TQT_SIGNAL(sliderMoved( int )), ec, TQT_SLOT(setVolume( int )) );
connect( m_slider, TQT_SIGNAL(sliderReleased( int )), ec, TQT_SLOT(setVolume( int )) );
- static_cast<KToolBar*>(w)->insertWidget( KAction::getToolButtonID(), 0, m_slider, index );
+ static_cast<TDEToolBar*>(w)->insertWidget( TDEAction::getToolButtonID(), 0, m_slider, index );
return 0;
}
@@ -458,7 +458,7 @@ VolumeAction::engineVolumeChanged( int value )
//////////////////////////////////////////////////////////////////////////////////////////
// RandomAction
//////////////////////////////////////////////////////////////////////////////////////////
-RandomAction::RandomAction( KActionCollection *ac ) :
+RandomAction::RandomAction( TDEActionCollection *ac ) :
SelectAction( i18n( "Ra&ndom" ), &AmarokConfig::setRandomMode, ac, "random_mode" )
{
setItems( TQStringList() << i18n( "&Off" ) << i18n( "&Tracks" ) << i18n( "&Albums" ) );
@@ -469,7 +469,7 @@ RandomAction::RandomAction( KActionCollection *ac ) :
void
RandomAction::setCurrentItem( int n )
{
- if( KAction *a = parentCollection()->action( "favor_tracks" ) )
+ if( TDEAction *a = parentCollection()->action( "favor_tracks" ) )
a->setEnabled( n );
SelectAction::setCurrentItem( n );
}
@@ -478,7 +478,7 @@ RandomAction::setCurrentItem( int n )
//////////////////////////////////////////////////////////////////////////////////////////
// FavorAction
//////////////////////////////////////////////////////////////////////////////////////////
-FavorAction::FavorAction( KActionCollection *ac ) :
+FavorAction::FavorAction( TDEActionCollection *ac ) :
SelectAction( i18n( "&Favor" ), &AmarokConfig::setFavorTracks, ac, "favor_tracks" )
{
setItems( TQStringList() << i18n( "Off" )
@@ -493,7 +493,7 @@ FavorAction::FavorAction( KActionCollection *ac ) :
//////////////////////////////////////////////////////////////////////////////////////////
// RepeatAction
//////////////////////////////////////////////////////////////////////////////////////////
-RepeatAction::RepeatAction( KActionCollection *ac ) :
+RepeatAction::RepeatAction( TDEActionCollection *ac ) :
SelectAction( i18n( "&Repeat" ), &AmarokConfig::setRepeat, ac, "repeat" )
{
setItems( TQStringList() << i18n( "&Off" ) << i18n( "&Track" )
@@ -505,25 +505,25 @@ RepeatAction::RepeatAction( KActionCollection *ac ) :
//////////////////////////////////////////////////////////////////////////////////////////
// BurnMenuAction
//////////////////////////////////////////////////////////////////////////////////////////
-BurnMenuAction::BurnMenuAction( KActionCollection *ac )
- : KAction( i18n( "Burn" ), 0, ac, "burn_menu" )
+BurnMenuAction::BurnMenuAction( TDEActionCollection *ac )
+ : TDEAction( i18n( "Burn" ), 0, ac, "burn_menu" )
{}
int
BurnMenuAction::plug( TQWidget *w, int index )
{
- KToolBar *bar = dynamic_cast<KToolBar*>(w);
+ TDEToolBar *bar = dynamic_cast<TDEToolBar*>(w);
- if( bar && kapp->authorizeKAction( name() ) )
+ if( bar && kapp->authorizeTDEAction( name() ) )
{
- const int id = KAction::getToolButtonID();
+ const int id = TDEAction::getToolButtonID();
addContainer( bar, id );
connect( bar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotDestroyed() ) );
bar->insertButton( TQString(), id, true, i18n( "Burn" ), index );
- KToolBarButton* button = bar->getButton( id );
+ TDEToolBarButton* button = bar->getButton( id );
button->setPopup( Amarok::BurnMenu::instance() );
button->setName( "toolbutton_burn_menu" );
button->setIcon( "k3b" );
@@ -543,7 +543,7 @@ BurnMenu::BurnMenu()
connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) );
}
-KPopupMenu*
+TDEPopupMenu*
BurnMenu::instance()
{
static BurnMenu menu;
@@ -573,18 +573,18 @@ BurnMenu::slotActivated( int index )
// StopMenuAction
//////////////////////////////////////////////////////////////////////////////////////////
-StopAction::StopAction( KActionCollection *ac )
- : KAction( i18n( "Stop" ), Amarok::icon( "stop" ), 0, EngineController::instance(), TQT_SLOT( stop() ), ac, "stop" )
+StopAction::StopAction( TDEActionCollection *ac )
+ : TDEAction( i18n( "Stop" ), Amarok::icon( "stop" ), 0, EngineController::instance(), TQT_SLOT( stop() ), ac, "stop" )
{}
int
StopAction::plug( TQWidget *w, int index )
{
- KToolBar *bar = dynamic_cast<KToolBar*>(w);
+ TDEToolBar *bar = dynamic_cast<TDEToolBar*>(w);
- if( bar && kapp->authorizeKAction( name() ) )
+ if( bar && kapp->authorizeTDEAction( name() ) )
{
- const int id = KAction::getToolButtonID();
+ const int id = TDEAction::getToolButtonID();
addContainer( bar, id );
connect( bar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotDestroyed() ) );
@@ -592,7 +592,7 @@ StopAction::plug( TQWidget *w, int index )
bar->insertButton( TQString(), id, TQT_SIGNAL( clicked() ), EngineController::instance(), TQT_SLOT( stop() ),
true, i18n( "Stop" ), index );
- KToolBarButton* button = bar->getButton( id );
+ TDEToolBarButton* button = bar->getButton( id );
button->setDelayedPopup( Amarok::StopMenu::instance() );
button->setName( "toolbutton_stop_menu" );
button->setIcon( Amarok::icon( "stop" ) );
@@ -600,7 +600,7 @@ StopAction::plug( TQWidget *w, int index )
return containerCount() - 1;
}
- else return KAction::plug( w, index );
+ else return TDEAction::plug( w, index );
}
StopMenu::StopMenu()
@@ -614,7 +614,7 @@ StopMenu::StopMenu()
connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) );
}
-KPopupMenu*
+TDEPopupMenu*
StopMenu::instance()
{
static StopMenu menu;
diff --git a/amarok/src/actionclasses.h b/amarok/src/actionclasses.h
index bb024da4..f653cee6 100644
--- a/amarok/src/actionclasses.h
+++ b/amarok/src/actionclasses.h
@@ -15,7 +15,7 @@
#include <kactionclasses.h>
#include <tqguardedptr.h>
-class KActionCollection;
+class TDEActionCollection;
class KHelpMenu;
@@ -27,7 +27,7 @@ namespace Amarok
public:
static Menu *instance();
- static KPopupMenu *helpMenu( TQWidget *parent = 0 );
+ static TDEPopupMenu *helpMenu( TQWidget *parent = 0 );
enum MenuIds {
ID_CONF_DECODER,
@@ -50,18 +50,18 @@ namespace Amarok
};
- class MenuAction : public KAction
+ class MenuAction : public TDEAction
{
public:
- MenuAction( KActionCollection* );
+ MenuAction( TDEActionCollection* );
virtual int plug( TQWidget*, int index = -1 );
};
- class PlayPauseAction : public KToggleAction, public EngineObserver
+ class PlayPauseAction : public TDEToggleAction, public EngineObserver
{
public:
- PlayPauseAction( KActionCollection* );
+ PlayPauseAction( TDEActionCollection* );
virtual void engineStateChanged( Engine::State, Engine::State = Engine::Empty );
};
@@ -78,18 +78,18 @@ namespace Amarok
TQWidget *m_child;
};
- class AnalyzerAction : public KAction
+ class AnalyzerAction : public TDEAction
{
public:
- AnalyzerAction( KActionCollection* );
+ AnalyzerAction( TDEActionCollection* );
virtual int plug( TQWidget *, int index = -1 );
};
- class VolumeAction : public KAction, public EngineObserver
+ class VolumeAction : public TDEAction, public EngineObserver
{
public:
- VolumeAction( KActionCollection* );
+ VolumeAction( TDEActionCollection* );
virtual int plug( TQWidget *, int index = -1 );
private:
void engineVolumeChanged( int value );
@@ -97,10 +97,10 @@ namespace Amarok
};
- class ToggleAction : public KToggleAction
+ class ToggleAction : public TDEToggleAction
{
public:
- ToggleAction( const TQString &text, void ( *f ) ( bool ), KActionCollection* const ac, const char *name );
+ ToggleAction( const TQString &text, void ( *f ) ( bool ), TDEActionCollection* const ac, const char *name );
virtual void setChecked( bool b );
@@ -110,10 +110,10 @@ namespace Amarok
void ( *m_function ) ( bool );
};
- class SelectAction : public KSelectAction
+ class SelectAction : public TDESelectAction
{
public:
- SelectAction( const TQString &text, void ( *f ) ( int ), KActionCollection* const ac, const char *name );
+ SelectAction( const TQString &text, void ( *f ) ( int ), TDEActionCollection* const ac, const char *name );
virtual void setCurrentItem( int n );
@@ -136,23 +136,23 @@ namespace Amarok
class RandomAction : public SelectAction
{
public:
- RandomAction( KActionCollection *ac );
+ RandomAction( TDEActionCollection *ac );
virtual void setCurrentItem( int n );
};
class FavorAction : public SelectAction
{
public:
- FavorAction( KActionCollection *ac );
+ FavorAction( TDEActionCollection *ac );
};
class RepeatAction : public SelectAction
{
public:
- RepeatAction( KActionCollection *ac );
+ RepeatAction( TDEActionCollection *ac );
};
- class BurnMenu : public KPopupMenu
+ class BurnMenu : public TDEPopupMenu
{
Q_OBJECT
@@ -163,7 +163,7 @@ namespace Amarok
SELECTED_TRACKS
};
- static KPopupMenu *instance();
+ static TDEPopupMenu *instance();
private slots:
void slotAboutToShow();
@@ -174,14 +174,14 @@ namespace Amarok
};
- class BurnMenuAction : public KAction
+ class BurnMenuAction : public TDEAction
{
public:
- BurnMenuAction( KActionCollection* );
+ BurnMenuAction( TDEActionCollection* );
virtual int plug( TQWidget*, int index = -1 );
};
- class StopMenu : public KPopupMenu
+ class StopMenu : public TDEPopupMenu
{
Q_OBJECT
@@ -193,7 +193,7 @@ namespace Amarok
AFTER_QUEUE
};
- static KPopupMenu *instance();
+ static TDEPopupMenu *instance();
private slots:
void slotAboutToShow();
@@ -204,10 +204,10 @@ namespace Amarok
};
- class StopAction : public KAction
+ class StopAction : public TDEAction
{
public:
- StopAction( KActionCollection* );
+ StopAction( TDEActionCollection* );
virtual int plug( TQWidget*, int index = -1 );
};
diff --git a/amarok/src/amarok.h b/amarok/src/amarok.h
index 1a3d27f1..0ca9005a 100644
--- a/amarok/src/amarok.h
+++ b/amarok/src/amarok.h
@@ -13,7 +13,7 @@
#include "amarok_export.h"
-class KActionCollection;
+class TDEActionCollection;
class TDEConfig;
class TQColor;
class TQDateTime;
@@ -46,7 +46,7 @@ namespace Amarok
extern TQColor Background; //brighter blue
///eg. outline of slider widgets in Player-window
extern TQColor Foreground; //lighter blue
- ///eg. KListView alternative row color
+ ///eg. TDEListView alternative row color
extern TQColor AltBase; //grey toned base
}
@@ -63,12 +63,12 @@ namespace Amarok
TDEConfig *config( const TQString &group = "General" ); //defined in app.cpp
/**
- * @return the KActionCollection used by Amarok
- * The KActionCollection is owned by the PlaylistWindow, so you must ensure
+ * @return the TDEActionCollection used by Amarok
+ * The TDEActionCollection is owned by the PlaylistWindow, so you must ensure
* you don't try to use this before then, but we've taken steps to prevent
* this eventuality - you should be safe.
*/
- KActionCollection *actionCollection(); //defined in app.cpp
+ TDEActionCollection *actionCollection(); //defined in app.cpp
/**
* An event handler that handles events in a generic Amarok fashion. Mainly
diff --git a/amarok/src/amarokcore/amarokdcophandler.cpp b/amarok/src/amarokcore/amarokdcophandler.cpp
index ba17e0a9..9d9a45ca 100644
--- a/amarok/src/amarokcore/amarokdcophandler.cpp
+++ b/amarok/src/amarokcore/amarokdcophandler.cpp
@@ -307,19 +307,19 @@ namespace Amarok
void DcopPlayerHandler::enableRandomMode( bool enable )
{
- static_cast<KSelectAction*>(Amarok::actionCollection()->action( "random_mode" ))
+ static_cast<TDESelectAction*>(Amarok::actionCollection()->action( "random_mode" ))
->setCurrentItem( enable ? AmarokConfig::EnumRandomMode::Tracks : AmarokConfig::EnumRandomMode::Off );
}
void DcopPlayerHandler::enableRepeatPlaylist( bool enable )
{
- static_cast<KSelectAction*>( Amarok::actionCollection()->action( "repeat" ) )
+ static_cast<TDESelectAction*>( Amarok::actionCollection()->action( "repeat" ) )
->setCurrentItem( enable ? AmarokConfig::EnumRepeat::Playlist : AmarokConfig::EnumRepeat::Off );
}
void DcopPlayerHandler::enableRepeatTrack( bool enable)
{
- static_cast<KSelectAction*>( Amarok::actionCollection()->action( "repeat" ) )
+ static_cast<TDESelectAction*>( Amarok::actionCollection()->action( "repeat" ) )
->setCurrentItem( enable ? AmarokConfig::EnumRepeat::Track : AmarokConfig::EnumRepeat::Off );
}
diff --git a/amarok/src/analyzers/blockanalyzer.cpp b/amarok/src/analyzers/blockanalyzer.cpp
index c955be60..9377a344 100644
--- a/amarok/src/analyzers/blockanalyzer.cpp
+++ b/amarok/src/analyzers/blockanalyzer.cpp
@@ -423,7 +423,7 @@ BlockAnalyzer::contextMenuEvent( TQContextMenuEvent *e )
const uint ids[] = { 50, 33, 25, 20, 10 };
- KPopupMenu menu;
+ TDEPopupMenu menu;
menu.insertTitle( i18n( "Framerate" ) );
for( uint x = 0; x < 5; ++x )
diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp
index 77ad4b3a..9b171fed 100644
--- a/amarok/src/app.cpp
+++ b/amarok/src/app.cpp
@@ -484,12 +484,12 @@ void App::initGlobalShortcuts()
//TODO fix kde accel system so that kactions find appropriate global shortcuts
// and there is only one configure shortcuts dialog
- KActionCollection* const ac = Amarok::actionCollection();
- KAccelShortcutList list( m_pGlobalAccel );
+ TDEActionCollection* const ac = Amarok::actionCollection();
+ TDEAccelShortcutList list( m_pGlobalAccel );
for( uint i = 0; i < list.count(); ++i )
{
- KAction *action = ac->action( list.name( i ).latin1() );
+ TDEAction *action = ac->action( list.name( i ).latin1() );
if( action )
{
@@ -949,10 +949,10 @@ App::applyColorScheme()
playlistWindow()->unsetPalette();
}
- // set the KListView alternate colours
- TQObjectList* const list = playlistWindow()->queryList( "KListView" );
+ // set the TDEListView alternate colours
+ TQObjectList* const list = playlistWindow()->queryList( "TDEListView" );
for( TQObject *o = list->first(); o; o = list->next() )
- static_cast<KListView*>(TQT_TQWIDGET(o))->setAlternateBackground( AltBase );
+ static_cast<TDEListView*>(TQT_TQWIDGET(o))->setAlternateBackground( AltBase );
delete list; //heap allocated!
}
@@ -1297,7 +1297,7 @@ namespace Amarok
return pApp->playlistWindow();
}
- KActionCollection *actionCollection()
+ TDEActionCollection *actionCollection()
{
return pApp->playlistWindow()->actionCollection();
}
diff --git a/amarok/src/app.h b/amarok/src/app.h
index 9b20122b..184cdfc5 100644
--- a/amarok/src/app.h
+++ b/amarok/src/app.h
@@ -30,7 +30,7 @@ namespace Amarok {
namespace TDEIO { class Job; }
-class KActionCollection;
+class TDEActionCollection;
class TDEConfig;
class TDEGlobalAccel;
class MetaBundle;
diff --git a/amarok/src/browserToolBar.h b/amarok/src/browserToolBar.h
index 6d421ab0..d0d6f257 100644
--- a/amarok/src/browserToolBar.h
+++ b/amarok/src/browserToolBar.h
@@ -15,11 +15,11 @@
namespace Browser
{
- class ToolBar : public KToolBar
+ class ToolBar : public TDEToolBar
{
public:
ToolBar( TQWidget *parent )
- : KToolBar( parent, "NotMainToolBar" )
+ : TDEToolBar( parent, "NotMainToolBar" )
{
setMovingEnabled(false);
setFlat(true);
diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp
index 3f1517a7..f4a1c954 100644
--- a/amarok/src/collectionbrowser.cpp
+++ b/amarok/src/collectionbrowser.cpp
@@ -85,9 +85,9 @@ CollectionBrowser *CollectionBrowser::s_instance = 0;
CollectionBrowser::CollectionBrowser( const char* name )
: TQVBox( 0, name )
- , m_cat1Menu( new KPopupMenu( this ) )
- , m_cat2Menu( new KPopupMenu( this ) )
- , m_cat3Menu( new KPopupMenu( this ) )
+ , m_cat1Menu( new TDEPopupMenu( this ) )
+ , m_cat2Menu( new TDEPopupMenu( this ) )
+ , m_cat3Menu( new TDEPopupMenu( this ) )
, m_timer( new TQTimer( this ) )
, m_returnPressed( false )
{
@@ -98,10 +98,10 @@ CollectionBrowser::CollectionBrowser( const char* name )
m_toolbar = new Browser::ToolBar( this );
{ //<Search LineEdit>
- KToolBarButton *button;
- KToolBar* searchToolBar = new Browser::ToolBar( this );
+ TDEToolBarButton *button;
+ TDEToolBar* searchToolBar = new Browser::ToolBar( this );
- button = new KToolBarButton( "locationbar_erase", 0, searchToolBar );
+ button = new TDEToolBarButton( "locationbar_erase", 0, searchToolBar );
m_searchEdit = new ClickLineEdit( i18n( "Enter search terms here" ), searchToolBar );
m_searchEdit->installEventFilter( this );
KPushButton *filterButton = new KPushButton("...", searchToolBar, "filter");
@@ -141,18 +141,18 @@ CollectionBrowser::CollectionBrowser( const char* name )
// plugged below
m_ipodToolbar = new Browser::ToolBar( m_ipodHbox );
m_ipodHbox->setStretchFactor( m_ipodToolbar, 0 );
- m_ipodToolbar->setIconText( KToolBar::IconOnly, false );
+ m_ipodToolbar->setIconText( TDEToolBar::IconOnly, false );
- KActionCollection* ac = new KActionCollection( this );
+ TDEActionCollection* ac = new TDEActionCollection( this );
m_view = new CollectionView( this );
m_view->installEventFilter( this );
- m_configureAction = new KAction( i18n( "Configure Folders" ), Amarok::icon( "configure" ), 0, TQT_TQOBJECT(this), TQT_SLOT( setupDirs() ), ac, "Configure" );
- m_treeViewAction = new KRadioAction( i18n( "Tree View" ), "view_tree", 0, TQT_TQOBJECT(m_view), TQT_SLOT( setTreeMode() ), ac, "Tree View" );
- m_flatViewAction = new KRadioAction( i18n( "Flat View" ), "view_detailed", 0, TQT_TQOBJECT(m_view), TQT_SLOT( setFlatMode() ), ac, "Flat View" );
- m_ipodViewAction = new KRadioAction( i18n( "iPod View" ), Amarok::icon("device"), 0, TQT_TQOBJECT(m_view), TQT_SLOT( setIpodMode() ), ac, "iPod View" );
+ m_configureAction = new TDEAction( i18n( "Configure Folders" ), Amarok::icon( "configure" ), 0, TQT_TQOBJECT(this), TQT_SLOT( setupDirs() ), ac, "Configure" );
+ m_treeViewAction = new TDERadioAction( i18n( "Tree View" ), "view_tree", 0, TQT_TQOBJECT(m_view), TQT_SLOT( setTreeMode() ), ac, "Tree View" );
+ m_flatViewAction = new TDERadioAction( i18n( "Flat View" ), "view_detailed", 0, TQT_TQOBJECT(m_view), TQT_SLOT( setFlatMode() ), ac, "Flat View" );
+ m_ipodViewAction = new TDERadioAction( i18n( "iPod View" ), Amarok::icon("device"), 0, TQT_TQOBJECT(m_view), TQT_SLOT( setIpodMode() ), ac, "iPod View" );
m_treeViewAction->setExclusiveGroup("view mode");
m_flatViewAction->setExclusiveGroup("view mode");
m_ipodViewAction->setExclusiveGroup("view mode");
@@ -169,18 +169,18 @@ CollectionBrowser::CollectionBrowser( const char* name )
break;
}
- m_showDividerAction = new KToggleAction( i18n( "Show Divider" ), "leftjust", 0, TQT_TQOBJECT(this), TQT_SLOT( toggleDivider() ), ac, "Show Divider" );
+ m_showDividerAction = new TDEToggleAction( i18n( "Show Divider" ), "leftjust", 0, TQT_TQOBJECT(this), TQT_SLOT( toggleDivider() ), ac, "Show Divider" );
m_showDividerAction->setChecked(m_view->m_showDivider);
// m_ipodIncrement and m_ipodDecrement are the actions that
// correspond to moving forward / backward in the iPod collection
// browser window; see the "For iPod-style navigation" comments below.
- m_ipodDecrement = new KAction( i18n( "Browse backward" ),
+ m_ipodDecrement = new TDEAction( i18n( "Browse backward" ),
TQIconSet( m_view->ipodDecrementIcon(), TQIconSet::Small ),
0, TQT_TQOBJECT(m_view), TQT_SLOT( decrementDepth() ), ac,
"iPod Decrement" );
- m_ipodIncrement = new KAction( i18n( "Browse forward" ),
+ m_ipodIncrement = new TDEAction( i18n( "Browse forward" ),
TQIconSet( m_view->ipodIncrementIcon(), TQIconSet::Small ),
0, TQT_TQOBJECT(m_view), TQT_SLOT( incrementDepth() ), ac,
"iPod Increment" );
@@ -191,7 +191,7 @@ CollectionBrowser::CollectionBrowser( const char* name )
ipodToolbar( m_view->m_viewMode == CollectionView::modeIpodView );
- m_tagfilterMenuButton = new KActionMenu( i18n( "Group By" ), "filter", ac );
+ m_tagfilterMenuButton = new TDEActionMenu( i18n( "Group By" ), "filter", ac );
m_tagfilterMenuButton->setDelayed( false );
// FIXME: either both or nothing
//m_tagfilterMenuButton->setEnabled( m_view->m_viewMode == CollectionView::modeTreeView );
@@ -401,9 +401,9 @@ CollectionBrowser::layoutToolbar()
m_toolbar->clear();
- m_toolbar->setIconText( KToolBar::IconTextRight, false );
+ m_toolbar->setIconText( TDEToolBar::IconTextRight, false );
m_tagfilterMenuButton->plug( m_toolbar );
- m_toolbar->setIconText( KToolBar::IconOnly, false );
+ m_toolbar->setIconText( TDEToolBar::IconOnly, false );
m_toolbar->insertLineSeparator();
m_treeViewAction->plug( m_toolbar );
@@ -441,7 +441,7 @@ CollectionView* CollectionView::m_instance = 0;
CollectionView::CollectionView( CollectionBrowser* parent )
- : KListView( parent )
+ : TDEListView( parent )
, m_parent( parent )
, m_timeFilter( 0 )
, m_currentDepth( 0 )
@@ -493,7 +493,7 @@ CollectionView::CollectionView( CollectionBrowser* parent )
m_flatColumnWidths.push_back( (*it).toInt() );
//</READ CONFIG>
- KActionCollection* ac = new KActionCollection( this );
+ TDEActionCollection* ac = new TDEActionCollection( this );
KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), ac, "collectionview_select_all" );
connect( CollectionDB::instance(), TQT_SIGNAL( scanStarted() ),
@@ -586,7 +586,7 @@ CollectionView::keyPressEvent( TQKeyEvent *e )
// First skip any dividers directly above / below
do
{
- KListView::keyPressEvent( e );
+ TDEListView::keyPressEvent( e );
if( currentItem() == cur ) // Prevent infinite loops
{
if( nextItem != 0 )
@@ -620,7 +620,7 @@ CollectionView::keyPressEvent( TQKeyEvent *e )
&& dynamic_cast<DividerItem*>(cur) != 0
&& nextItem != 0 )
{
- KListView::keyPressEvent( e );
+ TDEListView::keyPressEvent( e );
if( currentItem() == cur ) // Prevent infinite loops
break;
cur = currentItem();
@@ -645,7 +645,7 @@ CollectionView::keyPressEvent( TQKeyEvent *e )
}
else // we don't want the event
- KListView::keyPressEvent( e );
+ TDEListView::keyPressEvent( e );
}
@@ -1386,7 +1386,7 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) //
int artistLevel = -1;
if ( item ) {
- KPopupMenu menu( this );
+ TDEPopupMenu menu( this );
int cat = 0;
if ( m_viewMode == modeTreeView ) {
@@ -1464,7 +1464,7 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) //
menu.insertSeparator();
- KPopupMenu fileMenu;
+ TDEPopupMenu fileMenu;
fileMenu.insertItem( SmallIconSet( "filesaveas" ), i18n( "&Organize File..." , "&Organize %n Files..." , selection.count() ) , ORGANIZE );
fileMenu.insertItem( SmallIconSet( Amarok::icon( "remove" ) ), i18n( "&Delete File..." , "&Delete %n Files..." , selection.count() ) , DELETE );
menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "Manage &Files" ), &fileMenu, FILE_MENU );
@@ -3251,7 +3251,7 @@ CollectionView::selectIpodItems ( void )
else
{
- KListView::selectAll( false );
+ TDEListView::selectAll( false );
int selected = 0;
TQStringList::iterator it = m_ipodSelected[m_currentDepth].begin();
while( it != m_ipodSelected[m_currentDepth].end() )
@@ -3303,7 +3303,7 @@ CollectionView::selectIpodItems ( void )
// navigation
if( m_ipodIncremented == 1 )
{
- KListView::selectAll( false );
+ TDEListView::selectAll( false );
TQListViewItem *item = firstChild();
// There will be a divider in the first slot if there is only
@@ -3520,7 +3520,7 @@ CollectionView::yearAlbumCalc( TQString &year, TQString &text )
void
CollectionView::viewportPaintEvent( TQPaintEvent *e )
{
- KListView::viewportPaintEvent( e );
+ TDEListView::viewportPaintEvent( e );
// Superimpose bubble help for Flat-View mode:
@@ -3626,7 +3626,7 @@ CollectionView::eventFilter( TQObject* o, TQEvent* e )
&& TQT_TQMOUSEEVENT( e )->button() == Qt::RightButton
&& m_viewMode == modeFlatView )
{
- KPopupMenu popup;
+ TDEPopupMenu popup;
popup.setCheckable( true );
popup.insertTitle( i18n( "Flat View Columns" ), /*id*/ -1, /*index*/ 1 );
@@ -3666,7 +3666,7 @@ CollectionView::eventFilter( TQObject* o, TQEvent* e )
return true;
}
- return KListView::eventFilter( o, e );
+ return TDEListView::eventFilter( o, e );
}
uint CollectionView::translateTimeFilter( uint filterMode )
@@ -4031,7 +4031,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ )
if ( values.count() )
{
- // KListViewItem* x = new DividerItem(this, i18n( "Various" ), m_cat1);
+ // TDEListViewItem* x = new DividerItem(this, i18n( "Various" ), m_cat1);
// x->setExpandable(false);
// x->setDropEnabled( false );
// x->setSelectable(false);
@@ -4414,7 +4414,7 @@ CollectionItem::paintCell ( TQPainter * painter, const TQColorGroup & cg,
}
else
{
- KListViewItem::paintCell( painter, cg, column, width, align );
+ TDEListViewItem::paintCell( painter, cg, column, width, align );
}
}
@@ -4539,7 +4539,7 @@ CollectionItem::sortChildItems ( int column, bool ascending ) {
// DividerItem
DividerItem::DividerItem( TQListView* parent, TQString txt, int cat/*, bool sortYearsInverted*/)
-: KListViewItem( parent), m_blockText(false), m_text(txt), m_cat(cat)/*, m_sortYearsInverted(sortYearsInverted)*/
+: TDEListViewItem( parent), m_blockText(false), m_text(txt), m_cat(cat)/*, m_sortYearsInverted(sortYearsInverted)*/
{
setExpandable(false);
setDropEnabled(false);
@@ -4552,9 +4552,9 @@ DividerItem::paintCell ( TQPainter * p, const TQColorGroup & cg,
{
p->save();
- // be sure, that KListViewItem::paintCell() does not draw its text
+ // be sure, that TDEListViewItem::paintCell() does not draw its text
setBlockText( true );
- KListViewItem::paintCell(p, cg, column, width, align);
+ TDEListViewItem::paintCell(p, cg, column, width, align);
setBlockText( false );
//use bold font for the divider
@@ -4592,7 +4592,7 @@ DividerItem::text(int column) const
if (column == 0) {
return m_blockText ? "" : m_text;
}
- return KListViewItem::text(column);
+ return TDEListViewItem::text(column);
}
int
diff --git a/amarok/src/collectionbrowser.h b/amarok/src/collectionbrowser.h
index 932580b9..5f9dda0f 100644
--- a/amarok/src/collectionbrowser.h
+++ b/amarok/src/collectionbrowser.h
@@ -30,13 +30,13 @@ class TQPixmap;
class TQPoint;
class TQStringList;
-class KAction;
+class TDEAction;
class KComboBox;
-class KPopupMenu;
-class KRadioAction;
+class TDEPopupMenu;
+class TDERadioAction;
class KTabBar;
-class KToolBar;
-class KToggleAction;
+class TDEToolBar;
+class TDEToggleAction;
class CollectionView;
class CollectionItem;
@@ -65,7 +65,7 @@ class CollectionBrowser: public TQVBox
public:
CollectionBrowser( const char* name );
virtual bool eventFilter( TQObject*, TQEvent* );
- KToolBar* getToolBar() const { return m_toolbar; }
+ TDEToolBar* getToolBar() const { return m_toolbar; }
static CollectionBrowser *instance() { return s_instance; }
public slots:
@@ -86,23 +86,23 @@ class CollectionBrowser: public TQVBox
//attributes:
KTabBar* m_tabs; //tree-view, flat-view tabs
- class KToolBar *m_toolbar;
- KAction *m_configureAction;
+ class TDEToolBar *m_toolbar;
+ TDEAction *m_configureAction;
// For iPod-style browsing
- KAction *m_ipodIncrement, *m_ipodDecrement;
- class KToolBar *m_ipodToolbar;
+ TDEAction *m_ipodIncrement, *m_ipodDecrement;
+ class TDEToolBar *m_ipodToolbar;
class TQHBox *m_ipodHbox;
- KToggleAction *m_showDividerAction;
- KRadioAction *m_treeViewAction;
- KRadioAction *m_flatViewAction;
- KRadioAction *m_ipodViewAction;
- class KActionMenu *m_tagfilterMenuButton;
+ TDEToggleAction *m_showDividerAction;
+ TDERadioAction *m_treeViewAction;
+ TDERadioAction *m_flatViewAction;
+ TDERadioAction *m_ipodViewAction;
+ class TDEActionMenu *m_tagfilterMenuButton;
- KPopupMenu* m_categoryMenu;
- KPopupMenu* m_cat1Menu;
- KPopupMenu* m_cat2Menu;
- KPopupMenu* m_cat3Menu;
+ TDEPopupMenu* m_categoryMenu;
+ TDEPopupMenu* m_cat1Menu;
+ TDEPopupMenu* m_cat2Menu;
+ TDEPopupMenu* m_cat3Menu;
KLineEdit* m_searchEdit;
KComboBox* m_timeFilter;
CollectionView* m_view;
@@ -117,7 +117,7 @@ class CollectionBrowser: public TQVBox
friend class DividerItem;
};
-class DividerItem : public KListViewItem
+class DividerItem : public TDEListViewItem
{
public:
static TQString createGroup(const TQString& src, int cat);
@@ -144,15 +144,15 @@ private:
-class CollectionItem : public KListViewItem {
+class CollectionItem : public TDEListViewItem {
public:
CollectionItem( TQListView* parent, int cat = 0, bool unknown = false, bool sampler=false )
- : KListViewItem( parent )
+ : TDEListViewItem( parent )
, m_cat( cat )
, m_isUnknown( unknown )
, m_isSampler( sampler ) {};
CollectionItem( TQListViewItem* parent, int cat = 0, bool unknown = false, bool sampler=false )
- : KListViewItem( parent )
+ : TDEListViewItem( parent )
, m_cat( cat )
, m_isUnknown( unknown )
, m_isSampler( sampler ) {};
@@ -172,7 +172,7 @@ class CollectionItem : public KListViewItem {
virtual void setPixmap(int column, const TQPixmap & pix);
/// convenience functions
- CollectionView *listView() const { return reinterpret_cast<CollectionView*>( KListViewItem::listView() ); }
+ CollectionView *listView() const { return reinterpret_cast<CollectionView*>( TDEListViewItem::listView() ); }
private:
friend class CollectionView;
@@ -189,7 +189,7 @@ class CollectionItem : public KListViewItem {
};
-class CollectionView : public KListView, public DropProxyTarget
+class CollectionView : public TDEListView, public DropProxyTarget
{
Q_OBJECT
@@ -210,7 +210,7 @@ class CollectionView : public KListView, public DropProxyTarget
void setTimeFilter( const uint timeFilter ) { m_timeFilter = timeFilter; }
TQString filter() { return m_filter; }
uint timeFilter() { return m_timeFilter; }
- CollectionItem* currentItem() { return static_cast<CollectionItem*>( KListView::currentItem() ); }
+ CollectionItem* currentItem() { return static_cast<CollectionItem*>( TDEListView::currentItem() ); }
int trackDepth() { return m_trackDepth; }
int viewMode() const { return m_viewMode; }
@@ -328,7 +328,7 @@ class CollectionView : public KListView, public DropProxyTarget
/**Call when a category has changed **/
void updateColumnHeader();
- // Reimplemented from KListView
+ // Reimplemented from TDEListView
void viewportPaintEvent( TQPaintEvent* );
void viewportResizeEvent( TQResizeEvent* );
bool eventFilter( TQObject*, TQEvent* );
diff --git a/amarok/src/columnlist.cpp b/amarok/src/columnlist.cpp
index 6cced338..9106c898 100644
--- a/amarok/src/columnlist.cpp
+++ b/amarok/src/columnlist.cpp
@@ -71,7 +71,7 @@ ColumnList::ColumnList( TQWidget *parent, const char *name )
TQToolTip::add( m_down, i18n( "Move column down" ) );
connect( m_down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveDown() ) );
- m_list = new KListView( this );
+ m_list = new TDEListView( this );
m_list->addColumn("");
m_list->header()->hide();
m_list->setSelectionMode( TQListView::Single );
diff --git a/amarok/src/columnlist.h b/amarok/src/columnlist.h
index 67bd2c65..10604065 100644
--- a/amarok/src/columnlist.h
+++ b/amarok/src/columnlist.h
@@ -23,7 +23,7 @@
#include <tqhbox.h>
#include <kdialogbase.h>
-class KListView;
+class TDEListView;
class KPushButton;
template<class T> class TQValueList;
@@ -49,7 +49,7 @@ private slots:
private:
friend class MyCheckListItem;
- KListView *m_list;
+ TDEListView *m_list;
KPushButton *m_up, *m_down;
bool m_changed;
};
diff --git a/amarok/src/configdialog.cpp b/amarok/src/configdialog.cpp
index 42469018..cf47b311 100644
--- a/amarok/src/configdialog.cpp
+++ b/amarok/src/configdialog.cpp
@@ -190,7 +190,7 @@ AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, TDEC
static_cast<TQLabel*>(TQT_TQWIDGET(label))->setPixmap( info );
delete list;
- //stop KFont Requesters getting stupidly large
+ //stop TDEFont Requesters getting stupidly large
list = queryList( TQLABEL_OBJECT_NAME_STRING, "m_sampleLabel" );
for( TQObject *label = list->first(); label; label = list->next() )
static_cast<TQLabel*>(TQT_TQWIDGET(label))->setMaximumWidth( 250 );
diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp
index 9e434496..9047f352 100644
--- a/amarok/src/contextbrowser.cpp
+++ b/amarok/src/contextbrowser.cpp
@@ -192,8 +192,8 @@ ContextBrowser::ContextBrowser( const char *name )
, m_dirtyLyricsPage( true )
, m_dirtyWikiPage( true )
, m_emptyDB( CollectionDB::instance()->isEmpty() )
- , m_wikiBackPopup( new KPopupMenu( this ) )
- , m_wikiForwardPopup( new KPopupMenu( this ) )
+ , m_wikiBackPopup( new TDEPopupMenu( this ) )
+ , m_wikiForwardPopup( new TDEPopupMenu( this ) )
, m_wikiJob( NULL )
, m_wikiConfigDialog( NULL )
, m_relatedOpen( true )
@@ -218,17 +218,17 @@ ContextBrowser::ContextBrowser( const char *name )
m_lyricsTab = new TQVBox(this, "lyrics_tab");
m_lyricsToolBar = new Browser::ToolBar( m_lyricsTab );
- m_lyricsToolBar->setIconText( KToolBar::IconTextRight, false );
+ m_lyricsToolBar->setIconText( TDEToolBar::IconTextRight, false );
m_lyricsToolBar->insertButton( Amarok::icon( "refresh" ), LYRICS_REFRESH, true, i18n("Refresh") );
m_lyricsToolBar->insertButton( Amarok::icon( "add_lyrics" ), LYRICS_ADD, true, i18n("Add") );
m_lyricsToolBar->insertButton( Amarok::icon( "edit" ), LYRICS_EDIT, true, i18n("Edit") );
m_lyricsToolBar->setToggle( LYRICS_EDIT, true );
m_lyricsToolBar->insertButton( Amarok::icon( "search" ), LYRICS_SEARCH, true, i18n("Search") );
- m_lyricsToolBar->setIconText( KToolBar::IconOnly, false );
+ m_lyricsToolBar->setIconText( TDEToolBar::IconOnly, false );
m_lyricsToolBar->insertButton( Amarok::icon( "external" ), LYRICS_BROWSER, true, i18n("Open in external browser") );
{ //Search text inside lyrics. Code inspired/copied from playlistwindow.cpp
- m_lyricsTextBar = new KToolBar( m_lyricsTab, "NotMainToolBar" );
+ m_lyricsTextBar = new TDEToolBar( m_lyricsTab, "NotMainToolBar" );
m_lyricsTextBar->hide();
m_lyricsTextBarShowed=false;
@@ -238,7 +238,7 @@ ContextBrowser::ContextBrowser( const char *name )
m_lyricsTextBar->boxLayout()->addStretch();
- TQWidget *button = new KToolBarButton( "locationbar_erase", 1, m_lyricsTextBar );
+ TQWidget *button = new TDEToolBarButton( "locationbar_erase", 1, m_lyricsTextBar );
TQLabel *filter_label = new TQLabel( i18n("S&earch:") + ' ', m_lyricsTextBar );
m_lyricsSearchText = new ClickLineEdit( i18n( "Search in lyrics" ), m_lyricsTextBar );
filter_label->setBuddy( m_lyricsSearchText );
@@ -259,7 +259,7 @@ ContextBrowser::ContextBrowser( const char *name )
connect ( m_lyricsSearchText, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(lyricsSearchText(const TQString & )) );
connect ( m_lyricsSearchText, TQT_SIGNAL(returnPressed()), this, (TQT_SLOT(lyricsSearchTextNext())) );
Amarok::actionCollection()->setAutoConnectShortcuts ( true );
- new KAction( i18n("Search text in lyrics"), KShortcut("/"), TQT_TQOBJECT(this),TQT_SLOT( lyricsSearchTextShow() ), Amarok::actionCollection(), "search_text_lyric");
+ new TDEAction( i18n("Search text in lyrics"), TDEShortcut("/"), TQT_TQOBJECT(this),TQT_SLOT( lyricsSearchTextShow() ), Amarok::actionCollection(), "search_text_lyric");
Amarok::actionCollection()->setAutoConnectShortcuts ( false );
}
@@ -892,7 +892,7 @@ void ContextBrowser::slotContextMenu( const TQString& urlString, const TQPoint&
KURL url( urlString );
- KPopupMenu menu;
+ TDEPopupMenu menu;
KURL::List urls( url );
TQString artist, album, track; // track unused here
Amarok::albumArtistTrackFromUrl( url.path(), artist, album, track );
diff --git a/amarok/src/contextbrowser.h b/amarok/src/contextbrowser.h
index 59dc15cc..56744f72 100644
--- a/amarok/src/contextbrowser.h
+++ b/amarok/src/contextbrowser.h
@@ -20,7 +20,7 @@ class ClickLineEdit;
class CollectionDB;
class Color;
class HTMLView;
-class KPopupMenu;
+class TDEPopupMenu;
class MetaBundle;
class TQPalette;
class TQVBox;
@@ -171,7 +171,7 @@ class ContextBrowser : public KTabWidget, public EngineObserver
TQString m_lyricsBeingEditedArtist;
TQString m_lyricsBeingEditedTitle;
ClickLineEdit* m_lyricsSearchText;
- KToolBar* m_lyricsTextBar;
+ TDEToolBar* m_lyricsTextBar;
bool m_lyricsTextBarShowed;
@@ -183,8 +183,8 @@ class ContextBrowser : public KTabWidget, public EngineObserver
TQString m_wikiCurrentEntry;
TQStringList m_wikiBackHistory;
TQStringList m_wikiForwardHistory;
- KPopupMenu* m_wikiBackPopup;
- KPopupMenu* m_wikiForwardPopup;
+ TDEPopupMenu* m_wikiBackPopup;
+ TDEPopupMenu* m_wikiForwardPopup;
TDEIO::TransferJob* m_wikiJob;
Browser::ToolBar* m_wikiToolBar;
TQLineEdit* m_wikiLocaleEdit;
diff --git a/amarok/src/coverfetcher.cpp b/amarok/src/coverfetcher.cpp
index fe0e5f05..b9cafc97 100644
--- a/amarok/src/coverfetcher.cpp
+++ b/amarok/src/coverfetcher.cpp
@@ -37,7 +37,7 @@
void
Amarok::coverContextMenu( TQWidget *parent, TQPoint point, const TQString &artist, const TQString &album, bool showCoverManager )
{
- KPopupMenu menu;
+ TDEPopupMenu menu;
enum { SHOW, FETCH, CUSTOM, DELETE, MANAGER };
menu.insertTitle( i18n( "Cover Image" ) );
diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp
index 91bf9e53..0b5c80da 100644
--- a/amarok/src/covermanager.cpp
+++ b/amarok/src/covermanager.cpp
@@ -59,11 +59,11 @@
static TQString artistToSelectInInitFunction;
CoverManager *CoverManager::s_instance = 0;
-class ArtistItem : public KListViewItem
+class ArtistItem : public TDEListViewItem
{
public:
ArtistItem(TQListView *view, TQListViewItem *item, const TQString &text)
- : KListViewItem(view, item, text) {}
+ : TDEListViewItem(view, item, text) {}
protected:
int compare( TQListViewItem* i, int col, bool ascending ) const
{
@@ -101,7 +101,7 @@ CoverManager::CoverManager()
setMargin( 4 );
//artist listview
- m_artistView = new KListView( this );
+ m_artistView = new TDEListView( this );
m_artistView->addColumn(i18n( "Albums By" ));
m_artistView->setFullWidth( true );
m_artistView->setSorting( 0 );
@@ -141,8 +141,8 @@ CoverManager::CoverManager()
{ //<Search LineEdit>
TQHBox *searchBox = new TQHBox( hbox );
- KToolBar* searchToolBar = new Browser::ToolBar( searchBox );
- KToolBarButton *button = new KToolBarButton( "locationbar_erase", 0, searchToolBar );
+ TDEToolBar* searchToolBar = new Browser::ToolBar( searchBox );
+ TDEToolBarButton *button = new TDEToolBarButton( "locationbar_erase", 0, searchToolBar );
m_searchEdit = new ClickLineEdit( i18n( "Enter search terms here" ), searchToolBar );
m_searchEdit->setFrame( TQFrame::Sunken );
@@ -156,7 +156,7 @@ CoverManager::CoverManager()
} //</Search LineEdit>
// view menu
- m_viewMenu = new KPopupMenu( this );
+ m_viewMenu = new TDEPopupMenu( this );
m_viewMenu->insertItem( i18n("All Albums"), AllAlbums );
m_viewMenu->insertItem( i18n("Albums With Cover"), AlbumsWithCover );
m_viewMenu->insertItem( i18n("Albums Without Cover"), AlbumsWithoutCover );
@@ -165,7 +165,7 @@ CoverManager::CoverManager()
#ifdef AMAZON_SUPPORT
// amazon locale menu
- m_amazonLocaleMenu = new KPopupMenu( this );
+ m_amazonLocaleMenu = new TDEPopupMenu( this );
m_amazonLocaleMenu->insertItem( i18n("International"), CoverFetcher::International );
m_amazonLocaleMenu->insertItem( i18n("Canada"), CoverFetcher::Canada );
m_amazonLocaleMenu->insertItem( i18n("France"), CoverFetcher::France );
@@ -175,8 +175,8 @@ CoverManager::CoverManager()
connect( m_amazonLocaleMenu, TQT_SIGNAL( activated(int) ), TQT_SLOT( changeLocale(int) ) );
#endif
- KToolBar* toolBar = new KToolBar( hbox );
- toolBar->setIconText( KToolBar::IconTextRight );
+ TDEToolBar* toolBar = new TDEToolBar( hbox );
+ toolBar->setIconText( TDEToolBar::IconTextRight );
toolBar->setFrameShape( TQFrame::NoFrame );
toolBar->insertButton( "view_choose", 1, m_viewMenu, true, i18n( "View" ) );
#ifdef AMAZON_SUPPORT
@@ -486,7 +486,7 @@ void CoverManager::showCoverMenu( TQIconViewItem *item, const TQPoint &p ) //SLO
enum { SHOW, FETCH, CUSTOM, DELETE, APPEND };
- KPopupMenu menu;
+ TDEPopupMenu menu;
menu.insertTitle( i18n( "Cover Image" ) );
diff --git a/amarok/src/covermanager.h b/amarok/src/covermanager.h
index 178e794c..c88a4f01 100644
--- a/amarok/src/covermanager.h
+++ b/amarok/src/covermanager.h
@@ -15,10 +15,10 @@ class TQListViewItem;
class CoverViewItem;
class ClickLineEdit;
class KPushButton;
-class KPopupMenu;
+class TDEPopupMenu;
class TQToolButton;
class TQLabel;
-class KListView;
+class TDEListView;
class CoverView;
class TQHBox;
class KProgress;
@@ -76,12 +76,12 @@ class CoverManager : public TQSplitter
void deleteSelectedCovers();
TQPtrList<CoverViewItem> selectedItems();
- KListView *m_artistView;
+ TDEListView *m_artistView;
CoverView *m_coverView;
ClickLineEdit *m_searchEdit;
KPushButton *m_fetchButton;
- KPopupMenu *m_amazonLocaleMenu;
- KPopupMenu *m_viewMenu;
+ TDEPopupMenu *m_amazonLocaleMenu;
+ TDEPopupMenu *m_viewMenu;
TQToolButton *m_amazonLocaleButton;
TQToolButton *m_viewButton;
int m_currentLocale;
diff --git a/amarok/src/deletedialog.h b/amarok/src/deletedialog.h
index e96977ca..8f8f0bfa 100644
--- a/amarok/src/deletedialog.h
+++ b/amarok/src/deletedialog.h
@@ -23,7 +23,7 @@
#include "deletedialogbase.h"
class TQStringList;
-class KListBox;
+class TDEListBox;
class KGuiItem;
class TQLabel;
class TQWidgetStack;
diff --git a/amarok/src/deletedialogbase.ui b/amarok/src/deletedialogbase.ui
index bd4e2a5c..63a678c3 100644
--- a/amarok/src/deletedialogbase.ui
+++ b/amarok/src/deletedialogbase.ui
@@ -72,7 +72,7 @@
</widget>
</hbox>
</widget>
- <widget class="KListBox">
+ <widget class="TDEListBox">
<property name="name">
<cstring>ddFileList</cstring>
</property>
diff --git a/amarok/src/engine/nmm/HostList.cpp b/amarok/src/engine/nmm/HostList.cpp
index 869928db..903e81fa 100644
--- a/amarok/src/engine/nmm/HostList.cpp
+++ b/amarok/src/engine/nmm/HostList.cpp
@@ -32,7 +32,7 @@
#include "HostListItem.h"
HostList::HostList( TQWidget *parent, const char *name )
- : KListView( parent, name ),
+ : TDEListView( parent, name ),
m_read_only( false ),
m_hoveredVolume(0)
{
@@ -115,16 +115,16 @@ void HostList::contentsMousePressEvent( TQMouseEvent *e)
item->setVolume( item->volumeAtPosition( vol ) );
}
else
- KListView::contentsMousePressEvent( e );
+ TDEListView::contentsMousePressEvent( e );
}
else
- KListView::contentsMousePressEvent( e );
+ TDEListView::contentsMousePressEvent( e );
}
void HostList::contentsMouseMoveEvent( TQMouseEvent *e )
{
if( e )
- KListView::contentsMouseMoveEvent( e );
+ TDEListView::contentsMouseMoveEvent( e );
HostListItem *prev = m_hoveredVolume;
const TQPoint pos = e ? e->pos() : viewportToContents( viewport()->mapFromGlobal( TQCursor::pos() ) );
@@ -145,7 +145,7 @@ void HostList::contentsMouseMoveEvent( TQMouseEvent *e )
void HostList::leaveEvent( TQEvent *e )
{
- KListView::leaveEvent( e );
+ TDEListView::leaveEvent( e );
HostListItem *prev = m_hoveredVolume;
m_hoveredVolume = 0;
diff --git a/amarok/src/engine/nmm/HostList.h b/amarok/src/engine/nmm/HostList.h
index 8be1cb00..fd9f93f9 100644
--- a/amarok/src/engine/nmm/HostList.h
+++ b/amarok/src/engine/nmm/HostList.h
@@ -29,7 +29,7 @@
class HostListItem;
-class HostList : public KListView
+class HostList : public TDEListView
{
Q_OBJECT
diff --git a/amarok/src/engine/nmm/HostListItem.cpp b/amarok/src/engine/nmm/HostListItem.cpp
index efc516fd..0cf22dff 100644
--- a/amarok/src/engine/nmm/HostListItem.cpp
+++ b/amarok/src/engine/nmm/HostListItem.cpp
@@ -42,7 +42,7 @@
#include "nmm_engine.h"
HostListItem::HostListItem( TQListView *parent, TQString hostname, bool audio, bool video, int volume, int status, bool read_only )
- : KListViewItem( parent ),
+ : TDEListViewItem( parent ),
m_audio( audio ),
m_video( video ),
m_volume( volume ),
@@ -221,7 +221,7 @@ void HostListItem::paintCell(TQPainter * p, const TQColorGroup & cg, int column,
return;
}
- KListViewItem::paintCell(p, m_cg, column, width, align);
+ TDEListViewItem::paintCell(p, m_cg, column, width, align);
}
TQPixmap* HostListItem::pixmapVolume( int type )
diff --git a/amarok/src/engine/nmm/HostListItem.h b/amarok/src/engine/nmm/HostListItem.h
index 3181a93b..8fa0cc88 100644
--- a/amarok/src/engine/nmm/HostListItem.h
+++ b/amarok/src/engine/nmm/HostListItem.h
@@ -28,7 +28,7 @@
#include <klistview.h>
#include <tqpixmap.h>
-class HostListItem : public KListViewItem {
+class HostListItem : public TDEListViewItem {
public:
enum Column
{
diff --git a/amarok/src/equalizerpresetmanager.cpp b/amarok/src/equalizerpresetmanager.cpp
index d7b9c973..e45bf812 100644
--- a/amarok/src/equalizerpresetmanager.cpp
+++ b/amarok/src/equalizerpresetmanager.cpp
@@ -39,7 +39,7 @@ EqualizerPresetManager::EqualizerPresetManager( TQWidget *parent, const char *na
setMainWidget( mainWidget );
TQHBoxLayout *mainLayout = new TQHBoxLayout( mainWidget, 0, spacingHint() );
- m_presetsView = new KListView( mainWidget, "presetListView" );
+ m_presetsView = new TDEListView( mainWidget, "presetListView" );
m_presetsView->addColumn( i18n( "Presets" ) );
m_presetsView->setFullWidth( true );
connect(m_presetsView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( updateButtonState() ));
@@ -83,7 +83,7 @@ EqualizerPresetManager::setPresets(TQMap< TQString, TQValueList<int> > presets)
TQMap< TQString, TQValueList<int> >::Iterator end = presets.end();
for ( TQMap< TQString, TQValueList<int> >::Iterator it = presets.begin(); it != end; ++it )
if ( it.key() != i18n( "Zero" ) && it.key() != i18n( "Manual" ) ) // Don't add 'Manual' and 'Zero'
- new KListViewItem( m_presetsView, it.key() );
+ new TDEListViewItem( m_presetsView, it.key() );
}
TQMap< TQString, TQValueList<int> >
diff --git a/amarok/src/equalizerpresetmanager.h b/amarok/src/equalizerpresetmanager.h
index 776c62a1..ebc3ef46 100644
--- a/amarok/src/equalizerpresetmanager.h
+++ b/amarok/src/equalizerpresetmanager.h
@@ -26,7 +26,7 @@
class TQPushButton;
class TQStringList;
-class KListView;
+class TDEListView;
class EqualizerPresetManager : public KDialogBase
{
@@ -49,7 +49,7 @@ class EqualizerPresetManager : public KDialogBase
private:
TQMap< TQString, TQValueList<int> > m_presets;
- KListView* m_presetsView;
+ TDEListView* m_presetsView;
//TQPushButton* m_addBtn;
TQPushButton* m_renameBtn;
diff --git a/amarok/src/equalizersetup.h b/amarok/src/equalizersetup.h
index 25602c32..03ed492e 100644
--- a/amarok/src/equalizersetup.h
+++ b/amarok/src/equalizersetup.h
@@ -25,7 +25,7 @@ class EqualizerGraph;
class TQGroupBox;
class TQCheckBox;
class KComboBox;
-class KPopupMenu;
+class TDEPopupMenu;
namespace Amarok { class Slider; }
diff --git a/amarok/src/filebrowser.cpp b/amarok/src/filebrowser.cpp
index 2c285ba6..2f04f8e5 100644
--- a/amarok/src/filebrowser.cpp
+++ b/amarok/src/filebrowser.cpp
@@ -68,7 +68,7 @@
FileBrowser::FileBrowser( const char * name, Medium * medium )
: TQVBox( 0, name )
{
- KActionCollection *actionCollection;
+ TDEActionCollection *actionCollection;
SearchPane *searchPane;
KURL *location;
@@ -92,14 +92,14 @@ FileBrowser::FileBrowser( const char * name, Medium * medium )
location = new KURL( m_medium->mountPoint() );
}
- KActionCollection* ac = new KActionCollection( this );
+ TDEActionCollection* ac = new TDEActionCollection( this );
KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), ac, "filebrowser_select_all" );
- KToolBar *toolbar = new Browser::ToolBar( this );
+ TDEToolBar *toolbar = new Browser::ToolBar( this );
{ //Filter LineEdit
- KToolBar* searchToolBar = new Browser::ToolBar( this );
- KToolBarButton *button = new KToolBarButton( "locationbar_erase", 0, searchToolBar );
+ TDEToolBar* searchToolBar = new Browser::ToolBar( this );
+ TDEToolBarButton *button = new TDEToolBarButton( "locationbar_erase", 0, searchToolBar );
m_filter = new ClickLineEdit( i18n( "Enter search terms here" ), searchToolBar );
searchToolBar->setStretchableWidget( m_filter );
@@ -164,7 +164,7 @@ FileBrowser::FileBrowser( const char * name, Medium * medium )
}
{
- TQPopupMenu* const menu = static_cast<KActionMenu*>(actionCollection->action("popupMenu"))->popupMenu();
+ TQPopupMenu* const menu = static_cast<TDEActionMenu*>(actionCollection->action("popupMenu"))->popupMenu();
menu->clear();
menu->insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), MakePlaylist );
@@ -198,50 +198,50 @@ FileBrowser::FileBrowser( const char * name, Medium * medium )
}
{
- KActionMenu *a;
+ TDEActionMenu *a;
- a = static_cast<KActionMenu*>( actionCollection->action( "sorting menu" ) );
+ a = static_cast<TDEActionMenu*>( actionCollection->action( "sorting menu" ) );
a->setIcon( Amarok::icon( "configure" ) );
a->setDelayed( false ); //TODO should be done by KDirOperator
- actionCollection->action( "delete" )->setShortcut( KShortcut( SHIFT + Key_Delete ) );
+ actionCollection->action( "delete" )->setShortcut( TDEShortcut( SHIFT + Key_Delete ) );
- a = new KActionMenu( i18n("Bookmarks"), "bookmark", actionCollection, "bookmarks" );
+ a = new TDEActionMenu( i18n("Bookmarks"), "bookmark", actionCollection, "bookmarks" );
a->setDelayed( false );
new KBookmarkHandler( m_dir, a->popupMenu() );
}
{
- if ( KAction *a = actionCollection->action( "up" ) )
+ if ( TDEAction *a = actionCollection->action( "up" ) )
a->plug( toolbar );
- if ( KAction *a = actionCollection->action( "back" ) )
+ if ( TDEAction *a = actionCollection->action( "back" ) )
a->plug( toolbar );
- if ( KAction *a = actionCollection->action( "forward" ) )
+ if ( TDEAction *a = actionCollection->action( "forward" ) )
a->plug( toolbar );
- if ( KAction *a = actionCollection->action( "home" ) )
+ if ( TDEAction *a = actionCollection->action( "home" ) )
a->plug( toolbar );
- if ( KAction *a = actionCollection->action( "reload" ) ) {
+ if ( TDEAction *a = actionCollection->action( "reload" ) ) {
a->setIcon( Amarok::icon( "refresh" ) );
a->plug( toolbar );
}
toolbar->insertLineSeparator();
- if ( KAction *a = actionCollection->action( "short view" ) )
+ if ( TDEAction *a = actionCollection->action( "short view" ) )
a->plug( toolbar );
- if ( KAction *a = actionCollection->action( "detailed view" ) )
+ if ( TDEAction *a = actionCollection->action( "detailed view" ) )
a->plug( toolbar );
toolbar->insertLineSeparator();
- if ( KAction *a = actionCollection->action( "sorting menu" ) )
+ if ( TDEAction *a = actionCollection->action( "sorting menu" ) )
a->plug( toolbar );
- if ( KAction *a = actionCollection->action( "bookmarks" ) )
+ if ( TDEAction *a = actionCollection->action( "bookmarks" ) )
a->plug( toolbar );
- KAction *gotoCurrent = new KAction( i18n("Go To Current Track Folder"), Amarok::icon( "music" ), 0,
+ TDEAction *gotoCurrent = new TDEAction( i18n("Go To Current Track Folder"), Amarok::icon( "music" ), 0,
TQT_TQOBJECT(this), TQT_SLOT( gotoCurrentFolder() ), actionCollection );
gotoCurrent->plug( toolbar );
@@ -406,11 +406,11 @@ FileBrowser::urlChanged( const KURL &u )
inline void
FileBrowser::slotViewChanged( KFileView *view )
{
- if( view->widget()->inherits( "KListView" ) )
+ if( view->widget()->inherits( "TDEListView" ) )
{
using namespace Amarok::ColorScheme;
- static_cast<KListView*>(view->widget())->setAlternateBackground( AltBase );
+ static_cast<TDEListView*>(view->widget())->setAlternateBackground( AltBase );
}
}
@@ -424,17 +424,17 @@ inline void
FileBrowser::prepareContextMenu()
{
const KFileItemList &items = *m_dir->selectedItems();
- static_cast<KActionMenu*>(m_dir->actionCollection()->action("popupMenu"))->popupMenu()->setItemVisible( SavePlaylist,
+ static_cast<TDEActionMenu*>(m_dir->actionCollection()->action("popupMenu"))->popupMenu()->setItemVisible( SavePlaylist,
items.count() > 1 || ( items.count() == 1 && items.getFirst()->isDir() ) );
- static_cast<KActionMenu*>(m_dir->actionCollection()->action("popupMenu"))->popupMenu()->setItemVisible( QueueTrack,
+ static_cast<TDEActionMenu*>(m_dir->actionCollection()->action("popupMenu"))->popupMenu()->setItemVisible( QueueTrack,
items.count() == 1 );
- static_cast<KActionMenu*>(m_dir->actionCollection()->action("popupMenu"))->popupMenu()->setItemVisible( QueueTracks,
+ static_cast<TDEActionMenu*>(m_dir->actionCollection()->action("popupMenu"))->popupMenu()->setItemVisible( QueueTracks,
items.count() > 1 );
- static_cast<KActionMenu*>(m_dir->actionCollection()->action("popupMenu"))->popupMenu()->setItemVisible( MediaDevice,
+ static_cast<TDEActionMenu*>(m_dir->actionCollection()->action("popupMenu"))->popupMenu()->setItemVisible( MediaDevice,
MediaBrowser::isAvailable() );
- static_cast<KActionMenu*>(m_dir->actionCollection()->action("popupMenu"))->popupMenu()->setItemVisible( MoveToCollection, !CollectionDB::instance()->isDirInCollection( url().path() ) );
- static_cast<KActionMenu*>(m_dir->actionCollection()->action("popupMenu"))->popupMenu()->setItemVisible( CopyToCollection, !CollectionDB::instance()->isDirInCollection( url().path() ) );
- static_cast<KActionMenu*>(m_dir->actionCollection()->action("popupMenu"))->popupMenu()->setItemVisible( OrganizeFiles, CollectionDB::instance()->isDirInCollection( url().path() ) );
+ static_cast<TDEActionMenu*>(m_dir->actionCollection()->action("popupMenu"))->popupMenu()->setItemVisible( MoveToCollection, !CollectionDB::instance()->isDirInCollection( url().path() ) );
+ static_cast<TDEActionMenu*>(m_dir->actionCollection()->action("popupMenu"))->popupMenu()->setItemVisible( CopyToCollection, !CollectionDB::instance()->isDirInCollection( url().path() ) );
+ static_cast<TDEActionMenu*>(m_dir->actionCollection()->action("popupMenu"))->popupMenu()->setItemVisible( OrganizeFiles, CollectionDB::instance()->isDirInCollection( url().path() ) );
}
inline void
@@ -527,21 +527,21 @@ FileBrowser::selectAll()
#include <tqpainter.h>
#include <tqsimplerichtext.h>
-class KURLView : public KListView
+class KURLView : public TDEListView
{
public:
- KURLView( TQWidget *parent ) : KListView( parent )
+ KURLView( TQWidget *parent ) : TDEListView( parent )
{
reinterpret_cast<TQWidget*>(header())->hide();
addColumn( TQString() );
- setResizeMode( KListView::LastColumn );
+ setResizeMode( TDEListView::LastColumn );
setDragEnabled( true );
setSelectionMode( TQListView::Extended );
}
- class Item : public KListViewItem {
+ class Item : public TDEListViewItem {
public:
- Item( const KURL &url, KURLView *parent ) : KListViewItem( parent, url.fileName() ), m_url( url ) {}
+ Item( const KURL &url, KURLView *parent ) : TDEListViewItem( parent, url.fileName() ), m_url( url ) {}
KURL m_url;
};
@@ -558,7 +558,7 @@ public:
virtual void viewportPaintEvent( TQPaintEvent *e )
{
- KListView::viewportPaintEvent( e );
+ TDEListView::viewportPaintEvent( e );
if ( childCount() == 0 ) {
TQPainter p( viewport() );
diff --git a/amarok/src/filebrowser.h b/amarok/src/filebrowser.h
index 9331c55b..e987c860 100644
--- a/amarok/src/filebrowser.h
+++ b/amarok/src/filebrowser.h
@@ -31,7 +31,7 @@
class ClickLineEdit;
class TQTimer;
-class KActionCollection;
+class TDEActionCollection;
class KFileItem;
class KFileView;
class KURLComboBox;
diff --git a/amarok/src/htmlview.cpp b/amarok/src/htmlview.cpp
index 47876403..4f6ddf3f 100644
--- a/amarok/src/htmlview.cpp
+++ b/amarok/src/htmlview.cpp
@@ -37,12 +37,12 @@ HTMLView::HTMLView( TQWidget *parentWidget, const char *widgetname, const bool D
setDNDEnabled( DNDEnabled );
setJScriptEnabled( JScriptEnabled );
- KActionCollection* ac = actionCollection();
+ TDEActionCollection* ac = actionCollection();
ac->setAutoConnectShortcuts( true );
m_copy = KStdAction::copy( this, TQT_SLOT( copyText() ), ac, "htmlview_copy" );
m_selectAll = KStdAction::selectAll( this, TQT_SLOT( selectAll() ), ac, "htmlview_select_all" );
{
- KPopupMenu m;
+ TDEPopupMenu m;
m_copy->plug( &m );
m_selectAll->plug( &m );
diff --git a/amarok/src/htmlview.h b/amarok/src/htmlview.h
index fb9b8489..38a51e81 100644
--- a/amarok/src/htmlview.h
+++ b/amarok/src/htmlview.h
@@ -10,7 +10,7 @@
#include <tdehtml_part.h>
#include <tdehtmlview.h>
-class KAction;
+class TDEAction;
class KTempFile;
class HTMLView : public TDEHTMLPart
@@ -33,8 +33,8 @@ class HTMLView : public TDEHTMLPart
static KTempFile *m_shadowGradientImage;
static int m_instances;
- KAction *m_selectAll;
- KAction *m_copy;
+ TDEAction *m_selectAll;
+ TDEAction *m_copy;
private slots:
void enableCopyAction();
diff --git a/amarok/src/kbookmarkhandler.cpp b/amarok/src/kbookmarkhandler.cpp
index 0e5a74e4..ff070e22 100644
--- a/amarok/src/kbookmarkhandler.cpp
+++ b/amarok/src/kbookmarkhandler.cpp
@@ -26,7 +26,7 @@
#include <kdiroperator.h>
#include <kstandarddirs.h>
-KBookmarkHandler::KBookmarkHandler( KDirOperator *parent, KPopupMenu* rootmenu )
+KBookmarkHandler::KBookmarkHandler( KDirOperator *parent, TDEPopupMenu* rootmenu )
: TQObject( parent, "KBookmarkHandler" )
, KBookmarkOwner()
{
diff --git a/amarok/src/kbookmarkhandler.h b/amarok/src/kbookmarkhandler.h
index 86a44eff..1398cded 100644
--- a/amarok/src/kbookmarkhandler.h
+++ b/amarok/src/kbookmarkhandler.h
@@ -24,12 +24,12 @@
#include <tqobject.h>
class KDirOperator;
-class KPopupMenu;
+class TDEPopupMenu;
class KBookmarkHandler : public TQObject, public KBookmarkOwner
{
public:
- KBookmarkHandler( KDirOperator *parent, KPopupMenu* );
+ KBookmarkHandler( KDirOperator *parent, TDEPopupMenu* );
/// KBookmarkOwner interface:
virtual void openBookmarkURL( const TQString &url );
diff --git a/amarok/src/konquisidebar/universalamarok.cpp b/amarok/src/konquisidebar/universalamarok.cpp
index d4820dfb..11c425bb 100644
--- a/amarok/src/konquisidebar/universalamarok.cpp
+++ b/amarok/src/konquisidebar/universalamarok.cpp
@@ -82,7 +82,7 @@ UniversalAmarok::UniversalAmarok(TDEInstance *inst,TQObject *parent,TQWidget *wi
TDEGlobal::iconLoader()->addAppDir( "amarok" );
widget = new amarokWidget( widgetParent );
// widgetParent->resize(580,300);
- KToolBar *topBar = new KToolBar( widget, "Topbar" );
+ TDEToolBar *topBar = new TDEToolBar( widget, "Topbar" );
topBar->setIconSize(16);
topBar->insertButton( "today", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( currentTrack() ) );
topBar->insertButton( "document", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( lyrics() ) );
@@ -102,7 +102,7 @@ UniversalAmarok::UniversalAmarok(TDEInstance *inst,TQObject *parent,TQWidget *wi
playlistStub = new AmarokPlaylistInterface_stub( amarokDCOP, "amarok", "playlist");
contextStub = new AmarokContextBrowserInterface_stub (amarokDCOP, "amarok", "contextbrowser");
- KToolBar* toolBar=new KToolBar(widget, "PlayerControls");
+ TDEToolBar* toolBar=new TDEToolBar(widget, "PlayerControls");
toolBar->setIconSize(16);
toolBar->insertButton( "player_start",0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendPrev() ) );
diff --git a/amarok/src/lastfm.cpp b/amarok/src/lastfm.cpp
index 5c631ffc..9c81af6b 100644
--- a/amarok/src/lastfm.cpp
+++ b/amarok/src/lastfm.cpp
@@ -136,14 +136,14 @@ Controller::Controller()
: TQObject( EngineController::instance(), "lastfmController" )
, m_service( 0 )
{
- KActionCollection* ac = Amarok::actionCollection();
- m_actionList.append( new KAction( i18n( "Ban" ), Amarok::icon( "remove" ),
+ TDEActionCollection* ac = Amarok::actionCollection();
+ m_actionList.append( new TDEAction( i18n( "Ban" ), Amarok::icon( "remove" ),
KKey( TQt::CTRL | TQt::Key_B ), this, TQT_SLOT( ban() ), ac, "ban" ) );
- m_actionList.append( new KAction( i18n( "Love" ), Amarok::icon( "love" ),
+ m_actionList.append( new TDEAction( i18n( "Love" ), Amarok::icon( "love" ),
KKey( TQt::CTRL | TQt::Key_L ), this, TQT_SLOT( love() ), ac, "love" ) );
- m_actionList.append( new KAction( i18n( "Skip" ), Amarok::icon( "next" ),
+ m_actionList.append( new TDEAction( i18n( "Skip" ), Amarok::icon( "next" ),
KKey( TQt::CTRL | TQt::Key_K ), this, TQT_SLOT( skip() ), ac, "skip" ) );
setActionsEnabled( false );
}
@@ -289,7 +289,7 @@ Controller::setActionsEnabled( bool enable )
Amarok::actionCollection()->action( "play_pause" )->setEnabled( !enable );
Amarok::actionCollection()->action( "pause" )->setEnabled( !enable );
- KAction* action;
+ TDEAction* action;
for( action = m_actionList.first(); action; action = m_actionList.next() )
action->setEnabled( enable );
}
diff --git a/amarok/src/lastfm.h b/amarok/src/lastfm.h
index 0c2e0666..ed9261bb 100644
--- a/amarok/src/lastfm.h
+++ b/amarok/src/lastfm.h
@@ -28,7 +28,7 @@
#include <tdeconfigdialog.h>
class KLineEdit;
-class KAction;
+class TDEAction;
class KProcIO;
class KURL;
class TQSocket;
@@ -102,7 +102,7 @@ namespace LastFm
void setActionsEnabled( bool enable );
static Controller *s_instance;
- TQPtrList<KAction> m_actionList;
+ TQPtrList<TDEAction> m_actionList;
TQString m_genreUrl;
WebService* m_service;
diff --git a/amarok/src/magnatunebrowser/magnatunebrowser.cpp b/amarok/src/magnatunebrowser/magnatunebrowser.cpp
index 0e17c98f..08644b12 100644
--- a/amarok/src/magnatunebrowser/magnatunebrowser.cpp
+++ b/amarok/src/magnatunebrowser/magnatunebrowser.cpp
@@ -52,7 +52,7 @@ MagnatuneBrowser::MagnatuneBrowser( const char *name )
initBottomPanel();
- //connect (m_listView, TQT_SIGNAL(executed(KListViewItem *)), this, TQT_SLOT(itemExecuted(KListViewItem *)));
+ //connect (m_listView, TQT_SIGNAL(executed(TDEListViewItem *)), this, TQT_SLOT(itemExecuted(TDEListViewItem *)));
connect( m_listView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
this, TQT_SLOT( itemExecuted( TQListViewItem * ) ) );
connect( m_listView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
diff --git a/amarok/src/magnatunebrowser/magnatunelistview.cpp b/amarok/src/magnatunebrowser/magnatunelistview.cpp
index 7f576e87..0bcb38bc 100644
--- a/amarok/src/magnatunebrowser/magnatunelistview.cpp
+++ b/amarok/src/magnatunebrowser/magnatunelistview.cpp
@@ -27,7 +27,7 @@
#include <tqcolor.h>
MagnatuneListView::MagnatuneListView( TQWidget * parent )
- : KListView( parent )
+ : TDEListView( parent )
{
setRootIsDecorated( true );
@@ -55,7 +55,7 @@ KURLDrag * MagnatuneListView::dragObject( )
MagnatuneTrackList tracks;
MagnatuneTrackList::iterator it;
- KListViewItem * pSelectedItem = dynamic_cast<KListViewItem *>( selectedItem() );
+ TDEListViewItem * pSelectedItem = dynamic_cast<TDEListViewItem *>( selectedItem() );
if (!pSelectedItem) {
debug() << "dynamic_cast to pSelectedItem failed!" << endl;
return 0;
diff --git a/amarok/src/magnatunebrowser/magnatunelistview.h b/amarok/src/magnatunebrowser/magnatunelistview.h
index 2a7f7391..9b39120a 100644
--- a/amarok/src/magnatunebrowser/magnatunelistview.h
+++ b/amarok/src/magnatunebrowser/magnatunelistview.h
@@ -26,12 +26,12 @@
#include <kurldrag.h>
/**
-A specialized KListView that provides drag and drop functionality
+A specialized TDEListView that provides drag and drop functionality
@author Nikolaj Hald Nielsen <[email protected]>
*/
-class MagnatuneListView : public KListView
+class MagnatuneListView : public TDEListView
{
public:
MagnatuneListView(TQWidget * parent);
diff --git a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
index df75d45d..eafe018a 100644
--- a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
+++ b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
@@ -29,10 +29,10 @@
-MagnatuneListViewArtistItem::MagnatuneListViewArtistItem( MagnatuneArtist artist, KListView * parent )
-: KListViewItem( parent ), MagnatuneArtist( artist )
+MagnatuneListViewArtistItem::MagnatuneListViewArtistItem( MagnatuneArtist artist, TDEListView * parent )
+: TDEListViewItem( parent ), MagnatuneArtist( artist )
{
- KListViewItem::setText( 0, artist.getName() );
+ TDEListViewItem::setText( 0, artist.getName() );
setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Toolbar, KIcon::SizeSmall ) );
@@ -58,7 +58,7 @@ void MagnatuneListViewArtistItem::setOpen( bool o )
}
}
listView()->setUpdatesEnabled( true );
- KListViewItem::setOpen( o );
+ TDEListViewItem::setOpen( o );
invalidateHeight();
listView()->repaintContents();
@@ -69,7 +69,7 @@ void MagnatuneListViewArtistItem::setOpen( bool o )
void MagnatuneListViewArtistItem::setup()
{
setExpandable( true );
- KListViewItem::setup();
+ TDEListViewItem::setup();
}
@@ -84,10 +84,10 @@ void MagnatuneListViewArtistItem::setup()
-MagnatuneListViewAlbumItem::MagnatuneListViewAlbumItem( MagnatuneAlbum album, KListViewItem * parent )
-: KListViewItem( parent ), MagnatuneAlbum( album )
+MagnatuneListViewAlbumItem::MagnatuneListViewAlbumItem( MagnatuneAlbum album, TDEListViewItem * parent )
+: TDEListViewItem( parent ), MagnatuneAlbum( album )
{
- KListViewItem::setText( 0, album.getName() );
+ TDEListViewItem::setText( 0, album.getName() );
setDragEnabled( true );
//setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "cdrom_unmount", KIcon::Toolbar, KIcon::SizeSmall ) );
@@ -116,7 +116,7 @@ void MagnatuneListViewAlbumItem::setOpen( bool o )
}
listView()->setUpdatesEnabled( true );
- KListViewItem::setOpen( o );
+ TDEListViewItem::setOpen( o );
invalidateHeight();
listView()->repaintContents();
@@ -126,7 +126,7 @@ void MagnatuneListViewAlbumItem::setOpen( bool o )
void MagnatuneListViewAlbumItem::setup( )
{
setExpandable( true );
- KListViewItem::setup();
+ TDEListViewItem::setup();
}
@@ -141,8 +141,8 @@ void MagnatuneListViewAlbumItem::setup( )
-MagnatuneListViewTrackItem::MagnatuneListViewTrackItem( MagnatuneTrack track, KListViewItem * parent )
-: KListViewItem( parent ), MagnatuneTrack( track )
+MagnatuneListViewTrackItem::MagnatuneListViewTrackItem( MagnatuneTrack track, TDEListViewItem * parent )
+: TDEListViewItem( parent ), MagnatuneTrack( track )
{
int trackNumber = track.getTrackNumber();
@@ -152,7 +152,7 @@ MagnatuneListViewTrackItem::MagnatuneListViewTrackItem( MagnatuneTrack track, KL
- KListViewItem::setText( 0, trackNumberString + " - " + track.getName() );
+ TDEListViewItem::setText( 0, trackNumberString + " - " + track.getName() );
debug() << "track duration: " << TQString::number( track.getDuration() ) << endl;
@@ -160,9 +160,9 @@ MagnatuneListViewTrackItem::MagnatuneListViewTrackItem( MagnatuneTrack track, KL
duration = duration.addSecs(track.getDuration());
if (duration.hour() == 0)
- KListViewItem::setText( 1, duration.toString( "m:ss" ) );
+ TDEListViewItem::setText( 1, duration.toString( "m:ss" ) );
else
- KListViewItem::setText( 1, duration.toString( "h:mm:ss" ) );
+ TDEListViewItem::setText( 1, duration.toString( "h:mm:ss" ) );
setDragEnabled( true );
diff --git a/amarok/src/magnatunebrowser/magnatunelistviewitems.h b/amarok/src/magnatunebrowser/magnatunelistviewitems.h
index 573acb67..a5a4c695 100644
--- a/amarok/src/magnatunebrowser/magnatunelistviewitems.h
+++ b/amarok/src/magnatunebrowser/magnatunelistviewitems.h
@@ -27,16 +27,16 @@
#include <klistview.h>
/**
-A specialized KListViewItem that encapsulates a MagnatuneArtist
+A specialized TDEListViewItem that encapsulates a MagnatuneArtist
@author Nikolaj Hald Nielsen <[email protected]>
*/
-class MagnatuneListViewArtistItem : public KListViewItem, public MagnatuneArtist
+class MagnatuneListViewArtistItem : public TDEListViewItem, public MagnatuneArtist
{
public:
- MagnatuneListViewArtistItem(MagnatuneArtist artist, KListView * parent);
+ MagnatuneListViewArtistItem(MagnatuneArtist artist, TDEListView * parent);
~MagnatuneListViewArtistItem();
@@ -47,15 +47,15 @@ public:
/**
-A specialized KListViewItem that encapsulates a MagnatuneAlbum
+A specialized TDEListViewItem that encapsulates a MagnatuneAlbum
@author Nikolaj Hald Nielsen <[email protected]>
*/
-class MagnatuneListViewAlbumItem : public KListViewItem, public MagnatuneAlbum
+class MagnatuneListViewAlbumItem : public TDEListViewItem, public MagnatuneAlbum
{
public:
- MagnatuneListViewAlbumItem(MagnatuneAlbum album, KListViewItem * parent);
+ MagnatuneListViewAlbumItem(MagnatuneAlbum album, TDEListViewItem * parent);
~MagnatuneListViewAlbumItem();
void setOpen( bool o );
@@ -65,15 +65,15 @@ public:
/**
-A specialized KListViewItem that encapsulates a MagnatuneTrack
+A specialized TDEListViewItem that encapsulates a MagnatuneTrack
@author Nikolaj Hald Nielsen <[email protected]>
*/
-class MagnatuneListViewTrackItem : public KListViewItem, public MagnatuneTrack
+class MagnatuneListViewTrackItem : public TDEListViewItem, public MagnatuneTrack
{
public:
- MagnatuneListViewTrackItem(MagnatuneTrack track, KListViewItem * parent);
+ MagnatuneListViewTrackItem(MagnatuneTrack track, TDEListViewItem * parent);
~MagnatuneListViewTrackItem();
};
diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp
index 5d7c1417..2d71ca00 100644
--- a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp
+++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp
@@ -40,7 +40,7 @@ void MagnatuneRedownloadDialog::setRedownloadItems( TQStringList items )
{
for ( TQStringList::Iterator it = items.begin(); it != items.end(); ++it ) {
- new KListViewItem(redownloadListView, (*it));
+ new TDEListViewItem(redownloadListView, (*it));
}
}
diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
index 7026bd58..d2f4bdef 100644
--- a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
@@ -60,7 +60,7 @@
</size>
</property>
</spacer>
- <widget class="KListView" row="1" column="0" rowspan="1" colspan="3">
+ <widget class="TDEListView" row="1" column="0" rowspan="1" colspan="3">
<column>
<property name="text">
<string>Artist - Album</string>
diff --git a/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp
index cb22052a..d98697aa 100644
--- a/amarok/src/mediabrowser.cpp
+++ b/amarok/src/mediabrowser.cpp
@@ -245,7 +245,7 @@ MediaBrowser::MediaBrowser( const char *name )
setSpacing( 4 );
m_toolbar = new Browser::ToolBar( this );
- m_toolbar->setIconText( KToolBar::IconTextRight, false );
+ m_toolbar->setIconText( TDEToolBar::IconTextRight, false );
m_toolbar->insertButton( "connect_creating", CONNECT, true, i18n("Connect") );
TQToolTip::add( m_toolbar->getButton(CONNECT), i18n( "Connect media device" ) );
@@ -258,11 +258,11 @@ MediaBrowser::MediaBrowser( const char *name )
m_toolbar->insertLineSeparator();
- // m_toolbar->setIconText( KToolBar::IconTextRight, true );
+ // m_toolbar->setIconText( TDEToolBar::IconTextRight, true );
m_toolbar->insertButton( Amarok::icon( "add_playlist" ), CUSTOM, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( customClicked() ), true, "custom" );
TQToolTip::add( m_toolbar->getButton(TRANSFER), i18n( "Transfer tracks to media device" ) );
- m_toolbar->setIconText( KToolBar::IconOnly, false );
+ m_toolbar->setIconText( TDEToolBar::IconOnly, false );
m_toolbar->insertButton( Amarok::icon( "configure" ), CONFIGURE, true, i18n("Configure") );
TQToolTip::add( m_toolbar->getButton(CONFIGURE), i18n( "Configure device" ) );
@@ -272,8 +272,8 @@ MediaBrowser::MediaBrowser( const char *name )
// searching/filtering
{ //<Search LineEdit>
- KToolBar* searchToolBar = new Browser::ToolBar( this );
- KToolBarButton *button = new KToolBarButton( "locationbar_erase", 0, searchToolBar );
+ TDEToolBar* searchToolBar = new Browser::ToolBar( this );
+ TDEToolBarButton *button = new TDEToolBarButton( "locationbar_erase", 0, searchToolBar );
m_searchEdit = new ClickLineEdit( i18n( "Enter search terms here" ), searchToolBar );
KPushButton *filterButton = new KPushButton("...", searchToolBar, "filter");
searchToolBar->setStretchableWidget( m_searchEdit );
@@ -548,7 +548,7 @@ MediaBrowser::activateDevice( int index, bool skipDummy )
currentDevice()->view()->show();
if( currentDevice()->customAction() )
{
- m_toolbar->setIconText( KToolBar::IconTextRight, false );
+ m_toolbar->setIconText( TDEToolBar::IconTextRight, false );
currentDevice()->customAction()->plug( m_toolbar );
m_toolbar->hide();
m_toolbar->show();
@@ -790,25 +790,25 @@ MediaBrowser::~MediaBrowser()
MediaItem::MediaItem( TQListView* parent )
-: KListViewItem( parent )
+: TDEListViewItem( parent )
{
init();
}
MediaItem::MediaItem( TQListViewItem* parent )
-: KListViewItem( parent )
+: TDEListViewItem( parent )
{
init();
}
MediaItem::MediaItem( TQListView* parent, TQListViewItem* after )
-: KListViewItem( parent, after )
+: TDEListViewItem( parent, after )
{
init();
}
MediaItem::MediaItem( TQListViewItem* parent, TQListViewItem* after )
-: KListViewItem( parent, after )
+: TDEListViewItem( parent, after )
{
init();
}
@@ -874,7 +874,7 @@ void MediaItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int
break;
}
- KListViewItem::paintCell( p, cg, column, width, align );
+ TDEListViewItem::paintCell( p, cg, column, width, align );
}
const MetaBundle *
@@ -1099,7 +1099,7 @@ MediaItem::compare( TQListViewItem *i, int col, bool ascending ) const
return key1.localeAwareCompare( key2 );
}
- return KListViewItem::compare(i, col, ascending);
+ return TDEListViewItem::compare(i, col, ascending);
}
class MediaItemTip : public TQToolTip
@@ -1172,7 +1172,7 @@ class MediaItemTip : public TQToolTip
MediaView::MediaView( TQWidget* parent, MediaDevice *device )
- : KListView( parent )
+ : TDEListView( parent )
, m_parent( parent )
, m_device( device )
{
@@ -1191,7 +1191,7 @@ MediaView::MediaView( TQWidget* parent, MediaDevice *device )
header()->hide();
addColumn( i18n( "Remote Media" ) );
- KActionCollection* ac = new KActionCollection( this );
+ TDEActionCollection* ac = new TDEActionCollection( this );
KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), ac, "mediabrowser_select_all" );
connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ),
@@ -1218,7 +1218,7 @@ MediaView::keyPressEvent( TQKeyEvent *e )
if( e->key() == Key_Delete )
m_device->deleteFromDevice();
else
- KListView::keyPressEvent( e );
+ TDEListView::keyPressEvent( e );
}
void
@@ -1269,7 +1269,7 @@ MediaView::dragObject()
{
KURL::List urls = nodeBuildDragList( 0 );
KMultipleDrag *md = new KMultipleDrag( viewport() );
- md->addDragObject( KListView::dragObject() );
+ md->addDragObject( TDEListView::dragObject() );
KURLDrag* ud = new KURLDrag( urls, viewport() );
md->addDragObject( ud );
md->setPixmap( CollectionDB::createDragPixmap( urls ),
@@ -1477,7 +1477,7 @@ MediaView::contentsDropEvent( TQDropEvent *e )
void
MediaView::viewportPaintEvent( TQPaintEvent *e )
{
- KListView::viewportPaintEvent( e );
+ TDEListView::viewportPaintEvent( e );
// Superimpose bubble help:
@@ -2402,7 +2402,7 @@ MediaQueue::dragObject()
}
KMultipleDrag *md = new KMultipleDrag( viewport() );
- TQDragObject *d = KListView::dragObject();
+ TQDragObject *d = TDEListView::dragObject();
KURLDrag* urldrag = new KURLDrag( urls, viewport() );
md->addDragObject( d );
md->addDragObject( urldrag );
@@ -3600,7 +3600,7 @@ MediaDevice::isPreferredFormat( const MetaBundle &bundle )
MediaQueue::MediaQueue(MediaBrowser *parent)
- : KListView( parent ), m_parent( parent )
+ : TDEListView( parent ), m_parent( parent )
{
setFixedHeight( 200 );
setSelectionMode( TQListView::Extended );
@@ -3618,7 +3618,7 @@ MediaQueue::MediaQueue(MediaBrowser *parent)
itemCountChanged();
- KActionCollection* ac = new KActionCollection( this );
+ TDEActionCollection* ac = new TDEActionCollection( this );
KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), ac, "MediaQueue" );
connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ),
@@ -3761,7 +3761,7 @@ MediaQueue::keyPressEvent( TQKeyEvent *e )
if( e->key() == Key_Delete )
removeSelected();
else
- KListView::keyPressEvent( e );
+ TDEListView::keyPressEvent( e );
}
void
@@ -3779,7 +3779,7 @@ MediaQueue::slotShowContextMenu( TQListViewItem* item, const TQPoint& point, int
if( !childCount() )
return;
- KPopupMenu menu( this );
+ TDEPopupMenu menu( this );
enum Actions { REMOVE_SELECTED, CLEAR_ALL, START_TRANSFER };
diff --git a/amarok/src/mediabrowser.h b/amarok/src/mediabrowser.h
index d2cdae95..a50657d9 100644
--- a/amarok/src/mediabrowser.h
+++ b/amarok/src/mediabrowser.h
@@ -32,7 +32,7 @@ class MediaView;
class SpaceLabel;
class TransferDialog;
-class KAction;
+class TDEAction;
class KComboBox;
class KDialogBase;
class KProgress;
@@ -43,7 +43,7 @@ class TQDragObject;
class TQLabel;
class TQPalette;
-class LIBAMAROK_EXPORT MediaItem : public KListViewItem
+class LIBAMAROK_EXPORT MediaItem : public TDEListViewItem
{
public:
MediaItem( TQListView* parent );
@@ -122,7 +122,7 @@ class LIBAMAROK_EXPORT MediaItem : public KListViewItem
mutable MetaBundle *m_bundle;
};
-class MediaQueue : public KListView, public DropProxyTarget
+class MediaQueue : public TDEListView, public DropProxyTarget
{
Q_OBJECT
@@ -150,7 +150,7 @@ class MediaQueue : public KListView, public DropProxyTarget
void URLsAdded(); // call after finishing adding single urls
void dropProxyEvent( TQDropEvent *e );
- // Reimplemented from KListView
+ // Reimplemented from TDEListView
bool acceptDrag( TQDropEvent *e ) const;
TQDragObject *dragObject();
@@ -208,7 +208,7 @@ class MediaBrowser : public TQVBox
bool isQuitting() const { return m_quitting; }
KURL getProxyUrl( const KURL& daapUrl ) const;
- KToolBar* getToolBar() const { return m_toolbar; }
+ TDEToolBar* getToolBar() const { return m_toolbar; }
signals:
void availabilityChanged( bool isAvailable );
@@ -277,7 +277,7 @@ class MediaBrowser : public TQVBox
bool m_quitting;
};
-class MediaView : public KListView
+class MediaView : public TDEListView
{
Q_OBJECT
@@ -309,7 +309,7 @@ class MediaView : public KListView
private:
void keyPressEvent( TQKeyEvent *e );
- // Reimplemented from KListView
+ // Reimplemented from TDEListView
void contentsDropEvent( TQDropEvent *e );
void viewportPaintEvent( TQPaintEvent* );
bool acceptDrag( TQDropEvent *e ) const;
@@ -351,9 +351,9 @@ class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin
MediaView *view();
/**
- * @retrun a KAction that will be plugged into the media device browser toolbar
+ * @retrun a TDEAction that will be plugged into the media device browser toolbar
*/
- virtual KAction *customAction() { return 0; }
+ virtual TDEAction *customAction() { return 0; }
virtual void rmbPressed( TQListViewItem *item, const TQPoint &point, int ) { (void)item; (void) point; }
diff --git a/amarok/src/mediadevice/daap/daapclient.cpp b/amarok/src/mediadevice/daap/daapclient.cpp
index e3ed8011..90ada7e7 100644
--- a/amarok/src/mediadevice/daap/daapclient.cpp
+++ b/amarok/src/mediadevice/daap/daapclient.cpp
@@ -80,13 +80,13 @@ DEBUG_BLOCK
m_customButton = true;
m_transfer = false;
- KToolBar *toolbar = MediaBrowser::instance()->getToolBar();
- KToolBarButton *customButton = toolbar->getButton( MediaBrowser::CUSTOM );
+ TDEToolBar *toolbar = MediaBrowser::instance()->getToolBar();
+ TDEToolBarButton *customButton = toolbar->getButton( MediaBrowser::CUSTOM );
customButton->setText( i18n("Add computer") );
toolbar = CollectionBrowser::instance()->getToolBar();
- toolbar->setIconText( KToolBar::IconTextRight, false );
- m_broadcastButton = new KToolBarButton( "connect_creating", 0, toolbar, "broadcast_button",
+ toolbar->setIconText( TDEToolBar::IconTextRight, false );
+ m_broadcastButton = new TDEToolBarButton( "connect_creating", 0, toolbar, "broadcast_button",
i18n("Share My Music") );
m_broadcastButton->setToggle( true );
@@ -236,7 +236,7 @@ DaapClient::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int )
KURL::List urls;
- KPopupMenu menu( m_view );
+ TDEPopupMenu menu( m_view );
switch( item->type() )
{
case MediaItem::DIRECTORY:
diff --git a/amarok/src/mediadevice/daap/daapclient.h b/amarok/src/mediadevice/daap/daapclient.h
index c7140396..3d85c5d9 100644
--- a/amarok/src/mediadevice/daap/daapclient.h
+++ b/amarok/src/mediadevice/daap/daapclient.h
@@ -120,7 +120,7 @@ class DaapClient : public MediaDevice
TQCheckBox *m_removeDuplicatesCheckBox;
bool m_broadcastServer;
bool m_removeDuplicates;
- KToolBarButton *m_broadcastButton;
+ TDEToolBarButton *m_broadcastButton;
// if set to true, we don't display items that the user already has in the collection
bool m_hideMusicOwned;
diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp
index 1d5c2d9e..5520c75e 100644
--- a/amarok/src/mediadevice/generic/genericmediadevice.cpp
+++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp
@@ -938,7 +938,7 @@ GenericMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int
MediaItem *item = static_cast<MediaItem *>(qitem);
if ( item )
{
- KPopupMenu menu( m_view );
+ TDEPopupMenu menu( m_view );
menu.insertItem( SmallIconSet( Amarok::icon( "playlist" ) ), i18n( "&Load" ), LOAD );
menu.insertItem( SmallIconSet( Amarok::icon( "1downarrow" ) ), i18n( "&Append to Playlist" ), APPEND );
menu.insertItem( SmallIconSet( Amarok::icon( "fastforward" ) ), i18n( "&Queue Tracks" ), QUEUE );
@@ -1009,7 +1009,7 @@ GenericMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int
if( isConnected() )
{
- KPopupMenu menu( m_view );
+ TDEPopupMenu menu( m_view );
menu.insertItem( SmallIconSet( Amarok::icon( "folder" ) ), i18n("Add Directory" ), DIRECTORY );
if ( MediaBrowser::queue()->childCount())
{
diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
index a14bf31f..8cd04c32 100644
--- a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
+++ b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
@@ -649,7 +649,7 @@ IfpMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int )
MediaItem *item = static_cast<MediaItem *>(qitem);
if ( item )
{
- KPopupMenu menu( m_view );
+ TDEPopupMenu menu( m_view );
menu.insertItem( SmallIconSet( Amarok::icon( "collection" ) ), i18n( "Download" ), DOWNLOAD );
menu.insertSeparator();
menu.insertItem( SmallIconSet( Amarok::icon( "folder" ) ), i18n("Add Directory" ), DIRECTORY );
@@ -683,7 +683,7 @@ IfpMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int )
if( isConnected() )
{
- KPopupMenu menu( m_view );
+ TDEPopupMenu menu( m_view );
menu.insertItem( SmallIconSet( Amarok::icon( "folder" ) ), i18n("Add Directory" ), DIRECTORY );
int id = menu.exec( point );
switch( id )
diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
index ef019848..81f74f2e 100644
--- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
+++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
@@ -277,17 +277,17 @@ IpodMediaDevice::IpodMediaDevice()
m_syncStatsCheck = 0;
m_autoDeletePodcastsCheck = 0;
- KActionCollection *ac = new KActionCollection( this );
- KActionMenu *am = new KActionMenu( i18n( "iPod" ), Amarok::icon( "device" ), ac );
+ TDEActionCollection *ac = new TDEActionCollection( this );
+ TDEActionMenu *am = new TDEActionMenu( i18n( "iPod" ), Amarok::icon( "device" ), ac );
m_customAction = am;
m_customAction->setEnabled( false );
am->setDelayed( false );
- KPopupMenu *menu = am->popupMenu();
+ TDEPopupMenu *menu = am->popupMenu();
connect( menu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotIpodAction(int)) );
menu->insertItem( i18n( "Stale and Orphaned" ), CHECK_INTEGRITY );
menu->insertItem( i18n( "Update Artwork" ), UPDATE_ARTWORK );
- KPopupMenu *ipodGen = new KPopupMenu( menu );
+ TDEPopupMenu *ipodGen = new TDEPopupMenu( menu );
menu->insertItem( i18n( "Set iPod Model" ), ipodGen );
const Itdb_IpodInfo *table = itdb_info_get_ipod_info_table();
if( !table )
@@ -299,7 +299,7 @@ IpodMediaDevice::IpodMediaDevice()
{
const Itdb_IpodInfo *info = table;
infoFound = false;
- KPopupMenu *gen = 0;
+ TDEPopupMenu *gen = 0;
int index = SET_IPOD_MODEL;
while( info->model_number )
{
@@ -308,7 +308,7 @@ IpodMediaDevice::IpodMediaDevice()
if (!infoFound)
{
infoFound = true;
- gen = new KPopupMenu( ipodGen );
+ gen = new TDEPopupMenu( ipodGen );
connect( gen, TQT_SIGNAL(activated(int)), TQT_SLOT(slotIpodAction(int)) );
ipodGen->insertItem(
itdb_info_get_ipod_generation_string( info->ipod_generation),
@@ -2231,7 +2231,7 @@ IpodMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int )
bool locked = m_mutex.locked();
KURL::List urls = m_view->nodeBuildDragList( 0 );
- KPopupMenu menu( m_view );
+ TDEPopupMenu menu( m_view );
enum Actions { CREATE_PLAYLIST, APPEND, LOAD, QUEUE,
COPY_TO_COLLECTION,
@@ -2241,7 +2241,7 @@ IpodMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int )
DELETE_PLAYED, DELETE_FROM_IPOD, REMOVE_FROM_PLAYLIST,
FIRST_PLAYLIST};
- KPopupMenu *playlistsMenu = 0;
+ TDEPopupMenu *playlistsMenu = 0;
if ( item )
{
if( item->type() == MediaItem::PLAYLISTSROOT )
@@ -2303,7 +2303,7 @@ IpodMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int )
menu.insertItem( SmallIconSet( Amarok::icon( "playlist" ) ), i18n( "Make Media Device Playlist" ), MAKE_PLAYLIST );
menu.setItemEnabled( MAKE_PLAYLIST, !locked );
- playlistsMenu = new KPopupMenu(&menu);
+ playlistsMenu = new TDEPopupMenu(&menu);
int i=0;
for(MediaItem *it = dynamic_cast<MediaItem *>(m_playlistItem->firstChild());
it;
diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.h b/amarok/src/mediadevice/ipod/ipodmediadevice.h
index 3eb8fec8..eafcaa08 100644
--- a/amarok/src/mediadevice/ipod/ipodmediadevice.h
+++ b/amarok/src/mediadevice/ipod/ipodmediadevice.h
@@ -43,7 +43,7 @@ class TQLabel;
class TQLineEdit;
class TQFile;
-class KAction;
+class TDEAction;
class IpodMediaItem;
class PodcastInfo;
@@ -70,7 +70,7 @@ class IpodMediaDevice : public MediaDevice
virtual void loadConfig();
virtual MediaItem*tagsChanged( MediaItem *item, const MetaBundle &bundle );
- virtual KAction *customAction() { return m_customAction; }
+ virtual TDEAction *customAction() { return m_customAction; }
protected:
MediaItem *trackExists( const MetaBundle& bundle );
@@ -167,7 +167,7 @@ class IpodMediaDevice : public MediaDevice
TQFile *m_lockFile;
TQMutex m_mutex;
- KAction *m_customAction;
+ TDEAction *m_customAction;
enum { CHECK_INTEGRITY, UPDATE_ARTWORK, SET_IPOD_MODEL };
private slots:
diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
index 562c0260..b6235db5 100644
--- a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
+++ b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
@@ -75,7 +75,7 @@ MtpMediaDevice::MtpMediaDevice() : MediaDevice()
m_customButton = true;
m_transfer = true;
- KToolBarButton *customButton = MediaBrowser::instance()->getToolBar()->getButton( MediaBrowser::CUSTOM );
+ TDEToolBarButton *customButton = MediaBrowser::instance()->getToolBar()->getButton( MediaBrowser::CUSTOM );
customButton->setText( i18n("Special device functions") );
TQToolTip::remove( customButton );
TQToolTip::add( customButton, i18n( "Special functions of your device" ) );
@@ -1294,7 +1294,7 @@ MtpMediaDevice::rmbPressed( TQListViewItem *qitem, const TQPoint &point, int )
MtpMediaItem *item = static_cast<MtpMediaItem *>( qitem );
if( item )
{
- KPopupMenu menu( m_view );
+ TDEPopupMenu menu( m_view );
switch( item->type() )
{
case MediaItem::ARTIST:
diff --git a/amarok/src/mediadevice/njb/njbmediadevice.cpp b/amarok/src/mediadevice/njb/njbmediadevice.cpp
index 5aab72d4..905330b3 100644
--- a/amarok/src/mediadevice/njb/njbmediadevice.cpp
+++ b/amarok/src/mediadevice/njb/njbmediadevice.cpp
@@ -86,7 +86,7 @@ NjbMediaDevice::NjbMediaDevice(): MediaDevice()
m_customButton = true;
m_td = 0;
NJB_Set_Debug(0); // or try DD_SUBTRACE
- KToolBarButton* customButton = MediaBrowser::instance()->getToolBar()->getButton( MediaBrowser::CUSTOM );
+ TDEToolBarButton* customButton = MediaBrowser::instance()->getToolBar()->getButton( MediaBrowser::CUSTOM );
customButton->setText( i18n("Special device functions") );
TQToolTip::remove( customButton );
TQToolTip::add( customButton, i18n( "Special functions of your jukebox" ) );
@@ -635,7 +635,7 @@ NjbMediaDevice::rmbPressed(TQListViewItem* qitem, const TQPoint& point, int )
NjbMediaItem *item = static_cast<NjbMediaItem *>(qitem);
if ( item )
{
- KPopupMenu menu( m_view);
+ TDEPopupMenu menu( m_view);
menu.insertItem( SmallIconSet( Amarok::icon( "collection" ) ), i18n("Download file"), DOWNLOAD );
menu.insertItem( SmallIconSet( Amarok::icon( "collection" ) ), i18n("Download to collection"), DOWNLOAD_TO_COLLECTION );
menu.insertSeparator();
diff --git a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
index c43e0c8f..b0fabc71 100644
--- a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
+++ b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
@@ -390,7 +390,7 @@ RioKarmaMediaDevice::rmbPressed( TQListViewItem *qitem, const TQPoint &point, in
RioKarmaMediaItem *item = static_cast<RioKarmaMediaItem *>( qitem );
if( item )
{
- KPopupMenu menu( m_view );
+ TDEPopupMenu menu( m_view );
menu.insertItem( SmallIconSet( Amarok::icon( "remove" ) ), i18n( "Delete from device" ), DELETE );
int id = menu.exec( point );
diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp
index 9f8a5013..c275339d 100644
--- a/amarok/src/multitabbar.cpp
+++ b/amarok/src/multitabbar.cpp
@@ -172,7 +172,7 @@ void MultiTabBarInternal::contentsMousePressEvent( TQMouseEvent *ev )
void MultiTabBarInternal::showTabSelectionMenu(TQPoint pos)
{
- KPopupMenu popup;
+ TDEPopupMenu popup;
popup.insertTitle( i18n("Browsers") , /*id*/ -1, /*index*/ 1 );
popup.setCheckable( true );
for( uint i = 0; i < m_tabs.count(); i++ ) {
@@ -1177,7 +1177,7 @@ MultiTabBar::~MultiTabBar()
/*int MultiTabBar::insertButton(TQPixmap pic,int id ,const TQString&)
{
-(new KToolbarButton(pic,id,m_internal))->show();
+(new TDEToolbarButton(pic,id,m_internal))->show();
return 0;
}*/
diff --git a/amarok/src/mydiroperator.cpp b/amarok/src/mydiroperator.cpp
index 3e353f5b..46112215 100644
--- a/amarok/src/mydiroperator.cpp
+++ b/amarok/src/mydiroperator.cpp
@@ -35,10 +35,10 @@ MyDirOperator::myCdUp()
void
MyDirOperator::reenableDeleteKey()
{
- KActionCollection* dirActionCollection = static_cast<KActionCollection*>(KDirOperator::child("KDirOperator::myActionCollection"));
+ TDEActionCollection* dirActionCollection = static_cast<TDEActionCollection*>(KDirOperator::child("KDirOperator::myActionCollection"));
if( dirActionCollection )
{
- KAction* trash = dirActionCollection->action("trash");
+ TDEAction* trash = dirActionCollection->action("trash");
if(trash)
trash->setEnabled(false);
}
diff --git a/amarok/src/mydiroperator.h b/amarok/src/mydiroperator.h
index a92b088b..8ac2462b 100644
--- a/amarok/src/mydiroperator.h
+++ b/amarok/src/mydiroperator.h
@@ -22,7 +22,7 @@ class MyDirOperator : public KDirOperator {
virtual void activatedMenu (const KFileItem *, const TQPoint &pos) {
updateSelectionDependentActions();
reenableDeleteKey();
- static_cast<KActionMenu*>(actionCollection()->action("popupMenu"))->popupMenu()->popup( pos );
+ static_cast<TDEActionMenu*>(actionCollection()->action("popupMenu"))->popupMenu()->popup( pos );
}
void myHome();
void myCdUp();
diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp
index 3bbd14f3..6b8ad9a7 100644
--- a/amarok/src/playerwindow.cpp
+++ b/amarok/src/playerwindow.cpp
@@ -130,7 +130,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl
//NOTE we use a layout for the buttons so resizing will be possible
m_pFrameButtons = createWidget<TQHBox>( TQRect(0, 118, 311, 22), this );
- KActionCollection *ac =Amarok::actionCollection();
+ TDEActionCollection *ac =Amarok::actionCollection();
//FIXME change the names of the icons to reflect kde names so we can fall back to them if necessary
new NavButton( m_pFrameButtons, "prev", ac->action( "prev" ) );
@@ -849,7 +849,7 @@ void PlayerWidget::slotShowEqualizer( bool show ) //SLOT
#include <kiconeffect.h>
#include <kimageeffect.h>
-NavButton::NavButton( TQWidget *parent, const TQString &icon, KAction *action )
+NavButton::NavButton( TQWidget *parent, const TQString &icon, TDEAction *action )
: TQToolButton( parent )
, m_glowIndex( 0 )
{
diff --git a/amarok/src/playerwindow.h b/amarok/src/playerwindow.h
index 879560e2..cc16274c 100644
--- a/amarok/src/playerwindow.h
+++ b/amarok/src/playerwindow.h
@@ -26,7 +26,7 @@
#include "engineobserver.h" //baseclass
namespace Amarok { class PrettySlider; }
-class KAction;
+class TDEAction;
class MetaBundle;
class PlayerWidget;
class TQBitmap;
@@ -41,7 +41,7 @@ class TQTimerEvent;
class NavButton : public TQToolButton //no TQOBJECT macro - why bother?
{
public:
- NavButton( TQWidget*, const TQString&, KAction* );
+ NavButton( TQWidget*, const TQString&, TDEAction* );
protected:
void timerEvent( TQTimerEvent* );
diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp
index 0c01c1de..633d2606 100644
--- a/amarok/src/playlist.cpp
+++ b/amarok/src/playlist.cpp
@@ -164,7 +164,7 @@ TQMutex* Playlist::s_dynamicADTMutex = new TQMutex();
Playlist *Playlist::s_instance = 0;
Playlist::Playlist( TQWidget *parent )
- : KListView( parent, "ThePlaylist" )
+ : TDEListView( parent, "ThePlaylist" )
, EngineObserver( EngineController::instance() )
, m_startupTime_t( TQDateTime::currentDateTime().toTime_t() )
, m_oldestTime_t( CollectionDB::instance()->query( "SELECT MIN( createdate ) FROM statistics;" ).first().toInt() )
@@ -319,26 +319,26 @@ Playlist::Playlist( TQWidget *parent )
connect( &Glow::timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotGlowTimer()) );
- KActionCollection* const ac = Amarok::actionCollection();
- KAction *copy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( copyToClipboard() ), ac, "playlist_copy" );
+ TDEActionCollection* const ac = Amarok::actionCollection();
+ TDEAction *copy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( copyToClipboard() ), ac, "playlist_copy" );
KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), ac, "playlist_select_all" );
- m_clearButton = new KAction( i18n( "clear playlist", "&Clear" ), Amarok::icon( "playlist_clear" ), 0, TQT_TQOBJECT(this), TQT_SLOT( clear() ), ac, "playlist_clear" );
+ m_clearButton = new TDEAction( i18n( "clear playlist", "&Clear" ), Amarok::icon( "playlist_clear" ), 0, TQT_TQOBJECT(this), TQT_SLOT( clear() ), ac, "playlist_clear" );
m_undoButton = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT( undo() ), ac, "playlist_undo" );
m_redoButton = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT( redo() ), ac, "playlist_redo" );
m_undoButton ->setIcon( Amarok::icon( "undo" ) );
m_redoButton ->setIcon( Amarok::icon( "redo" ) );
- new KAction( i18n( "&Repopulate" ), Amarok::icon( "playlist_refresh" ), 0, TQT_TQOBJECT(this), TQT_SLOT( repopulate() ), ac, "repopulate" );
- new KAction( i18n( "S&huffle" ), "rebuild", CTRL+Key_H, TQT_TQOBJECT(this), TQT_SLOT( shuffle() ), ac, "playlist_shuffle" );
- KAction *gotoCurrent = new KAction( i18n( "&Go To Current Track" ), Amarok::icon( "music" ), CTRL+Key_J, TQT_TQOBJECT(this), TQT_SLOT( showCurrentTrack() ), ac, "playlist_show" );
- new KAction( i18n( "&Remove Duplicate && Dead Entries" ), 0, TQT_TQOBJECT(this), TQT_SLOT( removeDuplicates() ), ac, "playlist_remove_duplicates" );
- new KAction( i18n( "&Queue Selected Tracks" ), Amarok::icon( "queue_track" ), CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT( queueSelected() ), ac, "queue_selected" );
- KToggleAction *stopafter = new KToggleAction( i18n( "&Stop Playing After Track" ), Amarok::icon( "stop" ), CTRL+ALT+Key_V,
+ new TDEAction( i18n( "&Repopulate" ), Amarok::icon( "playlist_refresh" ), 0, TQT_TQOBJECT(this), TQT_SLOT( repopulate() ), ac, "repopulate" );
+ new TDEAction( i18n( "S&huffle" ), "rebuild", CTRL+Key_H, TQT_TQOBJECT(this), TQT_SLOT( shuffle() ), ac, "playlist_shuffle" );
+ TDEAction *gotoCurrent = new TDEAction( i18n( "&Go To Current Track" ), Amarok::icon( "music" ), CTRL+Key_J, TQT_TQOBJECT(this), TQT_SLOT( showCurrentTrack() ), ac, "playlist_show" );
+ new TDEAction( i18n( "&Remove Duplicate && Dead Entries" ), 0, TQT_TQOBJECT(this), TQT_SLOT( removeDuplicates() ), ac, "playlist_remove_duplicates" );
+ new TDEAction( i18n( "&Queue Selected Tracks" ), Amarok::icon( "queue_track" ), CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT( queueSelected() ), ac, "queue_selected" );
+ TDEToggleAction *stopafter = new TDEToggleAction( i18n( "&Stop Playing After Track" ), Amarok::icon( "stop" ), CTRL+ALT+Key_V,
TQT_TQOBJECT(this), TQT_SLOT( toggleStopAfterCurrentItem() ), ac, "stop_after" );
- { // KAction idiocy -- shortcuts don't work until they've been plugged into a menu
- KPopupMenu asdf;
+ { // TDEAction idiocy -- shortcuts don't work until they've been plugged into a menu
+ TDEPopupMenu asdf;
copy->plug( &asdf );
stopafter->plug( &asdf );
@@ -372,7 +372,7 @@ Playlist::Playlist( TQWidget *parent )
restoreLayout( TDEGlobal::config(), "PlaylistColumnsLayout" );
// Sorting must be disabled when current.xml is being loaded. See BUG 113042
- KListView::setSorting( NO_SORT ); //use base so we don't saveUndoState() too
+ TDEListView::setSorting( NO_SORT ); //use base so we don't saveUndoState() too
setDynamicMode( 0 );
@@ -2100,7 +2100,7 @@ Playlist::engineStateChanged( Engine::State state, Engine::State /*oldState*/ )
////////////////////////////////////////////////////////////////////////////////
-/// KListView Reimplementation
+/// TDEListView Reimplementation
////////////////////////////////////////////////////////////////////////////////
void
@@ -2165,7 +2165,7 @@ Playlist::clear() //SLOT
void
Playlist::safeClear()
{
- /* 3.3.5 and 3.3.6 have bad KListView::clear() functions.
+ /* 3.3.5 and 3.3.6 have bad TDEListView::clear() functions.
3.3.5 forgets to clear the pointer to the highlighted item.
3.3.6 forgets to clear the pointer to the last dragged item */
if ( strcmp( tqVersion(), "3.3.5" ) == 0
@@ -2187,7 +2187,7 @@ Playlist::safeClear()
triggerUpdate();
}
else
- KListView::clear();
+ TDEListView::clear();
}
void
@@ -2200,14 +2200,14 @@ Playlist::setSorting( int col, bool b )
//to figure out...at least right now
if( !dynamicMode() )
- KListView::setSorting( col, b );
+ TDEListView::setSorting( col, b );
}
void
Playlist::setColumnWidth( int col, int width )
{
- KListView::setColumnWidth( col, width );
+ TDEListView::setColumnWidth( col, width );
//FIXME this is because TQt doesn't by default disable resizing width 0 columns. GRRR!
//NOTE default column sizes are stored in default amarokrc so that restoreLayout() in ctor will
@@ -2256,7 +2256,7 @@ Playlist::rename( TQListViewItem *item, int column ) //SLOT
item->setSelected( true );
}
setCurrentItem( item );
- KListView::rename( item, column );
+ TDEListView::rename( item, column );
m_renameItem = item;
m_renameColumn = column;
@@ -2369,7 +2369,7 @@ Playlist::paletteChange( const TQPalette &p )
b = fg.blue();
}
- KListView::paletteChange( p );
+ TDEListView::paletteChange( p );
counter = 0; // reset the counter or apparently the text lacks contrast
slotGlowTimer(); // repaint currentTrack marker
@@ -2526,7 +2526,7 @@ Playlist::dragObject()
void
Playlist::viewportPaintEvent( TQPaintEvent *e )
{
- if( e ) KListView::viewportPaintEvent( e ); //we call with 0 in contentsDropEvent()
+ if( e ) TDEListView::viewportPaintEvent( e ); //we call with 0 in contentsDropEvent()
if ( m_marker ) {
TQPainter p( viewport() );
@@ -2582,7 +2582,7 @@ void
Playlist::viewportResizeEvent( TQResizeEvent *e )
{
if ( !m_smartResizing ) {
- KListView::viewportResizeEvent( e );
+ TDEListView::viewportResizeEvent( e );
return;
}
//only be clever with the sizing if there is not many items
@@ -2735,11 +2735,11 @@ Playlist::eventFilter( TQObject *o, TQEvent *e )
const int mouseOverColumn = header()->sectionAt( me->pos().x() );
- KPopupMenu popup;
+ TDEPopupMenu popup;
if( mouseOverColumn >= 0 )
popup.insertItem( i18n("&Hide %1").arg( columnText( mouseOverColumn ) ), HIDE ); //TODO
- KPopupMenu sub;
+ TDEPopupMenu sub;
for( int i = 0; i < columns(); ++i ) //columns() references a property
if( !columnWidth( i ) )
sub.insertItem( columnText( i ), i, i + 1 );
@@ -2967,7 +2967,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e )
}
//allow the header to process this
- return KListView::eventFilter( o, e );
+ return TDEListView::eventFilter( o, e );
#undef me
#undef ke
@@ -3295,8 +3295,8 @@ Playlist::disableDynamicMode() //SLOT
setDynamicMode( 0 );
AmarokConfig::setRandomMode( m_oldRandom );
AmarokConfig::setRepeat( m_oldRepeat );
- static_cast<KSelectAction*>(Amarok::actionCollection()->action( "random_mode" ))->setCurrentItem( m_oldRandom );
- static_cast<KSelectAction*>(Amarok::actionCollection()->action( "repeat" ))->setCurrentItem( m_oldRepeat );
+ static_cast<TDESelectAction*>(Amarok::actionCollection()->action( "random_mode" ))->setCurrentItem( m_oldRandom );
+ static_cast<TDESelectAction*>(Amarok::actionCollection()->action( "repeat" ))->setCurrentItem( m_oldRepeat );
}
void
@@ -3566,7 +3566,7 @@ Playlist::adjustColumn( int n )
else if( n == PlaylistItem::Mood )
setColumnWidth( n, 120 );
else
- KListView::adjustColumn( n );
+ TDEListView::adjustColumn( n );
}
void
@@ -3766,7 +3766,7 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S
enum { REPOPULATE, ENABLEDYNAMIC };
if( item == 0 )
{
- KPopupMenu popup;
+ TDEPopupMenu popup;
Amarok::actionCollection()->action("playlist_save")->plug( &popup );
Amarok::actionCollection()->action("playlist_clear")->plug( &popup );
DynamicMode *m = 0;
@@ -3816,7 +3816,7 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S
if( isCurrent && isLastFm )
{
- KActionCollection *ac = Amarok::actionCollection();
+ TDEActionCollection *ac = Amarok::actionCollection();
if( ac->action( "skip" ) ) ac->action( "skip" )->plug( &popup );
if( ac->action( "love" ) ) ac->action( "love" )->plug( &popup );
if( ac->action( "ban" ) ) ac->action( "ban" )->plug( &popup );
@@ -3874,7 +3874,7 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S
if( itemCount == 1 )
{
Amarok::actionCollection()->action( "stop_after" )->plug( &popup );
- dynamic_cast<KToggleAction *>( Amarok::actionCollection()->action( "stop_after" ) )->setChecked( m_stopAfterTrack == item );
+ dynamic_cast<TDEToggleAction *>( Amarok::actionCollection()->action( "stop_after" ) )->setChecked( m_stopAfterTrack == item );
}
if( isCurrent && itemCount == 1 )
@@ -3895,7 +3895,7 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S
popup.insertSeparator();
- KPopupMenu fileMenu;
+ TDEPopupMenu fileMenu;
if( CollectionDB::instance()->isDirInCollection( item->url().directory() ) )
{
fileMenu.insertItem( SmallIconSet( "filesaveas" ), i18n("&Organize File...", "&Organize %n Files...", itemCount), ORGANIZE );
@@ -3941,12 +3941,12 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S
TQValueList<TQString> submenuTexts = m_customSubmenuItem.keys();
for( TQValueList<TQString>::Iterator keyIt =submenuTexts.begin(); keyIt != submenuTexts.end(); ++keyIt )
{
- KPopupMenu* menu;
+ TDEPopupMenu* menu;
if( (*keyIt) == "root")
menu = &popup;
else
{
- menu = new KPopupMenu();
+ menu = new TDEPopupMenu();
popup.insertItem( *keyIt, menu);
}
foreach(m_customSubmenuItem[*keyIt])
@@ -4096,7 +4096,7 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S
case REPEAT:
// FIXME HACK Accessing AmarokConfig::Enum* yields compile errors with GCC 3.3.
- static_cast<KSelectAction*>( Amarok::actionCollection()->action( "repeat" ) )
+ static_cast<TDESelectAction*>( Amarok::actionCollection()->action( "repeat" ) )
->setCurrentItem( Amarok::repeatTrack()
? 0 /*AmarokConfig::EnumRepeat::Off*/
: 1 /*AmarokConfig::EnumRepeat::Track*/ );
@@ -4141,7 +4141,7 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S
void
Playlist::fontChange( const TQFont &old )
{
- KListView::fontChange( old );
+ TDEListView::fontChange( old );
initStarPixmaps();
triggerUpdate();
}
@@ -4150,7 +4150,7 @@ void
Playlist::contentsMouseMoveEvent( TQMouseEvent *e )
{
if( e )
- KListView::contentsMouseMoveEvent( e );
+ TDEListView::contentsMouseMoveEvent( e );
PlaylistItem *prev = m_hoveredRating;
const TQPoint pos = e ? e->pos() : viewportToContents( viewport()->mapFromGlobal( TQCursor::pos() ) );
@@ -4176,7 +4176,7 @@ Playlist::contentsMouseMoveEvent( TQMouseEvent *e )
void Playlist::leaveEvent( TQEvent *e )
{
- KListView::leaveEvent( e );
+ TDEListView::leaveEvent( e );
PlaylistItem *prev = m_hoveredRating;
m_hoveredRating = 0;
@@ -4205,7 +4205,7 @@ void Playlist::contentsMousePressEvent( TQMouseEvent *e )
CollectionDB::instance()->setSongRating( item->url().path(), rating, true );
}
else
- KListView::contentsMousePressEvent( e );
+ TDEListView::contentsMousePressEvent( e );
}
void Playlist::contentsWheelEvent( TQWheelEvent *e )
@@ -4238,7 +4238,7 @@ void Playlist::contentsWheelEvent( TQWheelEvent *e )
changed.at(i)->update();
}
else
- KListView::contentsWheelEvent( e );
+ TDEListView::contentsWheelEvent( e );
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/amarok/src/playlist.h b/amarok/src/playlist.h
index 710f129a..9ed7d8ab 100644
--- a/amarok/src/playlist.h
+++ b/amarok/src/playlist.h
@@ -39,8 +39,8 @@
#include <tqstringlist.h> //stack allocated
#include <vector> //stack allocated
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
class PlaylistItem;
class PlaylistEntry;
class PlaylistLoader;
@@ -55,7 +55,7 @@ class Medium;
/**
* @authors Mark Kretschmann && Max Howell
*
- * Playlist inherits KListView privately and thus is no longer a ListView
+ * Playlist inherits TDEListView privately and thus is no longer a ListView
* Instead it is a part of PlaylistWindow and they interact in harmony. The change
* was necessary as it is too dangerous to allow public access to PlaylistItems
* due to the multi-threading environment.
@@ -76,7 +76,7 @@ class Medium;
// AtomicString Index<KURL>::fieldString(const KURL &field);
-class Playlist : private KListView, public EngineObserver, public Amarok::ToolTipClient
+class Playlist : private TDEListView, public EngineObserver, public Amarok::ToolTipClient
{
Q_OBJECT
@@ -151,18 +151,18 @@ class Playlist : private KListView, public EngineObserver, public Amarok::ToolTi
void customMenuClicked ( int id );
bool removeCustomMenuItem( const TQString &submenu, const TQString &itemTitle );
- void setFont( const TQFont &f ) { KListView::setFont( f ); } //made public for convenience
- void unsetFont() { KListView::unsetFont(); }
+ void setFont( const TQFont &f ) { TDEListView::setFont( f ); } //made public for convenience
+ void unsetFont() { TDEListView::unsetFont(); }
- PlaylistItem *firstChild() const { return static_cast<PlaylistItem*>( KListView::firstChild() ); }
- PlaylistItem *lastItem() const { return static_cast<PlaylistItem*>( KListView::lastItem() ); }
- PlaylistItem *currentItem() const { return static_cast<PlaylistItem*>( KListView::currentItem() ); }
+ PlaylistItem *firstChild() const { return static_cast<PlaylistItem*>( TDEListView::firstChild() ); }
+ PlaylistItem *lastItem() const { return static_cast<PlaylistItem*>( TDEListView::lastItem() ); }
+ PlaylistItem *currentItem() const { return static_cast<PlaylistItem*>( TDEListView::currentItem() ); }
int numVisibleColumns() const;
TQValueList<int> visibleColumns() const;
MetaBundle::ColumnMask getVisibleColumnMask() const;
int mapToLogicalColumn( int physical ) const; // Converts physical PlaylistItem column position to logical
- TQString columnText( int c ) const { return KListView::columnText( c ); };
+ TQString columnText( int c ) const { return TDEListView::columnText( c ); };
void setColumns( TQValueList<int> order, TQValueList<int> visible );
/** Call this to prevent items being removed from the playlist, it is mostly for internal use only
@@ -323,13 +323,13 @@ class Playlist : private KListView, public EngineObserver, public Amarok::ToolTi
void engineNewMetaData( const MetaBundle&, bool );
void engineStateChanged( Engine::State, Engine::State = Engine::Empty );
- /// KListView Overloaded functions
+ /// TDEListView Overloaded functions
void contentsDropEvent ( TQDropEvent* );
void contentsDragEnterEvent( TQDragEnterEvent* );
void contentsDragMoveEvent ( TQDragMoveEvent* );
void contentsDragLeaveEvent( TQDragLeaveEvent* );
- #ifdef PURIST //KListView imposes hand cursor so override it
+ #ifdef PURIST //TDEListView imposes hand cursor so override it
void contentsMouseMoveEvent( TQMouseEvent *e ) { TQListView::contentsMouseMoveEvent( e ); }
#endif
@@ -384,9 +384,9 @@ class Playlist : private KListView, public EngineObserver, public Amarok::ToolTi
TQ_INT64 m_total; //for Favor Tracks
bool m_itemCountDirty;
- KAction *m_undoButton;
- KAction *m_redoButton;
- KAction *m_clearButton;
+ TDEAction *m_undoButton;
+ TDEAction *m_redoButton;
+ TDEAction *m_clearButton;
TQDir m_undoDir;
TQStringList m_undoList;
diff --git a/amarok/src/playlistbrowser.cpp b/amarok/src/playlistbrowser.cpp
index de89c6a2..e63b66ac 100644
--- a/amarok/src/playlistbrowser.cpp
+++ b/amarok/src/playlistbrowser.cpp
@@ -148,7 +148,7 @@ PlaylistBrowser::PlaylistBrowser( const char *name )
, m_coolStreamsOpen( false )
, m_smartDefaultsOpen( false )
, m_lastfmOpen( false )
- , m_ac( new KActionCollection( this ) )
+ , m_ac( new TDEActionCollection( this ) )
, m_podcastTimer( new TQTimer( this ) )
@@ -159,15 +159,15 @@ PlaylistBrowser::PlaylistBrowser( const char *name )
browserBox->setSpacing( 3 );
//<Toolbar>
- addMenuButton = new KActionMenu( i18n("Add"), Amarok::icon( "add_playlist" ), m_ac );
+ addMenuButton = new TDEActionMenu( i18n("Add"), Amarok::icon( "add_playlist" ), m_ac );
addMenuButton->setDelayed( false );
- KPopupMenu *playlistMenu = new KPopupMenu( this );
+ TDEPopupMenu *playlistMenu = new TDEPopupMenu( this );
playlistMenu->insertItem( i18n("New..."), PLAYLIST );
playlistMenu->insertItem( i18n("Import Existing..."), PLAYLIST_IMPORT );
connect( playlistMenu, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotAddPlaylistMenu(int) ) );
- KPopupMenu *addMenu = addMenuButton->popupMenu();
+ TDEPopupMenu *addMenu = addMenuButton->popupMenu();
addMenu->insertItem( i18n("Playlist"), playlistMenu );
addMenu->insertItem( i18n("Smart Playlist..."), SMARTPLAYLIST );
addMenu->insertItem( i18n("Dynamic Playlist..."), ADDDYNAMIC);
@@ -175,14 +175,14 @@ PlaylistBrowser::PlaylistBrowser( const char *name )
addMenu->insertItem( i18n("Podcast..."), PODCAST );
connect( addMenu, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotAddMenu(int) ) );
- renameButton = new KAction( i18n("Rename"), "editclear", 0, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), m_ac );
- removeButton = new KAction( i18n("Delete"), Amarok::icon( "remove" ), 0, TQT_TQOBJECT(this), TQT_SLOT( removeSelectedItems() ), m_ac );
+ renameButton = new TDEAction( i18n("Rename"), "editclear", 0, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), m_ac );
+ removeButton = new TDEAction( i18n("Delete"), Amarok::icon( "remove" ), 0, TQT_TQOBJECT(this), TQT_SLOT( removeSelectedItems() ), m_ac );
m_toolbar = new Browser::ToolBar( browserBox );
- m_toolbar->setIconText( KToolBar::IconTextRight, false ); //we want the open button to have text on right
+ m_toolbar->setIconText( TDEToolBar::IconTextRight, false ); //we want the open button to have text on right
addMenuButton->plug( m_toolbar );
- m_toolbar->setIconText( KToolBar::IconOnly, false ); //default appearance
+ m_toolbar->setIconText( TDEToolBar::IconOnly, false ); //default appearance
m_toolbar->insertLineSeparator();
renameButton->plug( m_toolbar);
removeButton->plug( m_toolbar );
@@ -2557,7 +2557,7 @@ void PlaylistBrowser::showContextMenu( TQListViewItem *item, const TQPoint &p, i
////////////////////////////////////////////////////////////////////////////
PlaylistBrowserView::PlaylistBrowserView( TQWidget *parent, const char *name )
- : KListView( parent, name )
+ : TDEListView( parent, name )
, m_marker( 0 )
{
addColumn( i18n("Playlists") );
@@ -2750,7 +2750,7 @@ void PlaylistBrowserView::eraseMarker() //SLOT
void PlaylistBrowserView::viewportPaintEvent( TQPaintEvent *e )
{
- if( e ) KListView::viewportPaintEvent( e ); //we call with 0 in contentsDropEvent()
+ if( e ) TDEListView::viewportPaintEvent( e ); //we call with 0 in contentsDropEvent()
if( m_marker )
{
@@ -2874,7 +2874,7 @@ void PlaylistBrowserView::moveSelectedItems( TQListViewItem *newParent )
void PlaylistBrowserView::rename( TQListViewItem *item, int c )
{
- KListView::rename( item, c );
+ TDEListView::rename( item, c );
TQRect rect( itemRect( item ) );
int fieldX = rect.x() + treeStepSize() + 2;
@@ -2902,7 +2902,7 @@ void PlaylistBrowserView::keyPressEvent( TQKeyEvent *e )
break;
default:
- KListView::keyPressEvent( e );
+ TDEListView::keyPressEvent( e );
break;
}
}
diff --git a/amarok/src/playlistbrowser.h b/amarok/src/playlistbrowser.h
index 838b4c0c..b17d6609 100644
--- a/amarok/src/playlistbrowser.h
+++ b/amarok/src/playlistbrowser.h
@@ -23,7 +23,7 @@
#include <tqvbox.h>
class KTextBrowser;
-class KToolBar;
+class TDEToolBar;
class TQCustomEvent;
class TQColorGroup;
@@ -213,12 +213,12 @@ class PlaylistBrowser : public TQVBox
bool m_lastfmOpen;
PlaylistBrowserView *m_listview;
- KActionCollection *m_ac;
- KAction *removeButton;
- KAction *renameButton;
- KActionMenu *viewMenuButton;
- KActionMenu *addMenuButton;
- KToolBar *m_toolbar;
+ TDEActionCollection *m_ac;
+ TDEAction *removeButton;
+ TDEAction *renameButton;
+ TDEActionMenu *viewMenuButton;
+ TDEActionMenu *addMenuButton;
+ TDEToolBar *m_toolbar;
TQValueList<int> m_dynamicSizeSave;
TQDict<PodcastSettings> m_podcastSettings;
@@ -238,7 +238,7 @@ class PlaylistBrowser : public TQVBox
-class PlaylistBrowserView : public KListView
+class PlaylistBrowserView : public TDEListView
{
Q_OBJECT
diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp
index b2eb4682..b65e857b 100644
--- a/amarok/src/playlistbrowseritem.cpp
+++ b/amarok/src/playlistbrowseritem.cpp
@@ -129,7 +129,7 @@ PlaylistBrowserEntry::compare( TQListViewItem* item, int col, bool ascending ) c
}
}
- return KListViewItem::compare(item, col, ascending);
+ return TDEListViewItem::compare(item, col, ascending);
}
void
@@ -156,7 +156,7 @@ PlaylistBrowserEntry::slotDoubleClicked()
void
PlaylistBrowserEntry::slotRenameItem()
{
- TQListViewItem *parent = KListViewItem::parent();
+ TQListViewItem *parent = TDEListViewItem::parent();
while( parent )
{
@@ -392,7 +392,7 @@ PlaylistCategory::slotRenameItem()
void
PlaylistCategory::showContextMenu( const TQPoint &position )
{
- KPopupMenu menu( listView() );
+ TDEPopupMenu menu( listView() );
if( !isKept() ) return;
@@ -545,7 +545,7 @@ PlaylistCategory::paintCell( TQPainter *p, const TQColorGroup &cg, int column, i
p->setFont( font );
- KListViewItem::paintCell( p, cg, column, width, align );
+ TDEListViewItem::paintCell( p, cg, column, width, align );
}
@@ -873,7 +873,7 @@ void PlaylistEntry::slotDoubleClicked()
void PlaylistEntry::showContextMenu( const TQPoint &position )
{
- KPopupMenu menu( listView() );
+ TDEPopupMenu menu( listView() );
enum Id { LOAD, APPEND, QUEUE, RENAME, DELETE, MEDIADEVICE_COPY, MEDIADEVICE_SYNC };
@@ -972,7 +972,7 @@ void PlaylistEntry::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
if( buffer.isNull() )
{
- KListViewItem::paintCell( p, cg, column, width, align );
+ TDEListViewItem::paintCell( p, cg, column, width, align );
return;
}
@@ -984,7 +984,7 @@ void PlaylistEntry::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor(0) );
#endif
- KListView *lv = static_cast<KListView *>( listView() );
+ TDEListView *lv = static_cast<TDEListView *>( listView() );
TQFont font( p->font() );
TQFontMetrics fm( p->fontMetrics() );
@@ -1081,7 +1081,7 @@ void PlaylistTrackItem::slotDoubleClicked()
void PlaylistTrackItem::showContextMenu( const TQPoint &position )
{
- KPopupMenu menu( listView() );
+ TDEPopupMenu menu( listView() );
enum Actions { LOAD, APPEND, QUEUE, BURN, REMOVE, INFO };
menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), LOAD );
@@ -1241,7 +1241,7 @@ void StreamEntry::paintCell( TQPainter *p, const TQColorGroup &cg, int column, i
if( buffer.isNull() )
{
- KListViewItem::paintCell( p, cg, column, width, align );
+ TDEListViewItem::paintCell( p, cg, column, width, align );
return;
}
@@ -1253,7 +1253,7 @@ void StreamEntry::paintCell( TQPainter *p, const TQColorGroup &cg, int column, i
pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor(0) );
#endif
- KListView *lv = static_cast<KListView *>( listView() );
+ TDEListView *lv = static_cast<TDEListView *>( listView() );
TQFont font( p->font() );
TQFontMetrics fm( p->fontMetrics() );
@@ -1290,7 +1290,7 @@ void StreamEntry::paintCell( TQPainter *p, const TQColorGroup &cg, int column, i
void
StreamEntry::showContextMenu( const TQPoint &position )
{
- KPopupMenu menu( listView() );
+ TDEPopupMenu menu( listView() );
enum Actions { LOAD, APPEND, QUEUE, EDIT, REMOVE };
menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), LOAD );
@@ -1482,7 +1482,7 @@ DynamicEntry::slotDoubleClicked()
void
DynamicEntry::showContextMenu( const TQPoint &position )
{
- KPopupMenu menu( listView() );
+ TDEPopupMenu menu( listView() );
enum Actions { LOAD, RENAME, REMOVE, EDIT };
menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), LOAD );
@@ -2297,7 +2297,7 @@ PodcastChannel::slotAnimation()
void
PodcastChannel::showContextMenu( const TQPoint &position )
{
- KPopupMenu menu( listView() );
+ TDEPopupMenu menu( listView() );
enum Actions { LOAD, APPEND, QUEUE, DELETE, RESCAN, LISTENED, NEW, CONFIG };
@@ -2737,7 +2737,7 @@ PodcastEpisode::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int
if( buffer.isNull() )
{
- KListViewItem::paintCell( p, cg, column, width, align );
+ TDEListViewItem::paintCell( p, cg, column, width, align );
return;
}
@@ -2749,7 +2749,7 @@ PodcastEpisode::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int
pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor(0) );
#endif
- KListView *lv = static_cast<KListView *>( listView() );
+ TDEListView *lv = static_cast<TDEListView *>( listView() );
TQFont font( p->font() );
TQFontMetrics fm( p->fontMetrics() );
@@ -2824,7 +2824,7 @@ PodcastEpisode::slotDoubleClicked()
void
PodcastEpisode::showContextMenu( const TQPoint &position )
{
- KPopupMenu menu( listView() );
+ TDEPopupMenu menu( listView() );
enum Actions { LOAD, APPEND, QUEUE, GET, ASSOCIATE, DELETE, MEDIA_DEVICE, LISTENED, NEW, OPEN_WITH /* has to be last */ };
menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), LOAD );
@@ -2845,7 +2845,7 @@ PodcastEpisode::showContextMenu( const TQPoint &position )
else
{
int i = 1;
- KPopupMenu *openMenu = new KPopupMenu;
+ TDEPopupMenu *openMenu = new TDEPopupMenu;
for( TDETrader::OfferList::iterator it = offers.begin();
it != offers.end();
++it )
@@ -3392,7 +3392,7 @@ void SmartPlaylist::slotDoubleClicked()
void SmartPlaylist::showContextMenu( const TQPoint &position )
{
- KPopupMenu menu( listView() );
+ TDEPopupMenu menu( listView() );
enum Actions { LOAD, ADD, QUEUE, EDIT, REMOVE, MEDIADEVICE_COPY, MEDIADEVICE_SYNC };
diff --git a/amarok/src/playlistbrowseritem.h b/amarok/src/playlistbrowseritem.h
index a37eabff..b5b4cd80 100644
--- a/amarok/src/playlistbrowseritem.h
+++ b/amarok/src/playlistbrowseritem.h
@@ -47,20 +47,20 @@ namespace TDEIO { class Job; class TransferJob; class CopyJob; } //podcast downl
/* A base class to be able to use polymorphism and avoid tons of casts */
-class PlaylistBrowserEntry : public TQObject, public KListViewItem
+class PlaylistBrowserEntry : public TQObject, public TDEListViewItem
{
Q_OBJECT
public:
PlaylistBrowserEntry( TQListViewItem *parent, TQListViewItem *after )
- : KListViewItem( parent, after) { m_kept = true; }
+ : TDEListViewItem( parent, after) { m_kept = true; }
PlaylistBrowserEntry( TQListView *parent, TQListViewItem *after )
- : KListViewItem( parent, after) { m_kept = true; }
+ : TDEListViewItem( parent, after) { m_kept = true; }
PlaylistBrowserEntry( TQListViewItem *parent, TQListViewItem *after, const TQString &name )
- : KListViewItem( parent, after, name) { m_kept = true; }
+ : TDEListViewItem( parent, after, name) { m_kept = true; }
virtual TQDomElement xml() const { return TQDomElement(); }
- TQListViewItem* parent() const { return KListViewItem::parent(); }
+ TQListViewItem* parent() const { return TDEListViewItem::parent(); }
bool isKept() const { return m_kept; } // if kept == true, then it will be saved
void setKept( bool k ); // to the cache files. If false, non-renameable
diff --git a/amarok/src/playlistitem.cpp b/amarok/src/playlistitem.cpp
index 26eca7f4..b1814d78 100644
--- a/amarok/src/playlistitem.cpp
+++ b/amarok/src/playlistitem.cpp
@@ -54,14 +54,14 @@ bool PlaylistItem::s_pixmapChanged = false;
PlaylistItem::PlaylistItem( TQListView *listview, TQListViewItem *item )
- : KListViewItem( listview, item )
+ : TDEListViewItem( listview, item )
, m_album( 0 )
{
- KListViewItem::setVisible( false );
+ TDEListViewItem::setVisible( false );
}
PlaylistItem::PlaylistItem( const MetaBundle &bundle, TQListViewItem *lvi, bool enabled )
- : MetaBundle( bundle ), KListViewItem( lvi->listView(), lvi->itemAbove() )
+ : MetaBundle( bundle ), TDEListViewItem( lvi->listView(), lvi->itemAbove() )
, m_album( 0 )
, m_deleteAfterEdit( false )
, m_isBeingRenamed( false )
@@ -253,7 +253,7 @@ void PlaylistItem::setSelected( bool selected )
if( isVisible() )
{
const bool prevSelected = isSelected();
- KListViewItem::setSelected( selected );
+ TDEListViewItem::setSelected( selected );
if( prevSelected && !isSelected() )
{
listView()->m_selCount--;
@@ -278,12 +278,12 @@ void PlaylistItem::setVisible( bool visible )
{
listView()->m_selCount--;
listView()->m_selLength -= length();
- KListViewItem::setSelected( false );
+ TDEListViewItem::setSelected( false );
listView()->countChanged();
}
const bool prevVisible = isVisible();
- KListViewItem::setVisible( visible );
+ TDEListViewItem::setVisible( visible );
if( prevVisible && !isVisible() )
{
listView()->m_visCount--;
@@ -941,7 +941,7 @@ void PlaylistItem::moodbarJobEvent( int newState )
void PlaylistItem::setup()
{
- KListViewItem::setup();
+ TDEListViewItem::setup();
// We make the current track item a bit taller than ordinary items
if( this == listView()->currentTrack() )
@@ -952,7 +952,7 @@ void PlaylistItem::setup()
void PlaylistItem::paintFocus( TQPainter* p, const TQColorGroup& cg, const TQRect& r )
{
if( this != listView()->currentTrack() )
- KListViewItem::paintFocus( p, cg, r );
+ TDEListViewItem::paintFocus( p, cg, r );
}
const TQString &PlaylistItem::editingText()
diff --git a/amarok/src/playlistitem.h b/amarok/src/playlistitem.h
index 3477906b..83e92aea 100644
--- a/amarok/src/playlistitem.h
+++ b/amarok/src/playlistitem.h
@@ -30,7 +30,7 @@ class MetaBundle;
class Playlist;
class PlaylistAlbum;
-class LIBAMAROK_EXPORT PlaylistItem : public MetaBundle, public KListViewItem
+class LIBAMAROK_EXPORT PlaylistItem : public MetaBundle, public TDEListViewItem
{
typedef MetaBundle super;
public:
@@ -84,8 +84,8 @@ class LIBAMAROK_EXPORT PlaylistItem : public MetaBundle, public KListViewItem
void setIsNew( bool is ) { m_isNew = is; }
/// convenience functions
- Playlist *listView() const { return reinterpret_cast<Playlist*>( KListViewItem::listView() ); }
- PlaylistItem *nextSibling() const { return static_cast<PlaylistItem*>( KListViewItem::nextSibling() ); }
+ Playlist *listView() const { return reinterpret_cast<Playlist*>( TDEListViewItem::listView() ); }
+ PlaylistItem *nextSibling() const { return static_cast<PlaylistItem*>( TDEListViewItem::nextSibling() ); }
static int ratingAtPoint( int x );
static int ratingColumnWidth();
diff --git a/amarok/src/playlistselection.cpp b/amarok/src/playlistselection.cpp
index a78b1dbf..c8ca3193 100644
--- a/amarok/src/playlistselection.cpp
+++ b/amarok/src/playlistselection.cpp
@@ -32,7 +32,7 @@
#include <klocale.h>
PlaylistSelection::PlaylistSelection( TQWidget* parent, const char* name )
- : KListView( parent, name )
+ : TDEListView( parent, name )
{
addColumn( i18n("Select Playlists") );
setRootIsDecorated( true );
diff --git a/amarok/src/playlistselection.h b/amarok/src/playlistselection.h
index 5f23c5e9..cb460c3e 100644
--- a/amarok/src/playlistselection.h
+++ b/amarok/src/playlistselection.h
@@ -17,7 +17,7 @@ class KDialogBase;
class DynamicMode;
//this is a widget used in newdynamic.ui
-class PlaylistSelection : public KListView
+class PlaylistSelection : public TDEListView
{
Q_OBJECT
diff --git a/amarok/src/playlistwindow.cpp b/amarok/src/playlistwindow.cpp
index 9bb693bb..abb1912b 100644
--- a/amarok/src/playlistwindow.cpp
+++ b/amarok/src/playlistwindow.cpp
@@ -83,11 +83,11 @@
namespace Amarok
{
- class ToolBar : public KToolBar
+ class ToolBar : public TDEToolBar
{
public:
ToolBar( TQWidget *parent, const char *name )
- : KToolBar( parent, name )
+ : TDEToolBar( parent, name )
{}
protected:
@@ -115,7 +115,7 @@ PlaylistWindow::PlaylistWindow()
// Sets caption and icon correctly (needed e.g. for GNOME)
kapp->setTopWidget( this );
- KActionCollection* const ac = actionCollection();
+ TDEActionCollection* const ac = actionCollection();
const EngineController* const ec = EngineController::instance();
ac->setAutoConnectShortcuts( false );
@@ -144,45 +144,45 @@ PlaylistWindow::PlaylistWindow()
#endif
//FIXME: after string freeze rename to "Burn Current Playlist"?
- new KAction( i18n("Burn to CD"), Amarok::icon( "burn" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBurnPlaylist()), ac, "playlist_burn" );
+ new TDEAction( i18n("Burn to CD"), Amarok::icon( "burn" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBurnPlaylist()), ac, "playlist_burn" );
actionCollection()->action("playlist_burn")->setEnabled( K3bExporter::isAvailable() );
- new KAction( i18n("Play Media..."), Amarok::icon( "files" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlayMedia()), ac, "playlist_playmedia" );
- new KAction( i18n("Play Audio CD"), Amarok::icon( "album" ), 0, TQT_TQOBJECT(this), TQT_SLOT(playAudioCD()), ac, "play_audiocd" );
- KAction *playPause = new KAction( i18n( "&Play/Pause" ), Amarok::icon( "play" ), Key_Space, ec, TQT_SLOT( playPause() ), ac, "play_pause" );
- new KAction( i18n("Script Manager"), Amarok::icon( "scripts" ), 0, TQT_TQOBJECT(this), TQT_SLOT(showScriptSelector()), ac, "script_manager" );
- new KAction( i18n("Queue Manager"), Amarok::icon( "queue" ), 0, TQT_TQOBJECT(this), TQT_SLOT(showQueueManager()), ac, "queue_manager" );
- KAction *seekForward = new KAction( i18n( "&Seek Forward" ), Amarok::icon( "fastforward" ), Key_Right, ec, TQT_SLOT( seekForward() ), ac, "seek_forward" );
- KAction *seekBackward = new KAction( i18n( "&Seek Backward" ), Amarok::icon( "rewind" ), Key_Left, ec, TQT_SLOT( seekBackward() ), ac, "seek_backward" );
- new KAction( i18n("Statistics"), Amarok::icon( "info" ), 0, TQT_TQOBJECT(this), TQT_SLOT(showStatistics()), ac, "statistics" );
- new KAction( i18n("Update Collection"), Amarok::icon( "refresh" ), 0, CollectionDB::instance(), TQT_SLOT( scanModifiedDirs() ), actionCollection(), "update_collection" );
+ new TDEAction( i18n("Play Media..."), Amarok::icon( "files" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlayMedia()), ac, "playlist_playmedia" );
+ new TDEAction( i18n("Play Audio CD"), Amarok::icon( "album" ), 0, TQT_TQOBJECT(this), TQT_SLOT(playAudioCD()), ac, "play_audiocd" );
+ TDEAction *playPause = new TDEAction( i18n( "&Play/Pause" ), Amarok::icon( "play" ), Key_Space, ec, TQT_SLOT( playPause() ), ac, "play_pause" );
+ new TDEAction( i18n("Script Manager"), Amarok::icon( "scripts" ), 0, TQT_TQOBJECT(this), TQT_SLOT(showScriptSelector()), ac, "script_manager" );
+ new TDEAction( i18n("Queue Manager"), Amarok::icon( "queue" ), 0, TQT_TQOBJECT(this), TQT_SLOT(showQueueManager()), ac, "queue_manager" );
+ TDEAction *seekForward = new TDEAction( i18n( "&Seek Forward" ), Amarok::icon( "fastforward" ), Key_Right, ec, TQT_SLOT( seekForward() ), ac, "seek_forward" );
+ TDEAction *seekBackward = new TDEAction( i18n( "&Seek Backward" ), Amarok::icon( "rewind" ), Key_Left, ec, TQT_SLOT( seekBackward() ), ac, "seek_backward" );
+ new TDEAction( i18n("Statistics"), Amarok::icon( "info" ), 0, TQT_TQOBJECT(this), TQT_SLOT(showStatistics()), ac, "statistics" );
+ new TDEAction( i18n("Update Collection"), Amarok::icon( "refresh" ), 0, CollectionDB::instance(), TQT_SLOT( scanModifiedDirs() ), actionCollection(), "update_collection" );
m_lastfmTags << "Alternative" << "Ambient" << "Chill Out" << "Classical" << "Dance"
<< "Electronica" << "Favorites" << "Heavy Metal" << "Hip Hop" << "Indie Rock"
<< "Industrial" << "Japanese" << "Pop" << "Psytrance" << "Rap" << "Rock"
<< "Soundtrack" << "Techno" << "Trance";
- KPopupMenu* playTagRadioMenu = new KPopupMenu( this );
+ TDEPopupMenu* playTagRadioMenu = new TDEPopupMenu( this );
int id = 0;
foreach( m_lastfmTags ) {
playTagRadioMenu->insertItem( *it, this, TQT_SLOT( playLastfmGlobaltag( int ) ), 0, id );
++id;
}
- KPopupMenu* addTagRadioMenu = new KPopupMenu( this );
+ TDEPopupMenu* addTagRadioMenu = new TDEPopupMenu( this );
id = 0;
foreach( m_lastfmTags ) {
addTagRadioMenu->insertItem( *it, this, TQT_SLOT( addLastfmGlobaltag( int ) ), 0, id );
++id;
}
- KActionMenu* playLastfm = new KActionMenu( i18n( "Play las&t.fm Stream" ), Amarok::icon( "audioscrobbler" ), ac, "lastfm_play" );
+ TDEActionMenu* playLastfm = new TDEActionMenu( i18n( "Play las&t.fm Stream" ), Amarok::icon( "audioscrobbler" ), ac, "lastfm_play" );
TQPopupMenu* playLastfmMenu = playLastfm->popupMenu();
playLastfmMenu->insertItem( i18n( "Personal Radio" ), this, TQT_SLOT( playLastfmPersonal() ) );
playLastfmMenu->insertItem( i18n( "Neighbor Radio" ), this, TQT_SLOT( playLastfmNeighbor() ) );
playLastfmMenu->insertItem( i18n( "Custom Station" ), this, TQT_SLOT( playLastfmCustom() ) );
playLastfmMenu->insertItem( i18n( "Global Tag Radio" ), playTagRadioMenu );
- KActionMenu* addLastfm = new KActionMenu( i18n( "Add las&t.fm Stream" ), Amarok::icon( "audioscrobbler" ), ac, "lastfm_add" );
+ TDEActionMenu* addLastfm = new TDEActionMenu( i18n( "Add las&t.fm Stream" ), Amarok::icon( "audioscrobbler" ), ac, "lastfm_add" );
TQPopupMenu* addLastfmMenu = addLastfm->popupMenu();
addLastfmMenu->insertItem( i18n( "Personal Radio" ), this, TQT_SLOT( addLastfmPersonal() ) );
addLastfmMenu->insertItem( i18n( "Neighbor Radio" ), this, TQT_SLOT( addLastfmNeighbor() ) );
@@ -191,16 +191,16 @@ PlaylistWindow::PlaylistWindow()
ac->action( "options_configure_globals" )->setText( i18n( "Configure &Global Shortcuts..." ) );
- new KAction( i18n( "Previous Track" ), Amarok::icon( "back" ), 0, ec, TQT_SLOT( previous() ), ac, "prev" );
- new KAction( i18n( "Play" ), Amarok::icon( "play" ), 0, ec, TQT_SLOT( play() ), ac, "play" );
- new KAction( i18n( "Pause" ), Amarok::icon( "pause" ), 0, ec, TQT_SLOT( pause() ), ac, "pause" );
- new KAction( i18n( "Next Track" ), Amarok::icon( "next" ), 0, ec, TQT_SLOT( next() ), ac, "next" );
+ new TDEAction( i18n( "Previous Track" ), Amarok::icon( "back" ), 0, ec, TQT_SLOT( previous() ), ac, "prev" );
+ new TDEAction( i18n( "Play" ), Amarok::icon( "play" ), 0, ec, TQT_SLOT( play() ), ac, "play" );
+ new TDEAction( i18n( "Pause" ), Amarok::icon( "pause" ), 0, ec, TQT_SLOT( pause() ), ac, "pause" );
+ new TDEAction( i18n( "Next Track" ), Amarok::icon( "next" ), 0, ec, TQT_SLOT( next() ), ac, "next" );
- KAction *toggleFocus = new KAction( i18n( "Toggle Focus" ), "reload", CTRL+Key_Tab, TQT_TQOBJECT(this), TQT_SLOT( slotToggleFocus() ), ac, "toggle_focus" );
+ TDEAction *toggleFocus = new TDEAction( i18n( "Toggle Focus" ), "reload", CTRL+Key_Tab, TQT_TQOBJECT(this), TQT_SLOT( slotToggleFocus() ), ac, "toggle_focus" );
- { // KAction idiocy -- shortcuts don't work until they've been plugged into a menu
- KPopupMenu asdf;
+ { // TDEAction idiocy -- shortcuts don't work until they've been plugged into a menu
+ TDEPopupMenu asdf;
playPause->plug( &asdf );
seekForward->plug( &asdf );
@@ -264,7 +264,7 @@ void PlaylistWindow::init()
TQFrame *playlist;
{ //<Search LineEdit>
- KToolBar *bar = new KToolBar( m_browsers->container(), "NotMainToolBar" );
+ TDEToolBar *bar = new TDEToolBar( m_browsers->container(), "NotMainToolBar" );
bar->setIconSize( 22, false ); //looks more sensible
bar->setFlat( true ); //removes the ugly frame
bar->setMovingEnabled( false ); //removes the ugly frame
@@ -276,7 +276,7 @@ void PlaylistWindow::init()
actionCollection()->action( "playlist_undo")->plug( bar );
actionCollection()->action( "playlist_redo")->plug( bar );
bar->boxLayout()->addStretch();
- TQWidget *button = new KToolBarButton( "locationbar_erase", 1, bar );
+ TQWidget *button = new TDEToolBarButton( "locationbar_erase", 1, bar );
TQLabel *filter_label = new TQLabel( i18n("S&earch:") + ' ', bar );
m_lineEdit = new ClickLineEdit( i18n( "Playlist Search" ), bar );
filter_label->setBuddy( m_lineEdit );
@@ -309,7 +309,7 @@ void PlaylistWindow::init()
#endif
TQWidget *statusbar = new Amarok::StatusBar( this );
- KAction* repeatAction = Amarok::actionCollection()->action( "repeat" );
+ TDEAction* repeatAction = Amarok::actionCollection()->action( "repeat" );
connect( repeatAction, TQT_SIGNAL( activated( int ) ), playlist, TQT_SLOT( slotRepeatTrackToggled( int ) ) );
m_menubar = new KMenuBar( this );
@@ -318,7 +318,7 @@ void PlaylistWindow::init()
#endif
//BEGIN Actions menu
- KPopupMenu *actionsMenu = new KPopupMenu( m_menubar );
+ TDEPopupMenu *actionsMenu = new TDEPopupMenu( m_menubar );
actionCollection()->action("playlist_playmedia")->plug( actionsMenu );
actionCollection()->action("lastfm_play")->plug( actionsMenu );
actionCollection()->action("play_audiocd")->plug( actionsMenu );
@@ -334,7 +334,7 @@ void PlaylistWindow::init()
//END Actions menu
//BEGIN Playlist menu
- KPopupMenu *playlistMenu = new KPopupMenu( m_menubar );
+ TDEPopupMenu *playlistMenu = new TDEPopupMenu( m_menubar );
actionCollection()->action("playlist_add")->plug( playlistMenu );
actionCollection()->action("stream_add")->plug( playlistMenu );
actionCollection()->action("lastfm_add")->plug( playlistMenu );
@@ -355,16 +355,16 @@ void PlaylistWindow::init()
//END Playlist menu
//BEGIN Mode menu
- KPopupMenu *modeMenu = new KPopupMenu( m_menubar );
+ TDEPopupMenu *modeMenu = new TDEPopupMenu( m_menubar );
actionCollection()->action("repeat")->plug( modeMenu );
- KSelectAction *random = static_cast<KSelectAction*>( actionCollection()->action("random_mode") );
+ TDESelectAction *random = static_cast<TDESelectAction*>( actionCollection()->action("random_mode") );
random->plug( modeMenu );
random->popupMenu()->insertSeparator();
actionCollection()->action("favor_tracks")->plug( random->popupMenu() );
//END Mode menu
//BEGIN Tools menu
- m_toolsMenu = new KPopupMenu( m_menubar );
+ m_toolsMenu = new TDEPopupMenu( m_menubar );
m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "covermanager" ) ), i18n("&Cover Manager"), Amarok::Menu::ID_SHOW_COVER_MANAGER );
actionCollection()->action("queue_manager")->plug( m_toolsMenu );
m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "visualizations" ) ), i18n("&Visualizations"), Amarok::Menu::ID_SHOW_VIS_SELECTOR );
@@ -386,10 +386,10 @@ void PlaylistWindow::init()
//END Tools menu
//BEGIN Settings menu
- m_settingsMenu = new KPopupMenu( m_menubar );
- //TODO use KStdAction or KMainWindow
+ m_settingsMenu = new TDEPopupMenu( m_menubar );
+ //TODO use KStdAction or TDEMainWindow
#ifndef TQ_WS_MAC
- static_cast<KToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowMenubar)))->setChecked( AmarokConfig::showMenuBar() );
+ static_cast<TDEToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowMenubar)))->setChecked( AmarokConfig::showMenuBar() );
actionCollection()->action(KStdAction::name(KStdAction::ShowMenubar))->plug( m_settingsMenu );
m_settingsMenu->insertItem( AmarokConfig::showToolbar() ? i18n( "Hide Toolbar" ) : i18n("Show Toolbar"), ID_SHOW_TOOLBAR );
m_settingsMenu->insertItem( AmarokConfig::showPlayerWindow() ? i18n("Hide Player &Window") : i18n("Show Player &Window"), ID_SHOW_PLAYERWINDOW );
@@ -545,12 +545,12 @@ void PlaylistWindow::createGUI()
m_toolbar->clear();
- //KActions don't unplug themselves when the widget that is plugged is deleted!
+ //TDEActions don't unplug themselves when the widget that is plugged is deleted!
//we need to unplug to detect if the menu is plugged in App::applySettings()
//TODO report to bugs.kde.org
//we unplug after clear as otherwise it crashes! dunno why..
- KActionPtrList actions = actionCollection()->actions();
- for( KActionPtrList::Iterator it = actions.begin(), end = actions.end(); it != end; ++it )
+ TDEActionPtrList actions = actionCollection()->actions();
+ for( TDEActionPtrList::Iterator it = actions.begin(), end = actions.end(); it != end; ++it )
(*it)->unplug( m_toolbar );
KXMLGUIBuilder builder( this );
@@ -560,9 +560,9 @@ void PlaylistWindow::createGUI()
factory.addClient( this );
//TEXT ON RIGHT HACK
- //KToolBarButtons have independent settings for their appearance.
- //KToolBarButton::modeChange() causes that button to set its mode to that of its parent KToolBar
- //KToolBar::setIconText() calls modeChange() for children, unless 2nd param is false
+ //TDEToolBarButtons have independent settings for their appearance.
+ //TDEToolBarButton::modeChange() causes that button to set its mode to that of its parent TDEToolBar
+ //TDEToolBar::setIconText() calls modeChange() for children, unless 2nd param is false
TQStringList list;
list << "toolbutton_playlist_add"
@@ -572,13 +572,13 @@ void PlaylistWindow::createGUI()
<< "toolbutton_burn_menu"
<< "toolbutton_amarok_menu";
- m_toolbar->setIconText( KToolBar::IconTextRight, false ); //we want some buttons to have text on right
+ m_toolbar->setIconText( TDEToolBar::IconTextRight, false ); //we want some buttons to have text on right
const TQStringList::ConstIterator end = list.constEnd();
const TQStringList::ConstIterator last = list.fromLast();
for( TQStringList::ConstIterator it = list.constBegin(); it != end; ++it )
{
- KToolBarButton* const button = static_cast<KToolBarButton*>( TQT_TQWIDGET(m_toolbar->child( (*it).latin1() )) );
+ TDEToolBarButton* const button = static_cast<TDEToolBarButton*>( TQT_TQWIDGET(m_toolbar->child( (*it).latin1() )) );
if ( it == last ) {
//if the user has no PlayerWindow, he MUST have the menu action plugged
@@ -593,7 +593,7 @@ void PlaylistWindow::createGUI()
}
}
- m_toolbar->setIconText( KToolBar::IconOnly, false ); //default appearance
+ m_toolbar->setIconText( TDEToolBar::IconOnly, false ); //default appearance
conserveMemory();
setUpdatesEnabled( true );
}
@@ -649,7 +649,7 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e )
// intercept F2 for inline tag renaming
// NOTE: tab will move to the next tag
// NOTE: if item is still null don't select first item in playlist, user wouldn't want that. It's silly.
- // TODO: berkus has solved the "inability to cancel" issue with KListView, but it's not in tdelibs yet..
+ // TODO: berkus has solved the "inability to cancel" issue with TDEListView, but it's not in tdelibs yet..
// item may still be null, but this is safe
// NOTE: column 0 cannot be edited currently, hence we pick column 1
@@ -1050,7 +1050,7 @@ void PlaylistWindow::slotToggleFocus() //SLOT
void PlaylistWindow::slotToggleMenu() //SLOT
{
- if( static_cast<KToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowMenubar)))->isChecked() ) {
+ if( static_cast<TDEToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowMenubar)))->isChecked() ) {
AmarokConfig::setShowMenuBar( true );
m_menubar->setShown( true );
}
diff --git a/amarok/src/playlistwindow.h b/amarok/src/playlistwindow.h
index 348ffe0e..13656fd4 100644
--- a/amarok/src/playlistwindow.h
+++ b/amarok/src/playlistwindow.h
@@ -27,8 +27,8 @@ class CollectionBrowser;
class ContextBrowser;
class MediaBrowser;
class TQMenuBar;
-class KPopupMenu;
-class KToolBar;
+class TDEPopupMenu;
+class TDEToolBar;
class TQLabel;
class TQTimer;
@@ -106,12 +106,12 @@ class PlaylistWindow : public TQWidget, public KXMLGUIClient
enum MenuId { ID_SHOW_TOOLBAR = 2000, ID_SHOW_PLAYERWINDOW };
TQMenuBar *m_menubar;
- KPopupMenu *m_toolsMenu;
- KPopupMenu *m_settingsMenu;
+ TDEPopupMenu *m_toolsMenu;
+ TDEPopupMenu *m_settingsMenu;
BrowserBar *m_browsers;
- KPopupMenu *m_searchMenu;
+ TDEPopupMenu *m_searchMenu;
ClickLineEdit *m_lineEdit;
- KToolBar *m_toolbar;
+ TDEToolBar *m_toolbar;
TQTimer *m_timer; //search filter timer
TQStringList m_lastfmTags;
MediaBrowser *m_currMediaBrowser;
diff --git a/amarok/src/prettypopupmenu.cpp b/amarok/src/prettypopupmenu.cpp
index 1b50ff74..73db24f4 100644
--- a/amarok/src/prettypopupmenu.cpp
+++ b/amarok/src/prettypopupmenu.cpp
@@ -38,7 +38,7 @@ TQColor PrettyPopupMenu::s_sidePixmapColor;
////////////////////////////////////////////////////////////////////////////////
PrettyPopupMenu::PrettyPopupMenu( TQWidget* parent, const char* name )
- : KPopupMenu( parent, name )
+ : TDEPopupMenu( parent, name )
{
// Must be initialized so that we know the size on first invocation
if ( s_sidePixmap.isNull() )
@@ -113,30 +113,30 @@ PrettyPopupMenu::calcPixmapColor()
void
PrettyPopupMenu::setMinimumSize(const TQSize & s)
{
- KPopupMenu::setMinimumSize(s.width() + s_sidePixmap.width(), s.height());
+ TDEPopupMenu::setMinimumSize(s.width() + s_sidePixmap.width(), s.height());
}
void
PrettyPopupMenu::setMaximumSize(const TQSize & s)
{
- KPopupMenu::setMaximumSize(s.width() + s_sidePixmap.width(), s.height());
+ TDEPopupMenu::setMaximumSize(s.width() + s_sidePixmap.width(), s.height());
}
void
PrettyPopupMenu::setMinimumSize(int w, int h)
{
- KPopupMenu::setMinimumSize(w + s_sidePixmap.width(), h);
+ TDEPopupMenu::setMinimumSize(w + s_sidePixmap.width(), h);
}
void
PrettyPopupMenu::setMaximumSize(int w, int h)
{
- KPopupMenu::setMaximumSize(w + s_sidePixmap.width(), h);
+ TDEPopupMenu::setMaximumSize(w + s_sidePixmap.width(), h);
}
void PrettyPopupMenu::resizeEvent(TQResizeEvent * e)
{
- KPopupMenu::resizeEvent( e );
+ TDEPopupMenu::resizeEvent( e );
setFrameRect( TQStyle::visualRect( TQRect( s_sidePixmap.width(), 0,
width() - s_sidePixmap.width(), height() ), this ) );
@@ -146,7 +146,7 @@ void PrettyPopupMenu::resizeEvent(TQResizeEvent * e)
void PrettyPopupMenu::resize( int width, int height )
{
width = kMax(width, maximumSize().width());
- KPopupMenu::resize(width, height);
+ TDEPopupMenu::resize(width, height);
}
void
diff --git a/amarok/src/prettypopupmenu.h b/amarok/src/prettypopupmenu.h
index 30021fc6..23a1be75 100644
--- a/amarok/src/prettypopupmenu.h
+++ b/amarok/src/prettypopupmenu.h
@@ -31,15 +31,15 @@ class TQSize;
/**
* @class PrettyPopup
- * @short KPopupMenu with a pixmap at the left side
+ * @short TDEPopupMenu with a pixmap at the left side
* @author Mark Kretschmann <[email protected]>
*
- * This class behaves just like KPopupMenu, but adds a decorative banner
+ * This class behaves just like TDEPopupMenu, but adds a decorative banner
* graphic at the left border of the menu.
*
* The idea and the code are based on the Kicker start menu from KDE.
*/
-class PrettyPopupMenu : public KPopupMenu
+class PrettyPopupMenu : public TDEPopupMenu
{
Q_OBJECT
diff --git a/amarok/src/queuemanager.cpp b/amarok/src/queuemanager.cpp
index cec41390..6813dbe7 100644
--- a/amarok/src/queuemanager.cpp
+++ b/amarok/src/queuemanager.cpp
@@ -38,9 +38,9 @@
void
QueueItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align )
{
- KListViewItem::paintCell( p, cg, column, width, align );
+ TDEListViewItem::paintCell( p, cg, column, width, align );
- TQString str = TQString::number( ( static_cast<KListView *>( listView() ) )->itemIndex( this ) + 1 );
+ TQString str = TQString::number( ( static_cast<TDEListView *>( listView() ) )->itemIndex( this ) + 1 );
//draw the symbol's outline
uint fw = p->fontMetrics().width( str ) + 2;
@@ -65,7 +65,7 @@ QueueItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt
//////////////////////////////////////////////////////////////////////////////////////////
QueueList::QueueList( TQWidget *parent, const char *name )
- : KListView( parent, name )
+ : TDEListView( parent, name )
{
addColumn( i18n("Name") );
setResizeMode( TQListView::LastColumn );
@@ -81,7 +81,7 @@ QueueList::QueueList( TQWidget *parent, const char *name )
void
QueueList::viewportPaintEvent( TQPaintEvent *e )
{
- if( e ) KListView::viewportPaintEvent( e );
+ if( e ) TDEListView::viewportPaintEvent( e );
if( !childCount() && e )
{
@@ -229,7 +229,7 @@ QueueList::removeSelected() //SLOT
void
QueueList::clear() // SLOT
{
- KListView::clear();
+ TDEListView::clear();
emit changed();
}
@@ -237,17 +237,17 @@ void
QueueList::contentsDragEnterEvent( TQDragEnterEvent *e )
{
debug() << "contentsDrageEnterEvent()" << endl;
- e->accept( e->source() == reinterpret_cast<KListView*>( Playlist::instance() )->viewport() );
+ e->accept( e->source() == reinterpret_cast<TDEListView*>( Playlist::instance() )->viewport() );
}
void
QueueList::contentsDragMoveEvent( TQDragMoveEvent *e )
{
debug() << "contentsDrageMoveEvent()" << endl;
- KListView::contentsDragMoveEvent( e );
+ TDEListView::contentsDragMoveEvent( e );
// Must be overloaded for dnd to work
- e->accept( ( e->source() == reinterpret_cast<KListView*>( Playlist::instance() )->viewport() ) ||
+ e->accept( ( e->source() == reinterpret_cast<TDEListView*>( Playlist::instance() )->viewport() ) ||
e->source() == viewport() );
}
@@ -257,7 +257,7 @@ QueueList::contentsDropEvent( TQDropEvent *e )
debug() << "contentsDragDropEvent()" << endl;
if( e->source() == viewport() )
{
- KListView::contentsDropEvent( e );
+ TDEListView::contentsDropEvent( e );
emit changed();
}
else
diff --git a/amarok/src/queuemanager.h b/amarok/src/queuemanager.h
index 06c51fc5..aa92f03a 100644
--- a/amarok/src/queuemanager.h
+++ b/amarok/src/queuemanager.h
@@ -23,18 +23,18 @@
class KPushButton;
-class QueueItem : public KListViewItem
+class QueueItem : public TDEListViewItem
{
public:
QueueItem( TQListView *parent, TQListViewItem *after, TQString t )
- : KListViewItem( parent, after, t )
+ : TDEListViewItem( parent, after, t )
{ };
void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align );
};
-class QueueList : public KListView
+class QueueList : public TDEListView
{
Q_OBJECT
diff --git a/amarok/src/scriptmanager.cpp b/amarok/src/scriptmanager.cpp
index 67e117f7..ec197ac2 100644
--- a/amarok/src/scriptmanager.cpp
+++ b/amarok/src/scriptmanager.cpp
@@ -157,10 +157,10 @@ ScriptManager::ScriptManager( TQWidget *parent, const char *name )
/// Category items
- m_generalCategory = new KListViewItem( m_gui->listView, i18n( "General" ) );
- m_lyricsCategory = new KListViewItem( m_gui->listView, i18n( "Lyrics" ) );
- m_scoreCategory = new KListViewItem( m_gui->listView, i18n( "Score" ) );
- m_transcodeCategory = new KListViewItem( m_gui->listView, i18n( "Transcoding" ) );
+ m_generalCategory = new TDEListViewItem( m_gui->listView, i18n( "General" ) );
+ m_lyricsCategory = new TDEListViewItem( m_gui->listView, i18n( "Lyrics" ) );
+ m_scoreCategory = new TDEListViewItem( m_gui->listView, i18n( "Score" ) );
+ m_transcodeCategory = new TDEListViewItem( m_gui->listView, i18n( "Transcoding" ) );
m_generalCategory ->setSelectable( false );
m_lyricsCategory ->setSelectable( false );
@@ -706,7 +706,7 @@ ScriptManager::slotShowContextMenu( TQListViewItem* item, const TQPoint& pos )
if( it.data().li == item ) break;
enum { SHOW_LOG, EDIT };
- KPopupMenu menu;
+ TDEPopupMenu menu;
menu.insertTitle( i18n( "Debugging" ) );
menu.insertItem( SmallIconSet( Amarok::icon( "clock" ) ), i18n( "Show Output &Log" ), SHOW_LOG );
menu.insertItem( SmallIconSet( Amarok::icon( "edit" ) ), i18n( "&Edit" ), EDIT );
@@ -876,7 +876,7 @@ ScriptManager::loadScript( const TQString& path )
// Read and parse .spec file, if exists
TQFileInfo info( path );
- KListViewItem* li = 0;
+ TDEListViewItem* li = 0;
const TQString specPath = info.dirPath() + '/' + info.baseName( true ) + ".spec";
if( TQFile::exists( specPath ) ) {
TDEConfig spec( specPath, true, false );
@@ -885,16 +885,16 @@ ScriptManager::loadScript( const TQString& path )
if( spec.hasKey( "type" ) ) {
type = spec.readEntry( "type" );
if( type == "lyrics" )
- li = new KListViewItem( m_lyricsCategory, name );
+ li = new TDEListViewItem( m_lyricsCategory, name );
if( type == "transcode" )
- li = new KListViewItem( m_transcodeCategory, name );
+ li = new TDEListViewItem( m_transcodeCategory, name );
if( type == "score" )
- li = new KListViewItem( m_scoreCategory, name );
+ li = new TDEListViewItem( m_scoreCategory, name );
}
}
if( !li )
- li = new KListViewItem( m_generalCategory, name );
+ li = new TDEListViewItem( m_generalCategory, name );
li->setPixmap( 0, TQPixmap() );
diff --git a/amarok/src/scriptmanagerbase.ui b/amarok/src/scriptmanagerbase.ui
index 52a5b4b3..c3ca95aa 100644
--- a/amarok/src/scriptmanagerbase.ui
+++ b/amarok/src/scriptmanagerbase.ui
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView" row="0" column="0" rowspan="9" colspan="1">
+ <widget class="TDEListView" row="0" column="0" rowspan="9" colspan="1">
<column>
<property name="text">
<string>Scripts</string>
diff --git a/amarok/src/sliderwidget.cpp b/amarok/src/sliderwidget.cpp
index 7295f368..4bba200c 100644
--- a/amarok/src/sliderwidget.cpp
+++ b/amarok/src/sliderwidget.cpp
@@ -429,7 +429,7 @@ Amarok::VolumeSlider::mousePressEvent( TQMouseEvent *e )
void
Amarok::VolumeSlider::contextMenuEvent( TQContextMenuEvent *e )
{
- KPopupMenu menu;
+ TDEPopupMenu menu;
menu.insertTitle( i18n( "Volume" ) );
menu.insertItem( i18n( "100%" ), 100 );
menu.insertItem( i18n( "80%" ), 80 );
diff --git a/amarok/src/socketserver.cpp b/amarok/src/socketserver.cpp
index 541ac492..fbff36ad 100644
--- a/amarok/src/socketserver.cpp
+++ b/amarok/src/socketserver.cpp
@@ -232,7 +232,7 @@ Vis::Selector::rightButton( TQListViewItem* qitem, const TQPoint& pos, int )
Item *item = static_cast<Item*>( qitem );
- KPopupMenu menu( this );
+ TDEPopupMenu menu( this );
menu.insertItem( i18n( "Fullscreen" ), 0 );
if( !item->m_proc || !item->m_proc->isRunning() )
diff --git a/amarok/src/statistics.cpp b/amarok/src/statistics.cpp
index 7f631ade..c0e6ec4b 100644
--- a/amarok/src/statistics.cpp
+++ b/amarok/src/statistics.cpp
@@ -69,12 +69,12 @@ Statistics::Statistics( TQWidget *parent, const char *name )
box->setSpacing( 5 );
{ //<Search LineEdit>
- KToolBar *bar = new Browser::ToolBar( box );
+ TDEToolBar *bar = new Browser::ToolBar( box );
bar->setIconSize( 22, false ); //looks more sensible
bar->setFlat( true ); //removes the ugly frame
bar->setMovingEnabled( false ); //removes the ugly frame
- TQWidget *button = new KToolBarButton( "locationbar_erase", 1, bar );
+ TQWidget *button = new TDEToolBarButton( "locationbar_erase", 1, bar );
m_lineEdit = new ClickLineEdit( i18n( "Enter search terms here" ), bar );
bar->setStretchableWidget( m_lineEdit );
@@ -120,7 +120,7 @@ Statistics::slotSetFilter() //SLOT
//////////////////////////////////////////////////////////////////////////////////////////
StatisticsList::StatisticsList( TQWidget *parent, const char *name )
- : KListView( parent, name )
+ : TDEListView( parent, name )
, m_currentItem( 0 )
, m_expanded( false )
{
@@ -600,7 +600,7 @@ StatisticsList::clearHover() //SLOT
void
StatisticsList::viewportPaintEvent( TQPaintEvent *e )
{
- if( e ) KListView::viewportPaintEvent( e );
+ if( e ) TDEListView::viewportPaintEvent( e );
if( CollectionDB::instance()->isEmpty() && e )
{
@@ -638,7 +638,7 @@ StatisticsList::showContextMenu( TQListViewItem *item, const TQPoint &p, int )
bool hasSQL = !( item->itemType() == StatisticsDetailedItem::TRACK ); //track is url
- KPopupMenu menu( this );
+ TDEPopupMenu menu( this );
enum Actions { APPEND, QUEUE, INFO };
menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND );
@@ -681,8 +681,8 @@ StatisticsList::showContextMenu( TQListViewItem *item, const TQPoint &p, int )
/// CLASS StatisticsItem
//////////////////////////////////////////////////////////////////////////////////////////
-StatisticsItem::StatisticsItem( TQString text, StatisticsList *parent, KListViewItem *after, const char *name )
- : KListViewItem( static_cast<KListView*>(parent), after, name )
+StatisticsItem::StatisticsItem( TQString text, StatisticsList *parent, TDEListViewItem *after, const char *name )
+ : TDEListViewItem( static_cast<TDEListView*>(parent), after, name )
, m_animTimer( new TQTimer( this ) )
, m_animCount( 0 )
, m_isActive( false )
@@ -779,7 +779,7 @@ StatisticsItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int
if( buffer.isNull() )
{
- KListViewItem::paintCell( p, cg, column, width, align );
+ TDEListViewItem::paintCell( p, cg, column, width, align );
return;
}
@@ -787,7 +787,7 @@ StatisticsItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int
TQPainter pBuf( &buffer, true );
- KListView *lv = static_cast<KListView *>( listView() );
+ TDEListView *lv = static_cast<TDEListView *>( listView() );
TQFont font( p->font() );
font.setBold( true );
@@ -859,7 +859,7 @@ StatisticsItem::blendColors( const TQColor& color1, const TQColor& color2, int p
StatisticsDetailedItem::StatisticsDetailedItem( const TQString &text, const TQString &subtext, StatisticsItem *parent,
StatisticsDetailedItem *after, const char *name )
- : KListViewItem( parent, after, name )
+ : TDEListViewItem( parent, after, name )
, m_type( NONE )
, m_subText( subtext )
{
@@ -881,7 +881,7 @@ StatisticsDetailedItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col
if( buffer.isNull() )
{
- KListViewItem::paintCell( p, cg, column, width, align );
+ TDEListViewItem::paintCell( p, cg, column, width, align );
return;
}
@@ -893,7 +893,7 @@ StatisticsDetailedItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col
pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor(0) );
#endif
- KListView *lv = static_cast<KListView *>( listView() );
+ TDEListView *lv = static_cast<TDEListView *>( listView() );
TQFont font( p->font() );
TQFontMetrics fm( p->fontMetrics() );
diff --git a/amarok/src/statistics.h b/amarok/src/statistics.h
index 05f3acc0..9e3e41c9 100644
--- a/amarok/src/statistics.h
+++ b/amarok/src/statistics.h
@@ -52,7 +52,7 @@ class Statistics : public KDialogBase
static Statistics *s_instance;
};
-class StatisticsList : public KListView
+class StatisticsList : public TDEListView
{
Q_OBJECT
@@ -91,13 +91,13 @@ class StatisticsList : public KListView
};
/// The listview items which are the headers for the categories
-class StatisticsItem : public TQObject, public KListViewItem
+class StatisticsItem : public TQObject, public TDEListViewItem
{
Q_OBJECT
public:
- StatisticsItem( TQString text, StatisticsList *parent, KListViewItem *after=0, const char *name=0 );
+ StatisticsItem( TQString text, StatisticsList *parent, TDEListViewItem *after=0, const char *name=0 );
~StatisticsItem() {};
void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align );
@@ -136,7 +136,7 @@ class StatisticsItem : public TQObject, public KListViewItem
};
/// Listview items for the children of expanded items (the actual results)
-class StatisticsDetailedItem : public KListViewItem
+class StatisticsDetailedItem : public TDEListViewItem
{
public:
StatisticsDetailedItem( const TQString &text, const TQString &subtext, StatisticsItem *parent,
diff --git a/amarok/src/statusbar/queueLabel.cpp b/amarok/src/statusbar/queueLabel.cpp
index a1480dad..fc14829f 100644
--- a/amarok/src/statusbar/queueLabel.cpp
+++ b/amarok/src/statusbar/queueLabel.cpp
@@ -167,9 +167,9 @@ void QueueLabel::mousePressEvent( TQMouseEvent* mouseEvent )
if( s > 0 ) length += s;
}
- TQPtrList<KPopupMenu> menus;
+ TQPtrList<TDEPopupMenu> menus;
menus.setAutoDelete( true );
- KPopupMenu *menu = new KPopupMenu;
+ TDEPopupMenu *menu = new TDEPopupMenu;
menus.append( menu );
const uint count = queue.count();
@@ -195,7 +195,7 @@ void QueueLabel::mousePressEvent( TQMouseEvent* mouseEvent )
if( i < count )
{
- menus.append( new KPopupMenu );
+ menus.append( new TDEPopupMenu );
menu->insertSeparator();
menu->insertItem( i18n( "1 More Track", "%n More Tracks", count - i + 1 ), menus.getLast() );
menu = menus.getLast();
diff --git a/amarok/src/statusbar/selectLabel.h b/amarok/src/statusbar/selectLabel.h
index 37738db9..d30c8df5 100644
--- a/amarok/src/statusbar/selectLabel.h
+++ b/amarok/src/statusbar/selectLabel.h
@@ -134,7 +134,7 @@ class SelectLabel : public TQLabel
else if( AmarokConfig::favorTracks() &&
m_action == Amarok::actionCollection()->action( "random_mode" ) ) //hack?
{
- KSelectAction *a = static_cast<KSelectAction*>( Amarok::actionCollection()->action( "favor_tracks" ) );
+ TDESelectAction *a = static_cast<TDESelectAction*>( Amarok::actionCollection()->action( "favor_tracks" ) );
tip += TQString("<br><br>") + i18n("%1: %2")
.arg( a->text().remove( '&' ), a->currentText().remove( '&' ) );
}
diff --git a/amarok/src/statusbar/statusbar.cpp b/amarok/src/statusbar/statusbar.cpp
index b6dad191..0b4a666c 100644
--- a/amarok/src/statusbar/statusbar.cpp
+++ b/amarok/src/statusbar/statusbar.cpp
@@ -47,7 +47,7 @@
namespace Amarok {
-KAction *action( const char *name ) { return Amarok::actionCollection()->action( name ); }
+TDEAction *action( const char *name ) { return Amarok::actionCollection()->action( name ); }
//TODO disable hide statusbar? or show when required? that sucks though.
diff --git a/amarok/src/statusbar/toggleLabel.h b/amarok/src/statusbar/toggleLabel.h
index 7c840c38..a1d2cca9 100644
--- a/amarok/src/statusbar/toggleLabel.h
+++ b/amarok/src/statusbar/toggleLabel.h
@@ -40,13 +40,13 @@ class ToggleLabel : public TQLabel
Q_OBJECT
- KToggleAction const*const m_action;
+ TDEToggleAction const*const m_action;
signals:
void toggled( bool );
public:
- ToggleLabel( KToggleAction const*const action, TQWidget *parent )
+ ToggleLabel( TDEToggleAction const*const action, TQWidget *parent )
: TQLabel( parent )
, m_action( action )
, m_tooltip( 0 )
diff --git a/amarok/src/systray.cpp b/amarok/src/systray.cpp
index 7bfa39e3..c1315882 100644
--- a/amarok/src/systray.cpp
+++ b/amarok/src/systray.cpp
@@ -41,7 +41,7 @@ Amarok::TrayIcon::TrayIcon( TQWidget *playerWidget )
, overlayVisible( false )
, m_lastFmMode( false )
{
- KActionCollection* const ac = Amarok::actionCollection();
+ TDEActionCollection* const ac = Amarok::actionCollection();
setAcceptDrops( true );
@@ -51,7 +51,7 @@ Amarok::TrayIcon::TrayIcon( TQWidget *playerWidget )
ac->action( "next" )->plug( contextMenu() );
//seems to be necessary
- KAction *quit = actionCollection()->action( "file_quit" );
+ TDEAction *quit = actionCollection()->action( "file_quit" );
quit->disconnect();
connect( quit, TQT_SIGNAL(activated()), kapp, TQT_SLOT(quit()) );
@@ -272,7 +272,7 @@ Amarok::TrayIcon::setLastFm( bool lastFmActive )
static int separatorId = 0;
- KActionCollection* const ac = Amarok::actionCollection();
+ TDEActionCollection* const ac = Amarok::actionCollection();
if( ac->action( "ban" ) == 0 ) return; //if the LastFm::Controller doesn't exist yet
if( lastFmActive )
diff --git a/amarok/src/tagguesserconfigdialog.ui b/amarok/src/tagguesserconfigdialog.ui
index abe81601..7c6ac774 100644
--- a/amarok/src/tagguesserconfigdialog.ui
+++ b/amarok/src/tagguesserconfigdialog.ui
@@ -20,7 +20,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView" row="0" column="0" rowspan="7" colspan="1">
+ <widget class="TDEListView" row="0" column="0" rowspan="7" colspan="1">
<column>
<property name="text">
<string>File Name Scheme</string>
diff --git a/amarok/src/tagguesserconfigdialog.ui.h b/amarok/src/tagguesserconfigdialog.ui.h
index 07033c7b..fc7be1fc 100644
--- a/amarok/src/tagguesserconfigdialog.ui.h
+++ b/amarok/src/tagguesserconfigdialog.ui.h
@@ -43,7 +43,7 @@ void TagGuesserConfigDialog::init()
TQStringList::ConstIterator it = schemes.begin();
TQStringList::ConstIterator end = schemes.end();
for ( ; it != end; ++it ) {
- KListViewItem *item = new KListViewItem( lvSchemes, *it );
+ TDEListViewItem *item = new TDEListViewItem( lvSchemes, *it );
item->moveItem( lvSchemes->lastItem() );
}
@@ -119,7 +119,7 @@ void TagGuesserConfigDialog::slotMoveDownClicked()
void TagGuesserConfigDialog::slotAddClicked()
{
- KListViewItem *item = new KListViewItem( lvSchemes );
+ TDEListViewItem *item = new TDEListViewItem( lvSchemes );
lvSchemes->rename(item, 0);
}
diff --git a/amarok/src/trackpickerdialog.cpp b/amarok/src/trackpickerdialog.cpp
index aa3c8eda..743d9c8f 100644
--- a/amarok/src/trackpickerdialog.cpp
+++ b/amarok/src/trackpickerdialog.cpp
@@ -28,11 +28,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/amarok/src/trackpickerdialogbase.ui b/amarok/src/trackpickerdialogbase.ui
index 4352b51b..f7e2172a 100644
--- a/amarok/src/trackpickerdialogbase.ui
+++ b/amarok/src/trackpickerdialogbase.ui
@@ -86,7 +86,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Title</string>
diff --git a/doc/et/develop.docbook b/doc/et/develop.docbook
index 14742793..542fffdd 100644
--- a/doc/et/develop.docbook
+++ b/doc/et/develop.docbook
@@ -152,7 +152,7 @@
<entry
>playlistitem.cpp</entry>
<entry
->KListViewItem-i järglane, lugude nimekirja elemendid.</entry>
+>TDEListViewItem-i järglane, lugude nimekirja elemendid.</entry>
</row>
<row>
diff --git a/doc/it/develop.docbook b/doc/it/develop.docbook
index 17420da9..f58624a6 100644
--- a/doc/it/develop.docbook
+++ b/doc/it/develop.docbook
@@ -152,7 +152,7 @@
<entry
>playlistitem.cpp</entry>
<entry
->Derivato da KListViewItem, articoli della playlist.</entry>
+>Derivato da TDEListViewItem, articoli della playlist.</entry>
</row>
<row>
diff --git a/doc/nl/develop.docbook b/doc/nl/develop.docbook
index de8cb11e..77e9cbd9 100644
--- a/doc/nl/develop.docbook
+++ b/doc/nl/develop.docbook
@@ -152,7 +152,7 @@
<entry
>playlistitem.cpp</entry>
<entry
->Afgeleid van KListViewItem, playlist-items.</entry>
+>Afgeleid van TDEListViewItem, playlist-items.</entry>
</row>
<row>
diff --git a/doc/pt/develop.docbook b/doc/pt/develop.docbook
index f75eee98..2e99af42 100644
--- a/doc/pt/develop.docbook
+++ b/doc/pt/develop.docbook
@@ -152,7 +152,7 @@
<entry
>playlistitem.cpp</entry>
<entry
->Derivador da KListViewItem, itens da lista de reprodução.</entry>
+>Derivador da TDEListViewItem, itens da lista de reprodução.</entry>
</row>
<row>
diff --git a/doc/sv/develop.docbook b/doc/sv/develop.docbook
index 314daf15..39084c78 100644
--- a/doc/sv/develop.docbook
+++ b/doc/sv/develop.docbook
@@ -152,7 +152,7 @@
<entry
>playlistitem.cpp</entry>
<entry
->Härledd från KListViewItem, spellistans objekt.</entry>
+>Härledd från TDEListViewItem, spellistans objekt.</entry>
</row>
<row>