diff options
| -rw-r--r-- | kplayer/kplayer.cpp | 204 | ||||
| -rw-r--r-- | kplayer/kplayeractionlist.cpp | 8 | ||||
| -rw-r--r-- | kplayer/kplayerengine.cpp | 154 | ||||
| -rw-r--r-- | kplayer/kplayerlogwindow.cpp | 8 | ||||
| -rw-r--r-- | kplayer/kplayernode.cpp | 66 | ||||
| -rw-r--r-- | kplayer/kplayernodeaction.cpp | 34 | ||||
| -rw-r--r-- | kplayer/kplayernodeview.cpp | 178 | ||||
| -rw-r--r-- | kplayer/kplayerpart.cpp | 8 | ||||
| -rw-r--r-- | kplayer/kplayerplaylist.cpp | 44 | ||||
| -rw-r--r-- | kplayer/kplayerprocess.cpp | 36 | ||||
| -rw-r--r-- | kplayer/kplayerpropertiesdialog.cpp | 2 | ||||
| -rw-r--r-- | kplayer/kplayersettingsdialog.cpp | 14 | ||||
| -rw-r--r-- | kplayer/kplayerslideraction.cpp | 10 | ||||
| -rw-r--r-- | kplayer/kplayersource.cpp | 30 | ||||
| -rw-r--r-- | kplayer/kplayerwidget.cpp | 10 |
15 files changed, 403 insertions, 403 deletions
diff --git a/kplayer/kplayer.cpp b/kplayer/kplayer.cpp index dc0f8d9..2f46097 100644 --- a/kplayer/kplayer.cpp +++ b/kplayer/kplayer.cpp @@ -441,90 +441,90 @@ KPlayer::KPlayer (TQWidget *parent, const char *name) : TDEMainWindow (parent, n i18n("Saturation toolbar has a saturation slider that shows the current video saturation and allows you to change it. This is the same slider you get from the saturation pop-up slider button on the main toolbar, but it will not disappear when you click elsewhere. You can show or hide the toolbar using the Show Saturation Toolbar option on the Settings menu. Clicking the Saturation button on this toolbar will also hide it.") }; KPlayerEngine::initialize (actionCollection(), this, 0, kapp -> config()); - connect (engine(), SIGNAL (windowStateChanged (uint)), SLOT (windowStateChanged (uint))); - connect (engine(), SIGNAL (syncronize (bool)), SLOT (syncronize (bool))); - connect (engine(), SIGNAL (zoom()), SLOT (zoom())); - connect (engine(), SIGNAL (correctSize()), SLOT (correctSize())); - connect (engine(), SIGNAL (initialSize()), SLOT (initialSize())); - connect (engine() -> videoActionList(), SIGNAL (updating (KPlayerActionList*)), - SLOT (actionListUpdating (KPlayerActionList*))); - connect (engine() -> videoActionList(), SIGNAL (updated (KPlayerActionList*)), - SLOT (actionListUpdated (KPlayerActionList*))); - connect (engine() -> audioActionList(), SIGNAL (updating (KPlayerActionList*)), - SLOT (actionListUpdating (KPlayerActionList*))); - connect (engine() -> audioActionList(), SIGNAL (updated (KPlayerActionList*)), - SLOT (actionListUpdated (KPlayerActionList*))); - connect (engine() -> subtitleActionList(), SIGNAL (updating (KPlayerActionList*)), - SLOT (actionListUpdating (KPlayerActionList*))); - connect (engine() -> subtitleActionList(), SIGNAL (updated (KPlayerActionList*)), - SLOT (actionListUpdated (KPlayerActionList*))); + connect (engine(), TQ_SIGNAL (windowStateChanged (uint)), TQ_SLOT (windowStateChanged (uint))); + connect (engine(), TQ_SIGNAL (syncronize (bool)), TQ_SLOT (syncronize (bool))); + connect (engine(), TQ_SIGNAL (zoom()), TQ_SLOT (zoom())); + connect (engine(), TQ_SIGNAL (correctSize()), TQ_SLOT (correctSize())); + connect (engine(), TQ_SIGNAL (initialSize()), TQ_SLOT (initialSize())); + connect (engine() -> videoActionList(), TQ_SIGNAL (updating (KPlayerActionList*)), + TQ_SLOT (actionListUpdating (KPlayerActionList*))); + connect (engine() -> videoActionList(), TQ_SIGNAL (updated (KPlayerActionList*)), + TQ_SLOT (actionListUpdated (KPlayerActionList*))); + connect (engine() -> audioActionList(), TQ_SIGNAL (updating (KPlayerActionList*)), + TQ_SLOT (actionListUpdating (KPlayerActionList*))); + connect (engine() -> audioActionList(), TQ_SIGNAL (updated (KPlayerActionList*)), + TQ_SLOT (actionListUpdated (KPlayerActionList*))); + connect (engine() -> subtitleActionList(), TQ_SIGNAL (updating (KPlayerActionList*)), + TQ_SLOT (actionListUpdating (KPlayerActionList*))); + connect (engine() -> subtitleActionList(), TQ_SIGNAL (updated (KPlayerActionList*)), + TQ_SLOT (actionListUpdated (KPlayerActionList*))); TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); if ( args -> count() > 0 && (args -> isSet ("play") || args -> isSet ("play-next") || ! args -> isSet ("queue") && ! args -> isSet ("queue-next") && ! args -> isSet ("add-to-new-playlist") && ! args -> isSet ("add-to-playlists") && ! args -> isSet ("add-to-collection")) ) engine() -> clearStoreSections ("kplayer:/nowplaying"); m_log = new KPlayerLogWindow (actionCollection(), this); - connect (log(), SIGNAL (windowHidden()), SLOT (logWindowHidden())); - connect (action ("log_clear"), SIGNAL (activated()), SLOT (fileClearLog())); + connect (log(), TQ_SIGNAL (windowHidden()), TQ_SLOT (logWindowHidden())); + connect (action ("log_clear"), TQ_SIGNAL (activated()), TQ_SLOT (fileClearLog())); m_library = new KPlayerLibraryWindow (actionCollection(), this); - connect (library(), SIGNAL (windowHidden()), SLOT (libraryHidden())); - connect (library() -> library(), SIGNAL (makeVisible()), SLOT (makeLibraryVisible())); - connect (library() -> library(), SIGNAL (enableActionGroup (const TQString&, bool)), - SLOT (enableSubmenu (const TQString&, bool))); - connect (library() -> library() -> playlistActionList(), SIGNAL (updating (KPlayerActionList*)), - SLOT (actionListUpdating (KPlayerActionList*))); - connect (library() -> library() -> playlistActionList(), SIGNAL (updated (KPlayerActionList*)), - SLOT (actionListUpdated (KPlayerActionList*))); - connect (library() -> library() -> columnActionList(), SIGNAL (updating (KPlayerActionList*)), - SLOT (actionListUpdating (KPlayerActionList*))); - connect (library() -> library() -> columnActionList(), SIGNAL (updated (KPlayerActionList*)), - SLOT (libraryActionListUpdated (KPlayerActionList*))); - connect (library() -> library() -> editActionList(), SIGNAL (updating (KPlayerActionList*)), - SLOT (actionListUpdating (KPlayerActionList*))); - connect (library() -> library() -> editActionList(), SIGNAL (updated (KPlayerActionList*)), - SLOT (libraryActionListUpdated (KPlayerActionList*))); - connect (library() -> library() -> goToActionList(), SIGNAL (updating (KPlayerActionList*)), - SLOT (actionListUpdating (KPlayerActionList*))); - connect (library() -> library() -> goToActionList(), SIGNAL (updated (KPlayerActionList*)), - SLOT (actionListUpdated (KPlayerActionList*))); - connect (library() -> library() -> historyActionList(), SIGNAL (updating (KPlayerActionList*)), - SLOT (actionListUpdating (KPlayerActionList*))); - connect (library() -> library() -> historyActionList(), SIGNAL (updated (KPlayerActionList*)), - SLOT (actionListUpdated (KPlayerActionList*))); + connect (library(), TQ_SIGNAL (windowHidden()), TQ_SLOT (libraryHidden())); + connect (library() -> library(), TQ_SIGNAL (makeVisible()), TQ_SLOT (makeLibraryVisible())); + connect (library() -> library(), TQ_SIGNAL (enableActionGroup (const TQString&, bool)), + TQ_SLOT (enableSubmenu (const TQString&, bool))); + connect (library() -> library() -> playlistActionList(), TQ_SIGNAL (updating (KPlayerActionList*)), + TQ_SLOT (actionListUpdating (KPlayerActionList*))); + connect (library() -> library() -> playlistActionList(), TQ_SIGNAL (updated (KPlayerActionList*)), + TQ_SLOT (actionListUpdated (KPlayerActionList*))); + connect (library() -> library() -> columnActionList(), TQ_SIGNAL (updating (KPlayerActionList*)), + TQ_SLOT (actionListUpdating (KPlayerActionList*))); + connect (library() -> library() -> columnActionList(), TQ_SIGNAL (updated (KPlayerActionList*)), + TQ_SLOT (libraryActionListUpdated (KPlayerActionList*))); + connect (library() -> library() -> editActionList(), TQ_SIGNAL (updating (KPlayerActionList*)), + TQ_SLOT (actionListUpdating (KPlayerActionList*))); + connect (library() -> library() -> editActionList(), TQ_SIGNAL (updated (KPlayerActionList*)), + TQ_SLOT (libraryActionListUpdated (KPlayerActionList*))); + connect (library() -> library() -> goToActionList(), TQ_SIGNAL (updating (KPlayerActionList*)), + TQ_SLOT (actionListUpdating (KPlayerActionList*))); + connect (library() -> library() -> goToActionList(), TQ_SIGNAL (updated (KPlayerActionList*)), + TQ_SLOT (actionListUpdated (KPlayerActionList*))); + connect (library() -> library() -> historyActionList(), TQ_SIGNAL (updating (KPlayerActionList*)), + TQ_SLOT (actionListUpdating (KPlayerActionList*))); + connect (library() -> library() -> historyActionList(), TQ_SIGNAL (updated (KPlayerActionList*)), + TQ_SLOT (actionListUpdated (KPlayerActionList*))); m_playlist = new KPlayerPlaylist (actionCollection(), this); - connect (playlist(), SIGNAL (started()), SLOT (playlistStarted())); - connect (playlist(), SIGNAL (activated()), SLOT (playlistActivated())); - connect (playlist(), SIGNAL (stopped()), SLOT (playlistStopped())); - connect (playlist(), SIGNAL (enableActionGroup (const TQString&, bool)), SLOT (enableSubmenu (const TQString&, bool))); - connect (playlist() -> playlistActionList(), SIGNAL (updating (KPlayerActionList*)), - SLOT (actionListUpdating (KPlayerActionList*))); - connect (playlist() -> playlistActionList(), SIGNAL (updated (KPlayerActionList*)), - SLOT (actionListUpdated (KPlayerActionList*))); - connect (playlist() -> recentActionList(), SIGNAL (updating (KPlayerActionList*)), - SLOT (actionListUpdating (KPlayerActionList*))); - connect (playlist() -> recentActionList(), SIGNAL (updated (KPlayerActionList*)), - SLOT (actionListUpdated (KPlayerActionList*))); - connect (playlist() -> devicesActionList(), SIGNAL (updating (KPlayerActionList*)), - SLOT (actionListUpdating (KPlayerActionList*))); - connect (playlist() -> devicesActionList(), SIGNAL (updated (KPlayerActionList*)), - SLOT (actionListUpdated (KPlayerActionList*))); - connect (playlist() -> playlistAddActionList(), SIGNAL (updating (KPlayerActionList*)), - SLOT (actionListUpdating (KPlayerActionList*))); - connect (playlist() -> playlistAddActionList(), SIGNAL (updated (KPlayerActionList*)), - SLOT (actionListUpdated (KPlayerActionList*))); - connect (actionCollection(), SIGNAL (actionStatusText(const TQString&)), SLOT (setStatusMessage(const TQString&))); - connect (actionCollection(), SIGNAL (clearStatusText()), SLOT (clearStatusMessage())); + connect (playlist(), TQ_SIGNAL (started()), TQ_SLOT (playlistStarted())); + connect (playlist(), TQ_SIGNAL (activated()), TQ_SLOT (playlistActivated())); + connect (playlist(), TQ_SIGNAL (stopped()), TQ_SLOT (playlistStopped())); + connect (playlist(), TQ_SIGNAL (enableActionGroup (const TQString&, bool)), TQ_SLOT (enableSubmenu (const TQString&, bool))); + connect (playlist() -> playlistActionList(), TQ_SIGNAL (updating (KPlayerActionList*)), + TQ_SLOT (actionListUpdating (KPlayerActionList*))); + connect (playlist() -> playlistActionList(), TQ_SIGNAL (updated (KPlayerActionList*)), + TQ_SLOT (actionListUpdated (KPlayerActionList*))); + connect (playlist() -> recentActionList(), TQ_SIGNAL (updating (KPlayerActionList*)), + TQ_SLOT (actionListUpdating (KPlayerActionList*))); + connect (playlist() -> recentActionList(), TQ_SIGNAL (updated (KPlayerActionList*)), + TQ_SLOT (actionListUpdated (KPlayerActionList*))); + connect (playlist() -> devicesActionList(), TQ_SIGNAL (updating (KPlayerActionList*)), + TQ_SLOT (actionListUpdating (KPlayerActionList*))); + connect (playlist() -> devicesActionList(), TQ_SIGNAL (updated (KPlayerActionList*)), + TQ_SLOT (actionListUpdated (KPlayerActionList*))); + connect (playlist() -> playlistAddActionList(), TQ_SIGNAL (updating (KPlayerActionList*)), + TQ_SLOT (actionListUpdating (KPlayerActionList*))); + connect (playlist() -> playlistAddActionList(), TQ_SIGNAL (updated (KPlayerActionList*)), + TQ_SLOT (actionListUpdated (KPlayerActionList*))); + connect (actionCollection(), TQ_SIGNAL (actionStatusText(const TQString&)), TQ_SLOT (setStatusMessage(const TQString&))); + connect (actionCollection(), TQ_SIGNAL (clearStatusText()), TQ_SLOT (clearStatusMessage())); actionCollection() -> setHighlightingEnabled (true); - connect (process(), SIGNAL (stateChanged(KPlayerProcess::State, KPlayerProcess::State)), - SLOT (playerStateChanged(KPlayerProcess::State, KPlayerProcess::State))); - connect (process(), SIGNAL (progressChanged(float, KPlayerProcess::ProgressType)), - SLOT (playerProgressChanged(float, KPlayerProcess::ProgressType))); - connect (process(), SIGNAL (infoAvailable()), SLOT (playerInfoAvailable())); - connect (process(), SIGNAL (sizeAvailable()), SLOT (playerSizeAvailable())); - connect (process(), SIGNAL (messageReceived (TQString)), SLOT (playerMessageReceived (TQString))); - connect (process(), SIGNAL (errorDetected()), SLOT (playerErrorDetected())); - connect (configuration(), SIGNAL (updated()), SLOT (refreshSettings())); - connect (kPlayerWorkspace(), SIGNAL (contextMenu(const TQPoint&)), SLOT (contextMenu(const TQPoint&))); + connect (process(), TQ_SIGNAL (stateChanged(KPlayerProcess::State, KPlayerProcess::State)), + TQ_SLOT (playerStateChanged(KPlayerProcess::State, KPlayerProcess::State))); + connect (process(), TQ_SIGNAL (progressChanged(float, KPlayerProcess::ProgressType)), + TQ_SLOT (playerProgressChanged(float, KPlayerProcess::ProgressType))); + connect (process(), TQ_SIGNAL (infoAvailable()), TQ_SLOT (playerInfoAvailable())); + connect (process(), TQ_SIGNAL (sizeAvailable()), TQ_SLOT (playerSizeAvailable())); + connect (process(), TQ_SIGNAL (messageReceived (TQString)), TQ_SLOT (playerMessageReceived (TQString))); + connect (process(), TQ_SIGNAL (errorDetected()), TQ_SLOT (playerErrorDetected())); + connect (configuration(), TQ_SIGNAL (updated()), TQ_SLOT (refreshSettings())); + connect (kPlayerWorkspace(), TQ_SIGNAL (contextMenu(const TQPoint&)), TQ_SLOT (contextMenu(const TQPoint&))); setCentralWidget (kPlayerWorkspace()); initStatusBar(); initActions(); @@ -533,7 +533,7 @@ KPlayer::KPlayer (TQWidget *parent, const char *name) : TDEMainWindow (parent, n library() -> library() -> initialize ((TQPopupMenu*) factory() -> container ("library_popup", this)); uint i; for ( i = 0; i < menuBar() -> count(); i ++ ) - connect (popupMenu (i), SIGNAL (aboutToHide()), SLOT (clearStatusMessage())); + connect (popupMenu (i), TQ_SIGNAL (aboutToHide()), TQ_SLOT (clearStatusMessage())); for ( i = 0; i < KPLAYER_TOOLBARS; i ++ ) m_toolbar[i] = toolbars[i]; setAutoSaveSettings ("MainWindow", false); @@ -576,52 +576,52 @@ void KPlayer::initActions (void) #ifdef DEBUG_KPLAYER_WINDOW kdDebugTime() << "Creating actions\n"; #endif - TDEAction* action = KStdAction::quit (this, SLOT (fileQuit()), actionCollection()); + TDEAction* action = KStdAction::quit (this, TQ_SLOT (fileQuit()), actionCollection()); action -> setStatusText (i18n("Quits KPlayer")); action -> setWhatsThis (i18n("Quit command saves the playlist and all settings, stops playing and closes KPlayer.")); - action = KStdAction::showMenubar (this, SLOT (viewMenubar()), actionCollection()); + action = KStdAction::showMenubar (this, TQ_SLOT (viewMenubar()), actionCollection()); action -> setStatusText (i18n("Shows/hides the menu bar")); action -> setWhatsThis (i18n("Show Menubar command shows or hides the menu bar.")); - action = KStdAction::showStatusbar (this, SLOT (viewStatusbar()), actionCollection()); + action = KStdAction::showStatusbar (this, TQ_SLOT (viewStatusbar()), actionCollection()); action -> setStatusText (i18n("Shows/hides the status bar")); action -> setWhatsThis (i18n("Show Statusbar command shows or hides the status bar.")); - action = new TDEToggleAction (i18n("&Show Playlist"), 0, CTRL + Key_P, this, SLOT (viewPlaylist()), actionCollection(), "options_show_playlist"); + action = new TDEToggleAction (i18n("&Show Playlist"), 0, CTRL + Key_P, this, TQ_SLOT (viewPlaylist()), actionCollection(), "options_show_playlist"); action -> setStatusText (i18n("Shows/hides the playlist")); action -> setWhatsThis (i18n("Show Playlist command shows or hides the playlist toolbar.")); - action = new TDEToggleAction (i18n("Sho&w Library"), 0, CTRL + Key_L, this, SLOT (viewLibrary()), actionCollection(), "options_show_library"); + action = new TDEToggleAction (i18n("Sho&w Library"), 0, CTRL + Key_L, this, TQ_SLOT (viewLibrary()), actionCollection(), "options_show_library"); action -> setStatusText (i18n("Shows/hides the multimedia library")); action -> setWhatsThis (i18n("Show Library command shows or hides the multimedia library.")); - action = new TDEToggleAction (i18n("Show Message &Log"), 0, CTRL + Key_G, this, SLOT (viewMessageLog()), actionCollection(), "options_show_log"); + action = new TDEToggleAction (i18n("Show Message &Log"), 0, CTRL + Key_G, this, TQ_SLOT (viewMessageLog()), actionCollection(), "options_show_log"); action -> setStatusText (i18n("Shows/hides the message log")); action -> setWhatsThis (i18n("Show Message Log command shows or hides the message log.")); - action = new TDEToggleAction (i18n("Show Main &Toolbar"), 0, 0, this, SLOT (viewMainToolbar()), actionCollection(), "options_show_toolbar"); + action = new TDEToggleAction (i18n("Show Main &Toolbar"), 0, 0, this, TQ_SLOT (viewMainToolbar()), actionCollection(), "options_show_toolbar"); action -> setStatusText (i18n("Shows/hides the main toolbar")); action -> setWhatsThis (i18n("Show Main Toolbar command shows or hides the main toolbar.")); - action = new TDEToggleAction (i18n("Show &Progress Toolbar"), 0, 0, this, SLOT (viewProgressToolbar()), actionCollection(), "settings_progress_toolbar"); + action = new TDEToggleAction (i18n("Show &Progress Toolbar"), 0, 0, this, TQ_SLOT (viewProgressToolbar()), actionCollection(), "settings_progress_toolbar"); action -> setStatusText (i18n("Shows/hides the progress toolbar")); action -> setWhatsThis (i18n("Show Progress Toolbar command shows or hides the progress toolbar. This command is available when the time length of the current file is known.")); - action = new TDEToggleAction (i18n("Show &Volume Toolbar"), "volume", 0, this, SLOT (viewVolumeToolbar()), actionCollection(), "settings_volume_toolbar"); + action = new TDEToggleAction (i18n("Show &Volume Toolbar"), "volume", 0, this, TQ_SLOT (viewVolumeToolbar()), actionCollection(), "settings_volume_toolbar"); action -> setStatusText (i18n("Shows/hides the volume toolbar")); action -> setWhatsThis (i18n("Show Volume Toolbar command shows or hides the volume toolbar.")); - action = new TDEToggleAction (i18n("Show C&ontrast Toolbar"), "contrast", 0, this, SLOT (viewContrastToolbar()), actionCollection(), "settings_contrast_toolbar"); + action = new TDEToggleAction (i18n("Show C&ontrast Toolbar"), "contrast", 0, this, TQ_SLOT (viewContrastToolbar()), actionCollection(), "settings_contrast_toolbar"); action -> setStatusText (i18n("Shows/hides the contrast toolbar")); action -> setWhatsThis (i18n("Show Contrast Toolbar command shows or hides the contrast toolbar. This command is available for video files.")); - action = new TDEToggleAction (i18n("Show &Brightness Toolbar"), "brightness", 0, this, SLOT (viewBrightnessToolbar()), actionCollection(), "settings_brightness_toolbar"); + action = new TDEToggleAction (i18n("Show &Brightness Toolbar"), "brightness", 0, this, TQ_SLOT (viewBrightnessToolbar()), actionCollection(), "settings_brightness_toolbar"); action -> setStatusText (i18n("Shows/hides the brightness toolbar")); action -> setWhatsThis (i18n("Show Brightness Toolbar command shows or hides the brightness toolbar. This command is available for video files.")); - action = new TDEToggleAction (i18n("Show H&ue Toolbar"), "hue", 0, this, SLOT (viewHueToolbar()), actionCollection(), "settings_hue_toolbar"); + action = new TDEToggleAction (i18n("Show H&ue Toolbar"), "hue", 0, this, TQ_SLOT (viewHueToolbar()), actionCollection(), "settings_hue_toolbar"); action -> setStatusText (i18n("Shows/hides the hue toolbar")); action -> setWhatsThis (i18n("Show Hue Toolbar command shows or hides the hue toolbar. This command is available for video files.")); - action = new TDEToggleAction (i18n("Show &Saturation Toolbar"), "saturation", 0, this, SLOT (viewSaturationToolbar()), actionCollection(), "settings_saturation_toolbar"); + action = new TDEToggleAction (i18n("Show &Saturation Toolbar"), "saturation", 0, this, TQ_SLOT (viewSaturationToolbar()), actionCollection(), "settings_saturation_toolbar"); action -> setStatusText (i18n("Shows/hides the saturation toolbar")); action -> setWhatsThis (i18n("Show Saturation Toolbar command shows or hides the saturation toolbar. This command is available for video files.")); - action = KStdAction::keyBindings (this, SLOT (settingsKeyBindings()), actionCollection()); + action = KStdAction::keyBindings (this, TQ_SLOT (settingsKeyBindings()), actionCollection()); action -> setStatusText (i18n("Opens the KPlayer key bindings dialog")); action -> setWhatsThis (i18n("Configure Shortcuts command opens a dialog that lets you see and change KPlayer's shortcut key bindings, or associations between actions and the corresponding keys or combinations of keys that activate them. If you change the bindings, make sure not to duplicate an existing shortcut and also not to use the Shift key for your new shortcuts, because the Shift key has a special function in KPlayer.")); - action = KStdAction::configureToolbars (this, SLOT (settingsConfigureToolbars()), actionCollection()); + action = KStdAction::configureToolbars (this, TQ_SLOT (settingsConfigureToolbars()), actionCollection()); action -> setStatusText (i18n("Opens the KPlayer toolbar configuration dialog")); action -> setWhatsThis (i18n("Configure Toolbars command opens a dialog that lets you see and change KPlayer's toolbars and controls assigned to them.")); - action = KStdAction::preferences (this, SLOT (settingsConfigure()), actionCollection()); + action = KStdAction::preferences (this, TQ_SLOT (settingsConfigure()), actionCollection()); action -> setStatusText (i18n("Opens the KPlayer configuration dialog")); action -> setWhatsThis (i18n("Configure KPlayer command opens a dialog that lets you configure the program, modifying various aspects of its functionality, user interface and interaction with MPlayer. For more information see the Configuration dialog chapter and the Advanced configuration micro-HOWTO in the user manual.")); createGUI ("kplayerui.rc", false); @@ -652,8 +652,8 @@ void KPlayer::initActions (void) action = actionCollection() -> action ("help_report_bug"); if ( action ) { - disconnect (action, SIGNAL(activated()), 0, 0); - connect (action, SIGNAL(activated()), SLOT(helpReportBug())); + disconnect (action, TQ_SIGNAL(activated()), 0, 0); + connect (action, TQ_SIGNAL(activated()), TQ_SLOT(helpReportBug())); action -> setStatusText (i18n("Opens the manual section on bug reporting")); action -> setWhatsThis (i18n("Report Bug command opens the section of KPlayer user manual that explains how to report a bug in KPlayer, including all the information that may be helpful in finding and fixing the bug.")); } @@ -694,7 +694,7 @@ void KPlayer::initStatusBar (void) statusBar() -> setMinimumHeight (statusBar() -> layout() -> minimumSize().height()); if ( m_status_label ) { - connect (m_status_label, SIGNAL (itemPressed (int)), this, SLOT (statusPressed())); + connect (m_status_label, TQ_SIGNAL (itemPressed (int)), this, TQ_SLOT (statusPressed())); TQWhatsThis::add (m_status_label, i18n("Status area of the status bar tells you if there have been playback errors.")); } if ( m_state_label ) @@ -1198,7 +1198,7 @@ void KPlayer::playlistActivated (void) clearStatusMessage(); if ( m_progress_label ) m_progress_label -> setText (""); - connect (settings() -> properties(), SIGNAL (updated()), this, SLOT (refreshProperties())); + connect (settings() -> properties(), TQ_SIGNAL (updated()), this, TQ_SLOT (refreshProperties())); enableVideoActions(); } @@ -1224,10 +1224,10 @@ void KPlayer::refreshProperties (void) void KPlayer::closeEvent (TQCloseEvent* event) { - disconnect (log(), SIGNAL (windowHidden()), this, SLOT (logWindowHidden())); - disconnect (library(), SIGNAL (windowHidden()), this, SLOT (libraryHidden())); - disconnect (settings() -> properties(), SIGNAL (updated()), this, SLOT (refreshProperties())); - disconnect (configuration(), SIGNAL (updated()), this, SLOT (refreshSettings())); + disconnect (log(), TQ_SIGNAL (windowHidden()), this, TQ_SLOT (logWindowHidden())); + disconnect (library(), TQ_SIGNAL (windowHidden()), this, TQ_SLOT (libraryHidden())); + disconnect (settings() -> properties(), TQ_SIGNAL (updated()), this, TQ_SLOT (refreshProperties())); + disconnect (configuration(), TQ_SIGNAL (updated()), this, TQ_SLOT (refreshSettings())); saveOptions(); library() -> library() -> terminate(); playlist() -> terminate(); @@ -1454,7 +1454,7 @@ void KPlayer::settingsConfigureToolbars (void) { saveMainWindowSettings (config(), "General Options"); KEditToolbar dialog (actionCollection()); - connect (&dialog, SIGNAL (newToolbarConfig()), SLOT (newToolbarConfiguration())); + connect (&dialog, TQ_SIGNAL (newToolbarConfig()), TQ_SLOT (newToolbarConfiguration())); dialog.exec(); } @@ -1729,7 +1729,7 @@ void KPlayer::resizeEvent (TQResizeEvent* event) if ( kPlayerWorkspace() -> isResizing() ) m_set_display_size = false; else - TQTimer::singleShot (0, this, SLOT (setDisplaySize())); + TQTimer::singleShot (0, this, TQ_SLOT (setDisplaySize())); } } diff --git a/kplayer/kplayeractionlist.cpp b/kplayer/kplayeractionlist.cpp index 3af374d..4dddddf 100644 --- a/kplayer/kplayeractionlist.cpp +++ b/kplayer/kplayeractionlist.cpp @@ -251,7 +251,7 @@ void KPlayerSimpleActionList::update (void) TQStringList::ConstIterator iterator (m_names.constBegin()); while ( iterator != m_names.constEnd() ) { - TDEAction* action = new TDEAction (*iterator, 0, this, SLOT(actionActivated()), this); + TDEAction* action = new TDEAction (*iterator, 0, this, TQ_SLOT(actionActivated()), this); updateAction (action); m_actions.append (action); ++ iterator; @@ -384,7 +384,7 @@ void KPlayerTrackActionList::addActions (const TQMap<int, TQString>& ids, int id #ifdef DEBUG_KPLAYER_ACTIONLIST kdDebugTime() << " Stream " << iterator.key() << " " << iterator.data() << " " << text << "\n"; #endif - TDEToggleAction* action = new TDEToggleAction (text, 0, this, SLOT(actionActivated()), this); + TDEToggleAction* action = new TDEToggleAction (text, 0, this, TQ_SLOT(actionActivated()), this); updateAction (action); action -> setExclusiveGroup (name()); if ( id == iterator.key() ) @@ -433,7 +433,7 @@ void KPlayerSubtitleTrackActionList::update (bool show, const TQMap<int, TQStrin unplug(); if ( sids.count() > 0 || vsids.count() > 0 || files.count() > 0 ) { - TDEToggleAction* action = new TDEToggleAction (i18n("&None"), 0, this, SLOT(actionActivated()), this); + TDEToggleAction* action = new TDEToggleAction (i18n("&None"), 0, this, TQ_SLOT(actionActivated()), this); action -> setStatusText (i18n("Turns off subtitle display")); action -> setWhatsThis (i18n("Subtitles None command turns off subtitle display.")); action -> setExclusiveGroup (name()); @@ -453,7 +453,7 @@ void KPlayerSubtitleTrackActionList::update (bool show, const TQMap<int, TQStrin #endif if ( ! text.isEmpty() ) { - action = new TDEToggleAction (text, 0, this, SLOT (actionActivated()), this); + action = new TDEToggleAction (text, 0, this, TQ_SLOT (actionActivated()), this); updateAction (action); action -> setText (text); action -> setExclusiveGroup (name()); diff --git a/kplayer/kplayerengine.cpp b/kplayer/kplayerengine.cpp index 5745c7a..9ee9329 100644 --- a/kplayer/kplayerengine.cpp +++ b/kplayer/kplayerengine.cpp @@ -109,13 +109,13 @@ KPlayerEngine::KPlayerEngine (TDEActionCollection* ac, TQWidget* parent, const c m_process = new KPlayerProcess; m_workspace = new KPlayerWorkspace (parent, name); m_widget = workspace() -> widget(); - connect (workspace(), SIGNAL (resized()), this, SLOT (workspaceResized())); - connect (workspace(), SIGNAL (userResize()), this, SLOT (workspaceUserResize())); - connect (process(), SIGNAL (stateChanged(KPlayerProcess::State, KPlayerProcess::State)), this, SLOT (playerStateChanged(KPlayerProcess::State, KPlayerProcess::State))); - connect (process(), SIGNAL (progressChanged(float, KPlayerProcess::ProgressType)), this, SLOT (playerProgressChanged(float, KPlayerProcess::ProgressType))); - connect (process(), SIGNAL (infoAvailable()), this, SLOT (playerInfoAvailable())); - connect (process(), SIGNAL (sizeAvailable()), this, SLOT (playerSizeAvailable())); - connect (configuration(), SIGNAL (updated()), this, SLOT (refreshSettings())); + connect (workspace(), TQ_SIGNAL (resized()), this, TQ_SLOT (workspaceResized())); + connect (workspace(), TQ_SIGNAL (userResize()), this, TQ_SLOT (workspaceUserResize())); + connect (process(), TQ_SIGNAL (stateChanged(KPlayerProcess::State, KPlayerProcess::State)), this, TQ_SLOT (playerStateChanged(KPlayerProcess::State, KPlayerProcess::State))); + connect (process(), TQ_SIGNAL (progressChanged(float, KPlayerProcess::ProgressType)), this, TQ_SLOT (playerProgressChanged(float, KPlayerProcess::ProgressType))); + connect (process(), TQ_SIGNAL (infoAvailable()), this, TQ_SLOT (playerInfoAvailable())); + connect (process(), TQ_SIGNAL (sizeAvailable()), this, TQ_SLOT (playerSizeAvailable())); + connect (configuration(), TQ_SIGNAL (updated()), this, TQ_SLOT (refreshSettings())); setupActions(); m_audio_drivers << "mpegpes: DVB" @@ -430,12 +430,12 @@ KPlayerEngine::~KPlayerEngine() } if ( settings() ) { - disconnect (settings() -> properties(), SIGNAL (updated()), this, SLOT (refreshProperties())); + disconnect (settings() -> properties(), TQ_SIGNAL (updated()), this, TQ_SLOT (refreshProperties())); delete settings(); } if ( configuration() ) { - disconnect (configuration(), SIGNAL (updated()), this, SLOT (refreshSettings())); + disconnect (configuration(), TQ_SIGNAL (updated()), this, TQ_SLOT (refreshSettings())); configuration() -> commit(); delete configuration(); } @@ -475,66 +475,66 @@ void KPlayerEngine::setupActions (void) kdDebugTime() << "KPlayerEngine::setupActions\n"; #endif TDEAction* action; - action = new TDEAction (i18n("&Properties..."), "properties", ALT + Key_Return, this, SLOT (fileProperties()), m_ac, "file_properties"); + action = new TDEAction (i18n("&Properties..."), "properties", ALT + Key_Return, this, TQ_SLOT (fileProperties()), m_ac, "file_properties"); action -> setStatusText (i18n("Opens the File Properties dialog")); action -> setWhatsThis (i18n("Properties command opens the File Properties dialog that lets you choose many options specific to the currently loaded file. See the File properties micro-HOWTO for details.")); - action = new TDEAction (i18n("&Play"), "player_play", Key_Return, this, SLOT (play()), m_ac, "player_play"); + action = new TDEAction (i18n("&Play"), "player_play", Key_Return, this, TQ_SLOT (play()), m_ac, "player_play"); action -> setStatusText (i18n("Plays the currently loaded file")); action -> setWhatsThis (i18n("Play command starts playback of the current file. If the player has been paused, this command resumes playback. This command is available when a file is loaded.")); - action = new TDEToggleAction (i18n("Paus&e"), "player_pause", Key_Space, this, SLOT (pause()), m_ac, "player_pause"); + action = new TDEToggleAction (i18n("Paus&e"), "player_pause", Key_Space, this, TQ_SLOT (pause()), m_ac, "player_pause"); action -> setStatusText (i18n("Pauses the player")); action -> setWhatsThis (i18n("Pause command pauses or resumes playback of the current file. This command is available when the player is not idle.")); - action = new TDEAction (i18n("&Stop"), "player_stop", Key_Escape, this, SLOT (stop()), m_ac, "player_stop"); + action = new TDEAction (i18n("&Stop"), "player_stop", Key_Escape, this, TQ_SLOT (stop()), m_ac, "player_stop"); action -> setStatusText (i18n("Stops the player")); action -> setWhatsThis (i18n("Stop command stops playback of the current file. This command is available when the player is not idle.")); - action = new TDEAction (i18n("&Forward"), 0, Key_Right, this, SLOT (forward()), m_ac, "player_forward"); + action = new TDEAction (i18n("&Forward"), 0, Key_Right, this, TQ_SLOT (forward()), m_ac, "player_forward"); action -> setStatusText (i18n("Moves playback forward")); action -> setWhatsThis (i18n("Forward command moves playback forward by one percent of the time length of the current file. This command is available when playing a file.")); - action = new TDEAction (i18n("F&ast Forward"), "player_fwd", CTRL + Key_Right, this, SLOT (fastForward()), m_ac, "player_fast_forward"); + action = new TDEAction (i18n("F&ast Forward"), "player_fwd", CTRL + Key_Right, this, TQ_SLOT (fastForward()), m_ac, "player_fast_forward"); action -> setStatusText (i18n("Moves playback forward fast")); action -> setWhatsThis (i18n("Fast Forward command moves playback forward by ten percent of the time length of the current file. This command is available when playing a file.")); - action = new TDEAction (i18n("&Backward"), 0, Key_Left, this, SLOT (backward()), m_ac, "player_backward"); + action = new TDEAction (i18n("&Backward"), 0, Key_Left, this, TQ_SLOT (backward()), m_ac, "player_backward"); action -> setStatusText (i18n("Moves playback backward")); action -> setWhatsThis (i18n("Backward command moves playback backward by one percent of the time length of the current file. This command is available when playing a file.")); - action = new TDEAction (i18n("Fast Back&ward"), "player_rew", CTRL + Key_Left, this, SLOT (fastBackward()), m_ac, "player_fast_backward"); + action = new TDEAction (i18n("Fast Back&ward"), "player_rew", CTRL + Key_Left, this, TQ_SLOT (fastBackward()), m_ac, "player_fast_backward"); action -> setStatusText (i18n("Moves playback backward fast")); action -> setWhatsThis (i18n("Fast Backward command moves playback backward by ten percent of the time length of the current file. This command is available when playing a file.")); - action = new TDEAction (i18n("Back &to Start"), 0, CTRL + Key_Home, this, SLOT (start()), m_ac, "player_start"); + action = new TDEAction (i18n("Back &to Start"), 0, CTRL + Key_Home, this, TQ_SLOT (start()), m_ac, "player_start"); action -> setStatusText (i18n("Moves playback to the beginning")); action -> setWhatsThis (i18n("Back to Start command moves playback to the beginning of the current file. This command is available when playing a file.")); - action = new TDEAction (i18n("&Increase Volume"), 0, CTRL + Key_Up, this, SLOT (volumeIncrease()), m_ac, "audio_volume_up"); + action = new TDEAction (i18n("&Increase Volume"), 0, CTRL + Key_Up, this, TQ_SLOT (volumeIncrease()), m_ac, "audio_volume_up"); action -> setStatusText (i18n("Increases the volume")); action -> setWhatsThis (i18n("Increase Volume command increases the sound volume.")); - action = new TDEAction (i18n("&Decrease Volume"), 0, CTRL + Key_Down, this, SLOT (volumeDecrease()), m_ac, "audio_volume_down"); + action = new TDEAction (i18n("&Decrease Volume"), 0, CTRL + Key_Down, this, TQ_SLOT (volumeDecrease()), m_ac, "audio_volume_down"); action -> setStatusText (i18n("Decreases the volume")); action -> setWhatsThis (i18n("Decrease Volume command decreases the sound volume.")); - TDEToggleAction* toggle = new TDEToggleAction (i18n("&Mute"), "mute", CTRL + Key_Backslash, this, SLOT (mute()), m_ac, "audio_mute"); + TDEToggleAction* toggle = new TDEToggleAction (i18n("&Mute"), "mute", CTRL + Key_Backslash, this, TQ_SLOT (mute()), m_ac, "audio_mute"); toggle -> setStatusText (i18n("Turns the sound on/off")); toggle -> setWhatsThis (i18n("Mute command turns the sound on or off.")); if ( configuration() -> mute() ) toggle -> setChecked (true); - toggle = new TDEToggleAction (i18n("Maintain &Aspect"), "viewmagfit", CTRL + Key_A, this, SLOT (maintainAspect()), m_ac, "view_maintain_aspect"); + toggle = new TDEToggleAction (i18n("Maintain &Aspect"), "viewmagfit", CTRL + Key_A, this, TQ_SLOT (maintainAspect()), m_ac, "view_maintain_aspect"); toggle -> setStatusText (i18n("Maintains the video aspect ratio")); toggle -> setWhatsThis (i18n("Maintain Aspect command toggles the option to maintain the video aspect ratio.")); if ( settings() -> maintainAspect() ) toggle -> setChecked (true); m_updating = true; - KPlayerSliderAction* sa = new KPlayerSliderAction (i18n("Progress"), 0, this, SLOT (progressChanged (int)), m_ac, "player_progress"); + KPlayerSliderAction* sa = new KPlayerSliderAction (i18n("Progress"), 0, this, TQ_SLOT (progressChanged (int)), m_ac, "player_progress"); sa -> slider() -> setup (0, 0, 0, configuration() -> showSliderMarks(), 0, 0, 0); sa -> setStatusText (i18n("Shows player progress and allows seeking")); sa -> setWhatsThis (i18n("Progress slider shows playback progress and allows seeking.")); - connect (sa -> slider(), SIGNAL (sliderReleased()), kPlayerProcess(), SLOT (progressSliderReleased())); + connect (sa -> slider(), TQ_SIGNAL (sliderReleased()), kPlayerProcess(), TQ_SLOT (progressSliderReleased())); - sa = new KPlayerSliderAction (i18n("Volume"), 0, this, SLOT (volumeChanged (int)), m_ac, "audio_volume"); + sa = new KPlayerSliderAction (i18n("Volume"), 0, this, TQ_SLOT (volumeChanged (int)), m_ac, "audio_volume"); sa -> setStatusText (i18n("Changes volume level")); sa -> setWhatsThis (i18n("Volume slider shows the current sound volume level and allows you to change it.")); - KPlayerPopupSliderAction* psa = new KPlayerPopupSliderAction (i18n("Volume"), "volume", Key_F9, this, SLOT (volumeChanged (int)), m_ac, "popup_volume"); + KPlayerPopupSliderAction* psa = new KPlayerPopupSliderAction (i18n("Volume"), "volume", Key_F9, this, TQ_SLOT (volumeChanged (int)), m_ac, "popup_volume"); psa -> setStatusText (i18n("Shows the volume popup slider")); psa -> setWhatsThis (i18n("Volume button displays a slider that shows the current sound volume level and allows you to change it.")); @@ -546,169 +546,169 @@ void KPlayerEngine::setupActions (void) return; } - action = new TDEAction (i18n("&Load Subtitles..."), 0, CTRL + Key_S, this, SLOT (fileOpenSubtitles()), m_ac, "subtitles_load"); + action = new TDEAction (i18n("&Load Subtitles..."), 0, CTRL + Key_S, this, TQ_SLOT (fileOpenSubtitles()), m_ac, "subtitles_load"); action -> setStatusText (i18n("Opens a subtitle file")); action -> setWhatsThis (i18n("Load Subtitles command displays the standard Open File dialog and lets you choose a subtitle file to use with the current file or URL. If you load subtitles when video is playing, KPlayer will display the subtitles immediately. By default it will also remember the subtitles you choose in the current file properties. This command is available for video files.")); - /*action = new TDEAction (i18n("Load Su&btitle URL..."), 0, 0, this, SLOT (fileOpenSubtitleUrl()), m_ac, "subtitles_load_url"); + /*action = new TDEAction (i18n("Load Su&btitle URL..."), 0, 0, this, TQ_SLOT (fileOpenSubtitleUrl()), m_ac, "subtitles_load_url"); action -> setStatusText (i18n("Opens a subtitle URL")); action -> setWhatsThis (i18n("Load Subtitle URL command displays the standard Open URL dialog and lets you type or paste in a subtitle URL to use with the current file or URL. If you load subtitles when video is playing, KPlayer will display the subtitles immediately. By default it will also remember the subtitles you choose in the current file properties. This command is available for video files.")); - action = new TDEAction (i18n("U&nload Subtitles"), 0, 0, this, SLOT (fileUnloadSubtitles()), m_ac, "subtitles_unload"); + action = new TDEAction (i18n("U&nload Subtitles"), 0, 0, this, TQ_SLOT (fileUnloadSubtitles()), m_ac, "subtitles_unload"); action -> setStatusText (i18n("Unloads subtitles")); action -> setWhatsThis (i18n("Unload Subtitles command unloads the currently loaded subtitles, and if video is playing, hides the subtitles. This command is available when subtitles are loaded."));*/ - action = new TDEToggleAction (i18n("&Full Screen"), "window_fullscreen", CTRL + Key_F, this, SLOT (fullScreen()), m_ac, "view_full_screen"); + action = new TDEToggleAction (i18n("&Full Screen"), "window_fullscreen", CTRL + Key_F, this, TQ_SLOT (fullScreen()), m_ac, "view_full_screen"); action -> setStatusText (i18n("Switches to full screen mode")); action -> setWhatsThis (i18n("Full Screen command switches to full screen video display and back to normal mode.")); - action = KStdAction::zoomIn (this, SLOT (zoomIn()), m_ac); + action = KStdAction::zoomIn (this, TQ_SLOT (zoomIn()), m_ac); action -> setStatusText (i18n("Enlarges the video")); action -> setWhatsThis (i18n("Zoom In command enlarges the video area by one half of the original video size of the current file.")); - action = KStdAction::zoomOut (this, SLOT (zoomOut()), m_ac); + action = KStdAction::zoomOut (this, TQ_SLOT (zoomOut()), m_ac); action -> setStatusText (i18n("Shrinks the video")); action -> setWhatsThis (i18n("Zoom Out command reduces the video area by one half of the original video size of the current file.")); - toggle = new TDEToggleAction (i18n("Zoom to 5&0%"), 0, 0, this, SLOT (zoom12()), m_ac, "view_zoom_1_2"); + toggle = new TDEToggleAction (i18n("Zoom to 5&0%"), 0, 0, this, TQ_SLOT (zoom12()), m_ac, "view_zoom_1_2"); // xgettext:no-c-format toggle -> setStatusText (i18n("Scales video to 50% of the original size")); // xgettext:no-c-format toggle -> setWhatsThis (i18n("Zoom to 50% command resizes the video area to one half of the original video size of the current file.")); toggle -> setExclusiveGroup ("zoom"); - toggle = new TDEToggleAction (i18n("Zoom to &100%"), 0, CTRL + Key_Backspace, this, SLOT (zoom11()), m_ac, "view_zoom_1_1"); + toggle = new TDEToggleAction (i18n("Zoom to &100%"), 0, CTRL + Key_Backspace, this, TQ_SLOT (zoom11()), m_ac, "view_zoom_1_1"); toggle -> setStatusText (i18n("Scales video to its original size")); // xgettext:no-c-format toggle -> setWhatsThis (i18n("Zoom to 100% command resizes the video area to the original video size of the current file.")); toggle -> setExclusiveGroup ("zoom"); - toggle = new TDEToggleAction (i18n("Zoo&m to 150%"), 0, 0, this, SLOT (zoom32()), m_ac, "view_zoom_3_2"); + toggle = new TDEToggleAction (i18n("Zoo&m to 150%"), 0, 0, this, TQ_SLOT (zoom32()), m_ac, "view_zoom_3_2"); // xgettext:no-c-format toggle -> setStatusText (i18n("Scales video to 150% of the original size")); // xgettext:no-c-format toggle -> setWhatsThis (i18n("Zoom to 150% command resizes the video area to 150% of the original video size of the current file.")); toggle -> setExclusiveGroup ("zoom"); - toggle = new TDEToggleAction (i18n("Zoom to &200%"), 0, 0, this, SLOT (zoom21()), m_ac, "view_zoom_2_1"); + toggle = new TDEToggleAction (i18n("Zoom to &200%"), 0, 0, this, TQ_SLOT (zoom21()), m_ac, "view_zoom_2_1"); // xgettext:no-c-format toggle -> setStatusText (i18n("Scales video to 200% of the original size")); // xgettext:no-c-format toggle -> setWhatsThis (i18n("Zoom to 200% command resizes the video area to twice the original video size of the current file.")); toggle -> setExclusiveGroup ("zoom"); - toggle = new TDEToggleAction (i18n("Zoom &to 250%"), 0, 0, this, SLOT (zoom52()), m_ac, "view_zoom_5_2"); + toggle = new TDEToggleAction (i18n("Zoom &to 250%"), 0, 0, this, TQ_SLOT (zoom52()), m_ac, "view_zoom_5_2"); // xgettext:no-c-format toggle -> setStatusText (i18n("Scales video to 250% of the original size")); // xgettext:no-c-format toggle -> setWhatsThis (i18n("Zoom to 250% command resizes the video area to 250% of the original video size of the current file.")); toggle -> setExclusiveGroup ("zoom"); - toggle = new TDEToggleAction (i18n("Zoom to &300%"), 0, 0, this, SLOT (zoom31()), m_ac, "view_zoom_3_1"); + toggle = new TDEToggleAction (i18n("Zoom to &300%"), 0, 0, this, TQ_SLOT (zoom31()), m_ac, "view_zoom_3_1"); // xgettext:no-c-format toggle -> setStatusText (i18n("Scales video to 300% of the original size")); // xgettext:no-c-format toggle -> setWhatsThis (i18n("Zoom to 300% command resizes the video area to thrice the original video size of the current file.")); toggle -> setExclusiveGroup ("zoom"); - toggle = new TDEToggleAction (i18n("Maintain Original &Aspect"), 0, 0, this, SLOT (maintainOriginalAspect()), m_ac, "view_original_aspect"); + toggle = new TDEToggleAction (i18n("Maintain Original &Aspect"), 0, 0, this, TQ_SLOT (maintainOriginalAspect()), m_ac, "view_original_aspect"); toggle -> setStatusText (i18n("Maintains the original video aspect ratio")); toggle -> setWhatsThis (i18n("Maintain Original Aspect command toggles the option to maintain the original video aspect ratio of the current file.")); if ( settings() -> maintainAspect() ) toggle -> setChecked (true); toggle -> setExclusiveGroup ("aspect"); - toggle = new TDEToggleAction (i18n("Maintain &Current Aspect"), 0, 0, this, SLOT (maintainCurrentAspect()), m_ac, "view_current_aspect"); + toggle = new TDEToggleAction (i18n("Maintain &Current Aspect"), 0, 0, this, TQ_SLOT (maintainCurrentAspect()), m_ac, "view_current_aspect"); toggle -> setStatusText (i18n("Maintains the current video aspect ratio")); toggle -> setWhatsThis (i18n("Maintain Current Aspect command toggles the option to maintain the current video aspect ratio.")); toggle -> setExclusiveGroup ("aspect"); - toggle = new TDEToggleAction (i18n("Force &4 to 3 Aspect"), 0, 0, this, SLOT (aspect43()), m_ac, "view_aspect_4_3"); + toggle = new TDEToggleAction (i18n("Force &4 to 3 Aspect"), 0, 0, this, TQ_SLOT (aspect43()), m_ac, "view_aspect_4_3"); toggle -> setStatusText (i18n("Sets 4 to 3 video aspect ratio")); toggle -> setWhatsThis (i18n("Force 4 to 3 Aspect command toggles the option to maintain four to three video aspect ratio.")); toggle -> setExclusiveGroup ("aspect"); - toggle = new TDEToggleAction (i18n("Force 1&6 to 9 Aspect"), 0, 0, this, SLOT (aspect169()), m_ac, "view_aspect_16_9"); + toggle = new TDEToggleAction (i18n("Force 1&6 to 9 Aspect"), 0, 0, this, TQ_SLOT (aspect169()), m_ac, "view_aspect_16_9"); toggle -> setStatusText (i18n("Sets 16 to 9 video aspect ratio")); toggle -> setWhatsThis (i18n("Force 16 to 9 Aspect command toggles the option to maintain sixteen to nine video aspect ratio.")); toggle -> setExclusiveGroup ("aspect"); - action = new TDEAction (i18n("I&ncrease Delay"), 0, CTRL + Key_BracketLeft, this, SLOT (audioDelayIncrease()), m_ac, "audio_delay_up"); + action = new TDEAction (i18n("I&ncrease Delay"), 0, CTRL + Key_BracketLeft, this, TQ_SLOT (audioDelayIncrease()), m_ac, "audio_delay_up"); action -> setStatusText (i18n("Increases audio delay")); action -> setWhatsThis (i18n("Increase Delay command increases the delay of sound relative to video.")); - action = new TDEAction (i18n("D&ecrease Delay"), 0, CTRL + Key_BracketRight, this, SLOT (audioDelayDecrease()), m_ac, "audio_delay_down"); + action = new TDEAction (i18n("D&ecrease Delay"), 0, CTRL + Key_BracketRight, this, TQ_SLOT (audioDelayDecrease()), m_ac, "audio_delay_down"); action -> setStatusText (i18n("Decreases audio delay")); action -> setWhatsThis (i18n("Decrease Delay command decreases the delay of sound relative to video.")); - action = new TDEAction (i18n("Decrease C&ontrast"), 0, CTRL + Key_1, this, SLOT (contrastDecrease()), m_ac, "video_contrast_down"); + action = new TDEAction (i18n("Decrease C&ontrast"), 0, CTRL + Key_1, this, TQ_SLOT (contrastDecrease()), m_ac, "video_contrast_down"); action -> setStatusText (i18n("Decreases video contrast")); action -> setWhatsThis (i18n("Decrease Contrast command decreases the video contrast.")); - action = new TDEAction (i18n("Increase &Contrast"), 0, CTRL + Key_2, this, SLOT (contrastIncrease()), m_ac, "video_contrast_up"); + action = new TDEAction (i18n("Increase &Contrast"), 0, CTRL + Key_2, this, TQ_SLOT (contrastIncrease()), m_ac, "video_contrast_up"); action -> setStatusText (i18n("Increases video contrast")); action -> setWhatsThis (i18n("Increase Contrast command increases the video contrast.")); - action = new TDEAction (i18n("Decrease B&rightness"), 0, CTRL + Key_3, this, SLOT (brightnessDecrease()), m_ac, "video_brightness_down"); + action = new TDEAction (i18n("Decrease B&rightness"), 0, CTRL + Key_3, this, TQ_SLOT (brightnessDecrease()), m_ac, "video_brightness_down"); action -> setStatusText (i18n("Decreases video brightness")); action -> setWhatsThis (i18n("Decrease Brightness command decreases the video brightness.")); - action = new TDEAction (i18n("Increase &Brightness"), 0, CTRL + Key_4, this, SLOT (brightnessIncrease()), m_ac, "video_brightness_up"); + action = new TDEAction (i18n("Increase &Brightness"), 0, CTRL + Key_4, this, TQ_SLOT (brightnessIncrease()), m_ac, "video_brightness_up"); action -> setStatusText (i18n("Increases video brightness")); action -> setWhatsThis (i18n("Increase Brightness command increases the video brightness.")); - action = new TDEAction (i18n("Decrease H&ue"), 0, CTRL + Key_5, this, SLOT (hueDecrease()), m_ac, "video_hue_down"); + action = new TDEAction (i18n("Decrease H&ue"), 0, CTRL + Key_5, this, TQ_SLOT (hueDecrease()), m_ac, "video_hue_down"); action -> setStatusText (i18n("Decreases video hue")); action -> setWhatsThis (i18n("Decrease Hue command decreases the video hue.")); - action = new TDEAction (i18n("Increase &Hue"), 0, CTRL + Key_6, this, SLOT (hueIncrease()), m_ac, "video_hue_up"); + action = new TDEAction (i18n("Increase &Hue"), 0, CTRL + Key_6, this, TQ_SLOT (hueIncrease()), m_ac, "video_hue_up"); action -> setStatusText (i18n("Increases video hue")); action -> setWhatsThis (i18n("Increase Hue command increases the video hue.")); - action = new TDEAction (i18n("Decrease S&aturation"), 0, CTRL + Key_7, this, SLOT (saturationDecrease()), m_ac, "video_saturation_down"); + action = new TDEAction (i18n("Decrease S&aturation"), 0, CTRL + Key_7, this, TQ_SLOT (saturationDecrease()), m_ac, "video_saturation_down"); action -> setStatusText (i18n("Decreases video saturation")); action -> setWhatsThis (i18n("Decrease Saturation command decreases the video saturation.")); - action = new TDEAction (i18n("Increase &Saturation"), 0, CTRL + Key_8, this, SLOT (saturationIncrease()), m_ac, "video_saturation_up"); + action = new TDEAction (i18n("Increase &Saturation"), 0, CTRL + Key_8, this, TQ_SLOT (saturationIncrease()), m_ac, "video_saturation_up"); action -> setStatusText (i18n("Increases video saturation")); action -> setWhatsThis (i18n("Increase Saturation command increases the video saturation.")); - sa = new KPlayerSliderAction (i18n("Contrast"), 0, this, SLOT (contrastChanged (int)), m_ac, "video_contrast"); + sa = new KPlayerSliderAction (i18n("Contrast"), 0, this, TQ_SLOT (contrastChanged (int)), m_ac, "video_contrast"); sa -> setStatusText (i18n("Changes contrast level")); sa -> setWhatsThis (i18n("Contrast slider shows the current video contrast level and allows you to change it.")); - sa = new KPlayerSliderAction (i18n("Brightness"), 0, this, SLOT (brightnessChanged (int)), m_ac, "video_brightness"); + sa = new KPlayerSliderAction (i18n("Brightness"), 0, this, TQ_SLOT (brightnessChanged (int)), m_ac, "video_brightness"); sa -> setStatusText (i18n("Changes brightness level")); sa -> setWhatsThis (i18n("Brightness slider shows the current video brightness level and allows you to change it.")); - sa = new KPlayerSliderAction (i18n("Hue"), 0, this, SLOT (hueChanged (int)), m_ac, "video_hue"); + sa = new KPlayerSliderAction (i18n("Hue"), 0, this, TQ_SLOT (hueChanged (int)), m_ac, "video_hue"); sa -> setStatusText (i18n("Changes hue level")); sa -> setWhatsThis (i18n("Hue slider shows the current video hue level and allows you to change it.")); - sa = new KPlayerSliderAction (i18n("Saturation"), 0, this, SLOT (saturationChanged (int)), m_ac, "video_saturation"); + sa = new KPlayerSliderAction (i18n("Saturation"), 0, this, TQ_SLOT (saturationChanged (int)), m_ac, "video_saturation"); sa -> setStatusText (i18n("Changes saturation level")); sa -> setWhatsThis (i18n("Saturation slider shows the current video saturation level and allows you to change it.")); - psa = new KPlayerPopupSliderAction (i18n("Contrast"), "contrast", Key_F5, this, SLOT (contrastChanged (int)), m_ac, "popup_contrast"); + psa = new KPlayerPopupSliderAction (i18n("Contrast"), "contrast", Key_F5, this, TQ_SLOT (contrastChanged (int)), m_ac, "popup_contrast"); psa -> setStatusText (i18n("Shows the contrast popup slider")); psa -> setWhatsThis (i18n("Contrast button displays a slider that shows the current video contrast level and allows you to change it.")); - psa = new KPlayerPopupSliderAction (i18n("Brightness"), "brightness", Key_F6, this, SLOT (brightnessChanged (int)), m_ac, "popup_brightness"); + psa = new KPlayerPopupSliderAction (i18n("Brightness"), "brightness", Key_F6, this, TQ_SLOT (brightnessChanged (int)), m_ac, "popup_brightness"); psa -> setStatusText (i18n("Shows the brightness popup slider")); psa -> setWhatsThis (i18n("Brightness button displays a slider that shows the current video brightness level and allows you to change it.")); - psa = new KPlayerPopupSliderAction (i18n("Hue"), "hue", Key_F7, this, SLOT (hueChanged (int)), m_ac, "popup_hue"); + psa = new KPlayerPopupSliderAction (i18n("Hue"), "hue", Key_F7, this, TQ_SLOT (hueChanged (int)), m_ac, "popup_hue"); psa -> setStatusText (i18n("Shows the hue popup slider")); psa -> setWhatsThis (i18n("Hue button displays a slider that shows the current video hue level and allows you to change it.")); - psa = new KPlayerPopupSliderAction (i18n("Saturation"), "saturation", Key_F8, this, SLOT (saturationChanged (int)), m_ac, "popup_saturation"); + psa = new KPlayerPopupSliderAction (i18n("Saturation"), "saturation", Key_F8, this, TQ_SLOT (saturationChanged (int)), m_ac, "popup_saturation"); psa -> setStatusText (i18n("Shows the saturation popup slider")); psa -> setWhatsThis (i18n("Saturation button displays a slider that shows the current video saturation level and allows you to change it.")); - toggle = new TDEToggleAction (i18n("S&oft Frame Dropping"), 0, 0, this, SLOT (softFrameDrop()), m_ac, "player_soft_frame_drop"); + toggle = new TDEToggleAction (i18n("S&oft Frame Dropping"), 0, 0, this, TQ_SLOT (softFrameDrop()), m_ac, "player_soft_frame_drop"); toggle -> setStatusText (i18n("Turns soft frame dropping on/off")); toggle -> setWhatsThis (i18n("Soft Frame Dropping command toggles the soft frame dropping option. If your system is too slow to play a file, MPlayer can drop some frames so playback does not slow down. The soft option drops frames less aggressively than the hard one, and should not cause playback problems. The Frame drop option can also be set on the Advanced page either globally in KPlayer Settings or for a particular file in the File Properties.")); toggle -> setExclusiveGroup ("framedrop"); - toggle = new TDEToggleAction (i18n("&Hard Frame Dropping"), 0, 0, this, SLOT (hardFrameDrop()), m_ac, "player_hard_frame_drop"); + toggle = new TDEToggleAction (i18n("&Hard Frame Dropping"), 0, 0, this, TQ_SLOT (hardFrameDrop()), m_ac, "player_hard_frame_drop"); toggle -> setStatusText (i18n("Turns hard frame dropping on/off")); toggle -> setWhatsThis (i18n("Hard Frame Dropping command toggles the hard frame dropping option. If your system is too slow to play a file, MPlayer can drop some frames so playback does not slow down. The hard option drops frames more aggressively than the soft one, and may sometimes break decoding. The Frame drop option can also be set on the Advanced page either globally in KPlayer Settings or for a particular file in the File Properties.")); toggle -> setExclusiveGroup ("framedrop"); - action = new TDEAction (i18n("Move &Down"), 0, CTRL + Key_Comma, this, SLOT (subtitlesMoveDown()), m_ac, "subtitles_move_down"); + action = new TDEAction (i18n("Move &Down"), 0, CTRL + Key_Comma, this, TQ_SLOT (subtitlesMoveDown()), m_ac, "subtitles_move_down"); action -> setStatusText (i18n("Moves subtitles down")); action -> setWhatsThis (i18n("Move Down command moves the subtitles down.")); - action = new TDEAction (i18n("Move &Up"), 0, CTRL + Key_Period, this, SLOT (subtitlesMoveUp()), m_ac, "subtitles_move_up"); + action = new TDEAction (i18n("Move &Up"), 0, CTRL + Key_Period, this, TQ_SLOT (subtitlesMoveUp()), m_ac, "subtitles_move_up"); action -> setStatusText (i18n("Moves subtitles up")); action -> setWhatsThis (i18n("Move Up command moves the subtitles up.")); - action = new TDEAction (i18n("D&ecrease Delay"), 0, CTRL + Key_Apostrophe, this, SLOT (subtitlesDelayDecrease()), m_ac, "subtitles_delay_decrease"); + action = new TDEAction (i18n("D&ecrease Delay"), 0, CTRL + Key_Apostrophe, this, TQ_SLOT (subtitlesDelayDecrease()), m_ac, "subtitles_delay_decrease"); action -> setStatusText (i18n("Decreases subtitle delay")); action -> setWhatsThis (i18n("Decrease Delay command decreases the delay of subtitles relative to video.")); - action = new TDEAction (i18n("I&ncrease Delay"), 0, CTRL + Key_Semicolon, this, SLOT (subtitlesDelayIncrease()), m_ac, "subtitles_delay_increase"); + action = new TDEAction (i18n("I&ncrease Delay"), 0, CTRL + Key_Semicolon, this, TQ_SLOT (subtitlesDelayIncrease()), m_ac, "subtitles_delay_increase"); action -> setStatusText (i18n("Increases subtitle delay")); action -> setWhatsThis (i18n("Increase Delay command increases the delay of subtitles relative to video.")); m_video_action_list = new KPlayerTrackActionList (i18n("Track %1"), i18n("Selects %1 video track"), i18n("Video %1 command switches to the selected video track."), this, "video_streams"); - connect (videoActionList(), SIGNAL (activated (int)), SLOT (videoStream (int))); + connect (videoActionList(), TQ_SIGNAL (activated (int)), TQ_SLOT (videoStream (int))); m_audio_action_list = new KPlayerTrackActionList (i18n("Track %1"), i18n("Selects %1 audio track"), i18n("Audio %1 command switches to the selected audio track."), this, "audio_streams"); - connect (audioActionList(), SIGNAL (activated (int)), SLOT (audioStream (int))); + connect (audioActionList(), TQ_SIGNAL (activated (int)), TQ_SLOT (audioStream (int))); m_subtitle_action_list = new KPlayerSubtitleTrackActionList (i18n("Track %1"), i18n("Selects %1 subtitle track"), i18n("Subtitles %1 command switches to the selected subtitle track."), this, "subtitle_streams"); - connect (subtitleActionList(), SIGNAL (activated (int)), SLOT (subtitleStream (int))); + connect (subtitleActionList(), TQ_SIGNAL (activated (int)), TQ_SLOT (subtitleStream (int))); refreshSettings(); enablePlayerActions(); @@ -1212,10 +1212,10 @@ void KPlayerEngine::load (KURL url) m_stop = false; m_play_pending = false; if ( settings() -> properties() ) - disconnect (settings() -> properties(), SIGNAL (updated()), this, SLOT (refreshProperties())); + disconnect (settings() -> properties(), TQ_SIGNAL (updated()), this, TQ_SLOT (refreshProperties())); settings() -> load (url); process() -> load (url); - connect (settings() -> properties(), SIGNAL (updated()), this, SLOT (refreshProperties())); + connect (settings() -> properties(), TQ_SIGNAL (updated()), this, TQ_SLOT (refreshProperties())); playerProgressChanged (0, KPlayerProcess::Position); settings() -> clearSubtitles(); if ( properties() -> subtitleAutoload() ) @@ -1997,9 +1997,9 @@ void KPlayerEngine::getLists (TQString path) KPlayerLineOutputProcess* player = new KPlayerLineOutputProcess; *player << path << "-identify" << "-ac" << "help" << "-ao" << "help" << "-vc" << "help" << "-vo" << "help" << "-demuxer" << "help"; - connect (player, SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)), - SLOT (receivedOutput (KPlayerLineOutputProcess*, char*, int))); - connect (player, SIGNAL (processExited (TDEProcess*)), SLOT (processExited (TDEProcess*))); + connect (player, TQ_SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)), + TQ_SLOT (receivedOutput (KPlayerLineOutputProcess*, char*, int))); + connect (player, TQ_SIGNAL (processExited (TDEProcess*)), TQ_SLOT (processExited (TDEProcess*))); player -> start (TDEProcess::NotifyOnExit, TDEProcess::All); } @@ -2269,9 +2269,9 @@ void KPlayerEngine::runAmixer (const TQString& command, const TQString& paramete kdDebugTime() << " Volume " << parameter << "\n"; #endif } - connect (amixer, SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)), - SLOT (amixerOutput (KPlayerLineOutputProcess*, char*, int))); - connect (amixer, SIGNAL (processExited (TDEProcess*)), SLOT (amixerExited (TDEProcess*))); + connect (amixer, TQ_SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)), + TQ_SLOT (amixerOutput (KPlayerLineOutputProcess*, char*, int))); + connect (amixer, TQ_SIGNAL (processExited (TDEProcess*)), TQ_SLOT (amixerExited (TDEProcess*))); m_amixer_running = amixer -> start (TDEProcess::NotifyOnExit, TDEProcess::All); } diff --git a/kplayer/kplayerlogwindow.cpp b/kplayer/kplayerlogwindow.cpp index 04f006a..fddb0ad 100644 --- a/kplayer/kplayerlogwindow.cpp +++ b/kplayer/kplayerlogwindow.cpp @@ -77,16 +77,16 @@ KPlayerLogWidget::KPlayerLogWidget (TDEActionCollection* ac, TQWidget* parent, c setTextFormat (TQt::PlainText); setReadOnly (true); setError (false); - TDEAction* action = new TDEAction (i18n("&Select All"), 0, 0, this, SLOT (selectAll()), m_ac, "log_select_all"); + TDEAction* action = new TDEAction (i18n("&Select All"), 0, 0, this, TQ_SLOT (selectAll()), m_ac, "log_select_all"); action -> setStatusText (i18n("Selects all messages in the message log")); action -> setWhatsThis (i18n("Select All command selects all messages in the message log.")); - action = new TDEAction (i18n("&Copy"), 0, 0, this, SLOT (copy()), m_ac, "log_copy"); + action = new TDEAction (i18n("&Copy"), 0, 0, this, TQ_SLOT (copy()), m_ac, "log_copy"); action -> setStatusText (i18n("Copies the text selected in the message log to the clipboard")); action -> setWhatsThis (i18n("Copy command copies the text selected in the message log to the clipboard.")); - action = new TDEAction (i18n("C&lear"), 0, 0, this, SLOT (clear()), m_ac, "log_clear"); + action = new TDEAction (i18n("C&lear"), 0, 0, this, TQ_SLOT (clear()), m_ac, "log_clear"); action -> setStatusText (i18n("Clears all messages from the message log")); action -> setWhatsThis (i18n("Clear command removes all messages from the message log.")); - connect (this, SIGNAL (selectionChanged()), SLOT (updateActions())); + connect (this, TQ_SIGNAL (selectionChanged()), TQ_SLOT (updateActions())); } void KPlayerLogWidget::updateActions (void) diff --git a/kplayer/kplayernode.cpp b/kplayer/kplayernode.cpp index 9b5e1dd..2c8df47 100644 --- a/kplayer/kplayernode.cpp +++ b/kplayer/kplayernode.cpp @@ -90,7 +90,7 @@ void KPlayerNode::setup (KPlayerContainerNode* parent, const TQString& id, KPlay void KPlayerNode::setupMedia (void) { m_media = KPlayerMedia::genericProperties (metaurl()); - connect (media(), SIGNAL (updated()), SLOT (updated())); + connect (media(), TQ_SIGNAL (updated()), TQ_SLOT (updated())); } void KPlayerNode::setupChildren (KPlayerContainerNode*) @@ -281,7 +281,7 @@ void KPlayerMediaNode::setupMedia (void) { setupUrl(); m_media = KPlayerMedia::trackProperties (metaurl()); - connect (media(), SIGNAL (updated()), SLOT (updated())); + connect (media(), TQ_SIGNAL (updated()), TQ_SLOT (updated())); } void KPlayerMediaNode::setupUrl (void) @@ -1956,7 +1956,7 @@ void KPlayerPlaylistNode::setupSource (void) { m_duplicates = acceptsDuplicates(); KPlayerGroupNode::setupSource(); - connect (configuration(), SIGNAL (updated()), SLOT (configurationUpdated())); + connect (configuration(), TQ_SIGNAL (updated()), TQ_SLOT (configurationUpdated())); if ( ! parent() -> parent() && id() == "playlists" && ! media() -> hasChildren() ) { TQString group ("Playlist Entries"); @@ -2003,8 +2003,8 @@ void KPlayerPlaylistNode::setupOrigin (void) if ( origin() && origin() -> hasProperties() ) { media() -> setDefaultName (origin() -> name()); - connect (origin() -> parent(), SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), - SLOT (originUpdated (KPlayerContainerNode*, KPlayerNode*))); + connect (origin() -> parent(), TQ_SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), + TQ_SLOT (originUpdated (KPlayerContainerNode*, KPlayerNode*))); } } @@ -2039,8 +2039,8 @@ void KPlayerPlaylistNode::releaseOrigin (void) kdDebugTime() << "KPlayerPlaylistNode::releaseOrigin\n"; #endif if ( origin() && origin() -> hasProperties() ) - disconnect (origin() -> parent(), SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), - this, SLOT (originUpdated (KPlayerContainerNode*, KPlayerNode*))); + disconnect (origin() -> parent(), TQ_SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), + this, TQ_SLOT (originUpdated (KPlayerContainerNode*, KPlayerNode*))); KPlayerGroupNode::releaseOrigin(); } @@ -2162,8 +2162,8 @@ void KPlayerNowPlayingNode::setupOrigin (void) KPlayerContainerNode* origin = root() -> getNodeByUrl (KURL::fromPathOrURL (disk -> localPath())); if ( origin ) { - disconnect (m_origin -> parent(), SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), - this, SLOT (originUpdated (KPlayerContainerNode*, KPlayerNode*))); + disconnect (m_origin -> parent(), TQ_SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), + this, TQ_SLOT (originUpdated (KPlayerContainerNode*, KPlayerNode*))); m_origin -> reference(); m_origin -> release(); setOrigin (origin); @@ -2202,8 +2202,8 @@ void KPlayerNowPlayingNode::originUpdated (KPlayerContainerNode*, KPlayerNode* n KPlayerContainerNode* origin = root() -> getNodeByUrl (KURL::fromPathOrURL (disk -> localPath())); if ( origin ) { - disconnect (node -> parent(), SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), - this, SLOT (originUpdated (KPlayerContainerNode*, KPlayerNode*))); + disconnect (node -> parent(), TQ_SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), + this, TQ_SLOT (originUpdated (KPlayerContainerNode*, KPlayerNode*))); node -> release(); origin -> reference(); setOrigin (origin); @@ -2396,10 +2396,10 @@ void KPlayerDevicesNode::setupSource (void) kdDebugTime() << " Path " << m_directory.path() << "\n"; kdDebugTime() << " Method " << m_watch.internalMethod() << "\n"; #endif - connect (&m_watch, SIGNAL (dirty (const TQString&)), SLOT (dirty (const TQString&))); - connect (&m_lister, SIGNAL (completed()), SLOT (completed())); - connect (&m_lister, SIGNAL (newItems (const KFileItemList&)), SLOT (refresh (const KFileItemList&))); - connect (&m_lister, SIGNAL (deleteItem (KFileItem*)), SLOT (removed (KFileItem*))); + connect (&m_watch, TQ_SIGNAL (dirty (const TQString&)), TQ_SLOT (dirty (const TQString&))); + connect (&m_lister, TQ_SIGNAL (completed()), TQ_SLOT (completed())); + connect (&m_lister, TQ_SIGNAL (newItems (const KFileItemList&)), TQ_SLOT (refresh (const KFileItemList&))); + connect (&m_lister, TQ_SIGNAL (deleteItem (KFileItem*)), TQ_SLOT (removed (KFileItem*))); TQStringList mimetypes; mimetypes.append ("media/audiocd"); mimetypes.append ("media/bluray_mounted"); @@ -2836,7 +2836,7 @@ void KPlayerDiskNode::setupMedia (void) media() -> setDefaultName (parent() -> deviceName (id())); diskInserted(); if ( ! disk() ) - connect (media(), SIGNAL (updated()), SLOT (updated())); + connect (media(), TQ_SIGNAL (updated()), TQ_SLOT (updated())); } void KPlayerDiskNode::setupSource (void) @@ -2935,7 +2935,7 @@ void KPlayerDiskNode::diskDetected (const TQString& diskid) KPlayerGenericProperties* previous = media(); previous -> disconnect (this); m_media = m_disk = KPlayerMedia::diskProperties (m_device, "kplayer:/disks/" + diskid); - connect (media(), SIGNAL (updated()), SLOT (updated())); + connect (media(), TQ_SIGNAL (updated()), TQ_SLOT (updated())); const TQString& type (parent() -> diskType (id())); if ( type.isNull() ) disk() -> setDefaultName (i18n("Disk in %2").arg (device() -> name())); @@ -2970,7 +2970,7 @@ void KPlayerDiskNode::diskInserted (const TQString& path) TQString urls ("kplayer:/disks" + id()); KPlayerEngine::engine() -> meta() -> deleteGroup (urls); m_media = m_disk = KPlayerMedia::diskProperties (m_device, urls); - connect (media(), SIGNAL (updated()), SLOT (updated())); + connect (media(), TQ_SIGNAL (updated()), TQ_SLOT (updated())); setDiskType (type); media() -> diff (previous); if ( previous != device() ) @@ -2988,7 +2988,7 @@ void KPlayerDiskNode::diskInserted (const TQString& path) TQString urls ("kplayer:/disks" + id()); KPlayerEngine::engine() -> meta() -> deleteGroup (urls); m_media = m_disk = KPlayerMedia::diskProperties (device(), urls); - connect (media(), SIGNAL (updated()), SLOT (updated())); + connect (media(), TQ_SIGNAL (updated()), TQ_SLOT (updated())); setDiskType (type); media() -> diff (device()); } @@ -3011,7 +3011,7 @@ void KPlayerDiskNode::diskRemoved (void) KPlayerDiskProperties* d = disk(); m_disk = 0; m_media = device(); - connect (media(), SIGNAL (updated()), SLOT (updated())); + connect (media(), TQ_SIGNAL (updated()), TQ_SLOT (updated())); media() -> diff (d); KPlayerMedia::release (d); } @@ -3028,7 +3028,7 @@ void KPlayerDiskNode::getLocalPath (void) return; m_url = "list://"; TDEIO::ListJob* job = TDEIO::listDir ("media:/" + url().fileName(), false, false); - connect (job, SIGNAL(result(TDEIO::Job*)), SLOT(listResult(TDEIO::Job*))); + connect (job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(listResult(TDEIO::Job*))); } void KPlayerDiskNode::listResult (TDEIO::Job* job) @@ -3043,13 +3043,13 @@ void KPlayerDiskNode::listResult (TDEIO::Job* job) #endif m_url = "mount://"; TDEIO::SimpleJob* job = TDEIO::mount (true, 0, id(), TQString::null, false); - connect (job, SIGNAL(result(TDEIO::Job*)), SLOT(mountResult(TDEIO::Job*))); + connect (job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(mountResult(TDEIO::Job*))); } else { m_url = "path://"; TDEIO::StatJob* job = TDEIO::stat ("media:/" + url().fileName(), false); - connect (job, SIGNAL(result(TDEIO::Job*)), SLOT(pathResult(TDEIO::Job*))); + connect (job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(pathResult(TDEIO::Job*))); } } @@ -3062,7 +3062,7 @@ void KPlayerDiskNode::mountResult (TDEIO::Job* job) #endif m_url = "path://"; job = TDEIO::stat ("media:/" + url().fileName(), false); - connect (job, SIGNAL(result(TDEIO::Job*)), SLOT(pathResult(TDEIO::Job*))); + connect (job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(pathResult(TDEIO::Job*))); } void KPlayerDiskNode::pathResult (TDEIO::Job* job) @@ -3141,7 +3141,7 @@ void KPlayerDiskNode::autodetect (void) { m_url = "data://"; TDEIO::StatJob* job = TDEIO::stat ("media:/" + url().fileName(), false); - connect (job, SIGNAL(result(TDEIO::Job*)), SLOT(statResult(TDEIO::Job*))); + connect (job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(statResult(TDEIO::Job*))); return; } else if (m_fast_autodetect && disk() -> type() == "BLURAY" && m_url != "bluray://" ) @@ -3164,9 +3164,9 @@ void KPlayerDiskNode::autodetect (void) *process << "vcd://1" << "vcd://2"; else *process << m_url; - connect (process, SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)), - SLOT (receivedOutput (KPlayerLineOutputProcess*, char*, int))); - connect (process, SIGNAL (processExited (TDEProcess*)), SLOT (processExited (TDEProcess*))); + connect (process, TQ_SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)), + TQ_SLOT (receivedOutput (KPlayerLineOutputProcess*, char*, int))); + connect (process, TQ_SIGNAL (processExited (TDEProcess*)), TQ_SLOT (processExited (TDEProcess*))); process -> start (TDEProcess::NotifyOnExit, TDEProcess::All); } @@ -3219,9 +3219,9 @@ void KPlayerDiskNode::processExited (TDEProcess* process) KPlayerLineOutputProcess* process = new KPlayerLineOutputProcess; *process << media() -> executablePath() << "-cdrom-device" << id() << "-v" << "-identify" << "-ao" << "null" << "-vo" << "null" << "-frames" << "0" << "cddb://"; - connect (process, SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)), - SLOT (receivedCddbOutput (KPlayerLineOutputProcess*, char*, int))); - connect (process, SIGNAL (processExited (TDEProcess*)), SLOT (cddbProcessExited (TDEProcess*))); + connect (process, TQ_SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)), + TQ_SLOT (receivedCddbOutput (KPlayerLineOutputProcess*, char*, int))); + connect (process, TQ_SIGNAL (processExited (TDEProcess*)), TQ_SLOT (cddbProcessExited (TDEProcess*))); process -> start (TDEProcess::NotifyOnExit, TDEProcess::All); return; } @@ -3439,7 +3439,7 @@ void KPlayerTVNode::setupMedia (void) if ( ! media() -> hasType() ) media() -> setType (parent() -> deviceType (id())); media() -> setDefaultName (parent() -> deviceName (id())); - connect (media(), SIGNAL (updated()), SLOT (updated())); + connect (media(), TQ_SIGNAL (updated()), TQ_SLOT (updated())); } KPlayerDVBNode::~KPlayerDVBNode() @@ -3452,7 +3452,7 @@ void KPlayerDVBNode::setupMedia (void) if ( ! media() -> hasType() ) media() -> setType (parent() -> deviceType (id())); media() -> setDefaultName (parent() -> deviceName (id())); - connect (media(), SIGNAL (updated()), SLOT (updated())); + connect (media(), TQ_SIGNAL (updated()), TQ_SLOT (updated())); } #if 0 diff --git a/kplayer/kplayernodeaction.cpp b/kplayer/kplayernodeaction.cpp index fce7941..a58089d 100644 --- a/kplayer/kplayernodeaction.cpp +++ b/kplayer/kplayernodeaction.cpp @@ -54,12 +54,12 @@ void KPlayerNodeActionList::initialize (const KURL& url) node() -> reference(); populateNode(); updateActions(); - connect (node(), SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), - SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); - connect (node(), SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), - SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); - connect (node(), SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), - SLOT (updated (KPlayerContainerNode*, KPlayerNode*))); + connect (node(), TQ_SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), + TQ_SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); + connect (node(), TQ_SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), + TQ_SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); + connect (node(), TQ_SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), + TQ_SLOT (updated (KPlayerContainerNode*, KPlayerNode*))); } } @@ -145,7 +145,7 @@ TDEAction* KPlayerNodeActionList::createAction (KPlayerNode* node) #ifdef DEBUG_KPLAYER_NODEACTION kdDebugTime() << " Name " << name << "\n"; #endif - TDEAction* action = new TDEAction (m_text.arg (name), 0, this, SLOT (actionActivated()), node); + TDEAction* action = new TDEAction (m_text.arg (name), 0, this, TQ_SLOT (actionActivated()), node); updateAction (action); return action; } @@ -285,7 +285,7 @@ TDEAction* KPlayerDevicesActionList::createAction (KPlayerNode* node) (KPlayerDeviceActionMenu*) new KPlayerDiskActionMenu (device); updateAction (action); action -> setup(); - connect (action, SIGNAL (activated (KPlayerNode*)), parent(), SLOT (play (KPlayerNode*))); + connect (action, TQ_SIGNAL (activated (KPlayerNode*)), parent(), TQ_SLOT (play (KPlayerNode*))); return action; } @@ -299,12 +299,12 @@ KPlayerDeviceActionMenu::KPlayerDeviceActionMenu (KPlayerDeviceNode* device) setDelayed (false); m_populated = false; device -> reference(); - connect (device, SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), - SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); - connect (device, SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), - SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); - connect (device, SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), - SLOT (updated (KPlayerContainerNode*, KPlayerNode*))); + connect (device, TQ_SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), + TQ_SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); + connect (device, TQ_SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), + TQ_SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); + connect (device, TQ_SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), + TQ_SLOT (updated (KPlayerContainerNode*, KPlayerNode*))); } KPlayerDeviceActionMenu::~KPlayerDeviceActionMenu() @@ -372,7 +372,7 @@ void KPlayerDeviceActionMenu::updateActions (void) ++ actit; } if ( ! action ) - action = new TDEAction (i18n("Play %1").arg (node -> name()), 0, this, SLOT (play()), node); + action = new TDEAction (i18n("Play %1").arg (node -> name()), 0, this, TQ_SLOT (play()), node); m_actions.append (action); ++ iterator; } @@ -435,8 +435,8 @@ KPlayerDiskActionMenu::KPlayerDiskActionMenu (KPlayerDeviceNode* device) kdDebugTime() << " URL " << device -> url().url() << "\n"; #endif m_play_disk = false; - m_load_action = new TDEAction (i18n("&Load Disk"), 0, this, SLOT (loadDisk()), device); - m_play_action = new TDEAction (i18n("&Play Disk"), 0, this, SLOT (playDisk()), device); + m_load_action = new TDEAction (i18n("&Load Disk"), 0, this, TQ_SLOT (loadDisk()), device); + m_play_action = new TDEAction (i18n("&Play Disk"), 0, this, TQ_SLOT (playDisk()), device); } KPlayerDiskActionMenu::~KPlayerDiskActionMenu() diff --git a/kplayer/kplayernodeview.cpp b/kplayer/kplayernodeview.cpp index dc08a30..ed02685 100644 --- a/kplayer/kplayernodeview.cpp +++ b/kplayer/kplayernodeview.cpp @@ -325,12 +325,12 @@ void KPlayerListViewFolderItem::initialize (void) void KPlayerListViewFolderItem::connectNodeCommon (void) { - TQObject::connect (node(), SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), - nodeView(), SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); - TQObject::connect (node(), SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), - nodeView(), SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); - TQObject::connect (node(), SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), - nodeView(), SLOT (updated (KPlayerContainerNode*, KPlayerNode*))); + TQObject::connect (node(), TQ_SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), + nodeView(), TQ_SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); + TQObject::connect (node(), TQ_SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), + nodeView(), TQ_SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); + TQObject::connect (node(), TQ_SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), + nodeView(), TQ_SLOT (updated (KPlayerContainerNode*, KPlayerNode*))); } void KPlayerListViewFolderItem::connectNode (void) @@ -341,18 +341,18 @@ void KPlayerListViewFolderItem::connectNode (void) #endif connectNodeCommon(); if ( isOpen() ) - TQObject::connect (node(), SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), - listView(), SLOT (updateAttributes (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&))); + TQObject::connect (node(), TQ_SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), + listView(), TQ_SLOT (updateAttributes (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&))); } void KPlayerListViewFolderItem::disconnectNodeCommon (void) { - TQObject::disconnect (node(), SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), - nodeView(), SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); - TQObject::disconnect (node(), SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), - nodeView(), SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); - TQObject::disconnect (node(), SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), - nodeView(), SLOT (updated (KPlayerContainerNode*, KPlayerNode*))); + TQObject::disconnect (node(), TQ_SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), + nodeView(), TQ_SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); + TQObject::disconnect (node(), TQ_SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), + nodeView(), TQ_SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); + TQObject::disconnect (node(), TQ_SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), + nodeView(), TQ_SLOT (updated (KPlayerContainerNode*, KPlayerNode*))); } void KPlayerListViewFolderItem::disconnectNode (void) @@ -362,8 +362,8 @@ void KPlayerListViewFolderItem::disconnectNode (void) kdDebugTime() << " URL " << node() -> url() << "\n"; #endif disconnectNodeCommon(); - TQObject::disconnect (node(), SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), - listView(), SLOT (updateAttributes (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&))); + TQObject::disconnect (node(), TQ_SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), + listView(), TQ_SLOT (updateAttributes (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&))); } void KPlayerListViewFolderItem::populateNode (void) @@ -373,8 +373,8 @@ void KPlayerListViewFolderItem::populateNode (void) #endif node() -> populate(); listView() -> updateAttributes (node() -> attributeCounts(), KPlayerPropertyCounts()); - TQObject::connect (node(), SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), - listView(), SLOT (updateAttributes (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&))); + TQObject::connect (node(), TQ_SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), + listView(), TQ_SLOT (updateAttributes (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&))); } void KPlayerListViewFolderItem::vacateNode (void) @@ -382,8 +382,8 @@ void KPlayerListViewFolderItem::vacateNode (void) #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "Vacating list view folder item node\n"; #endif - TQObject::disconnect (node(), SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), - listView(), SLOT (updateAttributes (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&))); + TQObject::disconnect (node(), TQ_SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), + listView(), TQ_SLOT (updateAttributes (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&))); listView() -> updateAttributes (KPlayerPropertyCounts(), node() -> attributeCounts()); node() -> vacate(); } @@ -632,7 +632,7 @@ void KPlayerHistoryActionList::update (void) -- iterator; if ( actions().count() == limit ) m_actions.removeFirst(); - TDEToggleAction* action = new TDEToggleAction ((*iterator).m_name, 0, this, SLOT(actionActivated()), this); + TDEToggleAction* action = new TDEToggleAction ((*iterator).m_name, 0, this, TQ_SLOT(actionActivated()), this); if ( iterator == m_current ) { action -> setChecked (true); @@ -705,16 +705,16 @@ void KPlayerNodeView::initialize (void) setShowSortIndicator (true); setTabOrderedRenaming (false); renameLineEdit() -> setFrame (true); - //header() -> disconnect (SIGNAL (clicked (int)), this); - //header() -> disconnect (SIGNAL (sectionClicked (int)), this); - //header() -> disconnect (SIGNAL (sectionHandleDoubleClicked (int)), this); - connect (this, SIGNAL (selectionChanged()), SLOT (itemSelectionChanged())); - connect (this, SIGNAL (executed (TQListViewItem*)), SLOT (itemExecuted (TQListViewItem*))); + //header() -> disconnect (TQ_SIGNAL (clicked (int)), this); + //header() -> disconnect (TQ_SIGNAL (sectionClicked (int)), this); + //header() -> disconnect (TQ_SIGNAL (sectionHandleDoubleClicked (int)), this); + connect (this, TQ_SIGNAL (selectionChanged()), TQ_SLOT (itemSelectionChanged())); + connect (this, TQ_SIGNAL (executed (TQListViewItem*)), TQ_SLOT (itemExecuted (TQListViewItem*))); if ( library() -> popupMenu() ) - connect (this, SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)), - SLOT (showContextMenu (TDEListView*, TQListViewItem*, const TQPoint&))); - connect (this, SIGNAL (itemRenamed (TQListViewItem*, const TQString&, int)), - SLOT (edited (TQListViewItem*, const TQString&, int))); + connect (this, TQ_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)), + TQ_SLOT (showContextMenu (TDEListView*, TQListViewItem*, const TQPoint&))); + connect (this, TQ_SIGNAL (itemRenamed (TQListViewItem*, const TQString&, int)), + TQ_SLOT (edited (TQListViewItem*, const TQString&, int))); header() -> installEventFilter (this); renameLineEdit() -> installEventFilter (this); } @@ -724,28 +724,28 @@ void KPlayerNodeView::terminate (void) #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "Terminating node view\n"; #endif - disconnect (this, SIGNAL (selectionChanged()), this, SLOT (itemSelectionChanged())); + disconnect (this, TQ_SIGNAL (selectionChanged()), this, TQ_SLOT (itemSelectionChanged())); setRootNode (0); } void KPlayerNodeView::connectNodeCommon (void) { - connect (rootNode(), SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), - SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); - connect (rootNode(), SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), - SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); - connect (rootNode(), SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), - this, SLOT (updated (KPlayerContainerNode*, KPlayerNode*))); + connect (rootNode(), TQ_SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), + TQ_SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); + connect (rootNode(), TQ_SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), + TQ_SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); + connect (rootNode(), TQ_SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), + this, TQ_SLOT (updated (KPlayerContainerNode*, KPlayerNode*))); } void KPlayerNodeView::disconnectNodeCommon (void) { - disconnect (rootNode(), SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), - this, SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); - disconnect (rootNode(), SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), - this, SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); - disconnect (rootNode(), SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), - this, SLOT (updated (KPlayerContainerNode*, KPlayerNode*))); + disconnect (rootNode(), TQ_SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), + this, TQ_SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); + disconnect (rootNode(), TQ_SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), + this, TQ_SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); + disconnect (rootNode(), TQ_SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), + this, TQ_SLOT (updated (KPlayerContainerNode*, KPlayerNode*))); } KPlayerNode* KPlayerNodeView::currentNode (void) const @@ -962,8 +962,8 @@ void KPlayerNodeView::startEditing (TQListViewItem* item, int column) m_editing_item = (KPlayerListViewItem*) item; m_editing_column = column; rename (item, column); - connect (this, SIGNAL(contentsMoving(int, int)), SLOT(moveLineEdit(int, int))); - connect (header(), SIGNAL (sizeChange (int, int, int)), SLOT (moveLineEdit (int, int, int))); + connect (this, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(moveLineEdit(int, int))); + connect (header(), TQ_SIGNAL (sizeChange (int, int, int)), TQ_SLOT (moveLineEdit (int, int, int))); } void KPlayerNodeView::stopEditing (bool save, int state) @@ -971,8 +971,8 @@ void KPlayerNodeView::stopEditing (bool save, int state) #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerNodeView::stopEditing " << save << " " << state << "\n"; #endif - disconnect (header(), SIGNAL (sizeChange (int, int, int)), this, SLOT (moveLineEdit (int, int, int))); - disconnect (this, SIGNAL(contentsMoving(int, int)), this, SLOT(moveLineEdit(int, int))); + disconnect (header(), TQ_SIGNAL (sizeChange (int, int, int)), this, TQ_SLOT (moveLineEdit (int, int, int))); + disconnect (this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(moveLineEdit(int, int))); if ( renameLineEdit() -> isHidden() ) return; TQListViewItem* item = m_editing_item; @@ -1002,7 +1002,7 @@ void KPlayerNodeView::moveLineEdit (int x, int y) kdDebugTime() << " To " << x << "x" << y << "\n"; kdDebugTime() << " Edit " << renameLineEdit() -> x() << "x" << renameLineEdit() -> y() << "\n"; #endif - TQTimer::singleShot (0, this, SLOT (moveLineEdit())); + TQTimer::singleShot (0, this, TQ_SLOT (moveLineEdit())); } void KPlayerNodeView::moveLineEdit (void) @@ -1549,30 +1549,30 @@ void KPlayerNodeView::connectActions (void) #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "Connecting actions\n"; #endif - connect (action ("library_play"), SIGNAL(activated()), SLOT(play())); - connect (action ("library_play_next"), SIGNAL(activated()), SLOT(playNext())); - connect (action ("library_queue"), SIGNAL(activated()), SLOT(queue())); - connect (action ("library_queue_next"), SIGNAL(activated()), SLOT(queueNext())); - connect (action ("library_add_files"), SIGNAL(activated()), SLOT(addFiles())); - connect (action ("library_add_url"), SIGNAL(activated()), SLOT(addUrl())); - connect (action ("library_add_group"), SIGNAL(activated()), SLOT(addGroup())); - connect (action ("library_add_to_new_playlist"), SIGNAL(activated()), SLOT(addToNewPlaylist())); - connect (action ("library_add_to_playlists"), SIGNAL(activated()), SLOT(addToPlaylists())); - connect (playlistActionList(), SIGNAL(activated(KPlayerNode*)), SLOT(addToPlaylist(KPlayerNode*))); - connect (action ("library_add_to_collection"), SIGNAL(activated()), SLOT(addToCollection())); - connect (action ("library_rename"), SIGNAL(activated()), SLOT(editName())); - connect (editActionList(), SIGNAL(activated(int)), listView(), SLOT(editField(int))); - connect (action ("library_properties"), SIGNAL(activated()), SLOT(properties())); - connect (action ("library_select_all"), SIGNAL(activated()), listView(), SLOT(selectAll())); - connect (action ("library_move_up"), SIGNAL(activated()), SLOT(moveUp())); - connect (action ("library_move_down"), SIGNAL(activated()), SLOT(moveDown())); - connect (action ("library_remove"), SIGNAL(activated()), SLOT(remove())); - connect (columnActionList(), SIGNAL(activated(int)), listView(), SLOT(toggleColumn(int))); - connect (action ("library_go_back"), SIGNAL(activated()), treeView(), SLOT(goBack())); - connect (action ("library_go_forward"), SIGNAL(activated()), treeView(), SLOT(goForward())); - connect (action ("library_go_up"), SIGNAL(activated()), listView(), SLOT(goUp())); - connect (action ("library_go_down"), SIGNAL(activated()), listView(), SLOT(goDown())); - connect (action ("library_go_to_origin"), SIGNAL(activated()), SLOT(goToOrigin())); + connect (action ("library_play"), TQ_SIGNAL(activated()), TQ_SLOT(play())); + connect (action ("library_play_next"), TQ_SIGNAL(activated()), TQ_SLOT(playNext())); + connect (action ("library_queue"), TQ_SIGNAL(activated()), TQ_SLOT(queue())); + connect (action ("library_queue_next"), TQ_SIGNAL(activated()), TQ_SLOT(queueNext())); + connect (action ("library_add_files"), TQ_SIGNAL(activated()), TQ_SLOT(addFiles())); + connect (action ("library_add_url"), TQ_SIGNAL(activated()), TQ_SLOT(addUrl())); + connect (action ("library_add_group"), TQ_SIGNAL(activated()), TQ_SLOT(addGroup())); + connect (action ("library_add_to_new_playlist"), TQ_SIGNAL(activated()), TQ_SLOT(addToNewPlaylist())); + connect (action ("library_add_to_playlists"), TQ_SIGNAL(activated()), TQ_SLOT(addToPlaylists())); + connect (playlistActionList(), TQ_SIGNAL(activated(KPlayerNode*)), TQ_SLOT(addToPlaylist(KPlayerNode*))); + connect (action ("library_add_to_collection"), TQ_SIGNAL(activated()), TQ_SLOT(addToCollection())); + connect (action ("library_rename"), TQ_SIGNAL(activated()), TQ_SLOT(editName())); + connect (editActionList(), TQ_SIGNAL(activated(int)), listView(), TQ_SLOT(editField(int))); + connect (action ("library_properties"), TQ_SIGNAL(activated()), TQ_SLOT(properties())); + connect (action ("library_select_all"), TQ_SIGNAL(activated()), listView(), TQ_SLOT(selectAll())); + connect (action ("library_move_up"), TQ_SIGNAL(activated()), TQ_SLOT(moveUp())); + connect (action ("library_move_down"), TQ_SIGNAL(activated()), TQ_SLOT(moveDown())); + connect (action ("library_remove"), TQ_SIGNAL(activated()), TQ_SLOT(remove())); + connect (columnActionList(), TQ_SIGNAL(activated(int)), listView(), TQ_SLOT(toggleColumn(int))); + connect (action ("library_go_back"), TQ_SIGNAL(activated()), treeView(), TQ_SLOT(goBack())); + connect (action ("library_go_forward"), TQ_SIGNAL(activated()), treeView(), TQ_SLOT(goForward())); + connect (action ("library_go_up"), TQ_SIGNAL(activated()), listView(), TQ_SLOT(goUp())); + connect (action ("library_go_down"), TQ_SIGNAL(activated()), listView(), TQ_SLOT(goDown())); + connect (action ("library_go_to_origin"), TQ_SIGNAL(activated()), TQ_SLOT(goToOrigin())); } void KPlayerNodeView::showContextMenu (TDEListView*, TQListViewItem*, const TQPoint& point) @@ -1730,7 +1730,7 @@ void KPlayerNodeView::keepUpCurrentItem (TQListViewItem* current, TQListViewItem kdDebugTime() << " Current " << current -> text (0) << "\n"; #endif setCurrentItem (current); - TQTimer::singleShot (0, treeView(), SLOT (activateCurrentItem())); + TQTimer::singleShot (0, treeView(), TQ_SLOT (activateCurrentItem())); } } } @@ -2185,9 +2185,9 @@ void KPlayerListView::initialize (void) #endif KPlayerNodeView::initialize(); setSelectionMode (TQListView::Extended); - connect (header(), SIGNAL (indexChange (int, int, int)), SLOT (headerIndexChange (int, int, int))); - //connect (header(), SIGNAL (clicked (int)), SLOT (headerClicked (int))); - //connect (header(), SIGNAL (sectionHandleDoubleClicked (int)), SLOT (headerAdjustColumn (int))); + connect (header(), TQ_SIGNAL (indexChange (int, int, int)), TQ_SLOT (headerIndexChange (int, int, int))); + //connect (header(), TQ_SIGNAL (clicked (int)), TQ_SLOT (headerClicked (int))); + //connect (header(), TQ_SIGNAL (sectionHandleDoubleClicked (int)), TQ_SLOT (headerAdjustColumn (int))); resize (2000, height()); m_home_media = KPlayerNode::root() -> nodeById ("file:" + TQDir::homeDirPath()) -> media(); } @@ -2247,8 +2247,8 @@ void KPlayerListView::connectNode (void) #endif loadColumnWidths(); connectNodeCommon(); - connect (rootNode(), SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), - this, SLOT (updateAttributes (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&))); + connect (rootNode(), TQ_SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), + this, TQ_SLOT (updateAttributes (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&))); } void KPlayerListView::disconnectNode (void) @@ -2259,8 +2259,8 @@ void KPlayerListView::disconnectNode (void) #endif saveColumnWidths(); disconnectNodeCommon(); - disconnect (rootNode(), SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), - this, SLOT (updateAttributes (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&))); + disconnect (rootNode(), TQ_SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), + this, TQ_SLOT (updateAttributes (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&))); } bool KPlayerListView::showingMedia (void) const @@ -2920,7 +2920,7 @@ void KPlayerTreeView::initialize (void) setRootNode (KPlayerNode::root()); setSelected (firstChild(), true); if ( library() -> popupMenu() ) - connect (library() -> popupMenu(), SIGNAL (aboutToHide()), SLOT (popupMenuHidden())); + connect (library() -> popupMenu(), TQ_SIGNAL (aboutToHide()), TQ_SLOT (popupMenuHidden())); } void KPlayerTreeView::terminate (void) @@ -3287,7 +3287,7 @@ void KPlayerTreeView::popupMenuHidden (void) #endif m_popup_menu_shown = false; if ( currentItem() && activeNode() != currentNode() && renameLineEdit() -> isHidden() ) - TQTimer::singleShot (0, this, SLOT (resetActiveNode())); + TQTimer::singleShot (0, this, TQ_SLOT (resetActiveNode())); } void KPlayerTreeView::resetActiveNode (void) @@ -3369,7 +3369,7 @@ KPlayerLibrary::KPlayerLibrary (TDEActionCollection* ac, TQWidget* parent, const action -> setWhatsThis (i18n("Remove command removes the selected items from the multimedia library.")); m_go_to = new KPlayerContainerActionList ("%1", i18n("Opens %1 in the library window"), i18n("Go to %1 command opens the corresponding folder in the library window."), this, "library_go_to_list"); - connect (goToActionList(), SIGNAL(activated(KPlayerNode*)), SLOT(open(KPlayerNode*))); + connect (goToActionList(), TQ_SIGNAL(activated(KPlayerNode*)), TQ_SLOT(open(KPlayerNode*))); action = new TDEAction (i18n("&Back"), "back", ALT + Key_Left, m_ac, "library_go_back"); action -> setStatusText (i18n("Opens the previous folder")); action -> setWhatsThis (i18n("Go back command opens the previous folder from the history.")); @@ -3385,7 +3385,7 @@ KPlayerLibrary::KPlayerLibrary (TDEActionCollection* ac, TQWidget* parent, const action = new TDEAction (i18n("&To Origin"), 0, ALT + SHIFT + Key_Left, m_ac, "library_go_to_origin"); action -> setStatusText (i18n("Opens the origin of the current folder")); action -> setWhatsThis (i18n("Go to origin command opens the origin folder of the current folder.")); - action = new TDEAction (i18n("&Edit"), 0, 0, this, SLOT (editPlaylist()), m_ac, "playlist_edit"); + action = new TDEAction (i18n("&Edit"), 0, 0, this, TQ_SLOT (editPlaylist()), m_ac, "playlist_edit"); action -> setStatusText (i18n("Opens the playlist in the multimedia library")); action -> setWhatsThis (i18n("Edit command opens the playlist in the multimedia library and allows you to edit it.")); m_tree = new KPlayerTreeView (this); @@ -3407,8 +3407,8 @@ KPlayerLibrary::KPlayerLibrary (TDEActionCollection* ac, TQWidget* parent, const m_history_list = new KPlayerHistoryActionList (treeView() -> history(), treeView() -> currentHistoryEntry(), "%1", i18n("Opens %1 in the library window"), i18n("Go to %1 command opens the corresponding folder in the library window."), this, "library_history"); - connect (historyActionList(), SIGNAL(activated(const KPlayerHistory::Iterator&)), treeView(), - SLOT(goToHistory(const KPlayerHistory::Iterator&))); + connect (historyActionList(), TQ_SIGNAL(activated(const KPlayerHistory::Iterator&)), treeView(), + TQ_SLOT(goToHistory(const KPlayerHistory::Iterator&))); m_last_view = m_tree; } @@ -3483,14 +3483,14 @@ void KPlayerLibrary::disconnectActions (void) a = action ("library_add_to_playlists"); a -> disconnect(); a -> setEnabled (false); - playlistActionList() -> disconnect (SIGNAL(activated(KPlayerNode*))); + playlistActionList() -> disconnect (TQ_SIGNAL(activated(KPlayerNode*))); a = action ("library_add_to_collection"); a -> disconnect(); a -> setEnabled (false); a = action ("library_rename"); a -> disconnect(); a -> setEnabled (false); - editActionList() -> disconnect (SIGNAL(activated(int))); + editActionList() -> disconnect (TQ_SIGNAL(activated(int))); a = action ("library_properties"); a -> disconnect(); a -> setEnabled (false); @@ -3506,7 +3506,7 @@ void KPlayerLibrary::disconnectActions (void) a = action ("library_remove"); a -> disconnect(); a -> setEnabled (false); - columnActionList() -> disconnect (SIGNAL(activated(int))); + columnActionList() -> disconnect (TQ_SIGNAL(activated(int))); a = action ("library_go_back"); a -> disconnect(); a -> setEnabled (false); diff --git a/kplayer/kplayerpart.cpp b/kplayer/kplayerpart.cpp index d76d787..4ff3169 100644 --- a/kplayer/kplayerpart.cpp +++ b/kplayer/kplayerpart.cpp @@ -58,9 +58,9 @@ KPlayerPart::KPlayerPart (TQWidget* wparent, const char* wname, TQObject* parent KPlayerEngine::initialize (actionCollection(), wparent, wname); //KPlayerEngine::engine() -> configuration() -> setResizeAutomatically (false); setInstance (KPlayerPartFactory::instance()); -//connect (kPlayerProcess(), SIGNAL (stateChanged(KPlayerProcess::State)), this, SLOT (playerStateChanged(KPlayerProcess::State))); -//connect (kPlayerProcess(), SIGNAL (infoAvailable()), this, SLOT (playerInfoAvailable())); - connect (kPlayerWorkspace(), SIGNAL (contextMenu(const TQPoint&)), this, SLOT (widgetContextMenu(const TQPoint&))); +//connect (kPlayerProcess(), TQ_SIGNAL (stateChanged(KPlayerProcess::State)), this, TQ_SLOT (playerStateChanged(KPlayerProcess::State))); +//connect (kPlayerProcess(), TQ_SIGNAL (infoAvailable()), this, TQ_SLOT (playerInfoAvailable())); + connect (kPlayerWorkspace(), TQ_SIGNAL (contextMenu(const TQPoint&)), this, TQ_SLOT (widgetContextMenu(const TQPoint&))); setWidget (kPlayerWorkspace()); initActions(); setXMLFile ("kplayerpartui.rc"); @@ -181,7 +181,7 @@ bool KPlayerPart::closeURL (void) void KPlayerPart::initActions (void) { - TDEAction* action = new TDEAction (i18n("Start &KPlayer"), 0, 0, this, SLOT (launchKPlayer()), actionCollection(), "player_launch"); + TDEAction* action = new TDEAction (i18n("Start &KPlayer"), 0, 0, this, TQ_SLOT (launchKPlayer()), actionCollection(), "player_launch"); action -> setStatusText (i18n("Stops playback and starts KPlayer with the current URL")); action -> setWhatsThis (i18n("Start KPlayer command stops playback, opens the full KPlayer, puts the multimedia file or URL on the playlist and starts playing it. It is always recommended that you choose this command, since it will give you better interface and more options when playing the multimedia.")); kPlayerEngine() -> setActionCollection (actionCollection()); diff --git a/kplayer/kplayerplaylist.cpp b/kplayer/kplayerplaylist.cpp index 29b85a1..276602f 100644 --- a/kplayer/kplayerplaylist.cpp +++ b/kplayer/kplayerplaylist.cpp @@ -45,26 +45,26 @@ KPlayerPlaylist::KPlayerPlaylist (TDEActionCollection* ac, TQObject* parent, con m_ac = ac; m_current = 0; m_play_requested = false; - TDEAction* action = KStdAction::open (this, SLOT (filePlay()), m_ac); + TDEAction* action = KStdAction::open (this, TQ_SLOT (filePlay()), m_ac); action -> setText (i18n("&Play...")); action -> setStatusText (i18n("Plays an existing file")); action -> setWhatsThis (i18n("Play command displays the standard Open File dialog and lets you choose a file or several files to put on the playlist and start playing.")); - action = new TDEAction (i18n("Play &URL..."), "fileopenurl", CTRL + Key_U, this, SLOT (filePlayUrl()), m_ac, "file_open_url"); + action = new TDEAction (i18n("Play &URL..."), "fileopenurl", CTRL + Key_U, this, TQ_SLOT (filePlayUrl()), m_ac, "file_open_url"); action -> setStatusText (i18n("Plays a URL")); action -> setWhatsThis (i18n("Play URL command displays the standard URL dialog and lets you type or paste in a URL to put on the playlist and start playing. The URL can be a remote network location, a local file path, or a TDE I/O Slave URL.")); m_playlists = new KPlayerContainerActionList ("%1", i18n("Plays the %1 list"), i18n("Play List %1 starts playing the list."), this, "play_list"); - connect (playlistActionList(), SIGNAL (activated (KPlayerNode*)), SLOT (play (KPlayerNode*))); + connect (playlistActionList(), TQ_SIGNAL (activated (KPlayerNode*)), TQ_SLOT (play (KPlayerNode*))); m_recent = new KPlayerNodeActionList ("%1", i18n("Plays %1"), i18n("Play Recent %1 starts playing the recently played item."), this, "file_recent"); - connect (recentActionList(), SIGNAL (activated (KPlayerNode*)), SLOT (play (KPlayerNode*))); + connect (recentActionList(), TQ_SIGNAL (activated (KPlayerNode*)), TQ_SLOT (play (KPlayerNode*))); refreshSettings(); m_devices = new KPlayerDevicesActionList ("%1", i18n("Shows commands and options available for %1"), i18n("Submenu that shows commands and options available for %1."), this, "file_devices"); - action = new TDEAction (i18n("&Next"), "1rightarrow", ALT + Key_Down, this, SLOT (next()), m_ac, "player_next"); + action = new TDEAction (i18n("&Next"), "1rightarrow", ALT + Key_Down, this, TQ_SLOT (next()), m_ac, "player_next"); action -> setStatusText (i18n("Plays the next item on the playlist")); action -> setWhatsThis (i18n("Next command starts playing the next item on the current playlist.")); - action = new TDEAction (i18n("P&revious"), "1leftarrow", ALT + Key_Up, this, SLOT (previous()), m_ac, "player_previous"); + action = new TDEAction (i18n("P&revious"), "1leftarrow", ALT + Key_Up, this, TQ_SLOT (previous()), m_ac, "player_previous"); action -> setStatusText (i18n("Plays the previous item on the playlist")); action -> setWhatsThis (i18n("Previous command starts playing the previous item on the current playlist.")); KWidgetAction* widget = new KWidgetAction (new KPlayerPlaylistCombobox, i18n("Playlist"), 0, 0, 0, m_ac, "player_list"); @@ -72,36 +72,36 @@ KPlayerPlaylist::KPlayerPlaylist (TDEActionCollection* ac, TQObject* parent, con widget -> setShortcutConfigurable (false); widget -> setStatusText (i18n("Shows playlist items and allows you to select an item to play")); widget -> setWhatsThis (i18n("Playlist combo box in the closed state displays the current playlist item. You can drop down the combo box to see the entire list and select a different item to load and play.")); - connect (playlist(), SIGNAL (activated(int)), SLOT (play(int))); + connect (playlist(), TQ_SIGNAL (activated(int)), TQ_SLOT (play(int))); TQToolTip::add (playlist(), i18n("Playlist")); - TDEToggleAction* toggle = new TDEToggleAction (i18n("&Loop"), "loop", 0, this, SLOT (loop()), m_ac, "player_loop"); + TDEToggleAction* toggle = new TDEToggleAction (i18n("&Loop"), "loop", 0, this, TQ_SLOT (loop()), m_ac, "player_loop"); toggle -> setStatusText (i18n("Turns the option to loop through the list on/off")); toggle -> setWhatsThis (i18n("Loop command toggles the option to start playing items from the beginning of the playlist after playing the last item on the playlist.")); if ( configuration() -> loop() ) toggle -> setChecked (true); - toggle = new TDEToggleAction (i18n("S&huffle"), "shuffle", 0, this, SLOT (shuffle()), m_ac, "player_shuffle"); + toggle = new TDEToggleAction (i18n("S&huffle"), "shuffle", 0, this, TQ_SLOT (shuffle()), m_ac, "player_shuffle"); toggle -> setStatusText (i18n("Turns the option to play items in random order on or off")); toggle -> setWhatsThis (i18n("Shuffle command toggles the option to play items in a random order.")); if ( configuration() -> shuffle() ) toggle -> setChecked (true); - action = new TDEAction (i18n("&Files..."), 0, 0, this, SLOT (addFiles()), m_ac, "playlist_add_files"); + action = new TDEAction (i18n("&Files..."), 0, 0, this, TQ_SLOT (addFiles()), m_ac, "playlist_add_files"); action -> setStatusText (i18n("Adds files to the playlist")); action -> setWhatsThis (i18n("Add files command displays the standard Open File dialog and lets you choose a file or several files to add to the playlist.")); - action = new TDEAction (i18n("&URL..."), 0, 0, this, SLOT (addUrl()), m_ac, "playlist_add_url"); + action = new TDEAction (i18n("&URL..."), 0, 0, this, TQ_SLOT (addUrl()), m_ac, "playlist_add_url"); action -> setStatusText (i18n("Adds a URL to the playlist")); action -> setWhatsThis (i18n("Add URL command displays the standard Open URL dialog and lets you type or paste in a URL to add to the playlist.")); - action = new TDEAction (i18n("&Playlists..."), 0, 0, this, SLOT (addToPlaylists()), m_ac, "playlist_add_to_playlists"); + action = new TDEAction (i18n("&Playlists..."), 0, 0, this, TQ_SLOT (addToPlaylists()), m_ac, "playlist_add_to_playlists"); action -> setStatusText (i18n("Saves the playlist under a new name")); action -> setWhatsThis (i18n("Add to new playlist command prompts for a new playlist name and saves the playlist under the new name.")); m_playlists_add = new KPlayerContainerActionList ("%1", i18n("Adds playlist items to %1 playlist"), i18n("Add to playlist command adds the playlist items to the %1 playlist."), this, "playlist_add_to_playlist"); playlistAddActionList() -> setMaximumSize (configuration() -> playlistMenuSize()); - action = new TDEAction (i18n("&Collection..."), 0, 0, this, SLOT (addToCollection()), m_ac, "playlist_add_to_collection"); + action = new TDEAction (i18n("&Collection..."), 0, 0, this, TQ_SLOT (addToCollection()), m_ac, "playlist_add_to_collection"); action -> setStatusText (i18n("Saves the playlist in the collection")); action -> setWhatsThis (i18n("Add to collection command prompts for a new folder name and saves the playlist under the new name in the multimedia collection.")); - connect (process(), SIGNAL (stateChanged(KPlayerProcess::State, KPlayerProcess::State)), - SLOT (playerStateChanged(KPlayerProcess::State, KPlayerProcess::State))); - connect (configuration(), SIGNAL (updated()), this, SLOT (refreshSettings())); + connect (process(), TQ_SIGNAL (stateChanged(KPlayerProcess::State, KPlayerProcess::State)), + TQ_SLOT (playerStateChanged(KPlayerProcess::State, KPlayerProcess::State))); + connect (configuration(), TQ_SIGNAL (updated()), this, TQ_SLOT (refreshSettings())); m_nowplaying = (KPlayerNowPlayingNode*) KPlayerNode::root() -> getNodeByUrl ("kplayer:/nowplaying"); nowplaying() -> reference(); } @@ -166,12 +166,12 @@ void KPlayerPlaylist::attach (KPlayerContainerNode* node) kdDebugTime() << "KPlayerPlaylist::attach\n"; #endif node -> populate(); - connect (node, SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), - SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); - connect (node, SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), - SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); - connect (node, SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), - SLOT (updated (KPlayerContainerNode*, KPlayerNode*))); + connect (node, TQ_SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), + TQ_SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); + connect (node, TQ_SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), + TQ_SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); + connect (node, TQ_SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), + TQ_SLOT (updated (KPlayerContainerNode*, KPlayerNode*))); } void KPlayerPlaylist::detach (KPlayerContainerNode* node) diff --git a/kplayer/kplayerprocess.cpp b/kplayer/kplayerprocess.cpp index 2af3bff..89895a4 100644 --- a/kplayer/kplayerprocess.cpp +++ b/kplayer/kplayerprocess.cpp @@ -89,8 +89,8 @@ KPlayerLineOutputProcess::KPlayerLineOutputProcess (void) #if 0 m_merge = false; #endif - connect (this, SIGNAL (receivedStdout (TDEProcess*, char*, int)), SLOT (slotReceivedStdout (TDEProcess*, char*, int))); - connect (this, SIGNAL (receivedStderr (TDEProcess*, char*, int)), SLOT (slotReceivedStderr (TDEProcess*, char*, int))); + connect (this, TQ_SIGNAL (receivedStdout (TDEProcess*, char*, int)), TQ_SLOT (slotReceivedStdout (TDEProcess*, char*, int))); + connect (this, TQ_SIGNAL (receivedStderr (TDEProcess*, char*, int)), TQ_SLOT (slotReceivedStderr (TDEProcess*, char*, int))); } KPlayerLineOutputProcess::~KPlayerLineOutputProcess() @@ -337,10 +337,10 @@ void KPlayerProcess::transferTemporaryFile (void) m_temp_job = TDEIO::get (properties() -> url(), false, false); m_temp_job -> setWindow (kPlayerWorkspace()); m_temp_job -> addMetaData ("PropagateHttpHeader", "true"); - connect (m_temp_job, SIGNAL (data (TDEIO::Job*, const TQByteArray&)), SLOT (transferTempData (TDEIO::Job*, const TQByteArray&))); - connect (m_temp_job, SIGNAL (result (TDEIO::Job*)), SLOT (transferTempDone (TDEIO::Job*))); - connect (m_temp_job, SIGNAL (percent (TDEIO::Job*, unsigned long)), SLOT (transferProgress (TDEIO::Job*, unsigned long))); - connect (m_temp_job, SIGNAL (infoMessage (TDEIO::Job*, const TQString&)), SLOT (transferInfoMessage (TDEIO::Job*, const TQString&))); + connect (m_temp_job, TQ_SIGNAL (data (TDEIO::Job*, const TQByteArray&)), TQ_SLOT (transferTempData (TDEIO::Job*, const TQByteArray&))); + connect (m_temp_job, TQ_SIGNAL (result (TDEIO::Job*)), TQ_SLOT (transferTempDone (TDEIO::Job*))); + connect (m_temp_job, TQ_SIGNAL (percent (TDEIO::Job*, unsigned long)), TQ_SLOT (transferProgress (TDEIO::Job*, unsigned long))); + connect (m_temp_job, TQ_SIGNAL (infoMessage (TDEIO::Job*, const TQString&)), TQ_SLOT (transferInfoMessage (TDEIO::Job*, const TQString&))); transferProgress (m_temp_job, 0); m_delayed_helper = true; } @@ -438,8 +438,8 @@ void KPlayerProcess::get_info (void) *m_helper << "-nocache"; else if ( properties() -> cache() == 2 ) *m_helper << "-cache" << TQString::number (properties() -> cacheSize()); - connect (m_helper, SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)), - SLOT (receivedHelperLine (KPlayerLineOutputProcess*, char*, int))); + connect (m_helper, TQ_SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)), + TQ_SLOT (receivedHelperLine (KPlayerLineOutputProcess*, char*, int))); if ( ! run (m_helper) ) { delete m_helper; @@ -680,10 +680,10 @@ void KPlayerProcess::start (void) } else m_fifo_name = TQCString(); - connect (m_player, SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)), - SLOT (receivedOutputLine (KPlayerLineOutputProcess*, char*, int))); - connect (m_player, SIGNAL (receivedStderrLine (KPlayerLineOutputProcess*, char*, int)), - SLOT (receivedOutputLine (KPlayerLineOutputProcess*, char*, int))); + connect (m_player, TQ_SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)), + TQ_SLOT (receivedOutputLine (KPlayerLineOutputProcess*, char*, int))); + connect (m_player, TQ_SIGNAL (receivedStderrLine (KPlayerLineOutputProcess*, char*, int)), + TQ_SLOT (receivedOutputLine (KPlayerLineOutputProcess*, char*, int))); if ( ! run (m_player) ) { delete m_player; @@ -704,9 +704,9 @@ void KPlayerProcess::start (void) m_slave_job = TDEIO::get (properties() -> url(), false, false); m_slave_job -> setWindow (kPlayerWorkspace()); m_slave_job -> addMetaData ("PropagateHttpHeader", "true"); - connect (m_slave_job, SIGNAL (data (TDEIO::Job*, const TQByteArray&)), SLOT (transferData (TDEIO::Job*, const TQByteArray&))); - connect (m_slave_job, SIGNAL (result (TDEIO::Job*)), SLOT (transferDone (TDEIO::Job*))); - connect (m_slave_job, SIGNAL (infoMessage (TDEIO::Job*, const TQString&)), SLOT (transferInfoMessage (TDEIO::Job*, const TQString&))); + connect (m_slave_job, TQ_SIGNAL (data (TDEIO::Job*, const TQByteArray&)), TQ_SLOT (transferData (TDEIO::Job*, const TQByteArray&))); + connect (m_slave_job, TQ_SIGNAL (result (TDEIO::Job*)), TQ_SLOT (transferDone (TDEIO::Job*))); + connect (m_slave_job, TQ_SIGNAL (infoMessage (TDEIO::Job*, const TQString&)), TQ_SLOT (transferInfoMessage (TDEIO::Job*, const TQString&))); m_cache_size = properties() -> cache() == 2 ? properties() -> cacheSize() * 1024 : 1048576; m_first_chunk = true; #ifdef DEBUG_KPLAYER_PROCESS @@ -769,7 +769,7 @@ bool KPlayerProcess::run (KPlayerLineOutputProcess* player) *player << (properties() -> useTemporaryFile() && m_temporary_file ? TQFile::encodeName (m_temporary_file -> name()) : m_fifo_name); else *player << properties() -> urlString(); - connect (player, SIGNAL (processExited (TDEProcess*)), SLOT (playerProcessExited (TDEProcess*))); + connect (player, TQ_SIGNAL (processExited (TDEProcess*)), TQ_SLOT (playerProcessExited (TDEProcess*))); #if 0 player -> setMerge (true); #endif @@ -1523,7 +1523,7 @@ void KPlayerProcess::sendFifoData (void) } m_fifo_notifier = new TQSocketNotifier (m_fifo_handle, TQSocketNotifier::Write); m_fifo_notifier -> setEnabled (false); - connect (m_fifo_notifier, SIGNAL (activated (int)), SLOT (playerDataWritten (int))); + connect (m_fifo_notifier, TQ_SIGNAL (activated (int)), TQ_SLOT (playerDataWritten (int))); } else if ( ! m_fifo_timer ) { @@ -1531,7 +1531,7 @@ void KPlayerProcess::sendFifoData (void) kdDebugTime() << "Process: fifo open failed, creating timer\n"; #endif m_fifo_timer = new TQTimer (this); - connect (m_fifo_timer, SIGNAL (timeout()), SLOT (sendFifoData())); + connect (m_fifo_timer, TQ_SIGNAL (timeout()), TQ_SLOT (sendFifoData())); m_fifo_timer -> start (100); } } diff --git a/kplayer/kplayerpropertiesdialog.cpp b/kplayer/kplayerpropertiesdialog.cpp index ee7014a..0726827 100644 --- a/kplayer/kplayerpropertiesdialog.cpp +++ b/kplayer/kplayerpropertiesdialog.cpp @@ -52,7 +52,7 @@ TQString listEntry (TQComboBox* combo, bool hasDefault = false) KPlayerPropertiesDialog::KPlayerPropertiesDialog (void) : KDialogBase (TreeList, i18n("File Properties"), Help | Default | Ok | Apply | Cancel, Ok) { - TQApplication::connect (this, SIGNAL (aboutToShowPage (TQWidget*)), this, SLOT (pageAboutToShow(TQWidget*))); + TQApplication::connect (this, TQ_SIGNAL (aboutToShowPage (TQWidget*)), this, TQ_SLOT (pageAboutToShow(TQWidget*))); } KPlayerPropertiesDialog::~KPlayerPropertiesDialog (void) diff --git a/kplayer/kplayersettingsdialog.cpp b/kplayer/kplayersettingsdialog.cpp index d6efcd5..3dbcabc 100644 --- a/kplayer/kplayersettingsdialog.cpp +++ b/kplayer/kplayersettingsdialog.cpp @@ -45,7 +45,7 @@ KPlayerSettingsDialog::KPlayerSettingsDialog (TQWidget* parent) : KDialogBase (TreeList, i18n("KPlayer Preferences"), Help | Default | Ok | Apply | Cancel, Ok, parent) { //m_initial_move = false; - TQApplication::connect (this, SIGNAL (aboutToShowPage (TQWidget*)), this, SLOT (pageAboutToShow(TQWidget*))); + TQApplication::connect (this, TQ_SIGNAL (aboutToShowPage (TQWidget*)), this, TQ_SLOT (pageAboutToShow(TQWidget*))); TQFrame* frame = addPage (i18n("General"), i18n("General Settings")); TQBoxLayout* layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); @@ -313,7 +313,7 @@ KPlayerSettingsAdvanced::KPlayerSettingsAdvanced (TQWidget* parent, const char* { loadLists(); load(); - TQApplication::connect (kPlayerEngine(), SIGNAL (updated()), this, SLOT (refresh())); + TQApplication::connect (kPlayerEngine(), TQ_SIGNAL (updated()), this, TQ_SLOT (refresh())); } void KPlayerSettingsAdvanced::refresh (void) @@ -396,7 +396,7 @@ KPlayerSettingsAudio::KPlayerSettingsAudio (TQWidget* parent, const char* name) m_amixer_running = false; loadLists(); load(); - TQApplication::connect (kPlayerEngine(), SIGNAL (updated()), this, SLOT (refresh())); + TQApplication::connect (kPlayerEngine(), TQ_SIGNAL (updated()), this, TQ_SLOT (refresh())); } void KPlayerSettingsAudio::refresh (void) @@ -515,9 +515,9 @@ void KPlayerSettingsAudio::runAmixer (void) #endif } *amixer << "scontents"; - connect (amixer, SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)), - SLOT (amixerOutput (KPlayerLineOutputProcess*, char*, int))); - connect (amixer, SIGNAL (processExited (TDEProcess*)), SLOT (amixerExited (TDEProcess*))); + connect (amixer, TQ_SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)), + TQ_SLOT (amixerOutput (KPlayerLineOutputProcess*, char*, int))); + connect (amixer, TQ_SIGNAL (processExited (TDEProcess*)), TQ_SLOT (amixerExited (TDEProcess*))); m_amixer_running = amixer -> start (TDEProcess::NotifyOnExit, TDEProcess::All); if ( ! m_amixer_running ) defaultAlsaChannels(); @@ -948,7 +948,7 @@ KPlayerSettingsVideo::KPlayerSettingsVideo (TQWidget* parent, const char* name) { loadLists(); load(); - TQApplication::connect (engine(), SIGNAL (updated()), this, SLOT (refresh())); + TQApplication::connect (engine(), TQ_SIGNAL (updated()), this, TQ_SLOT (refresh())); } void KPlayerSettingsVideo::refresh (void) diff --git a/kplayer/kplayerslideraction.cpp b/kplayer/kplayerslideraction.cpp index a1a8a80..3e971a1 100644 --- a/kplayer/kplayerslideraction.cpp +++ b/kplayer/kplayerslideraction.cpp @@ -64,7 +64,7 @@ KPlayerPopupSliderAction::KPlayerPopupSliderAction (const TQString& text, #ifdef DEBUG_KPLAYER_SLIDERS kdDebugTime() << "Popup slider size " << m_slider -> width() << "x" << m_slider -> height() << "\n"; #endif - connect (m_slider, SIGNAL (changed (int)), receiver, slot); + connect (m_slider, TQ_SIGNAL (changed (int)), receiver, slot); if ( ! text.isEmpty() ) TQToolTip::add (m_slider, text); } @@ -137,7 +137,7 @@ KPlayerSliderAction::KPlayerSliderAction (const TQString& text, const TDEShortcu { setAutoSized (true); setShortcutConfigurable (false); - connect (slider(), SIGNAL (changed (int)), receiver, slot); + connect (slider(), TQ_SIGNAL (changed (int)), receiver, slot); } KPlayerSliderAction::~KPlayerSliderAction() @@ -156,7 +156,7 @@ int KPlayerSliderAction::plug (TQWidget* widget, int index) if ( ! text().isEmpty() ) TQToolTip::add (slider(), text()); orientationChanged (toolbar -> orientation()); - connect (toolbar, SIGNAL (orientationChanged (Orientation)), this, SLOT (orientationChanged (Orientation))); + connect (toolbar, TQ_SIGNAL (orientationChanged (Orientation)), this, TQ_SLOT (orientationChanged (Orientation))); return result; } @@ -165,7 +165,7 @@ void KPlayerSliderAction::unplug (TQWidget* widget) KWidgetAction::unplug (widget); if ( ! slider() || ! isPlugged() || widget != slider() -> parent() ) return; - disconnect (widget, SIGNAL (orientationChanged (Orientation)), this, SLOT (orientationChanged (Orientation))); + disconnect (widget, TQ_SIGNAL (orientationChanged (Orientation)), this, TQ_SLOT (orientationChanged (Orientation))); } void KPlayerSliderAction::orientationChanged (Orientation orientation) @@ -178,7 +178,7 @@ KPlayerSlider::KPlayerSlider (TQt::Orientation orientation, TQWidget* parent, co : TQSlider (orientation, parent, name) { m_dragging = m_changing_orientation = false; - connect (this, SIGNAL (valueChanged (int)), this, SLOT (sliderValueChanged (int))); + connect (this, TQ_SIGNAL (valueChanged (int)), this, TQ_SLOT (sliderValueChanged (int))); } KPlayerSlider::~KPlayerSlider() diff --git a/kplayer/kplayersource.cpp b/kplayer/kplayersource.cpp index 024917d..80e4ebc 100644 --- a/kplayer/kplayersource.cpp +++ b/kplayer/kplayersource.cpp @@ -62,10 +62,10 @@ bool KPlayerSource::has (bool groups) void KPlayerSource::connectNodes (KPlayerContainerNode* node) { - connect (node, SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), - SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); - connect (node, SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), - SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); + connect (node, TQ_SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), + TQ_SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); + connect (node, TQ_SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), + TQ_SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); KPlayerNodeListIterator iterator (node -> nodes()); while ( KPlayerNode* node = iterator.current() ) { @@ -576,7 +576,7 @@ KPlayerDirectorySource::KPlayerDirectorySource (KPlayerContainerNode* parent) if ( m_watch.internalMethod() != KDirWatch::Stat ) { m_watch.startScan(); - connect (&m_watch, SIGNAL (dirty (const TQString&)), SLOT (dirty (const TQString&))); + connect (&m_watch, TQ_SIGNAL (dirty (const TQString&)), TQ_SLOT (dirty (const TQString&))); } #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << " Path " << m_directory.path() << "\n"; @@ -747,11 +747,11 @@ KPlayerOriginSource::~KPlayerOriginSource() void KPlayerOriginSource::connectOrigin (void) { - connect (parent() -> origin(), SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), - SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); - connect (parent() -> origin(), SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), - SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); - connect (parent() -> origin(), SIGNAL (detached()), SLOT (detach())); + connect (parent() -> origin(), TQ_SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), + TQ_SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); + connect (parent() -> origin(), TQ_SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), + TQ_SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); + connect (parent() -> origin(), TQ_SIGNAL (detached()), TQ_SLOT (detach())); } void KPlayerOriginSource::enumStart (bool groups) @@ -863,10 +863,10 @@ KPlayerKeySource::~KPlayerKeySource() void KPlayerKeySource::connectOrigin (void) { - connect (parent() -> origin() -> source(), SIGNAL (nodesAdded (const KPlayerNodeList&)), - SLOT (added (const KPlayerNodeList&))); - connect (parent() -> origin() -> source(), SIGNAL (nodesRemoved (const KPlayerNodeList&)), - SLOT (removed (const KPlayerNodeList&))); + connect (parent() -> origin() -> source(), TQ_SIGNAL (nodesAdded (const KPlayerNodeList&)), + TQ_SLOT (added (const KPlayerNodeList&))); + connect (parent() -> origin() -> source(), TQ_SIGNAL (nodesRemoved (const KPlayerNodeList&)), + TQ_SLOT (removed (const KPlayerNodeList&))); } void KPlayerKeySource::enumStart (bool groups) @@ -1054,7 +1054,7 @@ KPlayerSearchSource::~KPlayerSearchSource() void KPlayerSearchSource::connectOrigin (void) { connectNodes (parent() -> origin()); - connect (parent() -> origin(), SIGNAL (detached()), SLOT (detach())); + connect (parent() -> origin(), TQ_SIGNAL (detached()), TQ_SLOT (detach())); } bool KPlayerSearchSource::canAddLeaves (void) const diff --git a/kplayer/kplayerwidget.cpp b/kplayer/kplayerwidget.cpp index aae619b..525da17 100644 --- a/kplayer/kplayerwidget.cpp +++ b/kplayer/kplayerwidget.cpp @@ -63,7 +63,7 @@ KPlayerWidget::KPlayerWidget (TQWidget *parent, const char *name) #ifdef DEBUG_KPLAYER_WIDGET kdDebugTime() << "Creating widget\n"; #endif - connect (kPlayerProcess(), SIGNAL (stateChanged (KPlayerProcess::State, KPlayerProcess::State)), SLOT (playerStateChanged (KPlayerProcess::State, KPlayerProcess::State))); + connect (kPlayerProcess(), TQ_SIGNAL (stateChanged (KPlayerProcess::State, KPlayerProcess::State)), TQ_SLOT (playerStateChanged (KPlayerProcess::State, KPlayerProcess::State))); TQWhatsThis::add (this, i18n("Video area is the central part of KPlayer. When playing a file that has video, it will display the video and optionally subtitles. Normally it will be hidden when playing an audio only file.")); setFocusPolicy (TQWidget::NoFocus); //setEnabled (false); @@ -238,9 +238,9 @@ KPlayerWorkspace::KPlayerWorkspace (TQWidget* parent, const char* name) #endif m_mouse_activity = m_resizing = false; m_widget = new KPlayerWidget (this); - connect (&m_timer, SIGNAL (timeout()), SLOT (cursorTimeout())); - connect (kPlayerProcess(), SIGNAL (stateChanged (KPlayerProcess::State, KPlayerProcess::State)), SLOT (playerStateChanged (KPlayerProcess::State, KPlayerProcess::State))); - connect (kPlayerProcess(), SIGNAL (sizeAvailable()), SLOT (setMouseCursorTracking())); + connect (&m_timer, TQ_SIGNAL (timeout()), TQ_SLOT (cursorTimeout())); + connect (kPlayerProcess(), TQ_SIGNAL (stateChanged (KPlayerProcess::State, KPlayerProcess::State)), TQ_SLOT (playerStateChanged (KPlayerProcess::State, KPlayerProcess::State))); + connect (kPlayerProcess(), TQ_SIGNAL (sizeAvailable()), TQ_SLOT (setMouseCursorTracking())); TQWhatsThis::add (this, i18n("Video area is the central part of KPlayer. When playing a file that has video, it will display the video and optionally subtitles. Normally it will be hidden when playing an audio only file.")); setEraseColor (TQColor (0, 0, 0)); setMinimumSize (TQSize (0, 0)); @@ -272,7 +272,7 @@ void KPlayerWorkspace::resizeHandler (bool resizing) return; m_resizing = resizing; if ( ! resizing ) - TQTimer::singleShot (0, this, SIGNAL(userResize())); + TQTimer::singleShot (0, this, TQ_SIGNAL(userResize())); } void KPlayerWorkspace::resizeEvent (TQResizeEvent* event) |