diff options
Diffstat (limited to 'amarok/src/playlistwindow.cpp')
-rw-r--r-- | amarok/src/playlistwindow.cpp | 130 |
1 files changed, 65 insertions, 65 deletions
diff --git a/amarok/src/playlistwindow.cpp b/amarok/src/playlistwindow.cpp index 1ccbdf99..ce6f7dbe 100644 --- a/amarok/src/playlistwindow.cpp +++ b/amarok/src/playlistwindow.cpp @@ -86,8 +86,8 @@ namespace Amarok class ToolBar : public KToolBar { public: - ToolBar( TQWidget *parent, const char *name ) - : KToolBar( parent, name ) + ToolBar( TQWidget *tqparent, const char *name ) + : KToolBar( tqparent, name ) {} protected: @@ -106,7 +106,7 @@ namespace Amarok PlaylistWindow *PlaylistWindow::s_instance = 0; PlaylistWindow::PlaylistWindow() - : TQWidget( 0, "PlaylistWindow", Qt::WGroupLeader ) + : TQWidget( 0, "PlaylistWindow", TQt::WGroupLeader ) , KXMLGUIClient() , m_lastBrowser( 0 ) { @@ -123,37 +123,37 @@ PlaylistWindow::PlaylistWindow() new K3bExporter(); - KStdAction::configureToolbars( kapp, TQT_SLOT( slotConfigToolBars() ), ac ); - KStdAction::keyBindings( kapp, TQT_SLOT( slotConfigShortcuts() ), ac ); - KStdAction::keyBindings( kapp, TQT_SLOT( slotConfigGlobalShortcuts() ), ac, "options_configure_globals" ); - KStdAction::preferences( kapp, TQT_SLOT( slotConfigAmarok() ), ac ); + KStdAction::configureToolbars( TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigToolBars() ), ac ); + KStdAction::keyBindings( TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigShortcuts() ), ac ); + KStdAction::keyBindings( TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigGlobalShortcuts() ), ac, "options_configure_globals" ); + KStdAction::preferences( TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigAmarok() ), ac ); ac->action("options_configure_globals")->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::Preferences))->setIcon( Amarok::icon( "configure" ) ); - KStdAction::quit( kapp, TQT_SLOT( quit() ), ac ); - KStdAction::open( this, TQT_SLOT(slotAddLocation()), ac, "playlist_add" )->setText( i18n("&Add Media...") ); + KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), ac ); + KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT(slotAddLocation()), ac, "playlist_add" )->setText( i18n("&Add Media...") ); ac->action( "playlist_add" )->setIcon( Amarok::icon( "files" ) ); - KStdAction::open( this, TQT_SLOT(slotAddStream()), ac, "stream_add" )->setText( i18n("&Add Stream...") ); + KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT(slotAddStream()), ac, "stream_add" )->setText( i18n("&Add Stream...") ); ac->action( "stream_add" )->setIcon( Amarok::icon( "files" ) ); - KStdAction::save( this, TQT_SLOT(savePlaylist()), ac, "playlist_save" )->setText( i18n("&Save Playlist As...") ); + KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT(savePlaylist()), ac, "playlist_save" )->setText( i18n("&Save Playlist As...") ); ac->action( "playlist_save" )->setIcon( Amarok::icon( "save" ) ); -#ifndef Q_WS_MAC - KStdAction::showMenubar( this, TQT_SLOT(slotToggleMenu()), ac ); +#ifndef TQ_WS_MAC + KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotToggleMenu()), ac ); #endif //FIXME: after string freeze rename to "Burn Current Playlist"? - new KAction( i18n("Burn to CD"), Amarok::icon( "burn" ), 0, this, TQT_SLOT(slotBurnPlaylist()), ac, "playlist_burn" ); + new KAction( i18n("Burn to CD"), Amarok::icon( "burn" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBurnPlaylist()), ac, "playlist_burn" ); actionCollection()->action("playlist_burn")->setEnabled( K3bExporter::isAvailable() ); - new KAction( i18n("Play Media..."), Amarok::icon( "files" ), 0, this, TQT_SLOT(slotPlayMedia()), ac, "playlist_playmedia" ); - new KAction( i18n("Play Audio CD"), Amarok::icon( "album" ), 0, this, TQT_SLOT(playAudioCD()), ac, "play_audiocd" ); + new KAction( i18n("Play Media..."), Amarok::icon( "files" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlayMedia()), ac, "playlist_playmedia" ); + new KAction( i18n("Play Audio CD"), Amarok::icon( "album" ), 0, TQT_TQOBJECT(this), TQT_SLOT(playAudioCD()), ac, "play_audiocd" ); KAction *playPause = new KAction( i18n( "&Play/Pause" ), Amarok::icon( "play" ), Key_Space, ec, TQT_SLOT( playPause() ), ac, "play_pause" ); - new KAction( i18n("Script Manager"), Amarok::icon( "scripts" ), 0, this, TQT_SLOT(showScriptSelector()), ac, "script_manager" ); - new KAction( i18n("Queue Manager"), Amarok::icon( "queue" ), 0, this, TQT_SLOT(showQueueManager()), ac, "queue_manager" ); + new KAction( i18n("Script Manager"), Amarok::icon( "scripts" ), 0, TQT_TQOBJECT(this), TQT_SLOT(showScriptSelector()), ac, "script_manager" ); + new KAction( i18n("Queue Manager"), Amarok::icon( "queue" ), 0, TQT_TQOBJECT(this), TQT_SLOT(showQueueManager()), ac, "queue_manager" ); KAction *seekForward = new KAction( i18n( "&Seek Forward" ), Amarok::icon( "fastforward" ), Key_Right, ec, TQT_SLOT( seekForward() ), ac, "seek_forward" ); KAction *seekBackward = new KAction( i18n( "&Seek Backward" ), Amarok::icon( "rewind" ), Key_Left, ec, TQT_SLOT( seekBackward() ), ac, "seek_backward" ); - new KAction( i18n("Statistics"), Amarok::icon( "info" ), 0, this, TQT_SLOT(showStatistics()), ac, "statistics" ); + new KAction( i18n("Statistics"), Amarok::icon( "info" ), 0, TQT_TQOBJECT(this), TQT_SLOT(showStatistics()), ac, "statistics" ); new KAction( i18n("Update Collection"), Amarok::icon( "refresh" ), 0, CollectionDB::instance(), TQT_SLOT( scanModifiedDirs() ), actionCollection(), "update_collection" ); m_lastfmTags << "Alternative" << "Ambient" << "Chill Out" << "Classical" << "Dance" @@ -196,7 +196,7 @@ PlaylistWindow::PlaylistWindow() new KAction( i18n( "Pause" ), Amarok::icon( "pause" ), 0, ec, TQT_SLOT( pause() ), ac, "pause" ); new KAction( i18n( "Next Track" ), Amarok::icon( "next" ), 0, ec, TQT_SLOT( next() ), ac, "next" ); - KAction *toggleFocus = new KAction( i18n( "Toggle Focus" ), "reload", CTRL+Key_Tab, this, TQT_SLOT( slotToggleFocus() ), ac, "toggle_focus" ); + KAction *toggleFocus = new KAction( i18n( "Toggle Focus" ), "reload", CTRL+Key_Tab, TQT_TQOBJECT(this), TQT_SLOT( slotToggleFocus() ), ac, "toggle_focus" ); { // KAction idiocy -- shortcuts don't work until they've been plugged into a menu @@ -227,7 +227,7 @@ PlaylistWindow::PlaylistWindow() new Amarok::BurnMenuAction( ac ); if( AmarokConfig::playlistWindowSize().isValid() ) { - // if first ever run, use sizeHint(), and let + // if first ever run, use tqsizeHint(), and let // KWin place us otherwise use the stored values resize( AmarokConfig::playlistWindowSize() ); move( AmarokConfig::playlistWindowPos() ); @@ -258,7 +258,7 @@ void PlaylistWindow::init() m_browsers = new BrowserBar( this ); - //<Dynamic Mode Status Bar /> + //<Dynamic Mode tqStatus Bar /> DynamicBar *dynamicBar = new DynamicBar( m_browsers->container()); TQFrame *playlist; @@ -282,7 +282,7 @@ void PlaylistWindow::init() filter_label->setBuddy( m_lineEdit ); bar->setStretchableWidget( m_lineEdit ); KPushButton *filterButton = new KPushButton("...", bar, "filter"); - filterButton->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); + filterButton->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); m_lineEdit->setFrame( TQFrame::Sunken ); m_lineEdit->installEventFilter( this ); //we intercept keyEvents @@ -304,7 +304,7 @@ void PlaylistWindow::init() dynamicBar->init(); m_toolbar = new Amarok::ToolBar( m_browsers->container(), "mainToolBar" ); -#ifndef Q_WS_MAC +#ifndef TQ_WS_MAC m_toolbar->setShown( AmarokConfig::showToolbar() ); #endif TQWidget *statusbar = new Amarok::StatusBar( this ); @@ -313,7 +313,7 @@ void PlaylistWindow::init() connect( repeatAction, TQT_SIGNAL( activated( int ) ), playlist, TQT_SLOT( slotRepeatTrackToggled( int ) ) ); m_menubar = new KMenuBar( this ); -#ifndef Q_WS_MAC +#ifndef TQ_WS_MAC m_menubar->setShown( AmarokConfig::showMenuBar() ); #endif @@ -368,7 +368,7 @@ void PlaylistWindow::init() m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "covermanager" ) ), i18n("&Cover Manager"), Amarok::Menu::ID_SHOW_COVER_MANAGER ); actionCollection()->action("queue_manager")->plug( m_toolsMenu ); m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "visualizations" ) ), i18n("&Visualizations"), Amarok::Menu::ID_SHOW_VIS_SELECTOR ); - m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "equalizer") ), i18n("&Equalizer"), kapp, TQT_SLOT( slotConfigEqualizer() ), 0, Amarok::Menu::ID_CONFIGURE_EQUALIZER ); + m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "equalizer") ), i18n("&Equalizer"), TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigEqualizer() ), 0, Amarok::Menu::ID_CONFIGURE_ETQUALIZER ); actionCollection()->action("script_manager")->plug( m_toolsMenu ); actionCollection()->action("statistics")->plug( m_toolsMenu ); m_toolsMenu->insertSeparator(); @@ -388,7 +388,7 @@ void PlaylistWindow::init() //BEGIN Settings menu m_settingsMenu = new KPopupMenu( m_menubar ); //TODO use KStdAction or KMainWindow -#ifndef Q_WS_MAC +#ifndef TQ_WS_MAC static_cast<KToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowMenubar)))->setChecked( AmarokConfig::showMenuBar() ); actionCollection()->action(KStdAction::name(KStdAction::ShowMenubar))->plug( m_settingsMenu ); m_settingsMenu->insertItem( AmarokConfig::showToolbar() ? i18n( "Hide Toolbar" ) : i18n("Show Toolbar"), ID_SHOW_TOOLBAR ); @@ -396,7 +396,7 @@ void PlaylistWindow::init() m_settingsMenu->insertSeparator(); #endif -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC // plug it first, as this item will be moved to the applications first menu actionCollection()->action(KStdAction::name(KStdAction::Preferences))->plug( m_settingsMenu ); #endif @@ -424,7 +424,7 @@ void PlaylistWindow::init() layV->addWidget( statusbar ); //The volume slider later becomes our FocusProxy, so all wheelEvents get redirected to it - m_toolbar->setFocusPolicy( TQWidget::WheelFocus ); + m_toolbar->setFocusPolicy( TQ_WheelFocus ); m_toolbar->setFlat( true ); m_toolbar->setMovingEnabled( false ); playlist->setMargin( 2 ); @@ -488,7 +488,7 @@ void PlaylistWindow::init() PlaylistBrowser::instance(), TQT_SLOT( loadDynamicItems() ) ); - qApp->installEventFilter( this ); // keyboards shortcuts for the browsers + tqApp->installEventFilter( this ); // keyboards shortcuts for the browsers connect( playlist, TQT_SIGNAL( itemCountChanged( int, int, int, int, int, int ) ), statusbar, TQT_SLOT( slotItemCountChanged( int, int, int, int, int, int ) ) ); @@ -554,15 +554,15 @@ void PlaylistWindow::createGUI() (*it)->unplug( m_toolbar ); KXMLGUIBuilder builder( this ); - KXMLGUIFactory factory( &builder, this ); + KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) ); //build Toolbar, plug actions factory.addClient( this ); //TEXT ON RIGHT HACK //KToolBarButtons have independent settings for their appearance. - //KToolBarButton::modeChange() causes that button to set its mode to that of its parent KToolBar - //KToolBar::setIconText() calls modeChange() for children, unless 2nd param is false + //KToolBarButton::modeChange() causes that button to set its mode to that of its tqparent KToolBar + //KToolBar::setIconText() calls modeChange() for tqchildren, unless 2nd param is false TQStringList list; list << "toolbutton_playlist_add" @@ -578,7 +578,7 @@ void PlaylistWindow::createGUI() const TQStringList::ConstIterator last = list.fromLast(); for( TQStringList::ConstIterator it = list.constBegin(); it != end; ++it ) { - KToolBarButton* const button = static_cast<KToolBarButton*>( m_toolbar->child( (*it).latin1() ) ); + KToolBarButton* const button = static_cast<KToolBarButton*>( TQT_TQWIDGET(m_toolbar->child( (*it).latin1() )) ); if ( it == last ) { //if the user has no PlayerWindow, he MUST have the menu action plugged @@ -589,7 +589,7 @@ void PlaylistWindow::createGUI() if ( button ) { button->modeChange(); - button->setFocusPolicy( TQWidget::NoFocus ); + button->setFocusPolicy( TQ_NoFocus ); } } @@ -639,7 +639,7 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e ) //there are a few keypresses that we intercept - #define e static_cast<TQKeyEvent*>(e) + #define e TQT_TQKEYEVENT(e) if( e->key() == Key_F2 ) { @@ -682,7 +682,7 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e ) } } - if( o == m_lineEdit ) //the search lineedit + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lineEdit) ) //the search lineedit { TQListViewItem *item; switch( e->key() ) @@ -707,7 +707,7 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e ) for( It it( pl, It::Visible ); PlaylistItem *x = static_cast<PlaylistItem*>( *it ); ++it ) { pl->queue( x, true ); - ( pl->m_nextTracks.contains( x ) ? in : out ).append( x ); + ( pl->m_nextTracks.tqcontains( x ) ? in : out ).append( x ); } else { @@ -753,9 +753,9 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e ) //following are for Playlist::instance() only //we don't handle these in the playlist because often we manipulate the lineEdit too - if( o == pl ) + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(pl) ) { - if( pl->currentItem() && ( e->key() == Key_Up && pl->currentItem()->itemAbove() == 0 && !(e->state() & Qt::ShiftButton) ) ) + if( pl->currentItem() && ( e->key() == Key_Up && pl->currentItem()->itemAbove() == 0 && !(e->state() & TQt::ShiftButton) ) ) { TQListViewItem *lastitem = *It( pl, It::Visible ); if ( !lastitem ) @@ -768,7 +768,7 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e ) pl->ensureItemVisible( lastitem ); return true; } - if( pl->currentItem() && ( e->key() == Key_Down && pl->currentItem()->itemBelow() == 0 && !(e->state() & Qt::ShiftButton) ) ) + if( pl->currentItem() && ( e->key() == Key_Down && pl->currentItem()->itemBelow() == 0 && !(e->state() & TQt::ShiftButton) ) ) { pl->currentItem()->setSelected( false ); pl->setCurrentItem( *It( pl, It::Visible ) ); @@ -781,7 +781,7 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e ) pl->removeSelectedItems(); return true; } - if( ( ( e->key() >= Key_0 && e->key() <= Key_Z ) || e->key() == Key_Backspace || e->key() == Key_Escape ) && ( !e->state() || e->state() == Qt::ShiftButton ) ) //only if shift or no modifier key is pressed and 0-Z or backspace or escape + if( ( ( e->key() >= Key_0 && e->key() <= Key_Z ) || e->key() == Key_Backspace || e->key() == Key_Escape ) && ( !e->state() || e->state() == TQt::ShiftButton ) ) //only if shift or no modifier key is pressed and 0-Z or backspace or escape { m_lineEdit->setFocus(); TQApplication::sendEvent( m_lineEdit, e ); @@ -801,11 +801,11 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e ) void PlaylistWindow::closeEvent( TQCloseEvent *e ) { -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC Q_UNUSED( e ); hide(); #else - Amarok::genericEventHandler( this, e ); + Amarok::genericEventHandler( TQT_TQWIDGET(this), TQT_TQEVENT(e) ); #endif } @@ -819,7 +819,7 @@ void PlaylistWindow::showEvent( TQShowEvent* ) } #include <tqdesktopwidget.h> -TQSize PlaylistWindow::sizeHint() const +TQSize PlaylistWindow::tqsizeHint() const { return TQApplication::desktop()->screenGeometry( (TQWidget*)this ).size() / 1.5; } @@ -856,7 +856,7 @@ void PlaylistWindow::savePlaylist() const //SLOT } if( useArtist && useAlbum ) - title = i18n("%1 - %2").arg( artist, album ); + title = i18n("%1 - %2").tqarg( artist, album ); else if( useArtist ) title = artist; else if( useAlbum ) @@ -887,8 +887,8 @@ void PlaylistWindow::slotAddLocation( bool directPlay ) //SLOT { // open a file selector to add media to the playlist KURL::List files; - //files = KFileDialog::getOpenURLs( TQString::null, "*.*|" + i18n("All Files"), this, i18n("Add Media") ); - KFileDialog dlg( TQString::null, "*.*|", this, "openMediaDialog", true ); + //files = KFileDialog::getOpenURLs( TQString(), "*.*|" + i18n("All Files"), this, i18n("Add Media") ); + KFileDialog dlg( TQString(), "*.*|", this, "openMediaDialog", true ); dlg.setCaption( directPlay ? i18n("Play Media (Files or URLs)") : i18n("Add Media (Files or URLs)") ); dlg.setMode( KFile::Files | KFile::Directory ); dlg.exec(); @@ -908,7 +908,7 @@ void PlaylistWindow::slotAddLocation( bool directPlay ) //SLOT void PlaylistWindow::slotAddStream() //SLOT { bool ok; - TQString url = KInputDialog::getText( i18n("Add Stream"), i18n("URL"), TQString::null, &ok, this ); + TQString url = KInputDialog::getText( i18n("Add Stream"), i18n("URL"), TQString(), &ok, this ); if ( !ok ) return; @@ -922,7 +922,7 @@ void PlaylistWindow::playLastfmPersonal() //SLOT if( !LastFm::Controller::checkCredentials() ) return; const KURL url( TQString( "lastfm://user/%1/personal" ) - .arg( AmarokConfig::scrobblerUsername() ) ); + .tqarg( AmarokConfig::scrobblerUsername() ) ); Playlist::instance()->insertMedia( url, Playlist::Append|Playlist::DirectPlay ); } @@ -933,7 +933,7 @@ void PlaylistWindow::addLastfmPersonal() //SLOT if( !LastFm::Controller::checkCredentials() ) return; const KURL url( TQString( "lastfm://user/%1/personal" ) - .arg( AmarokConfig::scrobblerUsername() ) ); + .tqarg( AmarokConfig::scrobblerUsername() ) ); Playlist::instance()->insertMedia( url ); } @@ -944,7 +944,7 @@ void PlaylistWindow::playLastfmNeighbor() //SLOT if( !LastFm::Controller::checkCredentials() ) return; const KURL url( TQString( "lastfm://user/%1/neighbours" ) - .arg( AmarokConfig::scrobblerUsername() ) ); + .tqarg( AmarokConfig::scrobblerUsername() ) ); Playlist::instance()->insertMedia( url, Playlist::Append|Playlist::DirectPlay ); } @@ -955,7 +955,7 @@ void PlaylistWindow::addLastfmNeighbor() //SLOT if( !LastFm::Controller::checkCredentials() ) return; const KURL url( TQString( "lastfm://user/%1/neighbours" ) - .arg( AmarokConfig::scrobblerUsername() ) ); + .tqarg( AmarokConfig::scrobblerUsername() ) ); Playlist::instance()->insertMedia( url ); } @@ -1006,7 +1006,7 @@ void PlaylistWindow::addLastfmGlobaltag( int id ) //SLOT void PlaylistWindow::playAudioCD() //SLOT { KURL::List urls; - if( EngineController::engine()->getAudioCDContents(TQString::null, urls) ) + if( EngineController::engine()->getAudioCDContents(TQString(), urls) ) { if (!urls.isEmpty()) Playlist::instance()->insertMedia(urls, Playlist::Replace); @@ -1093,7 +1093,7 @@ void PlaylistWindow::actionsMenuAboutToShow() //SLOT void PlaylistWindow::toolsMenuAboutToShow() //SLOT { - m_toolsMenu->setItemEnabled( Amarok::Menu::ID_CONFIGURE_EQUALIZER, EngineController::hasEngineProperty( "HasEqualizer" ) ); + m_toolsMenu->setItemEnabled( Amarok::Menu::ID_CONFIGURE_ETQUALIZER, EngineController::hasEngineProperty( "HasEqualizer" ) ); m_toolsMenu->setItemEnabled( Amarok::Menu::ID_RESCAN_COLLECTION, !ThreadManager::instance()->isJobPending( "CollectionScanner" ) ); } @@ -1115,7 +1115,7 @@ void PlaylistWindow::toolsMenuAboutToShow() //SLOT */ void PlaylistWindow::showHide() //SLOT { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 const KWin::WindowInfo info = KWin::windowInfo( winId() ); const uint desktop = KWin::currentDesktop(); const bool isOnThisDesktop = info.isOnDesktop( desktop ); @@ -1142,7 +1142,7 @@ void PlaylistWindow::showHide() //SLOT void PlaylistWindow::activate() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 const KWin::WindowInfo info = KWin::windowInfo( winId() ); if( KWinModule( NULL, KWinModule::INFO_DESKTOP ).activeWindow() != winId()) @@ -1158,7 +1158,7 @@ void PlaylistWindow::activate() bool PlaylistWindow::isReallyShown() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 const KWin::WindowInfo info = KWin::windowInfo( winId() ); return isShown() && !info.isMinimized() && info.isOnDesktop( KWin::currentDesktop() ); #else @@ -1187,8 +1187,8 @@ PlaylistWindow::mbAvailabilityChanged( bool isAvailable ) //SLOT ////////////////////////////////////////////////////////////////////////////////////////// /// DynamicBar ////////////////////////////////////////////////////////////////////////////////////////// -DynamicBar::DynamicBar(TQWidget* parent) - : TQHBox( parent, "DynamicModeStatusBar" ) +DynamicBar::DynamicBar(TQWidget* tqparent) + : TQHBox( tqparent, "DynamicModeStatusBar" ) { m_titleWidget = new DynamicTitle(this); @@ -1248,10 +1248,10 @@ void DynamicTitle::setTitle(const TQString& newTitle) void DynamicTitle::paintEvent(TQPaintEvent* /*e*/) { TQPainter p; - p.begin( this, false ); - TQPen pen( colorGroup().highlightedText(), 0, Qt::NoPen ); + p.tqbegin( this, false ); + TQPen pen( tqcolorGroup().highlightedText(), 0, TQt::NoPen ); p.setPen( pen ); - p.setBrush( colorGroup().highlight() ); + p.setBrush( tqcolorGroup().highlight() ); p.setFont(m_font); TQFontMetrics fm(m_font); @@ -1266,10 +1266,10 @@ void DynamicTitle::paintEvent(TQPaintEvent* /*e*/) p.drawEllipse( 0, yStart, s_curveWidth * 2, textHeight); p.drawEllipse( s_curveWidth + textWidth + s_imageSize, yStart, s_curveWidth*2, textHeight); p.fillRect( s_curveWidth, yStart, textWidth + s_imageSize + s_curveWidth, textHeight - , TQBrush( colorGroup().highlight()) ); + , TQBrush( tqcolorGroup().highlight()) ); p.drawPixmap( s_curveWidth, yStart + ((textHeight - s_imageSize) /2), SmallIcon("dynamic") ); //not sure why first arg of Rect shouldn't add @curveWidth - p.drawText( TQRect(s_imageSize, yStart, s_curveWidth + textWidth +s_imageSize, textHeight), Qt::AlignCenter, m_title); + p.drawText( TQRect(s_imageSize, yStart, s_curveWidth + textWidth +s_imageSize, textHeight), TQt::AlignCenter, m_title); } #include "playlistwindow.moc" |