diff --git a/src/gstplayer.cpp b/src/gstplayer.cpp index 74bcee0..3683989 100644 --- a/src/gstplayer.cpp +++ b/src/gstplayer.cpp @@ -461,7 +461,7 @@ void Backend::play (int repeat) { } void Backend::stop () { - TQTimer::singleShot (0, gstapp, TQT_SLOT (stop ())); + TQTimer::singleShot (0, gstapp, TQ_SLOT (stop ())); } void Backend::pause () { @@ -507,7 +507,7 @@ void Backend::quit () { if (running) stop (); else - TQTimer::singleShot (0, tqApp, TQT_SLOT (quit ())); + TQTimer::singleShot (0, tqApp, TQ_SLOT (quit ())); } bool updateConfigEntry (const TQString & name, const TQString & value) { @@ -709,7 +709,7 @@ void KGStreamerPlayer::play (int repeat) { gstPollForStateChange (gst_elm_play, GST_STATE_PLAYING); } g_free (uri); - TQTimer::singleShot (500, this, TQT_SLOT (updatePosition ())); + TQTimer::singleShot (500, this, TQ_SLOT (updatePosition ())); return; fail: if (videosink) { @@ -757,7 +757,7 @@ void KGStreamerPlayer::stop () { } void KGStreamerPlayer::finished () { - TQTimer::singleShot (10, this, TQT_SLOT (stop ())); + TQTimer::singleShot (10, this, TQ_SLOT (stop ())); } static void adjustColorSetting (const char * channel, int val) { @@ -832,7 +832,7 @@ void KGStreamerPlayer::updatePosition () { callback->moviePosition (int (val / (GST_MSECOND * 100))); } mutex.unlock (); - TQTimer::singleShot (500, this, TQT_SLOT (updatePosition ())); + TQTimer::singleShot (500, this, TQ_SLOT (updatePosition ())); } } @@ -859,7 +859,7 @@ bool KGStreamerPlayer::event (TQEvent * e) { if (callback) callback->finished (); else - TQTimer::singleShot (0, this, TQT_SLOT (quit ())); + TQTimer::singleShot (0, this, TQ_SLOT (quit ())); break; } //callback->movieParams (se->length/100, se->width, se->height, se->height ? 1.0*se->width/se->height : 1.0); @@ -1075,7 +1075,7 @@ int main(int argc, char **argv) { getConfigEntries (buf); callback->started (dcopclient.appId (), buf); } else - TQTimer::singleShot (10, gstapp, TQT_SLOT (play (int))); + TQTimer::singleShot (10, gstapp, TQ_SLOT (play (int))); gstapp->exec (); diff --git a/src/kmplayer_part.cpp b/src/kmplayer_part.cpp index 6bf0e5b..2efc6ce 100644 --- a/src/kmplayer_part.cpp +++ b/src/kmplayer_part.cpp @@ -154,17 +154,17 @@ KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (TQWidget * wparent, const char * m_sources ["hrefsource"] = (new KMPlayerHRefSource (this)); #ifdef HAVE_NSPR KMPlayer::NpPlayer *npp = (KMPlayer::NpPlayer *) players () ["npp"]; - connect (npp, TQT_SIGNAL (evaluate (const TQString &, TQString &)), - m_liveconnectextension, TQT_SLOT (evaluate (const TQString &, TQString &))); - connect (npp, TQT_SIGNAL (openUrl (const KURL &, const TQString &)), + connect (npp, TQ_SIGNAL (evaluate (const TQString &, TQString &)), + m_liveconnectextension, TQ_SLOT (evaluate (const TQString &, TQString &))); + connect (npp, TQ_SIGNAL (openUrl (const KURL &, const TQString &)), m_browserextension, - TQT_SLOT (slotRequestOpenURL (const KURL &, const TQString &))); + TQ_SLOT (slotRequestOpenURL (const KURL &, const TQString &))); #endif - /*TDEAction *playact =*/ new TDEAction(i18n("P&lay"), TQString ("media-playback-start"), TDEShortcut (), this, TQT_SLOT(play ()), actionCollection (), "play"); - /*TDEAction *pauseact =*/ new TDEAction(i18n("&Pause"), TQString ("media-playback-pause"), TDEShortcut (), this, TQT_SLOT(pause ()), actionCollection (), "pause"); - /*TDEAction *stopact =*/ new TDEAction(i18n("&Stop"), TQString ("media-playback-stop"), TDEShortcut (), this, TQT_SLOT(stop ()), actionCollection (), "stop"); - new TDEAction (i18n ("Increase Volume"), TQString ("player_volume"), TDEShortcut (), this, TQT_SLOT (increaseVolume ()), actionCollection (), "edit_volume_up"); - new TDEAction (i18n ("Decrease Volume"), TQString ("player_volume"), TDEShortcut (), this, TQT_SLOT (decreaseVolume ()), actionCollection (), "edit_volume_down"); + /*TDEAction *playact =*/ new TDEAction(i18n("P&lay"), TQString ("media-playback-start"), TDEShortcut (), this, TQ_SLOT(play ()), actionCollection (), "play"); + /*TDEAction *pauseact =*/ new TDEAction(i18n("&Pause"), TQString ("media-playback-pause"), TDEShortcut (), this, TQ_SLOT(pause ()), actionCollection (), "pause"); + /*TDEAction *stopact =*/ new TDEAction(i18n("&Stop"), TQString ("media-playback-stop"), TDEShortcut (), this, TQ_SLOT(stop ()), actionCollection (), "stop"); + new TDEAction (i18n ("Increase Volume"), TQString ("player_volume"), TDEShortcut (), this, TQ_SLOT (increaseVolume ()), actionCollection (), "edit_volume_up"); + new TDEAction (i18n ("Decrease Volume"), TQString ("player_volume"), TDEShortcut (), this, TQ_SLOT (decreaseVolume ()), actionCollection (), "edit_volume_down"); Source * urlsource = m_sources ["urlsource"]; KMPlayer::ControlPanel * panel = m_view->controlPanel (); TQStringList::const_iterator it = args.begin (); @@ -311,15 +311,15 @@ KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (TQWidget * wparent, const char * //KParts::Part::setWidget (m_view); setXMLFile("kmplayerpartui.rc"); panel->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom50, - this, TQT_SLOT (setMenuZoom (int))); + this, TQ_SLOT (setMenuZoom (int))); panel->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom100, - this, TQT_SLOT (setMenuZoom (int))); + this, TQ_SLOT (setMenuZoom (int))); panel->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom150, - this, TQT_SLOT (setMenuZoom (int))); + this, TQ_SLOT (setMenuZoom (int))); panel->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom200, - this, TQT_SLOT (setMenuZoom (int))); + this, TQ_SLOT (setMenuZoom (int))); panel->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom300, - this, TQT_SLOT (setMenuZoom (int))); + this, TQ_SLOT (setMenuZoom (int))); m_view->setNoInfoMessages (m_features != Feat_InfoPanel); if (m_features == Feat_InfoPanel) @@ -344,8 +344,8 @@ KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (TQWidget * wparent, const char * connectPanel (m_view->controlPanel ()); if (m_features & Feat_StatusBar) { last_time_left = 0; - connect (this, TQT_SIGNAL (positioned (int, int)), - this, TQT_SLOT (statusPosition (int, int))); + connect (this, TQ_SIGNAL (positioned (int, int)), + this, TQ_SLOT (statusPosition (int, int))); m_view->statusBar ()->insertItem (TQString ("--:--"), 1, 0, true); } } @@ -473,7 +473,7 @@ KDE_NO_EXPORT bool KMPlayerPart::openURL (const KURL & _url) { if (url.isEmpty ()) { if (!m_master && !(m_features & Feat_Viewer)) // no master set, wait for a viewer to attach or timeout - TQTimer::singleShot (50, this, TQT_SLOT (waitForImageWindowTimeOut ())); + TQTimer::singleShot (50, this, TQ_SLOT (waitForImageWindowTimeOut ())); return true; } if (!m_group.isEmpty () && !(m_features & Feat_Viewer)) { @@ -483,7 +483,7 @@ KDE_NO_EXPORT bool KMPlayerPart::openURL (const KURL & _url) { i = std::find_if (++i, e, pred)) if ((*i)->url ().isEmpty ()) // image window created w/o url return (*i)->openURL (_url); - TQTimer::singleShot (50, this, TQT_SLOT (waitForImageWindowTimeOut ())); + TQTimer::singleShot (50, this, TQ_SLOT (waitForImageWindowTimeOut ())); //kdError () << "Not the ImageWindow and no ImageWindow found" << endl; return true; } @@ -553,16 +553,16 @@ KDE_NO_EXPORT void KMPlayerPart::connectToPart (KMPlayerPart * m) { if (m_features & Feat_InfoPanel) m->connectInfoPanel (m_view->infoPanel ()); connectSource (m_source, m->source ()); - connect (m, TQT_SIGNAL (destroyed (TQObject *)), - this, TQT_SLOT (viewerPartDestroyed (TQObject *))); - connect (m, TQT_SIGNAL (processChanged (const char *)), - this, TQT_SLOT (viewerPartProcessChanged (const char *))); - connect (m, TQT_SIGNAL (sourceChanged (KMPlayer::Source *, KMPlayer::Source *)), - this, TQT_SLOT (viewerPartSourceChanged (KMPlayer::Source *, KMPlayer::Source *))); + connect (m, TQ_SIGNAL (destroyed (TQObject *)), + this, TQ_SLOT (viewerPartDestroyed (TQObject *))); + connect (m, TQ_SIGNAL (processChanged (const char *)), + this, TQ_SLOT (viewerPartProcessChanged (const char *))); + connect (m, TQ_SIGNAL (sourceChanged (KMPlayer::Source *, KMPlayer::Source *)), + this, TQ_SLOT (viewerPartSourceChanged (KMPlayer::Source *, KMPlayer::Source *))); if (m_features & Feat_StatusBar) { last_time_left = 0; - connect (m, TQT_SIGNAL (positioned (int, int)), - this, TQT_SLOT (statusPosition (int, int))); + connect (m, TQ_SIGNAL (positioned (int, int)), + this, TQ_SLOT (statusPosition (int, int))); m_view->statusBar ()->insertItem (TQString ("--:--"), 1, 0, true); } } @@ -863,7 +863,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerLiveConnectExtension::KMPlayerLiveConnectExtension ( m_started (false), m_enablefinish (false), m_evaluating (false) { - connect (parent, TQT_SIGNAL (started (TDEIO::Job *)), this, TQT_SLOT (started ())); + connect (parent, TQ_SIGNAL (started (TDEIO::Job *)), this, TQ_SLOT (started ())); } KDE_NO_CDTOR_EXPORT KMPlayerLiveConnectExtension::~KMPlayerLiveConnectExtension() { @@ -1153,17 +1153,17 @@ KDE_NO_EXPORT void KMPlayerHRefSource::play () { KDE_NO_EXPORT void KMPlayerHRefSource::activate () { m_player->stop (); if (m_finished) { - TQTimer::singleShot (0, this, TQT_SLOT (finished ())); + TQTimer::singleShot (0, this, TQ_SLOT (finished ())); return; } init (); m_player->setProcess ("mplayer"); if (m_player->process ()->grabPicture (m_url, 0)) - connect (m_player->process (), TQT_SIGNAL (grabReady (const TQString &)), - this, TQT_SLOT (grabReady (const TQString &))); + connect (m_player->process (), TQ_SIGNAL (grabReady (const TQString &)), + this, TQ_SLOT (grabReady (const TQString &))); else { setURL (KURL ()); - TQTimer::singleShot (0, this, TQT_SLOT (play ())); + TQTimer::singleShot (0, this, TQ_SLOT (play ())); } } @@ -1184,11 +1184,11 @@ KDE_NO_EXPORT void KMPlayerHRefSource::finished () { if (!view) return; if (!view->setPicture (m_grabfile)) { clear (); - TQTimer::singleShot (0, this, TQT_SLOT (play ())); + TQTimer::singleShot (0, this, TQ_SLOT (play ())); return; } if (view->viewer ()) - connect (view, TQT_SIGNAL (pictureClicked ()), this, TQT_SLOT (play ())); + connect (view, TQ_SIGNAL (pictureClicked ()), this, TQ_SLOT (play ())); } KDE_NO_EXPORT void KMPlayerHRefSource::deactivate () { @@ -1197,7 +1197,7 @@ KDE_NO_EXPORT void KMPlayerHRefSource::deactivate () { if (!view) return; view->setPicture (TQString ()); if (view->viewer ()) - disconnect (view, TQT_SIGNAL (pictureClicked ()), this, TQT_SLOT (play ())); + disconnect (view, TQ_SIGNAL (pictureClicked ()), this, TQ_SLOT (play ())); } KDE_NO_EXPORT TQString KMPlayerHRefSource::prettyName () { diff --git a/src/kmplayer_smil.cpp b/src/kmplayer_smil.cpp index cf0a8f9..d8a0b79 100644 --- a/src/kmplayer_smil.cpp +++ b/src/kmplayer_smil.cpp @@ -3425,9 +3425,9 @@ KDE_NO_EXPORT void ImageRuntime::remoteReady (TQByteArray & data) { if (!pix->isNull ()) { cached_img.data->image = pix; img_movie = new TQMovie (data, data.size ()); - img_movie->connectUpdate(this,TQT_SLOT(movieUpdated(const TQRect&))); - img_movie->connectStatus (this, TQT_SLOT (movieStatus (int))); - img_movie->connectResize(this,TQT_SLOT (movieResize(const TQSize&))); + img_movie->connectUpdate(this,TQ_SLOT(movieUpdated(const TQRect&))); + img_movie->connectStatus (this, TQ_SLOT (movieStatus (int))); + img_movie->connectResize(this,TQ_SLOT (movieResize(const TQSize&))); frame_nr = 0; mt->width = pix->width (); mt->height = pix->height (); diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp index 6463738..7d7abe8 100644 --- a/src/kmplayerapp.cpp +++ b/src/kmplayerapp.cpp @@ -516,8 +516,8 @@ KDE_NO_CDTOR_EXPORT KMPlayerApp::KMPlayerApp(TQWidget* , const char* name) m_minimal_mode (false) { setCentralWidget (m_view); - connect (m_broadcastconfig, TQT_SIGNAL (broadcastStarted()), this, TQT_SLOT (broadcastStarted())); - connect (m_broadcastconfig, TQT_SIGNAL (broadcastStopped()), this, TQT_SLOT (broadcastStopped())); + connect (m_broadcastconfig, TQ_SIGNAL (broadcastStarted()), this, TQ_SLOT (broadcastStarted())); + connect (m_broadcastconfig, TQ_SIGNAL (broadcastStopped()), this, TQ_SLOT (broadcastStopped())); initStatusBar(); #ifdef HAVE_DBUS m_player->setServiceName (TQString ("org.kde.kmplayer-%1").arg (getpid ())); @@ -554,7 +554,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerApp::KMPlayerApp(TQWidget* , const char* name) kdDebug() << "Window manager: TWin found" << endl; else kdDebug() << "Window manager: not TWin - using save fullscreen mode" << endl; - connect(&m_screensaverTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFakeKeyEvent())); + connect(&m_screensaverTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotFakeKeyEvent())); m_screensaverTimer.start( 55000 ); //setAutoSaveSettings(); @@ -574,49 +574,49 @@ KDE_NO_CDTOR_EXPORT KMPlayerApp::~KMPlayerApp () { KDE_NO_EXPORT void KMPlayerApp::initActions () { TDEActionCollection * ac = actionCollection (); - fileNewWindow = new TDEAction(i18n("New &Window"), 0, 0, this, TQT_SLOT(slotFileNewWindow()), ac, "new_window"); - fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), ac, "open"); - fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), ac, "open_recent"); - KStdAction::saveAs (this, TQT_SLOT (slotSaveAs ()), ac, "save_as"); - new TDEAction (i18n ("Clear &History"), 0, 0, this, TQT_SLOT (slotClearHistory ()), ac, "clear_history"); - fileClose = KStdAction::close (this, TQT_SLOT (slotFileClose ()), ac); - fileQuit = KStdAction::quit (this, TQT_SLOT (slotFileQuit ()), ac); - new TDEAction (i18n ("&Open DVD"), TQString ("media-optical-dvd-mounted"), TDEShortcut (), this, TQT_SLOT(openDVD ()), ac, "opendvd"); - new TDEAction (i18n ("&Open VCD"), TQString ("media-optical-cdrom-mounted"), TDEShortcut (), this, TQT_SLOT(openVCD ()), ac, "openvcd"); - new TDEAction (i18n ("&Open Audio CD"), TQString ("media-optical-cdrom-mounted"), TDEShortcut (), this, TQT_SLOT(openAudioCD ()), ac, "openaudiocd"); - new TDEAction (i18n ("&Open Pipe..."), TQString ("pipe"), TDEShortcut (), this, TQT_SLOT(openPipe ()), ac, "source_pipe"); + fileNewWindow = new TDEAction(i18n("New &Window"), 0, 0, this, TQ_SLOT(slotFileNewWindow()), ac, "new_window"); + fileOpen = KStdAction::open(this, TQ_SLOT(slotFileOpen()), ac, "open"); + fileOpenRecent = KStdAction::openRecent(this, TQ_SLOT(slotFileOpenRecent(const KURL&)), ac, "open_recent"); + KStdAction::saveAs (this, TQ_SLOT (slotSaveAs ()), ac, "save_as"); + new TDEAction (i18n ("Clear &History"), 0, 0, this, TQ_SLOT (slotClearHistory ()), ac, "clear_history"); + fileClose = KStdAction::close (this, TQ_SLOT (slotFileClose ()), ac); + fileQuit = KStdAction::quit (this, TQ_SLOT (slotFileQuit ()), ac); + new TDEAction (i18n ("&Open DVD"), TQString ("media-optical-dvd-mounted"), TDEShortcut (), this, TQ_SLOT(openDVD ()), ac, "opendvd"); + new TDEAction (i18n ("&Open VCD"), TQString ("media-optical-cdrom-mounted"), TDEShortcut (), this, TQ_SLOT(openVCD ()), ac, "openvcd"); + new TDEAction (i18n ("&Open Audio CD"), TQString ("media-optical-cdrom-mounted"), TDEShortcut (), this, TQ_SLOT(openAudioCD ()), ac, "openaudiocd"); + new TDEAction (i18n ("&Open Pipe..."), TQString ("pipe"), TDEShortcut (), this, TQ_SLOT(openPipe ()), ac, "source_pipe"); //TDEGlobal::iconLoader ()->loadIconSet (TQString ("tv"), TDEIcon::Small, 0,true) - new TDEAction (i18n ("&Connect"), TQString ("connect_established"), TDEShortcut (), this, TQT_SLOT (openVDR ()), ac, "vdr_connect"); - editVolumeInc = new TDEAction (i18n ("Increase Volume"), TQString ("player_volume"), TDEShortcut (), m_player, TQT_SLOT (increaseVolume ()), ac, "edit_volume_up"); - editVolumeDec = new TDEAction (i18n ("Decrease Volume"), TQString ("player_volume"), TDEShortcut (), m_player, TQT_SLOT(decreaseVolume ()), ac, "edit_volume_down"); - toggleView = new TDEAction (i18n ("C&onsole"), TQString ("konsole"), TDEShortcut (), m_player->view(), TQT_SLOT (toggleVideoConsoleWindow ()), ac, "view_video"); - //new TDEAction (i18n ("V&ideo"), TQString (video-x-generic"), TDEShortcut (), m_view, TQT_SLOT (toggleVideoConsoleWindow ()), ac, "view_video"); - new TDEAction (i18n ("Pla&y List"), TQString ("player_playlist"), TDEShortcut (), m_player, TQT_SLOT (showPlayListWindow ()), ac, "view_playlist"); - new TDEAction (i18n ("Minimal mode"), TQString ("application-x-zerosize"), TDEShortcut (), this, TQT_SLOT (slotMinimalMode ()), ac, "view_minimal"); - new TDEAction (i18n ("50%"), 0, 0, this, TQT_SLOT (zoom50 ()), ac, "view_zoom_50"); - new TDEAction (i18n ("100%"), TQString ("zoom-fit-best"), TDEShortcut (), this, TQT_SLOT (zoom100 ()), ac, "view_zoom_100"); - new TDEAction (i18n ("150%"), 0, 0, this, TQT_SLOT (zoom150 ()), ac, "view_zoom_150"); - new TDEAction (i18n ("200%"), 0, TDEShortcut (), this, TQT_SLOT (zoom200 ()), ac, "view_zoom_200"); - new TDEAction (i18n ("300%"), 0, TDEShortcut (), this, TQT_SLOT (zoom300 ()), ac, "view_zoom_300"); - viewEditMode = new TDEToggleAction (i18n ("&Edit mode"), 0, 0, this, TQT_SLOT (editMode ()), ac, "edit_mode"); - viewSyncEditMode = new TDEAction (i18n ("Sync &with playlist"), TQString ("reload"), TDEShortcut (), this, TQT_SLOT (syncEditMode ()), ac, "sync_edit_mode"); + new TDEAction (i18n ("&Connect"), TQString ("connect_established"), TDEShortcut (), this, TQ_SLOT (openVDR ()), ac, "vdr_connect"); + editVolumeInc = new TDEAction (i18n ("Increase Volume"), TQString ("player_volume"), TDEShortcut (), m_player, TQ_SLOT (increaseVolume ()), ac, "edit_volume_up"); + editVolumeDec = new TDEAction (i18n ("Decrease Volume"), TQString ("player_volume"), TDEShortcut (), m_player, TQ_SLOT(decreaseVolume ()), ac, "edit_volume_down"); + toggleView = new TDEAction (i18n ("C&onsole"), TQString ("konsole"), TDEShortcut (), m_player->view(), TQ_SLOT (toggleVideoConsoleWindow ()), ac, "view_video"); + //new TDEAction (i18n ("V&ideo"), TQString (video-x-generic"), TDEShortcut (), m_view, TQ_SLOT (toggleVideoConsoleWindow ()), ac, "view_video"); + new TDEAction (i18n ("Pla&y List"), TQString ("player_playlist"), TDEShortcut (), m_player, TQ_SLOT (showPlayListWindow ()), ac, "view_playlist"); + new TDEAction (i18n ("Minimal mode"), TQString ("application-x-zerosize"), TDEShortcut (), this, TQ_SLOT (slotMinimalMode ()), ac, "view_minimal"); + new TDEAction (i18n ("50%"), 0, 0, this, TQ_SLOT (zoom50 ()), ac, "view_zoom_50"); + new TDEAction (i18n ("100%"), TQString ("zoom-fit-best"), TDEShortcut (), this, TQ_SLOT (zoom100 ()), ac, "view_zoom_100"); + new TDEAction (i18n ("150%"), 0, 0, this, TQ_SLOT (zoom150 ()), ac, "view_zoom_150"); + new TDEAction (i18n ("200%"), 0, TDEShortcut (), this, TQ_SLOT (zoom200 ()), ac, "view_zoom_200"); + new TDEAction (i18n ("300%"), 0, TDEShortcut (), this, TQ_SLOT (zoom300 ()), ac, "view_zoom_300"); + viewEditMode = new TDEToggleAction (i18n ("&Edit mode"), 0, 0, this, TQ_SLOT (editMode ()), ac, "edit_mode"); + viewSyncEditMode = new TDEAction (i18n ("Sync &with playlist"), TQString ("reload"), TDEShortcut (), this, TQ_SLOT (syncEditMode ()), ac, "sync_edit_mode"); viewSyncEditMode->setEnabled (false); - new TDEAction (i18n ("Show Popup Menu"), TDEShortcut (), m_view->controlPanel (), TQT_SLOT (showPopupMenu ()), ac, "view_show_popup_menu"); - new TDEAction (i18n ("Show Language Menu"), TDEShortcut (TQt::Key_L), m_view->controlPanel (), TQT_SLOT (showLanguageMenu ()), ac, "view_show_lang_menu"); - viewKeepRatio = new TDEToggleAction (i18n ("&Keep Width/Height Ratio"), 0, this, TQT_SLOT (keepSizeRatio ()), ac, "view_keep_ratio"); + new TDEAction (i18n ("Show Popup Menu"), TDEShortcut (), m_view->controlPanel (), TQ_SLOT (showPopupMenu ()), ac, "view_show_popup_menu"); + new TDEAction (i18n ("Show Language Menu"), TDEShortcut (TQt::Key_L), m_view->controlPanel (), TQ_SLOT (showLanguageMenu ()), ac, "view_show_lang_menu"); + viewKeepRatio = new TDEToggleAction (i18n ("&Keep Width/Height Ratio"), 0, this, TQ_SLOT (keepSizeRatio ()), ac, "view_keep_ratio"); #if KDE_IS_VERSION(3,1,90) - viewFullscreen = KStdAction::fullScreen (this, TQT_SLOT(fullScreen ()), ac, 0, "view_fullscreen"); + viewFullscreen = KStdAction::fullScreen (this, TQ_SLOT(fullScreen ()), ac, 0, "view_fullscreen"); #else - viewFullscreen = new TDEAction (i18n("&Full Screen"), 0, 0, this, TQT_SLOT(fullScreen ()), ac, "view_fullscreen"); + viewFullscreen = new TDEAction (i18n("&Full Screen"), 0, 0, this, TQ_SLOT(fullScreen ()), ac, "view_fullscreen"); #endif - /*TDEAction *playact =*/ new TDEAction (i18n ("P&lay"), TQString ("media-playback-start"), TDEShortcut (), m_player, TQT_SLOT (play ()), ac, "play"); - /*TDEAction *pauseact =*/ new TDEAction (i18n ("&Pause"), TQString ("media-playback-pause"), TDEShortcut (), m_player, TQT_SLOT (pause ()), ac, "pause"); - /*TDEAction *stopact =*/ new TDEAction (i18n ("&Stop"), TQString ("media-playback-stop"), TDEShortcut (), m_player, TQT_SLOT (stop ()), ac, "stop"); - /*TDEAction *artsctrl =*/ new TDEAction (i18n ("&Arts Control"), TQString ("player_volume"), TDEShortcut (), this, TQT_SLOT (startArtsControl ()), ac, "view_arts_control"); - viewToolBar = KStdAction::showToolbar(this, TQT_SLOT(slotViewToolBar()), ac, "showtoolbar"); - viewStatusBar =KStdAction::showStatusbar(this,TQT_SLOT(slotViewStatusBar()),ac, "showstatusbar"); - viewMenuBar = KStdAction::showMenubar(this, TQT_SLOT(slotViewMenuBar()), ac, "showmenu"); - KStdAction::preferences(m_player, TQT_SLOT(showConfigDialog()), ac,"configure"); + /*TDEAction *playact =*/ new TDEAction (i18n ("P&lay"), TQString ("media-playback-start"), TDEShortcut (), m_player, TQ_SLOT (play ()), ac, "play"); + /*TDEAction *pauseact =*/ new TDEAction (i18n ("&Pause"), TQString ("media-playback-pause"), TDEShortcut (), m_player, TQ_SLOT (pause ()), ac, "pause"); + /*TDEAction *stopact =*/ new TDEAction (i18n ("&Stop"), TQString ("media-playback-stop"), TDEShortcut (), m_player, TQ_SLOT (stop ()), ac, "stop"); + /*TDEAction *artsctrl =*/ new TDEAction (i18n ("&Arts Control"), TQString ("player_volume"), TDEShortcut (), this, TQ_SLOT (startArtsControl ()), ac, "view_arts_control"); + viewToolBar = KStdAction::showToolbar(this, TQ_SLOT(slotViewToolBar()), ac, "showtoolbar"); + viewStatusBar =KStdAction::showStatusbar(this,TQ_SLOT(slotViewStatusBar()),ac, "showstatusbar"); + viewMenuBar = KStdAction::showMenubar(this, TQ_SLOT(slotViewMenuBar()), ac, "showmenu"); + KStdAction::preferences(m_player, TQ_SLOT(showConfigDialog()), ac,"configure"); fileNewWindow->setStatusText(i18n("Opens a new application window")); fileOpen->setStatusText(i18n("Opens an existing file")); fileOpenRecent->setStatusText(i18n("Opens a recently used file")); @@ -625,8 +625,8 @@ KDE_NO_EXPORT void KMPlayerApp::initActions () { //viewToolBar->setStatusText(i18n("Enables/disables the toolbar")); viewStatusBar->setStatusText(i18n("Enables/disables the statusbar")); viewMenuBar->setStatusText(i18n("Enables/disables the menubar")); - KStdAction::keyBindings( this, TQT_SLOT(slotConfigureKeys()), ac, "configkeys"); - KStdAction::configureToolbars (this, TQT_SLOT (slotConfigureToolbars ()), ac, "configtoolbars"); + KStdAction::keyBindings( this, TQ_SLOT(slotConfigureKeys()), ac, "configkeys"); + KStdAction::configureToolbars (this, TQ_SLOT (slotConfigureToolbars ()), ac, "configtoolbars"); } KDE_NO_EXPORT void KMPlayerApp::initStatusBar () { @@ -646,71 +646,71 @@ KDE_NO_EXPORT void KMPlayerApp::initMenu () { m_dvdmenu->clear (); #ifdef HAVE_XINE m_dvdnavmenu->clear (); - m_dvdnavmenu->insertItem (i18n ("&Start"), this, TQT_SLOT (dvdNav ())); + m_dvdnavmenu->insertItem (i18n ("&Start"), this, TQ_SLOT (dvdNav ())); m_dvdmenu->insertItem (i18n ("&DVD Navigator"), m_dvdnavmenu, -1, 1); - m_dvdmenu->insertItem (i18n ("&Open DVD"), this, TQT_SLOT(openDVD ()), 0,-1, 2); + m_dvdmenu->insertItem (i18n ("&Open DVD"), this, TQ_SLOT(openDVD ()), 0,-1, 2); #else - m_dvdmenu->insertItem (i18n ("&Open DVD"), this, TQT_SLOT(openDVD ()), 0,-1, 1); + m_dvdmenu->insertItem (i18n ("&Open DVD"), this, TQ_SLOT(openDVD ()), 0,-1, 1); #endif m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("media-optical-cdrom-mounted"), TDEIcon::Small, 0, true), i18n ("V&CD"), m_vcdmenu, -1, 6); m_vcdmenu->clear (); m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("tv"), TDEIcon::Small, 0, true), i18n ("&TV"), m_tvmenu, -1, 8); - m_vcdmenu->insertItem (i18n ("&Open VCD"), this, TQT_SLOT(openVCD ()), 0,-1, 1); + m_vcdmenu->insertItem (i18n ("&Open VCD"), this, TQ_SLOT(openVCD ()), 0,-1, 1); m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("media-optical-cdrom-mounted"), TDEIcon::Small, 0, true), i18n ("&Audio CD"), m_audiocdmenu, -1, 7); - m_audiocdmenu->insertItem (i18n ("&Open Audio CD"), this, TQT_SLOT(openAudioCD ()), 0,-1, 1); + m_audiocdmenu->insertItem (i18n ("&Open Audio CD"), this, TQ_SLOT(openAudioCD ()), 0,-1, 1); } KDE_NO_EXPORT void KMPlayerApp::initView () { //m_view->docArea ()->readDockConfig (config, TQString ("Window Layout")); m_player->connectPanel (m_view->controlPanel ()); initMenu (); - new TDEAction (i18n ("Increase Volume"), editVolumeInc->shortcut (), m_player, TQT_SLOT (increaseVolume ()), m_view->viewArea ()->actionCollection (), "edit_volume_up"); - new TDEAction (i18n ("Decrease Volume"), editVolumeDec->shortcut (), m_player, TQT_SLOT(decreaseVolume ()), m_view->viewArea ()->actionCollection (), "edit_volume_down"); - connect (m_player->settings (), TQT_SIGNAL (configChanged ()), - this, TQT_SLOT (configChanged ())); - connect (m_player, TQT_SIGNAL (loading (int)), - this, TQT_SLOT (loadingProgress (int))); - connect (m_player, TQT_SIGNAL (positioned (int, int)), - this, TQT_SLOT (positioned (int, int))); - connect (m_player, TQT_SIGNAL (statusUpdated (const TQString &)), - this, TQT_SLOT (slotStatusMsg (const TQString &))); - connect (m_view, TQT_SIGNAL (windowVideoConsoleToggled (int)), - this, TQT_SLOT (windowVideoConsoleToggled (int))); - connect (m_player, TQT_SIGNAL (sourceChanged (KMPlayer::Source *, KMPlayer::Source *)), this, TQT_SLOT (slotSourceChanged(KMPlayer::Source *, KMPlayer::Source *))); + new TDEAction (i18n ("Increase Volume"), editVolumeInc->shortcut (), m_player, TQ_SLOT (increaseVolume ()), m_view->viewArea ()->actionCollection (), "edit_volume_up"); + new TDEAction (i18n ("Decrease Volume"), editVolumeDec->shortcut (), m_player, TQ_SLOT(decreaseVolume ()), m_view->viewArea ()->actionCollection (), "edit_volume_down"); + connect (m_player->settings (), TQ_SIGNAL (configChanged ()), + this, TQ_SLOT (configChanged ())); + connect (m_player, TQ_SIGNAL (loading (int)), + this, TQ_SLOT (loadingProgress (int))); + connect (m_player, TQ_SIGNAL (positioned (int, int)), + this, TQ_SLOT (positioned (int, int))); + connect (m_player, TQ_SIGNAL (statusUpdated (const TQString &)), + this, TQ_SLOT (slotStatusMsg (const TQString &))); + connect (m_view, TQ_SIGNAL (windowVideoConsoleToggled (int)), + this, TQ_SLOT (windowVideoConsoleToggled (int))); + connect (m_player, TQ_SIGNAL (sourceChanged (KMPlayer::Source *, KMPlayer::Source *)), this, TQ_SLOT (slotSourceChanged(KMPlayer::Source *, KMPlayer::Source *))); m_view->controlPanel ()->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom50, - this, TQT_SLOT (zoom50 ())); + this, TQ_SLOT (zoom50 ())); m_view->controlPanel ()->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom100, - this, TQT_SLOT (zoom100 ())); + this, TQ_SLOT (zoom100 ())); m_view->controlPanel ()->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom150, - this, TQT_SLOT (zoom150 ())); + this, TQ_SLOT (zoom150 ())); m_view->controlPanel ()->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom200, - this, TQT_SLOT (zoom200 ())); + this, TQ_SLOT (zoom200 ())); m_view->controlPanel ()->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom300, - this, TQT_SLOT (zoom300 ())); - connect (m_view->controlPanel()->broadcastButton (), TQT_SIGNAL (clicked ()), - this, TQT_SLOT (broadcastClicked ())); + this, TQ_SLOT (zoom300 ())); + connect (m_view->controlPanel()->broadcastButton (), TQ_SIGNAL (clicked ()), + this, TQ_SLOT (broadcastClicked ())); m_auto_resize = m_player->settings ()->autoresize; if (m_auto_resize) - connect (m_player, TQT_SIGNAL (sourceDimensionChanged ()), - this, TQT_SLOT (zoom100 ())); - connect (m_view, TQT_SIGNAL (fullScreenChanged ()), - this, TQT_SLOT (fullScreen ())); - connect (m_player, TQT_SIGNAL (toggleMinimalMode ()), - this, TQT_SLOT (slotMinimalMode ())); - connect (m_view->playList (), TQT_SIGNAL (selectionChanged (TQListViewItem *)), - this, TQT_SLOT (playListItemSelected (TQListViewItem *))); - connect (m_view->playList(), TQT_SIGNAL (dropped (TQDropEvent*, TQListViewItem*)), - this, TQT_SLOT (playListItemDropped (TQDropEvent *, TQListViewItem *))); - connect (m_view->playList(), TQT_SIGNAL (moved ()), - this, TQT_SLOT (playListItemMoved ())); - connect (m_view->playList(), TQT_SIGNAL (prepareMenu (KMPlayer::PlayListItem *, TQPopupMenu *)), this, TQT_SLOT (preparePlaylistMenu (KMPlayer::PlayListItem *, TQPopupMenu *))); + connect (m_player, TQ_SIGNAL (sourceDimensionChanged ()), + this, TQ_SLOT (zoom100 ())); + connect (m_view, TQ_SIGNAL (fullScreenChanged ()), + this, TQ_SLOT (fullScreen ())); + connect (m_player, TQ_SIGNAL (toggleMinimalMode ()), + this, TQ_SLOT (slotMinimalMode ())); + connect (m_view->playList (), TQ_SIGNAL (selectionChanged (TQListViewItem *)), + this, TQ_SLOT (playListItemSelected (TQListViewItem *))); + connect (m_view->playList(), TQ_SIGNAL (dropped (TQDropEvent*, TQListViewItem*)), + this, TQ_SLOT (playListItemDropped (TQDropEvent *, TQListViewItem *))); + connect (m_view->playList(), TQ_SIGNAL (moved ()), + this, TQ_SLOT (playListItemMoved ())); + connect (m_view->playList(), TQ_SIGNAL (prepareMenu (KMPlayer::PlayListItem *, TQPopupMenu *)), this, TQ_SLOT (preparePlaylistMenu (KMPlayer::PlayListItem *, TQPopupMenu *))); m_dropmenu = new TQPopupMenu (m_view->playList ()); - m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("player_playlist"), TDEIcon::Small, 0, true), i18n ("&Add to list"), this, TQT_SLOT (menuDropInList ())); - m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("folder_grey"), TDEIcon::Small, 0, true), i18n ("Add in new &Group"), this, TQT_SLOT (menuDropInGroup ())); - m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("edit-copy"), TDEIcon::Small, 0, true), i18n ("&Copy here"), this, TQT_SLOT (menuCopyDrop ())); - m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("edit-delete"), TDEIcon::Small, 0, true), i18n ("&Delete"), this, TQT_SLOT (menuDeleteNode ())); + m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("player_playlist"), TDEIcon::Small, 0, true), i18n ("&Add to list"), this, TQ_SLOT (menuDropInList ())); + m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("folder_grey"), TDEIcon::Small, 0, true), i18n ("Add in new &Group"), this, TQ_SLOT (menuDropInGroup ())); + m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("edit-copy"), TDEIcon::Small, 0, true), i18n ("&Copy here"), this, TQ_SLOT (menuCopyDrop ())); + m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("edit-delete"), TDEIcon::Small, 0, true), i18n ("&Delete"), this, TQ_SLOT (menuDeleteNode ())); /*TQPopupMenu * viewmenu = new TQPopupMenu; - viewmenu->insertItem (i18n ("Full Screen"), this, TQT_SLOT(fullScreen ()), + viewmenu->insertItem (i18n ("Full Screen"), this, TQ_SLOT(fullScreen ()), TQKeySequence ("CTRL + Key_F")); menuBar ()->insertItem (i18n ("&View"), viewmenu, -1, 2);*/ //toolBar("mainToolBar")->hide(); @@ -834,17 +834,17 @@ KDE_NO_EXPORT void KMPlayerApp::playerStarted () { KDE_NO_EXPORT void KMPlayerApp::slotSourceChanged (KMPlayer::Source *olds, KMPlayer::Source * news) { if (olds) { - disconnect (olds, TQT_SIGNAL (titleChanged (const TQString &)), this, - TQT_SLOT (setCaption (const TQString &))); - disconnect (olds, TQT_SIGNAL (startPlaying ()), - this, TQT_SLOT (playerStarted ())); + disconnect (olds, TQ_SIGNAL (titleChanged (const TQString &)), this, + TQ_SLOT (setCaption (const TQString &))); + disconnect (olds, TQ_SIGNAL (startPlaying ()), + this, TQ_SLOT (playerStarted ())); } if (news) { setCaption (news->prettyName (), false); - connect (news, TQT_SIGNAL (titleChanged (const TQString &)), - this, TQT_SLOT (setCaption (const TQString &))); - connect (news, TQT_SIGNAL (startPlaying ()), - this, TQT_SLOT (playerStarted ())); + connect (news, TQ_SIGNAL (titleChanged (const TQString &)), + this, TQ_SLOT (setCaption (const TQString &))); + connect (news, TQ_SIGNAL (startPlaying ()), + this, TQ_SLOT (playerStarted ())); viewSyncEditMode->setEnabled (m_view->editMode () || !strcmp (m_player->source ()->name (), "urlsource")); } @@ -909,7 +909,7 @@ struct IntroSource : public KMPlayer::Source { KDE_NO_EXPORT void IntroSource::activate () { if (m_player->settings ()->autoresize) - m_app->disconnect(m_player, TQT_SIGNAL(sourceDimensionChanged()),m_app,TQT_SLOT(zoom100())); + m_app->disconnect(m_player, TQ_SIGNAL(sourceDimensionChanged()),m_app,TQ_SLOT(zoom100())); m_document = new KMPlayer::Document (TQString (""), this); TQString introfile = locate ("data", "kmplayer/intro.xml"); TQFile file (introfile); @@ -971,7 +971,7 @@ KDE_NO_EXPORT void IntroSource::stateElementChanged (KMPlayer::Node * node, KMPl KDE_NO_EXPORT void IntroSource::deactivate () { deactivated = true; if (m_player->settings ()->autoresize) - m_app->connect(m_player, TQT_SIGNAL(sourceDimensionChanged()),m_app,TQT_SLOT(zoom100())); + m_app->connect(m_player, TQ_SIGNAL(sourceDimensionChanged()),m_app,TQ_SLOT(zoom100())); if (!finished && m_document) // user opens a source while introducing m_document->reset (); } @@ -1238,7 +1238,7 @@ KDE_NO_EXPORT void KMPlayerApp::minimalMode (bool by_user) { if (m_minimal_mode) { readOptions (); if (by_user) - disconnect (m_view->controlPanel ()->button (KMPlayer::ControlPanel::button_playlist), TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotMinimalMode ())); + disconnect (m_view->controlPanel ()->button (KMPlayer::ControlPanel::button_playlist), TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotMinimalMode ())); restoreFromConfig (); } else { saveOptions (); @@ -1246,7 +1246,7 @@ KDE_NO_EXPORT void KMPlayerApp::minimalMode (bool by_user) { toolBar("mainToolBar")->hide(); statusBar()->hide(); if (by_user) - connect (m_view->controlPanel ()->button (KMPlayer::ControlPanel::button_playlist), TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotMinimalMode ())); + connect (m_view->controlPanel ()->button (KMPlayer::ControlPanel::button_playlist), TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotMinimalMode ())); } m_view->viewArea ()->minimalMode (); m_minimal_mode = !m_minimal_mode; @@ -1327,7 +1327,7 @@ KDE_NO_EXPORT bool KMPlayerApp::queryClose () { if (m_played_exit || m_player->settings ()->no_intro || kapp->sessionSaving() ) return true; if (m_auto_resize) - disconnect(m_player, TQT_SIGNAL(sourceDimensionChanged()),this,TQT_SLOT(zoom100())); + disconnect(m_player, TQ_SIGNAL(sourceDimensionChanged()),this,TQ_SLOT(zoom100())); m_played_exit = true; if (!m_minimal_mode) minimalMode (false); @@ -1343,8 +1343,8 @@ KDE_NO_EXPORT bool KMPlayerApp::queryExit() { if (!m_minimal_mode) saveOptions(); - disconnect (m_player->settings (), TQT_SIGNAL (configChanged ()), - this, TQT_SLOT (configChanged ())); + disconnect (m_player->settings (), TQ_SIGNAL (configChanged ()), + this, TQ_SLOT (configChanged ())); m_player->settings ()->writeConfig (); return true; } @@ -1489,7 +1489,7 @@ KDE_NO_EXPORT void KMPlayerApp::slotViewMenuBar() { slotStatusMsg (i18n ("Show Menubar with %1").arg(viewMenuBar->shortcutText())); if (!m_showStatusbar) { statusBar()->show(); - TQTimer::singleShot (3000, statusBar(), TQT_SLOT (hide ())); + TQTimer::singleShot (3000, statusBar(), TQ_SLOT (hide ())); } } } @@ -1668,12 +1668,12 @@ KDE_NO_EXPORT void KMPlayerApp::preparePlaylistMenu (KMPlayer::PlayListItem * it pm->insertSeparator (); manip_node = item->node; if (ri->flags & KMPlayer::PlayListView::Deleteable) - pm->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("edit-delete"), TDEIcon::Small, 0, true), i18n ("&Delete item"), this, TQT_SLOT (menuDeleteNode ())); + pm->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("edit-delete"), TDEIcon::Small, 0, true), i18n ("&Delete item"), this, TQ_SLOT (menuDeleteNode ())); if (ri->flags & KMPlayer::PlayListView::Moveable) { if (manip_node->previousSibling ()) - pm->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("go-up"), TDEIcon::Small, 0, true), i18n ("&Move up"), this, TQT_SLOT (menuMoveUpNode ())); + pm->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("go-up"), TDEIcon::Small, 0, true), i18n ("&Move up"), this, TQ_SLOT (menuMoveUpNode ())); if (manip_node->nextSibling ()) - pm->insertItem (TDEGlobal::iconLoader()->loadIconSet (TQString ("go-down"), TDEIcon::Small, 0, true), i18n ("Move &down"), this, TQT_SLOT (menuMoveDownNode ())); + pm->insertItem (TDEGlobal::iconLoader()->loadIconSet (TQString ("go-down"), TDEIcon::Small, 0, true), i18n ("Move &down"), this, TQ_SLOT (menuMoveDownNode ())); } } } @@ -1712,9 +1712,9 @@ KDE_NO_EXPORT void KMPlayerApp::configChanged () { m_systray = 0L; } if (m_player->settings ()->autoresize && !m_auto_resize) - connect(m_player,TQT_SIGNAL(sourceDimensionChanged()),this,TQT_SLOT(zoom100())); + connect(m_player,TQ_SIGNAL(sourceDimensionChanged()),this,TQ_SLOT(zoom100())); else if (!m_player->settings ()->autoresize && m_auto_resize) - disconnect(m_player, TQT_SIGNAL(sourceDimensionChanged()),this,TQT_SLOT(zoom100())); + disconnect(m_player, TQ_SIGNAL(sourceDimensionChanged()),this,TQ_SLOT(zoom100())); m_auto_resize = m_player->settings ()->autoresize; static_cast (m_player->sources () ["tvsource"])->buildMenu (); } @@ -1889,17 +1889,17 @@ KDE_NO_EXPORT void KMPlayerDVDSource::activate () { if (!m_player->settings ()->mplayerpost090) { m_menu->insertItem (i18n ("Audio &Language"), m_dvdlanguagemenu); m_menu->insertItem (i18n ("&SubTitles"), m_dvdsubtitlemenu); - connect (m_dvdsubtitlemenu, TQT_SIGNAL (activated (int)), - this, TQT_SLOT (subtitleMenuClicked (int))); - connect (m_dvdlanguagemenu, TQT_SIGNAL (activated (int)), - this, TQT_SLOT (languageMenuClicked (int))); + connect (m_dvdsubtitlemenu, TQ_SIGNAL (activated (int)), + this, TQ_SLOT (subtitleMenuClicked (int))); + connect (m_dvdlanguagemenu, TQ_SIGNAL (activated (int)), + this, TQ_SLOT (languageMenuClicked (int))); } - connect (m_dvdtitlemenu, TQT_SIGNAL (activated (int)), - this, TQT_SLOT (titleMenuClicked (int))); - connect (m_dvdchaptermenu, TQT_SIGNAL (activated (int)), - this, TQT_SLOT (chapterMenuClicked (int))); + connect (m_dvdtitlemenu, TQ_SIGNAL (activated (int)), + this, TQ_SLOT (titleMenuClicked (int))); + connect (m_dvdchaptermenu, TQ_SIGNAL (activated (int)), + this, TQ_SLOT (chapterMenuClicked (int))); if (m_start_play) - TQTimer::singleShot (0, m_player, TQT_SLOT (play ())); + TQTimer::singleShot (0, m_player, TQ_SLOT (play ())); } KDE_NO_EXPORT void KMPlayerDVDSource::setIdentified (bool b) { @@ -1930,15 +1930,15 @@ KDE_NO_EXPORT void KMPlayerDVDSource::deactivate () { if (!m_player->settings ()->mplayerpost090) { m_menu->removeItemAt (m_menu->count () - 1); m_menu->removeItemAt (m_menu->count () - 1); - disconnect (m_dvdsubtitlemenu, TQT_SIGNAL (activated (int)), - this, TQT_SLOT (subtitleMenuClicked (int))); - disconnect (m_dvdlanguagemenu, TQT_SIGNAL (activated (int)), - this, TQT_SLOT (languageMenuClicked (int))); + disconnect (m_dvdsubtitlemenu, TQ_SIGNAL (activated (int)), + this, TQ_SLOT (subtitleMenuClicked (int))); + disconnect (m_dvdlanguagemenu, TQ_SIGNAL (activated (int)), + this, TQ_SLOT (languageMenuClicked (int))); } - disconnect (m_dvdtitlemenu, TQT_SIGNAL (activated (int)), - this, TQT_SLOT (titleMenuClicked (int))); - disconnect (m_dvdchaptermenu, TQT_SIGNAL (activated (int)), - this, TQT_SLOT (chapterMenuClicked (int))); + disconnect (m_dvdtitlemenu, TQ_SIGNAL (activated (int)), + this, TQ_SLOT (titleMenuClicked (int))); + disconnect (m_dvdchaptermenu, TQ_SIGNAL (activated (int)), + this, TQ_SLOT (chapterMenuClicked (int))); } } @@ -1985,7 +1985,7 @@ KDE_NO_EXPORT void KMPlayerDVDSource::titleMenuClicked (int id) { m_dvdchaptermenu->clear (); m_dvdlanguagemenu->clear (); if (m_start_play) - TQTimer::singleShot (0, m_player, TQT_SLOT (play ())); + TQTimer::singleShot (0, m_player, TQ_SLOT (play ())); } } @@ -1993,7 +1993,7 @@ KDE_NO_EXPORT void KMPlayerDVDSource::play () { buildArguments (); if (m_start_play) { m_player->stop (); - TQTimer::singleShot (0, m_player, TQT_SLOT (play ())); + TQTimer::singleShot (0, m_player, TQ_SLOT (play ())); } } @@ -2069,17 +2069,17 @@ KDE_NO_EXPORT void KMPlayerDVDNavSource::deactivate () { KDE_NO_EXPORT void KMPlayerDVDNavSource::play () { if (!m_menu->findItem (DVDNav_previous)) { - m_menu->insertItem (i18n ("&Previous"), this, TQT_SLOT (navMenuClicked (int)), 0, DVDNav_previous); - m_menu->insertItem (i18n ("&Next"), this, TQT_SLOT (navMenuClicked (int)), 0, DVDNav_next); - m_menu->insertItem (i18n ("&Root"), this, TQT_SLOT (navMenuClicked (int)), 0, DVDNav_root); - m_menu->insertItem (i18n ("&Up"), this, TQT_SLOT (navMenuClicked (int)), 0, DVDNav_up); + m_menu->insertItem (i18n ("&Previous"), this, TQ_SLOT (navMenuClicked (int)), 0, DVDNav_previous); + m_menu->insertItem (i18n ("&Next"), this, TQ_SLOT (navMenuClicked (int)), 0, DVDNav_next); + m_menu->insertItem (i18n ("&Root"), this, TQ_SLOT (navMenuClicked (int)), 0, DVDNav_root); + m_menu->insertItem (i18n ("&Up"), this, TQ_SLOT (navMenuClicked (int)), 0, DVDNav_up); } - TQTimer::singleShot (0, m_player, TQT_SLOT (play ())); - connect (this, TQT_SIGNAL (stopPlaying ()), this, TQT_SLOT(finished ())); + TQTimer::singleShot (0, m_player, TQ_SLOT (play ())); + connect (this, TQ_SIGNAL (stopPlaying ()), this, TQ_SLOT(finished ())); } KDE_NO_EXPORT void KMPlayerDVDNavSource::finished () { - disconnect (this, TQT_SIGNAL (stopPlaying ()), this, TQT_SLOT(finished ())); + disconnect (this, TQ_SIGNAL (stopPlaying ()), this, TQ_SLOT(finished ())); m_menu->removeItem (DVDNav_previous); m_menu->removeItem (DVDNav_next); m_menu->removeItem (DVDNav_root); @@ -2161,7 +2161,7 @@ KDE_NO_EXPORT void KMPlayerVCDSource::activate () { setURL (KURL ("vcd://")); buildArguments (); if (m_start_play) - TQTimer::singleShot (0, m_player, TQT_SLOT (play ())); + TQTimer::singleShot (0, m_player, TQ_SLOT (play ())); } KDE_NO_EXPORT void KMPlayerVCDSource::deactivate () { @@ -2262,7 +2262,7 @@ KDE_NO_EXPORT void KMPlayerAudioCDSource::activate () { setURL (KURL ("cdda://")); buildArguments (); //if (m_start_play) - TQTimer::singleShot (0, m_player, TQT_SLOT (play ())); + TQTimer::singleShot (0, m_player, TQ_SLOT (play ())); } KDE_NO_EXPORT void KMPlayerAudioCDSource::deactivate () { @@ -2324,7 +2324,7 @@ KDE_NO_EXPORT void KMPlayerPipeSource::activate () { m_recordcmd = m_options = TQString ("-"); // or m_url? m_identified = true; reset (); - TQTimer::singleShot (0, m_player, TQT_SLOT (play ())); + TQTimer::singleShot (0, m_player, TQ_SLOT (play ())); m_app->slotStatusMsg (i18n ("Ready.")); } diff --git a/src/kmplayerbroadcast.cpp b/src/kmplayerbroadcast.cpp index 52af330..95ecb4c 100644 --- a/src/kmplayerbroadcast.cpp +++ b/src/kmplayerbroadcast.cpp @@ -233,24 +233,24 @@ KDE_NO_CDTOR_EXPORT KMPlayerPrefBroadcastFormatPage::KMPlayerPrefBroadcastFormat TQFrame *profileframe = new TQFrame (this); TQGridLayout *profileslayout = new TQGridLayout (profileframe, 5, 2, 2); profile = new TQLineEdit ("", profileframe); - connect (profile, TQT_SIGNAL(textChanged (const TQString &)), - this, TQT_SLOT (slotTextChanged (const TQString &))); + connect (profile, TQ_SIGNAL(textChanged (const TQString &)), + this, TQ_SLOT (slotTextChanged (const TQString &))); profilelist = new TQListBox (profileframe); for (int i = 0; i < (int) profiles.size (); i++) profilelist->insertItem (profiles[i]->name, i); - connect (profilelist, TQT_SIGNAL (selected (int)), - this, TQT_SLOT (slotIndexChanged (int))); - connect (profilelist, TQT_SIGNAL (highlighted (int)), - this, TQT_SLOT (slotItemHighlighted (int))); + connect (profilelist, TQ_SIGNAL (selected (int)), + this, TQ_SLOT (slotIndexChanged (int))); + connect (profilelist, TQ_SIGNAL (highlighted (int)), + this, TQ_SLOT (slotItemHighlighted (int))); load = new TQPushButton (i18n ("Load"), profileframe); save = new TQPushButton (i18n ("Save"), profileframe); del = new TQPushButton (i18n ("Delete"), profileframe); load->setEnabled (false); save->setEnabled (false); del->setEnabled (false); - connect (load, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotLoad ())); - connect (save, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotSave ())); - connect (del, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotDelete ())); + connect (load, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotLoad ())); + connect (save, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotSave ())); + connect (del, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotDelete ())); profileslayout->addWidget (profile, 0, 0); profileslayout->setRowSpacing (4, 60); profileslayout->addMultiCellWidget (profilelist, 1, 4, 0, 0); @@ -459,8 +459,8 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::prefLocation (TQString & item, TQStr TQFrame * KMPlayerBroadcastConfig::prefPage (TQWidget * parent) { if (!m_configpage) { m_configpage = new KMPlayerPrefBroadcastFormatPage (parent, ffserversettingprofiles); - connect (m_configpage->startbutton, TQT_SIGNAL (clicked ()), this, TQT_SLOT (startServer ())); - connect (m_player, TQT_SIGNAL (sourceChanged (KMPlayer::Source *, KMPlayer::Source *)), this, TQT_SLOT (sourceChanged (KMPlayer::Source *,KMPlayer::Source *))); + connect (m_configpage->startbutton, TQ_SIGNAL (clicked ()), this, TQ_SLOT (startServer ())); + connect (m_player, TQ_SIGNAL (sourceChanged (KMPlayer::Source *, KMPlayer::Source *)), this, TQ_SLOT (sourceChanged (KMPlayer::Source *,KMPlayer::Source *))); m_configpage->startbutton->setEnabled (!m_player->source ()->videoDevice ().isEmpty ()); } @@ -488,8 +488,8 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::startServer () { m_configpage->setCursor (TQCursor (TQt::WaitCursor)); m_ffserver_process = new TDEProcess; m_ffserver_process->setUseShell (true); - connect (m_ffserver_process, TQT_SIGNAL (processExited (TDEProcess *)), - this, TQT_SLOT (processStopped (TDEProcess *))); + connect (m_ffserver_process, TQ_SIGNAL (processExited (TDEProcess *)), + this, TQ_SLOT (processStopped (TDEProcess *))); TQString conffile = locateLocal ("data", "kmplayer/ffserver.conf"); const char * noaudio = m_player->source ()->audioDevice ().isEmpty () ? "NoAudio" : ""; FFServerSetting ffs; @@ -512,15 +512,15 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::startServer () { *m_ffserver_process << "ffserver -f " << conffile; m_ffserver_out.truncate (0); connect (m_ffserver_process, - TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), - this, TQT_SLOT (processOutput (TDEProcess *, char *, int))); + TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQ_SLOT (processOutput (TDEProcess *, char *, int))); m_ffserver_process->start (TDEProcess::NotifyOnExit, TDEProcess::Stderr); if (m_ffserver_process->isRunning ()) { m_configpage->startbutton->setText (i18n ("Stop")); m_configpage->serverled->setState (KLed::On); emit broadcastStarted (); } - TQTimer::singleShot (500, this, TQT_SLOT (startFeed ())); + TQTimer::singleShot (500, this, TQ_SLOT (startFeed ())); } KDE_NO_EXPORT void KMPlayerBroadcastConfig::stopServer () { @@ -548,13 +548,13 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::startFeed () { KMessageBox::error (m_configpage, i18n ("Failed to start ffserver.\n") + m_ffserver_out, i18n ("Error")); goto bail_out; } - disconnect (m_ffserver_process, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), - this, TQT_SLOT (processOutput (TDEProcess *, char *, int))); + disconnect (m_ffserver_process, TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQ_SLOT (processOutput (TDEProcess *, char *, int))); if (m_ffmpeg_process) m_ffmpeg_process->stop (); delete m_ffmpeg_process; m_ffmpeg_process = new KMPlayer::FFMpeg (m_player, m_player->settings ()); - connect (m_ffmpeg_process, TQT_SIGNAL (stateChange (KMPlayer::Process::State, KMPlayer::Process::State)), this, TQT_SLOT (stateChange (KMPlayer::Process::State, KMPlayer::Process::State))); + connect (m_ffmpeg_process, TQ_SIGNAL (stateChange (KMPlayer::Process::State, KMPlayer::Process::State)), this, TQ_SLOT (stateChange (KMPlayer::Process::State, KMPlayer::Process::State))); ffurl.sprintf ("http://localhost:%d/kmplayer.ffm", m_ffserverconfig->ffserverport); m_ffmpeg_process->setURL (KURL(ffurl)); if (!m_ffmpeg_process->play (m_player->source (), KMPlayer::NodePtr())) { @@ -582,8 +582,8 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::stateChange (KMPlayer::Process::Stat kdDebug () << "ffmpeg process stopped " << m_endserver << endl; if (m_endserver && !stopProcess (m_ffserver_process)) { disconnect (m_ffserver_process, - TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), - this, TQT_SLOT (processOutput (TDEProcess *, char *, int))); + TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQ_SLOT (processOutput (TDEProcess *, char *, int))); KMessageBox::error (m_configpage, i18n ("Failed to end ffserver process."), i18n ("Error")); processStopped (0L); } diff --git a/src/kmplayerconfig.cpp b/src/kmplayerconfig.cpp index d774749..20911e5 100644 --- a/src/kmplayerconfig.cpp +++ b/src/kmplayerconfig.cpp @@ -365,13 +365,13 @@ KDE_NO_EXPORT bool Settings::createDialog () { if (p->supports ("urlsource")) configdialog->m_SourcePageURL->backend->insertItem (p->menuName ().remove (TQChar ('&')), id++); } - connect (configdialog, TQT_SIGNAL (okClicked ()), - this, TQT_SLOT (okPressed ())); - connect (configdialog, TQT_SIGNAL (applyClicked ()), - this, TQT_SLOT (okPressed ())); + connect (configdialog, TQ_SIGNAL (okClicked ()), + this, TQ_SLOT (okPressed ())); + connect (configdialog, TQ_SIGNAL (applyClicked ()), + this, TQ_SLOT (okPressed ())); if (TDEApplication::kApplication()) - connect (configdialog, TQT_SIGNAL (helpClicked ()), - this, TQT_SLOT (getHelp ())); + connect (configdialog, TQ_SIGNAL (helpClicked ()), + this, TQ_SLOT (getHelp ())); return true; } diff --git a/src/kmplayercontrolpanel.cpp b/src/kmplayercontrolpanel.cpp index 31ff93a..ac3fe82 100644 --- a/src/kmplayercontrolpanel.cpp +++ b/src/kmplayercontrolpanel.cpp @@ -423,21 +423,21 @@ KDE_NO_CDTOR_EXPORT ControlPanel::ControlPanel(TQWidget * parent, View * view) m_popupMenu->insertSeparator (); m_popupMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("configure"), TDEIcon::Small, 0, true), i18n ("&Configure KMPlayer..."), menu_config); setAutoControls (true); - connect (m_buttons [button_config], TQT_SIGNAL (clicked ()), - this, TQT_SLOT (buttonClicked ())); - connect (m_buttons [button_language], TQT_SIGNAL (clicked ()), - this, TQT_SLOT (buttonClicked ())); - connect (m_buttons [button_config], TQT_SIGNAL (mouseEntered ()), - this, TQT_SLOT (buttonMouseEntered ())); - connect (m_buttons [button_language], TQT_SIGNAL (mouseEntered ()), - this, TQT_SLOT (buttonMouseEntered ())); - connect (m_popupMenu, TQT_SIGNAL (mouseLeft ()), this, TQT_SLOT (menuMouseLeft ())); - connect (m_playerMenu, TQT_SIGNAL (mouseLeft ()), this, TQT_SLOT(menuMouseLeft ())); - connect (m_zoomMenu, TQT_SIGNAL (mouseLeft ()), this, TQT_SLOT (menuMouseLeft ())); - connect (m_colorMenu, TQT_SIGNAL (mouseLeft ()), this, TQT_SLOT (menuMouseLeft ())); - connect (m_languageMenu, TQT_SIGNAL(mouseLeft ()), this, TQT_SLOT(menuMouseLeft())); - connect (m_subtitleMenu, TQT_SIGNAL(mouseLeft ()), this, TQT_SLOT(menuMouseLeft())); - connect (m_audioMenu, TQT_SIGNAL (mouseLeft ()), this, TQT_SLOT (menuMouseLeft ())); + connect (m_buttons [button_config], TQ_SIGNAL (clicked ()), + this, TQ_SLOT (buttonClicked ())); + connect (m_buttons [button_language], TQ_SIGNAL (clicked ()), + this, TQ_SLOT (buttonClicked ())); + connect (m_buttons [button_config], TQ_SIGNAL (mouseEntered ()), + this, TQ_SLOT (buttonMouseEntered ())); + connect (m_buttons [button_language], TQ_SIGNAL (mouseEntered ()), + this, TQ_SLOT (buttonMouseEntered ())); + connect (m_popupMenu, TQ_SIGNAL (mouseLeft ()), this, TQ_SLOT (menuMouseLeft ())); + connect (m_playerMenu, TQ_SIGNAL (mouseLeft ()), this, TQ_SLOT(menuMouseLeft ())); + connect (m_zoomMenu, TQ_SIGNAL (mouseLeft ()), this, TQ_SLOT (menuMouseLeft ())); + connect (m_colorMenu, TQ_SIGNAL (mouseLeft ()), this, TQ_SLOT (menuMouseLeft ())); + connect (m_languageMenu, TQ_SIGNAL(mouseLeft ()), this, TQ_SLOT(menuMouseLeft())); + connect (m_subtitleMenu, TQ_SIGNAL(mouseLeft ()), this, TQ_SLOT(menuMouseLeft())); + connect (m_audioMenu, TQ_SIGNAL (mouseLeft ()), this, TQ_SLOT (menuMouseLeft ())); } KDE_NO_EXPORT void ControlPanel::setPalette (const TQPalette & pal) { diff --git a/src/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp index 96b9f99..f12427a 100644 --- a/src/kmplayerpartbase.cpp +++ b/src/kmplayerpartbase.cpp @@ -172,14 +172,14 @@ void PartBase::init (TDEActionCollection * action_collection) { #ifdef HAVE_NSPR m_players ["npp"] = new NpPlayer (this, m_settings, m_service); #endif - connect(m_settings, TQT_SIGNAL(configChanged()), this, TQT_SLOT(settingsChanged())); + connect(m_settings, TQ_SIGNAL(configChanged()), this, TQ_SLOT(settingsChanged())); m_settings->readConfig (); m_settings->applyColorSetting (false); m_bookmark_menu = new KBookmarkMenu (m_bookmark_manager, m_bookmark_owner, m_view->controlPanel ()->bookmarkMenu (), action_collection, true, true); - connect (m_view, TQT_SIGNAL (urlDropped (const KURL::List &)), this, TQT_SLOT (openURL (const KURL::List &))); + connect (m_view, TQ_SIGNAL (urlDropped (const KURL::List &)), this, TQ_SLOT (openURL (const KURL::List &))); connectPlaylist (m_view->playList ()); connectInfoPanel (m_view->infoPanel ()); - new TDEAction (i18n ("Edit playlist &item"), 0, 0, m_view->playList (), TQT_SLOT (editCurrent ()), action_collection, "edit_playlist_item"); + new TDEAction (i18n ("Edit playlist &item"), 0, 0, m_view->playList (), TQ_SLOT (editCurrent ()), action_collection, "edit_playlist_item"); } void PartBase::connectPanel (ControlPanel * panel) { @@ -188,58 +188,58 @@ void PartBase::connectPanel (ControlPanel * panel) { panel->hueSlider ()->setValue (m_settings->hue); panel->saturationSlider ()->setValue (m_settings->saturation); panel->volumeBar ()->setValue (m_settings->volume); - connect (panel->button (ControlPanel::button_playlist), TQT_SIGNAL (clicked ()), this, TQT_SLOT (showPlayListWindow ())); - connect (panel->button (ControlPanel::button_back), TQT_SIGNAL (clicked ()), this, TQT_SLOT (back ())); - connect (panel->button (ControlPanel::button_play), TQT_SIGNAL (clicked ()), this, TQT_SLOT (play ())); - connect (panel->button (ControlPanel::button_forward), TQT_SIGNAL (clicked ()), this, TQT_SLOT (forward ())); - connect (panel->button (ControlPanel::button_pause), TQT_SIGNAL (clicked ()), this, TQT_SLOT (pause ())); - connect (panel->button (ControlPanel::button_stop), TQT_SIGNAL (clicked ()), this, TQT_SLOT (stop ())); - connect (panel->button (ControlPanel::button_record), TQT_SIGNAL (clicked()), this, TQT_SLOT (record())); - connect (panel->volumeBar (), TQT_SIGNAL (volumeChanged (int)), this, TQT_SLOT (volumeChanged (int))); - connect (panel->positionSlider (), TQT_SIGNAL (valueChanged (int)), this, TQT_SLOT (positionValueChanged (int))); - connect (panel->positionSlider (), TQT_SIGNAL (sliderPressed()), this, TQT_SLOT (posSliderPressed())); - connect (panel->positionSlider (), TQT_SIGNAL (sliderReleased()), this, TQT_SLOT (posSliderReleased())); - connect (this, TQT_SIGNAL (positioned (int, int)), panel, TQT_SLOT (setPlayingProgress (int, int))); - connect (this, TQT_SIGNAL (loading(int)), panel, TQT_SLOT(setLoadingProgress(int))); - connect (panel->contrastSlider (), TQT_SIGNAL (valueChanged(int)), this, TQT_SLOT (contrastValueChanged(int))); - connect (panel->brightnessSlider (), TQT_SIGNAL (valueChanged(int)), this, TQT_SLOT (brightnessValueChanged(int))); - connect (panel->hueSlider (), TQT_SIGNAL (valueChanged(int)), this, TQT_SLOT (hueValueChanged(int))); - connect (panel->saturationSlider (), TQT_SIGNAL (valueChanged(int)), this, TQT_SLOT (saturationValueChanged(int))); - connect (this, TQT_SIGNAL (languagesUpdated(const TQStringList &, const TQStringList &)), panel, TQT_SLOT (setLanguages (const TQStringList &, const TQStringList &))); - connect (panel->audioMenu (), TQT_SIGNAL (activated (int)), this, TQT_SLOT (audioSelected (int))); - connect (panel->subtitleMenu (), TQT_SIGNAL (activated (int)), this, TQT_SLOT (subtitleSelected (int))); - connect (this, TQT_SIGNAL (audioIsSelected (int)), panel, TQT_SLOT (selectAudioLanguage (int))); - connect (this, TQT_SIGNAL (subtitleIsSelected (int)), panel, TQT_SLOT (selectSubtitle (int))); - panel->popupMenu()->connectItem (ControlPanel::menu_fullscreen, this, TQT_SLOT (fullScreen ())); + connect (panel->button (ControlPanel::button_playlist), TQ_SIGNAL (clicked ()), this, TQ_SLOT (showPlayListWindow ())); + connect (panel->button (ControlPanel::button_back), TQ_SIGNAL (clicked ()), this, TQ_SLOT (back ())); + connect (panel->button (ControlPanel::button_play), TQ_SIGNAL (clicked ()), this, TQ_SLOT (play ())); + connect (panel->button (ControlPanel::button_forward), TQ_SIGNAL (clicked ()), this, TQ_SLOT (forward ())); + connect (panel->button (ControlPanel::button_pause), TQ_SIGNAL (clicked ()), this, TQ_SLOT (pause ())); + connect (panel->button (ControlPanel::button_stop), TQ_SIGNAL (clicked ()), this, TQ_SLOT (stop ())); + connect (panel->button (ControlPanel::button_record), TQ_SIGNAL (clicked()), this, TQ_SLOT (record())); + connect (panel->volumeBar (), TQ_SIGNAL (volumeChanged (int)), this, TQ_SLOT (volumeChanged (int))); + connect (panel->positionSlider (), TQ_SIGNAL (valueChanged (int)), this, TQ_SLOT (positionValueChanged (int))); + connect (panel->positionSlider (), TQ_SIGNAL (sliderPressed()), this, TQ_SLOT (posSliderPressed())); + connect (panel->positionSlider (), TQ_SIGNAL (sliderReleased()), this, TQ_SLOT (posSliderReleased())); + connect (this, TQ_SIGNAL (positioned (int, int)), panel, TQ_SLOT (setPlayingProgress (int, int))); + connect (this, TQ_SIGNAL (loading(int)), panel, TQ_SLOT(setLoadingProgress(int))); + connect (panel->contrastSlider (), TQ_SIGNAL (valueChanged(int)), this, TQ_SLOT (contrastValueChanged(int))); + connect (panel->brightnessSlider (), TQ_SIGNAL (valueChanged(int)), this, TQ_SLOT (brightnessValueChanged(int))); + connect (panel->hueSlider (), TQ_SIGNAL (valueChanged(int)), this, TQ_SLOT (hueValueChanged(int))); + connect (panel->saturationSlider (), TQ_SIGNAL (valueChanged(int)), this, TQ_SLOT (saturationValueChanged(int))); + connect (this, TQ_SIGNAL (languagesUpdated(const TQStringList &, const TQStringList &)), panel, TQ_SLOT (setLanguages (const TQStringList &, const TQStringList &))); + connect (panel->audioMenu (), TQ_SIGNAL (activated (int)), this, TQ_SLOT (audioSelected (int))); + connect (panel->subtitleMenu (), TQ_SIGNAL (activated (int)), this, TQ_SLOT (subtitleSelected (int))); + connect (this, TQ_SIGNAL (audioIsSelected (int)), panel, TQ_SLOT (selectAudioLanguage (int))); + connect (this, TQ_SIGNAL (subtitleIsSelected (int)), panel, TQ_SLOT (selectSubtitle (int))); + panel->popupMenu()->connectItem (ControlPanel::menu_fullscreen, this, TQ_SLOT (fullScreen ())); panel->popupMenu ()->connectItem (ControlPanel::menu_config, - this, TQT_SLOT (showConfigDialog ())); + this, TQ_SLOT (showConfigDialog ())); panel->popupMenu ()->connectItem (ControlPanel::menu_video, - m_view, TQT_SLOT(toggleVideoConsoleWindow())); + m_view, TQ_SLOT(toggleVideoConsoleWindow())); panel->popupMenu ()->connectItem (ControlPanel::menu_playlist, - m_view, TQT_SLOT (toggleShowPlaylist ())); + m_view, TQ_SLOT (toggleShowPlaylist ())); panel->popupMenu ()->connectItem (ControlPanel::menu_minimal, - this, TQT_SLOT (minimalMode ())); - connect (this, TQT_SIGNAL (statusUpdated (const TQString &)), - panel->view (), TQT_SLOT (setStatusMessage (const TQString &))); - //connect (panel (), TQT_SIGNAL (clicked ()), m_settings, TQT_SLOT (show ())); + this, TQ_SLOT (minimalMode ())); + connect (this, TQ_SIGNAL (statusUpdated (const TQString &)), + panel->view (), TQ_SLOT (setStatusMessage (const TQString &))); + //connect (panel (), TQ_SIGNAL (clicked ()), m_settings, TQ_SLOT (show ())); } void PartBase::connectPlaylist (PlayListView * playlist) { - connect (playlist, TQT_SIGNAL (addBookMark (const TQString &, const TQString &)), - this, TQT_SLOT (addBookMark (const TQString &, const TQString &))); - connect (playlist, TQT_SIGNAL (executed (TQListViewItem *)), - this, TQT_SLOT (playListItemExecuted (TQListViewItem *))); - connect (playlist, TQT_SIGNAL (clicked (TQListViewItem *)), - this, TQT_SLOT (playListItemClicked (TQListViewItem *))); - connect (this, TQT_SIGNAL (treeChanged (int, NodePtr, NodePtr, bool, bool)), - playlist, TQT_SLOT (updateTree (int, NodePtr, NodePtr, bool, bool))); - connect (this, TQT_SIGNAL (treeUpdated ()), - playlist, TQT_SLOT (triggerUpdate ())); + connect (playlist, TQ_SIGNAL (addBookMark (const TQString &, const TQString &)), + this, TQ_SLOT (addBookMark (const TQString &, const TQString &))); + connect (playlist, TQ_SIGNAL (executed (TQListViewItem *)), + this, TQ_SLOT (playListItemExecuted (TQListViewItem *))); + connect (playlist, TQ_SIGNAL (clicked (TQListViewItem *)), + this, TQ_SLOT (playListItemClicked (TQListViewItem *))); + connect (this, TQ_SIGNAL (treeChanged (int, NodePtr, NodePtr, bool, bool)), + playlist, TQ_SLOT (updateTree (int, NodePtr, NodePtr, bool, bool))); + connect (this, TQ_SIGNAL (treeUpdated ()), + playlist, TQ_SLOT (triggerUpdate ())); } void PartBase::connectInfoPanel (InfoWindow * infopanel) { - connect (this, TQT_SIGNAL (infoUpdated (const TQString &)), - infopanel->view (), TQT_SLOT (setInfoMessage (const TQString &))); + connect (this, TQ_SIGNAL (infoUpdated (const TQString &)), + infopanel->view (), TQ_SLOT (setInfoMessage (const TQString &))); } PartBase::~PartBase () { @@ -398,7 +398,7 @@ void PartBase::updatePlayerMenu (ControlPanel * panel) { for (ProcessMap::const_iterator i = m_players.begin(); i != e; ++i) { Process * p = i.data (); if (p->supports (m_source->name ())) { - menu->insertItem (p->menuName (), this, TQT_SLOT (slotPlayerMenu (int)), 0, id++); + menu->insertItem (p->menuName (), this, TQ_SLOT (slotPlayerMenu (int)), 0, id++); if (i.data() == m_process) menu->setItemChecked (id-1, true); } @@ -407,20 +407,20 @@ void PartBase::updatePlayerMenu (ControlPanel * panel) { void PartBase::connectSource (Source * old_source, Source * source) { if (old_source) { - disconnect (old_source, TQT_SIGNAL(endOfPlayItems ()), this, TQT_SLOT(stop ())); - disconnect (old_source, TQT_SIGNAL (dimensionsChanged ()), - this, TQT_SLOT (sourceHasChangedAspects ())); - disconnect (old_source, TQT_SIGNAL (startPlaying ()), - this, TQT_SLOT (playingStarted ())); - disconnect (old_source, TQT_SIGNAL (stopPlaying ()), - this, TQT_SLOT (playingStopped ())); + disconnect (old_source, TQ_SIGNAL(endOfPlayItems ()), this, TQ_SLOT(stop ())); + disconnect (old_source, TQ_SIGNAL (dimensionsChanged ()), + this, TQ_SLOT (sourceHasChangedAspects ())); + disconnect (old_source, TQ_SIGNAL (startPlaying ()), + this, TQ_SLOT (playingStarted ())); + disconnect (old_source, TQ_SIGNAL (stopPlaying ()), + this, TQ_SLOT (playingStopped ())); } if (source) { - connect (source, TQT_SIGNAL (endOfPlayItems ()), this, TQT_SLOT (stop ())); - connect (source, TQT_SIGNAL (dimensionsChanged ()), - this, TQT_SLOT (sourceHasChangedAspects ())); - connect (source, TQT_SIGNAL (startPlaying()), this, TQT_SLOT(playingStarted())); - connect (source, TQT_SIGNAL (stopPlaying ()), this, TQT_SLOT(playingStopped())); + connect (source, TQ_SIGNAL (endOfPlayItems ()), this, TQ_SLOT (stop ())); + connect (source, TQ_SIGNAL (dimensionsChanged ()), + this, TQ_SLOT (sourceHasChangedAspects ())); + connect (source, TQ_SIGNAL (startPlaying()), this, TQ_SLOT(playingStarted())); + connect (source, TQ_SIGNAL (stopPlaying ()), this, TQ_SLOT(playingStopped())); } } @@ -433,12 +433,12 @@ void PartBase::setSource (Source * _source) { m_view->reset (); emit infoUpdated (TQString ()); } - disconnect (m_source, TQT_SIGNAL (startRecording ()), - this, TQT_SLOT (recordingStarted ())); - disconnect (this, TQT_SIGNAL (audioIsSelected (int)), - m_source, TQT_SLOT (setAudioLang (int))); - disconnect (this, TQT_SIGNAL (subtitleIsSelected (int)), - m_source, TQT_SLOT (setSubtitle (int))); + disconnect (m_source, TQ_SIGNAL (startRecording ()), + this, TQ_SLOT (recordingStarted ())); + disconnect (this, TQ_SIGNAL (audioIsSelected (int)), + m_source, TQ_SLOT (setAudioLang (int))); + disconnect (this, TQ_SIGNAL (subtitleIsSelected (int)), + m_source, TQ_SLOT (setSubtitle (int))); } if (m_view) { if (m_auto_controls) @@ -452,18 +452,18 @@ void PartBase::setSource (Source * _source) { m_source = _source; connectSource (old_source, m_source); m_process->setSource (m_source); - connect (m_source, TQT_SIGNAL(startRecording()), this,TQT_SLOT(recordingStarted())); - connect (this, TQT_SIGNAL (audioIsSelected (int)), - m_source, TQT_SLOT (setAudioLang (int))); - connect (this, TQT_SIGNAL (subtitleIsSelected (int)), - m_source, TQT_SLOT (setSubtitle (int))); + connect (m_source, TQ_SIGNAL(startRecording()), this,TQ_SLOT(recordingStarted())); + connect (this, TQ_SIGNAL (audioIsSelected (int)), + m_source, TQ_SLOT (setAudioLang (int))); + connect (this, TQ_SIGNAL (subtitleIsSelected (int)), + m_source, TQ_SLOT (setSubtitle (int))); m_source->init (); m_source->setIdentified (false); if (m_view && m_view->viewer ()) { updatePlayerMenu (m_view->controlPanel ()); m_view->viewer ()->setAspect (0.0); } - if (m_source) TQTimer::singleShot (0, m_source, TQT_SLOT (activate ())); + if (m_source) TQTimer::singleShot (0, m_source, TQ_SLOT (activate ())); updateTree (true, true); emit sourceChanged (old_source, m_source); } @@ -1104,7 +1104,7 @@ bool Source::requestPlayURL (NodePtr mrl) { else m_back_request = mrl; m_player->updateTree (); - TQTimer::singleShot (0, this, TQT_SLOT (playCurrent ())); + TQTimer::singleShot (0, this, TQ_SLOT (playCurrent ())); } m_player->setProcess (mrl->mrl ()); return true; @@ -1144,7 +1144,7 @@ void Source::stateElementChanged (Node * elm, Node::State os, Node::State ns) { //a SMIL movies stopped by SMIL events rather than movie just ending m_player->process ()->stop (); if (m_player->view ()) // move away the video widget - TQTimer::singleShot (0, m_player->view (), TQT_SLOT (updateLayout ())); + TQTimer::singleShot (0, m_player->view (), TQ_SLOT (updateLayout ())); } else if ((ns == Node::state_deferred || (os == Node::state_deferred && ns > Node::state_deferred)) && elm == m_document) { @@ -1204,7 +1204,7 @@ void Source::insertURL (NodePtr node, const TQString & mrl, const TQString & tit void Source::play () { m_player->updateTree (); - TQTimer::singleShot (0, m_player, TQT_SLOT (play ())); + TQTimer::singleShot (0, m_player, TQ_SLOT (play ())); //printTree (m_document); } @@ -1229,7 +1229,7 @@ void Source::backward () { else if (m_current) { m_document->reset (); m_current = e; - TQTimer::singleShot (0, this, TQT_SLOT (playCurrent ())); + TQTimer::singleShot (0, this, TQ_SLOT (playCurrent ())); } return; } @@ -1260,7 +1260,7 @@ void Source::jump (NodePtr e) { if (m_current) m_document->reset (); m_current = e; - TQTimer::singleShot (0, this, TQT_SLOT (playCurrent ())); + TQTimer::singleShot (0, this, TQ_SLOT (playCurrent ())); } } else m_player->updateTree (); @@ -1450,7 +1450,7 @@ void Source::stateChange(Process *p, Process::State olds, Process::State news) { (!mrl || mrl->view_mode != Mrl::WindowMode)) static_cast(m_player->view())->viewArea()->repaint(); } else - TQTimer::singleShot (0, this, TQT_SLOT (playCurrent ())); + TQTimer::singleShot (0, this, TQ_SLOT (playCurrent ())); } else if (news == Process::Buffering) { if (p->mrl ()->mrl ()->view_mode != Mrl::SingleMode) p->mrl ()->defer (); // paused the SMIL @@ -1853,14 +1853,14 @@ bool URLSource::resolveURL (NodePtr m) { job->addMetaData ("PropagateHttpHeader", "true"); job->addMetaData ("errorPage", "false"); m_resolve_info = new ResolveInfo (m, job, m_resolve_info); - connect (m_resolve_info->job, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), - this, TQT_SLOT (kioData (TDEIO::Job *, const TQByteArray &))); - //connect( m_job, TQT_SIGNAL(connected(TDEIO::Job*)), - // this, TQT_SLOT(slotConnected(TDEIO::Job*))); - connect(m_resolve_info->job, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), - this, TQT_SLOT (kioMimetype (TDEIO::Job *, const TQString &))); - connect (m_resolve_info->job, TQT_SIGNAL (result (TDEIO::Job *)), - this, TQT_SLOT (kioResult (TDEIO::Job *))); + connect (m_resolve_info->job, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), + this, TQ_SLOT (kioData (TDEIO::Job *, const TQByteArray &))); + //connect( m_job, TQ_SIGNAL(connected(TDEIO::Job*)), + // this, TQ_SLOT(slotConnected(TDEIO::Job*))); + connect(m_resolve_info->job, TQ_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), + this, TQ_SLOT (kioMimetype (TDEIO::Job *, const TQString &))); + connect (m_resolve_info->job, TQ_SIGNAL (result (TDEIO::Job *)), + this, TQ_SLOT (kioResult (TDEIO::Job *))); static_cast (m_player->view ())->controlPanel ()->setPlaying (true); m_player->updateStatus (i18n ("Connecting")); m_player->setLoaded (0); @@ -1945,16 +1945,16 @@ KDE_NO_EXPORT bool RemoteObjectPrivate::download (const TQString & str) { if (memory_cache->preserve (str)) { //kdDebug () << "downloading " << str << endl; job = TDEIO::get (kurl, false, false); - connect (job, TQT_SIGNAL (data (TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT (slotData (TDEIO::Job *, const TQByteArray &))); - connect (job, TQT_SIGNAL (result (TDEIO::Job *)), - this, TQT_SLOT (slotResult (TDEIO::Job *))); - connect (job, TQT_SIGNAL (mimetype (TDEIO::Job *, const TQString &)), - this, TQT_SLOT (slotMimetype (TDEIO::Job *, const TQString &))); + connect (job, TQ_SIGNAL (data (TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT (slotData (TDEIO::Job *, const TQByteArray &))); + connect (job, TQ_SIGNAL (result (TDEIO::Job *)), + this, TQ_SLOT (slotResult (TDEIO::Job *))); + connect (job, TQ_SIGNAL (mimetype (TDEIO::Job *, const TQString &)), + this, TQ_SLOT (slotMimetype (TDEIO::Job *, const TQString &))); } else { //kdDebug () << "download preserved " << str << endl; - connect (memory_cache, TQT_SIGNAL (preserveRemoved (const TQString &)), - this, TQT_SLOT (cachePreserveRemoved (const TQString &))); + connect (memory_cache, TQ_SIGNAL (preserveRemoved (const TQString &)), + this, TQ_SLOT (cachePreserveRemoved (const TQString &))); preserve_wait = true; } return false; @@ -1966,8 +1966,8 @@ KDE_NO_EXPORT void RemoteObjectPrivate::clear () { job = 0L; memory_cache->unpreserve (url); } else if (preserve_wait) { - disconnect (memory_cache, TQT_SIGNAL (preserveRemoved (const TQString &)), - this, TQT_SLOT (cachePreserveRemoved (const TQString &))); + disconnect (memory_cache, TQ_SIGNAL (preserveRemoved (const TQString &)), + this, TQ_SLOT (cachePreserveRemoved (const TQString &))); preserve_wait = false; } } @@ -1985,8 +1985,8 @@ KDE_NO_EXPORT void RemoteObjectPrivate::cachePreserveRemoved (const TQString & str) { if (str == url && !memory_cache->isPreserved (str)) { preserve_wait = false; - disconnect (memory_cache, TQT_SIGNAL (preserveRemoved (const TQString &)), - this, TQT_SLOT (cachePreserveRemoved (const TQString &))); + disconnect (memory_cache, TQ_SIGNAL (preserveRemoved (const TQString &)), + this, TQ_SLOT (cachePreserveRemoved (const TQString &))); download (str); } } diff --git a/src/kmplayerprocess.cpp b/src/kmplayerprocess.cpp index 6a77333..eb33c79 100644 --- a/src/kmplayerprocess.cpp +++ b/src/kmplayerprocess.cpp @@ -191,7 +191,7 @@ void Process::setState (State newstate) { m_old_state = m_state; m_state = newstate; if (need_timer && m_source) - TQTimer::singleShot (0, this, TQT_SLOT (rescheduledStateChanged ())); + TQTimer::singleShot (0, this, TQ_SLOT (rescheduledStateChanged ())); } } @@ -213,7 +213,7 @@ bool Process::play (Source * src, NodePtr _mrl) { return deMediafiedPlay (); m_url = url; m_job = TDEIO::stat (m_url, false); - connect(m_job, TQT_SIGNAL (result(TDEIO::Job *)), this, TQT_SLOT(result(TDEIO::Job *))); + connect(m_job, TQ_SIGNAL (result(TDEIO::Job *)), this, TQ_SLOT(result(TDEIO::Job *))); return true; #else return deMediafiedPlay (); @@ -281,10 +281,10 @@ KDE_NO_EXPORT void MPlayerBase::initProcess (Viewer * viewer) { if (KProtocolManager::useProxy () && proxyForURL (url, proxy_url)) m_process->setEnvironment("http_proxy", proxy_url); } - connect (m_process, TQT_SIGNAL (wroteStdin (TDEProcess *)), - this, TQT_SLOT (dataWritten (TDEProcess *))); - connect (m_process, TQT_SIGNAL (processExited (TDEProcess *)), - this, TQT_SLOT (processStopped (TDEProcess *))); + connect (m_process, TQ_SIGNAL (wroteStdin (TDEProcess *)), + this, TQ_SLOT (dataWritten (TDEProcess *))); + connect (m_process, TQ_SIGNAL (processExited (TDEProcess *)), + this, TQ_SLOT (processStopped (TDEProcess *))); } KDE_NO_EXPORT bool MPlayerBase::sendCommand (const TQString & cmd) { @@ -309,8 +309,8 @@ KDE_NO_EXPORT bool MPlayerBase::stop () { KDE_NO_EXPORT bool MPlayerBase::quit () { if (playing ()) { stop (); - disconnect (m_process, TQT_SIGNAL (processExited (TDEProcess *)), - this, TQT_SLOT (processStopped (TDEProcess *))); + disconnect (m_process, TQ_SIGNAL (processExited (TDEProcess *)), + this, TQ_SLOT (processStopped (TDEProcess *))); if (!m_use_slave) { void (*oldhandler)(int) = signal(SIGTERM, SIG_IGN); ::kill (-1 * ::getpid (), SIGTERM); @@ -523,10 +523,10 @@ KDE_NO_EXPORT bool MPlayer::brightness (int val, bool /*absolute*/) { bool MPlayer::run (const char * args, const char * pipe) { //m_view->consoleOutput ()->clear (); m_process_output = TQString (); - connect (m_process, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), - this, TQT_SLOT (processOutput (TDEProcess *, char *, int))); - connect (m_process, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), - this, TQT_SLOT (processOutput (TDEProcess *, char *, int))); + connect (m_process, TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), + this, TQ_SLOT (processOutput (TDEProcess *, char *, int))); + connect (m_process, TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQ_SLOT (processOutput (TDEProcess *, char *, int))); m_use_slave = !(pipe && pipe[0]); if (!m_use_slave) { fprintf (stderr, "%s | ", pipe); @@ -1427,12 +1427,12 @@ TQString CallbackProcess::dcopName () { void CallbackProcess::initProcess (Viewer * viewer) { Process::initProcess (viewer); - connect (m_process, TQT_SIGNAL (processExited (TDEProcess *)), - this, TQT_SLOT (processStopped (TDEProcess *))); - connect (m_process, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), - this, TQT_SLOT (processOutput (TDEProcess *, char *, int))); - connect (m_process, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), - this, TQT_SLOT (processOutput (TDEProcess *, char *, int))); + connect (m_process, TQ_SIGNAL (processExited (TDEProcess *)), + this, TQ_SLOT (processStopped (TDEProcess *))); + connect (m_process, TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), + this, TQ_SLOT (processOutput (TDEProcess *, char *, int))); + connect (m_process, TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQ_SLOT (processOutput (TDEProcess *, char *, int))); } KDE_NO_EXPORT void CallbackProcess::processOutput (TDEProcess *, char * str, int slen) { @@ -1822,8 +1822,8 @@ KDE_NO_EXPORT void FFMpeg::init () { bool FFMpeg::deMediafiedPlay () { initProcess (viewer ()); KURL url (m_url); - connect (m_process, TQT_SIGNAL (processExited (TDEProcess *)), - this, TQT_SLOT (processStopped (TDEProcess *))); + connect (m_process, TQ_SIGNAL (processExited (TDEProcess *)), + this, TQ_SLOT (processStopped (TDEProcess *))); TQString outurl = TQString (TQFile::encodeName (m_recordurl.isLocalFile () ? getPath (m_recordurl) : m_recordurl.url ())); if (m_recordurl.isLocalFile ()) TQFile (outurl).remove (); @@ -2033,16 +2033,16 @@ KDE_NO_EXPORT void NpStream::open () { } else { job = TDEIO::get (url, false, false); job->addMetaData ("errorPage", "false"); - connect (job, TQT_SIGNAL (data (TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT (slotData (TDEIO::Job *, const TQByteArray &))); - connect (job, TQT_SIGNAL (result (TDEIO::Job *)), - this, TQT_SLOT (slotResult (TDEIO::Job *))); - connect (job, TQT_SIGNAL (redirection (TDEIO::Job *, const KURL &)), - this, TQT_SLOT (redirection (TDEIO::Job *, const KURL &))); - connect (job, TQT_SIGNAL (mimetype (TDEIO::Job *, const TQString &)), - TQT_SLOT (slotMimetype (TDEIO::Job *, const TQString &))); - connect (job, TQT_SIGNAL (totalSize (TDEIO::Job *, TDEIO::filesize_t)), - TQT_SLOT (slotTotalSize (TDEIO::Job *, TDEIO::filesize_t))); + connect (job, TQ_SIGNAL (data (TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT (slotData (TDEIO::Job *, const TQByteArray &))); + connect (job, TQ_SIGNAL (result (TDEIO::Job *)), + this, TQ_SLOT (slotResult (TDEIO::Job *))); + connect (job, TQ_SIGNAL (redirection (TDEIO::Job *, const KURL &)), + this, TQ_SLOT (redirection (TDEIO::Job *, const KURL &))); + connect (job, TQ_SIGNAL (mimetype (TDEIO::Job *, const TQString &)), + TQ_SLOT (slotMimetype (TDEIO::Job *, const TQString &))); + connect (job, TQ_SIGNAL (totalSize (TDEIO::Job *, TDEIO::filesize_t)), + TQ_SLOT (slotTotalSize (TDEIO::Job *, TDEIO::filesize_t))); } } @@ -2116,14 +2116,14 @@ KDE_NO_EXPORT void NpPlayer::init () { KDE_NO_EXPORT void NpPlayer::initProcess (Viewer * viewer) { Process::initProcess (viewer); - connect (m_process, TQT_SIGNAL (processExited (TDEProcess *)), - this, TQT_SLOT (processStopped (TDEProcess *))); - connect (m_process, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), - this, TQT_SLOT (processOutput (TDEProcess *, char *, int))); - connect (m_process, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), - this, TQT_SLOT (processOutput (TDEProcess *, char *, int))); - connect (m_process, TQT_SIGNAL (wroteStdin (TDEProcess *)), - this, TQT_SLOT (wroteStdin (TDEProcess *))); + connect (m_process, TQ_SIGNAL (processExited (TDEProcess *)), + this, TQ_SLOT (processStopped (TDEProcess *))); + connect (m_process, TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), + this, TQ_SLOT (processOutput (TDEProcess *, char *, int))); + connect (m_process, TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQ_SLOT (processOutput (TDEProcess *, char *, int))); + connect (m_process, TQ_SIGNAL (wroteStdin (TDEProcess *)), + this, TQ_SLOT (wroteStdin (TDEProcess *))); if (!dbus_static) dbus_static = dbus_static_deleter.setObject (new DBusStatic ()); if (iface.isEmpty ()) { @@ -2316,8 +2316,8 @@ void NpPlayer::requestStream (const TQString &path, const TQString & url, const sendFinish (sid, 0, NpStream::BecauseDone); } else { NpStream * ns = new NpStream (this, sid, uri); - connect (ns, TQT_SIGNAL (stateChanged ()), - this, TQT_SLOT (streamStateChanged ())); + connect (ns, TQ_SIGNAL (stateChanged ()), + this, TQ_SLOT (streamStateChanged ())); streams[sid] = ns; if (url != uri.url ()) streamRedirected (sid, uri.url ()); @@ -2453,8 +2453,8 @@ KDE_NO_EXPORT void NpPlayer::processStreams () { ns->open (); write_in_progress = false; if (ns->job) { - connect (ns, TQT_SIGNAL (redirected (TQ_UINT32, const KURL&)), - this, TQT_SLOT (streamRedirected (TQ_UINT32, const KURL&))); + connect (ns, TQ_SIGNAL (redirected (TQ_UINT32, const KURL&)), + this, TQ_SLOT (streamRedirected (TQ_UINT32, const KURL&))); active_count++; } } diff --git a/src/kmplayertvsource.cpp b/src/kmplayertvsource.cpp index aa18167..0bf1644 100644 --- a/src/kmplayertvsource.cpp +++ b/src/kmplayertvsource.cpp @@ -116,7 +116,7 @@ KDE_NO_CDTOR_EXPORT TVDevicePage::TVDevicePage (TQWidget *parent, KMPlayer::Node inputsTab->addTab (widget, input->mrl ()->pretty_name); } TQPushButton * delButton = new TQPushButton (i18n ("Delete"), this); - connect (delButton, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotDelete ())); + connect (delButton, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotDelete ())); gridlayout->addWidget (audioLabel, 0, 0); gridlayout->addMultiCellWidget (audiodevice, 0, 0, 1, 3); gridlayout->addWidget (nameLabel, 1, 0); @@ -345,7 +345,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerTVSource::KMPlayerTVSource (KMPlayerApp * a, TQPopup : KMPlayerMenuSource (i18n ("TV"), a, m, "tvsource"), m_configpage (0L), scanner (0L), config_read (false) { m_url = "tv://"; m_menu->insertTearOffHandle (); - connect (m_menu, TQT_SIGNAL (aboutToShow ()), this, TQT_SLOT (menuAboutToShow ())); + connect (m_menu, TQ_SIGNAL (aboutToShow ()), this, TQ_SLOT (menuAboutToShow ())); m_document = new TVDocument (this); m_player->settings ()->addPage (this); tree_id = static_cast (m_player->view ())->playList ()->addTree (m_document, "tvsource", "tv", KMPlayer::PlayListView::TreeEdit | KMPlayer::PlayListView::Moveable | KMPlayer::PlayListView::Deleteable); @@ -379,7 +379,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::activate () { if (m_cur_tvdevice) { TQString playback = static_cast (m_cur_tvdevice.ptr ())->getAttribute (TQString::fromLatin1 ("playback")); if (playback.isEmpty () || playback.toInt ()) - TQTimer::singleShot (0, m_player, TQT_SLOT (play ())); + TQTimer::singleShot (0, m_player, TQ_SLOT (play ())); } } /* TODO: playback by @@ -397,7 +397,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::buildMenu () { int counter = 0; for (KMPlayer::NodePtr dp = m_document->firstChild (); dp; dp = dp->nextSibling ()) if (dp->id == id_node_tv_device) - m_menu->insertItem (KMPlayer::convertNode (dp)->pretty_name, this, TQT_SLOT (menuClicked (int)), 0, counter++); + m_menu->insertItem (KMPlayer::convertNode (dp)->pretty_name, this, TQ_SLOT (menuClicked (int)), 0, counter++); } KDE_NO_EXPORT void KMPlayerTVSource::menuAboutToShow () { @@ -486,7 +486,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::buildArguments () { KDE_NO_EXPORT void KMPlayerTVSource::playCurrent () { buildArguments (); if (m_app->broadcasting ()) - TQTimer::singleShot (0, m_app->broadcastConfig (), TQT_SLOT (startFeed ())); + TQTimer::singleShot (0, m_app->broadcastConfig (), TQ_SLOT (startFeed ())); else KMPlayer::Source::playCurrent (); } @@ -575,7 +575,7 @@ KDE_NO_EXPORT TQFrame * KMPlayerTVSource::prefPage (TQWidget * parent) { if (!m_configpage) { m_configpage = new KMPlayerPrefSourcePageTV (parent, this); scanner = new TVDeviceScannerSource (this); - connect (m_configpage->scan, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotScan())); + connect (m_configpage->scan, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotScan())); } return m_configpage; } @@ -592,16 +592,16 @@ KDE_NO_EXPORT void KMPlayerTVSource::slotScan () { TQString devstr = m_configpage->device->lineEdit()->text (); if (!hasTVDevice(m_document, devstr)) { scanner->scan (devstr, m_configpage->driver->text()); - connect (scanner, TQT_SIGNAL (scanFinished (TVDevice *)), - this, TQT_SLOT (slotScanFinished (TVDevice *))); + connect (scanner, TQ_SIGNAL (scanFinished (TVDevice *)), + this, TQ_SLOT (slotScanFinished (TVDevice *))); } else KMessageBox::error (m_configpage, i18n ("Device already present."), i18n ("Error")); } KDE_NO_EXPORT void KMPlayerTVSource::slotScanFinished (TVDevice * tvdevice) { - disconnect (scanner, TQT_SIGNAL (scanFinished (TVDevice *)), - this, TQT_SLOT (slotScanFinished (TVDevice *))); + disconnect (scanner, TQ_SIGNAL (scanFinished (TVDevice *)), + this, TQ_SLOT (slotScanFinished (TVDevice *))); if (tvdevice) { tvdevice->zombie = false; addTVDevicePage (tvdevice, true); @@ -614,8 +614,8 @@ KDE_NO_EXPORT void KMPlayerTVSource::addTVDevicePage(TVDevice *dev, bool show) { dev->device_page->deleteLater (); dev->device_page = new TVDevicePage (m_configpage->notebook, dev); m_configpage->notebook->insertTab (dev->device_page, dev->pretty_name); - connect (dev->device_page, TQT_SIGNAL (deleted (TVDevicePage *)), - this, TQT_SLOT (slotDeviceDeleted (TVDevicePage *))); + connect (dev->device_page, TQ_SIGNAL (deleted (TVDevicePage *)), + this, TQ_SLOT (slotDeviceDeleted (TVDevicePage *))); if (show) m_configpage->notebook->setCurrentPage (m_configpage->notebook->count ()-1); } diff --git a/src/kmplayervdr.cpp b/src/kmplayervdr.cpp index 8249ebd..bcf23d4 100644 --- a/src/kmplayervdr.cpp +++ b/src/kmplayervdr.cpp @@ -142,10 +142,10 @@ KDE_NO_CDTOR_EXPORT KMPlayerVDRSource::KMPlayerVDRSource (KMPlayerApp * app) m_stored_volume (0) { memset (m_actions, 0, sizeof (TDEAction *) * int (act_last)); m_player->settings ()->addPage (this); - connect (m_socket, TQT_SIGNAL (connectionClosed()), this, TQT_SLOT(disconnected())); - connect (m_socket, TQT_SIGNAL (connected ()), this, TQT_SLOT (connected ())); - connect (m_socket, TQT_SIGNAL (readyRead ()), this, TQT_SLOT (readyRead ())); - connect (m_socket, TQT_SIGNAL (error (int)), this, TQT_SLOT (socketError (int))); + connect (m_socket, TQ_SIGNAL (connectionClosed()), this, TQ_SLOT(disconnected())); + connect (m_socket, TQ_SIGNAL (connected ()), this, TQ_SLOT (connected ())); + connect (m_socket, TQ_SIGNAL (readyRead ()), this, TQ_SLOT (readyRead ())); + connect (m_socket, TQ_SIGNAL (error (int)), this, TQ_SLOT (socketError (int))); } KDE_NO_CDTOR_EXPORT KMPlayerVDRSource::~KMPlayerVDRSource () {} @@ -174,8 +174,8 @@ KDE_NO_EXPORT TQString KMPlayerVDRSource::prettyName () { KDE_NO_EXPORT void KMPlayerVDRSource::activate () { last_channel = 0; - connect (this, TQT_SIGNAL (startPlaying ()), this, TQT_SLOT (processStarted())); - connect (this, TQT_SIGNAL (stopPlaying ()), this, TQT_SLOT (processStopped ())); + connect (this, TQ_SIGNAL (startPlaying ()), this, TQ_SLOT (processStarted())); + connect (this, TQ_SIGNAL (stopPlaying ()), this, TQ_SLOT (processStopped ())); KMPlayer::ControlPanel * panel = m_app->view()->controlPanel (); panel->button (KMPlayer::ControlPanel::button_red)->show (); panel->button (KMPlayer::ControlPanel::button_green)->show (); @@ -183,29 +183,29 @@ KDE_NO_EXPORT void KMPlayerVDRSource::activate () { panel->button (KMPlayer::ControlPanel::button_blue)->show (); panel->button (KMPlayer::ControlPanel::button_pause)->hide (); panel->button (KMPlayer::ControlPanel::button_record)->hide (); - connect (panel->volumeBar (), TQT_SIGNAL (volumeChanged (int)), this, TQT_SLOT (volumeChanged (int))); - connect (panel->button (KMPlayer::ControlPanel::button_red), TQT_SIGNAL (clicked ()), this, TQT_SLOT (keyRed ())); - connect (panel->button (KMPlayer::ControlPanel::button_green), TQT_SIGNAL (clicked ()), this, TQT_SLOT (keyGreen ())); - connect (panel->button (KMPlayer::ControlPanel::button_yellow), TQT_SIGNAL (clicked ()), this, TQT_SLOT (keyYellow ())); - connect (panel->button (KMPlayer::ControlPanel::button_blue), TQT_SIGNAL (clicked ()), this, TQT_SLOT (keyBlue ())); + connect (panel->volumeBar (), TQ_SIGNAL (volumeChanged (int)), this, TQ_SLOT (volumeChanged (int))); + connect (panel->button (KMPlayer::ControlPanel::button_red), TQ_SIGNAL (clicked ()), this, TQ_SLOT (keyRed ())); + connect (panel->button (KMPlayer::ControlPanel::button_green), TQ_SIGNAL (clicked ()), this, TQ_SLOT (keyGreen ())); + connect (panel->button (KMPlayer::ControlPanel::button_yellow), TQ_SIGNAL (clicked ()), this, TQ_SLOT (keyYellow ())); + connect (panel->button (KMPlayer::ControlPanel::button_blue), TQ_SIGNAL (clicked ()), this, TQ_SLOT (keyBlue ())); setAspect (m_document, scale ? 16.0/9 : 1.33); if (!m_url.protocol ().compare ("kmplayer")) m_request_jump = KURL::decode_string (m_url.path ()).mid (1); setURL (KURL (TQString ("vdr://localhost:%1").arg (tcp_port))); - TQTimer::singleShot (0, m_player, TQT_SLOT (play ())); + TQTimer::singleShot (0, m_player, TQ_SLOT (play ())); } KDE_NO_EXPORT void KMPlayerVDRSource::deactivate () { - disconnect (m_socket, TQT_SIGNAL (error (int)), this, TQT_SLOT (socketError (int))); + disconnect (m_socket, TQ_SIGNAL (error (int)), this, TQ_SLOT (socketError (int))); if (m_player->view ()) { - disconnect (this, TQT_SIGNAL(startPlaying()), this, TQT_SLOT(processStarted())); - disconnect (this, TQT_SIGNAL (stopPlaying()), this, TQT_SLOT(processStopped())); + disconnect (this, TQ_SIGNAL(startPlaying()), this, TQ_SLOT(processStarted())); + disconnect (this, TQ_SIGNAL (stopPlaying()), this, TQ_SLOT(processStopped())); KMPlayer::ControlPanel * panel = m_app->view()->controlPanel (); - disconnect (panel->volumeBar (), TQT_SIGNAL (volumeChanged (int)), this, TQT_SLOT (volumeChanged (int))); - disconnect (panel->button (KMPlayer::ControlPanel::button_red), TQT_SIGNAL (clicked ()), this, TQT_SLOT (keyRed ())); - disconnect (panel->button (KMPlayer::ControlPanel::button_green), TQT_SIGNAL (clicked ()), this, TQT_SLOT (keyGreen ())); - disconnect (panel->button (KMPlayer::ControlPanel::button_yellow), TQT_SIGNAL (clicked ()), this, TQT_SLOT (keyYellow ())); - disconnect (panel->button (KMPlayer::ControlPanel::button_blue), TQT_SIGNAL (clicked ()), this, TQT_SLOT (keyBlue ())); + disconnect (panel->volumeBar (), TQ_SIGNAL (volumeChanged (int)), this, TQ_SLOT (volumeChanged (int))); + disconnect (panel->button (KMPlayer::ControlPanel::button_red), TQ_SIGNAL (clicked ()), this, TQ_SLOT (keyRed ())); + disconnect (panel->button (KMPlayer::ControlPanel::button_green), TQ_SIGNAL (clicked ()), this, TQ_SLOT (keyGreen ())); + disconnect (panel->button (KMPlayer::ControlPanel::button_yellow), TQ_SIGNAL (clicked ()), this, TQ_SLOT (keyYellow ())); + disconnect (panel->button (KMPlayer::ControlPanel::button_blue), TQ_SIGNAL (clicked ()), this, TQ_SLOT (keyBlue ())); } processStopped (); m_request_jump.truncate (0); @@ -240,29 +240,29 @@ KDE_NO_EXPORT void KMPlayerVDRSource::connected () { TDEAction * action = m_app->actionCollection ()->action ("vdr_connect"); action->setIcon (TQString ("connect_no")); action->setText (i18n ("Dis&connect")); - DEF_ACT (act_up, i18n ("VDR Key Up"), "go-up", , TQT_SLOT (keyUp ()), "vdr_key_up"); - DEF_ACT (act_down, i18n ("VDR Key Down"), "go-down", , TQT_SLOT (keyDown ()), "vdr_key_down"); - DEF_ACT (act_back, i18n ("VDR Key Back"), "back", , TQT_SLOT (keyBack ()), "vdr_key_back"); - DEF_ACT (act_ok, i18n ("VDR Key Ok"), "ok", , TQT_SLOT (keyOk ()), "vdr_key_ok"); - DEF_ACT (act_setup, i18n ("VDR Key Setup"), "configure", , TQT_SLOT (keySetup ()), "vdr_key_setup"); - DEF_ACT (act_channels, i18n ("VDR Key Channels"), "player_playlist", , TQT_SLOT (keyChannels ()), "vdr_key_channels"); - DEF_ACT (act_menu, i18n ("VDR Key Menu"), "showmenu", , TQT_SLOT (keyMenu ()), "vdr_key_menu"); - DEF_ACT (act_red, i18n ("VDR Key Red"), "red", , TQT_SLOT (keyRed ()), "vdr_key_red"); - DEF_ACT (act_green, i18n ("VDR Key Green"), "green", , TQT_SLOT (keyGreen ()), "vdr_key_green"); - DEF_ACT (act_yellow, i18n ("VDR Key Yellow"), "yellow", , TQT_SLOT (keyYellow ()), "vdr_key_yellow"); - DEF_ACT (act_blue, i18n ("VDR Key Blue"), "blue", , TQT_SLOT (keyBlue ()), "vdr_key_blue"); - DEF_ACT (act_custom, "VDR Custom Command", "application-x-executable", , TQT_SLOT (customCmd ()), "vdr_key_custom"); + DEF_ACT (act_up, i18n ("VDR Key Up"), "go-up", , TQ_SLOT (keyUp ()), "vdr_key_up"); + DEF_ACT (act_down, i18n ("VDR Key Down"), "go-down", , TQ_SLOT (keyDown ()), "vdr_key_down"); + DEF_ACT (act_back, i18n ("VDR Key Back"), "back", , TQ_SLOT (keyBack ()), "vdr_key_back"); + DEF_ACT (act_ok, i18n ("VDR Key Ok"), "ok", , TQ_SLOT (keyOk ()), "vdr_key_ok"); + DEF_ACT (act_setup, i18n ("VDR Key Setup"), "configure", , TQ_SLOT (keySetup ()), "vdr_key_setup"); + DEF_ACT (act_channels, i18n ("VDR Key Channels"), "player_playlist", , TQ_SLOT (keyChannels ()), "vdr_key_channels"); + DEF_ACT (act_menu, i18n ("VDR Key Menu"), "showmenu", , TQ_SLOT (keyMenu ()), "vdr_key_menu"); + DEF_ACT (act_red, i18n ("VDR Key Red"), "red", , TQ_SLOT (keyRed ()), "vdr_key_red"); + DEF_ACT (act_green, i18n ("VDR Key Green"), "green", , TQ_SLOT (keyGreen ()), "vdr_key_green"); + DEF_ACT (act_yellow, i18n ("VDR Key Yellow"), "yellow", , TQ_SLOT (keyYellow ()), "vdr_key_yellow"); + DEF_ACT (act_blue, i18n ("VDR Key Blue"), "blue", , TQ_SLOT (keyBlue ()), "vdr_key_blue"); + DEF_ACT (act_custom, "VDR Custom Command", "application-x-executable", , TQ_SLOT (customCmd ()), "vdr_key_custom"); m_app->initMenu (); // update menu and toolbar - DEF_ACT (act_0, i18n ("VDR Key 0"), "0", TQt::Key_0, TQT_SLOT (key0 ()), "vdr_key_0"); - DEF_ACT (act_1, i18n ("VDR Key 1"), "1", TQt::Key_1, TQT_SLOT (key1 ()), "vdr_key_1"); - DEF_ACT (act_2, i18n ("VDR Key 2"), "2", TQt::Key_2, TQT_SLOT (key2 ()), "vdr_key_2"); - DEF_ACT (act_3, i18n ("VDR Key 3"), "3", TQt::Key_3, TQT_SLOT (key3 ()), "vdr_key_3"); - DEF_ACT (act_4, i18n ("VDR Key 4"), "4", TQt::Key_4, TQT_SLOT (key4 ()), "vdr_key_4"); - DEF_ACT (act_5, i18n ("VDR Key 5"), "5", TQt::Key_5, TQT_SLOT (key5 ()), "vdr_key_5"); - DEF_ACT (act_6, i18n ("VDR Key 6"), "6", TQt::Key_6, TQT_SLOT (key6 ()), "vdr_key_6"); - DEF_ACT (act_7, i18n ("VDR Key 7"), "7", TQt::Key_7, TQT_SLOT (key7 ()), "vdr_key_7"); - DEF_ACT (act_8, i18n ("VDR Key 8"), "8", TQt::Key_8, TQT_SLOT (key8 ()), "vdr_key_8"); - DEF_ACT (act_9, i18n ("VDR Key 9"), "9", TQt::Key_9, TQT_SLOT (key9 ()), "vdr_key_9"); + DEF_ACT (act_0, i18n ("VDR Key 0"), "0", TQt::Key_0, TQ_SLOT (key0 ()), "vdr_key_0"); + DEF_ACT (act_1, i18n ("VDR Key 1"), "1", TQt::Key_1, TQ_SLOT (key1 ()), "vdr_key_1"); + DEF_ACT (act_2, i18n ("VDR Key 2"), "2", TQt::Key_2, TQ_SLOT (key2 ()), "vdr_key_2"); + DEF_ACT (act_3, i18n ("VDR Key 3"), "3", TQt::Key_3, TQ_SLOT (key3 ()), "vdr_key_3"); + DEF_ACT (act_4, i18n ("VDR Key 4"), "4", TQt::Key_4, TQ_SLOT (key4 ()), "vdr_key_4"); + DEF_ACT (act_5, i18n ("VDR Key 5"), "5", TQt::Key_5, TQ_SLOT (key5 ()), "vdr_key_5"); + DEF_ACT (act_6, i18n ("VDR Key 6"), "6", TQt::Key_6, TQ_SLOT (key6 ()), "vdr_key_6"); + DEF_ACT (act_7, i18n ("VDR Key 7"), "7", TQt::Key_7, TQ_SLOT (key7 ()), "vdr_key_7"); + DEF_ACT (act_8, i18n ("VDR Key 8"), "8", TQt::Key_8, TQ_SLOT (key8 ()), "vdr_key_8"); + DEF_ACT (act_9, i18n ("VDR Key 9"), "9", TQt::Key_9, TQ_SLOT (key9 ()), "vdr_key_9"); //KMPlayer::ViewLayer * layer = m_app->view ()->viewArea (); for (int i = 0; i < int (act_last); ++i) // somehow, the configured shortcuts only show up after createGUI() call @@ -710,13 +710,13 @@ KDE_NO_EXPORT void KMPlayerVDRSource::sync (bool fromUI) { } } } else // wait for showEvent - connect (xvideo, TQT_SIGNAL (configReceived()), this, TQT_SLOT (configReceived())); + connect (xvideo, TQ_SIGNAL (configReceived()), this, TQ_SLOT (configReceived())); } } KDE_NO_EXPORT void KMPlayerVDRSource::configReceived () { XVideo * xvideo = static_cast(m_player->players()["xvideo"]); - disconnect (xvideo, TQT_SIGNAL (configReceived()), this, TQT_SLOT (configReceived())); + disconnect (xvideo, TQ_SIGNAL (configReceived()), this, TQ_SLOT (configReceived())); sync (false); } diff --git a/src/kmplayerview.cpp b/src/kmplayerview.cpp index caca084..ecad4bb 100644 --- a/src/kmplayerview.cpp +++ b/src/kmplayerview.cpp @@ -362,7 +362,7 @@ KDE_NO_EXPORT void View::updateVolume () { TQLabel * mixer_label = new TQLabel (i18n ("Volume:"), m_control_panel->popupMenu ()); m_control_panel->popupMenu ()->insertItem (mixer_label, -1, 4); m_volume_slider = new TQSlider (0, 100, 10, volume, TQt::Horizontal, m_control_panel->popupMenu ()); - connect(m_volume_slider, TQT_SIGNAL(valueChanged(int)), this,TQT_SLOT(setVolume(int))); + connect(m_volume_slider, TQ_SIGNAL(valueChanged(int)), this,TQ_SLOT(setVolume(int))); m_control_panel->popupMenu ()->insertItem (m_volume_slider, ControlPanel::menu_volume, 5); m_control_panel->popupMenu ()->insertSeparator (6); } else { @@ -656,7 +656,7 @@ bool View::x11Event (XEvent * e) { case MapNotify: if (e->xmap.event == m_viewer->embeddedWinId ()) { show (); - TQTimer::singleShot (10, m_viewer, TQT_SLOT (sendConfigureEvent ())); + TQTimer::singleShot (10, m_viewer, TQ_SLOT (sendConfigureEvent ())); } break; /*case ConfigureNotify: diff --git a/src/playlistview.cpp b/src/playlistview.cpp index 1cd1568..95b0c85 100644 --- a/src/playlistview.cpp +++ b/src/playlistview.cpp @@ -134,18 +134,18 @@ KDE_NO_CDTOR_EXPORT PlayListView::PlayListView (TQWidget * parent, View * view, menu_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("player_playlist"), TDEIcon::Small); config_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("configure"), TDEIcon::Small); url_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("www"), TDEIcon::Small); - m_find = KStdAction::find (this, TQT_SLOT (slotFind ()), ac, "find"); - m_find_next = KStdAction::findNext (this, TQT_SLOT(slotFindNext()), ac, "next"); + m_find = KStdAction::find (this, TQ_SLOT (slotFind ()), ac, "find"); + m_find_next = KStdAction::findNext (this, TQ_SLOT(slotFindNext()), ac, "next"); m_find_next->setEnabled (false); - connect (this, TQT_SIGNAL (contextMenuRequested (TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT (contextMenuItem (TQListViewItem *, const TQPoint &, int))); - connect (this, TQT_SIGNAL (expanded (TQListViewItem *)), - this, TQT_SLOT (itemExpanded (TQListViewItem *))); - connect (this, TQT_SIGNAL (dropped (TQDropEvent *, TQListViewItem *)), - this, TQT_SLOT (itemDropped (TQDropEvent *, TQListViewItem *))); - connect (this, TQT_SIGNAL (itemRenamed (TQListViewItem *)), - this, TQT_SLOT (itemIsRenamed (TQListViewItem *))); - connect (this, TQT_SIGNAL (selectionChanged (TQListViewItem *)), - this, TQT_SLOT (itemIsSelected (TQListViewItem *))); + connect (this, TQ_SIGNAL (contextMenuRequested (TQListViewItem *, const TQPoint &, int)), this, TQ_SLOT (contextMenuItem (TQListViewItem *, const TQPoint &, int))); + connect (this, TQ_SIGNAL (expanded (TQListViewItem *)), + this, TQ_SLOT (itemExpanded (TQListViewItem *))); + connect (this, TQ_SIGNAL (dropped (TQDropEvent *, TQListViewItem *)), + this, TQ_SLOT (itemDropped (TQDropEvent *, TQListViewItem *))); + connect (this, TQ_SIGNAL (itemRenamed (TQListViewItem *)), + this, TQ_SLOT (itemIsRenamed (TQListViewItem *))); + connect (this, TQ_SIGNAL (selectionChanged (TQListViewItem *)), + this, TQ_SLOT (itemIsSelected (TQListViewItem *))); } KDE_NO_CDTOR_EXPORT PlayListView::~PlayListView () { @@ -277,7 +277,7 @@ void PlayListView::updateTree (int id, NodePtr root, NodePtr active, bool need_timer = !tree_update; tree_update = new TreeUpdate (ritem, active, select, open, tree_update); if (need_timer) - TQTimer::singleShot (0, this, TQT_SLOT (updateTrees ())); + TQTimer::singleShot (0, this, TQ_SLOT (updateTrees ())); } KDE_NO_EXPORT void PlayListView::updateTrees () { @@ -353,7 +353,7 @@ KDE_NO_EXPORT void PlayListView::contextMenuItem (TQListViewItem * vi, const TQP m_itemmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("edit-copy"), TDEIcon::Small, 0, true), i18n ("&Copy to Clipboard"), - this, TQT_SLOT (copyToClipboard ()), 0, 0); + this, TQ_SLOT (copyToClipboard ()), 0, 0); if (item->m_attr || (item->node && (item->node->isPlayable () || item->node->isDocument ()) && @@ -361,10 +361,10 @@ KDE_NO_EXPORT void PlayListView::contextMenuItem (TQListViewItem * vi, const TQP m_itemmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("bookmark_add"), TDEIcon::Small, 0, true), i18n ("&Add Bookmark"), - this, TQT_SLOT (addBookMark ()), 0, 1); + this, TQ_SLOT (addBookMark ()), 0, 1); if (ritem->have_dark_nodes) { m_itemmenu->insertItem (i18n ("&Show all"), - this, TQT_SLOT (toggleShowAllNodes ()), 0, 2); + this, TQ_SLOT (toggleShowAllNodes ()), 0, 2); m_itemmenu->setItemChecked (2, ritem->show_all_nodes); } m_itemmenu->insertSeparator (); @@ -555,7 +555,7 @@ KDE_NO_EXPORT void PlayListView::slotFind () { if (!m_find_dialog) { m_find_dialog = new KFindDialog (false, this, "kde_kmplayer_find", KFindDialog::CaseSensitive); m_find_dialog->setHasSelection (false); - connect(m_find_dialog, TQT_SIGNAL(okClicked ()), this, TQT_SLOT(slotFindOk ())); + connect(m_find_dialog, TQ_SIGNAL(okClicked ()), this, TQ_SLOT(slotFindOk ())); } else m_find_dialog->setPattern (TQString ()); m_find_dialog->show (); diff --git a/src/pref.cpp b/src/pref.cpp index 5561bd4..fd030e6 100644 --- a/src/pref.cpp +++ b/src/pref.cpp @@ -132,7 +132,7 @@ KDE_NO_CDTOR_EXPORT Preferences::Preferences(PartBase * player, Settings * setti addPrefPage (p); - connect (this, TQT_SIGNAL (defaultClicked ()), TQT_SLOT (confirmDefaults ())); + connect (this, TQ_SIGNAL (defaultClicked ()), TQ_SLOT (confirmDefaults ())); } KDE_NO_EXPORT void Preferences::setPage (const char * name) { @@ -277,24 +277,24 @@ KDE_NO_CDTOR_EXPORT PrefGeneralPageLooks::PrefGeneralPageLooks (TQWidget *parent for (int i = 0; i < int (ColorSetting::last_target); i++) colorscombo->insertItem (colors[i].title); colorscombo->setCurrentItem (0); - connect (colorscombo, TQT_SIGNAL (activated (int)), - this, TQT_SLOT (colorItemChanged(int))); + connect (colorscombo, TQ_SIGNAL (activated (int)), + this, TQ_SLOT (colorItemChanged(int))); colorbutton = new KColorButton (colorbox); colorbutton->setColor (colors[0].color); - connect (colorbutton, TQT_SIGNAL (changed (const TQColor &)), - this, TQT_SLOT (colorCanged (const TQColor &))); + connect (colorbutton, TQ_SIGNAL (changed (const TQColor &)), + this, TQ_SLOT (colorCanged (const TQColor &))); TQGroupBox *fontbox = new TQGroupBox (2,TQt::Horizontal, i18n ("Fonts"), this); fontscombo = new TQComboBox (fontbox); for (int i = 0; i < int (FontSetting::last_target); i++) fontscombo->insertItem (fonts[i].title); fontscombo->setCurrentItem (0); - connect (fontscombo, TQT_SIGNAL (activated (int)), - this, TQT_SLOT (fontItemChanged(int))); + connect (fontscombo, TQ_SIGNAL (activated (int)), + this, TQ_SLOT (fontItemChanged(int))); fontbutton = new TQPushButton (i18n ("AaBbCc"), fontbox); fontbutton->setFlat (true); fontbutton->setFont (fonts[0].font); - connect (fontbutton, TQT_SIGNAL (clicked ()), this, TQT_SLOT (fontClicked ())); + connect (fontbutton, TQ_SIGNAL (clicked ()), this, TQ_SLOT (fontClicked ())); layout->addWidget (colorbox); layout->addWidget (fontbox); @@ -381,10 +381,10 @@ KDE_NO_CDTOR_EXPORT PrefSourcePageURL::PrefSourcePageURL (TQWidget *parent) layout->addLayout (gridlayout); layout->addWidget (cbox); layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); - connect (urllist, TQT_SIGNAL(textChanged (const TQString &)), - this, TQT_SLOT (slotTextChanged (const TQString &))); - connect (sub_urllist, TQT_SIGNAL(textChanged (const TQString &)), - this, TQT_SLOT (slotTextChanged (const TQString &))); + connect (urllist, TQ_SIGNAL(textChanged (const TQString &)), + this, TQ_SLOT (slotTextChanged (const TQString &))); + connect (sub_urllist, TQ_SIGNAL(textChanged (const TQString &)), + this, TQ_SLOT (slotTextChanged (const TQString &))); } KDE_NO_EXPORT void PrefSourcePageURL::slotBrowse () { @@ -403,7 +403,7 @@ KDE_NO_CDTOR_EXPORT PrefRecordPage::PrefRecordPage (TQWidget *parent, PartBase * urllayout->addWidget (urlLabel); urllayout->addWidget (url); recordButton = new TQPushButton (i18n ("Start &Recording"), this); - connect (recordButton, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotRecord ())); + connect (recordButton, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotRecord ())); TQHBoxLayout *buttonlayout = new TQHBoxLayout; buttonlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum)); buttonlayout->addWidget (recordButton); @@ -434,9 +434,9 @@ KDE_NO_CDTOR_EXPORT PrefRecordPage::PrefRecordPage (TQWidget *parent, PartBase * layout->addItem (new TQSpacerItem (5, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum)); layout->addLayout (buttonlayout); layout->addItem (new TQSpacerItem (5, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); - connect (m_player, TQT_SIGNAL (sourceChanged(KMPlayer::Source*,KMPlayer::Source*)), this, TQT_SLOT (sourceChanged(KMPlayer::Source*,KMPlayer::Source*))); - connect (recorder, TQT_SIGNAL (clicked(int)), this, TQT_SLOT(recorderClicked(int))); - connect (replay, TQT_SIGNAL (clicked (int)), this, TQT_SLOT (replayClicked (int))); + connect (m_player, TQ_SIGNAL (sourceChanged(KMPlayer::Source*,KMPlayer::Source*)), this, TQ_SLOT (sourceChanged(KMPlayer::Source*,KMPlayer::Source*))); + connect (recorder, TQ_SIGNAL (clicked(int)), this, TQ_SLOT(recorderClicked(int))); + connect (replay, TQ_SIGNAL (clicked (int)), this, TQ_SLOT (replayClicked (int))); } KDE_NO_EXPORT void PrefRecordPage::recordingStarted () { @@ -448,15 +448,15 @@ KDE_NO_EXPORT void PrefRecordPage::recordingStarted () { KDE_NO_EXPORT void PrefRecordPage::recordingFinished () { recordButton->setText (i18n ("Start Recording")); url->setEnabled (true); - TQTimer::singleShot (0, m_player, TQT_SLOT(recordingStopped())); // removed from PartBase::setSource because PartBase::recordingStopped calls openURL and that will call PartBase::setSource and TQt doesn't like disconnecting/connecting a signal that is current + TQTimer::singleShot (0, m_player, TQ_SLOT(recordingStopped())); // removed from PartBase::setSource because PartBase::recordingStopped calls openURL and that will call PartBase::setSource and TQt doesn't like disconnecting/connecting a signal that is current } KDE_NO_EXPORT void PrefRecordPage::sourceChanged (Source * olds, Source * nws) { int id = 0; int nr_recs = 0; if (olds) { - disconnect(nws,TQT_SIGNAL(startRecording()),this, TQT_SLOT(recordingStarted())); - disconnect(nws,TQT_SIGNAL(stopRecording()),this, TQT_SLOT(recordingFinished())); + disconnect(nws,TQ_SIGNAL(startRecording()),this, TQ_SLOT(recordingStarted())); + disconnect(nws,TQ_SIGNAL(stopRecording()),this, TQ_SLOT(recordingFinished())); } if (nws) { for (RecorderPage * p = m_recorders; p; p = p->next, ++id) { @@ -466,8 +466,8 @@ KDE_NO_EXPORT void PrefRecordPage::sourceChanged (Source * olds, Source * nws) { if (b) nr_recs++; } source->setText (i18n ("Current Source: ") + nws->prettyName ()); - connect (nws, TQT_SIGNAL(startRecording()), this, TQT_SLOT(recordingStarted())); - connect (nws, TQT_SIGNAL(stopRecording()), this, TQT_SLOT(recordingFinished())); + connect (nws, TQ_SIGNAL(startRecording()), this, TQ_SLOT(recordingStarted())); + connect (nws, TQ_SIGNAL(stopRecording()), this, TQ_SLOT(recordingFinished())); } recordButton->setEnabled (nr_recs > 0); } @@ -490,8 +490,8 @@ KDE_NO_EXPORT void PrefRecordPage::replayClicked (int id) { } KDE_NO_EXPORT void PrefRecordPage::slotRecord () { - connect (m_player->source (), TQT_SIGNAL (stopPlaying ()), - this, TQT_SLOT (playingStopped ())); + connect (m_player->source (), TQ_SIGNAL (stopPlaying ()), + this, TQ_SLOT (playingStopped ())); if (m_player->process () && m_player->process ()->playing ()) m_player->process ()->quit (); else @@ -499,8 +499,8 @@ KDE_NO_EXPORT void PrefRecordPage::slotRecord () { } KDE_NO_EXPORT void PrefRecordPage::playingStopped () { - disconnect (m_player->source (), TQT_SIGNAL (stopPlaying ()), - this, TQT_SLOT (playingStopped ())); + disconnect (m_player->source (), TQ_SIGNAL (stopPlaying ()), + this, TQ_SLOT (playingStopped ())); if (!url->lineEdit()->text().isEmpty()) { m_player->settings ()->recordfile = url->lineEdit()->text(); m_player->settings ()->replaytime = replaytime->text ().toInt (); @@ -553,7 +553,7 @@ KDE_NO_CDTOR_EXPORT PrefMEncoderPage::PrefMEncoderPage (TQWidget *parent, PartBa gridlayout->addWidget (arguments, 0, 1); layout->addWidget (format); layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); - connect (format, TQT_SIGNAL (clicked (int)), this, TQT_SLOT (formatClicked (int))); + connect (format, TQ_SIGNAL (clicked (int)), this, TQ_SLOT (formatClicked (int))); } KDE_NO_EXPORT void PrefMEncoderPage::formatClicked (int id) { @@ -806,17 +806,17 @@ KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : T tabLayout->addWidget( PostprocessingOptions/*, 1, 0*/ ); PostprocessingOptions->setEnabled(false); - connect( customPreset, TQT_SIGNAL (toggled(bool) ), customFilters, TQT_SLOT(setEnabled(bool))); - connect( postProcessing, TQT_SIGNAL( toggled(bool) ), PostprocessingOptions, TQT_SLOT( setEnabled(bool) ) ); - connect( HzDeblockFilter, TQT_SIGNAL( toggled(bool) ), HzDeblockAQuality, TQT_SLOT( setEnabled(bool) ) ); - connect( HzDeblockFilter, TQT_SIGNAL( toggled(bool) ), HzDeblockCFiltering, TQT_SLOT( setEnabled(bool) ) ); - connect( VtDeblockFilter, TQT_SIGNAL( toggled(bool) ), VtDeblockCFiltering, TQT_SLOT( setEnabled(bool) ) ); - connect( VtDeblockFilter, TQT_SIGNAL( toggled(bool) ), VtDeblockAQuality, TQT_SLOT( setEnabled(bool) ) ); - connect( DeringFilter, TQT_SIGNAL( toggled(bool) ), DeringAQuality, TQT_SLOT( setEnabled(bool) ) ); - connect( DeringFilter, TQT_SIGNAL( toggled(bool) ), DeringCFiltering, TQT_SLOT( setEnabled(bool) ) ); - //connect( TmpNoiseFilter, TQT_SIGNAL( toggled(bool) ), TmpNoiseSlider, TQT_SLOT( setEnabled(bool) ) ); - - connect( AutolevelsFilter, TQT_SIGNAL( toggled(bool) ), AutolevelsFullrange, TQT_SLOT( setEnabled(bool) ) ); + connect( customPreset, TQ_SIGNAL (toggled(bool) ), customFilters, TQ_SLOT(setEnabled(bool))); + connect( postProcessing, TQ_SIGNAL( toggled(bool) ), PostprocessingOptions, TQ_SLOT( setEnabled(bool) ) ); + connect( HzDeblockFilter, TQ_SIGNAL( toggled(bool) ), HzDeblockAQuality, TQ_SLOT( setEnabled(bool) ) ); + connect( HzDeblockFilter, TQ_SIGNAL( toggled(bool) ), HzDeblockCFiltering, TQ_SLOT( setEnabled(bool) ) ); + connect( VtDeblockFilter, TQ_SIGNAL( toggled(bool) ), VtDeblockCFiltering, TQ_SLOT( setEnabled(bool) ) ); + connect( VtDeblockFilter, TQ_SIGNAL( toggled(bool) ), VtDeblockAQuality, TQ_SLOT( setEnabled(bool) ) ); + connect( DeringFilter, TQ_SIGNAL( toggled(bool) ), DeringAQuality, TQ_SLOT( setEnabled(bool) ) ); + connect( DeringFilter, TQ_SIGNAL( toggled(bool) ), DeringCFiltering, TQ_SLOT( setEnabled(bool) ) ); + //connect( TmpNoiseFilter, TQ_SIGNAL( toggled(bool) ), TmpNoiseSlider, TQ_SLOT( setEnabled(bool) ) ); + + connect( AutolevelsFilter, TQ_SIGNAL( toggled(bool) ), AutolevelsFullrange, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( defaultPreset, i18n( "Enable mplayer's default postprocessing filters" ) ); TQWhatsThis::add( customPreset, i18n( "Enable custom postprocessing filters (See: Custom preset -tab)" ) ); diff --git a/src/viewarea.cpp b/src/viewarea.cpp index 051c3ea..c76af9b 100644 --- a/src/viewarea.cpp +++ b/src/viewarea.cpp @@ -1353,7 +1353,7 @@ KDE_NO_CDTOR_EXPORT ViewArea::ViewArea (TQWidget * parent, View * view) m_minimal (false) { setEraseColor (TQColor (0, 0, 0)); setAcceptDrops (true); - new TDEAction (i18n ("Fullscreen"), TDEShortcut (TQt::Key_F), this, TQT_SLOT (accelActivated ()), m_collection, "view_fullscreen_toggle"); + new TDEAction (i18n ("Fullscreen"), TDEShortcut (TQt::Key_F), this, TQ_SLOT (accelActivated ()), m_collection, "view_fullscreen_toggle"); setMouseTracking (true); if (!image_data_map) imageCacheDeleter.setObject (image_data_map, new ImageDataMap); @@ -1387,7 +1387,7 @@ KDE_NO_EXPORT void ViewArea::fullScreen () { TQLabel * lbl = new TQLabel (i18n ("Scale:"), menu); scale_lbl_id = menu->insertItem (lbl, -1, 4); TQSlider * slider = new TQSlider (50, 150, 10, m_fullscreen_scale, TQt::Horizontal, menu); - connect (slider, TQT_SIGNAL (valueChanged (int)), this, TQT_SLOT (scale (int))); + connect (slider, TQ_SIGNAL (valueChanged (int)), this, TQ_SLOT (scale (int))); scale_slider_id = menu->insertItem (slider, -1, 5); m_view->controlPanel ()->button (ControlPanel::button_playlist)->setIconSet (TQIconSet (TQPixmap (normal_window_xpm))); } diff --git a/src/xineplayer.cpp b/src/xineplayer.cpp index 5dad3f2..cae0637 100644 --- a/src/xineplayer.cpp +++ b/src/xineplayer.cpp @@ -289,7 +289,7 @@ void Backend::play (int repeat_count) { } void Backend::stop () { - TQTimer::singleShot (0, xineapp, TQT_SLOT (stop ())); + TQTimer::singleShot (0, xineapp, TQ_SLOT (stop ())); } void Backend::pause () { @@ -337,7 +337,7 @@ void Backend::quit () { if (running) stop (); else - TQTimer::singleShot (0, tqApp, TQT_SLOT (quit ())); + TQTimer::singleShot (0, tqApp, TQ_SLOT (quit ())); } bool updateConfigEntry (const TQString & name, const TQString & value) { @@ -441,7 +441,7 @@ void KXinePlayer::init () { options[i+1] = 0L; xine_config_register_enum (xine, "audio.visualization", 0, (char ** ) options, 0L, 0L, 0, xine_config_cb, 0L); if (!callback) - TQTimer::singleShot (10, this, TQT_SLOT (play ())); + TQTimer::singleShot (10, this, TQ_SLOT (play ())); } KXinePlayer::~KXinePlayer () { @@ -613,7 +613,7 @@ void KXinePlayer::stop () { xine_stop (sub_stream); xine_stop (stream); mutex.unlock (); - TQTimer::singleShot (10, this, TQT_SLOT (postFinished ())); + TQTimer::singleShot (10, this, TQ_SLOT (postFinished ())); } void KXinePlayer::postFinished () { @@ -633,7 +633,7 @@ void KXinePlayer::pause () { } void KXinePlayer::finished () { - TQTimer::singleShot (10, this, TQT_SLOT (stop ())); + TQTimer::singleShot (10, this, TQ_SLOT (stop ())); } void KXinePlayer::setAudioLang (int id, const TQString & al) { @@ -662,7 +662,7 @@ void KXinePlayer::updatePosition () { movie_pos = pos; callback->moviePosition (pos/100); } - TQTimer::singleShot (500, this, TQT_SLOT (updatePosition ())); + TQTimer::singleShot (500, this, TQ_SLOT (updatePosition ())); } void KXinePlayer::saturation (int val) { @@ -748,7 +748,7 @@ bool KXinePlayer::event (TQEvent * e) { if (callback) callback->finished (); else - TQTimer::singleShot (0, this, TQT_SLOT (quit ())); + TQTimer::singleShot (0, this, TQ_SLOT (quit ())); break; } case event_size: { @@ -758,7 +758,7 @@ bool KXinePlayer::event (TQEvent * e) { callback->movieParams (se->length/100, se->width, se->height, se->height ? 1.0*se->width/se->height : 1.0, se->alang, se->slang); if (se->first_frame) { callback->playing (); - TQTimer::singleShot (500, this, TQT_SLOT (updatePosition ())); + TQTimer::singleShot (500, this, TQ_SLOT (updatePosition ())); } } break; diff --git a/src/xvplayer.cpp b/src/xvplayer.cpp index 4f61fc1..f10c9bd 100644 --- a/src/xvplayer.cpp +++ b/src/xvplayer.cpp @@ -129,7 +129,7 @@ void Backend::play (int) { } void Backend::stop () { - TQTimer::singleShot (0, xvapp, TQT_SLOT (stop ())); + TQTimer::singleShot (0, xvapp, TQ_SLOT (stop ())); } void Backend::pause () { @@ -179,7 +179,7 @@ void Backend::quit () { if (running) stop (); else - TQTimer::singleShot (0, tqApp, TQT_SLOT (quit ())); + TQTimer::singleShot (0, tqApp, TQ_SLOT (quit ())); } bool updateConfigEntry (const TQString & name, const TQString & value) { @@ -226,7 +226,7 @@ void KXVideoPlayer::init () { wid = XCreateSimpleWindow(display, XDefaultRootWindow(display), xpos, ypos, width, height, 1, 0, 0); if (!callback) - TQTimer::singleShot (10, this, TQT_SLOT (play ())); + TQTimer::singleShot (10, this, TQ_SLOT (play ())); XSelectInput (display, wid, (PointerMotionMask | ExposureMask | KeyPressMask | ButtonPressMask | StructureNotifyMask)); // | SubstructureNotifyMask)); XvAdaptorInfo * ai; @@ -435,11 +435,11 @@ void KXVideoPlayer::stop () { if (callback) callback->finished (); else - TQTimer::singleShot (0, tqApp, TQT_SLOT (quit ())); + TQTimer::singleShot (0, tqApp, TQ_SLOT (quit ())); } void KXVideoPlayer::finished () { - TQTimer::singleShot (10, this, TQT_SLOT (stop ())); + TQTimer::singleShot (10, this, TQ_SLOT (stop ())); } void KXVideoPlayer::saturation (int val) {