TDE
/
amarok
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/amarok
0
0
Fork 0
Code Issues Releases Wiki Activity

Replaced various '#define' with actual strings - part 6

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 90b4fd9bf1)
r14.1.x
Michele Calgaro 12 months ago
parent a96355179a
commit 97c254f28f
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
26 changed files with 124 additions and 124 deletions
Show Stats Download Patch File Download Diff File

30
amarok/src/app.cpp
Unescape View File

@ -442,7 +442,7 @@ void App::initGlobalShortcuts()
m_pGlobalAccel->insert( "stop", i18n( "Stop" ), 0, KKey("WIN+v"), 0, m_pGlobalAccel->insert( "stop", i18n( "Stop" ), 0, KKey("WIN+v"), 0,
ec, TQT_SLOT( stop() ), true, true ); ec, TQT_SLOT( stop() ), true, true );
m_pGlobalAccel->insert( "stop_after_global", i18n( "Stop Playing After Current Track" ), 0, KKey("WIN+CTRL+v"), 0, m_pGlobalAccel->insert( "stop_after_global", i18n( "Stop Playing After Current Track" ), 0, KKey("WIN+CTRL+v"), 0,
TQT_TQOBJECT(Playlist::instance()->qscrollview()), TQT_SLOT( toggleStopAfterCurrentTrack() ), true, true ); Playlist::instance()->qscrollview(), TQT_SLOT( toggleStopAfterCurrentTrack() ), true, true );
m_pGlobalAccel->insert( "next", i18n( "Next Track" ), 0, KKey("WIN+b"), 0, m_pGlobalAccel->insert( "next", i18n( "Next Track" ), 0, KKey("WIN+b"), 0,
ec, TQT_SLOT( next() ), true, true ); ec, TQT_SLOT( next() ), true, true );
m_pGlobalAccel->insert( "prev", i18n( "Previous Track" ), 0, KKey("WIN+z"), 0, m_pGlobalAccel->insert( "prev", i18n( "Previous Track" ), 0, KKey("WIN+z"), 0,
@ -456,26 +456,26 @@ void App::initGlobalShortcuts()
m_pGlobalAccel->insert( "seekbackward", i18n( "Seek Backward" ), 0, KKey("WIN+Shift+KP_Subtract"), 0, m_pGlobalAccel->insert( "seekbackward", i18n( "Seek Backward" ), 0, KKey("WIN+Shift+KP_Subtract"), 0,
ec, TQT_SLOT( seekBackward() ), true, true ); ec, TQT_SLOT( seekBackward() ), true, true );
m_pGlobalAccel->insert( "playlist_add", i18n( "Add Media..." ), 0, KKey("WIN+a"), 0, m_pGlobalAccel->insert( "playlist_add", i18n( "Add Media..." ), 0, KKey("WIN+a"), 0,
TQT_TQOBJECT(m_pPlaylistWindow), TQT_SLOT( slotAddLocation() ), true, true ); m_pPlaylistWindow, TQT_SLOT( slotAddLocation() ), true, true );
m_pGlobalAccel->insert( "show", i18n( "Toggle Playlist Window" ), 0, KKey("WIN+p"), 0, m_pGlobalAccel->insert( "show", i18n( "Toggle Playlist Window" ), 0, KKey("WIN+p"), 0,
TQT_TQOBJECT(m_pPlaylistWindow), TQT_SLOT( showHide() ), true, true ); m_pPlaylistWindow, TQT_SLOT( showHide() ), true, true );
#ifdef TQ_WS_X11 #ifdef TQ_WS_X11
m_pGlobalAccel->insert( "osd", i18n( "Show OSD" ), 0, KKey("WIN+o"), 0, m_pGlobalAccel->insert( "osd", i18n( "Show OSD" ), 0, KKey("WIN+o"), 0,
TQT_TQOBJECT(Amarok::OSD::instance()), TQT_SLOT( forceToggleOSD() ), true, true ); Amarok::OSD::instance(), TQT_SLOT( forceToggleOSD() ), true, true );
#endif #endif
m_pGlobalAccel->insert( "mute", i18n( "Mute Volume" ), 0, KKey("WIN+m"), 0, m_pGlobalAccel->insert( "mute", i18n( "Mute Volume" ), 0, KKey("WIN+m"), 0,
ec, TQT_SLOT( mute() ), true, true ); ec, TQT_SLOT( mute() ), true, true );
m_pGlobalAccel->insert( "rating1", i18n( "Rate Current Track: 1" ), 0, KKey("WIN+1"), 0, m_pGlobalAccel->insert( "rating1", i18n( "Rate Current Track: 1" ), 0, KKey("WIN+1"), 0,
TQT_TQOBJECT(this), TQT_SLOT( setRating1() ), true, true ); this, TQT_SLOT( setRating1() ), true, true );
m_pGlobalAccel->insert( "rating2", i18n( "Rate Current Track: 2" ), 0, KKey("WIN+2"), 0, m_pGlobalAccel->insert( "rating2", i18n( "Rate Current Track: 2" ), 0, KKey("WIN+2"), 0,
TQT_TQOBJECT(this), TQT_SLOT( setRating2() ), true, true ); this, TQT_SLOT( setRating2() ), true, true );
m_pGlobalAccel->insert( "rating3", i18n( "Rate Current Track: 3" ), 0, KKey("WIN+3"), 0, m_pGlobalAccel->insert( "rating3", i18n( "Rate Current Track: 3" ), 0, KKey("WIN+3"), 0,
TQT_TQOBJECT(this), TQT_SLOT( setRating3() ), true, true ); this, TQT_SLOT( setRating3() ), true, true );
m_pGlobalAccel->insert( "rating4", i18n( "Rate Current Track: 4" ), 0, KKey("WIN+4"), 0, m_pGlobalAccel->insert( "rating4", i18n( "Rate Current Track: 4" ), 0, KKey("WIN+4"), 0,
TQT_TQOBJECT(this), TQT_SLOT( setRating4() ), true, true ); this, TQT_SLOT( setRating4() ), true, true );
m_pGlobalAccel->insert( "rating5", i18n( "Rate Current Track: 5" ), 0, KKey("WIN+5"), 0, m_pGlobalAccel->insert( "rating5", i18n( "Rate Current Track: 5" ), 0, KKey("WIN+5"), 0,
TQT_TQOBJECT(this), TQT_SLOT( setRating5() ), true, true ); this, TQT_SLOT( setRating5() ), true, true );
m_pGlobalAccel->setConfigGroup( "Shortcuts" ); m_pGlobalAccel->setConfigGroup( "Shortcuts" );
m_pGlobalAccel->readSettings( kapp->config() ); m_pGlobalAccel->readSettings( kapp->config() );
@ -779,7 +779,7 @@ App::continueInit()
CollectionDB::instance()->checkDatabase(); CollectionDB::instance()->checkDatabase();
m_pMediaDeviceManager = MediaDeviceManager::instance(); m_pMediaDeviceManager = MediaDeviceManager::instance();
m_pGlobalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this) ); m_pGlobalAccel = new TDEGlobalAccel( this );
m_pPlaylistWindow = new PlaylistWindow(); m_pPlaylistWindow = new PlaylistWindow();
#ifdef TQ_WS_X11 #ifdef TQ_WS_X11
m_pTray = new Amarok::TrayIcon( m_pPlaylistWindow ); m_pTray = new Amarok::TrayIcon( m_pPlaylistWindow );
@ -854,8 +854,8 @@ App::applyColorScheme()
TQColorGroup group; TQColorGroup group;
using Amarok::ColorScheme::AltBase; using Amarok::ColorScheme::AltBase;
int h, s, v; int h, s, v;
TQWidget* const browserBar = TQT_TQWIDGET( playlistWindow()->child( "BrowserBar" ) ); TQWidget* const browserBar = static_cast<TQWidget*>( playlistWindow()->child( "BrowserBar" ) );
TQWidget* const contextBrowser = TQT_TQWIDGET( ContextBrowser::instance() ); TQWidget* const contextBrowser = ContextBrowser::instance();
if( AmarokConfig::schemeKDE() ) if( AmarokConfig::schemeKDE() )
{ {
@ -951,7 +951,7 @@ App::applyColorScheme()
// set the TDEListView alternate colours // set the TDEListView alternate colours
TQObjectList* const list = playlistWindow()->queryList( "TDEListView" ); TQObjectList* const list = playlistWindow()->queryList( "TDEListView" );
for( TQObject *o = list->first(); o; o = list->next() ) for( TQObject *o = list->first(); o; o = list->next() )
static_cast<TDEListView*>(TQT_TQWIDGET(o))->setAlternateBackground( AltBase ); static_cast<TDEListView*>(o)->setAlternateBackground( AltBase );
delete list; //heap allocated! delete list; //heap allocated!
} }
@ -1271,8 +1271,8 @@ void App::slotTrashResult( TDEIO::Job *job )
TQWidget *App::mainWindow() const TQWidget *App::mainWindow() const
{ {
return AmarokConfig::showPlayerWindow() ? TQT_TQWIDGET( m_pPlayerWindow ) return AmarokConfig::showPlayerWindow() ? static_cast<TQWidget*>( m_pPlayerWindow )
: TQT_TQWIDGET( m_pPlaylistWindow ); : static_cast<TQWidget*>( m_pPlaylistWindow );
} }
void App::quit() void App::quit()

8
amarok/src/browserbar.cpp
Unescape View File

@ -54,7 +54,7 @@ namespace Amarok
virtual void mouseMoveEvent( TQMouseEvent *e ) virtual void mouseMoveEvent( TQMouseEvent *e )
{ {
static_cast<BrowserBar*>(TQT_TQWIDGET(parent()))->mouseMovedOverSplitter( e ); static_cast<BrowserBar*>(parent())->mouseMovedOverSplitter( e );
} }
}; };
} }
@ -69,7 +69,7 @@ BrowserBar::BrowserBar( TQWidget *parent )
, m_browserBox( new TQVBox( this ) ) , m_browserBox( new TQVBox( this ) )
, m_currentIndex( -1 ) , m_currentIndex( -1 )
, m_lastIndex( -1 ) , m_lastIndex( -1 )
, m_mapper( new TQSignalMapper( TQT_TQOBJECT(this) ) ) , m_mapper( new TQSignalMapper( this ) )
{ {
m_tabManagementButton = new TQPushButton( SmallIconSet(Amarok::icon( "configure" )), 0, this, "tab_managment_button" ); m_tabManagementButton = new TQPushButton( SmallIconSet(Amarok::icon( "configure" )), 0, this, "tab_managment_button" );
connect (m_tabManagementButton, TQT_SIGNAL(clicked()), TQT_SLOT(showBrowserSelectionMenu())); connect (m_tabManagementButton, TQT_SIGNAL(clicked()), TQT_SLOT(showBrowserSelectionMenu()));
@ -259,7 +259,7 @@ BrowserBar::addBrowser( const TQString &identifier, TQWidget *widget, const TQSt
//we use a SignalMapper to show/hide the corresponding browser when tabs are clicked //we use a SignalMapper to show/hide the corresponding browser when tabs are clicked
connect( tab, TQT_SIGNAL(clicked()), m_mapper, TQT_SLOT(map()) ); connect( tab, TQT_SIGNAL(clicked()), m_mapper, TQT_SLOT(map()) );
m_mapper->setMapping( TQT_TQOBJECT(tab), id ); m_mapper->setMapping( tab, id );
connect( tab, TQT_SIGNAL(initiateDrag ( int ) ), this, TQT_SLOT( showBrowser( int )) ); connect( tab, TQT_SIGNAL(initiateDrag ( int ) ), this, TQT_SLOT( showBrowser( int )) );
m_browsers.push_back( widget ); m_browsers.push_back( widget );
@ -273,7 +273,7 @@ BrowserBar::removeMediaBrowser( TQWidget *widget )
m_browsers.erase( it ); m_browsers.erase( it );
TQWidget *tab; TQWidget *tab;
tab = m_tabBar->tab( m_browserIds["MediaBrowser"] ); tab = m_tabBar->tab( m_browserIds["MediaBrowser"] );
m_mapper->removeMappings( TQT_TQOBJECT(tab) ); m_mapper->removeMappings( tab );
m_tabBar->removeTab( m_browserIds["MediaBrowser"] ); m_tabBar->removeTab( m_browserIds["MediaBrowser"] );
} }

26
amarok/src/collectionbrowser.cpp
Unescape View File

@ -149,10 +149,10 @@ CollectionBrowser::CollectionBrowser( const char* name )
m_view = new CollectionView( this ); m_view = new CollectionView( this );
m_view->installEventFilter( this ); m_view->installEventFilter( this );
m_configureAction = new TDEAction( i18n( "Configure Folders" ), Amarok::icon( "configure" ), 0, TQT_TQOBJECT(this), TQT_SLOT( setupDirs() ), ac, "Configure" ); m_configureAction = new TDEAction( i18n( "Configure Folders" ), Amarok::icon( "configure" ), 0, 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_treeViewAction = new TDERadioAction( i18n( "Tree View" ), "view_tree", 0, 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_flatViewAction = new TDERadioAction( i18n( "Flat View" ), "view_detailed", 0, 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_ipodViewAction = new TDERadioAction( i18n( "iPod View" ), Amarok::icon("device"), 0, m_view, TQT_SLOT( setIpodMode() ), ac, "iPod View" );
m_treeViewAction->setExclusiveGroup("view mode"); m_treeViewAction->setExclusiveGroup("view mode");
m_flatViewAction->setExclusiveGroup("view mode"); m_flatViewAction->setExclusiveGroup("view mode");
m_ipodViewAction->setExclusiveGroup("view mode"); m_ipodViewAction->setExclusiveGroup("view mode");
@ -169,7 +169,7 @@ CollectionBrowser::CollectionBrowser( const char* name )
break; break;
} }
m_showDividerAction = new TDEToggleAction( i18n( "Show Divider" ), "format-justify-left", 0, TQT_TQOBJECT(this), TQT_SLOT( toggleDivider() ), ac, "Show Divider" ); m_showDividerAction = new TDEToggleAction( i18n( "Show Divider" ), "format-justify-left", 0, this, TQT_SLOT( toggleDivider() ), ac, "Show Divider" );
m_showDividerAction->setChecked(m_view->m_showDivider); m_showDividerAction->setChecked(m_view->m_showDivider);
@ -178,11 +178,11 @@ CollectionBrowser::CollectionBrowser( const char* name )
// browser window; see the "For iPod-style navigation" comments below. // browser window; see the "For iPod-style navigation" comments below.
m_ipodDecrement = new TDEAction( i18n( "Browse backward" ), m_ipodDecrement = new TDEAction( i18n( "Browse backward" ),
TQIconSet( m_view->ipodDecrementIcon(), TQIconSet::Small ), TQIconSet( m_view->ipodDecrementIcon(), TQIconSet::Small ),
0, TQT_TQOBJECT(m_view), TQT_SLOT( decrementDepth() ), ac, 0, m_view, TQT_SLOT( decrementDepth() ), ac,
"iPod Decrement" ); "iPod Decrement" );
m_ipodIncrement = new TDEAction( i18n( "Browse forward" ), m_ipodIncrement = new TDEAction( i18n( "Browse forward" ),
TQIconSet( m_view->ipodIncrementIcon(), TQIconSet::Small ), TQIconSet( m_view->ipodIncrementIcon(), TQIconSet::Small ),
0, TQT_TQOBJECT(m_view), TQT_SLOT( incrementDepth() ), ac, 0, m_view, TQT_SLOT( incrementDepth() ), ac,
"iPod Increment" ); "iPod Increment" );
m_ipodDecrement->plug( m_ipodToolbar ); m_ipodDecrement->plug( m_ipodToolbar );
m_ipodIncrement->plug( m_ipodToolbar ); m_ipodIncrement->plug( m_ipodToolbar );
@ -494,7 +494,7 @@ CollectionView::CollectionView( CollectionBrowser* parent )
//</READ CONFIG> //</READ CONFIG>
TDEActionCollection* ac = new TDEActionCollection( this ); TDEActionCollection* ac = new TDEActionCollection( this );
KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), ac, "collectionview_select_all" ); KStdAction::selectAll( this, TQT_SLOT( selectAll() ), ac, "collectionview_select_all" );
connect( CollectionDB::instance(), TQT_SIGNAL( scanStarted() ), connect( CollectionDB::instance(), TQT_SIGNAL( scanStarted() ),
this, TQT_SLOT( scanStarted() ) ); this, TQT_SLOT( scanStarted() ) );
@ -1759,7 +1759,7 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption,
else else
{ {
m_organizeURLs += Amarok::recursiveUrlExpand( urls ); m_organizeURLs += Amarok::recursiveUrlExpand( urls );
Amarok::StatusBar::instance()->incrementProgressTotalSteps( TQT_TQOBJECT(this), urls.count() ); Amarok::StatusBar::instance()->incrementProgressTotalSteps( this, urls.count() );
return; return;
} }
} }
@ -1831,9 +1831,9 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption,
m_organizeURLs = Amarok::recursiveUrlExpand( urls ); m_organizeURLs = Amarok::recursiveUrlExpand( urls );
m_organizeCopyMode = copy; m_organizeCopyMode = copy;
CollectionDB::instance()->createTables( true ); // create temp tables CollectionDB::instance()->createTables( true ); // create temp tables
Amarok::StatusBar::instance()->newProgressOperation( TQT_TQOBJECT(this) ) Amarok::StatusBar::instance()->newProgressOperation( this )
.setDescription( caption ) .setDescription( caption )
.setAbortSlot( TQT_TQOBJECT(this), TQT_SLOT( cancelOrganizingFiles() ) ) .setAbortSlot( this, TQT_SLOT( cancelOrganizingFiles() ) )
.setTotalSteps( m_organizeURLs.count() ); .setTotalSteps( m_organizeURLs.count() );
while( !m_organizeURLs.empty() && !m_organizingFileCancelled ) while( !m_organizeURLs.empty() && !m_organizingFileCancelled )
@ -1846,7 +1846,7 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption,
} }
m_organizeURLs.pop_front(); m_organizeURLs.pop_front();
Amarok::StatusBar::instance()->incrementProgress( TQT_TQOBJECT(this) ); Amarok::StatusBar::instance()->incrementProgress( this );
if( m_organizingFileCancelled ) m_organizeURLs.clear(); if( m_organizingFileCancelled ) m_organizeURLs.clear();
} }
@ -1887,7 +1887,7 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption,
m_dirty = true; m_dirty = true;
TQTimer::singleShot( 0, CollectionView::instance(), TQT_SLOT( renderView() ) ); TQTimer::singleShot( 0, CollectionView::instance(), TQT_SLOT( renderView() ) );
Amarok::StatusBar::instance()->endProgressOperation( TQT_TQOBJECT(this) ); Amarok::StatusBar::instance()->endProgressOperation( this );
} }
} }

10
amarok/src/configdialog.cpp
Unescape View File

@ -187,13 +187,13 @@ AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, TDEC
TQObjectList *list = queryList( "TQLabel", "infoPixmap" ); TQObjectList *list = queryList( "TQLabel", "infoPixmap" );
TQPixmap const info = TDEGlobal::iconLoader()->iconPath( "messagebox_info", -TDEIcon::SizeHuge ); TQPixmap const info = TDEGlobal::iconLoader()->iconPath( "messagebox_info", -TDEIcon::SizeHuge );
for( TQObject *label = list->first(); label; label = list->next() ) for( TQObject *label = list->first(); label; label = list->next() )
static_cast<TQLabel*>(TQT_TQWIDGET(label))->setPixmap( info ); static_cast<TQLabel*>(label)->setPixmap( info );
delete list; delete list;
//stop TDEFont Requesters getting stupidly large //stop TDEFont Requesters getting stupidly large
list = queryList( "TQLabel", "m_sampleLabel" ); list = queryList( "TQLabel", "m_sampleLabel" );
for( TQObject *label = list->first(); label; label = list->next() ) for( TQObject *label = list->first(); label; label = list->next() )
static_cast<TQLabel*>(TQT_TQWIDGET(label))->setMaximumWidth( 250 ); static_cast<TQLabel*>(label)->setMaximumWidth( 250 );
delete list; delete list;
connect( m_deviceManager, TQT_SIGNAL(changed()), TQT_SLOT(updateButtons()) ); connect( m_deviceManager, TQT_SIGNAL(changed()), TQT_SLOT(updateButtons()) );
@ -263,13 +263,13 @@ void AmarokConfigDialog::updateButtons()
void AmarokConfigDialog::updateSettings() void AmarokConfigDialog::updateSettings()
{ {
#ifdef TQ_WS_X11 #ifdef TQ_WS_X11
OSDPreviewWidget *osd = static_cast<OSDPreviewWidget*>( TQT_TQWIDGET(child( "osdpreview" )) ); OSDPreviewWidget *osd = static_cast<OSDPreviewWidget*>( child( "osdpreview" ) );
AmarokConfig::setOsdAlignment( osd->alignment() ); AmarokConfig::setOsdAlignment( osd->alignment() );
AmarokConfig::setOsdYOffset( osd->y() ); AmarokConfig::setOsdYOffset( osd->y() );
Amarok::OSD::instance()->applySettings(); Amarok::OSD::instance()->applySettings();
#endif #endif
static_cast<CollectionSetup*>(TQT_TQWIDGET(child("CollectionSetup")))->writeConfig(); static_cast<CollectionSetup*>(child("CollectionSetup"))->writeConfig();
if ( m_engineConfig ) m_engineConfig->save(); if ( m_engineConfig ) m_engineConfig->save();
@ -352,7 +352,7 @@ void AmarokConfigDialog::updateWidgetsDefault()
bool AmarokConfigDialog::hasChanged() bool AmarokConfigDialog::hasChanged()
{ {
#ifdef TQ_WS_X11 #ifdef TQ_WS_X11
OSDPreviewWidget *osd = static_cast<OSDPreviewWidget*>( TQT_TQWIDGET(child( "osdpreview" )) ); OSDPreviewWidget *osd = static_cast<OSDPreviewWidget*>( child( "osdpreview" ) );
#endif #endif
return m_soundSystem->currentText() != m_pluginAmarokName[AmarokConfig::soundSystem()] || return m_soundSystem->currentText() != m_pluginAmarokName[AmarokConfig::soundSystem()] ||

4
amarok/src/contextbrowser.cpp
Unescape View File

@ -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(textChanged(const TQString &)), this, TQT_SLOT(lyricsSearchText(const TQString & )) );
connect ( m_lyricsSearchText, TQT_SIGNAL(returnPressed()), this, (TQT_SLOT(lyricsSearchTextNext())) ); connect ( m_lyricsSearchText, TQT_SIGNAL(returnPressed()), this, (TQT_SLOT(lyricsSearchTextNext())) );
Amarok::actionCollection()->setAutoConnectShortcuts ( true ); Amarok::actionCollection()->setAutoConnectShortcuts ( true );
new TDEAction( i18n("Search text in lyrics"), TDEShortcut("/"), TQT_TQOBJECT(this),TQT_SLOT( lyricsSearchTextShow() ), Amarok::actionCollection(), "search_text_lyric"); new TDEAction( i18n("Search text in lyrics"), TDEShortcut("/"), this,TQT_SLOT( lyricsSearchTextShow() ), Amarok::actionCollection(), "search_text_lyric");
Amarok::actionCollection()->setAutoConnectShortcuts ( false ); Amarok::actionCollection()->setAutoConnectShortcuts ( false );
} }
@ -1103,7 +1103,7 @@ class CurrentTrackJob : public ThreadManager::DependentJob
{ {
public: public:
CurrentTrackJob( ContextBrowser *parent ) CurrentTrackJob( ContextBrowser *parent )
: ThreadManager::DependentJob( TQT_TQOBJECT(parent), "CurrentTrackJob" ) : ThreadManager::DependentJob( parent, "CurrentTrackJob" )
, b( parent ) , b( parent )
, m_currentTrack( TQDeepCopy<MetaBundle>( EngineController::instance()->bundle() ) ) , m_currentTrack( TQDeepCopy<MetaBundle>( EngineController::instance()->bundle() ) )
, m_isStream( EngineController::engine()->isStream() ) , m_isStream( EngineController::engine()->isStream() )

6
amarok/src/coverfetcher.cpp
Unescape View File

@ -508,7 +508,7 @@ CoverFetcher::attemptAnotherFetch()
connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
} }
TQString query() { return static_cast<KLineEdit*>(TQT_TQWIDGET(child( "Query" )))->text(); } TQString query() { return static_cast<KLineEdit*>(child( "Query" ))->text(); }
}; };
TQString TQString
@ -561,7 +561,7 @@ CoverFetcher::getUserQuery( TQString explanation )
explanation = i18n("Ask Amazon for covers using this query:"); explanation = i18n("Ask Amazon for covers using this query:");
EditSearchDialog dialog( EditSearchDialog dialog(
TQT_TQWIDGET( parent() ), static_cast<TQWidget*>( parent() ),
explanation, explanation,
m_userQuery, m_userQuery,
this ); this );
@ -629,7 +629,7 @@ CoverFetcher::getUserQuery( TQString explanation )
void void
CoverFetcher::showCover() CoverFetcher::showCover()
{ {
CoverFoundDialog dialog( TQT_TQWIDGET( parent() ), m_image, m_currentCoverName ); CoverFoundDialog dialog( static_cast<TQWidget*>( parent() ), m_image, m_currentCoverName );
switch( dialog.exec() ) switch( dialog.exec() )
{ {

2
amarok/src/enginecontroller.cpp
Unescape View File

@ -161,7 +161,7 @@ EngineController::loadEngine( const TQString &engineName )
Amarok::Plugin *plugin = PluginManager::createFromService( *it ); Amarok::Plugin *plugin = PluginManager::createFromService( *it );
if( plugin ) { if( plugin ) {
TQObject *bar = TQT_TQOBJECT(Amarok::StatusBar::instance()); TQObject *bar = Amarok::StatusBar::instance();
EngineBase *engine = static_cast<EngineBase*>( plugin ); EngineBase *engine = static_cast<EngineBase*>( plugin );
connect( engine, TQT_SIGNAL(stateChanged( Engine::State )), connect( engine, TQT_SIGNAL(stateChanged( Engine::State )),

6
amarok/src/filebrowser.cpp
Unescape View File

@ -93,7 +93,7 @@ FileBrowser::FileBrowser( const char * name, Medium * medium )
} }
TDEActionCollection* ac = new TDEActionCollection( this ); TDEActionCollection* ac = new TDEActionCollection( this );
KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), ac, "filebrowser_select_all" ); KStdAction::selectAll( this, TQT_SLOT( selectAll() ), ac, "filebrowser_select_all" );
TDEToolBar *toolbar = new Browser::ToolBar( this ); TDEToolBar *toolbar = new Browser::ToolBar( this );
@ -242,7 +242,7 @@ FileBrowser::FileBrowser( const char * name, Medium * medium )
TDEAction *gotoCurrent = new TDEAction( 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 ); this, TQT_SLOT( gotoCurrentFolder() ), actionCollection );
gotoCurrent->plug( toolbar ); gotoCurrent->plug( toolbar );
disconnect( actionCollection->action( "up" ), TQT_SIGNAL( activated() ), m_dir, TQT_SLOT( cdUp() ) ); disconnect( actionCollection->action( "up" ), TQT_SIGNAL( activated() ), m_dir, TQT_SLOT( cdUp() ) );
@ -638,7 +638,7 @@ SearchPane::toggle( bool toggled )
if ( toggled ) if ( toggled )
m_lineEdit->setFocus(); m_lineEdit->setFocus();
TQT_TQWIDGET(child("container"))->setShown( toggled ); static_cast<TQWidget*>(child("container"))->setShown( toggled );
} }
void void

4
amarok/src/kbookmarkhandler.cpp
Unescape View File

@ -42,11 +42,11 @@ KBookmarkHandler::KBookmarkHandler( KDirOperator *parent, TDEPopupMenu* rootmenu
TQString TQString
KBookmarkHandler::currentURL() const KBookmarkHandler::currentURL() const
{ {
return static_cast<KDirOperator*>(TQT_TQWIDGET(parent()))->url().url(); return static_cast<KDirOperator*>(parent())->url().url();
} }
void void
KBookmarkHandler::openBookmarkURL( const TQString &url ) KBookmarkHandler::openBookmarkURL( const TQString &url )
{ {
static_cast<KDirOperator*>(TQT_TQWIDGET(parent()))->setURL( KURL(url), true ); static_cast<KDirOperator*>(parent())->setURL( KURL(url), true );
} }

2
amarok/src/loader/loader.cpp
Unescape View File

@ -170,7 +170,7 @@ Loader::Loader( TQStringList args )
args.prepend( "amarokapp" ); args.prepend( "amarokapp" );
m_proc = new TQProcess( args, TQT_TQOBJECT(this) ); m_proc = new TQProcess( args, this );
m_proc->setCommunication( TQProcess::Stdout ); m_proc->setCommunication( TQProcess::Stdout );
std::cout << "Amarok: [Loader] Starting amarokapp..\n"; std::cout << "Amarok: [Loader] Starting amarokapp..\n";

2
amarok/src/magnatunebrowser/magnatunebrowser.cpp
Unescape View File

@ -349,7 +349,7 @@ bool MagnatuneBrowser::updateMagnatuneList()
m_listDownloadJob = TDEIO::storedGet( KURL( "http://magnatune.com/info/album_info.xml" ), false, false ); m_listDownloadJob = TDEIO::storedGet( KURL( "http://magnatune.com/info/album_info.xml" ), false, false );
Amarok::StatusBar::instance() ->newProgressOperation( m_listDownloadJob ) Amarok::StatusBar::instance() ->newProgressOperation( m_listDownloadJob )
.setDescription( i18n( "Downloading Magnatune.com Database" ) ) .setDescription( i18n( "Downloading Magnatune.com Database" ) )
.setAbortSlot( TQT_TQOBJECT(this), TQT_SLOT( listDownloadCancelled() ) ); .setAbortSlot( this, TQT_SLOT( listDownloadCancelled() ) );
connect( m_listDownloadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( listDownloadComplete( TDEIO::Job* ) ) ); connect( m_listDownloadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( listDownloadComplete( TDEIO::Job* ) ) );

6
amarok/src/mediabrowser.cpp
Unescape View File

@ -259,7 +259,7 @@ MediaBrowser::MediaBrowser( const char *name )
m_toolbar->insertLineSeparator(); m_toolbar->insertLineSeparator();
// m_toolbar->setIconText( TDEToolBar::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" ); m_toolbar->insertButton( Amarok::icon( "add_playlist" ), CUSTOM, TQT_SIGNAL( clicked() ), this, TQT_SLOT( customClicked() ), true, "custom" );
TQToolTip::add( m_toolbar->getButton(TRANSFER), i18n( "Transfer tracks to media device" ) ); TQToolTip::add( m_toolbar->getButton(TRANSFER), i18n( "Transfer tracks to media device" ) );
m_toolbar->setIconText( TDEToolBar::IconOnly, false ); m_toolbar->setIconText( TDEToolBar::IconOnly, false );
@ -1192,7 +1192,7 @@ MediaView::MediaView( TQWidget* parent, MediaDevice *device )
addColumn( i18n( "Remote Media" ) ); addColumn( i18n( "Remote Media" ) );
TDEActionCollection* ac = new TDEActionCollection( this ); TDEActionCollection* ac = new TDEActionCollection( this );
KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), ac, "mediabrowser_select_all" ); KStdAction::selectAll( this, TQT_SLOT( selectAll() ), ac, "mediabrowser_select_all" );
connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ),
this, TQT_SLOT( rmbPressed( TQListViewItem*, const TQPoint&, int ) ) ); this, TQT_SLOT( rmbPressed( TQListViewItem*, const TQPoint&, int ) ) );
@ -3619,7 +3619,7 @@ MediaQueue::MediaQueue(MediaBrowser *parent)
itemCountChanged(); itemCountChanged();
TDEActionCollection* ac = new TDEActionCollection( this ); TDEActionCollection* ac = new TDEActionCollection( this );
KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), ac, "MediaQueue" ); KStdAction::selectAll( this, TQT_SLOT( selectAll() ), ac, "MediaQueue" );
connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ),
TQT_SLOT( slotShowContextMenu( TQListViewItem*, const TQPoint&, int ) ) ); TQT_SLOT( slotShowContextMenu( TQListViewItem*, const TQPoint&, int ) ) );

2
amarok/src/mediadevice/generic/genericmediadevice.cpp
Unescape View File

@ -889,7 +889,7 @@ GenericMediaDevice::getCapacity( TDEIO::filesize_t *total, TDEIO::filesize_t *av
{ {
if( !m_connected || !KURL::fromPathOrURL( m_medium.mountPoint() ).isLocalFile() ) return false; if( !m_connected || !KURL::fromPathOrURL( m_medium.mountPoint() ).isLocalFile() ) return false;
KDiskFreeSp* kdf = new KDiskFreeSp( TQT_TQOBJECT(m_parent), "generic_kdf" ); KDiskFreeSp* kdf = new KDiskFreeSp( m_parent, "generic_kdf" );
kdf->readDF( m_medium.mountPoint() ); kdf->readDF( m_medium.mountPoint() );
connect(kdf, TQT_SIGNAL(foundMountPoint( const TQString &, unsigned long, unsigned long, unsigned long )), connect(kdf, TQT_SIGNAL(foundMountPoint( const TQString &, unsigned long, unsigned long, unsigned long )),
TQT_SLOT(foundMountPoint( const TQString &, unsigned long, unsigned long, unsigned long ))); TQT_SLOT(foundMountPoint( const TQString &, unsigned long, unsigned long, unsigned long )));

4
amarok/src/organizecollectiondialog.ui.h
Unescape View File

@ -202,8 +202,8 @@ void OrganizeCollectionDialog::slotDetails()
} }
if( dynamic_cast<TQWidget *>(parent()) ) { if( dynamic_cast<TQWidget *>(parent()) ) {
TQT_TQWIDGET(parent())->adjustSize(); static_cast<TQWidget *>(parent())->adjustSize();
TQT_TQWIDGET(parent())->updateGeometry(); static_cast<TQWidget *>(parent())->updateGeometry();
} }
} }

2
amarok/src/playerwindow.cpp
Unescape View File

@ -186,7 +186,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl
} //<TimeLabel> } //<TimeLabel>
m_pButtonEq = new IconButton( TQT_TQWIDGET(this), "eq", TQT_TQOBJECT(this), TQT_SLOT(slotShowEqualizer( bool )) ); m_pButtonEq = new IconButton( this, "eq", this, TQT_SLOT(slotShowEqualizer( bool )) );
m_pButtonEq->setGeometry( 34,85, 28,13 ); m_pButtonEq->setGeometry( 34,85, 28,13 );
//TODO set isOn() //TODO set isOn()

26
amarok/src/playlist.cpp
Unescape View File

@ -320,22 +320,22 @@ Playlist::Playlist( TQWidget *parent )
TDEActionCollection* const ac = Amarok::actionCollection(); TDEActionCollection* const ac = Amarok::actionCollection();
TDEAction *copy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( copyToClipboard() ), ac, "playlist_copy" ); TDEAction *copy = KStdAction::copy( this, TQT_SLOT( copyToClipboard() ), ac, "playlist_copy" );
KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), ac, "playlist_select_all" ); KStdAction::selectAll( this, TQT_SLOT( selectAll() ), ac, "playlist_select_all" );
m_clearButton = new TDEAction( 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, this, TQT_SLOT( clear() ), ac, "playlist_clear" );
m_undoButton = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT( undo() ), ac, "playlist_undo" ); m_undoButton = KStdAction::undo( this, TQT_SLOT( undo() ), ac, "playlist_undo" );
m_redoButton = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT( redo() ), ac, "playlist_redo" ); m_redoButton = KStdAction::redo( this, TQT_SLOT( redo() ), ac, "playlist_redo" );
m_undoButton ->setIcon( Amarok::icon( "undo" ) ); m_undoButton ->setIcon( Amarok::icon( "undo" ) );
m_redoButton ->setIcon( Amarok::icon( "redo" ) ); m_redoButton ->setIcon( Amarok::icon( "redo" ) );
new TDEAction( i18n( "&Repopulate" ), Amarok::icon( "playlist_refresh" ), 0, TQT_TQOBJECT(this), TQT_SLOT( repopulate() ), ac, "repopulate" ); new TDEAction( i18n( "&Repopulate" ), Amarok::icon( "playlist_refresh" ), 0, this, TQT_SLOT( repopulate() ), ac, "repopulate" );
new TDEAction( i18n( "S&huffle" ), "rebuild", CTRL+Key_H, TQT_TQOBJECT(this), TQT_SLOT( shuffle() ), ac, "playlist_shuffle" ); new TDEAction( i18n( "S&huffle" ), "rebuild", CTRL+Key_H, 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" ); TDEAction *gotoCurrent = new TDEAction( i18n( "&Go To Current Track" ), Amarok::icon( "music" ), CTRL+Key_J, 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( "&Remove Duplicate && Dead Entries" ), 0, 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" ); new TDEAction( i18n( "&Queue Selected Tracks" ), Amarok::icon( "queue_track" ), CTRL+Key_D, this, TQT_SLOT( queueSelected() ), ac, "queue_selected" );
TDEToggleAction *stopafter = new TDEToggleAction( i18n( "&Stop Playing After Track" ), Amarok::icon( "stop" ), CTRL+ALT+Key_V, 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" ); this, TQT_SLOT( toggleStopAfterCurrentItem() ), ac, "stop_after" );
{ // TDEAction idiocy -- shortcuts don't work until they've been plugged into a menu { // TDEAction idiocy -- shortcuts don't work until they've been plugged into a menu
TDEPopupMenu asdf; TDEPopupMenu asdf;
@ -4830,8 +4830,8 @@ Playlist::showTagDialog( TQPtrList<TQListViewItem> items )
TQT_SLOT(reject()) ); TQT_SLOT(reject()) );
} }
TQString command() { return static_cast<KLineEdit*>(TQT_TQWIDGET(child("Command")))->text(); } TQString command() { return static_cast<KLineEdit*>(child("Command"))->text(); }
TQString name() { return static_cast<KLineEdit*>(TQT_TQWIDGET(child("ColumnName")))->text(); } TQString name() { return static_cast<KLineEdit*>(child("ColumnName"))->text(); }
}; };
void void

12
amarok/src/playlistbrowser.cpp
Unescape View File

@ -175,8 +175,8 @@ PlaylistBrowser::PlaylistBrowser( const char *name )
addMenu->insertItem( i18n("Podcast..."), PODCAST ); addMenu->insertItem( i18n("Podcast..."), PODCAST );
connect( addMenu, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotAddMenu(int) ) ); connect( addMenu, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotAddMenu(int) ) );
renameButton = new TDEAction( i18n("Rename"), "edit-clear", 0, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), m_ac ); renameButton = new TDEAction( i18n("Rename"), "edit-clear", 0, this, TQT_SLOT( renameSelectedItem() ), m_ac );
removeButton = new TDEAction( i18n("Delete"), Amarok::icon( "remove" ), 0, TQT_TQOBJECT(this), TQT_SLOT( removeSelectedItems() ), m_ac ); removeButton = new TDEAction( i18n("Delete"), Amarok::icon( "remove" ), 0, this, TQT_SLOT( removeSelectedItems() ), m_ac );
m_toolbar = new Browser::ToolBar( browserBox ); m_toolbar = new Browser::ToolBar( browserBox );
m_toolbar->setIconText( TDEToolBar::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
@ -350,7 +350,7 @@ PlaylistBrowser::setInfo( const TQString &title, const TQString &info )
void void
PlaylistBrowser::resizeEvent( TQResizeEvent * ) PlaylistBrowser::resizeEvent( TQResizeEvent * )
{ {
if( TQT_TQWIDGET( m_infoPane->child( "container" ) )->isShown() ) if( static_cast<TQWidget*>( m_infoPane->child( "container" ) )->isShown() )
m_infoPane->setMaximumHeight( ( int )( m_splitter->height() / 1.5 ) ); m_infoPane->setMaximumHeight( ( int )( m_splitter->height() / 1.5 ) );
} }
@ -3183,7 +3183,7 @@ InfoPane::~InfoPane()
int int
InfoPane::getHeight() InfoPane::getHeight()
{ {
if( TQT_TQWIDGET( child( "container" ) )->isShown() ) if( static_cast<TQWidget*>( child( "container" ) )->isShown() )
{ {
//If the InfoPane is shown, return true height. //If the InfoPane is shown, return true height.
return static_cast<TQSplitter*>( parentWidget() )->sizes().last(); return static_cast<TQSplitter*>( parentWidget() )->sizes().last();
@ -3227,7 +3227,7 @@ InfoPane::toggle( bool toggled )
setMinimumHeight( 150 ); setMinimumHeight( 150 );
} }
TQT_TQWIDGET( child( "container" ) )->setShown( toggled ); static_cast<TQWidget*>( child( "container" ) )->setShown( toggled );
} }
void void
@ -3237,7 +3237,7 @@ InfoPane::setInfo( const TQString &title, const TQString &info )
//whether there is content to show. Otherwise, just remember what we wanted to do //whether there is content to show. Otherwise, just remember what we wanted to do
//so we can do it later, when the user does hide the pane. //so we can do it later, when the user does hide the pane.
m_enable = !( info.isEmpty() && title.isEmpty() ); m_enable = !( info.isEmpty() && title.isEmpty() );
if ( !TQT_TQWIDGET(child("container"))->isShown() ) if ( !static_cast<TQWidget*>( child("container") )->isShown() )
m_pushButton->setEnabled( m_enable ); m_pushButton->setEnabled( m_enable );
if( m_pushButton->isOn() ) if( m_pushButton->isOn() )

2
amarok/src/playlistloader.cpp
Unescape View File

@ -73,7 +73,7 @@ public:
UrlLoader::UrlLoader( const KURL::List &urls, TQListViewItem *after, int options ) UrlLoader::UrlLoader( const KURL::List &urls, TQListViewItem *after, int options )
: ThreadManager::DependentJob( TQT_TQOBJECT(Playlist::instance()), "UrlLoader" ) : ThreadManager::DependentJob( Playlist::instance(), "UrlLoader" )
, m_markerListViewItem( new PlaylistItem( Playlist::instance(), after ) ) , m_markerListViewItem( new PlaylistItem( Playlist::instance(), after ) )
, m_playFirstUrl( options & (Playlist::StartPlay | Playlist::DirectPlay) ) , m_playFirstUrl( options & (Playlist::StartPlay | Playlist::DirectPlay) )
, m_coloring( options & Playlist::Colorize ) , m_coloring( options & Playlist::Colorize )

38
amarok/src/playlistwindow.cpp
Unescape View File

@ -123,37 +123,37 @@ PlaylistWindow::PlaylistWindow()
new K3bExporter(); new K3bExporter();
KStdAction::configureToolbars( TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigToolBars() ), ac ); KStdAction::configureToolbars( kapp, TQT_SLOT( slotConfigToolBars() ), ac );
KStdAction::keyBindings( TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigShortcuts() ), ac ); KStdAction::keyBindings( kapp, TQT_SLOT( slotConfigShortcuts() ), ac );
KStdAction::keyBindings( TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigGlobalShortcuts() ), ac, "options_configure_globals" ); KStdAction::keyBindings( kapp, TQT_SLOT( slotConfigGlobalShortcuts() ), ac, "options_configure_globals" );
KStdAction::preferences( TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigAmarok() ), ac ); KStdAction::preferences( kapp, TQT_SLOT( slotConfigAmarok() ), ac );
ac->action("options_configure_globals")->setIcon( Amarok::icon( "configure" ) ); ac->action("options_configure_globals")->setIcon( Amarok::icon( "configure" ) );
ac->action(KStdAction::name(KStdAction::KeyBindings))->setIcon( Amarok::icon( "configure" ) ); ac->action(KStdAction::name(KStdAction::KeyBindings))->setIcon( Amarok::icon( "configure" ) );
ac->action(KStdAction::name(KStdAction::ConfigureToolbars))->setIcon( Amarok::icon( "configure" ) ); ac->action(KStdAction::name(KStdAction::ConfigureToolbars))->setIcon( Amarok::icon( "configure" ) );
ac->action(KStdAction::name(KStdAction::Preferences))->setIcon( Amarok::icon( "configure" ) ); ac->action(KStdAction::name(KStdAction::Preferences))->setIcon( Amarok::icon( "configure" ) );
KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), ac ); KStdAction::quit( kapp, TQT_SLOT( quit() ), ac );
KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT(slotAddLocation()), ac, "playlist_add" )->setText( i18n("&Add Media...") ); KStdAction::open( this, TQT_SLOT(slotAddLocation()), ac, "playlist_add" )->setText( i18n("&Add Media...") );
ac->action( "playlist_add" )->setIcon( Amarok::icon( "files" ) ); ac->action( "playlist_add" )->setIcon( Amarok::icon( "files" ) );
KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT(slotAddStream()), ac, "stream_add" )->setText( i18n("&Add Stream...") ); KStdAction::open( this, TQT_SLOT(slotAddStream()), ac, "stream_add" )->setText( i18n("&Add Stream...") );
ac->action( "stream_add" )->setIcon( Amarok::icon( "files" ) ); ac->action( "stream_add" )->setIcon( Amarok::icon( "files" ) );
KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT(savePlaylist()), ac, "playlist_save" )->setText( i18n("&Save Playlist As...") ); KStdAction::save( this, TQT_SLOT(savePlaylist()), ac, "playlist_save" )->setText( i18n("&Save Playlist As...") );
ac->action( "playlist_save" )->setIcon( Amarok::icon( "save" ) ); ac->action( "playlist_save" )->setIcon( Amarok::icon( "save" ) );
#ifndef TQ_WS_MAC #ifndef TQ_WS_MAC
KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotToggleMenu()), ac ); KStdAction::showMenubar( this, TQT_SLOT(slotToggleMenu()), ac );
#endif #endif
//FIXME: after string freeze rename to "Burn Current Playlist"? //FIXME: after string freeze rename to "Burn Current Playlist"?
new TDEAction( 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, this, TQT_SLOT(slotBurnPlaylist()), ac, "playlist_burn" );
actionCollection()->action("playlist_burn")->setEnabled( K3bExporter::isAvailable() ); actionCollection()->action("playlist_burn")->setEnabled( K3bExporter::isAvailable() );
new TDEAction( i18n("Play Media..."), Amarok::icon( "files" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlayMedia()), ac, "playlist_playmedia" ); new TDEAction( i18n("Play Media..."), Amarok::icon( "files" ), 0, 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" ); new TDEAction( i18n("Play Audio CD"), Amarok::icon( "album" ), 0, 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" ); 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("Script Manager"), Amarok::icon( "scripts" ), 0, 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" ); new TDEAction( i18n("Queue Manager"), Amarok::icon( "queue" ), 0, 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 *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" ); 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("Statistics"), Amarok::icon( "info" ), 0, this, TQT_SLOT(showStatistics()), ac, "statistics" );
new TDEAction( i18n("Update Collection"), Amarok::icon( "refresh" ), 0, CollectionDB::instance(), TQT_SLOT( scanModifiedDirs() ), actionCollection(), "update_collection" ); 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" m_lastfmTags << "Alternative" << "Ambient" << "Chill Out" << "Classical" << "Dance"
@ -196,7 +196,7 @@ PlaylistWindow::PlaylistWindow()
new TDEAction( i18n( "Pause" ), Amarok::icon( "pause" ), 0, ec, TQT_SLOT( pause() ), ac, "pause" ); 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" ); new TDEAction( i18n( "Next Track" ), Amarok::icon( "next" ), 0, ec, TQT_SLOT( next() ), ac, "next" );
TDEAction *toggleFocus = new TDEAction( 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, this, TQT_SLOT( slotToggleFocus() ), ac, "toggle_focus" );
{ // TDEAction idiocy -- shortcuts don't work until they've been plugged into a menu { // TDEAction idiocy -- shortcuts don't work until they've been plugged into a menu
@ -368,7 +368,7 @@ void PlaylistWindow::init()
m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "covermanager" ) ), i18n("&Cover Manager"), Amarok::Menu::ID_SHOW_COVER_MANAGER ); m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "covermanager" ) ), i18n("&Cover Manager"), Amarok::Menu::ID_SHOW_COVER_MANAGER );
actionCollection()->action("queue_manager")->plug( m_toolsMenu ); actionCollection()->action("queue_manager")->plug( m_toolsMenu );
m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "visualizations" ) ), i18n("&Visualizations"), Amarok::Menu::ID_SHOW_VIS_SELECTOR ); m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "visualizations" ) ), i18n("&Visualizations"), Amarok::Menu::ID_SHOW_VIS_SELECTOR );
m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "equalizer") ), i18n("&Equalizer"), TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigEqualizer() ), 0, Amarok::Menu::ID_CONFIGURE_EQUALIZER ); m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "equalizer") ), i18n("&Equalizer"), kapp, TQT_SLOT( slotConfigEqualizer() ), 0, Amarok::Menu::ID_CONFIGURE_EQUALIZER );
actionCollection()->action("script_manager")->plug( m_toolsMenu ); actionCollection()->action("script_manager")->plug( m_toolsMenu );
actionCollection()->action("statistics")->plug( m_toolsMenu ); actionCollection()->action("statistics")->plug( m_toolsMenu );
m_toolsMenu->insertSeparator(); m_toolsMenu->insertSeparator();
@ -554,7 +554,7 @@ void PlaylistWindow::createGUI()
(*it)->unplug( m_toolbar ); (*it)->unplug( m_toolbar );
KXMLGUIBuilder builder( this ); KXMLGUIBuilder builder( this );
KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) ); KXMLGUIFactory factory( &builder, this );
//build Toolbar, plug actions //build Toolbar, plug actions
factory.addClient( this ); factory.addClient( this );
@ -578,7 +578,7 @@ void PlaylistWindow::createGUI()
const TQStringList::ConstIterator last = list.fromLast(); const TQStringList::ConstIterator last = list.fromLast();
for( TQStringList::ConstIterator it = list.constBegin(); it != end; ++it ) for( TQStringList::ConstIterator it = list.constBegin(); it != end; ++it )
{ {
TDEToolBarButton* const button = static_cast<TDEToolBarButton*>( TQT_TQWIDGET(m_toolbar->child( (*it).latin1() )) ); TDEToolBarButton* const button = static_cast<TDEToolBarButton*>( m_toolbar->child( (*it).latin1() ) );
if ( it == last ) { if ( it == last ) {
//if the user has no PlayerWindow, he MUST have the menu action plugged //if the user has no PlayerWindow, he MUST have the menu action plugged

2
amarok/src/scriptmanager.cpp
Unescape View File

@ -677,7 +677,7 @@ ScriptManager::slotAboutScript()
about->setCaption( kapp->makeStdCaption( i18n( "About %1" ).arg( name ) ) ); about->setCaption( kapp->makeStdCaption( i18n( "About %1" ).arg( name ) ) );
about->setProduct( "", "", "", "" ); about->setProduct( "", "", "", "" );
// Get rid of the confusing KDE version text // Get rid of the confusing KDE version text
TQLabel* product = static_cast<TQLabel*>( TQT_TQWIDGET(about->mainWidget()->child( "version" )) ); TQLabel* product = static_cast<TQLabel*>( about->mainWidget()->child( "version" ) );
if( product ) product->setText( i18n( "%1 Amarok Script" ).arg( name ) ); if( product ) product->setText( i18n( "%1 Amarok Script" ).arg( name ) );
about->addTextPage( i18n( "About" ), readme.readAll(), true ); about->addTextPage( i18n( "About" ), readme.readAll(), true );

2
amarok/src/smartplaylisteditor.cpp
Unescape View File

@ -864,7 +864,7 @@ void CriteriaEditor::loadEditWidgets()
TQObjectList* list = m_editBox->queryList( "TQWidget" ); TQObjectList* list = m_editBox->queryList( "TQWidget" );
for( TQObject *obj = list->first(); obj; obj = list->next() ) for( TQObject *obj = list->first(); obj; obj = list->next() )
TQT_TQWIDGET(obj)->deleteLater(); obj->deleteLater();
delete list; delete list;

6
amarok/src/socketserver.cpp
Unescape View File

@ -101,7 +101,7 @@ Vis::SocketServer::newConnection( int sockfd )
/// @class Vis::SocketNotifier /// @class Vis::SocketNotifier
Vis::SocketNotifier::SocketNotifier( int sockfd ) Vis::SocketNotifier::SocketNotifier( int sockfd )
: TQSocketNotifier( sockfd, TQSocketNotifier::Read, TQT_TQOBJECT(this) ) : TQSocketNotifier( sockfd, TQSocketNotifier::Read, this )
{ {
connect( this, TQT_SIGNAL(activated( int )), TQT_SLOT(request( int )) ); connect( this, TQT_SIGNAL(activated( int )), TQT_SLOT(request( int )) );
} }
@ -150,12 +150,12 @@ Vis::Selector::instance()
debug() << bool(o == 0) << endl; debug() << bool(o == 0) << endl;
return o ? static_cast<Selector*>( TQT_TQWIDGET(o) ) : new Selector( parent ); return o ? static_cast<Selector*>( o ) : new Selector( parent );
} }
Vis::Selector::Selector( TQWidget *parent ) Vis::Selector::Selector( TQWidget *parent )
: TQListView( parent, "Vis::Selector::instance", TQt::WType_Dialog ) : TQListView( parent, "Vis::Selector::instance", TQt::WType_Dialog )
, m_server( new SocketServer( TQT_TQOBJECT(this) ) ) , m_server( new SocketServer( this ) )
{ {
Amarok::OverrideCursor waitcursor; Amarok::OverrideCursor waitcursor;

10
amarok/src/statusbar/popupMessage.cpp
Unescape View File

@ -97,32 +97,32 @@ void PopupMessage::addWidget( TQWidget *widget )
void PopupMessage::setShowCloseButton( const bool show ) void PopupMessage::setShowCloseButton( const bool show )
{ {
static_cast<KPushButton*>(TQT_TQWIDGET(child( "closeButton" )))->setShown( show ); static_cast<KPushButton*>(child( "closeButton" ))->setShown( show );
adjustSize(); adjustSize();
} }
void PopupMessage::setShowCounter( const bool show ) void PopupMessage::setShowCounter( const bool show )
{ {
m_showCounter = show; m_showCounter = show;
static_cast<TQFrame*>(TQT_TQWIDGET(child( "counterVisual" )))->setShown( show ); static_cast<TQFrame*>(child( "counterVisual" ))->setShown( show );
adjustSize(); adjustSize();
} }
void PopupMessage::setText( const TQString &text ) void PopupMessage::setText( const TQString &text )
{ {
static_cast<KActiveLabel*>(TQT_TQWIDGET(child( "label" )))->setText( text ); static_cast<KActiveLabel*>(child( "label" ))->setText( text );
adjustSize(); adjustSize();
} }
void PopupMessage::setImage( const TQString &location ) void PopupMessage::setImage( const TQString &location )
{ {
static_cast<TQLabel*>(TQT_TQWIDGET(child( "image" )))->setPixmap( TQPixmap( location ) ); static_cast<TQLabel*>(child( "image" ))->setPixmap( TQPixmap( location ) );
adjustSize(); adjustSize();
} }
void PopupMessage::setImage( const TQPixmap &pix ) void PopupMessage::setImage( const TQPixmap &pix )
{ {
static_cast<TQLabel*>(TQT_TQWIDGET(child( "image" )))->setPixmap( pix ); static_cast<TQLabel*>(child( "image" ))->setPixmap( pix );
adjustSize(); adjustSize();
} }

26
amarok/src/statusbar/statusBarBase.cpp
Unescape View File

@ -151,20 +151,20 @@ StatusBar::polish()
TQObjectList *list = queryList( "TQWidget", 0, false, false ); TQObjectList *list = queryList( "TQWidget", 0, false, false );
for( TQObject * o = list->first(); o; o = list->next() ) { for( TQObject * o = list->first(); o; o = list->next() ) {
int _h = TQT_TQWIDGET( o ) ->minimumSizeHint().height(); int _h = static_cast<TQWidget*>( o ) ->minimumSizeHint().height();
if ( _h > h ) if ( _h > h )
h = _h; h = _h;
// debug() << o->className() << ", " << o->name() << ": " << _h << ": " << TQT_TQWIDGET(o)->minimumHeight() << endl; // debug() << o->className() << ", " << o->name() << ": " << _h << ": " << static_cast<TQWidget*>(o)->minimumHeight() << endl;
if ( o->inherits( "TQLabel" ) ) if ( o->inherits( "TQLabel" ) )
static_cast<TQLabel*>(TQT_TQWIDGET(o))->setIndent( 4 ); static_cast<TQLabel*>(o)->setIndent( 4 );
} }
h -= 4; // it's too big usually h -= 4; // it's too big usually
for ( TQObject * o = list->first(); o; o = list->next() ) for ( TQObject * o = list->first(); o; o = list->next() )
TQT_TQWIDGET(o)->setFixedHeight( h ); static_cast<TQWidget*>(o)->setFixedHeight( h );
delete list; delete list;
} }
@ -176,7 +176,7 @@ StatusBar::paintEvent( TQPaintEvent* )
TQPainter p( this ); TQPainter p( this );
for( TQObject * o = list->first(); o; o = list->next() ) { for( TQObject * o = list->first(); o; o = list->next() ) {
TQWidget *w = TQT_TQWIDGET( o ); TQWidget *w = static_cast<TQWidget*>( o );
if ( !w->isVisible() ) if ( !w->isVisible() )
continue; continue;
@ -224,7 +224,7 @@ StatusBar::shortMessage( const TQString &text, bool longShort )
m_mainTextLabel->setText( text ); m_mainTextLabel->setText( text );
m_mainTextLabel->setPalette( TQToolTip::palette() ); m_mainTextLabel->setPalette( TQToolTip::palette() );
SingleShotPool::startTimer( longShort ? 8000 : 5000, TQT_TQOBJECT(this), TQT_SLOT(resetMainText()) ); SingleShotPool::startTimer( longShort ? 8000 : 5000, this, TQT_SLOT(resetMainText()) );
writeLogFile( text ); writeLogFile( text );
} }
@ -236,7 +236,7 @@ StatusBar::resetMainText()
// debug() << sender()->name() << endl; // debug() << sender()->name() << endl;
// don't reset if we are showing a shortMessage // don't reset if we are showing a shortMessage
if( SingleShotPool::isActive( TQT_TQOBJECT(this), TQT_SLOT(resetMainText()) ) ) if( SingleShotPool::isActive( this, TQT_SLOT(resetMainText()) ) )
return; return;
m_mainTextLabel->unsetPalette(); m_mainTextLabel->unsetPalette();
@ -330,7 +330,7 @@ StatusBar::longMessage( const TQString &text, int type )
void void
StatusBar::popupDeleted( TQObject *obj ) StatusBar::popupDeleted( TQObject *obj )
{ {
m_messageQueue.remove( TQT_TQWIDGET( obj ) ); m_messageQueue.remove( static_cast<TQWidget*>( obj ) );
} }
void void
@ -389,7 +389,7 @@ StatusBar::newProgressOperation( TQObject *owner )
// so we can show the correct progress information // so we can show the correct progress information
// after the ProgressBar is setup // after the ProgressBar is setup
SingleShotPool::startTimer( 0, TQT_TQOBJECT(this), TQT_SLOT(updateProgressAppearance()) ); SingleShotPool::startTimer( 0, this, TQT_SLOT(updateProgressAppearance()) );
progressBox()->show(); progressBox()->show();
cancelButton()->setEnabled( true ); cancelButton()->setEnabled( true );
@ -417,7 +417,7 @@ StatusBar::newProgressOperation( TDEIO::Job *job )
void void
StatusBar::endProgressOperation() StatusBar::endProgressOperation()
{ {
TQObject *owner = TQT_TQOBJECT(const_cast<TQObject*>( sender() )); //HACK deconsting it TQObject *owner = const_cast<TQObject*>( sender() );
TDEIO::Job *job = dynamic_cast<TDEIO::Job*>( owner ); TDEIO::Job *job = dynamic_cast<TDEIO::Job*>( owner );
//FIXME doesn't seem to work for TDEIO::DeleteJob, it has it's own error handler and returns no error too //FIXME doesn't seem to work for TDEIO::DeleteJob, it has it's own error handler and returns no error too
@ -439,7 +439,7 @@ StatusBar::endProgressOperation( TQObject *owner )
if ( !m_progressMap.contains( owner ) ) if ( !m_progressMap.contains( owner ) )
{ {
SingleShotPool::startTimer( 2000, TQT_TQOBJECT(this), TQT_SLOT(hideMainProgressBar()) ); SingleShotPool::startTimer( 2000, this, TQT_SLOT(hideMainProgressBar()) );
return ; return ;
} }
@ -447,7 +447,7 @@ StatusBar::endProgressOperation( TQObject *owner )
if( allDone() && !m_popupProgress->isShown() ) { if( allDone() && !m_popupProgress->isShown() ) {
cancelButton()->setEnabled( false ); cancelButton()->setEnabled( false );
SingleShotPool::startTimer( 2000, TQT_TQOBJECT(this), TQT_SLOT(hideMainProgressBar()) ); SingleShotPool::startTimer( 2000, this, TQT_SLOT(hideMainProgressBar()) );
} }
updateTotalProgress(); updateTotalProgress();
@ -471,7 +471,7 @@ StatusBar::toggleProgressWindow( bool show ) //slot
m_popupProgress->setShown( show ); m_popupProgress->setShown( show );
if( !show ) if( !show )
SingleShotPool::startTimer( 2000, TQT_TQOBJECT(this), TQT_SLOT(hideMainProgressBar()) ); SingleShotPool::startTimer( 2000, this, TQT_SLOT(hideMainProgressBar()) );
} }
void void

8
amarok/src/statusbar/statusBarBase.h
Unescape View File

@ -214,10 +214,10 @@ namespace KDE
int m_logCounter; int m_logCounter;
TQWidget *cancelButton() { return TQT_TQWIDGET( child( "cancelButton" ) ); } TQWidget *cancelButton() { return static_cast<TQWidget*>( child( "cancelButton" ) ); }
TQWidget *toggleProgressWindowButton() { return TQT_TQWIDGET( child( "showAllProgressDetails" ) ); } TQWidget *toggleProgressWindowButton() { return static_cast<TQWidget*>( child( "showAllProgressDetails" ) ); }
TQWidget *progressBox() { return TQT_TQWIDGET( child( "progressBox" ) ); } TQWidget *progressBox() { return static_cast<TQWidget*>( child( "progressBox" ) ); }
TQWidget *shortLongButton() { return TQT_TQWIDGET( child( "shortLongButton" ) ); } TQWidget *shortLongButton() { return static_cast<TQWidget*>( child( "shortLongButton" ) ); }
OverlayWidget *m_popupProgress; OverlayWidget *m_popupProgress;
TQProgressBar *m_mainProgressBar; TQProgressBar *m_mainProgressBar;

2
amarok/src/tooltip.cpp
Unescape View File

@ -72,7 +72,7 @@ int Amarok::ToolTip::s_hack = 0;
void Amarok::ToolTip::add( ToolTipClient *client, TQWidget *parent ) //static void Amarok::ToolTip::add( ToolTipClient *client, TQWidget *parent ) //static
{ {
if( !s_manager ) if( !s_manager )
s_manager = new Amarok::ToolTip::Manager( TQT_TQOBJECT(tqApp) ); s_manager = new Amarok::ToolTip::Manager( tqApp );
new ToolTip( client, parent ); new ToolTip( client, parent );
} }

Write Preview
Loading…
Cancel
Save