diff options
Diffstat (limited to 'amarok/src/app.cpp')
| -rw-r--r-- | amarok/src/app.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp index c66f25b9..05301df7 100644 --- a/amarok/src/app.cpp +++ b/amarok/src/app.cpp @@ -442,7 +442,7 @@ void App::initGlobalShortcuts() m_pGlobalAccel->insert( "stop", i18n( "Stop" ), 0, KKey("WIN+v"), 0, ec, TQT_SLOT( stop() ), true, true ); 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, ec, TQT_SLOT( next() ), true, true ); 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, ec, TQT_SLOT( seekBackward() ), true, true ); 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, - TQT_TQOBJECT(m_pPlaylistWindow), TQT_SLOT( showHide() ), true, true ); + m_pPlaylistWindow, TQT_SLOT( showHide() ), true, true ); #ifdef TQ_WS_X11 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 m_pGlobalAccel->insert( "mute", i18n( "Mute Volume" ), 0, KKey("WIN+m"), 0, ec, TQT_SLOT( mute() ), true, true ); 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, - 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, - 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, - 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, - TQT_TQOBJECT(this), TQT_SLOT( setRating5() ), true, true ); + this, TQT_SLOT( setRating5() ), true, true ); m_pGlobalAccel->setConfigGroup( "Shortcuts" ); m_pGlobalAccel->readSettings( kapp->config() ); @@ -779,7 +779,7 @@ App::continueInit() CollectionDB::instance()->checkDatabase(); m_pMediaDeviceManager = MediaDeviceManager::instance(); - m_pGlobalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this) ); + m_pGlobalAccel = new TDEGlobalAccel( this ); m_pPlaylistWindow = new PlaylistWindow(); #ifdef TQ_WS_X11 m_pTray = new Amarok::TrayIcon( m_pPlaylistWindow ); @@ -854,8 +854,8 @@ App::applyColorScheme() TQColorGroup group; using Amarok::ColorScheme::AltBase; int h, s, v; - TQWidget* const browserBar = TQT_TQWIDGET( playlistWindow()->child( "BrowserBar" ) ); - TQWidget* const contextBrowser = TQT_TQWIDGET( ContextBrowser::instance() ); + TQWidget* const browserBar = static_cast<TQWidget*>( playlistWindow()->child( "BrowserBar" ) ); + TQWidget* const contextBrowser = ContextBrowser::instance(); if( AmarokConfig::schemeKDE() ) { @@ -951,7 +951,7 @@ App::applyColorScheme() // set the TDEListView alternate colours TQObjectList* const list = playlistWindow()->queryList( "TDEListView" ); 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! } @@ -1271,8 +1271,8 @@ void App::slotTrashResult( TDEIO::Job *job ) TQWidget *App::mainWindow() const { - return AmarokConfig::showPlayerWindow() ? TQT_TQWIDGET( m_pPlayerWindow ) - : TQT_TQWIDGET( m_pPlaylistWindow ); + return AmarokConfig::showPlayerWindow() ? static_cast<TQWidget*>( m_pPlayerWindow ) + : static_cast<TQWidget*>( m_pPlaylistWindow ); } void App::quit() |