diff options
Diffstat (limited to 'kaffeine/src/kaffeine.cpp')
| -rw-r--r-- | kaffeine/src/kaffeine.cpp | 116 |
1 files changed, 58 insertions, 58 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<KaffeinePart>(service, m_playerContainer, service->name().ascii(), TQT_TQOBJECT(this), 0, m_engineParameters, &error); + m_mediaPart = KParts::ComponentFactory::createPartInstanceFromService<KaffeinePart>(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(); } } |