From efb801b0a2ef2e7d8036d29e030a55309026e8cf Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 9 Dec 2023 18:25:41 +0900 Subject: [PATCH] Remove various '#define' strings - part 6 Signed-off-by: Michele Calgaro --- kaffeine/src/kaffeine.cpp | 116 ++++----- .../gstreamer-part/gstreamer_part.cpp | 48 ++-- .../src/player-parts/xine-part/xine_part.cpp | 240 +++++++++--------- kaffeine/src/systemtray.cpp | 12 +- 4 files changed, 208 insertions(+), 208 deletions(-) diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp index f2caf6f..3ea00ea 100644 --- a/kaffeine/src/kaffeine.cpp +++ b/kaffeine/src/kaffeine.cpp @@ -140,7 +140,7 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"), if ( DVBconfig::haveDvbDevice() ) { kdDebug() << "Found DVB device." << endl; - dvbPanel = new DvbPanel( 0, TQT_TQOBJECT(this), "dvbpanel" ); + dvbPanel = new DvbPanel( 0, this, "dvbpanel" ); } else { @@ -188,12 +188,12 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"), inplug->addPlayerWidget( playerWidget, TDEGlobal::iconLoader()->loadIcon("kaffeine", TDEIcon::Small), i18n("Player Window") ); // playlist - m_playlist = new PlayList( stack, TQT_TQOBJECT(this) ); + m_playlist = new PlayList( stack, this ); inplug->add( m_playlist, TDEGlobal::iconLoader()->loadIcon("view_text", TDEIcon::Small), i18n( "Playlist") ); m_playlist->setFileFilter(DEFAULT_FILTER); guiFactory()->addClient( m_playlist ); - cddisc = new Disc( stack, TQT_TQOBJECT(this) ); + cddisc = new Disc( stack, this ); inplug->add( cddisc, TDEGlobal::iconLoader()->loadIcon("media-optical-cdrom-unmounted", TDEIcon::Small), i18n( "Audio CD") ); guiFactory()->addClient( cddisc ); @@ -247,13 +247,13 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"), else kdDebug() << "Window manager: not TWin - using save fullscreen mode" << endl; - connect(&m_screensaverTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotFakeKeyEvent())); + connect(&m_screensaverTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFakeKeyEvent())); m_screensaverTimer.start( 55000 ); - connect( &m_numKeyHideTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotRequestForTrackNumber()) ); + connect( &m_numKeyHideTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRequestForTrackNumber()) ); TDEAccel* accel = new TDEAccel(this); - accel->insert("Escape Fullscreen", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotEscapeFullscreen())); + accel->insert("Escape Fullscreen", Key_Escape, this, TQT_SLOT(slotEscapeFullscreen())); loadConfig(); //slotChangeStatusbar(i18n("Kaffeine Player") + " " + KAFFEINE_VERSION); @@ -381,27 +381,27 @@ void Kaffeine::slotLoadPart(const TQString& desktopName) //player container widget, will contain the player part m_playerContainer = new PlayerContainer(playerWidget); - connect(m_playerContainer, TQT_SIGNAL(signalURLDropEvent(const TQStringList&)), TQT_TQOBJECT(this), TQT_SLOT(slotLoadURLS(const TQStringList&))); + connect(m_playerContainer, TQT_SIGNAL(signalURLDropEvent(const TQStringList&)), this, TQT_SLOT(slotLoadURLS(const TQStringList&))); if (service->serviceTypes().contains("KaffeinePart")) { kdDebug() << "This is a KaffeinePart..." << endl; int error = 0; - m_mediaPart = KParts::ComponentFactory::createPartInstanceFromService(service, m_playerContainer, service->name().ascii(), TQT_TQOBJECT(this), 0, m_engineParameters, &error); + m_mediaPart = KParts::ComponentFactory::createPartInstanceFromService(service, m_playerContainer, service->name().ascii(), this, 0, m_engineParameters, &error); if (error > 0) { KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").arg(service->name()), KLibLoader::self()->lastErrorMessage()); } else { - connect(m_mediaPart, TQT_SIGNAL(setWindowCaption(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeCaption(const TQString&))); - //connect(m_mediaPart, TQT_SIGNAL(setStatusBarText(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeStatusbar(const TQString&))); - connect(m_mediaPart, TQT_SIGNAL(canceled(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotLoadingCanceled(const TQString&))); - connect(m_mediaPart, TQT_SIGNAL(signalPlaybackFailed()), TQT_TQOBJECT(this), TQT_SLOT(slotPlaybackFailed())); - connect(m_mediaPart, TQT_SIGNAL(signalTrackFinished()), TQT_TQOBJECT(this), TQT_SLOT(slotNext())); - connect(m_mediaPart, TQT_SIGNAL(signalNewMeta(const MRL &)), TQT_TQOBJECT(this), TQT_SLOT(slotMetaFromPlayer(const MRL &))); - connect(m_mediaPart, TQT_SIGNAL(signalNewFrameSize(const TQSize&)), TQT_TQOBJECT(this), TQT_SLOT(slotNewFrameSize(const TQSize&))); - connect(m_mediaPart, TQT_SIGNAL(signalRequestCurrentTrack()), TQT_TQOBJECT(this), TQT_SLOT(slotRequestForCurrentTrack())); - connect(m_mediaPart, TQT_SIGNAL(signalRequestNextTrack()), TQT_TQOBJECT(this), TQT_SLOT(slotRequestForNextTrack())); - connect(m_mediaPart, TQT_SIGNAL(signalRequestPreviousTrack()), TQT_TQOBJECT(this), TQT_SLOT(slotRequestForPreviousTrack())); - connect(m_mediaPart, TQT_SIGNAL(signalToggleMinimalMode()), TQT_TQOBJECT(this), TQT_SLOT(slotToggleMinimalModeFromPlayer())); + connect(m_mediaPart, TQT_SIGNAL(setWindowCaption(const TQString&)), this, TQT_SLOT(slotChangeCaption(const TQString&))); + //connect(m_mediaPart, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SLOT(slotChangeStatusbar(const TQString&))); + connect(m_mediaPart, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotLoadingCanceled(const TQString&))); + connect(m_mediaPart, TQT_SIGNAL(signalPlaybackFailed()), this, TQT_SLOT(slotPlaybackFailed())); + connect(m_mediaPart, TQT_SIGNAL(signalTrackFinished()), this, TQT_SLOT(slotNext())); + connect(m_mediaPart, TQT_SIGNAL(signalNewMeta(const MRL &)), this, TQT_SLOT(slotMetaFromPlayer(const MRL &))); + connect(m_mediaPart, TQT_SIGNAL(signalNewFrameSize(const TQSize&)), this, TQT_SLOT(slotNewFrameSize(const TQSize&))); + connect(m_mediaPart, TQT_SIGNAL(signalRequestCurrentTrack()), this, TQT_SLOT(slotRequestForCurrentTrack())); + connect(m_mediaPart, TQT_SIGNAL(signalRequestNextTrack()), this, TQT_SLOT(slotRequestForNextTrack())); + connect(m_mediaPart, TQT_SIGNAL(signalRequestPreviousTrack()), this, TQT_SLOT(slotRequestForPreviousTrack())); + connect(m_mediaPart, TQT_SIGNAL(signalToggleMinimalMode()), this, TQT_SLOT(slotToggleMinimalModeFromPlayer())); if ( service->library()=="libxinepart" ) connect( this, TQT_SIGNAL(showOSD(const TQString&,int,int)), m_mediaPart, TQT_SLOT(requestForOSD(const TQString&,int,int)) ); #ifdef HAVE_DVB @@ -505,7 +505,7 @@ void Kaffeine::slotPlay(const MRL& mrl) { m_mediaPart->openURL(mrl); if ( !mrl.mime().contains("audio") ) - TQTimer::singleShot(300, TQT_TQOBJECT(this), TQT_SLOT(slotSwitchToPlayerWindow())); + TQTimer::singleShot(300, this, TQT_SLOT(slotSwitchToPlayerWindow())); } } @@ -664,35 +664,35 @@ void Kaffeine::dropEvent(TQDropEvent* dev) void Kaffeine::setupActions() { /* file menu */ - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile()), actionCollection(), "file_open"); - new TDEAction(i18n("Open &URL..."), "www", CTRL|Key_U, TQT_TQOBJECT(this), TQT_SLOT(slotOpenURL()), actionCollection(), "file_open_url"); - new TDEAction(i18n("Open D&irectory..."), "folder_video", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenDirectory()), actionCollection(), "file_open_directory"); - m_recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotPlayRecent(const KURL&)), actionCollection(), "file_open_recent"); - m_sleepAfterPlay = new TDEToggleAction(i18n("Quit && Shutoff Monitor After This Track"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSleepAfterPlayMenu()), actionCollection(), "sleep_after_play"); - m_quitAfterPlay = new TDEToggleAction(i18n("Quit After This Track"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotQuitAfterPlayMenu()), actionCollection(), "quit_after_play"); - m_quitAfterPlaylist = new TDEToggleAction(i18n("Quit After Playlist"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotQuitAfterPlaylistMenu()), actionCollection(), "quit_after_playlist"); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::open(this, TQT_SLOT(slotOpenFile()), actionCollection(), "file_open"); + new TDEAction(i18n("Open &URL..."), "www", CTRL|Key_U, this, TQT_SLOT(slotOpenURL()), actionCollection(), "file_open_url"); + new TDEAction(i18n("Open D&irectory..."), "folder_video", 0, this, TQT_SLOT(slotOpenDirectory()), actionCollection(), "file_open_directory"); + m_recent = KStdAction::openRecent(this, TQT_SLOT(slotPlayRecent(const KURL&)), actionCollection(), "file_open_recent"); + m_sleepAfterPlay = new TDEToggleAction(i18n("Quit && Shutoff Monitor After This Track"), 0, 0, this, TQT_SLOT(slotSleepAfterPlayMenu()), actionCollection(), "sleep_after_play"); + m_quitAfterPlay = new TDEToggleAction(i18n("Quit After This Track"), 0, 0, this, TQT_SLOT(slotQuitAfterPlayMenu()), actionCollection(), "quit_after_play"); + m_quitAfterPlaylist = new TDEToggleAction(i18n("Quit After Playlist"), 0, 0, this, TQT_SLOT(slotQuitAfterPlaylistMenu()), actionCollection(), "quit_after_playlist"); + KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection()); /*view menu */ - m_fullscreen = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT(slotToggleFullscreen()), actionCollection(), this, "view_fullscreen"); - m_minimal = new TDEToggleAction(i18n("&Minimal Mode"), 0, Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotToggleMinimalMode()), actionCollection(), "view_minimal"); - new TDEAction(i18n("Toggle &Playlist/Player"), 0, Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotTogglePlaylist()), actionCollection(), "view_toggle_tab"); - m_originalAspect = new TDEToggleAction(i18n("Keep &Original Aspect"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotOriginalAspect()), actionCollection(), "view_original_aspect"); - m_autoResizeOff = new TDEToggleAction(i18n("Off"), 0, ALT|Key_0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoresizeOff()), actionCollection(), "view_auto_resize_off"); - m_autoResizeOriginal = new TDEToggleAction(i18n("Original Size"), 0, ALT|Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotAutoresizeOriginal()), actionCollection(), "view_auto_resize_original"); - m_autoResizeDouble = new TDEToggleAction(i18n("Double Size"), 0, ALT|Key_2, TQT_TQOBJECT(this), TQT_SLOT(slotAutoresizeDouble()), actionCollection(), "view_auto_resize_double"); - m_autoResizeTriple = new TDEToggleAction(i18n("Triple Size"), 0, ALT|Key_3, TQT_TQOBJECT(this), TQT_SLOT(slotAutoresizeTriple()), actionCollection(), "view_auto_resize_triple"); + m_fullscreen = KStdAction::fullScreen(this, TQT_SLOT(slotToggleFullscreen()), actionCollection(), this, "view_fullscreen"); + m_minimal = new TDEToggleAction(i18n("&Minimal Mode"), 0, Key_M, this, TQT_SLOT(slotToggleMinimalMode()), actionCollection(), "view_minimal"); + new TDEAction(i18n("Toggle &Playlist/Player"), 0, Key_P, this, TQT_SLOT(slotTogglePlaylist()), actionCollection(), "view_toggle_tab"); + m_originalAspect = new TDEToggleAction(i18n("Keep &Original Aspect"), 0, 0, this, TQT_SLOT(slotOriginalAspect()), actionCollection(), "view_original_aspect"); + m_autoResizeOff = new TDEToggleAction(i18n("Off"), 0, ALT|Key_0, this, TQT_SLOT(slotAutoresizeOff()), actionCollection(), "view_auto_resize_off"); + m_autoResizeOriginal = new TDEToggleAction(i18n("Original Size"), 0, ALT|Key_1, this, TQT_SLOT(slotAutoresizeOriginal()), actionCollection(), "view_auto_resize_original"); + m_autoResizeDouble = new TDEToggleAction(i18n("Double Size"), 0, ALT|Key_2, this, TQT_SLOT(slotAutoresizeDouble()), actionCollection(), "view_auto_resize_double"); + m_autoResizeTriple = new TDEToggleAction(i18n("Triple Size"), 0, ALT|Key_3, this, TQT_SLOT(slotAutoresizeTriple()), actionCollection(), "view_auto_resize_triple"); m_playersMenu = new TDEActionMenu(i18n("&Player Engine"), actionCollection(), "options_player"); - m_instWizard = new TDEAction(i18n("Installation &Wizard"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotInstWizard()), actionCollection(), "inst_wizard"); + m_instWizard = new TDEAction(i18n("Installation &Wizard"), 0, 0, this, TQT_SLOT(slotInstWizard()), actionCollection(), "inst_wizard"); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection(), "options_preferences"); + KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQT_SLOT(slotPreferences()), actionCollection(), "options_preferences"); /* fill players action menu */ - TQSignalMapper* mapper = new TQSignalMapper(TQT_TQOBJECT(this)); - connect(mapper, TQT_SIGNAL(mapped(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotLoadPart(const TQString&))); + TQSignalMapper* mapper = new TQSignalMapper(this); + connect(mapper, TQT_SIGNAL(mapped(const TQString&)), this, TQT_SLOT(slotLoadPart(const TQString&))); TDEAction* action = NULL; TQStringList mediaParts; @@ -722,7 +722,7 @@ void Kaffeine::setupActions() acn->insertItem( Key_7, 17 ); acn->insertItem( Key_8, 18 ); acn->insertItem( Key_9, 19 ); - connect( acn, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotNumKeyInput(int)) ); + connect( acn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotNumKeyInput(int)) ); } void Kaffeine::slotDVBNextBack(int dir) @@ -799,7 +799,7 @@ void Kaffeine::loadConfig() if ( m_dvbClientEnabled ) { - dvbClient = new CdWidget( m_dvbClientAddress, m_dvbClientPort, m_dvbClientInfo, m_dvbClientShiftPath, this, TQT_TQOBJECT(this), "cdwidget"); + dvbClient = new CdWidget( m_dvbClientAddress, m_dvbClientPort, m_dvbClientInfo, m_dvbClientShiftPath, this, this, "cdwidget"); inplug->add( dvbClient, TDEGlobal::iconLoader()->loadIcon("network", TDEIcon::Small), i18n( "DVB client") ); } else @@ -885,13 +885,13 @@ void Kaffeine::slotPreferences() KaffeinePreferences dlg; dlg.setConfig(m_pauseVideo, m_embedSystemTray, m_osdDuration, m_useAlternateEncoding, m_alternateEncoding); dlg.setDvbClient( m_dvbClientEnabled, m_dvbClientAddress, m_dvbClientPort, m_dvbClientInfo, m_dvbClientShiftPath ); - connect(&dlg, TQT_SIGNAL(signalClearRecent()), TQT_TQOBJECT(this), TQT_SLOT(slotClearRecent())); - connect(&dlg, TQT_SIGNAL(signalEmbedSystemTray(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSystemTray(bool))); - connect(&dlg, TQT_SIGNAL(signalUseAlternateEncoding(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotUseAlternateEncoding(bool))); - connect(&dlg, TQT_SIGNAL(signalAlternateEncoding(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotAlternateEncoding(const TQString&))); - connect(&dlg, TQT_SIGNAL(signalSetOSDTimeout(uint)), TQT_TQOBJECT(this), TQT_SLOT(slotSetOSDTimeout(uint))); - connect(&dlg, TQT_SIGNAL(signalPauseVideo(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotPauseVideo(bool))); - connect(&dlg, TQT_SIGNAL(signalDvbClient(bool,const TQString&,int,int,const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotDvbClient(bool,const TQString&,int,int,const TQString&))); + connect(&dlg, TQT_SIGNAL(signalClearRecent()), this, TQT_SLOT(slotClearRecent())); + connect(&dlg, TQT_SIGNAL(signalEmbedSystemTray(bool)), this, TQT_SLOT(slotSystemTray(bool))); + connect(&dlg, TQT_SIGNAL(signalUseAlternateEncoding(bool)), this, TQT_SLOT(slotUseAlternateEncoding(bool))); + connect(&dlg, TQT_SIGNAL(signalAlternateEncoding(const TQString&)), this, TQT_SLOT(slotAlternateEncoding(const TQString&))); + connect(&dlg, TQT_SIGNAL(signalSetOSDTimeout(uint)), this, TQT_SLOT(slotSetOSDTimeout(uint))); + connect(&dlg, TQT_SIGNAL(signalPauseVideo(bool)), this, TQT_SLOT(slotPauseVideo(bool))); + connect(&dlg, TQT_SIGNAL(signalDvbClient(bool,const TQString&,int,int,const TQString&)), this, TQT_SLOT(slotDvbClient(bool,const TQString&,int,int,const TQString&))); dlg.exec(); } @@ -906,7 +906,7 @@ void Kaffeine::slotDvbClient( bool enabled, const TQString &address, int port, i } else { - dvbClient = new CdWidget(address, port, info, tspath, this, TQT_TQOBJECT(this), "cdwidget"); + dvbClient = new CdWidget(address, port, info, tspath, this, this, "cdwidget"); if ( m_mediaPart ) { connect( dvbClient, TQT_SIGNAL(dvbOpen(const TQString&,const TQString&,int)), m_mediaPart, TQT_SLOT(slotDvbOpen(const TQString&,const TQString&,int)) ); @@ -980,12 +980,12 @@ void Kaffeine::slotSystemTray(bool embed) if (!m_systemTray) { m_systemTray = new SystemTray(this); - connect(m_systemTray, TQT_SIGNAL(signalPlay()), TQT_TQOBJECT(this), TQT_SLOT(slotPlayUnPause())); - connect(m_systemTray, TQT_SIGNAL(signalNext()), TQT_TQOBJECT(this), TQT_SLOT(slotRequestForNextTrack())); - connect(m_systemTray, TQT_SIGNAL(signalPrevious()), TQT_TQOBJECT(this), TQT_SLOT(slotRequestForPreviousTrack())); - connect(m_systemTray, TQT_SIGNAL(signalStop()), TQT_TQOBJECT(this), TQT_SLOT(slotStop())); - connect(m_systemTray, TQT_SIGNAL(signalMute()), TQT_TQOBJECT(this), TQT_SLOT(slotMute())); - connect(m_systemTray, TQT_SIGNAL(quitSelected()), TQT_TQOBJECT(this), TQT_SLOT(slotQuit())); + connect(m_systemTray, TQT_SIGNAL(signalPlay()), this, TQT_SLOT(slotPlayUnPause())); + connect(m_systemTray, TQT_SIGNAL(signalNext()), this, TQT_SLOT(slotRequestForNextTrack())); + connect(m_systemTray, TQT_SIGNAL(signalPrevious()), this, TQT_SLOT(slotRequestForPreviousTrack())); + connect(m_systemTray, TQT_SIGNAL(signalStop()), this, TQT_SLOT(slotStop())); + connect(m_systemTray, TQT_SIGNAL(signalMute()), this, TQT_SLOT(slotMute())); + connect(m_systemTray, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotQuit())); m_systemTray->show(); } } diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp index 1c24850..5f59e18 100644 --- a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp +++ b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp @@ -92,7 +92,7 @@ GStreamerPart::GStreamerPart( TQWidget* parentWidget, const char* /*widgetName*/ m_logoPath = locate( "data", "kaffeine/logo" ); kdDebug() << "GStreamerPart: Found logo animation: " << m_logoPath << endl; - connect( &busTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotReadBus()) ); + connect( &busTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotReadBus()) ); } @@ -266,7 +266,7 @@ bool GStreamerPart::openURL(const MRL& mrl) m_playlist.append( m_mrl ); } - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotPlay())); + TQTimer::singleShot(0, this, TQT_SLOT(slotPlay())); return true; } @@ -504,10 +504,10 @@ void GStreamerPart::slotVideoSettings() g_object_get( G_OBJECT(m_videosink), "brightness", &bright, NULL ); m_videoSettings = new VideoSettings( hue, sat, contr, bright ); - connect( m_videoSettings, TQT_SIGNAL(signalNewBrightness(int)), TQT_TQOBJECT(this), TQT_SLOT(slotBrightness(int)) ); - connect( m_videoSettings, TQT_SIGNAL(signalNewContrast(int)), TQT_TQOBJECT(this), TQT_SLOT(slotContrast(int)) ); - connect( m_videoSettings, TQT_SIGNAL(signalNewHue(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHue(int)) ); - connect( m_videoSettings, TQT_SIGNAL(signalNewSaturation(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSaturation(int)) ); + connect( m_videoSettings, TQT_SIGNAL(signalNewBrightness(int)), this, TQT_SLOT(slotBrightness(int)) ); + connect( m_videoSettings, TQT_SIGNAL(signalNewContrast(int)), this, TQT_SLOT(slotContrast(int)) ); + connect( m_videoSettings, TQT_SIGNAL(signalNewHue(int)), this, TQT_SLOT(slotHue(int)) ); + connect( m_videoSettings, TQT_SIGNAL(signalNewSaturation(int)), this, TQT_SLOT(slotSaturation(int)) ); } m_videoSettings->show(); @@ -693,42 +693,42 @@ void GStreamerPart::slotPrepareForFullscreen( bool fullscreen ) void GStreamerPart::initActions() { new TDEAction(i18n("Toggle Minimal Mode"), 0, 0, this, TQT_SIGNAL(signalToggleMinimalMode()), actionCollection(), "player_minimal_mode"); - new TDEAction(i18n("Play"), "media-playback-start", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlay()), actionCollection(), "player_play"); - new TDEAction(i18n("Pause"), "media-playback-pause", Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotTogglePause()), actionCollection(), "player_pause"); - new TDEAction(i18n("Stop"), "media-playback-stop", Key_Backspace, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "player_stop"); - new TDEAction(i18n("&Next"), "media-skip-forward", Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(slotNext()), actionCollection(), "player_next"); - new TDEAction(i18n("&Previous"), "media-skip-backward", Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(slotPrevious()), actionCollection(), "player_previous"); + new TDEAction(i18n("Play"), "media-playback-start", 0, this, TQT_SLOT(slotPlay()), actionCollection(), "player_play"); + new TDEAction(i18n("Pause"), "media-playback-pause", Key_Space, this, TQT_SLOT(slotTogglePause()), actionCollection(), "player_pause"); + new TDEAction(i18n("Stop"), "media-playback-stop", Key_Backspace, this, TQT_SLOT(slotStop()), actionCollection(), "player_stop"); + new TDEAction(i18n("&Next"), "media-skip-forward", Key_PageDown, this, TQT_SLOT(slotNext()), actionCollection(), "player_next"); + new TDEAction(i18n("&Previous"), "media-skip-backward", Key_PageUp, this, TQT_SLOT(slotPrevious()), actionCollection(), "player_previous"); m_timer = new Timer(); new KWidgetAction(m_timer->getSlider(), i18n("Position"), 0, 0, 0, actionCollection(), "player_position"); new KWidgetAction((TQWidget*)m_timer->getLabel(), i18n("Playtime"), 0, 0, 0, actionCollection(), "player_playtime"); m_audioVisual = new TDESelectAction(i18n("Audio &Visualization"), 0, actionCollection(), "audio_visual"); - connect(m_audioVisual, TQT_SIGNAL(activated(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotSetVisualPlugin(const TQString&))); + connect(m_audioVisual, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotSetVisualPlugin(const TQString&))); m_audioVisualPluginList.prepend("none"); m_audioVisual->setItems(m_audioVisualPluginList); m_audioVisual->setCurrentItem(m_audioVisual->items().findIndex(m_visualPluginName)); - new TDEAction(i18n("&Mute"), "player_mute", Key_U, TQT_TQOBJECT(this), TQT_SLOT(slotMute()), actionCollection(), "audio_mute"); - new TDEAction(i18n("&Auto"), "zoom-fit-best", Key_F5, TQT_TQOBJECT(m_video), TQT_SLOT(slotAspectRatioAuto()), actionCollection(), "aspect_auto"); - new TDEAction(i18n("&4:3"), "zoom-fit-best", Key_F6, TQT_TQOBJECT(m_video), TQT_SLOT(slotAspectRatio4_3()), actionCollection(), "aspect_43"); - new TDEAction(i18n("A&namorphic"), "zoom-fit-best", Key_F7, TQT_TQOBJECT(m_video), TQT_SLOT(slotAspectRatioAnamorphic()), actionCollection(), "aspect_anamorphic"); - new TDEAction(i18n("&DVB"), "zoom-fit-best", Key_F8, TQT_TQOBJECT(m_video), TQT_SLOT(slotAspectRatioDVB()), actionCollection(), "aspect_dvb"); - new TDEAction(i18n("&Square"), "zoom-fit-best", Key_F9, TQT_TQOBJECT(m_video), TQT_SLOT(slotAspectRatioSquare()), actionCollection(), "aspect_square"); - new TDEAction(i18n("&Video Settings"), "configure", Key_V, TQT_TQOBJECT(this), TQT_SLOT(slotVideoSettings()), actionCollection(), "video_settings"); - new TDEAction(i18n("Track &Info"), "application-vnd.tde.info", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotInfo()), actionCollection(), "player_track_info"); + new TDEAction(i18n("&Mute"), "player_mute", Key_U, this, TQT_SLOT(slotMute()), actionCollection(), "audio_mute"); + new TDEAction(i18n("&Auto"), "zoom-fit-best", Key_F5, m_video, TQT_SLOT(slotAspectRatioAuto()), actionCollection(), "aspect_auto"); + new TDEAction(i18n("&4:3"), "zoom-fit-best", Key_F6, m_video, TQT_SLOT(slotAspectRatio4_3()), actionCollection(), "aspect_43"); + new TDEAction(i18n("A&namorphic"), "zoom-fit-best", Key_F7, m_video, TQT_SLOT(slotAspectRatioAnamorphic()), actionCollection(), "aspect_anamorphic"); + new TDEAction(i18n("&DVB"), "zoom-fit-best", Key_F8, m_video, TQT_SLOT(slotAspectRatioDVB()), actionCollection(), "aspect_dvb"); + new TDEAction(i18n("&Square"), "zoom-fit-best", Key_F9, m_video, TQT_SLOT(slotAspectRatioSquare()), actionCollection(), "aspect_square"); + new TDEAction(i18n("&Video Settings"), "configure", Key_V, this, TQT_SLOT(slotVideoSettings()), actionCollection(), "video_settings"); + new TDEAction(i18n("Track &Info"), "application-vnd.tde.info", 0 , this, TQT_SLOT(slotInfo()), actionCollection(), "player_track_info"); m_volume = new TQSlider(TQt::Horizontal, 0); TQToolTip::add(m_volume, i18n("Volume")); m_volume->setRange(0, 100); m_volume->setSteps(1, 5); m_volume->setFixedWidth(75); - connect(m_volume, TQT_SIGNAL(valueChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotVolume(int))); + connect(m_volume, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVolume(int))); slotSetVolume(m_savedVolume); new KWidgetAction(m_volume, i18n("Volume"), 0, 0, 0, actionCollection(), "audio_volume"); - new TDEAction(i18n("&GStreamer Engine Parameters"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigDialog()), actionCollection(), "settings_gst_parameter"); + new TDEAction(i18n("&GStreamer Engine Parameters"), "edit", 0, this, TQT_SLOT(slotConfigDialog()), actionCollection(), "settings_gst_parameter"); - connect(m_video, TQT_SIGNAL(signalRightClick(const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(const TQPoint&))); + connect(m_video, TQT_SIGNAL(signalRightClick(const TQPoint&)), this, TQT_SLOT(slotContextMenu(const TQPoint&))); } @@ -995,7 +995,7 @@ void GStreamerPart::slotReadBus() if (m_url != m_logoPath) { errorMessage = error->message; errorDetails = debug; - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotEngineError()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotEngineError()) ); } g_error_free( error ); g_free( debug ); diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp index bde4d8b..62380c1 100644 --- a/kaffeine/src/player-parts/xine-part/xine_part.cpp +++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp @@ -131,7 +131,7 @@ XinePart::XinePart(TQWidget* parentWidget, const char* widgetName, TQObject* par initActions(); initConnections(); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotDisableAllActions())); + TQTimer::singleShot(0, this, TQT_SLOT(slotDisableAllActions())); m_oldPosition = m_xine->mapToGlobal(TQPoint(0,0)); m_posCheckTimer.start(333); } @@ -314,7 +314,7 @@ void XinePart::slotPlay(bool forcePlay) return; } else - TQTimer::singleShot(0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotPlay())); + TQTimer::singleShot(0, m_xine, TQT_SLOT(slotPlay())); } else { @@ -331,7 +331,7 @@ void XinePart::slotPlay(bool forcePlay) return; } else - TQTimer::singleShot(0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotPlay())); + TQTimer::singleShot(0, m_xine, TQT_SLOT(slotPlay())); } else kdError() << "XinePart: " << TDEIO::NetAccess::lastErrorString() << endl; @@ -354,7 +354,7 @@ void XinePart::slotStop() m_playlist[m_current] = MRL("dvd://" + TQString::number(title) + "." + TQString::number(chapter)); } - TQTimer::singleShot(0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotStop())); + TQTimer::singleShot(0, m_xine, TQT_SLOT(slotStop())); stateChanged("not_playing"); m_pauseButton->setChecked(false); m_playTime->setText("0:00:00"); @@ -416,7 +416,7 @@ void XinePart::slotDvbOpen( const TQString &filename, const TQString &chanName, return; m_playlist.clear(); m_xine->setDvb( filename, chanName, haveVideo ); - TQTimer::singleShot(0, TQT_TQOBJECT(m_xine), TQT_SLOT(openDvb())); + TQTimer::singleShot(0, m_xine, TQT_SLOT(openDvb())); //m_xine->openDvb( filename, chanName, haveVideo ); } @@ -588,7 +588,7 @@ void XinePart::slotSaveStream() m_xine->clearQueue(); m_xine->appendToQueue(m_playlist[m_current].url() + "#save:" + kurl.path()); - TQTimer::singleShot(0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotPlay())); + TQTimer::singleShot(0, m_xine, TQT_SLOT(slotPlay())); m_pauseButton->setChecked(false); } @@ -839,10 +839,10 @@ void XinePart::slotFilterDialog() m_xine, TQT_SLOT(slotCreateAudioFilter(const TQString&, TQWidget*))); connect(m_filterDialog, TQT_SIGNAL(signalCreateVideoFilter(const TQString&, TQWidget*)), m_xine, TQT_SLOT(slotCreateVideoFilter(const TQString&, TQWidget*))); - connect(m_filterDialog, TQT_SIGNAL(signalRemoveAllAudioFilters()), TQT_TQOBJECT(m_xine), TQT_SLOT(slotRemoveAllAudioFilters())); - connect(m_filterDialog, TQT_SIGNAL(signalRemoveAllVideoFilters()), TQT_TQOBJECT(m_xine), TQT_SLOT(slotRemoveAllVideoFilters())); - connect(m_filterDialog, TQT_SIGNAL(signalUseAudioFilters(bool)), TQT_TQOBJECT(m_xine), TQT_SLOT(slotEnableAudioFilters(bool))); - connect(m_filterDialog, TQT_SIGNAL(signalUseVideoFilters(bool)), TQT_TQOBJECT(m_xine), TQT_SLOT(slotEnableVideoFilters(bool))); + connect(m_filterDialog, TQT_SIGNAL(signalRemoveAllAudioFilters()), m_xine, TQT_SLOT(slotRemoveAllAudioFilters())); + connect(m_filterDialog, TQT_SIGNAL(signalRemoveAllVideoFilters()), m_xine, TQT_SLOT(slotRemoveAllVideoFilters())); + connect(m_filterDialog, TQT_SIGNAL(signalUseAudioFilters(bool)), m_xine, TQT_SLOT(slotEnableAudioFilters(bool))); + connect(m_filterDialog, TQT_SIGNAL(signalUseVideoFilters(bool)), m_xine, TQT_SLOT(slotEnableVideoFilters(bool))); } m_filterDialog->show(); m_filterDialog->raise(); @@ -903,12 +903,12 @@ void XinePart::slotPictureSettings() int hue, sat, contrast, bright, avOffset, spuOffset; m_xine->getVideoSettings(hue, sat, contrast, bright, avOffset, spuOffset); m_pictureSettings = new VideoSettings(hue, sat, contrast, bright, avOffset, spuOffset); - connect(m_pictureSettings, TQT_SIGNAL(signalNewHue(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetHue(int))); - connect(m_pictureSettings, TQT_SIGNAL(signalNewSaturation(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetSaturation(int))); - connect(m_pictureSettings, TQT_SIGNAL(signalNewContrast(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetContrast(int))); - connect(m_pictureSettings, TQT_SIGNAL(signalNewBrightness(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetBrightness(int))); - connect(m_pictureSettings, TQT_SIGNAL(signalNewAVOffset(int)), TQT_TQOBJECT(m_xine), TQT_SLOT(slotSetAVOffset(int))); - connect(m_pictureSettings, TQT_SIGNAL(signalNewSpuOffset(int)), TQT_TQOBJECT(m_xine), TQT_SLOT(slotSetSpuOffset(int))); + connect(m_pictureSettings, TQT_SIGNAL(signalNewHue(int)), this, TQT_SLOT(slotSetHue(int))); + connect(m_pictureSettings, TQT_SIGNAL(signalNewSaturation(int)), this, TQT_SLOT(slotSetSaturation(int))); + connect(m_pictureSettings, TQT_SIGNAL(signalNewContrast(int)), this, TQT_SLOT(slotSetContrast(int))); + connect(m_pictureSettings, TQT_SIGNAL(signalNewBrightness(int)), this, TQT_SLOT(slotSetBrightness(int))); + connect(m_pictureSettings, TQT_SIGNAL(signalNewAVOffset(int)), m_xine, TQT_SLOT(slotSetAVOffset(int))); + connect(m_pictureSettings, TQT_SIGNAL(signalNewSpuOffset(int)), m_xine, TQT_SLOT(slotSetSpuOffset(int))); } m_pictureSettings->show(); m_pictureSettings->raise(); @@ -1073,7 +1073,7 @@ void XinePart::slotTrackPlaying() kdDebug() << "XinePart: xine is playing" << endl; m_pauseButton->setChecked(false); - TQTimer::singleShot(100, TQT_TQOBJECT(this), TQT_SLOT(slotEnablePlayActions())); + TQTimer::singleShot(100, this, TQT_SLOT(slotEnablePlayActions())); if ( m_xine->getURL()=="DVB" ) { @@ -1276,9 +1276,9 @@ void XinePart::slotFinalize() actionCollection()->action("file_save_screenshot")->plug(m_embeddedContext); actionCollection()->action("file_save_stream")->plug(m_embeddedContext); m_embeddedContext->insertSeparator(); - action = new TDEAction(i18n("Copy URL to Clipboard"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyToClipboard()), actionCollection(), "copy_to_clipboard"); + action = new TDEAction(i18n("Copy URL to Clipboard"), "edit-copy", 0, this, TQT_SLOT(slotCopyToClipboard()), actionCollection(), "copy_to_clipboard"); action->plug(m_embeddedContext); - action = new TDEAction(i18n("Play in Kaffeine Externally"), "gear", 0, TQT_TQOBJECT(this), TQT_SLOT(slotLaunchExternally()), actionCollection(), "play_externally"); + action = new TDEAction(i18n("Play in Kaffeine Externally"), "gear", 0, this, TQT_SLOT(slotLaunchExternally()), actionCollection(), "play_externally"); action->plug(m_embeddedContext); } @@ -1287,7 +1287,7 @@ void XinePart::slotFinalize() m_audioVisual->setItems(visuals); loadConfig(); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotEnableAllActions())); + TQTimer::singleShot(0, this, TQT_SLOT(slotEnableAllActions())); } void XinePart::slotCopyToClipboard() @@ -1302,7 +1302,7 @@ void XinePart::slotLaunchExternally() { slotStop(); - TQTimer::singleShot(1000, TQT_TQOBJECT(this), TQT_SLOT(slotLaunchDelayed())); + TQTimer::singleShot(1000, this, TQT_SLOT(slotLaunchDelayed())); } void XinePart::slotLaunchDelayed() @@ -1319,98 +1319,98 @@ void XinePart::initActions() { TDEAction* action = NULL; /* file menu */ - m_broadcastSend = new TDEToggleAction(i18n("&Send Broadcast Stream..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleBroadcastSend()), actionCollection(), "network_send"); - new TDEAction(i18n("&Receive Broadcast Stream..."), "network", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBroadcastReceive()), actionCollection(), "network_receive"); - new TDEAction(i18n("&Save Screenshot..."), "frame_image", CTRL|Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotScreenshot()), actionCollection(), "file_save_screenshot"); - action = new TDEAction(i18n("Save Stream..."), "player_record", Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotSaveStream()), actionCollection(), "file_save_stream"); + m_broadcastSend = new TDEToggleAction(i18n("&Send Broadcast Stream..."), 0, 0, this, TQT_SLOT(slotToggleBroadcastSend()), actionCollection(), "network_send"); + new TDEAction(i18n("&Receive Broadcast Stream..."), "network", 0, this, TQT_SLOT(slotBroadcastReceive()), actionCollection(), "network_receive"); + new TDEAction(i18n("&Save Screenshot..."), "frame_image", CTRL|Key_S, this, TQT_SLOT(slotScreenshot()), actionCollection(), "file_save_screenshot"); + action = new TDEAction(i18n("Save Stream..."), "player_record", Key_R, this, TQT_SLOT(slotSaveStream()), actionCollection(), "file_save_stream"); action->setWhatsThis(i18n("Saves current stream to harddisc. This feature was disabled for some formats (e.g. Real Media) to prevent potential legal problems.")); /* player menu */ new TDEAction(i18n("Toggle Minimal Mode"), 0, 0, this, TQT_SIGNAL(signalToggleMinimalMode()), actionCollection(), "player_minimal_mode"); - new TDEAction(i18n("Play"), "media-playback-start", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlay()), actionCollection(), "player_play"); - m_pauseButton = new TDEToggleAction(i18n("Pause"), "media-playback-pause", Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotTogglePause()), actionCollection(), "player_pause"); - new TDEAction(i18n("&Next"), "media-skip-forward", Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(slotNext()), actionCollection(), "player_next"); - new TDEAction(i18n("&Previous"), "media-skip-backward", Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(slotPrevious()), actionCollection(), "player_previous"); - new TDEAction(i18n("Stop"), "media-playback-stop", Key_Backspace, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "player_stop"); - - new TDEAction(i18n("&Fast Forward"), "media-seek-forward", ALT|Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotFastForward()), actionCollection(), "player_ff"); - new TDEAction(i18n("Slow &Motion"), 0, ALT|Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotSlowMotion()), actionCollection(), "player_slowmotion"); - - new TDEAction(i18n("Skip Forward (20s)"), NULL, Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotPosPlusSmall()), actionCollection(), "player_posplus_small"); - new TDEAction(i18n("Skip Backward (20s)"), NULL, Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotPosMinusSmall()), actionCollection(), "player_posminus_small"); - new TDEAction(i18n("Skip Forward (1m)"), NULL, CTRL|Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(slotPosPlusMedium()), actionCollection(), "player_posplus_medium"); - new TDEAction(i18n("Skip Backward (1m)"), NULL, CTRL|Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(slotPosMinusMedium()), actionCollection(), "player_posminus_medium"); - new TDEAction(i18n("Skip Forward (10m)"), NULL, ALT|Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(slotPosPlusLarge()), actionCollection(), "player_posplus_large"); - new TDEAction(i18n("Skip Backward (10m)"), NULL, ALT|Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(slotPosMinusLarge()), actionCollection(), "player_posminus_large"); - new TDEAction(i18n("Jump to Position..."), "goto", CTRL|Key_J, TQT_TQOBJECT(this), TQT_SLOT(slotJumpToPosition()), actionCollection(), "player_jump_to"); - - new TDEAction(i18n("DVD Menu Left"), 0, CTRL|Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotDVDMenuLeft()), actionCollection(), "dvdmenuleft"); - new TDEAction(i18n("DVD Menu Right"), 0, CTRL|Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotDVDMenuRight()), actionCollection(), "dvdmenuright"); - new TDEAction(i18n("DVD Menu Up"), 0, CTRL|Key_Up, TQT_TQOBJECT(this), TQT_SLOT(slotDVDMenuUp()), actionCollection(), "dvdmenuup"); - new TDEAction(i18n("DVD Menu Down"), 0, CTRL|Key_Down, TQT_TQOBJECT(this), TQT_SLOT(slotDVDMenuDown()), actionCollection(), "dvdmenudown"); - new TDEAction(i18n("DVD Menu Select"), 0, CTRL|Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotDVDMenuSelect()), actionCollection(), "dvdmenuselect"); + new TDEAction(i18n("Play"), "media-playback-start", 0, this, TQT_SLOT(slotPlay()), actionCollection(), "player_play"); + m_pauseButton = new TDEToggleAction(i18n("Pause"), "media-playback-pause", Key_Space, this, TQT_SLOT(slotTogglePause()), actionCollection(), "player_pause"); + new TDEAction(i18n("&Next"), "media-skip-forward", Key_PageDown, this, TQT_SLOT(slotNext()), actionCollection(), "player_next"); + new TDEAction(i18n("&Previous"), "media-skip-backward", Key_PageUp, this, TQT_SLOT(slotPrevious()), actionCollection(), "player_previous"); + new TDEAction(i18n("Stop"), "media-playback-stop", Key_Backspace, this, TQT_SLOT(slotStop()), actionCollection(), "player_stop"); + + new TDEAction(i18n("&Fast Forward"), "media-seek-forward", ALT|Key_Right, this, TQT_SLOT(slotFastForward()), actionCollection(), "player_ff"); + new TDEAction(i18n("Slow &Motion"), 0, ALT|Key_Left, this, TQT_SLOT(slotSlowMotion()), actionCollection(), "player_slowmotion"); + + new TDEAction(i18n("Skip Forward (20s)"), NULL, Key_Right, this, TQT_SLOT(slotPosPlusSmall()), actionCollection(), "player_posplus_small"); + new TDEAction(i18n("Skip Backward (20s)"), NULL, Key_Left, this, TQT_SLOT(slotPosMinusSmall()), actionCollection(), "player_posminus_small"); + new TDEAction(i18n("Skip Forward (1m)"), NULL, CTRL|Key_PageUp, this, TQT_SLOT(slotPosPlusMedium()), actionCollection(), "player_posplus_medium"); + new TDEAction(i18n("Skip Backward (1m)"), NULL, CTRL|Key_PageDown, this, TQT_SLOT(slotPosMinusMedium()), actionCollection(), "player_posminus_medium"); + new TDEAction(i18n("Skip Forward (10m)"), NULL, ALT|Key_PageUp, this, TQT_SLOT(slotPosPlusLarge()), actionCollection(), "player_posplus_large"); + new TDEAction(i18n("Skip Backward (10m)"), NULL, ALT|Key_PageDown, this, TQT_SLOT(slotPosMinusLarge()), actionCollection(), "player_posminus_large"); + new TDEAction(i18n("Jump to Position..."), "goto", CTRL|Key_J, this, TQT_SLOT(slotJumpToPosition()), actionCollection(), "player_jump_to"); + + new TDEAction(i18n("DVD Menu Left"), 0, CTRL|Key_Left, this, TQT_SLOT(slotDVDMenuLeft()), actionCollection(), "dvdmenuleft"); + new TDEAction(i18n("DVD Menu Right"), 0, CTRL|Key_Right, this, TQT_SLOT(slotDVDMenuRight()), actionCollection(), "dvdmenuright"); + new TDEAction(i18n("DVD Menu Up"), 0, CTRL|Key_Up, this, TQT_SLOT(slotDVDMenuUp()), actionCollection(), "dvdmenuup"); + new TDEAction(i18n("DVD Menu Down"), 0, CTRL|Key_Down, this, TQT_SLOT(slotDVDMenuDown()), actionCollection(), "dvdmenudown"); + new TDEAction(i18n("DVD Menu Select"), 0, CTRL|Key_Return, this, TQT_SLOT(slotDVDMenuSelect()), actionCollection(), "dvdmenuselect"); m_audioChannels = new TDESelectAction(i18n("Audio Channel"), 0, actionCollection(), "audio_channels"); m_audioChannels->setToolTip(i18n("Select audio channel")); m_audioChannels->setComboWidth( 50 ); - connect(m_audioChannels, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetAudioChannel(int ))); - new TDEAction(i18n("&Next Audio Channel"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotNextAudioChannel()), actionCollection(), "next_audio_channels"); + connect(m_audioChannels, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetAudioChannel(int ))); + new TDEAction(i18n("&Next Audio Channel"), 0, 0, this, TQT_SLOT(slotNextAudioChannel()), actionCollection(), "next_audio_channels"); m_audioVisual = new TDESelectAction(i18n("Audio &Visualization"), 0, actionCollection(), "audio_visualization"); - connect(m_audioVisual, TQT_SIGNAL(activated(const TQString&)), TQT_TQOBJECT(m_xine), TQT_SLOT(slotSetVisualPlugin(const TQString&))); - new TDEAction(i18n("&Mute"), "player_mute", Key_U, TQT_TQOBJECT(this), TQT_SLOT(slotMute()), actionCollection(), "audio_mute"); - new TDEAction(i18n("Volume Up"), NULL, Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotVolumeUp()), actionCollection(), "volume_increase"); - new TDEAction(i18n("Volume Down"), NULL, Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotVolumeDown()), actionCollection(), "volume_decrease"); + connect(m_audioVisual, TQT_SIGNAL(activated(const TQString&)), m_xine, TQT_SLOT(slotSetVisualPlugin(const TQString&))); + new TDEAction(i18n("&Mute"), "player_mute", Key_U, this, TQT_SLOT(slotMute()), actionCollection(), "audio_mute"); + new TDEAction(i18n("Volume Up"), NULL, Key_Plus, this, TQT_SLOT(slotVolumeUp()), actionCollection(), "volume_increase"); + new TDEAction(i18n("Volume Down"), NULL, Key_Minus, this, TQT_SLOT(slotVolumeDown()), actionCollection(), "volume_decrease"); - m_deinterlaceEnabled = new TDEToggleAction(i18n("&Deinterlace"), 0, Key_I, TQT_TQOBJECT(m_xine), TQT_SLOT(slotToggleDeinterlace()), actionCollection(), "video_deinterlace"); + m_deinterlaceEnabled = new TDEToggleAction(i18n("&Deinterlace"), 0, Key_I, m_xine, TQT_SLOT(slotToggleDeinterlace()), actionCollection(), "video_deinterlace"); m_deinterlaceEnabled->setWhatsThis(i18n("Activate this for interlaced streams, some DVD's for example.")); - new TDEAction(i18n("&Auto"), "zoom-fit-best", Key_F5, TQT_TQOBJECT(m_xine), TQT_SLOT(slotAspectRatioAuto()), actionCollection(), "aspect_auto"); - new TDEAction(i18n("&4:3"), "zoom-fit-best", Key_F6, TQT_TQOBJECT(m_xine), TQT_SLOT(slotAspectRatio4_3()), actionCollection(), "aspect_43"); - new TDEAction(i18n("A&namorphic"), "zoom-fit-best", Key_F7, TQT_TQOBJECT(m_xine), TQT_SLOT(slotAspectRatioAnamorphic()), actionCollection(), "aspect_anamorphic"); - new TDEAction(i18n("&DVB"), "zoom-fit-best", Key_F8, TQT_TQOBJECT(m_xine), TQT_SLOT(slotAspectRatioDVB()), actionCollection(), "aspect_dvb"); - new TDEAction(i18n("&Square"), "zoom-fit-best", Key_F9, TQT_TQOBJECT(m_xine), TQT_SLOT(slotAspectRatioSquare()), actionCollection(), "aspect_square"); - KStdAction::zoomIn(TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomIn()), actionCollection(), "zoom_in"); - KStdAction::zoomOut(TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOut()), actionCollection(), "zoom_out"); - KStdAction::fitToPage(TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOff()), actionCollection(), "zoom_off"); - new TDEAction(i18n("Zoom In Horizontal"), NULL, CTRL|Key_H, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomInX()), actionCollection(), "zoom_in_x"); - new TDEAction(i18n("Zoom Out Horizontal"), NULL, CTRL|SHIFT|Key_H, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOutX()), actionCollection(), "zoom_out_x"); - new TDEAction(i18n("Zoom In Vertical"), NULL, CTRL|Key_V, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomInY()), actionCollection(), "zoom_in_y"); - new TDEAction(i18n("Zoom Out Vertical"), NULL, CTRL|SHIFT|Key_V, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOutY()), actionCollection(), "zoom_out_y"); - new TDEAction(i18n("Deinterlace &Quality"), "blend", CTRL|Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotDeinterlaceQuality()), actionCollection(), "video_deinterlace_quality"); - new TDEAction(i18n("&Video Settings"), "configure", Key_V, TQT_TQOBJECT(this), TQT_SLOT(slotPictureSettings()), actionCollection(), "video_picture"); - new TDEAction(i18n("&Equalizer"), NULL, Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotEqualizer()), actionCollection(), "equalizer"); + new TDEAction(i18n("&Auto"), "zoom-fit-best", Key_F5, m_xine, TQT_SLOT(slotAspectRatioAuto()), actionCollection(), "aspect_auto"); + new TDEAction(i18n("&4:3"), "zoom-fit-best", Key_F6, m_xine, TQT_SLOT(slotAspectRatio4_3()), actionCollection(), "aspect_43"); + new TDEAction(i18n("A&namorphic"), "zoom-fit-best", Key_F7, m_xine, TQT_SLOT(slotAspectRatioAnamorphic()), actionCollection(), "aspect_anamorphic"); + new TDEAction(i18n("&DVB"), "zoom-fit-best", Key_F8, m_xine, TQT_SLOT(slotAspectRatioDVB()), actionCollection(), "aspect_dvb"); + new TDEAction(i18n("&Square"), "zoom-fit-best", Key_F9, m_xine, TQT_SLOT(slotAspectRatioSquare()), actionCollection(), "aspect_square"); + KStdAction::zoomIn(m_xine, TQT_SLOT(slotZoomIn()), actionCollection(), "zoom_in"); + KStdAction::zoomOut(m_xine, TQT_SLOT(slotZoomOut()), actionCollection(), "zoom_out"); + KStdAction::fitToPage(m_xine, TQT_SLOT(slotZoomOff()), actionCollection(), "zoom_off"); + new TDEAction(i18n("Zoom In Horizontal"), NULL, CTRL|Key_H, m_xine, TQT_SLOT(slotZoomInX()), actionCollection(), "zoom_in_x"); + new TDEAction(i18n("Zoom Out Horizontal"), NULL, CTRL|SHIFT|Key_H, m_xine, TQT_SLOT(slotZoomOutX()), actionCollection(), "zoom_out_x"); + new TDEAction(i18n("Zoom In Vertical"), NULL, CTRL|Key_V, m_xine, TQT_SLOT(slotZoomInY()), actionCollection(), "zoom_in_y"); + new TDEAction(i18n("Zoom Out Vertical"), NULL, CTRL|SHIFT|Key_V, m_xine, TQT_SLOT(slotZoomOutY()), actionCollection(), "zoom_out_y"); + new TDEAction(i18n("Deinterlace &Quality"), "blend", CTRL|Key_I, this, TQT_SLOT(slotDeinterlaceQuality()), actionCollection(), "video_deinterlace_quality"); + new TDEAction(i18n("&Video Settings"), "configure", Key_V, this, TQT_SLOT(slotPictureSettings()), actionCollection(), "video_picture"); + new TDEAction(i18n("&Equalizer"), NULL, Key_E, this, TQT_SLOT(slotEqualizer()), actionCollection(), "equalizer"); m_subtitles = new TDESelectAction(i18n("Subtitle"), 0, actionCollection(), "player_subtitles"); m_subtitles->setToolTip(i18n("Select Subtitle")); m_subtitles->setComboWidth( 50 ); - connect(m_subtitles, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetSubtitle(int))); - new TDEAction(i18n("&Next Subtitle Channel"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotNextSubtitleChannel()), actionCollection(), "next_player_subtitles"); - new TDEAction(i18n("Delay Subtitle"), 0, CTRL|ALT|Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotDelaySubTitle()), actionCollection(), "adv_sub"); - new TDEAction(i18n("Advance Subtitle"), 0, CTRL|ALT|Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotAdvanceSubTitle()), actionCollection(), "delay_sub"); - new TDEAction(i18n("Add subtitle..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSubtitle()), actionCollection(), "add_subtitle"); - - new TDEAction(i18n("&Menu Toggle"), "view_detailed", Key_D, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuToggle()), actionCollection(), "dvd_toggle"); - new TDEAction(i18n("&Title"), NULL, 0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuTitle()), actionCollection(), "dvd_title"); - new TDEAction(i18n("&Root"), NULL, 0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuRoot()), actionCollection(), "dvd_root"); - new TDEAction(i18n("&Subpicture"), NULL, 0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuSubpicture()), actionCollection(), "dvd_subpicture"); - new TDEAction(i18n("&Audio"), NULL, 0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuAudio()), actionCollection(), "dvd_audio"); - new TDEAction(i18n("An&gle"), NULL, 0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuAngle()), actionCollection(), "dvd_angle"); - new TDEAction(i18n("&Part"), NULL, 0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuPart()), actionCollection(), "dvd_part"); + connect(m_subtitles, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetSubtitle(int))); + new TDEAction(i18n("&Next Subtitle Channel"), 0, 0, this, TQT_SLOT(slotNextSubtitleChannel()), actionCollection(), "next_player_subtitles"); + new TDEAction(i18n("Delay Subtitle"), 0, CTRL|ALT|Key_Left, this, TQT_SLOT(slotDelaySubTitle()), actionCollection(), "adv_sub"); + new TDEAction(i18n("Advance Subtitle"), 0, CTRL|ALT|Key_Right, this, TQT_SLOT(slotAdvanceSubTitle()), actionCollection(), "delay_sub"); + new TDEAction(i18n("Add subtitle..."), 0, 0, this, TQT_SLOT(slotAddSubtitle()), actionCollection(), "add_subtitle"); + + new TDEAction(i18n("&Menu Toggle"), "view_detailed", Key_D, m_xine, TQT_SLOT(slotMenuToggle()), actionCollection(), "dvd_toggle"); + new TDEAction(i18n("&Title"), NULL, 0, m_xine, TQT_SLOT(slotMenuTitle()), actionCollection(), "dvd_title"); + new TDEAction(i18n("&Root"), NULL, 0, m_xine, TQT_SLOT(slotMenuRoot()), actionCollection(), "dvd_root"); + new TDEAction(i18n("&Subpicture"), NULL, 0, m_xine, TQT_SLOT(slotMenuSubpicture()), actionCollection(), "dvd_subpicture"); + new TDEAction(i18n("&Audio"), NULL, 0, m_xine, TQT_SLOT(slotMenuAudio()), actionCollection(), "dvd_audio"); + new TDEAction(i18n("An&gle"), NULL, 0, m_xine, TQT_SLOT(slotMenuAngle()), actionCollection(), "dvd_angle"); + new TDEAction(i18n("&Part"), NULL, 0, m_xine, TQT_SLOT(slotMenuPart()), actionCollection(), "dvd_part"); m_dvdTitles = new TDESelectAction(i18n("Titles"), 0, actionCollection(), "dvd_title_menu"); - connect(m_dvdTitles, TQT_SIGNAL(activated(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotSetDVDTitle(const TQString&))); + connect(m_dvdTitles, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotSetDVDTitle(const TQString&))); m_dvdChapters = new TDESelectAction(i18n("Chapters"), 0, actionCollection(), "dvd_chapter_menu"); - connect(m_dvdChapters, TQT_SIGNAL(activated(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotSetDVDChapter(const TQString&))); + connect(m_dvdChapters, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotSetDVDChapter(const TQString&))); m_dvdAngles = new TDESelectAction(i18n("Angles"), 0, actionCollection(), "dvd_angle_menu"); - connect(m_dvdAngles, TQT_SIGNAL(activated(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotSetDVDAngle(const TQString&))); + connect(m_dvdAngles, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotSetDVDAngle(const TQString&))); - new TDEAction(i18n("Track &Info"), "application-vnd.tde.info", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotInfo()), actionCollection(), "player_track_info"); - new TDEAction(i18n("Effect &Plugins..."), "filter", Key_X, TQT_TQOBJECT(this), TQT_SLOT(slotFilterDialog()), actionCollection(), "player_post_filters"); + new TDEAction(i18n("Track &Info"), "application-vnd.tde.info", 0 , this, TQT_SLOT(slotInfo()), actionCollection(), "player_track_info"); + new TDEAction(i18n("Effect &Plugins..."), "filter", Key_X, this, TQT_SLOT(slotFilterDialog()), actionCollection(), "player_post_filters"); /* settings menu */ - new TDEAction(i18n("&xine Engine Parameters"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigXine()), actionCollection(), "settings_xine_parameter"); + new TDEAction(i18n("&xine Engine Parameters"), "edit", 0, this, TQT_SLOT(slotConfigXine()), actionCollection(), "settings_xine_parameter"); m_volume = new VolumeSlider(); TQToolTip::add @@ -1419,8 +1419,8 @@ void XinePart::initActions() m_volume->setSteps(1, 10); m_volume->setFocusPolicy(TQWidget::NoFocus); m_volume->setFixedWidth(75); - connect(m_volume, TQT_SIGNAL(valueChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotVolumeChanged(int))); - connect(m_xine, TQT_SIGNAL(signalSyncVolume()), TQT_TQOBJECT(this), TQT_SLOT(slotSyncVolume())); + connect(m_volume, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVolumeChanged(int))); + connect(m_xine, TQT_SIGNAL(signalSyncVolume()), this, TQT_SLOT(slotSyncVolume())); new KWidgetAction(m_volume, i18n("Volume"), 0, 0, 0, actionCollection(), "audio_volume"); m_position = new PositionSlider(Horizontal); @@ -1431,10 +1431,10 @@ void XinePart::initActions() m_position->setTracking(false); m_position->setFocusPolicy(TQWidget::NoFocus); m_position->setMinimumWidth(180); - connect(m_position, TQT_SIGNAL(sliderMoved(int)), TQT_TQOBJECT(m_xine), TQT_SLOT(slotSeekToPosition(int))); - connect(m_position, TQT_SIGNAL(sliderLastMove(int)), TQT_TQOBJECT(m_xine), TQT_SLOT(slotSeekToPositionBlocking(int))); - connect(m_position, TQT_SIGNAL(signalStartSeeking()), TQT_TQOBJECT(m_xine), TQT_SLOT(slotStartSeeking())); - connect(m_position, TQT_SIGNAL(signalStopSeeking()), TQT_TQOBJECT(m_xine), TQT_SLOT(slotStopSeeking())); + connect(m_position, TQT_SIGNAL(sliderMoved(int)), m_xine, TQT_SLOT(slotSeekToPosition(int))); + connect(m_position, TQT_SIGNAL(sliderLastMove(int)), m_xine, TQT_SLOT(slotSeekToPositionBlocking(int))); + connect(m_position, TQT_SIGNAL(signalStartSeeking()), m_xine, TQT_SLOT(slotStartSeeking())); + connect(m_position, TQT_SIGNAL(signalStopSeeking()), m_xine, TQT_SLOT(slotStopSeeking())); new KWidgetAction(m_position, i18n("Position"), 0, 0, 0, actionCollection(), "player_position"); m_playTime = new TQPushButton(0); @@ -1445,42 +1445,42 @@ void XinePart::initActions() m_playTime->setSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_playTime->setFocusPolicy(TQWidget::NoFocus); new KWidgetAction(m_playTime, i18n("Playtime"), 0, 0, 0, actionCollection(), "player_playtime"); - connect(m_playTime, TQT_SIGNAL(pressed()), TQT_TQOBJECT(this), TQT_SLOT(slotButtonTimerPressed())); - connect(m_playTime, TQT_SIGNAL(released()), TQT_TQOBJECT(this), TQT_SLOT(slotButtonTimerReleased())); + connect(m_playTime, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotButtonTimerPressed())); + connect(m_playTime, TQT_SIGNAL(released()), this, TQT_SLOT(slotButtonTimerReleased())); m_playTime->setText("0:00:00"); m_equalizer = new Equalizer(); - connect(m_equalizer, TQT_SIGNAL(signalNewEq30(int)), TQT_TQOBJECT(m_xine), TQT_SLOT(slotSetEq30(int))); - connect(m_equalizer, TQT_SIGNAL(signalNewEq60(int)), TQT_TQOBJECT(m_xine), TQT_SLOT(slotSetEq60(int))); - connect(m_equalizer, TQT_SIGNAL(signalNewEq125(int)), TQT_TQOBJECT(m_xine), TQT_SLOT(slotSetEq125(int))); - connect(m_equalizer, TQT_SIGNAL(signalNewEq250(int)), TQT_TQOBJECT(m_xine), TQT_SLOT(slotSetEq250(int))); - connect(m_equalizer, TQT_SIGNAL(signalNewEq500(int)), TQT_TQOBJECT(m_xine), TQT_SLOT(slotSetEq500(int))); - connect(m_equalizer, TQT_SIGNAL(signalNewEq1k(int)), TQT_TQOBJECT(m_xine), TQT_SLOT(slotSetEq1k(int))); - connect(m_equalizer, TQT_SIGNAL(signalNewEq2k(int)), TQT_TQOBJECT(m_xine), TQT_SLOT(slotSetEq2k(int))); - connect(m_equalizer, TQT_SIGNAL(signalNewEq4k(int)), TQT_TQOBJECT(m_xine), TQT_SLOT(slotSetEq4k(int))); - connect(m_equalizer, TQT_SIGNAL(signalNewEq8k(int)), TQT_TQOBJECT(m_xine), TQT_SLOT(slotSetEq8k(int))); - connect(m_equalizer, TQT_SIGNAL(signalNewEq16k(int)), TQT_TQOBJECT(m_xine), TQT_SLOT(slotSetEq16k(int))); - connect(m_equalizer, TQT_SIGNAL(signalSetVolumeGain(bool)), TQT_TQOBJECT(m_xine), TQT_SLOT(slotSetVolumeGain(bool))); + connect(m_equalizer, TQT_SIGNAL(signalNewEq30(int)), m_xine, TQT_SLOT(slotSetEq30(int))); + connect(m_equalizer, TQT_SIGNAL(signalNewEq60(int)), m_xine, TQT_SLOT(slotSetEq60(int))); + connect(m_equalizer, TQT_SIGNAL(signalNewEq125(int)), m_xine, TQT_SLOT(slotSetEq125(int))); + connect(m_equalizer, TQT_SIGNAL(signalNewEq250(int)), m_xine, TQT_SLOT(slotSetEq250(int))); + connect(m_equalizer, TQT_SIGNAL(signalNewEq500(int)), m_xine, TQT_SLOT(slotSetEq500(int))); + connect(m_equalizer, TQT_SIGNAL(signalNewEq1k(int)), m_xine, TQT_SLOT(slotSetEq1k(int))); + connect(m_equalizer, TQT_SIGNAL(signalNewEq2k(int)), m_xine, TQT_SLOT(slotSetEq2k(int))); + connect(m_equalizer, TQT_SIGNAL(signalNewEq4k(int)), m_xine, TQT_SLOT(slotSetEq4k(int))); + connect(m_equalizer, TQT_SIGNAL(signalNewEq8k(int)), m_xine, TQT_SLOT(slotSetEq8k(int))); + connect(m_equalizer, TQT_SIGNAL(signalNewEq16k(int)), m_xine, TQT_SLOT(slotSetEq16k(int))); + connect(m_equalizer, TQT_SIGNAL(signalSetVolumeGain(bool)), m_xine, TQT_SLOT(slotSetVolumeGain(bool))); } void XinePart::initConnections() { - connect(&m_posCheckTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotCheckMoved())); - connect(&m_osdTimerEnabler, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotToggleOsdTimer())); - connect(m_xine, TQT_SIGNAL(signalXineReady()), TQT_TQOBJECT(this), TQT_SLOT(slotFinalize())); + connect(&m_posCheckTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckMoved())); + connect(&m_osdTimerEnabler, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotToggleOsdTimer())); + connect(m_xine, TQT_SIGNAL(signalXineReady()), this, TQT_SLOT(slotFinalize())); connect(m_xine, TQT_SIGNAL(signalNewChannels(const TQStringList&, const TQStringList&, int, int )), this, TQT_SLOT(slotChannelInfo(const TQStringList&, const TQStringList&, int, int ))); - connect(m_xine, TQT_SIGNAL(signalXinePlaying()), TQT_TQOBJECT(this), TQT_SLOT(slotTrackPlaying())); - connect(m_xine, TQT_SIGNAL(signalNewPosition(int, const TQTime&)), TQT_TQOBJECT(this), TQT_SLOT(slotNewPosition(int, const TQTime&))); - connect(m_xine, TQT_SIGNAL(signalXineStatus(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotStatus(const TQString&))); - connect(m_xine, TQT_SIGNAL(signalXineError(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotError(const TQString&))); - connect(m_xine, TQT_SIGNAL(signalXineMessage(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotMessage(const TQString&))); - connect(m_xine, TQT_SIGNAL(signalPlaybackFinished()), TQT_TQOBJECT(this), TQT_SLOT(slotPlaybackFinished())); - connect(m_xine, TQT_SIGNAL(signalTitleChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotNewTitle())); - connect(m_xine, TQT_SIGNAL(signalLengthChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotNewLength())); - connect(m_xine, TQT_SIGNAL(signalVideoSizeChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotNewFrameSize())); - connect(m_xine, TQT_SIGNAL(signalRightClick(const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(const TQPoint&))); + connect(m_xine, TQT_SIGNAL(signalXinePlaying()), this, TQT_SLOT(slotTrackPlaying())); + connect(m_xine, TQT_SIGNAL(signalNewPosition(int, const TQTime&)), this, TQT_SLOT(slotNewPosition(int, const TQTime&))); + connect(m_xine, TQT_SIGNAL(signalXineStatus(const TQString&)), this, TQT_SLOT(slotStatus(const TQString&))); + connect(m_xine, TQT_SIGNAL(signalXineError(const TQString&)), this, TQT_SLOT(slotError(const TQString&))); + connect(m_xine, TQT_SIGNAL(signalXineMessage(const TQString&)), this, TQT_SLOT(slotMessage(const TQString&))); + connect(m_xine, TQT_SIGNAL(signalPlaybackFinished()), this, TQT_SLOT(slotPlaybackFinished())); + connect(m_xine, TQT_SIGNAL(signalTitleChanged()), this, TQT_SLOT(slotNewTitle())); + connect(m_xine, TQT_SIGNAL(signalLengthChanged()), this, TQT_SLOT(slotNewLength())); + connect(m_xine, TQT_SIGNAL(signalVideoSizeChanged()), this, TQT_SLOT(slotNewFrameSize())); + connect(m_xine, TQT_SIGNAL(signalRightClick(const TQPoint&)), this, TQT_SLOT(slotContextMenu(const TQPoint&))); } void XinePart::loadConfig() diff --git a/kaffeine/src/systemtray.cpp b/kaffeine/src/systemtray.cpp index 01106a3..6c14eb7 100644 --- a/kaffeine/src/systemtray.cpp +++ b/kaffeine/src/systemtray.cpp @@ -57,11 +57,11 @@ SystemTray::SystemTray(TQWidget *parent, const char *name ) : KSystemTray(parent kdDebug() << "SystemTray: Create System Tray" << endl; - TDEAction* play = new TDEAction(i18n("Play / Pause"), "media-playback-start", 0, TQT_TQOBJECT(this), TQT_SIGNAL(signalPlay()), actionCollection(), "trayplay"); - TDEAction* next = new TDEAction(i18n("&Next"), "go-next", 0, TQT_TQOBJECT(this), TQT_SIGNAL(signalNext()), actionCollection(), "traynext"); - TDEAction* previous = new TDEAction(i18n("&Previous"), "go-previous", 0, TQT_TQOBJECT(this), TQT_SIGNAL(signalPrevious()), actionCollection(), "trayprevious"); - TDEAction* stop = new TDEAction(i18n("Stop"), "media-playback-stop", 0, TQT_TQOBJECT(this), TQT_SIGNAL(signalStop()), actionCollection(), "traystop"); - TDEAction* mute = new TDEAction(i18n("&Mute"), "player_mute", 0, TQT_TQOBJECT(this), TQT_SIGNAL(signalMute()), actionCollection(), "traymute"); + TDEAction* play = new TDEAction(i18n("Play / Pause"), "media-playback-start", 0, this, TQT_SIGNAL(signalPlay()), actionCollection(), "trayplay"); + TDEAction* next = new TDEAction(i18n("&Next"), "go-next", 0, this, TQT_SIGNAL(signalNext()), actionCollection(), "traynext"); + TDEAction* previous = new TDEAction(i18n("&Previous"), "go-previous", 0, this, TQT_SIGNAL(signalPrevious()), actionCollection(), "trayprevious"); + TDEAction* stop = new TDEAction(i18n("Stop"), "media-playback-stop", 0, this, TQT_SIGNAL(signalStop()), actionCollection(), "traystop"); + TDEAction* mute = new TDEAction(i18n("&Mute"), "player_mute", 0, this, TQT_SIGNAL(signalMute()), actionCollection(), "traymute"); play->plug(contextMenu()); next->plug(contextMenu()); @@ -73,7 +73,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name ) : KSystemTray(parent m_osd->setFrameStyle(TQFrame::Panel | TQFrame::Plain); m_osd->setLineWidth(1); m_osd->setAlignment(SingleLine); - connect(&m_hideTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotHideOSD())); + connect(&m_hideTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotHideOSD())); setPixmap(TDEGlobal::iconLoader()->loadIcon("kaffeine", TDEIcon::Panel, 22)); TQToolTip::add(this, i18n("Kaffeine Player"));