Browse Source

Rename a number of classes to enhance compatibility with KDE4

pull/1/head
Timothy Pearson 9 years ago
parent
commit
4522f2c3c0
  1. 2
      amarok/HACKING
  2. 6
      amarok/src/Options2.ui
  3. 2
      amarok/src/Options5.ui
  4. 108
      amarok/src/actionclasses.cpp
  5. 50
      amarok/src/actionclasses.h
  6. 10
      amarok/src/amarok.h
  7. 6
      amarok/src/amarokcore/amarokdcophandler.cpp
  8. 2
      amarok/src/analyzers/blockanalyzer.cpp
  9. 14
      amarok/src/app.cpp
  10. 2
      amarok/src/app.h
  11. 4
      amarok/src/browserToolBar.h
  12. 72
      amarok/src/collectionbrowser.cpp
  13. 54
      amarok/src/collectionbrowser.h
  14. 2
      amarok/src/columnlist.cpp
  15. 4
      amarok/src/columnlist.h
  16. 2
      amarok/src/configdialog.cpp
  17. 16
      amarok/src/contextbrowser.cpp
  18. 8
      amarok/src/contextbrowser.h
  19. 2
      amarok/src/coverfetcher.cpp
  20. 20
      amarok/src/covermanager.cpp
  21. 10
      amarok/src/covermanager.h
  22. 2
      amarok/src/deletedialog.h
  23. 2
      amarok/src/deletedialogbase.ui
  24. 10
      amarok/src/engine/nmm/HostList.cpp
  25. 2
      amarok/src/engine/nmm/HostList.h
  26. 4
      amarok/src/engine/nmm/HostListItem.cpp
  27. 2
      amarok/src/engine/nmm/HostListItem.h
  28. 4
      amarok/src/equalizerpresetmanager.cpp
  29. 4
      amarok/src/equalizerpresetmanager.h
  30. 2
      amarok/src/equalizersetup.h
  31. 70
      amarok/src/filebrowser.cpp
  32. 2
      amarok/src/filebrowser.h
  33. 4
      amarok/src/htmlview.cpp
  34. 6
      amarok/src/htmlview.h
  35. 2
      amarok/src/kbookmarkhandler.cpp
  36. 4
      amarok/src/kbookmarkhandler.h
  37. 4
      amarok/src/konquisidebar/universalamarok.cpp
  38. 10
      amarok/src/lastfm.cpp
  39. 4
      amarok/src/lastfm.h
  40. 2
      amarok/src/magnatunebrowser/magnatunebrowser.cpp
  41. 4
      amarok/src/magnatunebrowser/magnatunelistview.cpp
  42. 4
      amarok/src/magnatunebrowser/magnatunelistview.h
  43. 30
      amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
  44. 18
      amarok/src/magnatunebrowser/magnatunelistviewitems.h
  45. 2
      amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp
  46. 2
      amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
  47. 44
      amarok/src/mediabrowser.cpp
  48. 18
      amarok/src/mediabrowser.h
  49. 10
      amarok/src/mediadevice/daap/daapclient.cpp
  50. 2
      amarok/src/mediadevice/daap/daapclient.h
  51. 4
      amarok/src/mediadevice/generic/genericmediadevice.cpp
  52. 4
      amarok/src/mediadevice/ifp/ifpmediadevice.cpp
  53. 18
      amarok/src/mediadevice/ipod/ipodmediadevice.cpp
  54. 6
      amarok/src/mediadevice/ipod/ipodmediadevice.h
  55. 4
      amarok/src/mediadevice/mtp/mtpmediadevice.cpp
  56. 4
      amarok/src/mediadevice/njb/njbmediadevice.cpp
  57. 2
      amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
  58. 4
      amarok/src/multitabbar.cpp
  59. 4
      amarok/src/mydiroperator.cpp
  60. 2
      amarok/src/mydiroperator.h
  61. 4
      amarok/src/playerwindow.cpp
  62. 4
      amarok/src/playerwindow.h
  63. 80
      amarok/src/playlist.cpp
  64. 30
      amarok/src/playlist.h
  65. 24
      amarok/src/playlistbrowser.cpp
  66. 16
      amarok/src/playlistbrowser.h
  67. 36
      amarok/src/playlistbrowseritem.cpp
  68. 10
      amarok/src/playlistbrowseritem.h
  69. 16
      amarok/src/playlistitem.cpp
  70. 6
      amarok/src/playlistitem.h
  71. 2
      amarok/src/playlistselection.cpp
  72. 2
      amarok/src/playlistselection.h
  73. 92
      amarok/src/playlistwindow.cpp
  74. 12
      amarok/src/playlistwindow.h
  75. 14
      amarok/src/prettypopupmenu.cpp
  76. 6
      amarok/src/prettypopupmenu.h
  77. 18
      amarok/src/queuemanager.cpp
  78. 6
      amarok/src/queuemanager.h
  79. 20
      amarok/src/scriptmanager.cpp
  80. 2
      amarok/src/scriptmanagerbase.ui
  81. 2
      amarok/src/sliderwidget.cpp
  82. 2
      amarok/src/socketserver.cpp
  83. 24
      amarok/src/statistics.cpp
  84. 8
      amarok/src/statistics.h
  85. 6
      amarok/src/statusbar/queueLabel.cpp
  86. 2
      amarok/src/statusbar/selectLabel.h
  87. 2
      amarok/src/statusbar/statusbar.cpp
  88. 4
      amarok/src/statusbar/toggleLabel.h
  89. 6
      amarok/src/systray.cpp
  90. 2
      amarok/src/tagguesserconfigdialog.ui
  91. 4
      amarok/src/tagguesserconfigdialog.ui.h
  92. 6
      amarok/src/trackpickerdialog.cpp
  93. 2
      amarok/src/trackpickerdialogbase.ui
  94. 2
      doc/et/develop.docbook
  95. 2
      doc/it/develop.docbook
  96. 2
      doc/nl/develop.docbook
  97. 2
      doc/pt/develop.docbook
  98. 2
      doc/sv/develop.docbook

2
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
|

6
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>

2
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>

108
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;

50
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 );
};

10
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

6
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 );
}

2
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 )

14
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();
}

2
amarok/src/app.h

@ -30,7 +30,7 @@ namespace Amarok {
namespace TDEIO { class Job; }
class KActionCollection;
class TDEActionCollection;
class TDEConfig;
class TDEGlobalAccel;
class MetaBundle;

4
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);

72
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

54
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* );

2
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 );

4
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;
};

2
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 );

16
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&