diff --git a/kplayer/kplayer.cpp b/kplayer/kplayer.cpp index 703c77b..ef0f602 100644 --- a/kplayer/kplayer.cpp +++ b/kplayer/kplayer.cpp @@ -26,12 +26,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #ifdef DEBUG #define DEBUG_KPLAYER_WINDOW @@ -62,7 +62,7 @@ void KPlayerX11GetKeyboardMouseState (uint id); #define ID_STATE_MSG 2 #define ID_PROGRESS_MSG 3 -QString resourcePath (const QString& filename); +TQString resourcePath (const TQString& filename); extern KAboutData* about; KPlayerApplication::KPlayerApplication (void) @@ -101,16 +101,16 @@ int KPlayerApplication::newInstance (void) return 0; } -bool KPlayerApplication::notify (QObject* object, QEvent* event) +bool KPlayerApplication::notify (TQObject* object, TQEvent* event) { static bool overridden = false; if ( kPlayerEngine() && kPlayerSettings() && event ) { switch ( event -> type() ) { - case QEvent::AccelOverride: + case TQEvent::AccelOverride: { - QKeyEvent* kevent = (QKeyEvent*) event; + TQKeyEvent* kevent = (TQKeyEvent*) event; #ifdef DEBUG_KPLAYER_NOTIFY_KEY kdDebugTime() << "KPlayerApplication::notify: event type AccelOverride" << " spontaneous " << event -> spontaneous() << " receiver " << (object ? object -> className() : "") @@ -123,14 +123,14 @@ bool KPlayerApplication::notify (QObject* object, QEvent* event) return result; } #ifdef DEBUG_KPLAYER_NOTIFY_KEY - case QEvent::KeyPress: - case QEvent::KeyRelease: + case TQEvent::KeyPress: + case TQEvent::KeyRelease: { - QKeyEvent* kevent = (QKeyEvent*) event; + TQKeyEvent* kevent = (TQKeyEvent*) event; /*if ( event -> spontaneous() ) { - kPlayerSettings() -> setControl (kevent -> stateAfter() & Qt::ControlButton); - kPlayerSettings() -> setShift (kevent -> stateAfter() & Qt::ShiftButton); + kPlayerSettings() -> setControl (kevent -> stateAfter() & TQt::ControlButton); + kPlayerSettings() -> setShift (kevent -> stateAfter() & TQt::ShiftButton); }*/ kdDebugTime() << "KPlayerApplication::notify: event type " << event -> type() << " spontaneous " << event -> spontaneous() << " receiver " << (object ? object -> className() : "") @@ -140,11 +140,11 @@ bool KPlayerApplication::notify (QObject* object, QEvent* event) } break; #endif - case QEvent::Accel: + case TQEvent::Accel: { - QKeyEvent* kevent = (QKeyEvent*) event; - //kPlayerSettings() -> setControl (kevent -> stateAfter() & Qt::ControlButton); - //kPlayerSettings() -> setShift (kevent -> stateAfter() & Qt::ShiftButton); + TQKeyEvent* kevent = (TQKeyEvent*) event; + //kPlayerSettings() -> setControl (kevent -> stateAfter() & TQt::ControlButton); + //kPlayerSettings() -> setShift (kevent -> stateAfter() & TQt::ShiftButton); #ifdef DEBUG_KPLAYER_NOTIFY_KEY kdDebugTime() << "KPlayerApplication::notify: event type Accel" << " spontaneous " << event -> spontaneous() << " receiver " << (object ? object -> className() : "") @@ -154,85 +154,85 @@ bool KPlayerApplication::notify (QObject* object, QEvent* event) << " control " << kPlayerSettings() -> control() << " shift " << kPlayerSettings() -> shift() << "\n"; #endif if ( ! overridden && - (kevent -> state() & (Qt::ShiftButton | Qt::ControlButton)) == (Qt::ShiftButton | Qt::ControlButton) - && (kevent -> key() >= Qt::Key_Exclam && kevent -> key() <= Qt::Key_Ampersand - || kevent -> key() >= Qt::Key_ParenLeft && kevent -> key() <= Qt::Key_Plus - || kevent -> key() == Qt::Key_Colon || kevent -> key() == Qt::Key_Less - || kevent -> key() >= Qt::Key_Greater && kevent -> key() <= Qt::Key_At - || kevent -> key() == Qt::Key_AsciiCircum || kevent -> key() == Qt::Key_Underscore - || kevent -> key() >= Qt::Key_BraceLeft && kevent -> key() <= Qt::Key_AsciiTilde) ) + (kevent -> state() & (TQt::ShiftButton | TQt::ControlButton)) == (TQt::ShiftButton | TQt::ControlButton) + && (kevent -> key() >= TQt::Key_Exclam && kevent -> key() <= TQt::Key_Ampersand + || kevent -> key() >= TQt::Key_ParenLeft && kevent -> key() <= TQt::Key_Plus + || kevent -> key() == TQt::Key_Colon || kevent -> key() == TQt::Key_Less + || kevent -> key() >= TQt::Key_Greater && kevent -> key() <= TQt::Key_At + || kevent -> key() == TQt::Key_AsciiCircum || kevent -> key() == TQt::Key_Underscore + || kevent -> key() >= TQt::Key_BraceLeft && kevent -> key() <= TQt::Key_AsciiTilde) ) { int key; switch ( kevent -> key() ) { - case Qt::Key_Exclam: - key = Qt::Key_1; + case TQt::Key_Exclam: + key = TQt::Key_1; break; - case Qt::Key_QuoteDbl: - key = Qt::Key_Apostrophe; + case TQt::Key_QuoteDbl: + key = TQt::Key_Apostrophe; break; - case Qt::Key_NumberSign: - key = Qt::Key_3; + case TQt::Key_NumberSign: + key = TQt::Key_3; break; - case Qt::Key_Dollar: - key = Qt::Key_4; + case TQt::Key_Dollar: + key = TQt::Key_4; break; - case Qt::Key_Percent: - key = Qt::Key_5; + case TQt::Key_Percent: + key = TQt::Key_5; break; - case Qt::Key_Ampersand: - key = Qt::Key_7; + case TQt::Key_Ampersand: + key = TQt::Key_7; break; - case Qt::Key_ParenLeft: - key = Qt::Key_BracketLeft; + case TQt::Key_ParenLeft: + key = TQt::Key_BracketLeft; break; - case Qt::Key_ParenRight: - key = Qt::Key_BracketRight; + case TQt::Key_ParenRight: + key = TQt::Key_BracketRight; break; - case Qt::Key_Asterisk: - key = Qt::Key_8; + case TQt::Key_Asterisk: + key = TQt::Key_8; break; - case Qt::Key_Plus: - key = Qt::Key_Equal; + case TQt::Key_Plus: + key = TQt::Key_Equal; break; - case Qt::Key_Colon: - key = Qt::Key_Semicolon; + case TQt::Key_Colon: + key = TQt::Key_Semicolon; break; - case Qt::Key_Less: - key = Qt::Key_Comma; + case TQt::Key_Less: + key = TQt::Key_Comma; break; - case Qt::Key_Greater: - key = Qt::Key_Period; + case TQt::Key_Greater: + key = TQt::Key_Period; break; - case Qt::Key_Question: - key = Qt::Key_Slash; + case TQt::Key_Question: + key = TQt::Key_Slash; break; - case Qt::Key_At: - key = Qt::Key_2; + case TQt::Key_At: + key = TQt::Key_2; break; - case Qt::Key_AsciiCircum: - key = Qt::Key_6; + case TQt::Key_AsciiCircum: + key = TQt::Key_6; break; - case Qt::Key_Underscore: - key = Qt::Key_Minus; + case TQt::Key_Underscore: + key = TQt::Key_Minus; break; - case Qt::Key_BraceLeft: - key = Qt::Key_BracketLeft; + case TQt::Key_BraceLeft: + key = TQt::Key_BracketLeft; break; - case Qt::Key_Bar: - key = Qt::Key_Backslash; + case TQt::Key_Bar: + key = TQt::Key_Backslash; break; - case Qt::Key_BraceRight: - key = Qt::Key_BracketRight; + case TQt::Key_BraceRight: + key = TQt::Key_BracketRight; break; - case Qt::Key_AsciiTilde: - key = Qt::Key_QuoteLeft; + case TQt::Key_AsciiTilde: + key = TQt::Key_QuoteLeft; break; default: key = kevent -> key(); } - QKeyEvent keyevent (kevent -> type(), key, kevent -> ascii() == kevent -> key() ? key : kevent -> ascii(), - kevent -> state() & ~ Qt::ShiftButton, kevent -> text(), kevent -> isAutoRepeat(), kevent -> count()); + TQKeyEvent keyevent (kevent -> type(), key, kevent -> ascii() == kevent -> key() ? key : kevent -> ascii(), + kevent -> state() & ~ TQt::ShiftButton, kevent -> text(), kevent -> isAutoRepeat(), kevent -> count()); if ( kevent -> isAccepted() ) keyevent.accept(); else @@ -249,37 +249,37 @@ bool KPlayerApplication::notify (QObject* object, QEvent* event) } } break; - case QEvent::MouseButtonDblClick: - case QEvent::MouseButtonPress: - case QEvent::MouseButtonRelease: - kPlayerSettings() -> setControl (((QMouseEvent*) event) -> stateAfter() & Qt::ControlButton); - kPlayerSettings() -> setShift (((QMouseEvent*) event) -> stateAfter() & Qt::ShiftButton); + case TQEvent::MouseButtonDblClick: + case TQEvent::MouseButtonPress: + case TQEvent::MouseButtonRelease: + kPlayerSettings() -> setControl (((TQMouseEvent*) event) -> stateAfter() & TQt::ControlButton); + kPlayerSettings() -> setShift (((TQMouseEvent*) event) -> stateAfter() & TQt::ShiftButton); #ifdef DEBUG_KPLAYER_NOTIFY_MOUSE kdDebugTime() << "KPlayerApplication::notify: event type " << event -> type() << " spontaneous " << event -> spontaneous() << " receiver " << (object ? object -> className() : "") << " control " << kPlayerSettings() -> control() << " shift " << kPlayerSettings() -> shift() << "\n"; #endif break; - case QEvent::MouseMove: + case TQEvent::MouseMove: { - QMouseEvent* mevent = ((QMouseEvent*) event); - if ( ((mevent -> stateAfter() & Qt::ControlButton) == Qt::ControlButton) != kPlayerSettings() -> anyControl() - || ((mevent -> stateAfter() & Qt::ShiftButton) == Qt::ShiftButton) != kPlayerSettings() -> anyShift() ) + TQMouseEvent* mevent = ((TQMouseEvent*) event); + if ( ((mevent -> stateAfter() & TQt::ControlButton) == TQt::ControlButton) != kPlayerSettings() -> anyControl() + || ((mevent -> stateAfter() & TQt::ShiftButton) == TQt::ShiftButton) != kPlayerSettings() -> anyShift() ) { - int state = mevent -> state() & ~ (Qt::ControlButton | Qt::ShiftButton); + int state = mevent -> state() & ~ (TQt::ControlButton | TQt::ShiftButton); if ( kPlayerSettings() -> anyControl() ) - state |= Qt::ControlButton; + state |= TQt::ControlButton; if ( kPlayerSettings() -> anyShift() ) - state |= Qt::ShiftButton; - QMouseEvent mouseevent (QEvent::MouseMove, mevent -> pos(), mevent -> button(), state); + state |= TQt::ShiftButton; + TQMouseEvent mouseevent (TQEvent::MouseMove, mevent -> pos(), mevent -> button(), state); if ( mevent -> isAccepted() ) mouseevent.accept(); else mouseevent.ignore(); return KUniqueApplication::notify (object, &mouseevent); } - kPlayerSettings() -> setControl (mevent -> stateAfter() & Qt::ControlButton); - kPlayerSettings() -> setShift (mevent -> stateAfter() & Qt::ShiftButton); + kPlayerSettings() -> setControl (mevent -> stateAfter() & TQt::ControlButton); + kPlayerSettings() -> setShift (mevent -> stateAfter() & TQt::ShiftButton); #ifdef DEBUG_KPLAYER_NOTIFY_MOUSE kdDebugTime() << "KPlayerApplication::notify: event type " << event -> type() << " spontaneous " << event -> spontaneous() << " receiver " << (object ? object -> className() : "") @@ -287,9 +287,9 @@ bool KPlayerApplication::notify (QObject* object, QEvent* event) #endif } break; - case QEvent::Wheel: - kPlayerSettings() -> setControl (((QWheelEvent*) event) -> state() & Qt::ControlButton); - kPlayerSettings() -> setShift (((QWheelEvent*) event) -> state() & Qt::ShiftButton); + case TQEvent::Wheel: + kPlayerSettings() -> setControl (((TQWheelEvent*) event) -> state() & TQt::ControlButton); + kPlayerSettings() -> setShift (((TQWheelEvent*) event) -> state() & TQt::ShiftButton); #ifdef DEBUG_KPLAYER_NOTIFY_WHEEL kdDebugTime() << "KPlayerApplication::notify: event type " << event -> type() << " spontaneous " << event -> spontaneous() << " receiver " << (object ? object -> className() : "") @@ -297,20 +297,20 @@ bool KPlayerApplication::notify (QObject* object, QEvent* event) #endif break; #ifdef DEBUG_KPLAYER_NOTIFY_MENU - case QEvent::ContextMenu: - //kPlayerSettings() -> setControl (((QContextMenuEvent*) event) -> state() & Qt::ControlButton); - //kPlayerSettings() -> setShift (((QContextMenuEvent*) event) -> state() & Qt::ShiftButton); + case TQEvent::ContextMenu: + //kPlayerSettings() -> setControl (((TQContextMenuEvent*) event) -> state() & TQt::ControlButton); + //kPlayerSettings() -> setShift (((TQContextMenuEvent*) event) -> state() & TQt::ShiftButton); kdDebugTime() << "KPlayerApplication::notify: event type " << event -> type() << " spontaneous " << event -> spontaneous() << " receiver " << (object ? object -> className() : "") << " control " << kPlayerSettings() -> control() << " shift " << kPlayerSettings() -> shift() << "\n"; break; #endif #ifdef DEBUG_KPLAYER_NOTIFY_DRAG - case QEvent::DragEnter: - case QEvent::DragMove: - case QEvent::Drop: + case TQEvent::DragEnter: + case TQEvent::DragMove: + case TQEvent::Drop: { - QDropEvent* devent = (QDropEvent*) event; + TQDropEvent* devent = (TQDropEvent*) event; kdDebugTime() << "KPlayerApplication::notify: event type " << event -> type() << " spontaneous " << event -> spontaneous() << " receiver " << (object ? object -> className() : "") << " accepted " << devent -> isAccepted() << " action " << devent -> action() @@ -319,21 +319,21 @@ bool KPlayerApplication::notify (QObject* object, QEvent* event) break; #endif #ifdef DEBUG_KPLAYER_NOTIFY_DRAG - case QEvent::DragResponse: + case TQEvent::DragResponse: kdDebugTime() << "KPlayerApplication::notify: event type DragResponse spontaneous " << event -> spontaneous() << " receiver " << (object ? object -> className() : "") - << " accepted " << ((QDragResponseEvent*) event) -> dragAccepted() << "\n"; + << " accepted " << ((TQDragResponseEvent*) event) -> dragAccepted() << "\n"; break; - case QEvent::DragLeave: + case TQEvent::DragLeave: kdDebugTime() << "KPlayerApplication::notify: event type DragLeave spontaneous " << event -> spontaneous() << " receiver " << (object ? object -> className() : "") << "\n"; break; #endif #ifdef DEBUG_KPLAYER_NOTIFY_RESIZE - case QEvent::Resize: + case TQEvent::Resize: if ( object == mainWidget() ) { - QResizeEvent* revent = (QResizeEvent*) event; + TQResizeEvent* revent = (TQResizeEvent*) event; kdDebugTime() << "KPlayerApplication::notify: Main window resize to " << revent -> size().width() << "x" << revent -> size().height() << "\n"; } #endif @@ -344,20 +344,20 @@ bool KPlayerApplication::notify (QObject* object, QEvent* event) return KUniqueApplication::notify (object, event); } -/*int KPlayerApplication::x11ClientMessage (QWidget* widget, XEvent* event, bool passive_only) +/*int KPlayerApplication::x11ClientMessage (TQWidget* widget, XEvent* event, bool passive_only) { KApplication::x11ClientMessage (widget, event, passive_only); }*/ #ifdef DEBUG_KPLAYER_RESIZING -void dumpObject (const QObject* object, int indent, int depth = 20) +void dumpObject (const TQObject* object, int indent, int depth = 20) { - QString spaces; + TQString spaces; for ( int i = 0; i < indent * 2; i ++ ) spaces += " "; - if ( object -> inherits ("QWidget") ) + if ( object -> inherits ("TQWidget") ) { - QWidget* widget = (QWidget*) object; + TQWidget* widget = (TQWidget*) object; kdDebugTime() << spaces << object -> className() << " " << object -> name ("") << " " << widget -> winId() << " " << widget -> minimumSize().width() << "x" << widget -> minimumSize().height() << @@ -368,9 +368,9 @@ void dumpObject (const QObject* object, int indent, int depth = 20) " " << widget -> frameGeometry().x() << "x" << widget -> frameGeometry().y() << " " << widget -> frameGeometry().width() << "x" << widget -> frameGeometry().height() << "\n"; } - else if ( object -> inherits ("QLayout") ) + else if ( object -> inherits ("TQLayout") ) { - QLayout* layout = (QLayout*) object; + TQLayout* layout = (TQLayout*) object; kdDebugTime() << spaces << object -> className() << " " << object -> name ("") << " " << layout -> minimumSize().width() << "x" << layout -> minimumSize().height() << " " << layout -> sizeHint().width() << "x" << layout -> sizeHint().height() << @@ -382,7 +382,7 @@ void dumpObject (const QObject* object, int indent, int depth = 20) else kdDebugTime() << spaces << object -> className() << " " << object -> name ("") << "\n"; indent ++; - QObjectList* objectlist = (QObjectList*) object -> children(); + TQObjectList* objectlist = (TQObjectList*) object -> children(); if ( objectlist && depth -- > 0 ) for ( object = objectlist -> first(); object; object = objectlist -> next() ) if ( object ) @@ -390,7 +390,7 @@ void dumpObject (const QObject* object, int indent, int depth = 20) } #endif -KPlayer::KPlayer (QWidget *parent, const char *name) : KMainWindow (parent, name) +KPlayer::KPlayer (TQWidget *parent, const char *name) : KMainWindow (parent, name) { #ifdef DEBUG_KPLAYER_WINDOW kdDebugTime() << "Creating main window\n"; @@ -412,7 +412,7 @@ KPlayer::KPlayer (QWidget *parent, const char *name) : KMainWindow (parent, name { "hueToolBar", "settings_hue_toolbar", false, false }, { "saturationToolBar", "settings_saturation_toolbar", false, false } }; - QString captions [KPLAYER_TOOLBARS] = { + TQString captions [KPLAYER_TOOLBARS] = { i18n("Main Toolbar"), i18n("Playlist"), i18n("Progress"), @@ -430,7 +430,7 @@ KPlayer::KPlayer (QWidget *parent, const char *name) : KMainWindow (parent, name "video_hue", "video_saturation" }; - QString whatsthis [KPLAYER_TOOLBARS] = { + TQString whatsthis [KPLAYER_TOOLBARS] = { i18n("Main toolbar contains buttons for commonly used operations. Left clicking an icon will activate the corresponding action. Some of the buttons will pop up slider controls when clicked. The sliders let you change various player controls: sound volume, video contrast, brightness, hue and saturation. The video controls will only be available for video files."), i18n("Playlist toolbar shows the multimedia title currently loaded or being played, offers commands to go to the next or previous items on the playlist, and also lets you see the entire playlist that consists of items that are currently being played or have been played recently. If you select a different item from the list, KPlayer will load and start playing it. The toolbar also contains options to loop and shuffle the playlist."), i18n("Progress and seeking toolbar is shown when the time length of a media file is known. It displays the playback progress and also allows seeking, that is, moving the playback point back and forth within the file. To seek to a specific position, drag the slider thumb to that position with the left mouse button, or simply click at that position with the middle mouse button. To move forward or backward in steps, left click the slider to the left or right of the thumb, or click the Forward and Backward buttons."), @@ -469,8 +469,8 @@ KPlayer::KPlayer (QWidget *parent, const char *name) : KMainWindow (parent, name 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 QString&, bool)), - SLOT (enableSubmenu (const QString&, bool))); + 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*)), @@ -495,7 +495,7 @@ KPlayer::KPlayer (QWidget *parent, const char *name) : KMainWindow (parent, name connect (playlist(), SIGNAL (started()), SLOT (playlistStarted())); connect (playlist(), SIGNAL (activated()), SLOT (playlistActivated())); connect (playlist(), SIGNAL (stopped()), SLOT (playlistStopped())); - connect (playlist(), SIGNAL (enableActionGroup (const QString&, bool)), SLOT (enableSubmenu (const QString&, bool))); + 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*)), @@ -512,7 +512,7 @@ KPlayer::KPlayer (QWidget *parent, const char *name) : KMainWindow (parent, name SLOT (actionListUpdating (KPlayerActionList*))); connect (playlist() -> playlistAddActionList(), SIGNAL (updated (KPlayerActionList*)), SLOT (actionListUpdated (KPlayerActionList*))); - connect (actionCollection(), SIGNAL (actionStatusText(const QString&)), SLOT (setStatusMessage(const QString&))); + connect (actionCollection(), SIGNAL (actionStatusText(const TQString&)), SLOT (setStatusMessage(const TQString&))); connect (actionCollection(), SIGNAL (clearStatusText()), SLOT (clearStatusMessage())); actionCollection() -> setHighlightingEnabled (true); connect (process(), SIGNAL (stateChanged(KPlayerProcess::State, KPlayerProcess::State)), @@ -521,16 +521,16 @@ KPlayer::KPlayer (QWidget *parent, const char *name) : KMainWindow (parent, name SLOT (playerProgressChanged(float, KPlayerProcess::ProgressType))); connect (process(), SIGNAL (infoAvailable()), SLOT (playerInfoAvailable())); connect (process(), SIGNAL (sizeAvailable()), SLOT (playerSizeAvailable())); - connect (process(), SIGNAL (messageReceived (QString)), SLOT (playerMessageReceived (QString))); + 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 QPoint&)), SLOT (contextMenu(const QPoint&))); + connect (kPlayerWorkspace(), SIGNAL (contextMenu(const TQPoint&)), SLOT (contextMenu(const TQPoint&))); setCentralWidget (kPlayerWorkspace()); initStatusBar(); initActions(); - log() -> initialize ((QPopupMenu*) factory() -> container ("log_popup", this)); - playlist() -> initialize ((QPopupMenu*) factory() -> container ("playlist_popup", this)); - library() -> library() -> initialize ((QPopupMenu*) factory() -> container ("library_popup", this)); + log() -> initialize ((TQPopupMenu*) factory() -> container ("log_popup", this)); + playlist() -> initialize ((TQPopupMenu*) factory() -> container ("playlist_popup", this)); + 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())); @@ -546,15 +546,15 @@ KPlayer::KPlayer (QWidget *parent, const char *name) : KMainWindow (parent, name setDockEnabled (library(), DockRight, false); setDockEnabled (log(), DockLeft, false); setDockEnabled (log(), DockRight, false); - QWhatsThis::add (menuBar(), i18n("Menu bar contains names of drop-down menus. Left click a name to alternately show and hide that menu, or use Alt + the underlined letter in the name as a hot key, for example Alt+F to show the File menu.")); - QWhatsThis::add (statusBar(), i18n("Status bar shows general information about the player status and progress.")); - QWhatsThis::add (library(), i18n("Multimedia library is a window where that lets you organize your files, streams, devices, manage your playlists, and choose items for playing. It shows various information about your media files and allows you to search and group them and change their properties.")); - QWhatsThis::add (log(), i18n("Message log is a window where KPlayer shows messages it receives from MPlayer. KPlayer can show it automatically when it detects an MPlayer error if that option is selected in KPlayer settings.")); + TQWhatsThis::add (menuBar(), i18n("Menu bar contains names of drop-down menus. Left click a name to alternately show and hide that menu, or use Alt + the underlined letter in the name as a hot key, for example Alt+F to show the File menu.")); + TQWhatsThis::add (statusBar(), i18n("Status bar shows general information about the player status and progress.")); + TQWhatsThis::add (library(), i18n("Multimedia library is a window where that lets you organize your files, streams, devices, manage your playlists, and choose items for playing. It shows various information about your media files and allows you to search and group them and change their properties.")); + TQWhatsThis::add (log(), i18n("Message log is a window where KPlayer shows messages it receives from MPlayer. KPlayer can show it automatically when it detects an MPlayer error if that option is selected in KPlayer settings.")); for ( i = 0; i < KPLAYER_TOOLBARS; i ++ ) { toolbar = toolBar (m_toolbar[i].name); toolbar -> setCaption (captions[i]); - QWhatsThis::add (toolbar, whatsthis[i]); + TQWhatsThis::add (toolbar, whatsthis[i]); //kdDebugTime() << "Orientation " << sliderAction (m_toolbar[i].action) -> slider() -> orientation() << "\n"; if ( i >= FIRST_SLIDER_TOOLBAR ) ((KPlayerSliderAction*) action (actions [i - FIRST_SLIDER_TOOLBAR])) -> slider() -> setOrientation (toolbar -> orientation()); @@ -563,11 +563,11 @@ KPlayer::KPlayer (QWidget *parent, const char *name) : KMainWindow (parent, name showMaximized(); enablePlayerActions(); enableVideoActions(); - setEraseColor (QColor (0, 0, 0)); + setEraseColor (TQColor (0, 0, 0)); setAcceptDrops (true); - //layout() -> setResizeMode (QLayout::FreeResize); + //layout() -> setResizeMode (TQLayout::FreeResize); //KWin::setState (log() -> winId(), NET::SkipTaskbar | NET::SkipPager); - setFocusPolicy (QWidget::StrongFocus); + setFocusPolicy (TQWidget::StrongFocus); setFocusProxy (kPlayerWorkspace() -> focusProxy()); } @@ -676,10 +676,10 @@ void KPlayer::initStatusBar (void) statusBar() -> insertItem (i18n("Ready"), ID_STATUS_MSG, 1); statusBar() -> insertItem (i18n("Idle"), ID_STATE_MSG, 1, true); statusBar() -> insertItem ("", ID_PROGRESS_MSG, 1, true); - QObjectList* children = (QObjectList*) statusBar() -> children(); + TQObjectList* children = (TQObjectList*) statusBar() -> children(); for ( uint i = 0; i < children -> count(); i ++ ) { - QObject* child = children -> at (i); + TQObject* child = children -> at (i); if ( child -> inherits ("KStatusBarLabel") ) { KStatusBarLabel* label = (KStatusBarLabel*) child; @@ -695,12 +695,12 @@ void KPlayer::initStatusBar (void) if ( m_status_label ) { connect (m_status_label, SIGNAL (itemPressed (int)), this, SLOT (statusPressed())); - QWhatsThis::add (m_status_label, i18n("Status area of the status bar tells you if there have been playback errors.")); + TQWhatsThis::add (m_status_label, i18n("Status area of the status bar tells you if there have been playback errors.")); } if ( m_state_label ) - QWhatsThis::add (m_state_label, i18n("State area of the status bar displays the current player state.")); + TQWhatsThis::add (m_state_label, i18n("State area of the status bar displays the current player state.")); if ( m_progress_label ) - QWhatsThis::add (m_progress_label, i18n("Progress area of the status bar shows playback progress and the total length if known.")); + TQWhatsThis::add (m_progress_label, i18n("Progress area of the status bar shows playback progress and the total length if known.")); } void KPlayer::refreshSettings (void) @@ -708,7 +708,7 @@ void KPlayer::refreshSettings (void) #ifdef DEBUG_KPLAYER_WINDOW kdDebugTime() << "KPlayer::refreshSettings\n"; #endif - QApplication::postEvent (this, new QEvent (QEvent::LayoutHint)); + TQApplication::postEvent (this, new TQEvent (TQEvent::LayoutHint)); //activateLayout(); if ( ! settings() -> properties() -> url().isEmpty() ) setCaption (settings() -> properties() -> caption()); @@ -723,7 +723,7 @@ void KPlayer::saveOptions (void) config() -> deleteGroup ("General Options"); saveMainWindowSettings (config(), "General Options"); config() -> setGroup ("General Options"); - Qt::Dock dock = DockTornOff; + TQt::Dock dock = DockTornOff; int index = 0, offset = 0; bool newline = true; bool docked = getLocation (log(), dock, index, newline, offset) && @@ -787,8 +787,8 @@ void KPlayer::saveOptions (void) config() -> writeEntry ("Playlist Editor FullScreen Visible", m_library_fullscreen_visible); for ( int i = 0; i < KPLAYER_TOOLBARS; i ++ ) { - config() -> writeEntry (QString (m_toolbar[i].name) + " Normally Visible", m_toolbar[i].normally_visible); - config() -> writeEntry (QString (m_toolbar[i].name) + " FullScreen Visible", m_toolbar[i].fullscreen_visible); + config() -> writeEntry (TQString (m_toolbar[i].name) + " Normally Visible", m_toolbar[i].normally_visible); + config() -> writeEntry (TQString (m_toolbar[i].name) + " FullScreen Visible", m_toolbar[i].fullscreen_visible); } } @@ -799,7 +799,7 @@ void KPlayer::readOptions (void) #endif applyMainWindowSettings (config(), "General Options"); config() -> setGroup ("General Options"); - QRect available (availableGeometry()); + TQRect available (availableGeometry()); int width = config() -> readNumEntry ("Main Window Width", 500); if ( width > available.width() ) width = available.width(); @@ -817,7 +817,7 @@ void KPlayer::readOptions (void) if ( width >= minimumWidth() && height >= minimumHeight() ) resize (width, height); m_normal_geometry.setRect (x, y, width, height); - Qt::Dock dock = (Qt::Dock) config() -> readNumEntry ("Message Log Dock", Qt::DockBottom); + TQt::Dock dock = (TQt::Dock) config() -> readNumEntry ("Message Log Dock", TQt::DockBottom); bool docked = config() -> readBoolEntry ("Message Log Docked", true); bool newline = config() -> readBoolEntry ("Message Log New Line", true); int index = config() -> readNumEntry ("Message Log Index", 0); @@ -839,7 +839,7 @@ void KPlayer::readOptions (void) log() -> undock(); if ( width > 0 && height > 0 ) log() -> setGeometry (left, top, width, height); - dock = (Qt::Dock) config() -> readNumEntry ("Playlist Dock", Qt::DockBottom); + dock = (TQt::Dock) config() -> readNumEntry ("Playlist Dock", TQt::DockBottom); docked = config() -> readBoolEntry ("Playlist Docked", true); newline = config() -> readBoolEntry ("Playlist New Line", true); index = config() -> readNumEntry ("Playlist Index", 0); @@ -869,8 +869,8 @@ void KPlayer::readOptions (void) showStatusbar(); for ( int i = 0; i < KPLAYER_TOOLBARS; i ++ ) { - m_toolbar[i].normally_visible = config() -> readBoolEntry (QString (m_toolbar[i].name) + " Normally Visible", m_toolbar[i].normally_visible); - m_toolbar[i].fullscreen_visible = config() -> readBoolEntry (QString (m_toolbar[i].name) + " FullScreen Visible", m_toolbar[i].fullscreen_visible); + m_toolbar[i].normally_visible = config() -> readBoolEntry (TQString (m_toolbar[i].name) + " Normally Visible", m_toolbar[i].normally_visible); + m_toolbar[i].fullscreen_visible = config() -> readBoolEntry (TQString (m_toolbar[i].name) + " FullScreen Visible", m_toolbar[i].fullscreen_visible); //kdDebugTime() << "Show " << m_toolbar[i].name << " " << m_toolbar[i].action << "\n"; showToolbar (i); } @@ -956,15 +956,15 @@ void KPlayer::enableVideoActions (void) enableSubmenu ("video", unpaused); } -QPopupMenu* KPlayer::popupMenu (int index) +TQPopupMenu* KPlayer::popupMenu (int index) { - QMenuData* data = menuBar(); + TQMenuData* data = menuBar(); if ( ! data ) return 0; int id = data -> idAt (index); if ( id == -1 ) return 0; - QMenuItem* item = data -> findItem (id); + TQMenuItem* item = data -> findItem (id); if ( ! item ) return 0; return item -> popup(); @@ -978,7 +978,7 @@ void KPlayer::actionListUpdating (KPlayerActionList* list) void KPlayer::actionListUpdated (KPlayerActionList* list) { bool has_actions = ! list -> isEmpty(); - QString name (list -> name()); + TQString name (list -> name()); if ( has_actions ) plugActionList (name, list -> actions()); enableSubmenu (name, has_actions); @@ -987,23 +987,23 @@ void KPlayer::actionListUpdated (KPlayerActionList* list) void KPlayer::libraryActionListUpdated (KPlayerActionList* list) { bool has_actions = ! list -> isEmpty(); - QString name (list -> name()); + TQString name (list -> name()); if ( has_actions ) plugActionList (name, list -> actions()); enableSubmenu (name, has_actions && library() -> isVisible()); } -void KPlayer::enableSubmenu (QMenuData* data, const QString& name, bool enable) +void KPlayer::enableSubmenu (TQMenuData* data, const TQString& name, bool enable) { for ( uint i = 0; i < data -> count(); i ++ ) { int id = data -> idAt (i); if ( id != -1 ) { - QMenuItem* item = data -> findItem (id); + TQMenuItem* item = data -> findItem (id); if ( item ) { - QPopupMenu* popup = item -> popup(); + TQPopupMenu* popup = item -> popup(); if ( popup ) { if ( popup -> name() == name ) @@ -1016,16 +1016,16 @@ void KPlayer::enableSubmenu (QMenuData* data, const QString& name, bool enable) } } -void KPlayer::enableSubmenu (const QString& name, bool enable) +void KPlayer::enableSubmenu (const TQString& name, bool enable) { #ifdef DEBUG_KPLAYER_WINDOW kdDebugTime() << "KPlayer::enableSubmenu " << name << " " << enable << "\n"; #endif enableSubmenu (menuBar(), name, enable); - QPopupMenu* popup = (QPopupMenu*) factory() -> container ("player_popup", this); + TQPopupMenu* popup = (TQPopupMenu*) factory() -> container ("player_popup", this); if ( popup ) enableSubmenu (popup, name, enable); - popup = (QPopupMenu*) factory() -> container ("library_popup", this); + popup = (TQPopupMenu*) factory() -> container ("library_popup", this); if ( popup ) enableSubmenu (popup, name, enable); } @@ -1046,7 +1046,7 @@ void KPlayer::enableSubtitleActions (void) toggleAction (KStdAction::stdName (KStdAction::ShowStatusbar)) -> setChecked (statusBar() -> isVisible()); }*/ -void KPlayer::dragEnterEvent (QDragEnterEvent *event) +void KPlayer::dragEnterEvent (TQDragEnterEvent *event) { #ifdef DEBUG_KPLAYER_WINDOW kdDebugTime() << "Drag enter event\n"; @@ -1054,7 +1054,7 @@ void KPlayer::dragEnterEvent (QDragEnterEvent *event) event -> accept (KURLDrag::canDecode (event)); } -void KPlayer::dropEvent (QDropEvent* event) +void KPlayer::dropEvent (TQDropEvent* event) { #ifdef DEBUG_KPLAYER_WINDOW kdDebugTime() << "Drop event\n"; @@ -1155,16 +1155,16 @@ void KPlayer::start (void) //bool KPlayerX11TestGrab (Display*, int); -/*bool KPlayer::event (QEvent* ev) +/*bool KPlayer::event (TQEvent* ev) { kdDebugTime() << "KPlayer event: type " << ev -> type() << " spontaneous " << ev -> spontaneous() << "\n"; -//if ( ev -> type() == QEvent::LayoutHint && isFullScreen() ) +//if ( ev -> type() == TQEvent::LayoutHint && isFullScreen() ) // return false; return KMainWindow::event (ev); }*/ -void KPlayer::contextMenu (const QPoint& global_position) +void KPlayer::contextMenu (const TQPoint& global_position) { #ifdef DEBUG_KPLAYER_RESIZING kdDebugTime() << "Main " << winId() << " wspace " << kPlayerWorkspace() -> winId() @@ -1172,12 +1172,12 @@ void KPlayer::contextMenu (const QPoint& global_position) dumpObject (this, 0); dumpObject (actionCollection(), 0); #endif - QPopupMenu* popup = (QPopupMenu*) factory() -> container ("player_popup", this); + TQPopupMenu* popup = (TQPopupMenu*) factory() -> container ("player_popup", this); if ( popup ) popup -> popup (global_position); } -void KPlayer::contextMenuEvent (QContextMenuEvent* event) +void KPlayer::contextMenuEvent (TQContextMenuEvent* event) { KMainWindow::contextMenuEvent (event); contextMenu (event -> globalPos()); @@ -1222,7 +1222,7 @@ void KPlayer::refreshProperties (void) enableVideoActions(); } -void KPlayer::closeEvent (QCloseEvent* event) +void KPlayer::closeEvent (TQCloseEvent* event) { disconnect (log(), SIGNAL (windowHidden()), this, SLOT (logWindowHidden())); disconnect (library(), SIGNAL (windowHidden()), this, SLOT (libraryHidden())); @@ -1386,10 +1386,10 @@ void KPlayer::showToolbar (int index) KToolBar* toolbar = toolBar (m_toolbar[index].name); toolbar -> show(); int hint = toolbar -> minimumSizeHint().height(); - if ( toolbar -> orientation() == Qt::Vertical && kPlayerWorkspace() -> height() < hint + if ( toolbar -> orientation() == TQt::Vertical && kPlayerWorkspace() -> height() < hint && ! settings() -> fullScreen() && ! settings() -> maximized() ) { - settings() -> setDisplaySize (QSize (settings() -> displaySize().width(), hint)); + settings() -> setDisplaySize (TQSize (settings() -> displaySize().width(), hint)); zoom(); } } @@ -1476,7 +1476,7 @@ void KPlayer::helpReportBug (void) void KPlayer::playerStateChanged (KPlayerProcess::State state, KPlayerProcess::State previous) { - static const QString stateMessages [4] = { i18n("Idle"), i18n("Running"), i18n("Playing"), i18n("Paused") }; + static const TQString stateMessages [4] = { i18n("Idle"), i18n("Running"), i18n("Playing"), i18n("Paused") }; #ifdef DEBUG_KPLAYER_WINDOW kdDebugTime() << "Main window received state change: " << previous << " => " << state << "\n"; #endif @@ -1507,9 +1507,9 @@ void KPlayer::playerStateChanged (KPlayerProcess::State state, KPlayerProcess::S void KPlayer::playerProgressChanged (float progress, KPlayerProcess::ProgressType type) { - static const QString cacheFillMessage (i18n("Cache fill: %1%")); - static const QString indexGenerationMessage (i18n("Generating index: %1%")); - static const QString fileTransferMessage (i18n("Transferring file: %1%")); + static const TQString cacheFillMessage (i18n("Cache fill: %1%")); + static const TQString indexGenerationMessage (i18n("Generating index: %1%")); + static const TQString fileTransferMessage (i18n("Transferring file: %1%")); if ( ! m_progress_label ) return; if ( type == KPlayerProcess::Position ) @@ -1538,7 +1538,7 @@ void KPlayer::playerSizeAvailable (void) enableVideoActions(); } -void KPlayer::playerMessageReceived (QString message) +void KPlayer::playerMessageReceived (TQString message) { if ( message.isEmpty() ) return; @@ -1582,14 +1582,14 @@ void KPlayer::libraryHidden (void) showLibrary (false); } -void KPlayer::log (QString message) +void KPlayer::log (TQString message) { if ( message.isEmpty() ) return; log() -> addLine (message); } -void KPlayer::setStatusText (const QString& text) +void KPlayer::setStatusText (const TQString& text) { statusBar() -> clear(); //statusBar() -> changeItem (text, ID_STATUS_MSG); @@ -1597,16 +1597,16 @@ void KPlayer::setStatusText (const QString& text) m_status_label -> setText (text); } -void KPlayer::setStatusMessage (const QString& text) +void KPlayer::setStatusMessage (const TQString& text) { if ( text.isEmpty() ) { clearStatusMessage(); return; } - QPopupMenu* popup = (QPopupMenu*) factory() -> container ("player_popup", this); + TQPopupMenu* popup = (TQPopupMenu*) factory() -> container ("player_popup", this); if ( ! popup || ! popup -> isVisible() ) - popup = (QPopupMenu*) factory() -> container ("library_popup", this); + popup = (TQPopupMenu*) factory() -> container ("library_popup", this); if ( ! popup || ! popup -> isVisible() ) for ( uint i = 0; i < menuBar() -> count(); i ++ ) if ( (popup = popupMenu (i)) && popup -> isVisible() ) @@ -1626,7 +1626,7 @@ void KPlayer::clearStatusMessage (void) m_progress_label -> show(); } -void KPlayer::showEvent (QShowEvent* event) +void KPlayer::showEvent (TQShowEvent* event) { #ifdef DEBUG_KPLAYER_WINDOW kdDebugTime() << "KPlayer::showEvent\n"; @@ -1676,7 +1676,7 @@ void KPlayer::windowActivationChange (bool old) #endif*/ } -void KPlayer::focusInEvent (QFocusEvent* event) +void KPlayer::focusInEvent (TQFocusEvent* event) { #ifdef DEBUG_KPLAYER_WINDOW kdDebugTime() << "Window focus in event\n"; @@ -1684,7 +1684,7 @@ void KPlayer::focusInEvent (QFocusEvent* event) KMainWindow::focusInEvent (event); } -void KPlayer::focusOutEvent (QFocusEvent* event) +void KPlayer::focusOutEvent (TQFocusEvent* event) { #ifdef DEBUG_KPLAYER_WINDOW kdDebugTime() << "Window focus out event\n"; @@ -1692,7 +1692,7 @@ void KPlayer::focusOutEvent (QFocusEvent* event) KMainWindow::focusOutEvent (event); } -void KPlayer::moveEvent (QMoveEvent* event) +void KPlayer::moveEvent (TQMoveEvent* event) { #ifdef DEBUG_KPLAYER_RESIZING bool maximized = isMaximized(); @@ -1709,14 +1709,14 @@ void KPlayer::moveEvent (QMoveEvent* event) #endif } -void KPlayer::resizeEvent (QResizeEvent* event) +void KPlayer::resizeEvent (TQResizeEvent* event) { #ifdef DEBUG_KPLAYER_RESIZING bool maximized = isMaximized(); #endif KMainWindow::resizeEvent (event); if ( ! m_full_screen && ! m_set_display_size && ! settings() -> maximized() && ! isMaximized() && m_initial_show ) - m_normal_geometry.setSize (QSize (width(), height())); + m_normal_geometry.setSize (TQSize (width(), height())); #ifdef DEBUG_KPLAYER_RESIZING kdDebugTime() << "WiSize " << event -> oldSize(). width() << "x" << event -> oldSize(). height() << " => " << event -> size(). width() << "x" << event -> size(). height() << ", maximized " @@ -1729,7 +1729,7 @@ void KPlayer::resizeEvent (QResizeEvent* event) if ( kPlayerWorkspace() -> isResizing() ) m_set_display_size = false; else - QTimer::singleShot (0, this, SLOT (setDisplaySize())); + TQTimer::singleShot (0, this, SLOT (setDisplaySize())); } } @@ -1751,7 +1751,7 @@ void KPlayer::setDisplaySize (void) void KPlayer::setMinimumSize (int w, int h) { - QSize prev (size()), msh (minimumSizeHint()); + TQSize prev (size()), msh (minimumSizeHint()); #ifdef DEBUG_KPLAYER_RESIZING kdDebugTime() << "Set minimum size " << w << "x" << h << " => " << msh.width() << "x" << msh.height() << "\n"; #endif @@ -1767,15 +1767,15 @@ void KPlayer::setMinimumSize (int w, int h) m_previous_size = size(); } -/*QSize KPlayer::sizeHint (void) const +/*TQSize KPlayer::sizeHint (void) const { return minimumSizeHint() + kPlayerWidget() -> videoSize(); }*/ -QSize KPlayer::minimumSizeHint (void) const +TQSize KPlayer::minimumSizeHint (void) const { KPlayer* that = (KPlayer*) this; - QSize size (configuration() -> minimumSliderLength(), 0); + TQSize size (configuration() -> minimumSliderLength(), 0); if ( ! that -> menuBar() -> isHidden() ) size.setHeight (that -> menuBar() -> sizeHint().height()); size.setHeight (size.height() + topDock() -> height()); @@ -1912,11 +1912,11 @@ void KPlayer::initialSize (void) #ifdef DEBUG_KPLAYER_WINDOW kdDebugTime() << "KPlayer::initialSize (" << isMaximized() << ")\n"; #endif - QSize size (settings() -> displaySize()); + TQSize size (settings() -> displaySize()); if ( settings() -> constrainedSize() || settings() -> properties() -> hasVideo() || ! size.isEmpty() ) return; for ( int i = 0; i <= VOLUME_TOOLBAR; i ++ ) - if ( toolBar (m_toolbar[i].name) -> orientation() == Qt::Vertical && m_toolbar[i].normally_visible ) + if ( toolBar (m_toolbar[i].name) -> orientation() == TQt::Vertical && m_toolbar[i].normally_visible ) // && toggleAction (m_toolbar[i].action) -> isChecked() ) { size.setHeight (kPlayerWorkspace() -> height()); @@ -1925,8 +1925,8 @@ void KPlayer::initialSize (void) #ifdef DEBUG_KPLAYER_RESIZING kdDebugTime() << " " << log() -> isHidden() << " " << log() -> place() << " " << library() -> isHidden() << " " << library() -> place() << "\n"; #endif - if ( library() -> isShown() && library() -> place() == QDockWindow::InDock - || log() -> isShown() && log() -> place() == QDockWindow::InDock ) + if ( library() -> isShown() && library() -> place() == TQDockWindow::InDock + || log() -> isShown() && log() -> place() == TQDockWindow::InDock ) size.setWidth (kPlayerWorkspace() -> width()); settings() -> setDisplaySize (size); } @@ -2045,17 +2045,17 @@ void KPlayer::syncronize (bool user_resize) #ifdef DEBUG_KPLAYER_WINDOW kdDebugTime() << "KPlayer::syncronizeEvents\n"; #endif - QApplication::syncX(); - bool rv = QApplication::eventLoop() -> processEvents (QEventLoop::ExcludeUserInput | QEventLoop::ExcludeSocketNotifiers); + TQApplication::syncX(); + bool rv = TQApplication::eventLoop() -> processEvents (TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); #ifdef DEBUG_KPLAYER_WINDOW kdDebugTime() << "KPlayer::syncronizeEvents: processEvents returned " << rv << "\n"; //kdDebugTime() << "KPlayer::syncronizeEvents: posted event count " << qGlobalPostedEventsCount() << "\n"; #endif - //QApplication::sendPostedEvents(); - //QApplication::sendPostedEvents (this, QEvent::Resize); - //QApplication::sendPostedEvents (this, QEvent::Move); - //QApplication::sendPostedEvents (this, QEvent::LayoutHint); - //QApplication::sendPostedEvents (kPlayerWorkspace(), QEvent::Resize); + //TQApplication::sendPostedEvents(); + //TQApplication::sendPostedEvents (this, TQEvent::Resize); + //TQApplication::sendPostedEvents (this, TQEvent::Move); + //TQApplication::sendPostedEvents (this, TQEvent::LayoutHint); + //TQApplication::sendPostedEvents (kPlayerWorkspace(), TQEvent::Resize); #ifdef DEBUG_KPLAYER_WINDOW //kdDebugTime() << "KPlayer::syncronizeEvents: posted event count " << qGlobalPostedEventsCount() << "\n"; //kdDebugTime() << "KPlayer::syncronizeEvents done\n"; @@ -2069,23 +2069,23 @@ void KPlayer::zoom (void) #ifdef DEBUG_KPLAYER_WINDOW kdDebugTime() << "KPlayer::zoom\n"; #endif - QSize target (minimumSizeHint()); - QRect available (availableGeometry()); + TQSize target (minimumSizeHint()); + TQRect available (availableGeometry()); KMainWindow::setMinimumSize (target.width(), target.height()); do_zoom(); - target = frameGeometry().size() + settings() -> displaySize().expandedTo (QSize (1, 1)) - centralWidget() -> size(); - Qt::Dock dock; + target = frameGeometry().size() + settings() -> displaySize().expandedTo (TQSize (1, 1)) - centralWidget() -> size(); + TQt::Dock dock; int index, offset; bool newline; if ( ! log() -> isHidden() && getLocation (log(), dock, index, newline, offset) - && ((dock == Qt::DockLeft || dock == Qt::DockRight) && target.width() >= available.width() - || (dock == Qt::DockTop || dock == Qt::DockBottom) && target.height() >= available.height()) ) + && ((dock == TQt::DockLeft || dock == TQt::DockRight) && target.width() >= available.width() + || (dock == TQt::DockTop || dock == TQt::DockBottom) && target.height() >= available.height()) ) { #ifdef DEBUG_KPLAYER_RESIZING kdDebugTime() << "Log dock " << dock << " " << index << " " << newline << " " << offset << " " << log() -> x() << "x" << log() -> y() << " " << log() -> width() << "x" << log() -> height() << "\n"; kdDebugTime() << "Minimum log size " << log() -> minimumWidth() << "x" << log() -> minimumHeight() << "\n"; #endif - if ( (dock == Qt::DockLeft || dock == Qt::DockRight) + if ( (dock == TQt::DockLeft || dock == TQt::DockRight) && log() -> width() - log() -> minimumWidth() > target.width() - available.width() ) { #ifdef DEBUG_KPLAYER_RESIZING @@ -2093,7 +2093,7 @@ void KPlayer::zoom (void) #endif log() -> setFixedExtentWidth (log() -> width() - target.width() + available.width()); } - else if ( (dock == Qt::DockTop || dock == Qt::DockBottom) + else if ( (dock == TQt::DockTop || dock == TQt::DockBottom) && log() -> height() - log() -> minimumHeight() > target.height() - available.height() ) { #ifdef DEBUG_KPLAYER_RESIZING @@ -2106,17 +2106,17 @@ void KPlayer::zoom (void) else log() -> hide(); do_zoom(); - target = frameGeometry().size() + settings() -> displaySize().expandedTo (QSize (1, 1)) - centralWidget() -> size(); + target = frameGeometry().size() + settings() -> displaySize().expandedTo (TQSize (1, 1)) - centralWidget() -> size(); } if ( ! library() -> isHidden() && getLocation (library(), dock, index, newline, offset) - && ((dock == Qt::DockLeft || dock == Qt::DockRight) && target.width() >= available.width() - || (dock == Qt::DockTop || dock == Qt::DockBottom) && target.height() >= available.height()) ) + && ((dock == TQt::DockLeft || dock == TQt::DockRight) && target.width() >= available.width() + || (dock == TQt::DockTop || dock == TQt::DockBottom) && target.height() >= available.height()) ) { #ifdef DEBUG_KPLAYER_RESIZING kdDebugTime() << "Library dock " << dock << " " << index << " " << newline << " " << offset << " " << library() -> x() << "x" << library() -> y() << " " << library() -> width() << "x" << library() -> height() << "\n"; kdDebugTime() << "Minimum library size " << library() -> minimumWidth() << "x" << library() -> minimumHeight() << "\n"; #endif - if ( (dock == Qt::DockLeft || dock == Qt::DockRight) + if ( (dock == TQt::DockLeft || dock == TQt::DockRight) && library() -> width() - library() -> minimumWidth() > target.width() - available.width() ) { #ifdef DEBUG_KPLAYER_RESIZING @@ -2124,7 +2124,7 @@ void KPlayer::zoom (void) #endif library() -> setFixedExtentWidth (library() -> width() - target.width() + available.width()); } - else if ( (dock == Qt::DockTop || dock == Qt::DockBottom) + else if ( (dock == TQt::DockTop || dock == TQt::DockBottom) && library() -> height() - library() -> minimumHeight() > target.height() - available.height() ) //>= target.height() - available.height() ) { @@ -2138,13 +2138,13 @@ void KPlayer::zoom (void) else library() -> hide(); do_zoom(); - target = frameGeometry().size() + settings() -> displaySize().expandedTo (QSize (1, 1)) - centralWidget() -> size(); + target = frameGeometry().size() + settings() -> displaySize().expandedTo (TQSize (1, 1)) - centralWidget() -> size(); } int i = 0; - while ( centralWidget() -> size() != settings() -> displaySize().expandedTo (QSize (1, 1)) && i ++ < 5 ) + while ( centralWidget() -> size() != settings() -> displaySize().expandedTo (TQSize (1, 1)) && i ++ < 5 ) { settings() -> setDisplaySize (settings() -> constrainSize (centralWidget() -> size() - + available.size() - frameGeometry().size() - QSize (1, 1))); + + available.size() - frameGeometry().size() - TQSize (1, 1))); do_zoom(); } m_show_log = m_show_library = false; @@ -2154,22 +2154,22 @@ void KPlayer::zoom (void) //KPlayerX11SendConfigureEvent (winId(), geometry().x(), geometry().y(), width(), height()); //syncronizeEvents(); //layout() -> invalidate(); -//QApplication::postEvent (this, new QResizeEvent (size(), size())); +//TQApplication::postEvent (this, new TQResizeEvent (size(), size())); //KPlayerX11SendConfigureEvent (winId(), geometry().x(), geometry().y(), width(), height()); - QApplication::syncX(); + TQApplication::syncX(); //KPlayerX11DiscardConfigureEvents (winId()); KPlayerX11DiscardConfigureEvents (kPlayerWorkspace() -> winId()); //syncronizeEvents(); - QApplication::postEvent (this, new QEvent (QEvent::LayoutHint)); + TQApplication::postEvent (this, new TQEvent (TQEvent::LayoutHint)); //checkBarActions(); #ifdef DEBUG_KPLAYER_WINDOW kdDebugTime() << "Zoom done\n"; #endif } -void KPlayer::do_move (const QRect& frame) +void KPlayer::do_move (const TQRect& frame) { - QRect available (availableGeometry()); + TQRect available (availableGeometry()); bool xl = geometry().left() < available.left(); bool xr = frame.right() > available.right(); bool yt = frame.top() < available.top(); @@ -2193,10 +2193,10 @@ void KPlayer::activateLayout (void) kdDebugTime() << "KPlayer::activateLayout\n"; #endif layout() -> activate(); - QApplication::sendPostedEvents (this, QEvent::Resize); - QApplication::sendPostedEvents (this, QEvent::Move); - QApplication::sendPostedEvents (this, QEvent::LayoutHint); - QApplication::sendPostedEvents (kPlayerWorkspace(), QEvent::Resize); + TQApplication::sendPostedEvents (this, TQEvent::Resize); + TQApplication::sendPostedEvents (this, TQEvent::Move); + TQApplication::sendPostedEvents (this, TQEvent::LayoutHint); + TQApplication::sendPostedEvents (kPlayerWorkspace(), TQEvent::Resize); #ifdef DEBUG_KPLAYER_RESIZING kdDebugTime() << "KPlayer::activateLayout done\n"; #endif @@ -2204,18 +2204,18 @@ void KPlayer::activateLayout (void) void KPlayer::do_zoom (void) { - QRect available (availableGeometry()); + TQRect available (availableGeometry()); //if ( isMaximized() ) // showNormal(); activateLayout(); - QSize minimum (minimumSizeHint()); - QSize video (settings() -> displaySize().expandedTo (QSize (1, 1))); - QSize cwsize (centralWidget() -> size()); - QSize target (size() + video - cwsize); + TQSize minimum (minimumSizeHint()); + TQSize video (settings() -> displaySize().expandedTo (TQSize (1, 1))); + TQSize cwsize (centralWidget() -> size()); + TQSize target (size() + video - cwsize); if ( target.width() < minimum.width() || target.height() < minimum.height() ) { settings() -> setDisplaySize (cwsize); - video = settings() -> displaySize().expandedTo (QSize (1, 1)); + video = settings() -> displaySize().expandedTo (TQSize (1, 1)); target = size(); } #ifdef DEBUG_KPLAYER_RESIZING @@ -2243,7 +2243,7 @@ void KPlayer::do_zoom (void) while ( target != size() && i ++ < 5 ) { cwsize = target - size(); - QRect rect (frameGeometry()); + TQRect rect (frameGeometry()); rect.addCoords (0, 0, cwsize.width(), cwsize.height()); if ( rect.width() > available.width() || rect.height() > available.height() ) break; @@ -2257,7 +2257,7 @@ void KPlayer::do_zoom (void) if ( target.width() < minimum.width() || target.height() < minimum.height() ) { settings() -> setDisplaySize (cwsize); - video = settings() -> displaySize().expandedTo (QSize (1, 1)); + video = settings() -> displaySize().expandedTo (TQSize (1, 1)); target = size(); } #ifdef DEBUG_KPLAYER_RESIZING @@ -2287,36 +2287,36 @@ void KPlayer::do_zoom (void) #endif } -QRect KPlayer::availableGeometry (void) const +TQRect KPlayer::availableGeometry (void) const { - QRect rect; - if ( ! QApplication::desktop() -> isVirtualDesktop() ) + TQRect rect; + if ( ! TQApplication::desktop() -> isVirtualDesktop() ) { - rect = QApplication::desktop() -> availableGeometry(); + rect = TQApplication::desktop() -> availableGeometry(); #ifdef DEBUG_KPLAYER_RESIZING - kdDebugTime() << "Screen " << QApplication::desktop() -> screenGeometry().x() - << "x" << QApplication::desktop() -> screenGeometry().y() - << " " << QApplication::desktop() -> screenGeometry().width() - << "x" << QApplication::desktop() -> screenGeometry().height() << "\n"; + kdDebugTime() << "Screen " << TQApplication::desktop() -> screenGeometry().x() + << "x" << TQApplication::desktop() -> screenGeometry().y() + << " " << TQApplication::desktop() -> screenGeometry().width() + << "x" << TQApplication::desktop() -> screenGeometry().height() << "\n"; #endif } else - for ( int i = 0; i < QApplication::desktop() -> numScreens(); i ++ ) + for ( int i = 0; i < TQApplication::desktop() -> numScreens(); i ++ ) { - rect |= QApplication::desktop() -> availableGeometry (i); + rect |= TQApplication::desktop() -> availableGeometry (i); #ifdef DEBUG_KPLAYER_RESIZING - kdDebugTime() << "Screen " << i << " " << QApplication::desktop() -> screenGeometry (i).x() - << "x" << QApplication::desktop() -> screenGeometry (i).y() - << " " << QApplication::desktop() -> screenGeometry (i).width() - << "x" << QApplication::desktop() -> screenGeometry (i).height() << "\n"; - kdDebugTime() << "Available " << QApplication::desktop() -> availableGeometry (i).x() - << "x" << QApplication::desktop() -> availableGeometry (i).y() - << " " << QApplication::desktop() -> availableGeometry (i).width() - << "x" << QApplication::desktop() -> availableGeometry (i).height() << "\n"; + kdDebugTime() << "Screen " << i << " " << TQApplication::desktop() -> screenGeometry (i).x() + << "x" << TQApplication::desktop() -> screenGeometry (i).y() + << " " << TQApplication::desktop() -> screenGeometry (i).width() + << "x" << TQApplication::desktop() -> screenGeometry (i).height() << "\n"; + kdDebugTime() << "Available " << TQApplication::desktop() -> availableGeometry (i).x() + << "x" << TQApplication::desktop() -> availableGeometry (i).y() + << " " << TQApplication::desktop() -> availableGeometry (i).width() + << "x" << TQApplication::desktop() -> availableGeometry (i).height() << "\n"; #endif } #ifdef DEBUG_KPLAYER_RESIZING - kdDebugTime() << "Desktop " << QApplication::desktop() -> width() << "x" << QApplication::desktop() -> height() << "\n"; + kdDebugTime() << "Desktop " << TQApplication::desktop() -> width() << "x" << TQApplication::desktop() -> height() << "\n"; kdDebugTime() << "Total available geometry " << rect.width() << "x" << rect.height() << "\n"; #endif return rect; @@ -2329,7 +2329,7 @@ QRect KPlayer::availableGeometry (void) const << ", KPlayer Widget Size: " << kPlayerWidget() -> width() << "x" << kPlayerWidget() -> height() << ".\n"; } -void KPlayer::barPlaceChanged (QDockWindow::Place) +void KPlayer::barPlaceChanged (TQDockWindow::Place) { kdDebugTime() << "A bar place has changed.\n"; kdDebugTime() << "Central Widget Size: " << centralWidget() -> width() << "x" << centralWidget() -> height() diff --git a/kplayer/kplayer.h b/kplayer/kplayer.h index 55b90f4..003f39b 100644 --- a/kplayer/kplayer.h +++ b/kplayer/kplayer.h @@ -35,7 +35,7 @@ class KPlayerWorkspace; class KStatusBarLabel; class KToggleAction; class KURL; -class QMenuData; +class TQMenuData; #define MAIN_TOOLBAR 0 #define PLAYLIST_TOOLBAR 1 @@ -66,7 +66,7 @@ class KPlayer : public KMainWindow public: /** Constructor. Parameters are passed to KMainWindow constructor. */ - KPlayer (QWidget* parent=0, const char *name=0); + KPlayer (TQWidget* parent=0, const char *name=0); /** Destructor. */ virtual ~KPlayer() { } @@ -100,7 +100,7 @@ public: /** Starts playing a new file. */ void start (void); /** Logs a message if logging of KPlayer messages is enabled. */ - void log (QString); + void log (TQString); /** Shows or hides the menu bar according to the current settings and updates the user interface. */ void showMenubar (void); @@ -122,9 +122,9 @@ public: void showMessageLog (bool); /** Calculates the size hint for the main window. */ - //virtual QSize sizeHint (void) const; + //virtual TQSize sizeHint (void) const; /** Calculates the minimum size hint for the main window. */ - virtual QSize minimumSizeHint (void) const; + virtual TQSize minimumSizeHint (void) const; /** Sets the minimum size of the main widget. */ virtual void setMinimumSize (int, int); @@ -135,20 +135,20 @@ public: /** Changes to normal screen size. */ void toNormalScreen (void); - /** Replacement for broken QWidget::isMaximized. */ + /** Replacement for broken TQWidget::isMaximized. */ bool isMaximized (void) const; - /** Replacement for broken QWidget::showMaximized. */ + /** Replacement for broken TQWidget::showMaximized. */ virtual void showMaximized (void); /** Calls base class implementation. */ virtual void showNormal (void); protected: /** Returns the total available geometry. */ - QRect availableGeometry (void) const; + TQRect availableGeometry (void) const; /** Resizes the main window in response to a zoom request. */ void do_zoom (void); /** Moves the main window if it does not fit the available screen space. */ - void do_move (const QRect& frame); + void do_move (const TQRect& frame); /** Sets up actions and connects signals to slots. */ void initActions (void); /** Sets up the status bar. */ @@ -178,9 +178,9 @@ protected: //void checkBarActions (void); /** Enables or disables submenus of the given menu with the given name. */ - void enableSubmenu (QMenuData* data, const QString& name, bool enable); + void enableSubmenu (TQMenuData* data, const TQString& name, bool enable); /** Returns the top level popup menu at the given position. */ - QPopupMenu* popupMenu (int index); + TQPopupMenu* popupMenu (int index); /** Enables a toolbar. * @param index the toolbar number @@ -192,27 +192,27 @@ protected: void disableToolbar (int index); /** Changes the statusbar contents for the standard label permanently, used to indicate current actions. */ - void setStatusText (const QString&); + void setStatusText (const TQString&); /** Processes the widget events. Passes them on to KMainWindow. */ - //virtual bool event (QEvent*); + //virtual bool event (TQEvent*); /** Sets the window geometry on the initial show event. */ - virtual void showEvent (QShowEvent*); + virtual void showEvent (TQShowEvent*); virtual void windowActivationChange (bool); - virtual void focusInEvent (QFocusEvent*); - virtual void focusOutEvent (QFocusEvent*); + virtual void focusInEvent (TQFocusEvent*); + virtual void focusOutEvent (TQFocusEvent*); /** Handles main window movement. */ - virtual void moveEvent (QMoveEvent*); + virtual void moveEvent (TQMoveEvent*); /** Handles main window resizing. */ - virtual void resizeEvent (QResizeEvent*); + virtual void resizeEvent (TQResizeEvent*); /** Displays the right click popup menu. */ - virtual void contextMenuEvent (QContextMenuEvent*); + virtual void contextMenuEvent (TQContextMenuEvent*); /** Handles the drag enter event. */ - virtual void dragEnterEvent (QDragEnterEvent*); + virtual void dragEnterEvent (TQDragEnterEvent*); /** Handles the drop event. */ - virtual void dropEvent (QDropEvent*); + virtual void dropEvent (TQDropEvent*); /** Saves options and stops KPlayer engine. */ - virtual void closeEvent (QCloseEvent*); + virtual void closeEvent (TQCloseEvent*); /** Retrieves an action from the actionCollection by name. */ KAction* action (const char* name) const @@ -223,7 +223,7 @@ protected: /** Rearranges child windows and clears events. */ void activateLayout (void); - /** Syncronizes X Server and Qt events. */ + /** Syncronizes X Server and TQt events. */ //void syncronizeEvents (void); /** The log window object. */ @@ -241,8 +241,8 @@ protected: bool m_set_display_size, m_initial_show, m_error_detected, m_maximized; bool m_full_screen, m_show_log, m_show_library; Toolbar m_toolbar [KPLAYER_TOOLBARS]; - QSize m_previous_size, m_video_size; - QRect m_normal_geometry; + TQSize m_previous_size, m_video_size; + TQRect m_normal_geometry; KStatusBarLabel *m_status_label, *m_state_label, *m_progress_label; public slots: @@ -258,7 +258,7 @@ public slots: void initialSize (void); /** Enables or disables submenus with the given name. */ - void enableSubmenu (const QString& name, bool enable); + void enableSubmenu (const TQString& name, bool enable); /** Shows the message log if there have been errors. */ void statusPressed (void); @@ -314,14 +314,14 @@ public slots: void helpReportBug (void); /** Changes the statusbar test temporarily, used to display a hint on the currently highlighted action. */ - void setStatusMessage (const QString&); + void setStatusMessage (const TQString&); /** Clears the temporary statusbar text when the action is no longer highlighted. */ void clearStatusMessage (void); /** Handles bar orientation change event. */ //void barOrientationChanged (Orientation); /** Handles bar place change event. */ -//void barPlaceChanged (QDockWindow::Place); +//void barPlaceChanged (TQDockWindow::Place); /** Handles bar visibility change event. */ //void barVisibilityChanged (bool); @@ -335,7 +335,7 @@ protected slots: /** Receives the sizeAvailable signal from KPlayerProcess. */ void playerSizeAvailable (void); /** Receives the messageReceived signal from KPlayerProcess. */ - void playerMessageReceived (QString); + void playerMessageReceived (TQString); /** Receives the errorDetected signal from KPlayerProcess. */ void playerErrorDetected (void); /** Receives the windowHidden signal from KPlayerLogWindow. Updates the menu item. */ @@ -359,7 +359,7 @@ protected slots: void libraryActionListUpdated (KPlayerActionList* list); /** Displays the right click popup menu at the given position. */ - void contextMenu (const QPoint& global_position); + void contextMenu (const TQPoint& global_position); }; /** The KPlayer application class. @@ -379,9 +379,9 @@ public: virtual int newInstance (void); /** Remembers the shift key state. */ - virtual bool notify (QObject*, QEvent*); + virtual bool notify (TQObject*, TQEvent*); - //int x11ClientMessage (QWidget* widget, XEvent* event, bool passive_only); + //int x11ClientMessage (TQWidget* widget, XEvent* event, bool passive_only); }; #endif diff --git a/kplayer/kplayeractionlist.cpp b/kplayer/kplayeractionlist.cpp index b8035eb..0f2a95f 100644 --- a/kplayer/kplayeractionlist.cpp +++ b/kplayer/kplayeractionlist.cpp @@ -15,8 +15,8 @@ #include #include -#include -#include +#include +#include #ifdef DEBUG #include @@ -28,9 +28,9 @@ kdbgstream kdDebugTime (void); #include "kplayeractionlist.moc" #include "kplayerproperties.h" -KPlayerActionList::KPlayerActionList (const QString& text, const QString& status, - const QString& whatsthis, QObject* parent, const char* name) - : QObject (parent, name), m_text (text), m_status (status), m_whatsthis (whatsthis) +KPlayerActionList::KPlayerActionList (const TQString& text, const TQString& status, + const TQString& whatsthis, TQObject* parent, const char* name) + : TQObject (parent, name), m_text (text), m_status (status), m_whatsthis (whatsthis) { #ifdef DEBUG_KPLAYER_ACTIONLIST kdDebugTime() << "Creating action list\n"; @@ -65,20 +65,20 @@ void KPlayerActionList::plug (void) #endif for ( i = 0; i < count; i ++ ) { - QWidget* container = action -> container (i); + TQWidget* container = action -> container (i); #ifdef DEBUG_KPLAYER_ACTIONLIST kdDebugTime() << " Container " << container -> className() << " " << container -> name ("") << "\n"; #endif - if ( container -> inherits ("QPopupMenu") ) + if ( container -> inherits ("TQPopupMenu") ) { - QPopupMenu* menu = (QPopupMenu*) container; + TQPopupMenu* menu = (TQPopupMenu*) container; int index = menu -> indexOf (action -> itemId (i)); #ifdef DEBUG_KPLAYER_ACTIONLIST kdDebugTime() << " Index " << index << "\n"; #endif if ( index > 0 ) { - QMenuItem* item = menu -> findItem (menu -> idAt (index - 1)); + TQMenuItem* item = menu -> findItem (menu -> idAt (index - 1)); if ( ! item || ! item -> isSeparator() ) menu -> insertSeparator (index); } @@ -91,20 +91,20 @@ void KPlayerActionList::plug (void) #endif for ( i = 0; i < count; i ++ ) { - QWidget* container = action -> container (i); + TQWidget* container = action -> container (i); #ifdef DEBUG_KPLAYER_ACTIONLIST kdDebugTime() << " Container " << container -> className() << " " << container -> name ("") << "\n"; #endif - if ( container -> inherits ("QPopupMenu") ) + if ( container -> inherits ("TQPopupMenu") ) { - QPopupMenu* menu = (QPopupMenu*) container; + TQPopupMenu* menu = (TQPopupMenu*) container; int index = menu -> indexOf (action -> itemId (i)) + 1; #ifdef DEBUG_KPLAYER_ACTIONLIST kdDebugTime() << " Index " << index << "\n"; #endif if ( index > 0 && index < int (menu -> count()) ) { - QMenuItem* item = menu -> findItem (menu -> idAt (index)); + TQMenuItem* item = menu -> findItem (menu -> idAt (index)); if ( ! item || ! item -> isSeparator() ) menu -> insertSeparator (index); } @@ -131,20 +131,20 @@ void KPlayerActionList::unplug (void) #endif for ( i = 0; i < count; i ++ ) { - QWidget* container = action -> container (i); + TQWidget* container = action -> container (i); #ifdef DEBUG_KPLAYER_ACTIONLIST kdDebugTime() << " Container " << container -> className() << " " << container -> name ("") << "\n"; #endif - if ( container -> inherits ("QPopupMenu") ) + if ( container -> inherits ("TQPopupMenu") ) { - QPopupMenu* menu = (QPopupMenu*) container; + TQPopupMenu* menu = (TQPopupMenu*) container; int index = menu -> indexOf (action -> itemId (i)); #ifdef DEBUG_KPLAYER_ACTIONLIST kdDebugTime() << " Index " << index << "\n"; #endif if ( index > 0 ) { - QMenuItem* item = menu -> findItem (menu -> idAt (index - 1)); + TQMenuItem* item = menu -> findItem (menu -> idAt (index - 1)); if ( ! item || item -> isSeparator() ) menu -> removeItemAt (index - 1); } @@ -157,20 +157,20 @@ void KPlayerActionList::unplug (void) #endif for ( i = 0; i < count; i ++ ) { - QWidget* container = action -> container (i); + TQWidget* container = action -> container (i); #ifdef DEBUG_KPLAYER_ACTIONLIST kdDebugTime() << " Container " << container -> className() << " " << container -> name ("") << "\n"; #endif - if ( container -> inherits ("QPopupMenu") ) + if ( container -> inherits ("TQPopupMenu") ) { - QPopupMenu* menu = (QPopupMenu*) container; + TQPopupMenu* menu = (TQPopupMenu*) container; int index = menu -> indexOf (action -> itemId (i)) + 1; #ifdef DEBUG_KPLAYER_ACTIONLIST kdDebugTime() << " Index " << index << "\n"; #endif if ( index > 0 && index < int (menu -> count()) ) { - QMenuItem* item = menu -> findItem (menu -> idAt (index)); + TQMenuItem* item = menu -> findItem (menu -> idAt (index)); if ( ! item || item -> isSeparator() ) menu -> removeItemAt (index); } @@ -183,7 +183,7 @@ void KPlayerActionList::unplug (void) void KPlayerActionList::updateAction (KAction* action) { - QString text (action -> text()); + TQString text (action -> text()); action -> setStatusText (m_status.arg (text)); action -> setWhatsThis (m_whatsthis.arg (text)); text = m_text.arg (text); @@ -203,7 +203,7 @@ void KPlayerActionList::actionActivated (void) kdDebugTime() << " Name " << action -> text() << "\n"; #endif int index = 0; - QPtrListIterator iterator (actions()); + TQPtrListIterator iterator (actions()); while ( iterator.current() ) { if ( iterator.current() == action ) @@ -226,8 +226,8 @@ void KPlayerActionList::actionActivated (KAction*, int index) emit activated (index); } -KPlayerSimpleActionList::KPlayerSimpleActionList (const QStringList& names, const QString& text, - const QString& status, const QString& whatsthis, QObject* parent, const char* name) +KPlayerSimpleActionList::KPlayerSimpleActionList (const TQStringList& names, const TQString& text, + const TQString& status, const TQString& whatsthis, TQObject* parent, const char* name) : KPlayerActionList (text, status, whatsthis, parent, name), m_names (names) { #ifdef DEBUG_KPLAYER_ACTIONLIST @@ -248,7 +248,7 @@ void KPlayerSimpleActionList::update (void) kdDebugTime() << "KPlayerSimpleActionList::update\n"; #endif unplug(); - QStringList::ConstIterator iterator (m_names.constBegin()); + TQStringList::ConstIterator iterator (m_names.constBegin()); while ( iterator != m_names.constEnd() ) { KAction* action = new KAction (*iterator, 0, this, SLOT(actionActivated()), this); @@ -261,9 +261,9 @@ void KPlayerSimpleActionList::update (void) void KPlayerSimpleActionList::updateAction (KAction* action) { - QString text (action -> text()); + TQString text (action -> text()); KPlayerPropertyInfo* info = KPlayerMedia::info (text); - QString caption (info -> caption()); + TQString caption (info -> caption()); if ( caption.isEmpty() ) caption = i18n(text.utf8()); action -> setStatusText (m_status.arg (caption)); @@ -273,9 +273,9 @@ void KPlayerSimpleActionList::updateAction (KAction* action) action -> setText (caption); } -KPlayerToggleActionList::KPlayerToggleActionList (const QStringList& names, const QMap& states, - const QString& ontext, const QString& offtext, const QString& onstatus, const QString& offstatus, - const QString& onwhatsthis, const QString& offwhatsthis, QObject* parent, const char* name) +KPlayerToggleActionList::KPlayerToggleActionList (const TQStringList& names, const TQMap& states, + const TQString& ontext, const TQString& offtext, const TQString& onstatus, const TQString& offstatus, + const TQString& onwhatsthis, const TQString& offwhatsthis, TQObject* parent, const char* name) : KPlayerSimpleActionList (names, offtext, offstatus, offwhatsthis, parent, name), m_states (states), m_on_text (ontext), m_on_status (onstatus), m_on_whatsthis (onwhatsthis) { @@ -293,9 +293,9 @@ KPlayerToggleActionList::~KPlayerToggleActionList() void KPlayerToggleActionList::updateAction (KAction* action) { - QString text (action -> text()); + TQString text (action -> text()); KPlayerPropertyInfo* info = KPlayerMedia::info (text); - QString caption (info -> caption()); + TQString caption (info -> caption()); if ( caption.isEmpty() ) caption = i18n(text.utf8()); bool on = m_states [text]; @@ -317,15 +317,15 @@ void KPlayerToggleActionList::actionActivated (KAction* action, int index) updateAction (action); } -QString languageName (int id, QString language) +TQString languageName (int id, TQString language) { - static const QString middle ("|ave|bam|ben|bih|bos|ces|che|chu|chv|div|epo|est|ewe|fao|fij|fry|glv|grn|hat|hmo|ido|iku|ile|ina|ind|ipk|jav|kal|kan|kas|khm|lao|lav|lin|lit|lug|mah|mal|mri|mar|mlg|mlt|mon|mri|nav|nob|orm|pli|pol|pus|run|sag|slk|sme|snd|sot|tat|tgl|tsn|tuk|tur|uig|zha|"); - static const QString right ("|aar|abk|afr|aka|amh|ara|asm|ava|aym|aze|bak|bel|bis|bod|bre|cat|cha|cos|cre|cym|dan|deu|dzo|ell|eng|eus|fas|fin|fra|fre|glg|guj|hau|heb|hin|hrv|hun|hye|iii|isl|ita|kat|kik|kor|kur|lat|lim|lub|mkd|mol|msa|mya|nau|nde|nep|nld|nno|nor|nya|oci|oji|ori|oss|pan|que|ron|rus|san|srp|sin|slv|smo|sna|som|sqi|srp|ssw|sun|swa|tam|tel|tgk|tha|tir|ton|tso|twi|ukr|urd|uzb|ven|vie|vol|wol|xho|yid|yor|zho|zul|"); - static const QString other ("|alb|sq|arg|an|arm|hy|baq|eu|bul|bg|bur|my|cze|cs|chi|zh|cor|kw|wel|cy|ger|de|dut|nl|gre|el|per|fa|ful|ff|geo|ka|gla|gd|gle|ga|her|hz|scr|hr|ibo|ig|ice|is|jpn|ja|kau|kr|kaz|kk|kin|rw|kir|ky|kom|kv|kon|kg|kua|kj|ltz|lb|mac|mk|mao|mi|may|ms|nbl|nr|ndo|ng|por|pt|roh|rm|rum|ro|scc|sr|slo|sk|spa|es|srd|sc|swe|sv|tah|ty|tib|bo|wln|wa"); - static QRegExp re_lang_code ("^([^\\[]+)\\[([^\\]]+)\\]"); + static const TQString middle ("|ave|bam|ben|bih|bos|ces|che|chu|chv|div|epo|est|ewe|fao|fij|fry|glv|grn|hat|hmo|ido|iku|ile|ina|ind|ipk|jav|kal|kan|kas|khm|lao|lav|lin|lit|lug|mah|mal|mri|mar|mlg|mlt|mon|mri|nav|nob|orm|pli|pol|pus|run|sag|slk|sme|snd|sot|tat|tgl|tsn|tuk|tur|uig|zha|"); + static const TQString right ("|aar|abk|afr|aka|amh|ara|asm|ava|aym|aze|bak|bel|bis|bod|bre|cat|cha|cos|cre|cym|dan|deu|dzo|ell|eng|eus|fas|fin|fra|fre|glg|guj|hau|heb|hin|hrv|hun|hye|iii|isl|ita|kat|kik|kor|kur|lat|lim|lub|mkd|mol|msa|mya|nau|nde|nep|nld|nno|nor|nya|oci|oji|ori|oss|pan|que|ron|rus|san|srp|sin|slv|smo|sna|som|sqi|srp|ssw|sun|swa|tam|tel|tgk|tha|tir|ton|tso|twi|ukr|urd|uzb|ven|vie|vol|wol|xho|yid|yor|zho|zul|"); + static const TQString other ("|alb|sq|arg|an|arm|hy|baq|eu|bul|bg|bur|my|cze|cs|chi|zh|cor|kw|wel|cy|ger|de|dut|nl|gre|el|per|fa|ful|ff|geo|ka|gla|gd|gle|ga|her|hz|scr|hr|ibo|ig|ice|is|jpn|ja|kau|kr|kaz|kk|kin|rw|kir|ky|kom|kv|kon|kg|kua|kj|ltz|lb|mac|mk|mao|mi|may|ms|nbl|nr|ndo|ng|por|pt|roh|rm|rum|ro|scc|sr|slo|sk|spa|es|srd|sc|swe|sv|tah|ty|tib|bo|wln|wa"); + static TQRegExp re_lang_code ("^([^\\[]+)\\[([^\\]]+)\\]"); if ( language.length() < 2 ) return i18n("Track %1").arg (id); - QString name; + TQString name; if ( re_lang_code.search (language) >= 0 ) { name = re_lang_code.cap(2).simplifyWhiteSpace(); @@ -335,7 +335,7 @@ QString languageName (int id, QString language) } if ( language.length() == 3 ) { - QString code ('|' + language + '|'); + TQString code ('|' + language + '|'); if ( middle.find (code, 0, false) >= 0 ) language.remove (1, 1); else if ( right.find (code, 0, false) >= 0 ) @@ -347,7 +347,7 @@ QString languageName (int id, QString language) language = other.mid (index + 5, 2); } } - QString locname (KGlobal::locale() -> twoAlphaToLanguageName (language)); + TQString locname (KGlobal::locale() -> twoAlphaToLanguageName (language)); if ( locname.isEmpty() ) { if ( language == "no" ) @@ -359,8 +359,8 @@ QString languageName (int id, QString language) return locname; } -KPlayerTrackActionList::KPlayerTrackActionList (const QString& text, const QString& status, - const QString& whatsthis, QObject* parent, const char* name) +KPlayerTrackActionList::KPlayerTrackActionList (const TQString& text, const TQString& status, + const TQString& whatsthis, TQObject* parent, const char* name) : KPlayerActionList (text, status, whatsthis, parent, name) { #ifdef DEBUG_KPLAYER_ACTIONLIST @@ -375,12 +375,12 @@ KPlayerTrackActionList::~KPlayerTrackActionList() #endif } -void KPlayerTrackActionList::addActions (const QMap& ids, int id) +void KPlayerTrackActionList::addActions (const TQMap& ids, int id) { - QMap::ConstIterator iterator (ids.constBegin()), end (ids.constEnd()); + TQMap::ConstIterator iterator (ids.constBegin()), end (ids.constEnd()); while ( iterator != end ) { - QString text (languageName (iterator.key(), iterator.data())); + TQString text (languageName (iterator.key(), iterator.data())); #ifdef DEBUG_KPLAYER_ACTIONLIST kdDebugTime() << " Stream " << iterator.key() << " " << iterator.data() << " " << text << "\n"; #endif @@ -394,7 +394,7 @@ void KPlayerTrackActionList::addActions (const QMap& ids, int id) } } -void KPlayerTrackActionList::update (const QMap& ids, int id) +void KPlayerTrackActionList::update (const TQMap& ids, int id) { unplug(); if ( ids.count() > 1 ) @@ -411,8 +411,8 @@ void KPlayerTrackActionList::actionActivated (KAction* action, int index) KPlayerActionList::actionActivated (action, ((KToggleAction*) action) -> isChecked() ? index : -1); } -KPlayerSubtitleTrackActionList::KPlayerSubtitleTrackActionList (const QString& text, const QString& status, - const QString& whatsthis, QObject* parent, const char* name) +KPlayerSubtitleTrackActionList::KPlayerSubtitleTrackActionList (const TQString& text, const TQString& status, + const TQString& whatsthis, TQObject* parent, const char* name) : KPlayerTrackActionList (text, status, whatsthis, parent, name) { #ifdef DEBUG_KPLAYER_ACTIONLIST @@ -427,8 +427,8 @@ KPlayerSubtitleTrackActionList::~KPlayerSubtitleTrackActionList() #endif } -void KPlayerSubtitleTrackActionList::update (bool show, const QMap& sids, int sid, - const QMap& vsids, int vsid, QStringList files, const QString& vobsub, const QString& current) +void KPlayerSubtitleTrackActionList::update (bool show, const TQMap& sids, int sid, + const TQMap& vsids, int vsid, TQStringList files, const TQString& vobsub, const TQString& current) { unplug(); if ( sids.count() > 0 || vsids.count() > 0 || files.count() > 0 ) @@ -444,10 +444,10 @@ void KPlayerSubtitleTrackActionList::update (bool show, const QMap addActions (vsids, vsid); if ( vsids.isEmpty() ) files << vobsub; - QStringList::ConstIterator iterator (files.constBegin()), end (files.constEnd()); + TQStringList::ConstIterator iterator (files.constBegin()), end (files.constEnd()); while ( iterator != end ) { - QString text ((*iterator).section ('/', -1, -1)); + TQString text ((*iterator).section ('/', -1, -1)); #ifdef DEBUG_KPLAYER_ACTIONLIST kdDebugTime() << " Subtitle file '" << text << "' " << *iterator << "\n"; #endif diff --git a/kplayer/kplayeractionlist.h b/kplayer/kplayeractionlist.h index 12c3bdf..86ee8c8 100644 --- a/kplayer/kplayeractionlist.h +++ b/kplayer/kplayeractionlist.h @@ -16,27 +16,27 @@ #ifndef KPLAYERACTIONLIST_H #define KPLAYERACTIONLIST_H -#include -#include +#include +#include class KAction; /**Action list. *@author kiriuja */ -class KPlayerActionList : public QObject +class KPlayerActionList : public TQObject { Q_OBJECT public: /** Constructor. */ - KPlayerActionList (const QString& text, const QString& status, - const QString& whatsthis, QObject* parent, const char* name); + KPlayerActionList (const TQString& text, const TQString& status, + const TQString& whatsthis, TQObject* parent, const char* name); /** Destructor. */ virtual ~KPlayerActionList(); /** Returns the list of actions. */ - const QPtrList& actions (void) const + const TQPtrList& actions (void) const { return m_actions; } /** Returns the number of actions on the list. */ int count (void) const @@ -68,13 +68,13 @@ protected: virtual void actionActivated (KAction* action, int index); /** Action text template. */ - QString m_text; + TQString m_text; /** Action status text template. */ - QString m_status; + TQString m_status; /** Action whats this text template. */ - QString m_whatsthis; + TQString m_whatsthis; /** Action list. */ - QPtrList m_actions; + TQPtrList m_actions; }; /**Simple action list. @@ -86,8 +86,8 @@ class KPlayerSimpleActionList : public KPlayerActionList public: /** Constructor. */ - KPlayerSimpleActionList (const QStringList& names, const QString& text, const QString& status, - const QString& whatsthis, QObject* parent, const char* name); + KPlayerSimpleActionList (const TQStringList& names, const TQString& text, const TQString& status, + const TQString& whatsthis, TQObject* parent, const char* name); /** Destructor. */ virtual ~KPlayerSimpleActionList(); @@ -99,7 +99,7 @@ protected: virtual void updateAction (KAction* action); /** Action names. */ - const QStringList& m_names; + const TQStringList& m_names; }; /**Toggle action list. @@ -111,9 +111,9 @@ class KPlayerToggleActionList : public KPlayerSimpleActionList public: /** Constructor. */ - KPlayerToggleActionList (const QStringList& names, const QMap& states, - const QString& ontext, const QString& offtext, const QString& onstatus, const QString& offstatus, - const QString& onwhatsthis, const QString& offwhatsthis, QObject* parent, const char* name); + KPlayerToggleActionList (const TQStringList& names, const TQMap& states, + const TQString& ontext, const TQString& offtext, const TQString& onstatus, const TQString& offstatus, + const TQString& onwhatsthis, const TQString& offwhatsthis, TQObject* parent, const char* name); /** Destructor. */ virtual ~KPlayerToggleActionList(); @@ -124,13 +124,13 @@ protected: virtual void actionActivated (KAction* action, int index); /** Action states. */ - const QMap& m_states; + const TQMap& m_states; /** Action on text template. */ - QString m_on_text; + TQString m_on_text; /** Action on status text template. */ - QString m_on_status; + TQString m_on_status; /** Action on whats this text template. */ - QString m_on_whatsthis; + TQString m_on_whatsthis; }; /**Track action list. @@ -142,17 +142,17 @@ class KPlayerTrackActionList : public KPlayerActionList public: /** Constructor. */ - KPlayerTrackActionList (const QString& text, const QString& status, - const QString& whatsthis, QObject* parent, const char* name); + KPlayerTrackActionList (const TQString& text, const TQString& status, + const TQString& whatsthis, TQObject* parent, const char* name); /** Destructor. */ virtual ~KPlayerTrackActionList(); /** Updates the track action list. */ - void update (const QMap& ids, int id); + void update (const TQMap& ids, int id); protected: /** Adds actions for the given IDs to the list. */ - void addActions (const QMap& ids, int id); + void addActions (const TQMap& ids, int id); /** Selects the track with the given index by emitting the activated signal. */ virtual void actionActivated (KAction* action, int index); @@ -167,14 +167,14 @@ class KPlayerSubtitleTrackActionList : public KPlayerTrackActionList public: /** Constructor. */ - KPlayerSubtitleTrackActionList (const QString& text, const QString& status, - const QString& whatsthis, QObject* parent, const char* name); + KPlayerSubtitleTrackActionList (const TQString& text, const TQString& status, + const TQString& whatsthis, TQObject* parent, const char* name); /** Destructor. */ virtual ~KPlayerSubtitleTrackActionList(); /** Updates the track action list. */ - void update (bool show, const QMap& sids, int sid, const QMap& vsids, - int vsid, QStringList files, const QString& vobsub, const QString& current); + void update (bool show, const TQMap& sids, int sid, const TQMap& vsids, + int vsid, TQStringList files, const TQString& vobsub, const TQString& current); protected: /** Selects the track with the given index by emitting the activated signal. */ diff --git a/kplayer/kplayerengine.cpp b/kplayer/kplayerengine.cpp index d85a9de..e956a36 100644 --- a/kplayer/kplayerengine.cpp +++ b/kplayer/kplayerengine.cpp @@ -21,9 +21,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #ifdef DEBUG #define DEBUG_KPLAYER_ENGINE @@ -39,30 +39,30 @@ KPlayerEngine* KPlayerEngine::m_engine = 0; -static QRegExp re_extension ("\\.[^/.]+$"); -static QRegExp re_driver ("^\\s+([A-Za-z0-9]+)\\s+(\\S.*)"); -static QRegExp re_codec ("^([A-Za-z0-9]+)\\s+\\S+\\s+\\S+\\s+(\\S.*)"); -static QRegExp re_demuxer ("^\\s*([A-Za-z0-9]+)\\s+\\d+\\s+(\\S.*)"); -static QRegExp re_multiple ("\\s+"), re_trailing (" $"); -static QRegExp re_brackets (" ?\\[.*\\]"), re_parentheses (" ?\\((?:..+|\\?)\\)"); -static QRegExp re_audio ("[- ](?:audio[- ])?(?:decoder|codec|output|out)s?", false); -static QRegExp re_video ("[- ](?:video[- ])?(?:decoder|codec|output|out)s?", false); -static QRegExp re_s ("'s", false), re_layer ("layer-", false); -static QRegExp re_dash (" - ", false); -static QRegExp re_writer (" writer", false); -static QRegExp re_demux (" demuxer", false); -static QRegExp re_sega (" for Sega Saturn CD-ROM games", false); -static QRegExp re_smjpeg ("smjpeg", false); -static QRegExp re_tv_card ("Tv card", false); -static QRegExp re_lmlm (" Compression Card stream", false); -static QRegExp re_xv ("/XV$", false), re_vidix (" \\(VIDIX\\)", false); -static QRegExp re_xover ("General X11 driver for overlay capable video output drivers", false); -static QRegExp re_opengl ("\\(OpenGL\\)", false); -static QRegExp re_matrox ("Matrox .* overlay in", false); -static QRegExp re_matroxg (" G200/G400/G450/G550", false); -static QRegExp re_macintosh ("Macintosh Audio Compression and Expansion", false); -static QRegExp re_amu ("Avid Meridien Uncompressed", false); -static QRegExp re_speech ("Windows Media Audio 9 Speech", false); +static TQRegExp re_extension ("\\.[^/.]+$"); +static TQRegExp re_driver ("^\\s+([A-Za-z0-9]+)\\s+(\\S.*)"); +static TQRegExp re_codec ("^([A-Za-z0-9]+)\\s+\\S+\\s+\\S+\\s+(\\S.*)"); +static TQRegExp re_demuxer ("^\\s*([A-Za-z0-9]+)\\s+\\d+\\s+(\\S.*)"); +static TQRegExp re_multiple ("\\s+"), re_trailing (" $"); +static TQRegExp re_brackets (" ?\\[.*\\]"), re_parentheses (" ?\\((?:..+|\\?)\\)"); +static TQRegExp re_audio ("[- ](?:audio[- ])?(?:decoder|codec|output|out)s?", false); +static TQRegExp re_video ("[- ](?:video[- ])?(?:decoder|codec|output|out)s?", false); +static TQRegExp re_s ("'s", false), re_layer ("layer-", false); +static TQRegExp re_dash (" - ", false); +static TQRegExp re_writer (" writer", false); +static TQRegExp re_demux (" demuxer", false); +static TQRegExp re_sega (" for Sega Saturn CD-ROM games", false); +static TQRegExp re_smjpeg ("smjpeg", false); +static TQRegExp re_tv_card ("Tv card", false); +static TQRegExp re_lmlm (" Compression Card stream", false); +static TQRegExp re_xv ("/XV$", false), re_vidix (" \\(VIDIX\\)", false); +static TQRegExp re_xover ("General X11 driver for overlay capable video output drivers", false); +static TQRegExp re_opengl ("\\(OpenGL\\)", false); +static TQRegExp re_matrox ("Matrox .* overlay in", false); +static TQRegExp re_matroxg (" G200/G400/G450/G550", false); +static TQRegExp re_macintosh ("Macintosh Audio Compression and Expansion", false); +static TQRegExp re_amu ("Avid Meridien Uncompressed", false); +static TQRegExp re_speech ("Windows Media Audio 9 Speech", false); void KPlayerWindowStateChanged (uint wid) { @@ -70,11 +70,11 @@ void KPlayerWindowStateChanged (uint wid) kPlayerEngine() -> emitWindowStateChanged (wid); } -int listIndex (const QStringList& sl, const QString& str) +int listIndex (const TQStringList& sl, const TQString& str) { - QString entry, stru (str.upper()), strusc (stru + ":"); + TQString entry, stru (str.upper()), strusc (stru + ":"); int index = 0; - for ( QStringList::ConstIterator sli = sl.begin(); sli != sl.end(); ++ sli ) + for ( TQStringList::ConstIterator sli = sl.begin(); sli != sl.end(); ++ sli ) { entry = (*sli).upper(); if ( entry == stru || entry.startsWith (strusc) ) @@ -84,13 +84,13 @@ int listIndex (const QStringList& sl, const QString& str) return -1; } -KPlayerFileDialog::KPlayerFileDialog (const QString& dir, const QString& filter, QWidget* parent, const char* name) +KPlayerFileDialog::KPlayerFileDialog (const TQString& dir, const TQString& filter, TQWidget* parent, const char* name) : KFileDialog (dir, filter, parent ? parent : kPlayerWidget(), name, true) { ops -> clearHistory(); } -KPlayerEngine::KPlayerEngine (KActionCollection* ac, QWidget* parent, const char* name, KConfig* config) +KPlayerEngine::KPlayerEngine (KActionCollection* ac, TQWidget* parent, const char* name, KConfig* config) { #ifdef DEBUG_KPLAYER_ENGINE kdDebugTime() << "Creating engine\n"; @@ -131,8 +131,8 @@ KPlayerEngine::KPlayerEngine (KActionCollection* ac, QWidget* parent, const char m_audio_codecs << "wma9dmo: Windows Media Audio 9 DMO" << "wmadmo: Windows Media Audio DMO" - << "qdmc: Quicktime QDMC/QDM2" - << "qclp: Quicktime QCLP" + << "qdmc: Quicktime TQDMC/TQDM2" + << "qclp: Quicktime TQCLP" << "qtmace3: Quicktime MACE3" << "qtmace6: Quicktime MACE6" << "racook: RealAudio COOK" @@ -327,7 +327,7 @@ KPlayerEngine::KPlayerEngine (KActionCollection* ac, QWidget* parent, const char << "alaris: Alaris VideoGramPiX" << "vcr1: ATI VCR-1" << "pim1: Pinnacle Hardware MPEG1" - << "qpeg: Q-Team QPEG" + << "qpeg: Q-Team TQPEG" << "rricm: rricm" << "camtasia: TechSmith Camtasia Screen" << "rawrgb32: RAW RGB32" @@ -402,23 +402,23 @@ KPlayerEngine::~KPlayerEngine() delete process(); if ( meta() ) { - QStringList groups (meta() -> groupList()); + TQStringList groups (meta() -> groupList()); #ifdef DEBUG_KPLAYER_ENGINE kdDebugTime() << "Cache has " << groups.count() << " entries\n"; #endif if ( int (groups.count()) > configuration() -> cacheSizeLimit() ) { - QMap map; + TQMap map; int i = 0; - for ( QStringList::Iterator it = groups.begin(); it != groups.end(); ++ it ) + for ( TQStringList::Iterator it = groups.begin(); it != groups.end(); ++ it ) { meta() -> setGroup (*it); - QDateTime dt (meta() -> readDateTimeEntry ("Date")); + TQDateTime dt (meta() -> readDateTimeEntry ("Date")); if ( ! dt.isNull() ) - map.insert (dt.toString (Qt::ISODate) + QString().sprintf ("-%04u", i ++), *it); + map.insert (dt.toString (TQt::ISODate) + TQString().sprintf ("-%04u", i ++), *it); } i = groups.count() - configuration() -> cacheSizeLimit(); - for ( QMap::Iterator mapit = map.begin(); i && mapit != map.end(); ++ mapit ) + for ( TQMap::Iterator mapit = map.begin(); i && mapit != map.end(); ++ mapit ) { #ifdef DEBUG_KPLAYER_ENGINE kdDebugTime() << "Deleting entry for " << mapit.data() << " from " << mapit.key() << "\n"; @@ -447,7 +447,7 @@ KPlayerEngine::~KPlayerEngine() delete meta(); } -void KPlayerEngine::initialize (KActionCollection* ac, QWidget* parent, const char* name, KConfig* config) +void KPlayerEngine::initialize (KActionCollection* ac, TQWidget* parent, const char* name, KConfig* config) { if ( ! engine() ) { @@ -862,9 +862,9 @@ void KPlayerEngine::refreshAspect (void) return; if ( settings() -> isAspect (properties() -> originalSize()) ) toggleAction ("view_original_aspect") -> setChecked (true); - else if ( settings() -> isAspect (QSize (4, 3)) ) + else if ( settings() -> isAspect (TQSize (4, 3)) ) toggleAction ("view_aspect_4_3") -> setChecked (true); - else if ( settings() -> isAspect (QSize (16, 9)) ) + else if ( settings() -> isAspect (TQSize (16, 9)) ) toggleAction ("view_aspect_16_9") -> setChecked (true); else toggleAction ("view_current_aspect") -> setChecked (true); @@ -900,7 +900,7 @@ void KPlayerEngine::playerStateChanged (KPlayerProcess::State state, KPlayerProc if ( state < KPlayerProcess::Playing && previous >= KPlayerProcess::Playing && ! properties() -> temporaryName().isEmpty() ) { - properties() -> setTemporaryName (QString::null); + properties() -> setTemporaryName (TQString::null); properties() -> commit(); } } @@ -932,7 +932,7 @@ void KPlayerEngine::playerInfoAvailable (void) kdDebugTime() << "Engine: Info available. Detected length: " << properties() -> length() << "\n"; #endif m_updating = true; - // QRangeControl breaks if its range is more than 524287 + // TQRangeControl breaks if its range is more than 524287 if ( properties() -> length() > 50000 ) m_progress_factor = 1; else if ( properties() -> length() > 5000 ) @@ -998,12 +998,12 @@ void KPlayerEngine::enablePlayerActions (void) busy = busy && properties() -> hasLength(); if ( ! busy ) { - QMouseEvent me1 (QEvent::MouseButtonRelease, QPoint (0, 0), QPoint (0, 0), Qt::LeftButton, - settings() -> shift() ? Qt::ShiftButton | Qt::LeftButton : Qt::LeftButton); - QApplication::sendEvent (sliderAction ("player_progress") -> slider(), &me1); - QMouseEvent me2 (QEvent::MouseButtonRelease, QPoint (0, 0), QPoint (0, 0), Qt::MidButton, - settings() -> shift() ? Qt::ShiftButton | Qt::MidButton : Qt::MidButton); - QApplication::sendEvent (sliderAction ("player_progress") -> slider(), &me2); + TQMouseEvent me1 (TQEvent::MouseButtonRelease, TQPoint (0, 0), TQPoint (0, 0), TQt::LeftButton, + settings() -> shift() ? TQt::ShiftButton | TQt::LeftButton : TQt::LeftButton); + TQApplication::sendEvent (sliderAction ("player_progress") -> slider(), &me1); + TQMouseEvent me2 (TQEvent::MouseButtonRelease, TQPoint (0, 0), TQPoint (0, 0), TQt::MidButton, + settings() -> shift() ? TQt::ShiftButton | TQt::MidButton : TQt::MidButton); + TQApplication::sendEvent (sliderAction ("player_progress") -> slider(), &me2); } sliderAction ("player_progress") -> slider() -> setEnabled (busy); m_updating = false; @@ -1111,8 +1111,8 @@ void KPlayerEngine::disableScreenSaver (void) { if ( ! properties() -> hasVideo() ) return; - QByteArray data, reply; - QCString type; + TQByteArray data, reply; + TQCString type; if ( ! kapp -> dcopClient() -> call ("kdesktop", "KScreensaverIface", "isEnabled()", data, type, reply) || type != "bool" ) { @@ -1121,7 +1121,7 @@ void KPlayerEngine::disableScreenSaver (void) #endif return; } - QDataStream replyStream (reply, IO_ReadOnly); + TQDataStream replyStream (reply, IO_ReadOnly); bool enabled = false; replyStream >> enabled; if ( ! enabled ) @@ -1131,7 +1131,7 @@ void KPlayerEngine::disableScreenSaver (void) #endif return; } - QDataStream argStream (data, IO_WriteOnly); + TQDataStream argStream (data, IO_WriteOnly); argStream << false; #ifdef DEBUG_KPLAYER_ENGINE if ( kapp -> dcopClient() -> send ("kdesktop", "KScreensaverIface", "enable(bool)", data) ) @@ -1148,8 +1148,8 @@ void KPlayerEngine::enableScreenSaver (void) { if ( ! m_enable_screen_saver ) return; - QByteArray data; - QDataStream argStream (data, IO_WriteOnly); + TQByteArray data; + TQDataStream argStream (data, IO_WriteOnly); argStream << true; #ifdef DEBUG_KPLAYER_ENGINE if ( kapp -> dcopClient() -> send ("kdesktop", "KScreensaverIface", "enable(bool)", data) ) @@ -1162,9 +1162,9 @@ void KPlayerEngine::enableScreenSaver (void) m_enable_screen_saver = false; } -bool isReadableFile (const QString& path) +bool isReadableFile (const TQString& path) { - QFileInfo info (path); + TQFileInfo info (path); return info.exists() && info.isReadable() && ! info.isDir(); } @@ -1244,29 +1244,29 @@ void KPlayerEngine::autoloadSubtitles (void) #endif if ( ! properties() -> url().isLocalFile() ) return; - QString urls (properties() -> subtitleUrlString()); - QStringList exts (configuration() -> subtitleExtensions()); - QString filename (properties() -> url().fileName()); - QString basename (filename.section ('.', 0, -2)); - QDir dir (properties() -> url().directory(), QString::null, QDir::Name | QDir::IgnoreCase, QDir::Files); + TQString urls (properties() -> subtitleUrlString()); + TQStringList exts (configuration() -> subtitleExtensions()); + TQString filename (properties() -> url().fileName()); + TQString basename (filename.section ('.', 0, -2)); + TQDir dir (properties() -> url().directory(), TQString::null, TQDir::Name | TQDir::IgnoreCase, TQDir::Files); #ifdef DEBUG_KPLAYER_ENGINE kdDebugTime() << " File name " << filename << "\n"; kdDebugTime() << " Base name " << basename << "\n"; #endif - const QFileInfoList* list = dir.entryInfoList(); + const TQFileInfoList* list = dir.entryInfoList(); if ( list ) { #ifdef DEBUG_KPLAYER_ENGINE kdDebugTime() << " Directory " << dir.path() << "\n"; #endif - QFileInfoListIterator fileinfoiterator (*list); - while ( QFileInfo* info = fileinfoiterator.current() ) + TQFileInfoListIterator fileinfoiterator (*list); + while ( TQFileInfo* info = fileinfoiterator.current() ) { - QString name (info -> fileName()); + TQString name (info -> fileName()); if ( name != filename && info -> filePath() != urls && name.startsWith (basename, false) && info -> exists() && info -> isReadable() && ! info -> isDir() ) { - QStringList::ConstIterator extiterator (exts.constBegin()); + TQStringList::ConstIterator extiterator (exts.constBegin()); while ( extiterator != exts.constEnd() ) { if ( name.endsWith (*extiterator, false) ) @@ -1325,22 +1325,22 @@ bool KPlayerEngine::loadSubtitles (const KURL::List& urls, bool checkExtensions) #endif if ( urls.isEmpty() || properties() -> url().isEmpty() ) return false; - QStringList exts (configuration() -> subtitleExtensions()); + TQStringList exts (configuration() -> subtitleExtensions()); KURL::List::ConstIterator urliterator (urls.begin()); while ( urliterator != urls.end() ) { const KURL& url (*urliterator); if ( ! url.isLocalFile() ) return false; - QString path (url.path()); + TQString path (url.path()); if ( path.isEmpty() ) return false; - QFileInfo info (path); + TQFileInfo info (path); if ( ! info.exists() || ! info.isReadable() || info.isDir() ) return false; if ( checkExtensions ) { - QStringList::ConstIterator extiterator (exts.constBegin()); + TQStringList::ConstIterator extiterator (exts.constBegin()); while ( extiterator != exts.constEnd() ) { if ( path.endsWith (*extiterator, false) ) @@ -1465,7 +1465,7 @@ void KPlayerEngine::wheel (int delta, int state) settings() -> setDisplaySize (settings() -> displaySize() + properties() -> currentSize() * delta / 1200); setDisplaySize (true); } - else if ( (state & Qt::ControlButton) == Qt::ControlButton ) + else if ( (state & TQt::ControlButton) == TQt::ControlButton ) { if ( delta >= 0 ) fastForward(); @@ -1520,14 +1520,14 @@ void KPlayerEngine::maintainCurrentAspect (void) void KPlayerEngine::aspect43 (void) { - maintainAspect (toggleAction ("view_aspect_4_3") -> isChecked(), QSize (4, 3)); + maintainAspect (toggleAction ("view_aspect_4_3") -> isChecked(), TQSize (4, 3)); if ( settings() -> maintainAspect() ) toggleAction ("view_aspect_4_3") -> setChecked (true); } void KPlayerEngine::aspect169 (void) { - maintainAspect (toggleAction ("view_aspect_16_9") -> isChecked(), QSize (16, 9)); + maintainAspect (toggleAction ("view_aspect_16_9") -> isChecked(), TQSize (16, 9)); if ( settings() -> maintainAspect() ) toggleAction ("view_aspect_16_9") -> setChecked (true); } @@ -1862,13 +1862,13 @@ void KPlayerEngine::saturationDecrease (void) setSaturation(); } -KURL::List KPlayerEngine::openFiles (const QString& title, QWidget* parent) +KURL::List KPlayerEngine::openFiles (const TQString& title, TQWidget* parent) { - static QString filter = i18n("*|All files\n*.avi *.AVI|AVI files\n*.mpg *.mpeg *.MPG *.MPEG|MPEG files\n*.ogg *.OGG|OGG files\n*.mp3 *.MP3|MP3 files"); + static TQString filter = i18n("*|All files\n*.avi *.AVI|AVI files\n*.mpg *.mpeg *.MPG *.MPEG|MPEG files\n*.ogg *.OGG|OGG files\n*.mp3 *.MP3|MP3 files"); KConfig* config = kPlayerConfig(); config -> setGroup ("Dialog Options"); - QString dir = config -> readPathEntry ("Open File Directory"); -//Saving dialog position did not work: dlg.pos() returns wrong position in Qt 3.1.1 + TQString dir = config -> readPathEntry ("Open File Directory"); +//Saving dialog position did not work: dlg.pos() returns wrong position in TQt 3.1.1 //int x = config -> readNumEntry ("Open File Left"); //int y = config -> readNumEntry ("Open File Top"); int width = config -> readNumEntry ("Open File Width"); @@ -1899,12 +1899,12 @@ KURL::List KPlayerEngine::openFiles (const QString& title, QWidget* parent) return dlg.selectedURLs(); } -KURL::List KPlayerEngine::openUrl (const QString& title, QWidget* parent) +KURL::List KPlayerEngine::openUrl (const TQString& title, TQWidget* parent) { KURL::List list; KConfig* config = kPlayerConfig(); config -> setGroup ("Dialog Options"); - QString dir = config -> readEntry ("Open URL"); + TQString dir = config -> readEntry ("Open URL"); //int x = config -> readNumEntry ("Open URL Left"); //int y = config -> readNumEntry ("Open URL Top"); int width = config -> readNumEntry ("Open URL Width"); @@ -1921,7 +1921,7 @@ KURL::List KPlayerEngine::openUrl (const QString& title, QWidget* parent) list.append (url); KRecentDocument::add (url); } - if ( dlg.result() == QDialog::Accepted ) + if ( dlg.result() == TQDialog::Accepted ) config -> writeEntry ("Open URL", url.isLocalFile() ? url.path() : url.url()); //config -> writeEntry ("Open URL Left", dlg.x()); //config -> writeEntry ("Open URL Top", dlg.y()); @@ -1930,12 +1930,12 @@ KURL::List KPlayerEngine::openUrl (const QString& title, QWidget* parent) return list; } -KURL::List KPlayerEngine::openSubtitles (QWidget* parent) +KURL::List KPlayerEngine::openSubtitles (TQWidget* parent) { - static QString filter = i18n("*|All files\n*.aqt *.AQT *.ass *.ASS *.js *.JS *.jss *.JSS *.rt *.RT *.smi *.SMI *.srt *.SRT *.ssa *.SSA *.sub *.SUB *.txt *.TXT *.utf *.UTF *.idx *.IDX *.ifo *.IFO|All subtitle files\n*.aqt *.AQT|AQT files\n*.ass *.ASS|ASS files\n*.js *.JS|JS files\n*.jss *.JSS|JSS files\n*.rt *.RT|RT files\n*.smi *.SMI|SMI files\n*.srt *.SRT|SRT files\n*.ssa *.SSA|SSA files\n*.sub *.SUB|SUB files\n*.txt *.TXT|TXT files\n*.utf *.UTF *.utf8 *.UTF8 *.utf-8 *.UTF-8|UTF files\n*.idx *.IDX *.ifo *.IFO|VobSub files"); + static TQString filter = i18n("*|All files\n*.aqt *.AQT *.ass *.ASS *.js *.JS *.jss *.JSS *.rt *.RT *.smi *.SMI *.srt *.SRT *.ssa *.SSA *.sub *.SUB *.txt *.TXT *.utf *.UTF *.idx *.IDX *.ifo *.IFO|All subtitle files\n*.aqt *.AQT|AQT files\n*.ass *.ASS|ASS files\n*.js *.JS|JS files\n*.jss *.JSS|JSS files\n*.rt *.RT|RT files\n*.smi *.SMI|SMI files\n*.srt *.SRT|SRT files\n*.ssa *.SSA|SSA files\n*.sub *.SUB|SUB files\n*.txt *.TXT|TXT files\n*.utf *.UTF *.utf8 *.UTF8 *.utf-8 *.UTF-8|UTF files\n*.idx *.IDX *.ifo *.IFO|VobSub files"); KConfig* config = kPlayerConfig(); config -> setGroup ("Dialog Options"); - QString dir = config -> readEntry ("Open Subtitle Directory"); + TQString dir = config -> readEntry ("Open Subtitle Directory"); //int x = config -> readNumEntry ("Open Subtitle Left"); //int y = config -> readNumEntry ("Open Subtitle Top"); int width = config -> readNumEntry ("Open Subtitle Width"); @@ -1956,11 +1956,11 @@ KURL::List KPlayerEngine::openSubtitles (QWidget* parent) return dlg.selectedURLs(); } -/*KURL KPlayerEngine::openSubtitleUrl (QWidget* parent) +/*KURL KPlayerEngine::openSubtitleUrl (TQWidget* parent) { KConfig* config = kPlayerConfig(); config -> setGroup ("Dialog Options"); - QString dir = config -> readEntry ("Open Subtitle URL"); + TQString dir = config -> readEntry ("Open Subtitle URL"); //int x = config -> readNumEntry ("Open Subtitle URL Left"); //int y = config -> readNumEntry ("Open Subtitle URL Top"); int width = config -> readNumEntry ("Open Subtitle URL Width"); @@ -1974,7 +1974,7 @@ KURL::List KPlayerEngine::openSubtitles (QWidget* parent) KURL url (dlg.selectedURL()); if ( ! url.isEmpty() && url.isValid() ) KRecentDocument::add (url); - if ( dlg.result() == QDialog::Accepted ) + if ( dlg.result() == TQDialog::Accepted ) config -> writeEntry ("Open Subtitle URL", url.isLocalFile() ? url.path() : url.url()); //config -> writeEntry ("Open Subtitle URL Left", dlg.x()); //config -> writeEntry ("Open Subtitle URL Top", dlg.y()); @@ -1983,7 +1983,7 @@ KURL::List KPlayerEngine::openSubtitles (QWidget* parent) return url; }*/ -void KPlayerEngine::getLists (QString path) +void KPlayerEngine::getLists (TQString path) { if ( path.isEmpty() ) path = properties() -> executablePath(); @@ -2040,7 +2040,7 @@ void KPlayerEngine::receivedOutput (KPlayerLineOutputProcess*, char* str, int) #ifdef DEBUG_KPLAYER_ENGINE kdDebug() << str << "\n"; #endif - QString desc (re_codec.cap(2)); + TQString desc (re_codec.cap(2)); desc.replace (re_multiple, " "); desc.replace (re_trailing, ""); desc.replace (re_brackets, ""); @@ -2057,7 +2057,7 @@ void KPlayerEngine::receivedOutput (KPlayerLineOutputProcess*, char* str, int) #ifdef DEBUG_KPLAYER_ENGINE kdDebug() << str << "\n"; #endif - QString desc (re_driver.cap(2)); + TQString desc (re_driver.cap(2)); desc.replace (re_multiple, " "); desc.replace (re_trailing, ""); desc.replace (re_brackets, ""); @@ -2073,7 +2073,7 @@ void KPlayerEngine::receivedOutput (KPlayerLineOutputProcess*, char* str, int) #ifdef DEBUG_KPLAYER_ENGINE kdDebug() << str << "\n"; #endif - QString desc (re_codec.cap(2)); + TQString desc (re_codec.cap(2)); desc.replace (re_multiple, " "); desc.replace (re_trailing, ""); desc.replace (re_brackets, ""); @@ -2089,7 +2089,7 @@ void KPlayerEngine::receivedOutput (KPlayerLineOutputProcess*, char* str, int) #ifdef DEBUG_KPLAYER_ENGINE kdDebug() << str << "\n"; #endif - QString desc (re_driver.cap(2)); + TQString desc (re_driver.cap(2)); desc.replace (re_multiple, " "); desc.replace (re_trailing, ""); desc.replace (re_xv, "/XVideo"); @@ -2111,7 +2111,7 @@ void KPlayerEngine::receivedOutput (KPlayerLineOutputProcess*, char* str, int) #ifdef DEBUG_KPLAYER_ENGINE kdDebug() << str << "\n"; #endif - QString desc (re_demuxer.cap(2)); + TQString desc (re_demuxer.cap(2)); desc.replace (re_parentheses, ""); desc.replace (re_demux, ""); desc.replace (re_sega, ""); @@ -2136,7 +2136,7 @@ void KPlayerEngine::processExited (KProcess* proc) emit updated(); } -void KPlayerEngine::maintainAspect (bool maintain, QSize aspect) +void KPlayerEngine::maintainAspect (bool maintain, TQSize aspect) { #ifdef DEBUG_KPLAYER_ENGINE kdDebugTime() << "Engine::maintainAspect (" << maintain << ", " << aspect.width() << "x" << aspect.height() << ")\n"; @@ -2159,7 +2159,7 @@ void KPlayerEngine::setDisplaySize (bool user_zoom, bool user_resize) m_zooming = true; emit syncronize (user_resize); m_zooming = false; - QSize size (settings() -> adjustDisplaySize (user_zoom, user_resize)); + TQSize size (settings() -> adjustDisplaySize (user_zoom, user_resize)); if ( user_zoom || ! settings() -> constrainedSize() ) { m_zooming = true; @@ -2173,8 +2173,8 @@ void KPlayerEngine::setDisplaySize (bool user_zoom, bool user_resize) void KPlayerEngine::workspaceResize (bool user) { - static QTime lasttime; - int msecs = lasttime.msecsTo (QTime::currentTime()); + static TQTime lasttime; + int msecs = lasttime.msecsTo (TQTime::currentTime()); #ifdef DEBUG_KPLAYER_ENGINE kdDebugTime() << "KPlayerEngine::workspaceResize " << user << " " << m_zooming << " " << msecs << "\n"; #endif @@ -2184,7 +2184,7 @@ void KPlayerEngine::workspaceResize (bool user) emit correctSize(); m_zooming = false; setDisplaySize (false, user); - lasttime = QTime::currentTime(); + lasttime = TQTime::currentTime(); } void KPlayerEngine::workspaceResized (void) @@ -2203,7 +2203,7 @@ void KPlayerEngine::workspaceUserResize (void) workspaceResize (! light()); } -void KPlayerEngine::clearStoreSections (const QString& section) +void KPlayerEngine::clearStoreSections (const TQString& section) { #ifdef DEBUG_KPLAYER_ENGINE kdDebugTime() << "Clearing store section " << section << "\n"; @@ -2213,7 +2213,7 @@ void KPlayerEngine::clearStoreSections (const QString& section) for ( int i = 0; i < children; ++ i ) { store() -> setGroup (section); - QString entry (store() -> readEntry ("Child" + QString::number (i))); + TQString entry (store() -> readEntry ("Child" + TQString::number (i))); if ( entry.find ('/') < 0 ) { KURL url (section); @@ -2237,7 +2237,7 @@ void KPlayerEngine::getAlsaVolume (void) runAmixer ("get"); } -void KPlayerEngine::runAmixer (const QString& command, const QString& parameter) +void KPlayerEngine::runAmixer (const TQString& command, const TQString& parameter) { #ifdef DEBUG_KPLAYER_ENGINE kdDebugTime() << "KPlayerEngine::runAmixer\n"; @@ -2246,7 +2246,7 @@ void KPlayerEngine::runAmixer (const QString& command, const QString& parameter) m_amixer_volume_first = m_amixer_volume_second = -1; KPlayerLineOutputProcess* amixer = new KPlayerLineOutputProcess; *amixer << "amixer"; - QString mixer = properties() -> mixerDevice(); + TQString mixer = properties() -> mixerDevice(); if ( ! mixer.isEmpty() ) { *amixer << "-D" << mixer; @@ -2280,14 +2280,14 @@ void KPlayerEngine::amixerOutput (KPlayerLineOutputProcess*, char* str, int) #ifdef DEBUG_KPLAYER_ENGINE kdDebugTime() << " amixer: " << str << "\n"; #endif - static QRegExp re_control ("^Simple mixer control '(.*)'"); - static QRegExp re_volume ("^ +[^:]+: Playback \\d+ \\[(\\d+)%\\]"); + static TQRegExp re_control ("^Simple mixer control '(.*)'"); + static TQRegExp re_volume ("^ +[^:]+: Playback \\d+ \\[(\\d+)%\\]"); if ( re_control.search (str) >= 0 ) { #ifdef DEBUG_KPLAYER_ENGINE kdDebugTime() << " Control " << re_control.cap(1) << "\n"; #endif - QString mixer = properties() -> mixerChannel(); + TQString mixer = properties() -> mixerChannel(); if ( mixer.isEmpty() ) mixer = "PCM"; m_amixer_found_control = re_control.cap(1) == mixer; @@ -2330,14 +2330,14 @@ void KPlayerEngine::amixerExited (KProcess* proc) #endif if ( volume != m_amixer_volume && set_volume ) { - QString parameter; + TQString parameter; if ( m_amixer_volume_second < 0 ) - parameter = QString::number (volume) + "%"; + parameter = TQString::number (volume) + "%"; else { volume = volume - m_amixer_volume >> 1; - parameter = QString::number (m_amixer_volume_first + volume) + "%," - + QString::number (m_amixer_volume_first + volume) + "%"; + parameter = TQString::number (m_amixer_volume_first + volume) + "%," + + TQString::number (m_amixer_volume_first + volume) + "%"; } runAmixer ("set", parameter); } diff --git a/kplayer/kplayerengine.h b/kplayer/kplayerengine.h index 877cc5a..875145d 100644 --- a/kplayer/kplayerengine.h +++ b/kplayer/kplayerengine.h @@ -32,7 +32,7 @@ class KPlayerTrackProperties; class KPlayerWidget; class KPlayerWorkspace; -int listIndex (const QStringList&, const QString&); +int listIndex (const TQStringList&, const TQString&); /** The KPlayer file dialog. *@author kiriuja @@ -43,22 +43,22 @@ class KPlayerFileDialog : public KFileDialog public: /** Constructor. Parameters are passed to the KFileDialog constructor. */ - KPlayerFileDialog (const QString& dir, const QString& filter, QWidget* parent, const char* name); + KPlayerFileDialog (const TQString& dir, const TQString& filter, TQWidget* parent, const char* name); /** Returns the last used directory. */ - QString directory (void) + TQString directory (void) { return ops -> url().path (-1); } }; /** The KPlayer engine. *@author kiriuja */ -class KPlayerEngine : public QObject +class KPlayerEngine : public TQObject { Q_OBJECT public: - KPlayerEngine (KActionCollection* ac, QWidget* parent, const char* name, KConfig*); + KPlayerEngine (KActionCollection* ac, TQWidget* parent, const char* name, KConfig*); virtual ~KPlayerEngine(); /** Returns whether the engine is running in the KPart mode. */ @@ -74,7 +74,7 @@ public: /** Starts loading of all mplayer drivers and codecs. * The updated signal is emitted when loading finishes. */ - void getLists (QString = QString::null); + void getLists (TQString = TQString::null); /** Starts amixer process to get the current ALSA volume. */ void getAlsaVolume (void); @@ -99,16 +99,16 @@ public: /** Displays the open file dialog and lets the user choose a file or files. Returns the list of chosen URLs or an empty list if the user did not choose any. */ - KURL::List openFiles (const QString& title, QWidget* = 0); + KURL::List openFiles (const TQString& title, TQWidget* = 0); /** Displays the URL requester dialog and lets the user enter a URL. Returns the entered URL or an empty URL if the user did not enter any. */ - KURL::List openUrl (const QString& title, QWidget* = 0); + KURL::List openUrl (const TQString& title, TQWidget* = 0); /** Displays the open file dialog and lets the user choose a subtitle file. Returns the chosen URL or an empty URL if the user did not choose any. */ - KURL::List openSubtitles (QWidget* = 0); + KURL::List openSubtitles (TQWidget* = 0); /** Displays the URL requester dialog and lets the user enter a subtitle URL. Returns the entered URL or an empty URL if the user did not enter any. */ - //KURL openSubtitleUrl (QWidget* = 0); + //KURL openSubtitleUrl (TQWidget* = 0); /** Retrieves an action from the actionCollection by name. */ KAction* action (const char* name) const @@ -145,10 +145,10 @@ public: void setSaturation (void); /** Clear the given store section and all subsections. */ - void clearStoreSections (const QString& section); + void clearStoreSections (const TQString& section); /** Initializes the engine. */ - static void initialize (KActionCollection* ac, QWidget* parent, const char* name = 0, KConfig* = 0); + static void initialize (KActionCollection* ac, TQWidget* parent, const char* name = 0, KConfig* = 0); /** Terminates the engine. */ static void terminate (void); @@ -189,13 +189,13 @@ public: KConfig* meta (void) { return m_meta; } /** Returns the meta information storage set to the given group. */ - KConfig* meta (const QString& group) + KConfig* meta (const TQString& group) { meta() -> setGroup (group); return meta(); } /** Returns the value of the given key with the given default. */ - QString meta (const QString& group, const QString& key, const QString& value = QString::null) + TQString meta (const TQString& group, const TQString& key, const TQString& value = TQString::null) { return meta (group) -> readEntry (key, value); } KActionCollection* actionCollection (void) const @@ -205,7 +205,7 @@ public: void setDisplaySize (bool zoom = false, bool resize = false); - void maintainAspect (bool maintain, QSize aspect); + void maintainAspect (bool maintain, TQSize aspect); void refreshAspect (void); /** Resets full screen and maximized states. */ @@ -227,37 +227,37 @@ public: int demuxerCount (void) const { return m_demuxers.count(); } - const QString& demuxerName (int index) const + const TQString& demuxerName (int index) const { return m_demuxers [index]; } - int demuxerIndex (const QString& codec) const + int demuxerIndex (const TQString& codec) const { return listIndex (m_demuxers, codec); } int audioCodecCount (void) const { return m_audio_codecs.count(); } - const QString& audioCodecName (int index) const + const TQString& audioCodecName (int index) const { return m_audio_codecs[index]; } - int audioCodecIndex (const QString& codec) const + int audioCodecIndex (const TQString& codec) const { return listIndex (m_audio_codecs, codec); } int audioDriverCount (void) const { return m_audio_drivers.count(); } - const QString& audioDriverName (int index) const + const TQString& audioDriverName (int index) const { return m_audio_drivers[index]; } - int audioDriverIndex (const QString& driver) const + int audioDriverIndex (const TQString& driver) const { return listIndex (m_audio_drivers, driver); } int videoCodecCount (void) const { return m_video_codecs.count(); } - const QString& videoCodecName (int index) const + const TQString& videoCodecName (int index) const { return m_video_codecs[index]; } - int videoCodecIndex (const QString& codec) const + int videoCodecIndex (const TQString& codec) const { return listIndex (m_video_codecs, codec); } int videoDriverCount (void) const { return m_video_drivers.count(); } - const QString& videoDriverName (int index) const + const TQString& videoDriverName (int index) const { return m_video_drivers[index]; } - int videoDriverIndex (const QString& driver) const + int videoDriverIndex (const TQString& driver) const { return listIndex (m_video_drivers, driver); } public slots: @@ -403,7 +403,7 @@ protected: /** Handles workspace resize based on the user flag. */ void workspaceResize (bool user); /** Runs amixer with the given command and parameter. */ - void runAmixer (const QString& command, const QString& parameter = QString::null); + void runAmixer (const TQString& command, const TQString& parameter = TQString::null); /** Sets up the progress slider. */ void setupProgressSlider (int maximum); @@ -414,7 +414,7 @@ protected: /** Autoexpands video and updates settings. */ void autoexpand (void); - QString m_path; + TQString m_path; /** Video track action list. */ KPlayerTrackActionList* m_video_action_list; @@ -430,15 +430,15 @@ protected: bool m_demuxers_ready; /** List of available audio codecs. */ - QStringList m_audio_codecs; + TQStringList m_audio_codecs; /** List of available audio drivers. */ - QStringList m_audio_drivers; + TQStringList m_audio_drivers; /** List of available video codecs. */ - QStringList m_video_codecs; + TQStringList m_video_codecs; /** List of available video drivers. */ - QStringList m_video_drivers; + TQStringList m_video_drivers; /** List of available demuxers. */ - QStringList m_demuxers; + TQStringList m_demuxers; bool m_amixer_running, m_amixer_found_control; int m_last_volume, m_amixer_volume, m_amixer_volume_first, m_amixer_volume_second; @@ -473,7 +473,7 @@ protected: bool m_updating; /** Recursion prevention. */ bool m_zooming; - /** Work around QRangeControl bug. */ + /** Work around TQRangeControl bug. */ int m_progress_factor; /** Do not play any more URLs. */ bool m_stop; diff --git a/kplayer/kplayerlogwindow.cpp b/kplayer/kplayerlogwindow.cpp index 81c5804..0a48ab4 100644 --- a/kplayer/kplayerlogwindow.cpp +++ b/kplayer/kplayerlogwindow.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include -#include -#include +#include +#include #ifdef DEBUG #define DEBUG_KPLAYER_LOG @@ -26,17 +26,17 @@ #include "kplayerengine.h" #include "kplayersettings.h" -KPlayerLogWindow::KPlayerLogWindow (KActionCollection* ac, QWidget* parent, const char* name) - : QDockWindow (parent, name) +KPlayerLogWindow::KPlayerLogWindow (KActionCollection* ac, TQWidget* parent, const char* name) + : TQDockWindow (parent, name) { setWidget (new KPlayerLogWidget (ac, this)); setResizeEnabled (true); - setCloseMode (QDockWindow::Always); + setCloseMode (TQDockWindow::Always); setNewLine (true); setCaption (i18n("Messages")); } -void KPlayerLogWindow::initialize (QPopupMenu* menu) +void KPlayerLogWindow::initialize (TQPopupMenu* menu) { #ifdef DEBUG_KPLAYER_PLAYLIST kdDebugTime() << "Initializing log window\n"; @@ -60,21 +60,21 @@ void KPlayerLogWindow::setError (bool flag) logWidget() -> setError (flag); } -void KPlayerLogWindow::hideEvent (QHideEvent* event) +void KPlayerLogWindow::hideEvent (TQHideEvent* event) { #ifdef DEBUG_KPLAYER_LOG kdDebugTime() << "Log::hideEvent\n"; #endif - QDockWindow::hideEvent (event); + TQDockWindow::hideEvent (event); if ( isHidden() ) // || ! event -> spontaneous() ) emit windowHidden(); } -KPlayerLogWidget::KPlayerLogWidget (KActionCollection* ac, QWidget* parent, const char* name) +KPlayerLogWidget::KPlayerLogWidget (KActionCollection* ac, TQWidget* parent, const char* name) : KTextEdit (parent, name) { m_ac = ac; - setTextFormat (Qt::PlainText); + setTextFormat (TQt::PlainText); setReadOnly (true); setError (false); KAction* action = new KAction (i18n("&Select All"), 0, 0, this, SLOT (selectAll()), m_ac, "log_select_all"); @@ -132,7 +132,7 @@ void KPlayerLogWidget::setError (bool flag) m_error = flag; } -void KPlayerLogWidget::showEvent (QShowEvent* event) +void KPlayerLogWidget::showEvent (TQShowEvent* event) { KTextEdit::showEvent (event); #ifdef DEBUG_KPLAYER_LOG @@ -153,7 +153,7 @@ void KPlayerLogWidget::showEvent (QShowEvent* event) } } -void KPlayerLogWidget::resizeEvent (QResizeEvent* event) +void KPlayerLogWidget::resizeEvent (TQResizeEvent* event) { bool at_bottom = contentsHeight() == contentsY() + visibleHeight(); #ifdef DEBUG_KPLAYER_LOG @@ -175,7 +175,7 @@ void KPlayerLogWidget::resizeEvent (QResizeEvent* event) } } -void KPlayerLogWidget::contextMenuEvent (QContextMenuEvent* event) +void KPlayerLogWidget::contextMenuEvent (TQContextMenuEvent* event) { #ifdef DEBUG_KPLAYER_WINDOW kdDebugTime() << "KPlayerLogWidget::contextMenuEvent\n"; diff --git a/kplayer/kplayerlogwindow.h b/kplayer/kplayerlogwindow.h index 9818ff0..6d353d6 100644 --- a/kplayer/kplayerlogwindow.h +++ b/kplayer/kplayerlogwindow.h @@ -18,7 +18,7 @@ #include #include -#include +#include /**The KPlayer log widget. *@author kiriuja @@ -28,7 +28,7 @@ class KPlayerLogWidget : public KTextEdit Q_OBJECT public: - KPlayerLogWidget (KActionCollection* ac, QWidget* parent = 0, const char* name = 0); + KPlayerLogWidget (KActionCollection* ac, TQWidget* parent = 0, const char* name = 0); /** Returns whether there is an error in the log. */ bool hasError (void) @@ -37,10 +37,10 @@ public: void setError (bool); /** Returns the popup menu. */ - QPopupMenu* popupMenu (void) const + TQPopupMenu* popupMenu (void) const { return m_popup; } /** Sets the popup menu. */ - void setPopupMenu (QPopupMenu* menu) + void setPopupMenu (TQPopupMenu* menu) { m_popup = menu; } /** Retrieves an action from the action collection by name. */ @@ -55,15 +55,15 @@ protected slots: void updateActions (void); protected: - virtual void showEvent (QShowEvent*); - virtual void resizeEvent (QResizeEvent*); + virtual void showEvent (TQShowEvent*); + virtual void resizeEvent (TQResizeEvent*); /** Displays the right click popup menu. */ - virtual void contextMenuEvent (QContextMenuEvent*); + virtual void contextMenuEvent (TQContextMenuEvent*); /** Action collection. */ KActionCollection* m_ac; /** Popup menu. */ - QPopupMenu* m_popup; + TQPopupMenu* m_popup; /** Error condition flag. */ bool m_error; /** Error location. */ @@ -73,19 +73,19 @@ protected: /**The KPlayer log window. *@author kiriuja */ -class KPlayerLogWindow : public QDockWindow +class KPlayerLogWindow : public TQDockWindow { Q_OBJECT public: - KPlayerLogWindow (KActionCollection* ac, QWidget* parent = 0, const char* name = 0); + KPlayerLogWindow (KActionCollection* ac, TQWidget* parent = 0, const char* name = 0); - void initialize (QPopupMenu* menu); + void initialize (TQPopupMenu* menu); KPlayerLogWidget* logWidget (void) { return (KPlayerLogWidget*) widget(); } - void addLine (const QString& line) + void addLine (const TQString& line) { ((KPlayerLogWidget*) widget()) -> append (line); } bool isEmpty (void) { return ((KPlayerLogWidget*) widget()) -> text().isEmpty(); } @@ -97,7 +97,7 @@ public: void setError (bool); protected: - virtual void hideEvent (QHideEvent*); + virtual void hideEvent (TQHideEvent*); signals: void windowHidden (void); diff --git a/kplayer/kplayernode.cpp b/kplayer/kplayernode.cpp index 6a99a88..157381b 100644 --- a/kplayer/kplayernode.cpp +++ b/kplayer/kplayernode.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #ifdef DEBUG #define DEBUG_KPLAYER_NODE @@ -30,7 +30,7 @@ #include "kplayersource.h" KPlayerRootNode* KPlayerNode::m_root = 0; -QString KPlayerNode::m_sort_key ("Name"); +TQString KPlayerNode::m_sort_key ("Name"); bool KPlayerNode::m_sort_by_name = true; bool KPlayerNode::m_sort_ascending = true; @@ -38,7 +38,7 @@ bool KPlayerNode::m_sort_ascending = true; #define UDS_LOCAL_PATH (72 | KIO::UDS_STRING) #endif -static QString itemLocalPath (const KFileItem& item) +static TQString itemLocalPath (const KFileItem& item) { KIO::UDSEntry::ConstIterator iterator = item.entry().begin(); const KIO::UDSEntry::ConstIterator end = item.entry().end(); @@ -49,7 +49,7 @@ static QString itemLocalPath (const KFileItem& item) return atom.m_str; ++ iterator; } - return QString::null; + return TQString::null; } KPlayerNode::~KPlayerNode() @@ -61,7 +61,7 @@ KPlayerNode::~KPlayerNode() KPlayerMedia::release (media()); } -void KPlayerNode::setup (KPlayerContainerNode* parent, const QString& id, KPlayerContainerNode* origin) +void KPlayerNode::setup (KPlayerContainerNode* parent, const TQString& id, KPlayerContainerNode* origin) { #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "Initializing node\n"; @@ -93,7 +93,7 @@ bool KPlayerNode::ready (void) const return true; } -QString KPlayerNode::suggestId (void) const +TQString KPlayerNode::suggestId (void) const { return metaurl().url(); } @@ -103,7 +103,7 @@ KURL KPlayerNode::url (void) const return parent() -> url (id()); } -KURL KPlayerNode::url (const QString& id) const +KURL KPlayerNode::url (const TQString& id) const { KURL idurl (url()); idurl.addPath (id); @@ -115,14 +115,14 @@ KURL KPlayerNode::metaurl (void) const return url(); } -KURL KPlayerNode::metaurl (const QString& id) const +KURL KPlayerNode::metaurl (const TQString& id) const { KURL idurl (media() -> url()); idurl.addPath (id); return idurl; } -QString KPlayerNode::icon (void) const +TQString KPlayerNode::icon (void) const { return media() -> icon(); } @@ -252,7 +252,7 @@ void KPlayerNode::terminate (void) root() -> vacate(); } -void KPlayerNode::setSorting (const QString& key, bool ascending) +void KPlayerNode::setSorting (const TQString& key, bool ascending) { #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerNode::setSorting\n"; @@ -324,7 +324,7 @@ KPlayerItemNode::~KPlayerItemNode() void KPlayerItemNode::setupUrl (void) { m_url = id(); - m_url.setRef (QString::null); + m_url.setRef (TQString::null); } KURL KPlayerItemNode::metaurl (void) const @@ -400,17 +400,17 @@ bool KPlayerContainerNode::ready (void) const return ! origin() || origin() -> ready(); } -QString KPlayerContainerNode::icon (void) const +TQString KPlayerContainerNode::icon (void) const { return origin() ? origin() -> icon() : "folder"; } -QString KPlayerContainerNode::openIcon (void) const +TQString KPlayerContainerNode::openIcon (void) const { return origin() ? origin() -> icon() : "folder_open"; } -QString KPlayerContainerNode::suggestId (void) const +TQString KPlayerContainerNode::suggestId (void) const { return id(); } @@ -553,7 +553,7 @@ void KPlayerContainerNode::release (KPlayerNode* node) } } -void KPlayerContainerNode::addBranch (const QString& name, KPlayerNode* after) +void KPlayerContainerNode::addBranch (const TQString& name, KPlayerNode* after) { #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerContainerNode::addBranch\n"; @@ -570,7 +570,7 @@ void KPlayerContainerNode::addBranch (const QString& name, KPlayerNode* after) node -> release(); } -void KPlayerContainerNode::appendBranch (const QString& name) +void KPlayerContainerNode::appendBranch (const TQString& name) { #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerContainerNode::appendBranch\n"; @@ -673,14 +673,14 @@ void KPlayerContainerNode::remove (const KPlayerNodeList& nodes) source() -> remove (nodes); } -KPlayerNode* KPlayerContainerNode::createLeaf (const QString& id) +KPlayerNode* KPlayerContainerNode::createLeaf (const TQString& id) { KPlayerNode* node = new KPlayerItemNode; node -> setup (this, id); return node; } -KPlayerContainerNode* KPlayerContainerNode::createBranch (const QString&, KPlayerContainerNode*) +KPlayerContainerNode* KPlayerContainerNode::createBranch (const TQString&, KPlayerContainerNode*) { return 0; } @@ -712,7 +712,7 @@ void KPlayerContainerNode::append (KPlayerNode* node) m_node_map.insert (node -> id(), node); } -KPlayerNode* KPlayerContainerNode::insertLeaf (const QString& id, KPlayerNode* after) +KPlayerNode* KPlayerContainerNode::insertLeaf (const TQString& id, KPlayerNode* after) { #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "Inserting leaf node\n"; @@ -730,7 +730,7 @@ KPlayerNode* KPlayerContainerNode::insertLeaf (const QString& id, KPlayerNode* a return node; } -KPlayerContainerNode* KPlayerContainerNode::insertBranch (const QString& id, +KPlayerContainerNode* KPlayerContainerNode::insertBranch (const TQString& id, KPlayerNode* after, KPlayerContainerNode* origin) { #ifdef DEBUG_KPLAYER_NODE @@ -780,7 +780,7 @@ void KPlayerContainerNode::doPopulate (void) m_nodes.clear(); m_node_map.clear(); bool group; - QString id; + TQString id; source() -> start (false); while ( source() -> next (group, id) ) { @@ -869,7 +869,7 @@ void KPlayerContainerNode::doPopulateGroups (void) m_nodes.clear(); m_node_map.clear(); bool group; - QString id; + TQString id; source() -> start (true); while ( source() -> next (group, id) ) { @@ -1000,7 +1000,7 @@ void KPlayerContainerNode::refreshNodes (void) emitAdded (nodes()); } -KPlayerNode* KPlayerContainerNode::nodeById (const QString& id) const +KPlayerNode* KPlayerContainerNode::nodeById (const TQString& id) const { #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerContainerNode::nodeById '" << id << "'\n"; @@ -1010,7 +1010,7 @@ KPlayerNode* KPlayerContainerNode::nodeById (const QString& id) const return iterator == m_node_map.end() ? 0 : *iterator; } -KPlayerContainerNode* KPlayerContainerNode::getNodeById (const QString& id) +KPlayerContainerNode* KPlayerContainerNode::getNodeById (const TQString& id) { #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerContainerNode::getNodeById\n"; @@ -1031,16 +1031,16 @@ KPlayerContainerNode* KPlayerContainerNode::getNodeById (const QString& id) return 0; } -KPlayerContainerNode* KPlayerContainerNode::getNodeByPath (const QString& path) +KPlayerContainerNode* KPlayerContainerNode::getNodeByPath (const TQString& path) { #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerContainerNode::getNodeByPath\n"; kdDebugTime() << " Path " << path << "\n"; #endif - KPlayerContainerNode* node = getNodeById (path.section ('/', 0, 0, QString::SectionSkipEmpty)); + KPlayerContainerNode* node = getNodeById (path.section ('/', 0, 0, TQString::SectionSkipEmpty)); if ( node ) { - QString subpath (path.section ('/', 1, 0xffffffff, QString::SectionSkipEmpty)); + TQString subpath (path.section ('/', 1, 0xffffffff, TQString::SectionSkipEmpty)); if ( ! subpath.isEmpty() ) node = node -> getNodeByPath (subpath); } @@ -1082,7 +1082,7 @@ void KPlayerContainerNode::customOrderByName (void) #endif if ( ! customOrder() && allowsCustomOrder() ) { - QString key (sortKey()); + TQString key (sortKey()); bool ascending = sortAscending(); setSorting ("Name", true); m_nodes.sort(); @@ -1129,7 +1129,7 @@ int KPlayerContainerNode::compareByPosition (const KPlayerNode* node1, const KPl return i1 == i2 ? 0 : i1 < i2 ? -1 : 1; } -void KPlayerContainerNode::addedLeaves (const QStringList& list) +void KPlayerContainerNode::addedLeaves (const TQStringList& list) { #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerContainerNode::addedLeaves\n"; @@ -1139,7 +1139,7 @@ void KPlayerContainerNode::addedLeaves (const QStringList& list) if ( ! list.isEmpty() && populated() ) { KPlayerPropertyCounts counts; - QStringList::ConstIterator iterator (list.begin()); + TQStringList::ConstIterator iterator (list.begin()); while ( iterator != list.end() ) { KPlayerNode* node = insertLeaf (*iterator); @@ -1160,7 +1160,7 @@ void KPlayerContainerNode::addedLeaves (const QStringList& list) emitAdded (nodes); } -void KPlayerContainerNode::addedBranches (const QStringList& list) +void KPlayerContainerNode::addedBranches (const TQStringList& list) { #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerContainerNode::addedBranches\n"; @@ -1170,7 +1170,7 @@ void KPlayerContainerNode::addedBranches (const QStringList& list) if ( ! list.isEmpty() && (populated() || groupsPopulated()) ) { KPlayerPropertyCounts counts; - QStringList::ConstIterator iterator (list.begin()); + TQStringList::ConstIterator iterator (list.begin()); while ( iterator != list.end() ) { KPlayerNode* node = insertBranch (*iterator); @@ -1194,7 +1194,7 @@ void KPlayerContainerNode::addedBranches (const QStringList& list) emitAdded (nodes); } -void KPlayerContainerNode::added (const QFileInfoList& list) +void KPlayerContainerNode::added (const TQFileInfoList& list) { #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerContainerNode::added file list\n"; @@ -1204,12 +1204,12 @@ void KPlayerContainerNode::added (const QFileInfoList& list) if ( ! list.isEmpty() && (populated() || groupsPopulated()) ) { KPlayerPropertyCounts counts; - for ( QFileInfoListIterator iterator (list); iterator.current(); ++ iterator ) + for ( TQFileInfoListIterator iterator (list); iterator.current(); ++ iterator ) { bool group = iterator.current() -> isDir(); if ( group || populated() ) { - QString id (iterator.current() -> fileName()); + TQString id (iterator.current() -> fileName()); KPlayerNode* node = group ? insertBranch (id) : insertLeaf (id); if ( node ) { @@ -1267,15 +1267,15 @@ KPlayerNode* KPlayerContainerNode::added (const KPlayerNodeList& nodes, bool lin KPlayerNodeListIterator iterator (nodes); while ( KPlayerNode* node = iterator.current() ) { - QString id (node -> suggestId()); + TQString id (node -> suggestId()); KPlayerNode* subnode = nodeById (id); if ( subnode && acceptsDuplicates() ) if ( node -> isContainer() ) { - QString base (id); + TQString base (id); for ( int i = 0; subnode; i ++ ) { - id = base + QString::number (i); + id = base + TQString::number (i); subnode = nodeById (id); } } @@ -1284,7 +1284,7 @@ KPlayerNode* KPlayerContainerNode::added (const KPlayerNodeList& nodes, bool lin KURL url (id); for ( int i = 0; subnode; i ++ ) { - url.setRef (QString::number (i)); + url.setRef (TQString::number (i)); id = url.url(); subnode = nodeById (id); } @@ -1436,7 +1436,7 @@ void KPlayerContainerNode::removed (const KPlayerNodeList& nodes, const KPlayerP nodes.releaseAll(); } -void KPlayerContainerNode::removed (const QStringList& ids) +void KPlayerContainerNode::removed (const TQStringList& ids) { #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerContainerNode::removed ID list\n"; @@ -1447,7 +1447,7 @@ void KPlayerContainerNode::removed (const QStringList& ids) if ( ! ids.isEmpty() ) { populate(); - for ( QStringList::ConstIterator iterator (ids.begin()); iterator != ids.end(); ++ iterator ) + for ( TQStringList::ConstIterator iterator (ids.begin()); iterator != ids.end(); ++ iterator ) { KPlayerNode* node = nodeById (*iterator); if ( node ) @@ -1510,7 +1510,7 @@ void KPlayerContainerNode::save (void) if ( ! origin() || media() -> customOrder() ) { populate(); - QStringList children; + TQStringList children; KPlayerNodeListIterator iterator (nodes()); while ( KPlayerNode* node = iterator.current() ) { @@ -1546,11 +1546,11 @@ void KPlayerContainerNode::applyCustomOrder (void) KPlayerNode* node; KPlayerNodeList list (m_nodes); m_nodes.clear(); - const QStringList& children (media() -> children()); - QStringList::ConstIterator iterator (children.begin()); + const TQStringList& children (media() -> children()); + TQStringList::ConstIterator iterator (children.begin()); while ( iterator != children.end() ) { - QString id (*iterator); + TQString id (*iterator); for ( node = list.first(); node; node = list.next() ) if ( node -> id() == id ) break; @@ -1624,7 +1624,7 @@ KPlayerTemporaryNode::~KPlayerTemporaryNode() #endif } -KPlayerNode* KPlayerTemporaryNode::temporaryItem (const QString& id) +KPlayerNode* KPlayerTemporaryNode::temporaryItem (const TQString& id) { KPlayerNode* node = nodeById (id); if ( ! node ) @@ -1651,7 +1651,7 @@ KPlayerRootNode::~KPlayerRootNode() void KPlayerRootNode::setupSource (void) { - QString home ("file:" + QDir::homeDirPath()); + TQString home ("file:" + TQDir::homeDirPath()); m_default_ids << "nowplaying" << "recent" << "playlists" << "collection" << "devices" << "file:/" << home; KPlayerContainerNode* node = new KPlayerNowPlayingNode; node -> setup (this, "nowplaying"); @@ -1700,7 +1700,7 @@ KURL KPlayerRootNode::url (void) const return id(); } -KPlayerContainerNode* KPlayerRootNode::createBranch (const QString& id, KPlayerContainerNode*) +KPlayerContainerNode* KPlayerRootNode::createBranch (const TQString& id, KPlayerContainerNode*) { KPlayerContainerNode* node; KPlayerContainerNodeMap::ConstIterator iterator = m_defaults.find (id); @@ -1728,14 +1728,14 @@ KPlayerContainerNode* KPlayerRootNode::getNodeByUrl (const KURL& url) kdDebugTime() << " URL " << url.url() << "\n"; kdDebugTime() << " Path " << url.path() << "\n"; #endif - QString path (url.path()); + TQString path (url.path()); KPlayerContainerNode* node = 0; if ( url.protocol() == "kplayer" ) node = root(); else { uint length = 0; - QString urls (url.url()); + TQString urls (url.url()); KPlayerContainerNodeMap::ConstIterator iterator (m_externals.begin()); while ( iterator != m_externals.end() ) { @@ -1750,13 +1750,13 @@ KPlayerContainerNode* KPlayerRootNode::getNodeByUrl (const KURL& url) } if ( ! node ) { - QString id (url.protocol() + ":/"); + TQString id (url.protocol() + ":/"); node = new KPlayerExternalNode; node -> setup (root(), id); m_externals.insert (node -> media() -> url().url(), node); } } - return path.section ('/', 0, 0, QString::SectionSkipEmpty).isEmpty() ? node + return path.section ('/', 0, 0, TQString::SectionSkipEmpty).isEmpty() ? node : node -> getNodeByPath (path); } @@ -1795,14 +1795,14 @@ bool KPlayerDirectoryNode::allowsCustomOrder (void) const return false; } -KPlayerNode* KPlayerDirectoryNode::createLeaf (const QString& id) +KPlayerNode* KPlayerDirectoryNode::createLeaf (const TQString& id) { KPlayerNode* node = new KPlayerFileNode; node -> setup (this, id); return node; } -KPlayerContainerNode* KPlayerDirectoryNode::createBranch (const QString& id, KPlayerContainerNode* origin) +KPlayerContainerNode* KPlayerDirectoryNode::createBranch (const TQString& id, KPlayerContainerNode* origin) { KPlayerContainerNode* node = new KPlayerDirectoryNode; node -> setup (this, id, origin); @@ -1818,12 +1818,12 @@ void KPlayerGroupNode::setupSource (void) m_source = origin() ? (KPlayerSource*) new KPlayerOriginSource (this) : (KPlayerSource*) new KPlayerStoreSource (this); } -QString KPlayerGroupNode::icon (void) const +TQString KPlayerGroupNode::icon (void) const { return origin() ? origin() -> icon() : "folder_green"; } -QString KPlayerGroupNode::openIcon (void) const +TQString KPlayerGroupNode::openIcon (void) const { return origin() ? origin() -> icon() : "folder_green_open"; } @@ -1885,7 +1885,7 @@ bool KPlayerCollectionNode::allowsCustomOrder (void) const return false; } -KPlayerContainerNode* KPlayerCollectionNode::createBranch (const QString& id, KPlayerContainerNode* origin) +KPlayerContainerNode* KPlayerCollectionNode::createBranch (const TQString& id, KPlayerContainerNode* origin) { KPlayerContainerNode* node = new KPlayerCollectionNode; node -> setup (this, id, origin); @@ -1893,7 +1893,7 @@ KPlayerContainerNode* KPlayerCollectionNode::createBranch (const QString& id, KP } #if 0 -void KPlayerCollectionNode::group (const QString& key) +void KPlayerCollectionNode::group (const TQString& key) { #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "Group nodes\n"; @@ -1950,7 +1950,7 @@ void KPlayerPlaylistNode::setupSource (void) connect (configuration(), SIGNAL (updated()), SLOT (configurationUpdated())); if ( ! parent() -> parent() && id() == "playlists" && ! media() -> hasChildren() ) { - QString group ("Playlist Entries"); + TQString group ("Playlist Entries"); KConfig* meta = KPlayerEngine::engine() -> meta(); meta -> setGroup (group); int entries = meta -> readNumEntry ("Entries"); @@ -1959,17 +1959,17 @@ void KPlayerPlaylistNode::setupSource (void) KPlayerNode* np = parent() -> nodeById ("nowplaying"); if ( np && ! np -> media() -> hasChildren() ) { - QString name (i18n("My Playlist")); - QStringList children; + TQString name (i18n("My Playlist")); + TQStringList children; children.append (name); media() -> setChildren (children); media() -> commit(); KConfig* config = media() -> config(); - QString urls (url (name).url()); + TQString urls (url (name).url()); config -> setGroup (urls); for ( int i = 0; i < entries; i ++ ) { - QString no (QString::number (i)); + TQString no (TQString::number (i)); config -> writeEntry ("Child" + no, meta -> readEntry ("Entry " + no)); } config -> writeEntry ("Children", entries); @@ -2035,12 +2035,12 @@ void KPlayerPlaylistNode::releaseOrigin (void) KPlayerGroupNode::releaseOrigin(); } -QString KPlayerPlaylistNode::icon (void) const +TQString KPlayerPlaylistNode::icon (void) const { return origin() ? origin() -> icon() : "folder_violet"; } -QString KPlayerPlaylistNode::openIcon (void) const +TQString KPlayerPlaylistNode::openIcon (void) const { return origin() ? origin() -> icon() : "folder_violet_open"; } @@ -2064,7 +2064,7 @@ bool KPlayerPlaylistNode::acceptsDuplicates (void) const return configuration() -> allowDuplicateEntries(); } -KPlayerContainerNode* KPlayerPlaylistNode::createBranch (const QString& id, KPlayerContainerNode* origin) +KPlayerContainerNode* KPlayerPlaylistNode::createBranch (const TQString& id, KPlayerContainerNode* origin) { KPlayerContainerNode* node = new KPlayerPlaylistNode; node -> setup (this, id, origin); @@ -2085,7 +2085,7 @@ void KPlayerPlaylistNode::configurationUpdated (void) KPlayerNodeListIterator iterator (nodes()); while ( KPlayerNode* node = iterator.current() ) { - QString id (node -> id().section ('#', 0, 0)); + TQString id (node -> id().section ('#', 0, 0)); KPlayerNodeMap::ConstIterator iterator = map.find (id); if ( iterator == map.end() ) map.insert (id, node); @@ -2104,7 +2104,7 @@ KPlayerNowPlayingNode::~KPlayerNowPlayingNode() { } -KPlayerContainerNode* KPlayerNowPlayingNode::createBranch (const QString& id, KPlayerContainerNode* origin) +KPlayerContainerNode* KPlayerNowPlayingNode::createBranch (const TQString& id, KPlayerContainerNode* origin) { KPlayerContainerNode* node = new KPlayerNowPlayingNode; node -> setup (this, id, origin); @@ -2126,12 +2126,12 @@ bool KPlayerNowPlayingNode::isNowPlaying (void) const return true; } -QString KPlayerNowPlayingNode::icon (void) const +TQString KPlayerNowPlayingNode::icon (void) const { return origin() ? origin() -> icon() : "folder_red"; } -QString KPlayerNowPlayingNode::openIcon (void) const +TQString KPlayerNowPlayingNode::openIcon (void) const { return origin() ? origin() -> icon() : "folder_red_open"; } @@ -2237,19 +2237,19 @@ bool KPlayerRecentNode::canLink (KPlayerContainerNode* node) const || node -> isPlaylist() && ! node -> isRecent() && ! node -> isNowPlaying(); } -KPlayerContainerNode* KPlayerRecentNode::createBranch (const QString& id, KPlayerContainerNode* origin) +KPlayerContainerNode* KPlayerRecentNode::createBranch (const TQString& id, KPlayerContainerNode* origin) { KPlayerContainerNode* node = new KPlayerRecentNode; node -> setup (this, id, origin); return node; } -QString KPlayerRecentNode::icon (void) const +TQString KPlayerRecentNode::icon (void) const { return origin() ? origin() -> icon() : "folder_red"; } -QString KPlayerRecentNode::openIcon (void) const +TQString KPlayerRecentNode::openIcon (void) const { return origin() ? origin() -> icon() : "folder_red_open"; } @@ -2263,14 +2263,14 @@ void KPlayerRecentsNode::setupSource (void) KPlayerRecentNode::setupSource(); if ( ! media() -> hasChildren() ) { - QString group ("Recent Files"); + TQString group ("Recent Files"); KConfig* config = KPlayerEngine::engine() -> config(); config -> setGroup (group); int limit = configuration() -> recentListSize(); - QStringList children; + TQStringList children; for ( int i = 1; i <= limit; i ++ ) { - QString name (config -> readEntry ("File" + QString::number (i))); + TQString name (config -> readEntry ("File" + TQString::number (i))); if ( name.isEmpty() ) break; children.append (name); @@ -2330,11 +2330,11 @@ void KPlayerRecentsNode::addRecent (const KPlayerNodeList& list) } else { - QString name (list.count() == 2 ? i18n("%1 and %2").arg (list.getFirst() -> name(), list.getLast() -> name()) - : i18n("%1 and %2 more").arg (list.getFirst() -> name(), QString::number (list.count() - 1))); - QString id (name); + TQString name (list.count() == 2 ? i18n("%1 and %2").arg (list.getFirst() -> name(), list.getLast() -> name()) + : i18n("%1 and %2 more").arg (list.getFirst() -> name(), TQString::number (list.count() - 1))); + TQString id (name); for ( int i = 0; nodeById (id); i ++ ) - id = name + QString::number (i); + id = name + TQString::number (i); prependBranch (id); KPlayerContainerNode* container = getNodeById (id); container -> media() -> setName (name); @@ -2379,19 +2379,19 @@ void KPlayerDevicesNode::setupSource (void) { m_complete = false; m_directory = "/dev"; - m_directory.setFilter (QDir::All | QDir::System); - m_directory.setSorting (QDir::Name); + m_directory.setFilter (TQDir::All | TQDir::System); + m_directory.setSorting (TQDir::Name); m_watch.addDir (m_directory.path()); m_watch.startScan(); #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << " Path " << m_directory.path() << "\n"; kdDebugTime() << " Method " << m_watch.internalMethod() << "\n"; #endif - connect (&m_watch, SIGNAL (dirty (const QString&)), SLOT (dirty (const QString&))); + 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*))); - QStringList mimetypes; + TQStringList mimetypes; mimetypes.append ("media/audiocd"); mimetypes.append ("media/cdrom_mounted"); mimetypes.append ("media/cdrom_unmounted"); @@ -2408,22 +2408,22 @@ void KPlayerDevicesNode::setupSource (void) m_source = new KPlayerDevicesSource (this); } -KPlayerContainerNode* KPlayerDevicesNode::createBranch (const QString& id, KPlayerContainerNode* origin) +KPlayerContainerNode* KPlayerDevicesNode::createBranch (const TQString& id, KPlayerContainerNode* origin) { - QMap::ConstIterator iterator = m_type_map.find (id); - QString type (iterator == m_type_map.end() ? media() -> type (id) : iterator.data()); + TQMap::ConstIterator iterator = m_type_map.find (id); + TQString type (iterator == m_type_map.end() ? media() -> type (id) : iterator.data()); KPlayerDeviceNode* node = type == "TV" ? (KPlayerDeviceNode*) new KPlayerTVNode : type == "DVB" ? (KPlayerDeviceNode*) new KPlayerDVBNode : (KPlayerDeviceNode*) new KPlayerDiskNode; node -> setup (this, id, origin); return node; } -QString KPlayerDevicesNode::icon (void) const +TQString KPlayerDevicesNode::icon (void) const { return "system"; } -QString KPlayerDevicesNode::openIcon (void) const +TQString KPlayerDevicesNode::openIcon (void) const { return "system"; } @@ -2443,7 +2443,7 @@ bool KPlayerDevicesNode::canSaveAsPlaylist (void) const return false; } -KPlayerContainerNode* KPlayerDevicesNode::getNodeByPath (const QString& path) +KPlayerContainerNode* KPlayerDevicesNode::getNodeByPath (const TQString& path) { #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerDevicesNode::getNodeByPath\n"; @@ -2452,12 +2452,12 @@ KPlayerContainerNode* KPlayerDevicesNode::getNodeByPath (const QString& path) return getNodeById ("/" + path); } -void KPlayerDevicesNode::dirty (const QString&) +void KPlayerDevicesNode::dirty (const TQString&) { #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerDevicesNode::dirty\n"; #endif - QStringList current, previous; + TQStringList current, previous; update (current, previous); addedBranches (current); if ( ! previous.isEmpty() ) @@ -2469,11 +2469,11 @@ void KPlayerDevicesNode::update (void) #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerDevicesNode::update\n"; #endif - QStringList current, previous; + TQStringList current, previous; update (current, previous); } -void KPlayerDevicesNode::update (QStringList& current, QStringList& previous) +void KPlayerDevicesNode::update (TQStringList& current, TQStringList& previous) { #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerDevicesNode::update\n"; @@ -2482,20 +2482,20 @@ void KPlayerDevicesNode::update (QStringList& current, QStringList& previous) const char* paths[] = { "/dev", "/dev", "/dev", "/dev/dvb" }; const char* globs[] = { "cdr*", "dvd*", "video*", "adapter*" }; const char* types[] = { I18N_NOOP("CD"), I18N_NOOP("DVD"), I18N_NOOP("TV"), I18N_NOOP("DVB") }; - QMap maps [sizeof (paths) / sizeof (const char*)]; + TQMap maps [sizeof (paths) / sizeof (const char*)]; previous = m_devices; for ( uint i = 0; i < sizeof (paths) / sizeof (const char*); i ++ ) { - QDir dir (paths[i], globs[i], QDir::Unsorted, QDir::All | QDir::System); - const QFileInfoList* list = dir.entryInfoList(); + TQDir dir (paths[i], globs[i], TQDir::Unsorted, TQDir::All | TQDir::System); + const TQFileInfoList* list = dir.entryInfoList(); if ( list ) - for ( QFileInfoListIterator filit (*list); filit.current(); ++ filit ) + for ( TQFileInfoListIterator filit (*list); filit.current(); ++ filit ) { - QFileInfo* info = filit.current(); - QString name (info -> fileName()); + TQFileInfo* info = filit.current(); + TQString name (info -> fileName()); if ( info -> exists() && info -> isReadable() ) { - QString path (info -> filePath()); + TQString path (info -> filePath()); #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << " Device " << path << "\n"; #endif @@ -2509,7 +2509,7 @@ void KPlayerDevicesNode::update (QStringList& current, QStringList& previous) #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << " Absolute " << path << "\n"; #endif - path = QDir::cleanDirPath (path); + path = TQDir::cleanDirPath (path); #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << " Cleaned " << path << "\n"; #endif @@ -2520,7 +2520,7 @@ void KPlayerDevicesNode::update (QStringList& current, QStringList& previous) #endif if ( ! media() -> hidden (path) ) { - QRegExp re_no ("(\\d+)$"); + TQRegExp re_no ("(\\d+)$"); int no = re_no.search (name) >= 0 ? re_no.cap(1).toInt() : -1; #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << " Number " << no << "\n"; @@ -2565,7 +2565,7 @@ void KPlayerDevicesNode::update (QStringList& current, QStringList& previous) } } } - QStringList::ConstIterator slit (previous.begin()); + TQStringList::ConstIterator slit (previous.begin()); while ( slit != previous.end() ) { m_devices.remove (*slit); @@ -2588,7 +2588,7 @@ void KPlayerDevicesNode::update (QStringList& current, QStringList& previous) addToNameMap (maps[3], i18n("DVB Device"), i18n("DVB Device %1")); } -void KPlayerDevicesNode::addToNameMap (QMap& map, const QString& device, const QString& deviceno) +void KPlayerDevicesNode::addToNameMap (TQMap& map, const TQString& device, const TQString& deviceno) { if ( map.count() == 1 ) m_name_map.insert (map.begin().key(), device); @@ -2599,7 +2599,7 @@ void KPlayerDevicesNode::addToNameMap (QMap& map, const QString& d do { found = false; - QMap::Iterator imit (map.begin()); + TQMap::Iterator imit (map.begin()); while ( imit != map.end() ) { if ( imit.data() == index ) @@ -2618,7 +2618,7 @@ void KPlayerDevicesNode::addToNameMap (QMap& map, const QString& d m_name_map.insert (map.begin().key(), device); else { - QMap::ConstIterator imit (map.begin()); + TQMap::ConstIterator imit (map.begin()); while ( imit != map.end() ) { m_name_map.insert (imit.key(), deviceno.arg (index)); @@ -2640,7 +2640,7 @@ void KPlayerDevicesNode::completed (void) void KPlayerDevicesNode::refreshItem (KFileItem* item) { - QString path ("/dev" + item -> url().path()); + TQString path ("/dev" + item -> url().path()); #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerDevicesNode::refreshItem\n"; kdDebugTime() << " Item " << item -> url() << "\n"; @@ -2665,7 +2665,7 @@ void KPlayerDevicesNode::refreshItem (KFileItem* item) kdDebugTime() << " Marked " << item -> isMarked() << "\n"; kdDebugTime() << " Path " << path << "\n"; #endif - QString type (item -> mimetype() == "media/audiocd" ? I18N_NOOP("Audio CD") + TQString type (item -> mimetype() == "media/audiocd" ? I18N_NOOP("Audio CD") : item -> mimetype() == "media/dvdvideo" ? "DVD" : item -> mimetype() == "media/svcd" || item -> mimetype() == "media/vcd" ? I18N_NOOP("Video CD") : item -> mimetype().startsWith ("media/dvd") ? I18N_NOOP("Data DVD") : I18N_NOOP("Data CD")); @@ -2680,7 +2680,7 @@ void KPlayerDevicesNode::refreshItem (KFileItem* item) disk -> diskInserted (itemLocalPath (*item)); /*if ( type == "DVD" ) { - QString name (item -> name()); + TQString name (item -> name()); #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << " Name " << name << "\n"; #endif @@ -2690,7 +2690,7 @@ void KPlayerDevicesNode::refreshItem (KFileItem* item) int i, length = name.length(); for ( i = 0; i < length; ++ i ) { - QChar c = name.constref (i); + TQChar c = name.constref (i); if ( c.upper() != c ) { capsonly = false; @@ -2699,7 +2699,7 @@ void KPlayerDevicesNode::refreshItem (KFileItem* item) } for ( i = 0; i < length; ++ i ) { - QChar& c = name.ref (i); + TQChar& c = name.ref (i); if ( c == '_' ) c = ' '; else if ( inword && c.isLetter() ) @@ -2731,7 +2731,7 @@ void KPlayerDevicesNode::refresh (const KFileItemList& items) void KPlayerDevicesNode::removed (KFileItem* item) { - QString path ("/dev" + item -> url().path()); + TQString path ("/dev" + item -> url().path()); #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerDevicesNode::removed\n"; kdDebugTime() << " Item " << item -> url() << "\n"; @@ -2757,7 +2757,7 @@ void KPlayerDevicesNode::removed (const KPlayerNodeList& nodes) KPlayerNodeListIterator nlit (nodes); while ( KPlayerNode* node = nlit.current() ) { - QString id (node -> id()); + TQString id (node -> id()); m_devices.remove (id); m_type_map.remove (id); m_disk_types.remove (id); @@ -2770,12 +2770,12 @@ KPlayerDeviceNode::~KPlayerDeviceNode() { } -QString KPlayerDeviceNode::icon (void) const +TQString KPlayerDeviceNode::icon (void) const { return "tv"; } -QString KPlayerDeviceNode::openIcon (void) const +TQString KPlayerDeviceNode::openIcon (void) const { return icon(); } @@ -2829,7 +2829,7 @@ void KPlayerDiskNode::setupSource (void) m_source = new KPlayerDiskSource (this); } -KPlayerNode* KPlayerDiskNode::createLeaf (const QString& id) +KPlayerNode* KPlayerDiskNode::createLeaf (const TQString& id) { if ( disk() && disk() -> type() == "Video CD" && disk() -> msf (id) == 6 ) return 0; @@ -2838,9 +2838,9 @@ KPlayerNode* KPlayerDiskNode::createLeaf (const QString& id) return node; } -QString KPlayerDiskNode::icon (void) const +TQString KPlayerDiskNode::icon (void) const { - const QString& type (media() -> type()); + const TQString& type (media() -> type()); return type == "DVD" ? "dvd_unmount" : type == "Audio CD" ? "cdaudio_unmount" : "cdrom_unmount"; } @@ -2850,12 +2850,12 @@ bool KPlayerDiskNode::ready (void) const || KPlayerEngine::engine() -> properties() -> parent() != disk()); } -QString KPlayerDiskNode::suggestId (void) const +TQString KPlayerDiskNode::suggestId (void) const { return media() -> url().fileName(); } -void KPlayerDiskNode::setDiskType (const QString& type) +void KPlayerDiskNode::setDiskType (const TQString& type) { #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerDiskNode::setDiskType\n"; @@ -2880,7 +2880,7 @@ bool KPlayerDiskNode::dataDisk (void) return disk() && disk() -> type().startsWith ("Data "); } -static QRegExp re_track_length ("^ID_(?:DVD_TITLE|VCD_TRACK|CDDA_TRACK)_(\\d+)_(?:LENGTH|MSF)=([0-9.:]+)$"); +static TQRegExp re_track_length ("^ID_(?:DVD_TITLE|VCD_TRACK|CDDA_TRACK)_(\\d+)_(?:LENGTH|MSF)=([0-9.:]+)$"); bool KPlayerDiskNode::accessDisk (void) { @@ -2889,7 +2889,7 @@ bool KPlayerDiskNode::accessDisk (void) kdDebugTime() << " URL " << url() << "\n"; kdDebugTime() << " Path " << id() << "\n"; #endif - QFile file (id()); + TQFile file (id()); if ( file.open (IO_ReadOnly) ) { char data [65536]; @@ -2908,7 +2908,7 @@ bool KPlayerDiskNode::accessDisk (void) return false; } -void KPlayerDiskNode::diskDetected (const QString& diskid) +void KPlayerDiskNode::diskDetected (const TQString& diskid) { #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerDiskNode::diskDetected\n"; @@ -2921,7 +2921,7 @@ void KPlayerDiskNode::diskDetected (const QString& diskid) previous -> disconnect (this); m_media = m_disk = KPlayerMedia::diskProperties (m_device, "kplayer:/disks/" + diskid); connect (media(), SIGNAL (updated()), SLOT (updated())); - const QString& type (parent() -> diskType (id())); + const TQString& type (parent() -> diskType (id())); if ( type.isNull() ) disk() -> setDefaultName (i18n("Disk in %2").arg (device() -> name())); else @@ -2935,12 +2935,12 @@ void KPlayerDiskNode::diskDetected (const QString& diskid) KPlayerMedia::release (previous); } -void KPlayerDiskNode::diskInserted (const QString& path) +void KPlayerDiskNode::diskInserted (const TQString& path) { #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerDiskNode::diskInserted\n"; #endif - const QString& type (parent() -> diskType (id())); + const TQString& type (parent() -> diskType (id())); if ( type.isNull() ) return; m_fast_autodetect = true; @@ -2952,7 +2952,7 @@ void KPlayerDiskNode::diskInserted (const QString& path) KPlayerContainerNode::removed (nodes()); KPlayerMedia* previous = media(); previous -> disconnect (this); - QString urls ("kplayer:/disks" + id()); + 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())); @@ -2970,7 +2970,7 @@ void KPlayerDiskNode::diskInserted (const QString& path) kdDebugTime() << " Type " << type << "\n"; #endif media() -> disconnect (this); - QString urls ("kplayer:/disks" + id()); + TQString urls ("kplayer:/disks" + id()); KPlayerEngine::engine() -> meta() -> deleteGroup (urls); m_media = m_disk = KPlayerMedia::diskProperties (device(), urls); connect (media(), SIGNAL (updated()), SLOT (updated())); @@ -2987,8 +2987,8 @@ void KPlayerDiskNode::diskRemoved (void) kdDebugTime() << "KPlayerDiskNode::diskRemoved\n"; #endif m_fast_autodetect = false; - m_local_path = QString::null; - m_url = QString::null; + m_local_path = TQString::null; + m_url = TQString::null; if ( disk() ) { KPlayerContainerNode::removed (nodes()); @@ -3027,7 +3027,7 @@ void KPlayerDiskNode::listResult (KIO::Job* job) kdDebugTime() << " Error " << job -> error() << " " << job -> errorString() << "\n"; #endif m_url = "mount://"; - KIO::SimpleJob* job = KIO::mount (true, 0, id(), QString::null, false); + KIO::SimpleJob* job = KIO::mount (true, 0, id(), TQString::null, false); connect (job, SIGNAL(result(KIO::Job*)), SLOT(mountResult(KIO::Job*))); } else @@ -3055,7 +3055,7 @@ void KPlayerDiskNode::pathResult (KIO::Job* job) #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerDiskNode::pathResult\n"; #endif - m_url = QString::null; + m_url = TQString::null; if ( job -> error() ) { #ifdef DEBUG_KPLAYER_NODE @@ -3112,8 +3112,8 @@ void KPlayerDiskNode::autodetect (void) m_autodetected = false; m_detected_tracks = 0; m_track_lengths.clear(); - m_disk_id = QString::null; - m_local_path = QString::null; + m_disk_id = TQString::null; + m_local_path = TQString::null; if ( ! disk() || ! disk() -> hasType() ) m_fast_autodetect = false; if ( ! m_fast_autodetect && ready() || m_fast_autodetect && disk() -> type() == "DVD" && m_url != "dvd://" ) @@ -3158,9 +3158,9 @@ void KPlayerDiskNode::receivedOutput (KPlayerLineOutputProcess*, char* str, int) #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << " <<<<<< " << str << "\n"; #endif - static QRegExp re_tracks ("^ID_(?:DVD_TITLES|VCD_END_TRACK|CDDA_TRACKS)=(\\d+)$"); - static QRegExp re_msf ("^(\\d+):(\\d+):(\\d+)$"); - static QRegExp re_filename ("^ID_FILENAME="); + static TQRegExp re_tracks ("^ID_(?:DVD_TITLES|VCD_END_TRACK|CDDA_TRACKS)=(\\d+)$"); + static TQRegExp re_msf ("^(\\d+):(\\d+):(\\d+)$"); + static TQRegExp re_filename ("^ID_FILENAME="); if ( m_detected_tracks == 0 && re_tracks.search (str) >= 0 ) m_detected_tracks = re_tracks.cap(1).toUInt(); else if ( m_detected_tracks && re_filename.search (str) >= 0 ) @@ -3170,7 +3170,7 @@ void KPlayerDiskNode::receivedOutput (KPlayerLineOutputProcess*, char* str, int) uint track = re_track_length.cap(1).toUInt() - 1; if ( track == m_track_lengths.count() ) { - QString length (re_track_length.cap(2)); + TQString length (re_track_length.cap(2)); if ( m_url == "cdda://" ) m_disk_id += length; if ( m_url == "dvd://" ) @@ -3197,7 +3197,7 @@ void KPlayerDiskNode::processExited (KProcess* process) KMD5 digest (m_disk_id.latin1()); diskDetected (digest.hexDigest()); autodetected(); - m_artist = m_album = m_genre = m_cddb_id = QString::null; + m_artist = m_album = m_genre = m_cddb_id = TQString::null; m_year = 0; KPlayerLineOutputProcess* process = new KPlayerLineOutputProcess; *process << media() -> executablePath() << "-cdrom-device" << id() << "-v" @@ -3218,7 +3218,7 @@ void KPlayerDiskNode::processExited (KProcess* process) { setDiskType (disk() -> type()); updateTracks(); - m_url = QString::null; + m_url = TQString::null; disk() -> commit(); return; } @@ -3228,7 +3228,7 @@ void KPlayerDiskNode::processExited (KProcess* process) autodetect(); else { - m_url = QString::null; + m_url = TQString::null; if ( disk() ) { setDiskType (I18N_NOOP("Data Disk")); @@ -3242,13 +3242,13 @@ void KPlayerDiskNode::autodetected (void) #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << "KPlayerDiskNode::autodetected\n"; #endif - QString type (m_url == "cdda://" ? "Audio CD" : m_url == "dvd://" ? "DVD" + TQString type (m_url == "cdda://" ? "Audio CD" : m_url == "dvd://" ? "DVD" : m_url == "vcd://" ? "Video CD" : disk() -> type()); setDiskType (type); if ( m_detected_tracks ) disk() -> setTracks (m_detected_tracks); updateTracks(); - m_url = QString::null; + m_url = TQString::null; disk() -> commit(); } @@ -3263,15 +3263,15 @@ void KPlayerDiskNode::updateTracks (void) if ( int (nodes().count()) != disk() -> tracks() ) { KPlayerContainerNode::removed (nodes()); - QString key (disk() -> type() == "Video CD" ? "MSF" : "Length"); - QStringList tracklist; + TQString key (disk() -> type() == "Video CD" ? "MSF" : "Length"); + TQStringList tracklist; for ( int track = 1; track <= disk() -> tracks(); ++ track ) { - tracklist.append (QString::number (track)); + tracklist.append (TQString::number (track)); if ( track <= int (m_track_lengths.count()) ) { KURL url (disk() -> url()); - url.addPath (QString::number (track)); + url.addPath (TQString::number (track)); KPlayerTrackProperties* media = KPlayerMedia::trackProperties (url); media -> setupInfo(); if ( ! media -> has (key) ) @@ -3305,7 +3305,7 @@ void KPlayerDiskNode::statResult (KIO::Job* job) } if ( dataDisk() ) { - m_url = QString::null; + m_url = TQString::null; disk() -> commit(); } else @@ -3323,7 +3323,7 @@ void KPlayerDiskNode::receivedCddbOutput (KPlayerLineOutputProcess*, char* str, m_cddb_id += re_track_length.cap(2); else if ( m_cddb_id == m_disk_id ) { - QString line (QString::fromLocal8Bit (str)); + TQString line (TQString::fromLocal8Bit (str)); if ( line.startsWith ("DTITLE=") ) { line.remove (0, 7); @@ -3355,9 +3355,9 @@ void KPlayerDiskNode::receivedCddbOutput (KPlayerLineOutputProcess*, char* str, if ( ok ) { KURL url (disk() -> url()); - url.addPath (QString::number (track)); + url.addPath (TQString::number (track)); KPlayerTrackProperties* media = KPlayerMedia::trackProperties (url); - QString title (line.section ('=', 1).simplifyWhiteSpace()); + TQString title (line.section ('=', 1).simplifyWhiteSpace()); if ( ! title.isEmpty() ) media -> setName (title); if ( ! m_artist.isEmpty() ) @@ -3365,7 +3365,7 @@ void KPlayerDiskNode::receivedCddbOutput (KPlayerLineOutputProcess*, char* str, if ( ! m_album.isEmpty() ) media -> setString ("Album", m_album); if ( m_year ) - media -> setString ("Year", QString::number (m_year)); + media -> setString ("Year", TQString::number (m_year)); if ( ! m_genre.isEmpty() ) media -> setString ("Genre", m_genre); media -> commit(); @@ -3393,7 +3393,7 @@ void KPlayerTunerNode::setupSource (void) m_source = new KPlayerTunerSource (this); } -KPlayerNode* KPlayerTunerNode::createLeaf (const QString& id) +KPlayerNode* KPlayerTunerNode::createLeaf (const TQString& id) { KPlayerChannelNode* node = new KPlayerChannelNode; node -> setup (this, id); @@ -3443,7 +3443,7 @@ KPlayerSearchesNode::~KPlayerSearchesNode() { } -KPlayerContainerNode* KPlayerSearchesNode::createBranch (const QString& id, KPlayerContainerNode* origin) +KPlayerContainerNode* KPlayerSearchesNode::createBranch (const TQString& id, KPlayerContainerNode* origin) { KPlayerContainerNode* node = new KPlayerSearchNode; node -> setup (this, id, origin); @@ -3464,7 +3464,7 @@ void KPlayerSearchNode::setupSource (void) m_source = new KPlayerSearchSource (this); } -KPlayerNode* KPlayerSearchNode::createLeaf (const QString& id) +KPlayerNode* KPlayerSearchNode::createLeaf (const TQString& id) { KPlayerNode* node = new KPlayerSearchItemNode; node -> setup (this, id); @@ -3481,7 +3481,7 @@ KPlayerNodeList::~KPlayerNodeList() { } -int KPlayerNodeList::compareItems (QPtrCollection::Item item1, QPtrCollection::Item item2) +int KPlayerNodeList::compareItems (TQPtrCollection::Item item1, TQPtrCollection::Item item2) { return ((KPlayerNode*) item1) -> compare ((KPlayerNode*) item2); } @@ -3532,7 +3532,7 @@ KPlayerNodeList KPlayerNodeList::fromUrlList (const KURL::List& urls) #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << " Type " << item.mimetype() << "\n"; #endif - QString path (itemLocalPath (item)); + TQString path (itemLocalPath (item)); if ( ! path.isEmpty() ) { url = KURL::fromPathOrURL (path); @@ -3549,7 +3549,7 @@ KPlayerNodeList KPlayerNodeList::fromUrlList (const KURL::List& urls) } if ( url.isLocalFile() ) { - QFileInfo info (url.path()); + TQFileInfo info (url.path()); group = info.isDir(); if ( group ) node = KPlayerNode::root() -> getNodeByUrl (url); @@ -3569,7 +3569,7 @@ KPlayerNodeListByName::~KPlayerNodeListByName() { } -int KPlayerNodeListByName::compareItems (QPtrCollection::Item item1, QPtrCollection::Item item2) +int KPlayerNodeListByName::compareItems (TQPtrCollection::Item item1, TQPtrCollection::Item item2) { return ((KPlayerNode*) item1) -> compareByName ((KPlayerNode*) item2); } @@ -3578,7 +3578,7 @@ KPlayerPlaylistNodeList::~KPlayerPlaylistNodeList() { } -int KPlayerPlaylistNodeList::compareItems (QPtrCollection::Item item1, QPtrCollection::Item item2) +int KPlayerPlaylistNodeList::compareItems (TQPtrCollection::Item item1, TQPtrCollection::Item item2) { KPlayerNode* node1 = (KPlayerNode*) item1; KPlayerNode* node2 = (KPlayerNode*) item2; diff --git a/kplayer/kplayernode.h b/kplayer/kplayernode.h index 5620cf1..2317272 100644 --- a/kplayer/kplayernode.h +++ b/kplayer/kplayernode.h @@ -25,22 +25,22 @@ class KPlayerRootNode; /**Node list iterator. * @author kiriuja */ -typedef QPtrListIterator KPlayerNodeListIterator; +typedef TQPtrListIterator KPlayerNodeListIterator; /**Node map by ID. * @author kiriuja */ -typedef QMap KPlayerNodeMap; +typedef TQMap KPlayerNodeMap; /**Container node map by ID. * @author kiriuja */ -typedef QMap KPlayerContainerNodeMap; +typedef TQMap KPlayerContainerNodeMap; /**Node list. *@author kiriuja */ -class KPlayerNodeList : public QPtrList +class KPlayerNodeList : public TQPtrList { public: /** Constructor. */ @@ -49,7 +49,7 @@ public: virtual ~KPlayerNodeList(); /** Compares the two given nodes. */ - virtual int compareItems (QPtrCollection::Item item1, QPtrCollection::Item item2); + virtual int compareItems (TQPtrCollection::Item item1, TQPtrCollection::Item item2); /** Releases all nodes on the list. */ void releaseAll (void) const; @@ -70,7 +70,7 @@ public: virtual ~KPlayerNodeListByName(); /** Compares the two given nodes. */ - virtual int compareItems (QPtrCollection::Item item1, QPtrCollection::Item item2); + virtual int compareItems (TQPtrCollection::Item item1, TQPtrCollection::Item item2); }; /**Playlist node list. @@ -85,13 +85,13 @@ public: virtual ~KPlayerPlaylistNodeList(); /** Compares the two given nodes. */ - virtual int compareItems (QPtrCollection::Item item1, QPtrCollection::Item item2); + virtual int compareItems (TQPtrCollection::Item item1, TQPtrCollection::Item item2); }; /**Node in the hierarchy. *@author kiriuja */ -class KPlayerNode : public QObject +class KPlayerNode : public TQObject { Q_OBJECT @@ -102,26 +102,26 @@ public: virtual ~KPlayerNode(); /** Initializes the node. */ - void setup (KPlayerContainerNode* parent, const QString& id, KPlayerContainerNode* origin = 0); + void setup (KPlayerContainerNode* parent, const TQString& id, KPlayerContainerNode* origin = 0); /** Unique identifier of the node within its parent node. */ - const QString& id (void) const + const TQString& id (void) const { return m_id; } /** Suggested identifier for a copy of this node. */ - virtual QString suggestId (void) const; + virtual TQString suggestId (void) const; /** Node name. */ - QString name (void) const + TQString name (void) const { return media() -> name(); } /** Node URL. Gives node location in the hierarchy. */ virtual KURL url (void) const; /** The URL of a subnode with the given ID. */ - KURL url (const QString& id) const; + KURL url (const TQString& id) const; /** Media URL. Refers to the meta information storage of the node. */ virtual KURL metaurl (void) const; /** Media URL of a subnode with the given ID. */ - KURL metaurl (const QString& id) const; + KURL metaurl (const TQString& id) const; /** Parent node. Null for root node. */ KPlayerContainerNode* parent (void) const @@ -135,7 +135,7 @@ public: { return m_media; } /** Returns icon name. */ - virtual QString icon (void) const; + virtual TQString icon (void) const; /** Configuration. */ KPlayerConfiguration* configuration (void) const @@ -190,12 +190,12 @@ public: static void terminate (void); /** Sets the sorting key and ascending order. */ - static void setSorting (const QString& key, bool ascending); + static void setSorting (const TQString& key, bool ascending); /** Returns whether nodes are being sorted by name. */ static bool sortByName (void) { return m_sort_by_name; } /** Returns the sort key. */ - static const QString& sortKey (void) + static const TQString& sortKey (void) { return m_sort_key; } /** Returns whether to sort in ascending order. */ static bool sortAscending (void) @@ -212,7 +212,7 @@ protected: virtual void setupChildren (KPlayerContainerNode* origin); /** Unique identifier of the node within its parent node. */ - QString m_id; + TQString m_id; /** Parent node. Null for root node. */ KPlayerContainerNode* m_parent; /** Reference count of the node. */ @@ -227,7 +227,7 @@ protected: /** Flag indicating whether the list is being sorted by name. */ static bool m_sort_by_name; /** Sort key. */ - static QString m_sort_key; + static TQString m_sort_key; /** Sort in ascending order. */ static bool m_sort_ascending; }; @@ -392,12 +392,12 @@ public: virtual bool ready (void) const; /** Returns icon name. */ - virtual QString icon (void) const; + virtual TQString icon (void) const; /** Returns open icon name. */ - virtual QString openIcon (void) const; + virtual TQString openIcon (void) const; /** Suggested identifier for a copy of this node. */ - virtual QString suggestId (void) const; + virtual TQString suggestId (void) const; /** Returns whether the node is a container. */ virtual bool isContainer (void) const; @@ -473,11 +473,11 @@ public: bool preferMove (KPlayerNode* node) const; /** Returns a node for the given ID from the node list. */ - KPlayerNode* nodeById (const QString& id) const; + KPlayerNode* nodeById (const TQString& id) const; /** Returns a node for the given ID if it exists. */ - KPlayerContainerNode* getNodeById (const QString& id); + KPlayerContainerNode* getNodeById (const TQString& id); /** Returns a node at the given path if it exists. */ - virtual KPlayerContainerNode* getNodeByPath (const QString& path); + virtual KPlayerContainerNode* getNodeByPath (const TQString& path); /** Returns the next node after the given one. */ KPlayerNode* nextNode (KPlayerNode*); @@ -509,12 +509,12 @@ public: void save (void); /** Adds a new branch node with the given name. */ - void addBranch (const QString& name, KPlayerNode* after = 0); + void addBranch (const TQString& name, KPlayerNode* after = 0); /** Adds a new branch node with the given name at the top of the node list. */ - void prependBranch (const QString& name) + void prependBranch (const TQString& name) { addBranch (name, this); } /** Adds a new branch node with the given name at the end of the node list. */ - void appendBranch (const QString& name); + void appendBranch (const TQString& name); /** Adds the given nodes to this node, optionally linking to the origin. */ void add (const KPlayerNodeList& nodes, bool link = true, KPlayerNode* after = 0); @@ -557,11 +557,11 @@ public: /** Adds all subnodes of the given node to the list of nodes, optionally linking to the origin. */ void added (KPlayerContainerNode* node, bool link); /** Adds the given files to the list of nodes. */ - void added (const QFileInfoList& list); + void added (const TQFileInfoList& list); /** Adds the given branches to the list of nodes. */ - void addedBranches (const QStringList& list); + void addedBranches (const TQStringList& list); /** Adds the given leaves to the list of nodes. */ - void addedLeaves (const QStringList& list); + void addedLeaves (const TQStringList& list); /** Moves the given nodes after the given node. */ KPlayerNode* moved (const KPlayerNodeList& nodes, KPlayerNode* after); @@ -571,7 +571,7 @@ public: /** Removes the node and all subnodes. */ virtual void removed (void); /** Removes nodes with the given IDs from the list of nodes. */ - void removed (const QStringList& ids); + void removed (const TQStringList& ids); /** Finishes removing the given nodes and counts and emits the removed signal. */ void removed (const KPlayerNodeList& nodes, const KPlayerPropertyCounts& counts); @@ -644,9 +644,9 @@ protected: virtual void setupSource (void); /** Creates a new leaf node with the given id. */ - virtual KPlayerNode* createLeaf (const QString& id); + virtual KPlayerNode* createLeaf (const TQString& id); /** Creates a new branch node with the given id and origin. */ - virtual KPlayerContainerNode* createBranch (const QString& id, KPlayerContainerNode* origin = 0); + virtual KPlayerContainerNode* createBranch (const TQString& id, KPlayerContainerNode* origin = 0); /** Inserts the given node and adds a reference if necessary. */ void insert (KPlayerNode* node, KPlayerNode* after); @@ -654,9 +654,9 @@ protected: void append (KPlayerNode* node); /** Inserts a new leaf subnode and adds a reference if necessary. */ - KPlayerNode* insertLeaf (const QString& id, KPlayerNode* after = 0); + KPlayerNode* insertLeaf (const TQString& id, KPlayerNode* after = 0); /** Inserts a new branch subnode and adds references as necessary. */ - KPlayerContainerNode* insertBranch (const QString& id, KPlayerNode* after = 0, KPlayerContainerNode* origin = 0); + KPlayerContainerNode* insertBranch (const TQString& id, KPlayerNode* after = 0, KPlayerContainerNode* origin = 0); /** Populates the list of all subnodes. */ void doPopulate (void); @@ -701,7 +701,7 @@ public: virtual ~KPlayerTemporaryNode(); /** Creates and returns a temporary item node. */ - KPlayerNode* temporaryItem (const QString& id); + KPlayerNode* temporaryItem (const TQString& id); }; /**Root node. @@ -725,7 +725,7 @@ public: { return m_temp; } /** Returns the list of default IDs. */ - const QStringList& defaultIds (void) + const TQStringList& defaultIds (void) { return m_default_ids; } /** Returns a node from the hierarchy given a URL. */ @@ -736,10 +736,10 @@ protected: virtual void setupSource (void); /** Creates a new branch node with the given id and origin. */ - virtual KPlayerContainerNode* createBranch (const QString& id, KPlayerContainerNode* origin = 0); + virtual KPlayerContainerNode* createBranch (const TQString& id, KPlayerContainerNode* origin = 0); /** List of default IDs. */ - QStringList m_default_ids; + TQStringList m_default_ids; /** Map of standard nodes. */ KPlayerContainerNodeMap m_defaults; /** External node map. */ @@ -775,9 +775,9 @@ protected: virtual void setupSource (void); /** Creates a new leaf node with the given id. */ - virtual KPlayerNode* createLeaf (const QString& id); + virtual KPlayerNode* createLeaf (const TQString& id); /** Creates a new branch node with the given id and origin. */ - virtual KPlayerContainerNode* createBranch (const QString& id, KPlayerContainerNode* origin = 0); + virtual KPlayerContainerNode* createBranch (const TQString& id, KPlayerContainerNode* origin = 0); }; /**External node. @@ -811,9 +811,9 @@ public: virtual ~KPlayerGroupNode(); /** Returns icon name. */ - virtual QString icon (void) const; + virtual TQString icon (void) const; /** Returns open icon name. */ - virtual QString openIcon (void) const; + virtual TQString openIcon (void) const; /** Returns whether the node is a group. */ virtual bool isGroup (void) const; @@ -850,24 +850,24 @@ public: #if 0 /** The key that is used to create group nodes. */ - const QString& groupingKey (void) const + const TQString& groupingKey (void) const { return media() -> groupingKey(); } /** Returns whether the node is grouped. */ bool isGrouped (void) const { return (! origin() || ! origin() -> canGroup()) && ! groupingKey().isEmpty(); } /** Parent's grouping key. */ - const QString& parentKey (void) const - { return parent() -> canGroup() ? ((KPlayerCollectionNode*) parent()) -> groupingKey() : QString::null; } + const TQString& parentKey (void) const + { return parent() -> canGroup() ? ((KPlayerCollectionNode*) parent()) -> groupingKey() : TQString::null; } /** Returns whether the node is grouped. */ bool isParentGrouped (void) const { return parent() -> canGroup() && ((KPlayerCollectionNode*) parent()) -> isGrouped(); } /** Groups the subnodes by key. */ - void group (const QString& key); + void group (const TQString& key); /** Groups the subnodes by folder. */ void ungroup (void) - { group (QString::null); } + { group (TQString::null); } /** Flattens the subnode hierarchy. */ void flatten (void) { group (""); } @@ -878,7 +878,7 @@ protected: virtual void setupOrigin (void); /** Creates a new branch node with the given id and origin. */ - virtual KPlayerContainerNode* createBranch (const QString& id, KPlayerContainerNode* origin = 0); + virtual KPlayerContainerNode* createBranch (const TQString& id, KPlayerContainerNode* origin = 0); }; /**Playlist node. @@ -895,9 +895,9 @@ public: virtual ~KPlayerPlaylistNode(); /** Returns icon name. */ - virtual QString icon (void) const; + virtual TQString icon (void) const; /** Returns open icon name. */ - virtual QString openIcon (void) const; + virtual TQString openIcon (void) const; /** Returns whether the given node can be linked into this container. */ virtual bool canLink (KPlayerContainerNode* node) const; @@ -925,7 +925,7 @@ protected: virtual void setupSource (void); /** Creates a new branch node with the given id and origin. */ - virtual KPlayerContainerNode* createBranch (const QString& id, KPlayerContainerNode* origin = 0); + virtual KPlayerContainerNode* createBranch (const TQString& id, KPlayerContainerNode* origin = 0); /** Duplicate indicator. */ bool m_duplicates; @@ -945,9 +945,9 @@ public: virtual ~KPlayerNowPlayingNode(); /** Returns icon name. */ - virtual QString icon (void) const; + virtual TQString icon (void) const; /** Returns open icon name. */ - virtual QString openIcon (void) const; + virtual TQString openIcon (void) const; /** Returns whether the node is a now playing group. */ virtual bool isNowPlaying (void) const; @@ -964,7 +964,7 @@ protected: virtual void setupOrigin (void); /** Creates a new branch node with the given id and origin. */ - virtual KPlayerContainerNode* createBranch (const QString& id, KPlayerContainerNode* origin = 0); + virtual KPlayerContainerNode* createBranch (const TQString& id, KPlayerContainerNode* origin = 0); }; /**Recent node. @@ -981,9 +981,9 @@ public: virtual ~KPlayerRecentNode(); /** Returns icon name. */ - virtual QString icon (void) const; + virtual TQString icon (void) const; /** Returns open icon name. */ - virtual QString openIcon (void) const; + virtual TQString openIcon (void) const; /** Indicates whether the node is a recent node. */ virtual bool isRecent (void) const; @@ -993,7 +993,7 @@ public: protected: /** Creates a new branch node with the given id. */ - virtual KPlayerContainerNode* createBranch (const QString& id, KPlayerContainerNode* origin = 0); + virtual KPlayerContainerNode* createBranch (const TQString& id, KPlayerContainerNode* origin = 0); }; /**Recents node. @@ -1034,9 +1034,9 @@ public: virtual ~KPlayerDevicesNode(); /** Returns icon name. */ - virtual QString icon (void) const; + virtual TQString icon (void) const; /** Returns open icon name. */ - virtual QString openIcon (void) const; + virtual TQString openIcon (void) const; /** Indicates whether the node is the device list. */ virtual bool isDevices (void) const; @@ -1050,29 +1050,29 @@ public: { return m_complete; } /** Returns a node for the given ID from the node list. */ - KPlayerDeviceNode* nodeById (const QString& id) + KPlayerDeviceNode* nodeById (const TQString& id) { return (KPlayerDeviceNode*) KPlayerContainerNode::nodeById (id); } /** Returns a node at the given path if it exists. */ - virtual KPlayerContainerNode* getNodeByPath (const QString& path); + virtual KPlayerContainerNode* getNodeByPath (const TQString& path); /** Source of subnodes. */ KPlayerDevicesSource* source (void) const { return (KPlayerDevicesSource*) m_source; } /** Returns the list of device paths. */ - const QStringList& devices (void) + const TQStringList& devices (void) { return m_devices; } /** Returns the type of the given device. */ - const QString& deviceType (const QString& id) + const TQString& deviceType (const TQString& id) { return m_type_map [id]; } /** Returns the suggested name of the given device. */ - const QString& deviceName (const QString& id) + const TQString& deviceName (const TQString& id) { return m_name_map [id]; } /** Returns the disk type in the given device. */ - const QString& diskType (const QString& id) + const TQString& diskType (const TQString& id) { return m_disk_types [id]; } /** Updates the list of devices. */ @@ -1094,31 +1094,31 @@ protected slots: /** Removes the given item. */ void removed (KFileItem *fileItem); /** Receives dirty signal from directory watch. */ - void dirty (const QString& path); + void dirty (const TQString& path); protected: /** Initializes the node source. */ virtual void setupSource (void); /** Creates a new branch node with the given id and origin. */ - virtual KPlayerContainerNode* createBranch (const QString& id, KPlayerContainerNode* origin = 0); + virtual KPlayerContainerNode* createBranch (const TQString& id, KPlayerContainerNode* origin = 0); /** Updates the list of devices. */ - void update (QStringList& current, QStringList& previous); + void update (TQStringList& current, TQStringList& previous); /** Adds device names based on the given numeric map. */ - void addToNameMap (QMap& map, const QString& device, const QString& deviceno); + void addToNameMap (TQMap& map, const TQString& device, const TQString& deviceno); /** Device paths. */ - QStringList m_devices; + TQStringList m_devices; /** Device types. */ - QMap m_type_map; + TQMap m_type_map; /** Device names. */ - QMap m_name_map; + TQMap m_name_map; /** Disk types. */ - QMap m_disk_types; + TQMap m_disk_types; /** Directory. */ - QDir m_directory; + TQDir m_directory; /** Directory watch. */ KDirWatch m_watch; /** Media directory lister. */ @@ -1151,9 +1151,9 @@ public: { return (KPlayerDeviceProperties*) m_media; } /** Returns icon name. */ - virtual QString icon (void) const; + virtual TQString icon (void) const; /** Returns open icon name. */ - virtual QString openIcon (void) const; + virtual TQString openIcon (void) const; /** Returns whether the node has media properties. */ virtual bool hasProperties (void) const; @@ -1185,7 +1185,7 @@ public: virtual bool ready (void) const; /** Suggested identifier for a copy of this node. */ - virtual QString suggestId (void) const; + virtual TQString suggestId (void) const; /** Source of subnodes. */ KPlayerDiskSource* source (void) const @@ -1199,7 +1199,7 @@ public: { return m_disk; } /** Returns icon name. */ - virtual QString icon (void) const; + virtual TQString icon (void) const; /** Returns the number of tracks and starts autodetection if needed. */ int tracks (void); @@ -1207,7 +1207,7 @@ public: void loadDisk (void); /** Returns the local path if known. */ - const QString& localPath (void) const + const TQString& localPath (void) const { return m_local_path; } /** Returns whether the local path is known. */ bool hasLocalPath (void) const @@ -1216,7 +1216,7 @@ public: void getLocalPath (void); /** Updates the node with the disk properties. */ - void diskInserted (const QString& path = QString::null); + void diskInserted (const TQString& path = TQString::null); /** Updates the node with the device properties. */ void diskRemoved (void); @@ -1254,7 +1254,7 @@ protected: virtual void setupSource (void); /** Creates a new leaf node with the given id. */ - virtual KPlayerNode* createLeaf (const QString& id); + virtual KPlayerNode* createLeaf (const TQString& id); /** Starts disk autodetection. */ void autodetect (void); @@ -1266,39 +1266,39 @@ protected: /** Identifies the disk and returns its properties. */ bool accessDisk (void); /** Updates the node with the disk properties. */ - void diskDetected (const QString& diskid); + void diskDetected (const TQString& diskid); /** Sets the disk type and updates the default name. */ - void setDiskType (const QString& type); + void setDiskType (const TQString& type); /** Disk properties. */ KPlayerDeviceProperties* m_device; /** Disk properties. */ KPlayerDiskProperties* m_disk; /** Track lengths. */ - QValueList m_track_lengths; + TQValueList m_track_lengths; /** URL currently being autodetected. */ - QString m_url; + TQString m_url; /** Audio CD disk ID. */ - QString m_disk_id; + TQString m_disk_id; /** Audio CD disk ID for matching against the one above. */ - QString m_cddb_id; + TQString m_cddb_id; /** Number of detected tracks. */ uint m_detected_tracks; /** Indicates autodetection success. */ bool m_autodetected; /** Artist. */ - QString m_artist; + TQString m_artist; /** Album. */ - QString m_album; + TQString m_album; /** Year. */ int m_year; /** Genre. */ - QString m_genre; + TQString m_genre; /** Fast autodetect when type is known from media slave. */ bool m_fast_autodetect; /** Local path. */ - QString m_local_path; + TQString m_local_path; }; /**Tuner node. @@ -1330,10 +1330,10 @@ protected: virtual void setupSource (void); /** Creates a new leaf node with the given id. */ - virtual KPlayerNode* createLeaf (const QString& id); + virtual KPlayerNode* createLeaf (const TQString& id); /** Current channel list. */ - QString m_channel_list; + TQString m_channel_list; }; /**TV node. @@ -1399,7 +1399,7 @@ public: protected: /** Creates a new branch node with the given id and origin. */ - virtual KPlayerContainerNode* createBranch (const QString& id, KPlayerContainerNode* origin = 0); + virtual KPlayerContainerNode* createBranch (const TQString& id, KPlayerContainerNode* origin = 0); }; /**Search node. @@ -1423,7 +1423,7 @@ protected: virtual void setupSource (void); /** Creates a new leaf node with the given id. */ - virtual KPlayerNode* createLeaf (const QString& id); + virtual KPlayerNode* createLeaf (const TQString& id); }; #endif diff --git a/kplayer/kplayernodeaction.cpp b/kplayer/kplayernodeaction.cpp index 259d406..a69eac0 100644 --- a/kplayer/kplayernodeaction.cpp +++ b/kplayer/kplayernodeaction.cpp @@ -23,8 +23,8 @@ #include "kplayernodeaction.moc" #include "kplayernode.h" -KPlayerNodeActionList::KPlayerNodeActionList (const QString& text, const QString& status, - const QString& whatsthis, QObject* parent, const char* name) +KPlayerNodeActionList::KPlayerNodeActionList (const TQString& text, const TQString& status, + const TQString& whatsthis, TQObject* parent, const char* name) : KPlayerActionList (text, status, whatsthis, parent, name) { #ifdef DEBUG_KPLAYER_NODEACTION @@ -115,12 +115,12 @@ void KPlayerNodeActionList::updated (KPlayerContainerNode*, KPlayerNode* node) kdDebugTime() << "KPlayerNodeActionList::updated\n"; kdDebugTime() << " Node " << node -> url().url() << "\n"; #endif - QPtrListIterator actit (actions()); + TQPtrListIterator actit (actions()); while ( KAction* action = actit.current() ) { if ( action -> parent() == node ) { - QString name (node -> name()); + TQString name (node -> name()); if ( action -> text() != name ) { #ifdef DEBUG_KPLAYER_NODEACTION @@ -141,7 +141,7 @@ KAction* KPlayerNodeActionList::createAction (KPlayerNode* node) kdDebugTime() << "KPlayerNodeActionList::createAction\n"; kdDebugTime() << " Node " << node -> url().url() << "\n"; #endif - QString name (node -> name()); + TQString name (node -> name()); #ifdef DEBUG_KPLAYER_NODEACTION kdDebugTime() << " Name " << name << "\n"; #endif @@ -161,7 +161,7 @@ void KPlayerNodeActionList::updateActions (void) kdDebugTime() << "KPlayerNodeActionList::updateActions\n"; kdDebugTime() << " Name " << name() << "\n"; #endif - QPtrList actions (m_actions); + TQPtrList actions (m_actions); unplug(); int count = 0; KPlayerNodeListByName nodes ((const KPlayerNodeListByName&) node() -> nodes()); @@ -176,7 +176,7 @@ void KPlayerNodeActionList::updateActions (void) #ifdef DEBUG_KPLAYER_NODEACTION kdDebugTime() << " Node " << node -> url().url() << "\n"; #endif - QPtrListIterator actit (actions); + TQPtrListIterator actit (actions); KAction* action; while ( (action = actit.current()) ) { @@ -215,8 +215,8 @@ void KPlayerNodeActionList::actionActivated (void) emit activated ((KPlayerNode*) sender() -> parent()); } -KPlayerContainerActionList::KPlayerContainerActionList (const QString& text, const QString& status, - const QString& whatsthis, QObject* parent, const char* name) +KPlayerContainerActionList::KPlayerContainerActionList (const TQString& text, const TQString& status, + const TQString& whatsthis, TQObject* parent, const char* name) : KPlayerNodeActionList (text, status, whatsthis, parent, name) { #ifdef DEBUG_KPLAYER_NODEACTION @@ -252,8 +252,8 @@ bool KPlayerContainerActionList::canInclude (KPlayerNode* node) const return node -> isContainer(); } -KPlayerDevicesActionList::KPlayerDevicesActionList (const QString& text, const QString& status, - const QString& whatsthis, QObject* parent, const char* name) +KPlayerDevicesActionList::KPlayerDevicesActionList (const TQString& text, const TQString& status, + const TQString& whatsthis, TQObject* parent, const char* name) : KPlayerContainerActionList (text, status, whatsthis, parent, name) { #ifdef DEBUG_KPLAYER_NODEACTION @@ -276,7 +276,7 @@ KAction* KPlayerDevicesActionList::createAction (KPlayerNode* node) kdDebugTime() << " Name " << node -> name() << "\n"; #endif KPlayerDeviceNode* device = (KPlayerDeviceNode*) node; - const QString& type = device -> media() -> type(); + const TQString& type = device -> media() -> type(); #ifdef DEBUG_KPLAYER_NODEACTION kdDebugTime() << " Type " << type << "\n"; #endif @@ -346,9 +346,9 @@ void KPlayerDeviceActionMenu::updateActions (void) #ifdef DEBUG_KPLAYER_NODEACTION kdDebugTime() << "KPlayerDeviceActionMenu::updateActions\n"; #endif - QPtrList actions (m_actions); + TQPtrList actions (m_actions); m_actions.clear(); - QPtrListIterator actlit (actions); + TQPtrListIterator actlit (actions); KAction* action; while ( (action = actlit.current()) ) { @@ -361,7 +361,7 @@ void KPlayerDeviceActionMenu::updateActions (void) #ifdef DEBUG_KPLAYER_NODEACTION kdDebugTime() << " Track " << node -> url().url() << "\n"; #endif - QPtrListIterator actit (actions); + TQPtrListIterator actit (actions); while ( (action = actit.current()) ) { if ( action -> parent() == node ) @@ -376,7 +376,7 @@ void KPlayerDeviceActionMenu::updateActions (void) m_actions.append (action); ++ iterator; } - QPtrListIterator actmit (m_actions); + TQPtrListIterator actmit (m_actions); while ( (action = actmit.current()) ) { insert (action); @@ -412,12 +412,12 @@ void KPlayerDeviceActionMenu::updated (KPlayerContainerNode*, KPlayerNode* node) kdDebugTime() << "KPlayerDeviceActionMenu::updated\n"; kdDebugTime() << " URL " << node -> url().url() << "\n"; #endif - QPtrListIterator actit (m_actions); + TQPtrListIterator actit (m_actions); while ( KAction* action = actit.current() ) { if ( action -> parent() == node ) { - QString name (i18n("Play %1").arg (node -> name())); + TQString name (i18n("Play %1").arg (node -> name())); name.replace ("&", "&&"); if ( action -> text() != name ) action -> setText (name); @@ -456,7 +456,7 @@ void KPlayerDiskActionMenu::setup (void) updateActions(); } -void KPlayerDiskActionMenu::setText (const QString& text) +void KPlayerDiskActionMenu::setText (const TQString& text) { #ifdef DEBUG_KPLAYER_NODEACTION kdDebugTime() << "KPlayerDiskActionMenu::setText\n"; @@ -519,7 +519,7 @@ void KPlayerDiskActionMenu::updateActions (void) } remove (m_load_action); remove (m_play_action); - QString name (device() -> name()); + TQString name (device() -> name()); insert (m_play_action); KPlayerDeviceActionMenu::updateActions(); insert (m_load_action); diff --git a/kplayer/kplayernodeaction.h b/kplayer/kplayernodeaction.h index 7ce1a7e..394ca06 100644 --- a/kplayer/kplayernodeaction.h +++ b/kplayer/kplayernodeaction.h @@ -35,8 +35,8 @@ class KPlayerNodeActionList : public KPlayerActionList public: /** Constructor. */ - KPlayerNodeActionList (const QString& text, const QString& status, - const QString& whatsthis, QObject* parent, const char* name); + KPlayerNodeActionList (const TQString& text, const TQString& status, + const TQString& whatsthis, TQObject* parent, const char* name); /** Destructor. */ virtual ~KPlayerNodeActionList(); @@ -100,8 +100,8 @@ class KPlayerContainerActionList : public KPlayerNodeActionList public: /** Constructor. */ - KPlayerContainerActionList (const QString& text, const QString& status, - const QString& whatsthis, QObject* parent, const char* name); + KPlayerContainerActionList (const TQString& text, const TQString& status, + const TQString& whatsthis, TQObject* parent, const char* name); /** Destructor. */ virtual ~KPlayerContainerActionList(); @@ -123,8 +123,8 @@ class KPlayerDevicesActionList : public KPlayerContainerActionList public: /** Constructor. */ - KPlayerDevicesActionList (const QString& text, const QString& status, - const QString& whatsthis, QObject* parent, const char* name); + KPlayerDevicesActionList (const TQString& text, const TQString& status, + const TQString& whatsthis, TQObject* parent, const char* name); /** Destructor. */ virtual ~KPlayerDevicesActionList(); @@ -169,7 +169,7 @@ protected: virtual void updateActions (void); /** Device actions. */ - QPtrList m_actions; + TQPtrList m_actions; /** Indicates whether the device node was populated. */ bool m_populated; @@ -199,7 +199,7 @@ public: { return (KPlayerDiskNode*) parent(); } /** Sets the action text. */ - virtual void setText (const QString& text); + virtual void setText (const TQString& text); protected slots: /** Loads the disk. */ diff --git a/kplayer/kplayernodeview.cpp b/kplayer/kplayernodeview.cpp index 4341c3f..f1d4b39 100644 --- a/kplayer/kplayernodeview.cpp +++ b/kplayer/kplayernodeview.cpp @@ -18,10 +18,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #ifdef DEBUG #define DEBUG_KPLAYER_NODEVIEW @@ -35,8 +35,8 @@ #include "kplayersettings.h" #include "kplayer.h" -KPlayerNodeNameValidator::KPlayerNodeNameValidator (KPlayerContainerNode* node, QObject* parent, const char* name) - : QValidator (parent, name) +KPlayerNodeNameValidator::KPlayerNodeNameValidator (KPlayerContainerNode* node, TQObject* parent, const char* name) + : TQValidator (parent, name) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "Creating node name validator\n"; @@ -57,7 +57,7 @@ KPlayerNodeNameValidator::~KPlayerNodeNameValidator() m_node -> release(); } -QValidator::State KPlayerNodeNameValidator::validate (QString& input, int&) const +TQValidator::State KPlayerNodeNameValidator::validate (TQString& input, int&) const { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerNodeNameValidator::validate\n"; @@ -71,12 +71,12 @@ QValidator::State KPlayerNodeNameValidator::validate (QString& input, int&) cons kdDebugTime() << " Node " << node -> url().url() << " container " << node -> isContainer() << "\n"; #endif if ( ! node || ! node -> isContainer() ) - return QValidator::Acceptable; + return TQValidator::Acceptable; } - return QValidator::Intermediate; + return TQValidator::Intermediate; } -KPlayerPropertiesDevice::KPlayerPropertiesDevice (QWidget* parent, const char* name) +KPlayerPropertiesDevice::KPlayerPropertiesDevice (TQWidget* parent, const char* name) : KPlayerPropertiesDevicePage (parent, name) { #ifdef DEBUG_KPLAYER_NODEVIEW @@ -85,7 +85,7 @@ KPlayerPropertiesDevice::KPlayerPropertiesDevice (QWidget* parent, const char* n m_node = KPlayerNode::root() -> getNodeByUrl ("kplayer:/devices"); m_node -> reference(); m_node -> populateGroups(); - QString list (KPlayerTVProperties::channelListFromCountry()); + TQString list (KPlayerTVProperties::channelListFromCountry()); for ( uint i = 0; i < channellistcount; i ++ ) { c_channel_list -> insertItem (i18n(channellists[i].name)); @@ -106,13 +106,13 @@ KPlayerPropertiesDevice::~KPlayerPropertiesDevice() m_node -> release(); } -void KPlayerPropertiesDevice::pathChanged (const QString& path) +void KPlayerPropertiesDevice::pathChanged (const TQString& path) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerPropertiesDevice::pathChanged\n"; kdDebugTime() << " Path " << path << "\n"; #endif - QString fullpath (path), slash ("/"); + TQString fullpath (path), slash ("/"); if ( ! path.startsWith (slash) ) fullpath.prepend (slash); bool enable = ! c_name -> text().isEmpty() && fullpath != slash && ! m_node -> nodeById (fullpath); @@ -156,7 +156,7 @@ void KPlayerPropertiesDevice::addDevice (void) #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerPropertiesDevice::addDevice\n"; #endif - QString fullpath (c_path -> text()), slash ("/"); + TQString fullpath (c_path -> text()), slash ("/"); if ( ! fullpath.startsWith (slash) ) fullpath.prepend (slash); KPlayerDeviceProperties* media = KPlayerMedia::deviceProperties (m_node -> url (fullpath)); @@ -172,13 +172,13 @@ void KPlayerPropertiesDevice::addDevice (void) else if ( index == 3 && ! c_channel_file -> text().isEmpty() ) ((KPlayerTunerProperties*) media) -> setChannelList (c_channel_file -> text()); media -> commit(); - QStringList list; + TQStringList list; list.append (fullpath); m_node -> addedBranches (list); KPlayerMedia::release (media); } -KPlayerDeviceDialog::KPlayerDeviceDialog (QWidget* parent, const char* name) +KPlayerDeviceDialog::KPlayerDeviceDialog (TQWidget* parent, const char* name) : KDialogBase (parent, name, true, i18n("Add device"), Help | Ok | Cancel) { #ifdef DEBUG_KPLAYER_NODEVIEW @@ -204,7 +204,7 @@ void KPlayerListViewItem::initialize (void) update(); } -int KPlayerListViewItem::compare (QListViewItem* item, int, bool ascending) const +int KPlayerListViewItem::compare (TQListViewItem* item, int, bool ascending) const { int result = node() -> compare (nodeForItem (item)); return ascending ? result : - result; @@ -230,7 +230,7 @@ KPlayerListViewItem* KPlayerListViewItem::itemForNode (KPlayerNode* node) return 0; } -QString KPlayerListViewItem::icon (void) const +TQString KPlayerListViewItem::icon (void) const { return node() -> icon(); } @@ -251,10 +251,10 @@ void KPlayerListViewItem::update (void) kdDebugTime() << " URL " << node() -> url().url() << "\n"; #endif setPixmap (0, DesktopIcon (icon(), KIcon::SizeSmall)); - QStringList::ConstIterator iterator (nodeView() -> attributeNames().begin()); + TQStringList::ConstIterator iterator (nodeView() -> attributeNames().begin()); for ( int i = 0; iterator != nodeView() -> attributeNames().end(); ++ iterator, ++ i ) { - QString text (node() -> media() -> asString (*iterator)); + TQString text (node() -> media() -> asString (*iterator)); setText (nodeView() -> header() -> mapToSection (i), text); #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << " " << *iterator << " " << text << "\n"; @@ -262,7 +262,7 @@ void KPlayerListViewItem::update (void) } } -void KPlayerListViewItem::update (const QString& name) +void KPlayerListViewItem::update (const TQString& name) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerListViewItem::update\n"; @@ -271,7 +271,7 @@ void KPlayerListViewItem::update (const QString& name) int index = nodeView() -> attributeNames().findIndex (name); if ( index > 0 ) { - QString text (node() -> media() -> asString (name)); + TQString text (node() -> media() -> asString (name)); setText (nodeView() -> header() -> mapToSection (index), text); #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << " " << name << " " << text << "\n"; @@ -325,11 +325,11 @@ void KPlayerListViewFolderItem::initialize (void) void KPlayerListViewFolderItem::connectNodeCommon (void) { - QObject::connect (node(), SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), + TQObject::connect (node(), SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), nodeView(), SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); - QObject::connect (node(), SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), + TQObject::connect (node(), SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), nodeView(), SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); - QObject::connect (node(), SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), + TQObject::connect (node(), SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), nodeView(), SLOT (updated (KPlayerContainerNode*, KPlayerNode*))); } @@ -341,17 +341,17 @@ void KPlayerListViewFolderItem::connectNode (void) #endif connectNodeCommon(); if ( isOpen() ) - QObject::connect (node(), SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), + TQObject::connect (node(), SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), listView(), SLOT (updateAttributes (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&))); } void KPlayerListViewFolderItem::disconnectNodeCommon (void) { - QObject::disconnect (node(), SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), + TQObject::disconnect (node(), SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)), nodeView(), SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*))); - QObject::disconnect (node(), SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), + TQObject::disconnect (node(), SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)), nodeView(), SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&))); - QObject::disconnect (node(), SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), + TQObject::disconnect (node(), SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)), nodeView(), SLOT (updated (KPlayerContainerNode*, KPlayerNode*))); } @@ -362,7 +362,7 @@ void KPlayerListViewFolderItem::disconnectNode (void) kdDebugTime() << " URL " << node() -> url() << "\n"; #endif disconnectNodeCommon(); - QObject::disconnect (node(), SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), + TQObject::disconnect (node(), SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), listView(), SLOT (updateAttributes (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&))); } @@ -373,7 +373,7 @@ void KPlayerListViewFolderItem::populateNode (void) #endif node() -> populate(); listView() -> updateAttributes (node() -> attributeCounts(), KPlayerPropertyCounts()); - QObject::connect (node(), SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), + TQObject::connect (node(), SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), listView(), SLOT (updateAttributes (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&))); } @@ -382,7 +382,7 @@ void KPlayerListViewFolderItem::vacateNode (void) #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "Vacating list view folder item node\n"; #endif - QObject::disconnect (node(), SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), + TQObject::disconnect (node(), SIGNAL (attributesUpdated (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&)), listView(), SLOT (updateAttributes (const KPlayerPropertyCounts&, const KPlayerPropertyCounts&))); listView() -> updateAttributes (KPlayerPropertyCounts(), node() -> attributeCounts()); node() -> vacate(); @@ -398,7 +398,7 @@ void KPlayerListViewFolderItem::resetCustomOrder (void) if ( isOpen() && childCount() ) { node() -> setCustomOrder (false); - for ( QListViewItem* item = firstChild(); item; item = item -> nextSibling() ) + for ( TQListViewItem* item = firstChild(); item; item = item -> nextSibling() ) ((KPlayerListViewItem*) item) -> resetCustomOrder(); } } @@ -428,7 +428,7 @@ void KPlayerListViewFolderItem::setOpen (bool open) } } -QString KPlayerListViewFolderItem::icon (void) const +TQString KPlayerListViewFolderItem::icon (void) const { return isOpen() ? node() -> openIcon() : node() -> icon(); } @@ -536,7 +536,7 @@ KPlayerListViewFolderItem::~KPlayerListViewFolderItem() #endif } -int KPlayerTreeViewFolderItem::compare (QListViewItem* item, int, bool) const +int KPlayerTreeViewFolderItem::compare (TQListViewItem* item, int, bool) const { return node() -> compareByName (nodeForItem (item)); } @@ -600,7 +600,7 @@ KPlayerTreeViewFolderItem::~KPlayerTreeViewFolderItem() } KPlayerHistoryActionList::KPlayerHistoryActionList (KPlayerHistory& history, const KPlayerHistory::Iterator& current, - const QString& text, const QString& status, const QString& whatsthis, QObject* parent, const char* name) + const TQString& text, const TQString& status, const TQString& whatsthis, TQObject* parent, const char* name) : KPlayerActionList (text, status, whatsthis, parent, name), m_history (history), m_current (current) { #ifdef DEBUG_KPLAYER_ACTIONLIST @@ -668,7 +668,7 @@ void KPlayerHistoryActionList::actionActivated (KAction*, int index) } } -KPlayerNodeView::KPlayerNodeView (QWidget* parent, const char* name) +KPlayerNodeView::KPlayerNodeView (TQWidget* parent, const char* name) : KListView (parent, name) { #ifdef DEBUG_KPLAYER_NODEVIEW @@ -709,12 +709,12 @@ void KPlayerNodeView::initialize (void) //header() -> disconnect (SIGNAL (sectionClicked (int)), this); //header() -> disconnect (SIGNAL (sectionHandleDoubleClicked (int)), this); connect (this, SIGNAL (selectionChanged()), SLOT (itemSelectionChanged())); - connect (this, SIGNAL (executed (QListViewItem*)), SLOT (itemExecuted (QListViewItem*))); + connect (this, SIGNAL (executed (TQListViewItem*)), SLOT (itemExecuted (TQListViewItem*))); if ( library() -> popupMenu() ) - connect (this, SIGNAL (contextMenu (KListView*, QListViewItem*, const QPoint&)), - SLOT (showContextMenu (KListView*, QListViewItem*, const QPoint&))); - connect (this, SIGNAL (itemRenamed (QListViewItem*, const QString&, int)), - SLOT (edited (QListViewItem*, const QString&, int))); + connect (this, SIGNAL (contextMenu (KListView*, TQListViewItem*, const TQPoint&)), + SLOT (showContextMenu (KListView*, TQListViewItem*, const TQPoint&))); + connect (this, SIGNAL (itemRenamed (TQListViewItem*, const TQString&, int)), + SLOT (edited (TQListViewItem*, const TQString&, int))); header() -> installEventFilter (this); renameLineEdit() -> installEventFilter (this); } @@ -908,7 +908,7 @@ void KPlayerNodeView::update (KPlayerListViewItem*) { } -void KPlayerNodeView::startEditing (QListViewItem* item, int column) +void KPlayerNodeView::startEditing (TQListViewItem* item, int column) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerNodeView::startEditing\n"; @@ -924,7 +924,7 @@ void KPlayerNodeView::startEditing (QListViewItem* item, int column) if ( item -> itemBelow() ) ensureItemVisible (item -> itemBelow()); ensureItemVisible (item); - QRect rect (itemRect (item)); + TQRect rect (itemRect (item)); rect.moveLeft (0); #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << " ItemRect " << rect.x() << "x" << rect.y() << " " << rect.width() << "x" << rect.height() << "\n"; @@ -975,9 +975,9 @@ void KPlayerNodeView::stopEditing (bool save, int state) disconnect (this, SIGNAL(contentsMoving(int, int)), this, SLOT(moveLineEdit(int, int))); if ( renameLineEdit() -> isHidden() ) return; - QListViewItem* item = m_editing_item; - QKeyEvent keyevent (QEvent::KeyPress, save ? Qt::Key_Return : Qt::Key_Escape, 0, state); - QApplication::sendEvent (renameLineEdit(), &keyevent); + TQListViewItem* item = m_editing_item; + TQKeyEvent keyevent (TQEvent::KeyPress, save ? TQt::Key_Return : TQt::Key_Escape, 0, state); + TQApplication::sendEvent (renameLineEdit(), &keyevent); repaintItem (item); setItemsRenameable (false); m_editing_item = 0; @@ -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 - QTimer::singleShot (0, this, SLOT (moveLineEdit())); + TQTimer::singleShot (0, this, SLOT (moveLineEdit())); } void KPlayerNodeView::moveLineEdit (void) @@ -1012,7 +1012,7 @@ void KPlayerNodeView::moveLineEdit (void) #endif if ( m_editing_item ) { - QRect rect (itemRect (m_editing_item)); + TQRect rect (itemRect (m_editing_item)); int x = rect.x() - 1; int index = header() -> mapToIndex (m_editing_column); for ( int i = 0; i < index; i ++ ) @@ -1040,38 +1040,38 @@ void KPlayerNodeView::setColumnWidth (int column, int width) moveLineEdit(); } -bool KPlayerNodeView::eventFilter (QObject* object, QEvent* event) +bool KPlayerNodeView::eventFilter (TQObject* object, TQEvent* event) { static bool recursion = false, move_recursion = false; static bool firstcolumn = false, anothercolumn = false; - if ( object == header() && (event -> type() == QEvent::MouseButtonPress - || event -> type() == QEvent::MouseButtonRelease || event -> type() == QEvent::MouseMove) ) + if ( object == header() && (event -> type() == TQEvent::MouseButtonPress + || event -> type() == TQEvent::MouseButtonRelease || event -> type() == TQEvent::MouseMove) ) { - QMouseEvent* mouseevent = (QMouseEvent*) event; - const QPoint& position (mouseevent -> pos()); + TQMouseEvent* mouseevent = (TQMouseEvent*) event; + const TQPoint& position (mouseevent -> pos()); int section = header() -> sectionAt (position.x() + header() -> offset()); #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerNodeView::eventFilter mouse move " << position.x() << "x" << position.y() << " offset " << header() -> offset() << " section " << section << "\n"; #endif - if ( (mouseevent -> stateAfter() & Qt::LeftButton) == Qt::LeftButton ) + if ( (mouseevent -> stateAfter() & TQt::LeftButton) == TQt::LeftButton ) { - if ( event -> type() == QEvent::MouseButtonPress ) + if ( event -> type() == TQEvent::MouseButtonPress ) (section == 0 ? firstcolumn : anothercolumn) = true; - else if ( event -> type() == QEvent::MouseMove && (firstcolumn || anothercolumn && section <= 0) ) + else if ( event -> type() == TQEvent::MouseMove && (firstcolumn || anothercolumn && section <= 0) ) return true; } else { - //if ( event -> type() == QEvent::MouseButtonRelease && (firstcolumn && section || anothercolumn && section <= 0) ) + //if ( event -> type() == TQEvent::MouseButtonRelease && (firstcolumn && section || anothercolumn && section <= 0) ) // return true; firstcolumn = anothercolumn = false; } } - else if ( ! move_recursion && m_editing_item && object == renameLineEdit() && event -> type() == QEvent::Move ) + else if ( ! move_recursion && m_editing_item && object == renameLineEdit() && event -> type() == TQEvent::Move ) { #ifdef DEBUG_KPLAYER_NODEVIEW - QMoveEvent* moveevent = (QMoveEvent*) event; + TQMoveEvent* moveevent = (TQMoveEvent*) event; kdDebugTime() << "KPlayerNodeView::eventFilter move " << moveevent -> oldPos().x() << "x" << moveevent -> oldPos().y() << " => " << moveevent -> pos().x() << "x" << moveevent -> pos().y() << " " << event -> spontaneous() << "\n"; #endif @@ -1080,18 +1080,18 @@ bool KPlayerNodeView::eventFilter (QObject* object, QEvent* event) move_recursion = false; } else if ( ! recursion && m_editing_item && object == renameLineEdit() - && (event -> type() == QEvent::KeyPress || event -> type() == QEvent::AccelOverride) ) + && (event -> type() == TQEvent::KeyPress || event -> type() == TQEvent::AccelOverride) ) { - QKeyEvent* keyevent = (QKeyEvent*) event; + TQKeyEvent* keyevent = (TQKeyEvent*) event; int key = keyevent -> key(); int state = keyevent -> state(); #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerNodeView::eventFilter " << event -> type() << " " << key << " " << state << "\n"; #endif - if ( event -> type() == QEvent::AccelOverride ) + if ( event -> type() == TQEvent::AccelOverride ) { - if ( key == Qt::Key_Return || key == Qt::Key_Enter || key == Qt::Key_Escape - || key == Qt::Key_Tab || key == Qt::Key_Backtab || key == Qt::Key_Up || key == Qt::Key_Down ) + if ( key == TQt::Key_Return || key == TQt::Key_Enter || key == TQt::Key_Escape + || key == TQt::Key_Tab || key == TQt::Key_Backtab || key == TQt::Key_Up || key == TQt::Key_Down ) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << " override\n"; @@ -1100,23 +1100,23 @@ bool KPlayerNodeView::eventFilter (QObject* object, QEvent* event) return true; } } - else if ( key == Qt::Key_Return || key == Qt::Key_Enter ) + else if ( key == TQt::Key_Return || key == TQt::Key_Enter ) { recursion = true; stopEditing (true, state); recursion = false; return true; } - else if ( key == Qt::Key_Escape ) + else if ( key == TQt::Key_Escape ) { recursion = true; stopEditing (false, state); recursion = false; return true; } - else if ( key == Qt::Key_Tab || key == Qt::Key_Backtab ) + else if ( key == TQt::Key_Tab || key == TQt::Key_Backtab ) { - if ( (state & (Qt::AltButton | Qt::ControlButton | Qt::MetaButton)) == 0 ) + if ( (state & (TQt::AltButton | TQt::ControlButton | TQt::MetaButton)) == 0 ) { KPlayerListViewItem* item = m_editing_item; int column = m_editing_column; @@ -1136,7 +1136,7 @@ bool KPlayerNodeView::eventFilter (QObject* object, QEvent* event) { bool edit = false; bool container = item -> node() -> isContainer(); - bool tab = key == Qt::Key_Tab && (state & Qt::ShiftButton) == 0; + bool tab = key == TQt::Key_Tab && (state & TQt::ShiftButton) == 0; do { while ( ! edit && (container ? column != 0 : tab ? column < attributeCount() - 1 : column > 0) ) @@ -1180,12 +1180,12 @@ bool KPlayerNodeView::eventFilter (QObject* object, QEvent* event) } return true; } - else if ( key == Qt::Key_Up || key == Qt::Key_Down ) + else if ( key == TQt::Key_Up || key == TQt::Key_Down ) { #ifdef DEBUG_KPLAYER_NODEVIEW - kdDebugTime() << "KPlayerNodeView::eventFilter " << (key == Qt::Key_Up ? "Up" : "Down") << "\n"; + kdDebugTime() << "KPlayerNodeView::eventFilter " << (key == TQt::Key_Up ? "Up" : "Down") << "\n"; #endif - if ( (state & (Qt::AltButton | Qt::ControlButton | Qt::MetaButton)) == 0 ) + if ( (state & (TQt::AltButton | TQt::ControlButton | TQt::MetaButton)) == 0 ) { KPlayerListViewItem* item = m_editing_item; int column = m_editing_column; @@ -1203,7 +1203,7 @@ bool KPlayerNodeView::eventFilter (QObject* object, QEvent* event) #endif if ( index >= 0 ) { - bool up = key == Qt::Key_Up; + bool up = key == TQt::Key_Up; do item = up ? (KPlayerListViewItem*) item -> itemAbove() : (KPlayerListViewItem*) item -> itemBelow(); while ( item && (index ? item -> node() -> isContainer() : ! item -> node() -> canRename()) ); @@ -1222,12 +1222,12 @@ bool KPlayerNodeView::eventFilter (QObject* object, QEvent* event) return KListView::eventFilter (object, event); } -void KPlayerNodeView::findDropTarget (const QPoint& pos, QListViewItem*& parent, QListViewItem*& after) +void KPlayerNodeView::findDropTarget (const TQPoint& pos, TQListViewItem*& parent, TQListViewItem*& after) { parent = after = 0; if ( ! firstChild() ) return; - QPoint p (contentsToViewport (pos)); + TQPoint p (contentsToViewport (pos)); KPlayerListViewItem* item = (KPlayerListViewItem*) itemAt (p); KPlayerNode* node = item ? item -> node() : rootNode(); KPlayerContainerNode* container = node -> isContainer() ? (KPlayerContainerNode*) node : node -> parent(); @@ -1266,7 +1266,7 @@ void KPlayerNodeView::findDropTarget (const QPoint& pos, QListViewItem*& parent, after = item; return; } - QListViewItem* last = item; + TQListViewItem* last = item; above = (KPlayerListViewItem*) item -> parent(); while ( above && ! last -> nextSibling() && p.x() < depthToPixels (last -> depth()) ) { @@ -1279,7 +1279,7 @@ void KPlayerNodeView::findDropTarget (const QPoint& pos, QListViewItem*& parent, parent = item ? item -> parent() : 0; } -void KPlayerNodeView::findDrop (const QPoint& pos, QListViewItem*& parent, QListViewItem*& after) +void KPlayerNodeView::findDrop (const TQPoint& pos, TQListViewItem*& parent, TQListViewItem*& after) { findDropTarget (pos, parent, after); #ifdef DEBUG_KPLAYER_NODEVIEW @@ -1293,9 +1293,9 @@ void KPlayerNodeView::findDrop (const QPoint& pos, QListViewItem*& parent, QList after = 0; } -extern QDragManager* qt_dnd_manager; +extern TQDragManager* qt_dnd_manager; -bool KPlayerNodeView::acceptDrag (QDropEvent* event) const +bool KPlayerNodeView::acceptDrag (TQDropEvent* event) const { if ( event -> pos().x() < 0 || event -> pos().y() < 0 ) return false; @@ -1306,7 +1306,7 @@ bool KPlayerNodeView::acceptDrag (QDropEvent* event) const event -> accept (false); event -> acceptAction (false); KPlayerNodeView* that = (KPlayerNodeView*) this; - QListViewItem *parent, *after; + TQListViewItem *parent, *after; that -> findDropTarget (event -> pos(), parent, after); #ifdef DEBUG_KPLAYER_NODEVIEW if ( parent ) @@ -1356,8 +1356,8 @@ bool KPlayerNodeView::acceptDrag (QDropEvent* event) const shift = true; else control = true; - int state = (kPlayerSettings() -> anyShift() ? Qt::ShiftButton : 0) - | (kPlayerSettings() -> anyControl() ? Qt::ControlButton : 0); + int state = (kPlayerSettings() -> anyShift() ? TQt::ShiftButton : 0) + | (kPlayerSettings() -> anyControl() ? TQt::ControlButton : 0); #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << " Accept " << event -> isAccepted() << "\n"; kdDebugTime() << " Action " << event -> isActionAccepted() << "\n"; @@ -1369,29 +1369,29 @@ bool KPlayerNodeView::acceptDrag (QDropEvent* event) const if ( control && ! kPlayerSettings() -> anyControl() ) { kPlayerSettings() -> setFakeControl(); - QApplication::postEvent (that, new QKeyEvent (QEvent::KeyPress, Qt::Key_Control, 0, state)); + TQApplication::postEvent (that, new TQKeyEvent (TQEvent::KeyPress, TQt::Key_Control, 0, state)); } else if ( ! control && kPlayerSettings() -> anyControl() ) { kPlayerSettings() -> setNoControl(); - QApplication::postEvent (that, new QKeyEvent (QEvent::KeyRelease, Qt::Key_Control, 0, state)); + TQApplication::postEvent (that, new TQKeyEvent (TQEvent::KeyRelease, TQt::Key_Control, 0, state)); } if ( shift && ! kPlayerSettings() -> anyShift() ) { kPlayerSettings() -> setFakeShift(); - QApplication::postEvent (that, new QKeyEvent (QEvent::KeyPress, Qt::Key_Shift, 0, state)); + TQApplication::postEvent (that, new TQKeyEvent (TQEvent::KeyPress, TQt::Key_Shift, 0, state)); } else if ( ! shift && kPlayerSettings() -> anyShift() ) { kPlayerSettings() -> setNoShift(); - QApplication::postEvent (that, new QKeyEvent (QEvent::KeyRelease, Qt::Key_Shift, 0, state)); + TQApplication::postEvent (that, new TQKeyEvent (TQEvent::KeyRelease, TQt::Key_Shift, 0, state)); } if ( kPlayerSettings() -> anyControl() && kPlayerSettings() -> anyShift() ) - event -> setAction (QDropEvent::Link); + event -> setAction (TQDropEvent::Link); else if ( kPlayerSettings() -> anyControl() ) - event -> setAction (QDropEvent::Copy); + event -> setAction (TQDropEvent::Copy); else if ( kPlayerSettings() -> anyShift() ) - event -> setAction (QDropEvent::Move); + event -> setAction (TQDropEvent::Move); event -> acceptAction(); qt_dnd_manager -> killTimers(); return true; @@ -1406,7 +1406,7 @@ bool KPlayerNodeView::acceptDrag (QDropEvent* event) const return false; } -void KPlayerNodeView::contentsDragMoveEvent (QDragMoveEvent* event) +void KPlayerNodeView::contentsDragMoveEvent (TQDragMoveEvent* event) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerNodeView::contentsDragMoveEvent\n"; @@ -1414,11 +1414,11 @@ void KPlayerNodeView::contentsDragMoveEvent (QDragMoveEvent* event) //if ( acceptDrag (event) ) KListView::contentsDragMoveEvent (event); if ( event -> isAccepted() ) - event -> accept (QRect (QCursor::pos(), QCursor::pos())); + event -> accept (TQRect (TQCursor::pos(), TQCursor::pos())); qt_dnd_manager -> killTimers(); } -void KPlayerNodeView::contentsDragEnterEvent (QDragEnterEvent* event) +void KPlayerNodeView::contentsDragEnterEvent (TQDragEnterEvent* event) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerNodeView::contentsDragEnterEvent\n"; @@ -1431,7 +1431,7 @@ void KPlayerNodeView::contentsDragEnterEvent (QDragEnterEvent* event) KListView::contentsDragEnterEvent (event); } -void KPlayerNodeView::contentsDragLeaveEvent (QDragLeaveEvent* event) +void KPlayerNodeView::contentsDragLeaveEvent (TQDragLeaveEvent* event) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerNodeView::contentsDragLeaveEvent\n"; @@ -1443,7 +1443,7 @@ void KPlayerNodeView::contentsDragLeaveEvent (QDragLeaveEvent* event) KListView::contentsDragLeaveEvent (event); } -void KPlayerNodeView::contentsDropEvent (QDropEvent* event) +void KPlayerNodeView::contentsDropEvent (TQDropEvent* event) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerNodeView::contentsDropEvent\n"; @@ -1453,7 +1453,7 @@ void KPlayerNodeView::contentsDropEvent (QDropEvent* event) #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << " Drag accepted\n"; #endif - QListViewItem *parent = 0, *after = 0; + TQListViewItem *parent = 0, *after = 0; findDropTarget (event -> pos(), parent, after); #ifdef DEBUG_KPLAYER_NODEVIEW if ( parent ) @@ -1474,17 +1474,17 @@ void KPlayerNodeView::contentsDropEvent (QDropEvent* event) if ( after ) setNodeOrder (target); KPlayerNode* node = after ? ((KPlayerListViewItem*) after) -> node() : 0; - if ( event -> isActionAccepted() && event -> action() == QDropEvent::Move ) + if ( event -> isActionAccepted() && event -> action() == TQDropEvent::Move ) { m_moving = own && ! urldrag; target -> move (nodes, node); m_moving = false; } else - target -> add (nodes, event -> isActionAccepted() && event -> action() == QDropEvent::Link, node); + target -> add (nodes, event -> isActionAccepted() && event -> action() == TQDropEvent::Link, node); } } - event -> setPoint (QPoint (-1, -1)); + event -> setPoint (TQPoint (-1, -1)); KListView::contentsDropEvent (event); m_drag_node_list.releaseAll(); m_drag_node_list.clear(); @@ -1493,19 +1493,19 @@ void KPlayerNodeView::contentsDropEvent (QDropEvent* event) m_mouse_pressed = false; } -bool KPlayerNodeView::event (QEvent* e) +bool KPlayerNodeView::event (TQEvent* e) { - if ( e -> type() == QEvent::AccelOverride ) + if ( e -> type() == TQEvent::AccelOverride ) { - QKeyEvent* keyevent = (QKeyEvent*) e; + TQKeyEvent* keyevent = (TQKeyEvent*) e; int key = keyevent -> key(); int state = keyevent -> state(); #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerNodeView::event AccelOverride " << key << " " << state << "\n"; #endif - if ( (state & Qt::ShiftButton) == Qt::ShiftButton && (key == Qt::Key_Left || key == Qt::Key_Right) - || (state & Qt::ControlButton) == Qt::ControlButton - && (key == Qt::Key_Up || key == Qt::Key_Down || key == Qt::Key_A) ) + if ( (state & TQt::ShiftButton) == TQt::ShiftButton && (key == TQt::Key_Left || key == TQt::Key_Right) + || (state & TQt::ControlButton) == TQt::ControlButton + && (key == TQt::Key_Up || key == TQt::Key_Down || key == TQt::Key_A) ) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << " override\n"; @@ -1517,14 +1517,14 @@ bool KPlayerNodeView::event (QEvent* e) return KListView::event (e); } -void KPlayerNodeView::keyPressEvent (QKeyEvent* keyevent) +void KPlayerNodeView::keyPressEvent (TQKeyEvent* keyevent) { int key = keyevent -> key(); int state = keyevent -> state(); #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerNodeView::keyPressEvent " << key << " " << state << "\n"; #endif - if ( currentItem() && state == 0 && (key == Qt::Key_Return || key == Qt::Key_Enter) ) + if ( currentItem() && state == 0 && (key == TQt::Key_Return || key == TQt::Key_Enter) ) { if ( ! activeNode() -> isContainer() ) play(); @@ -1574,7 +1574,7 @@ void KPlayerNodeView::connectActions (void) connect (action ("library_go_to_origin"), SIGNAL(activated()), SLOT(goToOrigin())); } -void KPlayerNodeView::showContextMenu (KListView*, QListViewItem*, const QPoint& point) +void KPlayerNodeView::showContextMenu (KListView*, TQListViewItem*, const TQPoint& point) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "Showing node view popup menu\n"; @@ -1592,7 +1592,7 @@ void KPlayerNodeView::showContextMenu (KListView*, QListViewItem*, const QPoint& #endif } -void KPlayerNodeView::focusInEvent (QFocusEvent* event) +void KPlayerNodeView::focusInEvent (TQFocusEvent* event) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "List view getting focus\n"; @@ -1607,7 +1607,7 @@ void KPlayerNodeView::focusInEvent (QFocusEvent* event) library() -> setLastActiveView (this); } -void KPlayerNodeView::focusOutEvent (QFocusEvent* event) +void KPlayerNodeView::focusOutEvent (TQFocusEvent* event) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "List view loosing focus\n"; @@ -1619,7 +1619,7 @@ void KPlayerNodeView::focusOutEvent (QFocusEvent* event) m_in_focus = false; } -void KPlayerNodeView::contentsMousePressEvent (QMouseEvent* e) +void KPlayerNodeView::contentsMousePressEvent (TQMouseEvent* e) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerNodeView::contentsMousePressEvent enter\n"; @@ -1627,7 +1627,7 @@ void KPlayerNodeView::contentsMousePressEvent (QMouseEvent* e) kdDebugTime() << " State " << e -> stateAfter() << "\n"; #endif m_mouse_pressed = true; - m_popup_menu_shown = e -> button() == Qt::RightButton; + m_popup_menu_shown = e -> button() == TQt::RightButton; m_last_node = currentNode(); KListView::contentsMousePressEvent (e); #ifdef DEBUG_KPLAYER_NODEVIEW @@ -1635,7 +1635,7 @@ void KPlayerNodeView::contentsMousePressEvent (QMouseEvent* e) #endif } -void KPlayerNodeView::contentsMouseReleaseEvent (QMouseEvent* e) +void KPlayerNodeView::contentsMouseReleaseEvent (TQMouseEvent* e) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerNodeView::contentsMouseReleaseEvent enter\n"; @@ -1643,7 +1643,7 @@ void KPlayerNodeView::contentsMouseReleaseEvent (QMouseEvent* e) kdDebugTime() << " State " << e -> stateAfter() << "\n"; #endif KListView::contentsMouseReleaseEvent (e); - m_mouse_pressed = (e -> stateAfter() & Qt::MouseButtonMask) != Qt::NoButton; + m_mouse_pressed = (e -> stateAfter() & TQt::MouseButtonMask) != TQt::NoButton; if ( ! m_mouse_pressed && ! m_popup_menu_shown ) { if ( m_dragging ) @@ -1659,7 +1659,7 @@ void KPlayerNodeView::contentsMouseReleaseEvent (QMouseEvent* e) #endif } -void KPlayerNodeView::itemExecuted (QListViewItem* item) +void KPlayerNodeView::itemExecuted (TQListViewItem* item) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "Item executed\n"; @@ -1706,7 +1706,7 @@ void KPlayerNodeView::activeItemChanged (void) #endif } -void KPlayerNodeView::itemTerminating (QListViewItem* item) +void KPlayerNodeView::itemTerminating (TQListViewItem* item) { if ( item == m_editing_item ) stopEditing(); @@ -1714,9 +1714,9 @@ void KPlayerNodeView::itemTerminating (QListViewItem* item) m_last_item = 0; } -void KPlayerNodeView::keepUpCurrentItem (QListViewItem* current, QListViewItem* item) +void KPlayerNodeView::keepUpCurrentItem (TQListViewItem* current, TQListViewItem* item) { - QListViewItem* lvi = currentItem(); + TQListViewItem* lvi = currentItem(); if ( lvi != current ) { while ( lvi && lvi != item ) @@ -1729,12 +1729,12 @@ void KPlayerNodeView::keepUpCurrentItem (QListViewItem* current, QListViewItem* kdDebugTime() << " Current " << current -> text (0) << "\n"; #endif setCurrentItem (current); - QTimer::singleShot (0, treeView(), SLOT (activateCurrentItem())); + TQTimer::singleShot (0, treeView(), SLOT (activateCurrentItem())); } } } -void KPlayerNodeView::setOpen (QListViewItem* item, bool open) +void KPlayerNodeView::setOpen (TQListViewItem* item, bool open) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerNodeView::setOpen " << open << "\n"; @@ -1810,9 +1810,9 @@ void KPlayerNodeView::addGroup (void) else { KPlayerNodeNameValidator validator (container); - QString name = KInputDialog::text (container -> isPlaylist() ? i18n("Add playlist") : i18n("Add folder"), + TQString name = KInputDialog::text (container -> isPlaylist() ? i18n("Add playlist") : i18n("Add folder"), container -> isPlaylist() ? i18n("Playlist name") : i18n("Folder name"), - QString::null, 0, 0, 0, &validator, QString::null, + TQString::null, 0, 0, 0, &validator, TQString::null, i18n("Folder name field allows you to enter a name for a new folder. OK button will be enabled when you enter a unique and valid name.")); if ( ! name.isNull() ) container -> addBranch (name); @@ -1857,8 +1857,8 @@ KPlayerContainerNode* KPlayerNodeView::addToNewPlaylist (const KPlayerNodeList& #endif KPlayerContainerNode* container = playlistActionList() -> node(); KPlayerNodeNameValidator validator (container); - QString name = KInputDialog::text (i18n("Add to new playlist"), i18n("Playlist name"), - QString::null, 0, 0, 0, &validator, QString::null, + TQString name = KInputDialog::text (i18n("Add to new playlist"), i18n("Playlist name"), + TQString::null, 0, 0, 0, &validator, TQString::null, i18n("Playlist name field allows you to enter a name for a new playlist. OK button will be enabled when you enter a unique and valid name.")); if ( ! name.isNull() ) { @@ -1978,7 +1978,7 @@ void KPlayerNodeView::editName (void) } } -void KPlayerNodeView::edited (QListViewItem* item, const QString& value, int column) +void KPlayerNodeView::edited (TQListViewItem* item, const TQString& value, int column) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerNodeView::edited column " << column << " to '" << value << "'\n"; @@ -1986,7 +1986,7 @@ void KPlayerNodeView::edited (QListViewItem* item, const QString& value, int col int index = header() -> mapToIndex (column); if ( index >= 0 && index < attributeCount() ) { - const QString& name (attributeNames() [index]); + const TQString& name (attributeNames() [index]); #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << " Column " << name << " " << index << "\n"; #endif @@ -2013,7 +2013,7 @@ void KPlayerNodeView::properties (void) dialog = KPlayerPropertiesDialog::createDialog ((KPlayerTrackProperties*) node -> media()); else { - const QString& type = ((KPlayerDeviceProperties*) node -> media()) -> type(); + const TQString& type = ((KPlayerDeviceProperties*) node -> media()) -> type(); if ( type == "TV" ) dialog = new KPlayerTVDevicePropertiesDialog; else if ( type == "DVB" ) @@ -2151,7 +2151,7 @@ KPlayerPlaylist* KPlayerNodeView::playlist (void) return ((KPlayer*) kapp -> mainWidget()) -> playlist(); } -KPlayerListView::KPlayerListView (QWidget* parent, const char* name) +KPlayerListView::KPlayerListView (TQWidget* parent, const char* name) : KPlayerNodeView (parent, name) { #ifdef DEBUG_KPLAYER_NODEVIEW @@ -2160,10 +2160,10 @@ KPlayerListView::KPlayerListView (QWidget* parent, const char* name) config() -> setGroup ("Multimedia Library"); m_attribute_order = config() -> hasKey ("Column Order") ? config() -> readListEntry ("Column Order") : KPlayerMedia::defaultOrder(); - QStringList::ConstIterator iterator (attributeOrder().begin()); + TQStringList::ConstIterator iterator (attributeOrder().begin()); while ( iterator != attributeOrder().end() ) { - const QString& name (*iterator); + const TQString& name (*iterator); if ( ! name.isEmpty() && config() -> hasKey ("Show Column " + name) ) KPlayerMedia::info (name) -> setShow (config() -> readBoolEntry ("Show Column " + name)); ++ iterator; @@ -2183,12 +2183,12 @@ void KPlayerListView::initialize (void) kdDebugTime() << "Initializing list view\n"; #endif KPlayerNodeView::initialize(); - setSelectionMode (QListView::Extended); + 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))); resize (2000, height()); - m_home_media = KPlayerNode::root() -> nodeById ("file:" + QDir::homeDirPath()) -> media(); + m_home_media = KPlayerNode::root() -> nodeById ("file:" + TQDir::homeDirPath()) -> media(); } void KPlayerListView::terminate (void) @@ -2204,7 +2204,7 @@ void KPlayerListView::terminate (void) KPlayerPropertyInfoMap::ConstIterator iterator (KPlayerMedia::info().begin()); while ( iterator != KPlayerMedia::info().end() ) { - const QString& name (iterator.key()); + const TQString& name (iterator.key()); KPlayerPropertyInfo* info = iterator.data(); if ( info -> show() == info -> showByDefault() ) config() -> deleteEntry ("Show Column " + name); @@ -2264,7 +2264,7 @@ void KPlayerListView::disconnectNode (void) bool KPlayerListView::showingMedia (void) const { - for ( QListViewItem* item = firstChild(); item; item = item -> itemBelow() ) + for ( TQListViewItem* item = firstChild(); item; item = item -> itemBelow() ) if ( nodeForItem (item) -> hasProperties() ) return true; return false; @@ -2275,7 +2275,7 @@ void KPlayerListView::updateActions (void) #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "Updating list view actions\n"; #endif - QListViewItemIterator iterator (this, QListViewItemIterator::Selected); + TQListViewItemIterator iterator (this, TQListViewItemIterator::Selected); bool selection = iterator.current() != 0; KPlayerNode* node = activeNode(); KPlayerContainerNode* container = activeContainer(); @@ -2368,7 +2368,7 @@ void KPlayerListView::toggleColumn (int index) kdDebugTime() << "KPlayerListView::toggleColumn\n"; kdDebugTime() << " Index " << index << "\n"; #endif - const QString& name (availableAttributes() [index]); + const TQString& name (availableAttributes() [index]); #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << " Name " << name << "\n"; #endif @@ -2380,7 +2380,7 @@ void KPlayerListView::toggleColumn (int index) if ( info -> show() ) { index = setupColumn (name); - for ( QListViewItem* item = firstChild(); item; item = item -> itemBelow() ) + for ( TQListViewItem* item = firstChild(); item; item = item -> itemBelow() ) ((KPlayerListViewItem*) item) -> update (name); loadColumnWidth (index); if ( index == columns() - 1 ) @@ -2397,7 +2397,7 @@ void KPlayerListView::editField (int index) kdDebugTime() << "KPlayerListView::editField\n"; kdDebugTime() << " Index " << index << "\n"; #endif - const QString& name (editableAttributes() [index]); + const TQString& name (editableAttributes() [index]); #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << " Name " << name << "\n"; #endif @@ -2455,18 +2455,18 @@ void KPlayerListView::updateAttributes (const KPlayerPropertyCounts& added, cons KPlayerPropertyCounts::ConstIterator it = attributeCounts().begin(); while ( it != attributeCounts().end() ) { - const QString& name (it.key()); + const TQString& name (it.key()); if ( KPlayerMedia::info (name) -> canShow() && ! attributeOrder().contains (name) ) m_attribute_order.insert (m_attribute_order.find (""), name); ++ it; } - QStringList::ConstIterator iterator (attributeOrder().begin()); + TQStringList::ConstIterator iterator (attributeOrder().begin()); if ( columns() == 0 ) setupColumn (*iterator); ++ iterator; while ( iterator != attributeOrder().end() ) { - const QString& name (*iterator); + const TQString& name (*iterator); if ( ! name.isEmpty() ) { KPlayerPropertyInfo* info = KPlayerMedia::info (name); @@ -2501,15 +2501,15 @@ void KPlayerListView::updateAttributes (const KPlayerPropertyCounts& added, cons sibling() -> updateActions(); } -void KPlayerListView::insertAttribute (QStringList& list, const QString& name) +void KPlayerListView::insertAttribute (TQStringList& list, const TQString& name) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerListView::insertAttribute\n"; kdDebugTime() << " Name " << name << "\n"; #endif list.remove (name); - QStringList::ConstIterator iterator (attributeOrder().begin()); - QStringList::Iterator it (list.begin()); + TQStringList::ConstIterator iterator (attributeOrder().begin()); + TQStringList::Iterator it (list.begin()); while ( it != list.end() && iterator != attributeOrder().end() && *iterator != name ) { if ( *it == *iterator ) @@ -2529,14 +2529,14 @@ void KPlayerListView::headerIndexChange (int section, int from, int to) #endif if ( from == to || from == 0 || to == 0 ) return; - QString name (attributeNames() [from]); - QString after (attributeNames() [from < to ? to : to - 1]); + TQString name (attributeNames() [from]); + TQString after (attributeNames() [from < to ? to : to - 1]); #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << " Name " << name << "\n"; kdDebugTime() << " After " << after << "\n"; #endif m_attribute_order.remove (name); - QStringList::Iterator iterator (m_attribute_order.find (after)); + TQStringList::Iterator iterator (m_attribute_order.find (after)); ++ iterator; m_attribute_order.insert (iterator, name); insertAttribute (m_attribute_names, name); @@ -2554,7 +2554,7 @@ void KPlayerListView::headerIndexChange (int section, int from, int to) KPlayerNodeList KPlayerListView::getSelectedNodes (void) const { KPlayerNodeList list; - for ( QListViewItem* item = firstChild(); item; item = item -> nextSibling() ) + for ( TQListViewItem* item = firstChild(); item; item = item -> nextSibling() ) if ( item -> isSelected() ) list.append (nodeForItem (item)); else @@ -2562,7 +2562,7 @@ KPlayerNodeList KPlayerListView::getSelectedNodes (void) const return list; } -void KPlayerListView::getSelectedNodes (QListViewItem* item, KPlayerNodeList& list) const +void KPlayerListView::getSelectedNodes (TQListViewItem* item, KPlayerNodeList& list) const { for ( item = item -> firstChild(); item; item = item -> nextSibling() ) if ( item -> isSelected() ) @@ -2585,20 +2585,20 @@ void KPlayerListView::setSorting (int column, bool ascending) #endif if ( index >= 0 ) { - const QString& name (attributeNames() [index]); + const TQString& name (attributeNames() [index]); config() -> setGroup ("Multimedia Library"); config() -> writeEntry ("Sort Column", name); config() -> writeEntry ("Sort Ascending", ascending); KPlayerNode::setSorting (name, ascending); rootNode() -> setCustomOrder (false); - for ( QListViewItem* item = firstChild(); item; item = item -> nextSibling() ) + for ( TQListViewItem* item = firstChild(); item; item = item -> nextSibling() ) ((KPlayerListViewItem*) item) -> resetCustomOrder(); } } KPlayerNodeView::setSorting (column, ascending); } -void KPlayerListView::cleanupColumn (const QString& name) +void KPlayerListView::cleanupColumn (const TQString& name) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerListView::cleanupColumn\n"; @@ -2615,14 +2615,14 @@ void KPlayerListView::cleanupColumn (const QString& name) } } -int KPlayerListView::setupColumn (const QString& name) +int KPlayerListView::setupColumn (const TQString& name) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerListView::setupColumn\n"; #endif insertAttribute (m_attribute_names, name); int index = attributeNames().findIndex (name); - const QString& caption (KPlayerMedia::info (name) -> caption()); + const TQString& caption (KPlayerMedia::info (name) -> caption()); int section = addColumn (caption.isEmpty() ? i18n(name.utf8()) : caption); #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << " +" << name << " " << index << "/" << section << "\n"; @@ -2639,7 +2639,7 @@ void KPlayerListView::loadColumnWidth (int index) kdDebugTime() << " Index " << index << "\n"; #endif int column = header() -> mapToSection (index); - const QString& name (attributeNames() [index]); + const TQString& name (attributeNames() [index]); config() -> setGroup ("Multimedia Library"); int width = config() -> readNumEntry ("Column " + name + " Width"); if ( width <= 0 && index == 0 ) @@ -2650,7 +2650,7 @@ void KPlayerListView::loadColumnWidth (int index) kdDebugTime() << " Width " << width << "\n"; #endif header() -> setStretchEnabled (false, index); - setColumnWidthMode (column, QListView::Manual); + setColumnWidthMode (column, TQListView::Manual); if ( width <= 0 ) adjustColumn (column); else @@ -2696,7 +2696,7 @@ void KPlayerListView::adjustLastColumn (void) } if ( ! horizontalScrollBar() -> isVisible() ) { - setColumnWidthMode (section, QListView::Maximum); + setColumnWidthMode (section, TQListView::Maximum); #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << " Maximum mode index " << index << " section " << section << " mode " << columnWidthMode (section) << " stretch " << header() -> isStretchEnabled (index) @@ -2714,7 +2714,7 @@ void KPlayerListView::loadColumnWidths (void) kdDebugTime() << "KPlayerListView::loadColumnWidths\n"; #endif int index = 0; - QStringList::ConstIterator iterator (attributeNames().begin()); + TQStringList::ConstIterator iterator (attributeNames().begin()); while ( iterator != attributeNames().end() ) { loadColumnWidth (index); @@ -2723,7 +2723,7 @@ void KPlayerListView::loadColumnWidths (void) } //adjustLastColumn(); config() -> setGroup ("Multimedia Library"); - QString name (config() -> readEntry ("Sort Column")); + TQString name (config() -> readEntry ("Sort Column")); index = attributeNames().findIndex (name); bool ascending = config() -> readBoolEntry ("Sort Ascending", true); if ( index < 0 ) @@ -2742,7 +2742,7 @@ void KPlayerListView::saveColumnWidths (void) #endif int index = 0; config() -> setGroup ("Multimedia Library"); - QStringList::ConstIterator iterator (attributeNames().begin()); + TQStringList::ConstIterator iterator (attributeNames().begin()); //while ( (index < columns() - 1 || ! header() -> isStretchEnabled (index)) && iterator != attributeNames().end() ) while ( index < columns() && iterator != attributeNames().end() ) { @@ -2769,7 +2769,7 @@ void KPlayerListView::resizeContents (int width, int height) adjustLastColumn(); } -void KPlayerListView::viewportResizeEvent (QResizeEvent* event) +void KPlayerListView::viewportResizeEvent (TQResizeEvent* event) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerListView::viewportResizeEvent " << event -> size().width() << "x" << event -> size().height() << "\n"; @@ -2798,13 +2798,13 @@ void KPlayerListView::loadHistoryEntry (const KPlayerHistoryEntry& entry) node = KPlayerNode::root() -> getNodeByUrl (*iterator); if ( node ) { - QListViewItem* item = itemForNode (node); + TQListViewItem* item = itemForNode (node); if ( item ) item -> setOpen (true); } ++ iterator; } - QStringList::ConstIterator iditerator (entry.m_selected_ids.begin()); + TQStringList::ConstIterator iditerator (entry.m_selected_ids.begin()); iterator = entry.m_selected.begin(); while ( iterator != entry.m_selected.end() && iditerator != entry.m_selected_ids.end() ) { @@ -2814,7 +2814,7 @@ void KPlayerListView::loadHistoryEntry (const KPlayerHistoryEntry& entry) node = container -> nodeById (*iditerator); if ( node ) { - QListViewItem* item = itemForNode (node); + TQListViewItem* item = itemForNode (node); if ( item ) item -> setSelected (true); } @@ -2830,7 +2830,7 @@ void KPlayerListView::loadHistoryEntry (const KPlayerHistoryEntry& entry) node = container -> nodeById (entry.m_current_id); if ( node ) { - QListViewItem* item = itemForNode (node); + TQListViewItem* item = itemForNode (node); if ( item ) setCurrentItem (item); } @@ -2860,7 +2860,7 @@ void KPlayerListView::saveHistoryEntry (KPlayerHistoryEntry& entry) const } item = (KPlayerListViewItem*) currentItem(); entry.m_current = item ? item -> node() -> parent() -> url() : KURL(); - entry.m_current_id = item ? item -> node() -> id() : QString::null; + entry.m_current_id = item ? item -> node() -> id() : TQString::null; entry.m_position.setX (contentsX()); entry.m_position.setY (contentsY()); #ifdef DEBUG_KPLAYER_NODEVIEW @@ -2878,7 +2878,7 @@ void KPlayerListView::headerSizeChange (int section, int, int) #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "Setting column " << attributeNames() [section] << " width mode to Manual\n"; #endif - setColumnWidthMode (section, QListView::Manual); + setColumnWidthMode (section, TQListView::Manual); } void KPlayerListView::headerAdjustColumn (int section) @@ -2887,10 +2887,10 @@ void KPlayerListView::headerAdjustColumn (int section) kdDebugTime() << "Setting column " << attributeNames() [section] << " width mode to Maximum\n"; #endif adjustColumn (section); - setColumnWidthMode (section, QListView::Maximum); + setColumnWidthMode (section, TQListView::Maximum); }*/ -KPlayerTreeView::KPlayerTreeView (QWidget* parent, const char* name) +KPlayerTreeView::KPlayerTreeView (TQWidget* parent, const char* name) : KPlayerNodeView (parent, name) { #ifdef DEBUG_KPLAYER_NODEVIEW @@ -2913,8 +2913,8 @@ void KPlayerTreeView::initialize (void) kdDebugTime() << "Initializing tree view\n"; #endif KPlayerNodeView::initialize(); - setAlternateBackground (QColor()); - setSelectionMode (QListView::Single); + setAlternateBackground (TQColor()); + setSelectionMode (TQListView::Single); header() -> hide(); setRootNode (KPlayerNode::root()); setSelected (firstChild(), true); @@ -2965,7 +2965,7 @@ void KPlayerTreeView::disconnectNode (void) disconnectNodeCommon(); } -void KPlayerTreeView::setOpen (QListViewItem* item, bool open) +void KPlayerTreeView::setOpen (TQListViewItem* item, bool open) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerTreeView::setOpen " << open << "\n"; @@ -3198,11 +3198,11 @@ KPlayerNodeList KPlayerTreeView::getSelectedNodes (void) const return list; } -bool KPlayerTreeView::event (QEvent* event) +bool KPlayerTreeView::event (TQEvent* event) { bool result = KPlayerNodeView::event (event); - if ( event -> type() == QEvent::ApplicationPaletteChange ) - setAlternateBackground (QColor()); + if ( event -> type() == TQEvent::ApplicationPaletteChange ) + setAlternateBackground (TQColor()); return result; } @@ -3224,10 +3224,10 @@ void KPlayerTreeView::setActiveNode (KPlayerContainerNode* node) #endif stopEditing(); sibling() -> stopEditing(); - QListViewItem* item = itemForNode (node, true); + TQListViewItem* item = itemForNode (node, true); if ( item ) { - QListViewItem* child = item -> firstChild(); + TQListViewItem* child = item -> firstChild(); if ( child ) { while ( child -> nextSibling() ) @@ -3286,7 +3286,7 @@ void KPlayerTreeView::popupMenuHidden (void) #endif m_popup_menu_shown = false; if ( currentItem() && activeNode() != currentNode() && renameLineEdit() -> isHidden() ) - QTimer::singleShot (0, this, SLOT (resetActiveNode())); + TQTimer::singleShot (0, this, SLOT (resetActiveNode())); } void KPlayerTreeView::resetActiveNode (void) @@ -3307,8 +3307,8 @@ void KPlayerTreeView::activateCurrentItem (void) setActiveNode (activeNode()); } -KPlayerLibrary::KPlayerLibrary (KActionCollection* ac, QWidget* parent, const char* name) - : QSplitter (parent, name) +KPlayerLibrary::KPlayerLibrary (KActionCollection* ac, TQWidget* parent, const char* name) + : TQSplitter (parent, name) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "Creating library\n"; @@ -3388,13 +3388,13 @@ KPlayerLibrary::KPlayerLibrary (KActionCollection* ac, QWidget* parent, const ch 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); - setResizeMode (treeView(), QSplitter::KeepSize); + setResizeMode (treeView(), TQSplitter::KeepSize); m_list = new KPlayerListView (this); config() -> setGroup ("Multimedia Library"); int width = config() -> readNumEntry ("Tree View Width"); if ( width ) { - QValueList sizes; + TQValueList sizes; sizes.append (width); setSizes (sizes); } @@ -3418,7 +3418,7 @@ KPlayerLibrary::~KPlayerLibrary() #endif } -void KPlayerLibrary::initialize (QPopupMenu* menu) +void KPlayerLibrary::initialize (TQPopupMenu* menu) { #ifdef DEBUG_KPLAYER_NODEVIEW kdDebugTime() << "KPlayerLibrary::initialize\n"; @@ -3549,12 +3549,12 @@ void KPlayerLibrary::editPlaylist (void) open (treeView() -> playlist() -> nowplaying()); } -KPlayerLibraryWindow::KPlayerLibraryWindow (KActionCollection* ac, QWidget* parent, const char* name) - : QDockWindow (parent, name) +KPlayerLibraryWindow::KPlayerLibraryWindow (KActionCollection* ac, TQWidget* parent, const char* name) + : TQDockWindow (parent, name) { setWidget (new KPlayerLibrary (ac, this)); setResizeEnabled (true); - setCloseMode (QDockWindow::Always); + setCloseMode (TQDockWindow::Always); setNewLine (true); setCaption (i18n("Multimedia Library")); } @@ -3564,9 +3564,9 @@ void KPlayerLibraryWindow::setFocus (void) library() -> setFocus(); } -void KPlayerLibraryWindow::hideEvent (QHideEvent* event) +void KPlayerLibraryWindow::hideEvent (TQHideEvent* event) { - QDockWindow::hideEvent (event); + TQDockWindow::hideEvent (event); library() -> disconnectActions(); if ( isHidden() ) emit windowHidden(); diff --git a/kplayer/kplayernodeview.h b/kplayer/kplayernodeview.h index 3e80377..f718773 100644 --- a/kplayer/kplayernodeview.h +++ b/kplayer/kplayernodeview.h @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include #include "kplayeractionlist.h" #include "kplayernode.h" @@ -36,16 +36,16 @@ class KPlayerPlaylist; /**Node name validator. *@author kiriuja */ -class KPlayerNodeNameValidator : public QValidator +class KPlayerNodeNameValidator : public TQValidator { public: /** Constructor. References and stores the given container node. */ - KPlayerNodeNameValidator (KPlayerContainerNode* node, QObject* parent = 0, const char* name = 0); + KPlayerNodeNameValidator (KPlayerContainerNode* node, TQObject* parent = 0, const char* name = 0); /** Destructor. Releases the container node. */ virtual ~KPlayerNodeNameValidator(); /** Validates node name. */ - virtual QValidator::State validate (QString& input, int& position) const; + virtual TQValidator::State validate (TQString& input, int& position) const; protected: /** Container node. */ @@ -61,7 +61,7 @@ class KPlayerPropertiesDevice : public KPlayerPropertiesDevicePage public: /** Constructor. */ - KPlayerPropertiesDevice (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesDevice (TQWidget* parent = 0, const char* name = 0); /** Destructor. */ virtual ~KPlayerPropertiesDevice(); @@ -74,7 +74,7 @@ public: protected: /** Enables or disables the OK button. */ - virtual void pathChanged (const QString&); + virtual void pathChanged (const TQString&); /** Shows or hides channel list and file options. */ virtual void typeChanged (int); @@ -91,7 +91,7 @@ class KPlayerDeviceDialog : public KDialogBase public: /** Constructor. */ - KPlayerDeviceDialog (QWidget* parent = 0, const char* name = 0); + KPlayerDeviceDialog (TQWidget* parent = 0, const char* name = 0); /** Destructor. */ virtual ~KPlayerDeviceDialog(); @@ -128,7 +128,7 @@ public: { return m_node; } /** Returns the node of the given item. */ - KPlayerNode* nodeForItem (QListViewItem* item) const + KPlayerNode* nodeForItem (TQListViewItem* item) const { return ((KPlayerListViewItem*) item) -> node(); } /** Returns the node view. */ @@ -136,7 +136,7 @@ public: { return (KPlayerNodeView*) KListViewItem::listView(); } /** Returns icon name. */ - virtual QString icon (void) const; + virtual TQString icon (void) const; /** Returns whether the node has children. */ virtual bool hasChildren (void); @@ -148,11 +148,11 @@ public: void update (void); /** Updates the given field of the item. */ - void update (const QString& name); + void update (const TQString& name); protected: /** Compares two list items. */ - virtual int compare (QListViewItem* item, int column, bool ascending) const; + virtual int compare (TQListViewItem* item, int column, bool ascending) const; /** Finds the item corresponding to the given node. */ KPlayerListViewItem* itemForNode (KPlayerNode* node); @@ -215,7 +215,7 @@ public: virtual void terminate (void); /** Returns icon name. */ - virtual QString icon (void) const; + virtual TQString icon (void) const; /** Returns whether the node has children. */ virtual bool hasChildren (void); @@ -280,7 +280,7 @@ public: protected: /** Compares two list items. */ - virtual int compare (QListViewItem* item, int column, bool ascending) const; + virtual int compare (TQListViewItem* item, int column, bool ascending) const; /** Creates a new child item for the given node and inserts it after the given item. */ virtual KPlayerListViewItem* createChild (KPlayerListViewItem* after, KPlayerNode* node); @@ -308,25 +308,25 @@ public: /** Entry URL. */ KURL m_url; /** Entry name. */ - QString m_name; + TQString m_name; /** List of expanded items. */ KURL::List m_expanded; /** List of selected item containers. */ KURL::List m_selected; /** List of selected item IDs. */ - QStringList m_selected_ids; + TQStringList m_selected_ids; /** Current item container. */ KURL m_current; /** Current item ID. */ - QString m_current_id; + TQString m_current_id; /** Scrolling position. */ - QPoint m_position; + TQPoint m_position; }; /** History. * @author kiriuja */ -typedef QValueList KPlayerHistory; +typedef TQValueList KPlayerHistory; /**History action list. *@author kiriuja @@ -338,7 +338,7 @@ class KPlayerHistoryActionList : public KPlayerActionList public: /** Constructor. */ KPlayerHistoryActionList (KPlayerHistory& history, const KPlayerHistory::Iterator& current, - const QString& text, const QString& status, const QString& whatsthis, QObject* parent, const char* name); + const TQString& text, const TQString& status, const TQString& whatsthis, TQObject* parent, const char* name); /** Destructor. */ virtual ~KPlayerHistoryActionList(); @@ -368,7 +368,7 @@ class KPlayerNodeView : public KListView public: /** Sets up the node view widget. */ - KPlayerNodeView (QWidget* parent = 0, const char* name = 0); + KPlayerNodeView (TQWidget* parent = 0, const char* name = 0); /** Frees up resources. */ virtual ~KPlayerNodeView(); @@ -389,7 +389,7 @@ public: int attributeCount (void) const { return m_attribute_names.count(); } /** Returns the list of attribute names. */ - const QStringList& attributeNames (void) const + const TQStringList& attributeNames (void) const { return m_attribute_names; } /** Returns the library widget. */ @@ -419,7 +419,7 @@ public: void setRootNode (KPlayerContainerNode* node); /** Returns the node of the given item. */ - KPlayerNode* nodeForItem (QListViewItem* item) const + KPlayerNode* nodeForItem (TQListViewItem* item) const { return ((KPlayerListViewItem*) item) -> node(); } /** Returns the active node. */ @@ -436,9 +436,9 @@ public: { return m_moving; } /** Stops editing an item that is going to be removed. */ - void itemTerminating (QListViewItem* item); + void itemTerminating (TQListViewItem* item); /** Changes the current item if the current one is among the children of item. */ - void keepUpCurrentItem (QListViewItem* current, QListViewItem* item); + void keepUpCurrentItem (TQListViewItem* current, TQListViewItem* item); /** Returns the playlist object. */ KPlayerPlaylist* playlist (void); @@ -447,7 +447,7 @@ public: KAction* action (const char* name) const; /** Checks whether the current item is being hidden and sets a new one. */ - virtual void setOpen (QListViewItem* item, bool open); + virtual void setOpen (TQListViewItem* item, bool open); /** Sets column width and moves the edit box if any. */ virtual void setColumnWidth (int column, int width); @@ -459,7 +459,7 @@ public: virtual void updateActions (void) = 0; /** Start editing the given column of the given item. */ - void startEditing (QListViewItem* item, int column); + void startEditing (TQListViewItem* item, int column); /** Terminates editing the current item. */ void stopEditing (bool save = true, int state = 0); @@ -479,12 +479,12 @@ protected slots: void updated (KPlayerContainerNode* parent, KPlayerNode* node); /** Expands, collapses or drills down a group node. */ - void itemExecuted (QListViewItem* item); + void itemExecuted (TQListViewItem* item); /** Shows the context menu. */ - void showContextMenu (KListView*, QListViewItem*, const QPoint&); + void showContextMenu (KListView*, TQListViewItem*, const TQPoint&); /** Updates the edited field of the current item. */ - void edited (QListViewItem* item, const QString& value, int column); + void edited (TQListViewItem* item, const TQString& value, int column); /** Moves line edit according to the new column size. */ void moveLineEdit (int section, int from, int to); /** Arranges for the line edit to be moved according to the new content position. */ @@ -558,42 +558,42 @@ protected: virtual void activeItemChanged (void); /** Finds the place where the drop would occur. */ - void findDropTarget (const QPoint& pos, QListViewItem*& parent, QListViewItem*& after); + void findDropTarget (const TQPoint& pos, TQListViewItem*& parent, TQListViewItem*& after); /** Finds the place where the drop would occur. */ - virtual void findDrop (const QPoint& pos, QListViewItem*& parent, QListViewItem*& after); + virtual void findDrop (const TQPoint& pos, TQListViewItem*& parent, TQListViewItem*& after); /** Accepts node and URL drags. */ - virtual bool acceptDrag (QDropEvent*) const; + virtual bool acceptDrag (TQDropEvent*) const; /** Sets custom node order if necessary. */ virtual void setNodeOrder (KPlayerContainerNode* node); /** Handles the drop event. */ - virtual void contentsDropEvent (QDropEvent*); + virtual void contentsDropEvent (TQDropEvent*); /** Handles the drag move event. */ - virtual void contentsDragMoveEvent (QDragMoveEvent*); + virtual void contentsDragMoveEvent (TQDragMoveEvent*); /** Handles the drag enter event. */ - virtual void contentsDragEnterEvent (QDragEnterEvent*); + virtual void contentsDragEnterEvent (TQDragEnterEvent*); /** Handles the drag leave event. */ - virtual void contentsDragLeaveEvent (QDragLeaveEvent*); + virtual void contentsDragLeaveEvent (TQDragLeaveEvent*); /** Handles accel overrides. */ - virtual bool event (QEvent*); + virtual bool event (TQEvent*); /** Handles the return key. */ - virtual void keyPressEvent (QKeyEvent*); + virtual void keyPressEvent (TQKeyEvent*); /** Updates actions and connections when the view gets the focus. */ - virtual void focusInEvent (QFocusEvent* event); + virtual void focusInEvent (TQFocusEvent* event); /** Updates actions and connections when the view loses the focus. */ - virtual void focusOutEvent (QFocusEvent* event); + virtual void focusOutEvent (TQFocusEvent* event); /** Stores indicator of right mouse button press. */ - virtual void contentsMousePressEvent (QMouseEvent* e); + virtual void contentsMousePressEvent (TQMouseEvent* e); /** Stores the last active item. */ - virtual void contentsMouseReleaseEvent (QMouseEvent* e); + virtual void contentsMouseReleaseEvent (TQMouseEvent* e); /** Processes keyboard events for rename edit box. */ - virtual bool eventFilter (QObject* object, QEvent* event); + virtual bool eventFilter (TQObject* object, TQEvent* event); /** Adds the given nodes to a new playlist. */ KPlayerContainerNode* addToNewPlaylist (const KPlayerNodeList& list); @@ -616,7 +616,7 @@ protected: /** Last current node. */ KPlayerNode* m_last_node; /** Names of visible node attributes. */ - QStringList m_attribute_names; + TQStringList m_attribute_names; /** Indicates whether items are being moved within the view. */ bool m_moving; /** Indicates whether the view has focus. */ @@ -646,7 +646,7 @@ class KPlayerListView : public KPlayerNodeView public: /** Sets up the list view widget. */ - KPlayerListView (QWidget* parent = 0, const char* name = 0); + KPlayerListView (TQWidget* parent = 0, const char* name = 0); /** Frees up resources. */ virtual ~KPlayerListView(); @@ -659,19 +659,19 @@ public: virtual KPlayerNodeView* sibling (void) const; /** Returns the list of available attribute names. */ - const QStringList& availableAttributes (void) const + const TQStringList& availableAttributes (void) const { return m_available_attributes; } /** Returns the list of editable attribute names. */ - const QStringList& editableAttributes (void) const + const TQStringList& editableAttributes (void) const { return m_editable_attributes; } /** Returns the list of all possible attributes. */ - const QStringList& attributeOrder (void) const + const TQStringList& attributeOrder (void) const { return m_attribute_order; } /** Returns the attribute states. */ - const QMap& attributeStates (void) const + const TQMap& attributeStates (void) const { return m_attribute_states; } /** Returns the attribute counts. */ @@ -681,7 +681,7 @@ public: /** Fills the given list with selected nodes. */ virtual KPlayerNodeList getSelectedNodes (void) const; /** Fills the given list with selected nodes under the given item. */ - void getSelectedNodes (QListViewItem* item, KPlayerNodeList& list) const; + void getSelectedNodes (TQListViewItem* item, KPlayerNodeList& list) const; /** Sets the sorting order. */ virtual void setSorting (int column, bool ascending = true); @@ -734,24 +734,24 @@ protected: virtual void disconnectNode (void); /** Inserts an attribute into the list according to the order. */ - void insertAttribute (QStringList& list, const QString& name); + void insertAttribute (TQStringList& list, const TQString& name); /** Adds and sets up the column with the given name. */ - int setupColumn (const QString& name); + int setupColumn (const TQString& name); /** Loads and applies column the given column width. */ void loadColumnWidth (int index); /** Adjusts the last column width. */ //void adjustLastColumn (void); /** Removes and cleans up the column with the given name. */ - void cleanupColumn (const QString& name); + void cleanupColumn (const TQString& name); /** Returns whether the column with the given name has to be shown. */ - bool showColumn (const QString& name) const + bool showColumn (const TQString& name) const { return m_column_states.contains (name) && m_column_states [name]; } /** Adjusts the last column when contents are resized. */ //virtual void resizeContents (int width, int height); /** Adjusts the last column when viewport is resized. */ - //virtual void viewportResizeEvent (QResizeEvent*); + //virtual void viewportResizeEvent (TQResizeEvent*); /** Updates the given item as necessary. */ virtual void update (KPlayerListViewItem* item); @@ -759,15 +759,15 @@ protected: /** Counts of visible node attributes. */ KPlayerPropertyCounts m_attribute_counts; /** Names of available node attributes. */ - QStringList m_available_attributes; + TQStringList m_available_attributes; /** Names of editable node attributes. */ - QStringList m_editable_attributes; + TQStringList m_editable_attributes; /** Names of all possible node attributes. */ - QStringList m_attribute_order; + TQStringList m_attribute_order; /** Attribute states. */ - QMap m_attribute_states; + TQMap m_attribute_states; /** Column states. */ - QMap m_column_states; + TQMap m_column_states; /** Home media. */ KPlayerGenericProperties* m_home_media; }; @@ -781,7 +781,7 @@ class KPlayerTreeView : public KPlayerNodeView public: /** Sets up the tree view widget. */ - KPlayerTreeView (QWidget* parent = 0, const char* name = 0); + KPlayerTreeView (TQWidget* parent = 0, const char* name = 0); /** Frees up resources. */ virtual ~KPlayerTreeView(); @@ -810,7 +810,7 @@ public: { return m_current; } /** Adjusts column width. */ - virtual void setOpen (QListViewItem* item, bool open); + virtual void setOpen (TQListViewItem* item, bool open); /** Updates actions according to the current tree view selection. */ virtual void updateActions (void); @@ -856,7 +856,7 @@ protected: virtual KPlayerNodeList getSelectedNodes (void) const; /** Prevents KListView from resetting the alternate background. */ - virtual bool event (QEvent*); + virtual bool event (TQEvent*); /** Sets custom node order by name. */ virtual void setNodeOrder (KPlayerContainerNode* node); @@ -872,18 +872,18 @@ protected: /**The library splitter widget. *@author kiriuja */ -class KPlayerLibrary : public QSplitter +class KPlayerLibrary : public TQSplitter { Q_OBJECT public: /** Sets up the view widget. Adds tree and list children. */ - KPlayerLibrary (KActionCollection* ac, QWidget* parent = 0, const char* name = 0); + KPlayerLibrary (KActionCollection* ac, TQWidget* parent = 0, const char* name = 0); /** Frees up resources. */ virtual ~KPlayerLibrary(); /** Initializes library. */ - void initialize (QPopupMenu* menu); + void initialize (TQPopupMenu* menu); /** Frees up resources. */ void terminate (void); @@ -895,7 +895,7 @@ public: { return m_list; } /** Returns the popup menu. */ - QPopupMenu* popupMenu (void) const + TQPopupMenu* popupMenu (void) const { return m_popup; } /** Configuration. */ @@ -941,14 +941,14 @@ public: void disconnectActions (void); /** Emits the enableActionGroup signal. */ - void emitEnableActionGroup (const QString& name, bool enable) + void emitEnableActionGroup (const TQString& name, bool enable) { emit enableActionGroup (name, enable); } signals: /** Emitted when the library needs to be shown. */ void makeVisible (void); /** Emitted when an action group is enabled or disabled. */ - void enableActionGroup (const QString& name, bool enable); + void enableActionGroup (const TQString& name, bool enable); public slots: /** Shows library and opens the given node. */ @@ -960,7 +960,7 @@ protected: /** Action collection. */ KActionCollection* m_ac; /** Popup menu. */ - QPopupMenu* m_popup; + TQPopupMenu* m_popup; /** Tree view. */ KPlayerTreeView* m_tree; /** List view. */ @@ -982,13 +982,13 @@ protected: /**The library window. *@author kiriuja */ -class KPlayerLibraryWindow : public QDockWindow +class KPlayerLibraryWindow : public TQDockWindow { Q_OBJECT public: /** Constructor. */ - KPlayerLibraryWindow (KActionCollection* ac, QWidget* parent, const char* name = 0); + KPlayerLibraryWindow (KActionCollection* ac, TQWidget* parent, const char* name = 0); /** Returns the library. */ KPlayerLibrary* library (void) @@ -999,7 +999,7 @@ public: protected: /** Emits the windowHidden signal. */ - virtual void hideEvent (QHideEvent*); + virtual void hideEvent (TQHideEvent*); signals: /** Emitted when the library window is hidden. */ diff --git a/kplayer/kplayerpart.cpp b/kplayer/kplayerpart.cpp index 04c363e..19c4717 100644 --- a/kplayer/kplayerpart.cpp +++ b/kplayer/kplayerpart.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #ifdef DEBUG @@ -45,7 +45,7 @@ KPlayerBrowserExtension::~KPlayerBrowserExtension() { }*/ -KPlayerPart::KPlayerPart (QWidget* wparent, const char* wname, QObject* parent, const char* name, const QStringList&) +KPlayerPart::KPlayerPart (TQWidget* wparent, const char* wname, TQObject* parent, const char* name, const TQStringList&) : KParts::ReadOnlyPart (parent, name ? name : "kplayerpart") { #ifdef DEBUG_KPLAYER_KPART @@ -60,7 +60,7 @@ KPlayerPart::KPlayerPart (QWidget* wparent, const char* wname, QObject* parent, 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 QPoint&)), this, SLOT (widgetContextMenu(const QPoint&))); + connect (kPlayerWorkspace(), SIGNAL (contextMenu(const TQPoint&)), this, SLOT (widgetContextMenu(const TQPoint&))); setWidget (kPlayerWorkspace()); initActions(); setXMLFile ("kplayerpartui.rc"); @@ -69,7 +69,7 @@ KPlayerPart::KPlayerPart (QWidget* wparent, const char* wname, QObject* parent, //m_extension = new KPlayerBrowserExtension (this); kdDebugTime() << "KPlayerPart: creating popup menu\n"; #endif - m_popup_menu = new QPopupMenu (wparent); + m_popup_menu = new TQPopupMenu (wparent); action ("player_launch") -> plug (m_popup_menu); m_popup_menu -> insertSeparator(); action ("player_play") -> plug (m_popup_menu); @@ -117,7 +117,7 @@ KPlayerPart::~KPlayerPart() #endif } -QString resourcePath (const QString& filename); +TQString resourcePath (const TQString& filename); KAboutData* KPlayerPart::createAboutData (void) { @@ -152,7 +152,7 @@ bool KPlayerPart::closeURL (void) //KToolBar* KPlayerPart::toolBar (int index) //{ //index -= PROGRESS_TOOLBAR; -/*QObject* toolbar = sliderAction (m_toolbar_actions [index]) -> slider() -> parent(); +/*TQObject* toolbar = sliderAction (m_toolbar_actions [index]) -> slider() -> parent(); #ifdef DEBUG_KPLAYER_KPART kdDebugTime() << "Name: '" << toolbar -> name() << "'\n"; if ( toolbar && toolbar -> inherits ("KToolBar") ) @@ -163,20 +163,20 @@ bool KPlayerPart::closeURL (void) if ( toolbar && toolbar -> inherits ("KToolBar") ) return (KToolBar*) toolbar;*/ #ifdef DEBUG_KPLAYER_KPART - /*if ( qApp ) + /*if ( tqApp ) kdDebugTime() << "App OK\n"; - if ( qApp && qApp -> mainWidget() ) + if ( tqApp && tqApp -> mainWidget() ) kdDebugTime() << "Main widget OK\n";*/ #endif -//if ( ! qApp || ! qApp -> mainWidget() ) +//if ( ! tqApp || ! tqApp -> mainWidget() ) // return 0; #ifdef DEBUG_KPLAYER_KPART - /*if ( qApp -> mainWidget() -> child (m_toolbar_names [index]) ) + /*if ( tqApp -> mainWidget() -> child (m_toolbar_names [index]) ) kdDebugTime() << "Child OK\n"; - if ( qApp -> mainWidget() -> child (m_toolbar_names [index], "KToolBar") ) + if ( tqApp -> mainWidget() -> child (m_toolbar_names [index], "KToolBar") ) kdDebugTime() << "KToolBar OK\n";*/ #endif -//return (KToolBar*) qApp -> mainWidget() -> child (m_toolbar_names [index], "KToolBar"); +//return (KToolBar*) tqApp -> mainWidget() -> child (m_toolbar_names [index], "KToolBar"); //} void KPlayerPart::initActions (void) @@ -196,8 +196,8 @@ void KPlayerPart::saveOptions (void) #endif KConfig* config = kPlayerConfig(); config -> setGroup ("Part Options"); - config -> writeEntry (QString (m_toolbar_names [0]) + " Part Visible", m_toolbar_visible [0]); - config -> writeEntry (QString (m_toolbar_names [1]) + " Part Visible", m_toolbar_visible [1]); + config -> writeEntry (TQString (m_toolbar_names [0]) + " Part Visible", m_toolbar_visible [0]); + config -> writeEntry (TQString (m_toolbar_names [1]) + " Part Visible", m_toolbar_visible [1]); } void KPlayerPart::readOptions (void) @@ -208,7 +208,7 @@ void KPlayerPart::readOptions (void) KPlayerSettings* settings = kPlayerSettings(); KConfig* config = kPlayerConfig(); config -> setGroup ("Part Options"); - m_toolbar_visible[0] = config -> readBoolEntry (QString (m_toolbar_names[0]) + " Part Visible", m_toolbar_visible[0]); + m_toolbar_visible[0] = config -> readBoolEntry (TQString (m_toolbar_names[0]) + " Part Visible", m_toolbar_visible[0]); toggleAction (m_toolbar_actions [0]) -> setChecked (m_toolbar_visible [0]); #ifdef DEBUG_KPLAYER_KPART if ( toolBar (PROGRESS_TOOLBAR) ) @@ -222,7 +222,7 @@ void KPlayerPart::readOptions (void) else toolbar -> hide(); } - m_toolbar_visible[1] = config -> readBoolEntry (QString (m_toolbar_names[1]) + " Part Visible", m_toolbar_visible[1]); + m_toolbar_visible[1] = config -> readBoolEntry (TQString (m_toolbar_names[1]) + " Part Visible", m_toolbar_visible[1]); toggleAction (m_toolbar_actions[1]) -> setChecked (m_toolbar_visible[1]); toolbar = toolBar (VOLUME_TOOLBAR); if ( toolbar ) @@ -283,14 +283,14 @@ void KPlayerPart::launchKPlayer (void) process.detach(); } -void KPlayerPart::widgetContextMenu (const QPoint& global_position) +void KPlayerPart::widgetContextMenu (const TQPoint& global_position) { #ifdef DEBUG_KPLAYER_KPART kdDebugTime() << "KPlayerPart context menu\n"; #endif - QPopupMenu* popup = 0; + TQPopupMenu* popup = 0; if ( factory() ) - popup = (QPopupMenu*) factory() -> container ("player_popup", this); + popup = (TQPopupMenu*) factory() -> container ("player_popup", this); if ( ! popup ) popup = m_popup_menu; if ( popup ) diff --git a/kplayer/kplayerpart.h b/kplayer/kplayerpart.h index 157184f..b8a117e 100644 --- a/kplayer/kplayerpart.h +++ b/kplayer/kplayerpart.h @@ -28,7 +28,7 @@ class KPlayerPart; class KPlayerPopupSliderAction; class KPlayerSliderAction; -class QPopupMenu; +class TQPopupMenu; #define PROGRESS_TOOLBAR 1 #define VOLUME_TOOLBAR 2 @@ -53,7 +53,7 @@ class KPlayerPart : public KParts::ReadOnlyPart Q_OBJECT public: - KPlayerPart (QWidget*, const char*, QObject*, const char*, const QStringList&); + KPlayerPart (TQWidget*, const char*, TQObject*, const char*, const TQStringList&); virtual ~KPlayerPart(); /** Returns the data for the About dialog. **/ @@ -93,7 +93,7 @@ public slots: /** Receives the infoAvailable signal from KPlayerProcess. */ //void playerInfoAvailable (void); /** Displays the right click popup menu at the given position. */ - void widgetContextMenu (const QPoint& global_position); + void widgetContextMenu (const TQPoint& global_position); protected: /** Initializes the KActions of the KPart. */ @@ -110,11 +110,11 @@ protected: /** The browser extension. */ //KPlayerBrowserExtension* m_extension; - QPopupMenu* m_popup_menu; + TQPopupMenu* m_popup_menu; // Following should really be private -//QStringList m_toolbar_names; -//QStringList m_toolbar_actions; +//TQStringList m_toolbar_names; +//TQStringList m_toolbar_actions; //bool m_toolbar_visible [2]; }; diff --git a/kplayer/kplayerplaylist.cpp b/kplayer/kplayerplaylist.cpp index ecd177c..953fb57 100644 --- a/kplayer/kplayerplaylist.cpp +++ b/kplayer/kplayerplaylist.cpp @@ -19,10 +19,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #ifdef DEBUG #define DEBUG_KPLAYER_PLAYLIST @@ -36,8 +36,8 @@ #include "kplayerpropertiesdialog.h" #include "kplayersettings.h" -KPlayerPlaylist::KPlayerPlaylist (KActionCollection* ac, QObject* parent, const char* name) - : QObject (parent, name) +KPlayerPlaylist::KPlayerPlaylist (KActionCollection* ac, TQObject* parent, const char* name) + : TQObject (parent, name) { #ifdef DEBUG_KPLAYER_PLAYLIST kdDebugTime() << "Creating playlist\n"; @@ -73,7 +73,7 @@ KPlayerPlaylist::KPlayerPlaylist (KActionCollection* ac, QObject* parent, const 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))); - QToolTip::add (playlist(), i18n("Playlist")); + TQToolTip::add (playlist(), i18n("Playlist")); KToggleAction* toggle = new KToggleAction (i18n("&Loop"), "loop", 0, this, 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.")); @@ -113,7 +113,7 @@ KPlayerPlaylist::~KPlayerPlaylist() #endif } -void KPlayerPlaylist::initialize (QPopupMenu* menu) +void KPlayerPlaylist::initialize (TQPopupMenu* menu) { #ifdef DEBUG_KPLAYER_PLAYLIST kdDebugTime() << "Initializing playlist\n"; @@ -699,8 +699,8 @@ void KPlayerPlaylist::addToPlaylists (void) { KPlayerContainerNode* container = KPlayerNode::root() -> getNodeByUrl ("kplayer:/playlists"); KPlayerNodeNameValidator validator (container); - QString name = KInputDialog::text (i18n("Add to playlists"), i18n("Playlist name"), - QString::null, 0, 0, 0, &validator, QString::null, + TQString name = KInputDialog::text (i18n("Add to playlists"), i18n("Playlist name"), + TQString::null, 0, 0, 0, &validator, TQString::null, i18n("Playlist name field allows you to enter a name for a new playlist. OK button will be enabled when you enter a unique and valid name.")); if ( ! name.isNull() ) { @@ -731,8 +731,8 @@ void KPlayerPlaylist::addToCollection (void) { KPlayerContainerNode* container = KPlayerNode::root() -> getNodeByUrl ("kplayer:/collection"); KPlayerNodeNameValidator validator (container); - QString name = KInputDialog::text (i18n("Add to collection"), i18n("Folder name"), - QString::null, 0, 0, 0, &validator, QString::null, + TQString name = KInputDialog::text (i18n("Add to collection"), i18n("Folder name"), + TQString::null, 0, 0, 0, &validator, TQString::null, i18n("Folder name field allows you to enter a name for a new folder. OK button will be enabled when you enter a unique and valid name.")); if ( ! name.isNull() ) { @@ -858,34 +858,34 @@ void KPlayerPlaylist::addNextNodes (const KPlayerNodeList& nodes) } } -KPlayerPlaylistCombobox::KPlayerPlaylistCombobox (QWidget* parent, const char* name) - : QComboBox (parent, name) +KPlayerPlaylistCombobox::KPlayerPlaylistCombobox (TQWidget* parent, const char* name) + : TQComboBox (parent, name) { #ifdef DEBUG_KPLAYER_PLAYLIST kdDebugTime() << "Creating playlist combobox\n"; #endif } -QSize KPlayerPlaylistCombobox::sizeHint() const +TQSize KPlayerPlaylistCombobox::sizeHint() const { - QSize hint = QComboBox::sizeHint(); + TQSize hint = TQComboBox::sizeHint(); hint.setWidth (configuration() -> preferredSliderLength()); return hint; } -QSize KPlayerPlaylistCombobox::minimumSizeHint() const +TQSize KPlayerPlaylistCombobox::minimumSizeHint() const { - QSize hint = QComboBox::minimumSizeHint(); + TQSize hint = TQComboBox::minimumSizeHint(); hint.setWidth (configuration() -> minimumSliderLength()); return hint; } -void KPlayerPlaylistCombobox::contextMenuEvent (QContextMenuEvent* event) +void KPlayerPlaylistCombobox::contextMenuEvent (TQContextMenuEvent* event) { #ifdef DEBUG_KPLAYER_PLAYLIST kdDebugTime() << "KPlayerPlaylistCombobox::contextMenuEvent\n"; #endif - QComboBox::contextMenuEvent (event); + TQComboBox::contextMenuEvent (event); m_popup -> popup (event -> globalPos()); event -> accept(); } diff --git a/kplayer/kplayerplaylist.h b/kplayer/kplayerplaylist.h index 5f50056..cefa97e 100644 --- a/kplayer/kplayerplaylist.h +++ b/kplayer/kplayerplaylist.h @@ -26,53 +26,53 @@ /**The playlist combobox widget. *@author kiriuja */ -class KPlayerPlaylistCombobox : public QComboBox +class KPlayerPlaylistCombobox : public TQComboBox { Q_OBJECT public: /** The KPlayerPlaylistCombobox constructor. */ - KPlayerPlaylistCombobox (QWidget* parent = 0, const char* name = 0); + KPlayerPlaylistCombobox (TQWidget* parent = 0, const char* name = 0); /** Configuration. */ KPlayerConfiguration* configuration (void) const { return KPlayerEngine::engine() -> configuration(); } /** Returns the popup menu. */ - QPopupMenu* popupMenu (void) const + TQPopupMenu* popupMenu (void) const { return m_popup; } /** Sets the popup menu. */ - void setPopupMenu (QPopupMenu* menu) + void setPopupMenu (TQPopupMenu* menu) { m_popup = menu; } /** The size hint. */ - virtual QSize sizeHint() const; + virtual TQSize sizeHint() const; /** The minimum size hint. */ - virtual QSize minimumSizeHint() const; + virtual TQSize minimumSizeHint() const; protected: /** Displays the right click popup menu. */ - virtual void contextMenuEvent (QContextMenuEvent*); + virtual void contextMenuEvent (TQContextMenuEvent*); /** Popup menu. */ - QPopupMenu* m_popup; + TQPopupMenu* m_popup; }; /**Playlist class, contains the list of playlist items. *@author kiriuja */ -class KPlayerPlaylist : public QObject +class KPlayerPlaylist : public TQObject { Q_OBJECT public: /** The KPlayerPlaylist constructor. Creates an empty playlist. */ - KPlayerPlaylist (KActionCollection* ac, QObject* parent = 0, const char* name = 0); + KPlayerPlaylist (KActionCollection* ac, TQObject* parent = 0, const char* name = 0); /** The KPlayerPlaylist destructor. */ virtual ~KPlayerPlaylist(); /** Initializes playlist. */ - void initialize (QPopupMenu* menu); + void initialize (TQPopupMenu* menu); /** Releases referenced nodes. */ void terminate (void); @@ -182,7 +182,7 @@ signals: void stopped (void); /** Emitted when an action group is enabled or disabled. */ - void enableActionGroup (const QString& name, bool enable); + void enableActionGroup (const TQString& name, bool enable); public slots: /** Plays the given node. */ diff --git a/kplayer/kplayerprocess.cpp b/kplayer/kplayerprocess.cpp index a12ab49..02b2f30 100644 --- a/kplayer/kplayerprocess.cpp +++ b/kplayer/kplayerprocess.cpp @@ -22,11 +22,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -50,32 +50,32 @@ #define NO_SEEK_ORIGIN -5 #ifdef DEBUG_KPLAYER_DUMP -static QFile s_dump (QDir::homeDirPath() + "/kioslave.dump"); -#endif - -static QRegExp re_ext ("^[A-Za-z0-9]+$"); -static QRegExp re_a_or_v ("^[AV]: *([0-9,:.-]+)"); -static QRegExp re_a_and_v ("^A: *([0-9,:.-]+) +V: *([0-9,:.-]+)"); -static QRegExp re_start ("^(?:Start playing|Starting playback|Zaèínám pøehrávat|Starte Wiedergabe|Påbegynder afspilning|Åêêßíçóç áíáðáñáãùãÞò|Empezando reproducción|Démarre la lecture|Lejátszás indítása|Inizio la riproduzione|ºÆÀ¸³«»Ï|재ìƒì„ 시작합니다|Почнува плејбекот|Start afspelen|Starter avspilling|Zaczynam odtwarzanie|Iníciando reprodução|Rulez|îÁÞÁÌÏ ×ÏcÐÒÏÉÚ×ÅÄÅÎÉÑ|Zaèínam prehráva»|Çalmaya baþlanýyor|ðÏÞÁÔÏË ÐÒÏÇÒÁ×ÁÎÎÑ|¿ªÊ¼²¥·Å|¶\\}©l¼½©ñ)\\.\\.\\.", false); -//static QRegExp re_playing ("(?:^(?:Playing|Pøehrávám|Spiele|Afspiller|ÁíáðáñáãùãÞ ôïõ|Reproduciendo|Joue|In riproduzione|Пуштено|Bezig met het afspelen van|Spiller|Odtwarzam|Reproduzindo|Rulez|ðÒÏÉÇÒÙ×ÁÎÉÅ|Prehrávam|ðÒÏÇÒÁ×ÁÎÎÑ|²¥·Å|¥¿¦b¼½©ñ) | (?:lejátszása|¤òºÆÀ¸Ãæ|ìž¬ìƒ ì¤‘|Çalýnýyor)\\.*$)", false); -static QRegExp re_exiting ("^(?:Exiting|Èçëèçàì|Konèím|Beende| ?Afslutter| ?¸îïäïò|Saliendo|Sortie|Kilépek|In uscita|½ªÎ»¤·¤Æ¤¤¤Þ¤¹|종료합니다.|ИзлегуÐ|Bezig met afsluiten|Avslutter|Wychodzê|Saindo|Ieºire|÷ÙÈÏÄÉÍ|Konèím|Çýkýlýyor|÷ÉÈÏÄÉÍÏ|ÕýÔÚÍ˳ö|¥¿¦b°h¥X)", false); -static QRegExp re_quit ("^(?:Exiting|Èçëèçàì|Konèím|Beende| ?Afslutter| ?¸îïäïò|Saliendo|Sortie|Kilépek|In uscita|½ªÎ»¤·¤Æ¤¤¤Þ¤¹|종료합니다.|ИзлегуÐ|Bezig met afsluiten|Avslutter|Wychodzê|Saindo|Ieºire|÷ÙÈÏÄÉÍ|Konèím|Çýkýlýyor|÷ÉÈÏÄÉÍÏ|ÕýÔÚÍ˳ö|¥¿¦b°h¥X)\\.\\.\\. \\((?:Quit|Êðàé|Konec|Ende|Afslut|Êëåßóéìï|Salida\\.?|Fin|Kilépés|Uscita|½ªÎ»|종료|Откажи|Stop|Avslutt|Wyj¶cie|Sair|Ieºire|÷ÙÈÏÄ|Koniec|Çýkýþ|÷ÉȦÄ|Í˳ö|Â÷¶\\})\\)", false); -static QRegExp re_success ("^(?:Exiting|Èçëèçàì|Konèím|Beende| ?Afslutter| ?¸îïäïò|Saliendo|Sortie|Kilépek|In uscita|½ªÎ»¤·¤Æ¤¤¤Þ¤¹|Á¾·áÇÕ´Ï´Ù|ÐзлегÑва|Bezig met afsluiten|Avslutter|Wychodzê|Saindo|Ieºire|÷ÙÈÏÄÉÍ|Konèím|Çýkýlýyor|÷ÉÈÏÄÉÍÏ|ÕýÔÚÍ˳ö|¥¿¦b°h¥X)\\.\\.\\. \\((?:End of file|Êðàé íà ôàéëà|Konec souboru|Ende der Datei|Slut på filen|ÔÝëïò ôïõ áñ÷åßïõ|Fin del archivo\\.?|Fin du fichier|Vége a file-nak|Fine del file|¥Õ¥¡¥¤¥ë¤ÎËöü¤Ç¤¹|파ì¼ì˜ ë|Крај на датотеката|Einde van bestand|Slutt på filen|Koniec pliku|Fim do arquivo|Sfârºit fiºier|ëÏÎÅà ÆÁÊÌÁ|Koniec súboru|Dosyanýn Sonu|ë¦ÎÅÃØ ÆÁÊÌÕ|Îļþ½áÊø|ÀÉ®×¥½ºÝ)\\)", false); -static QRegExp re_cache_fill ("^Cache fill: *([0-9]+[.,]?[0-9]*) *%", false); -static QRegExp re_generating_index ("^Generating Index: *([0-9]+[.,]?[0-9]*) *%", false); -static QRegExp re_mpeg12 ("mpeg[12]", false); -static QRegExp re_version ("^MPlayer *0\\.9.* \\(C\\) "); -static QRegExp re_crash ("^ID_SIGNAL=([0-9]+)$"); -static QRegExp re_paused ("^ID_PAUSED$"); - -static QCString command_quit ("quit\n"); -static QCString command_pause ("pause\n"); -static QCString command_visibility ("sub_visibility\n"); -static QCString command_seek_100 ("seek 100 1\n"); -static QCString command_seek_99 ("seek 99 1\n"); -static QCString command_seek_95 ("seek 95 1\n"); -static QCString command_seek_90 ("seek 90 1\n"); -static QCString command_seek_50 ("seek 50 1\n"); +static TQFile s_dump (TQDir::homeDirPath() + "/kioslave.dump"); +#endif + +static TQRegExp re_ext ("^[A-Za-z0-9]+$"); +static TQRegExp re_a_or_v ("^[AV]: *([0-9,:.-]+)"); +static TQRegExp re_a_and_v ("^A: *([0-9,:.-]+) +V: *([0-9,:.-]+)"); +static TQRegExp re_start ("^(?:Start playing|Starting playback|Zaèínám pøehrávat|Starte Wiedergabe|Påbegynder afspilning|Åêêßíçóç áíáðáñáãùãÞò|Empezando reproducción|Démarre la lecture|Lejátszás indítása|Inizio la riproduzione|ºÆÀ¸³«»Ï|재ìƒì„ 시작합니다|Почнува плејбекот|Start afspelen|Starter avspilling|Zaczynam odtwarzanie|Iníciando reprodução|Rulez|îÁÞÁÌÏ ×ÏcÐÒÏÉÚ×ÅÄÅÎÉÑ|Zaèínam prehráva»|Çalmaya baþlanýyor|ðÏÞÁÔÏË ÐÒÏÇÒÁ×ÁÎÎÑ|¿ªÊ¼²¥·Å|¶\\}©l¼½©ñ)\\.\\.\\.", false); +//static TQRegExp re_playing ("(?:^(?:Playing|Pøehrávám|Spiele|Afspiller|ÁíáðáñáãùãÞ ôïõ|Reproduciendo|Joue|In riproduzione|Пуштено|Bezig met het afspelen van|Spiller|Odtwarzam|Reproduzindo|Rulez|ðÒÏÉÇÒÙ×ÁÎÉÅ|Prehrávam|ðÒÏÇÒÁ×ÁÎÎÑ|²¥·Å|¥¿¦b¼½©ñ) | (?:lejátszása|¤òºÆÀ¸Ãæ|ìž¬ìƒ ì¤‘|Çalýnýyor)\\.*$)", false); +static TQRegExp re_exiting ("^(?:Exiting|Èçëèçàì|Konèím|Beende| ?Afslutter| ?¸îïäïò|Saliendo|Sortie|Kilépek|In uscita|½ªÎ»¤·¤Æ¤¤¤Þ¤¹|종료합니다.|ИзлегуÐ|Bezig met afsluiten|Avslutter|Wychodzê|Saindo|Ieºire|÷ÙÈÏÄÉÍ|Konèím|Çýkýlýyor|÷ÉÈÏÄÉÍÏ|ÕýÔÚÍ˳ö|¥¿¦b°h¥X)", false); +static TQRegExp re_quit ("^(?:Exiting|Èçëèçàì|Konèím|Beende| ?Afslutter| ?¸îïäïò|Saliendo|Sortie|Kilépek|In uscita|½ªÎ»¤·¤Æ¤¤¤Þ¤¹|종료합니다.|ИзлегуÐ|Bezig met afsluiten|Avslutter|Wychodzê|Saindo|Ieºire|÷ÙÈÏÄÉÍ|Konèím|Çýkýlýyor|÷ÉÈÏÄÉÍÏ|ÕýÔÚÍ˳ö|¥¿¦b°h¥X)\\.\\.\\. \\((?:Quit|Êðàé|Konec|Ende|Afslut|Êëåßóéìï|Salida\\.?|Fin|Kilépés|Uscita|½ªÎ»|종료|Откажи|Stop|Avslutt|Wyj¶cie|Sair|Ieºire|÷ÙÈÏÄ|Koniec|Çýkýþ|÷ÉȦÄ|Í˳ö|Â÷¶\\})\\)", false); +static TQRegExp re_success ("^(?:Exiting|Èçëèçàì|Konèím|Beende| ?Afslutter| ?¸îïäïò|Saliendo|Sortie|Kilépek|In uscita|½ªÎ»¤·¤Æ¤¤¤Þ¤¹|Á¾·áÇÕ´Ï´Ù|ÐзлегÑва|Bezig met afsluiten|Avslutter|Wychodzê|Saindo|Ieºire|÷ÙÈÏÄÉÍ|Konèím|Çýkýlýyor|÷ÉÈÏÄÉÍÏ|ÕýÔÚÍ˳ö|¥¿¦b°h¥X)\\.\\.\\. \\((?:End of file|Êðàé íà ôàéëà|Konec souboru|Ende der Datei|Slut på filen|ÔÝëïò ôïõ áñ÷åßïõ|Fin del archivo\\.?|Fin du fichier|Vége a file-nak|Fine del file|¥Õ¥¡¥¤¥ë¤ÎËöü¤Ç¤¹|파ì¼ì˜ ë|Крај на датотеката|Einde van bestand|Slutt på filen|Koniec pliku|Fim do arquivo|Sfârºit fiºier|ëÏÎÅà ÆÁÊÌÁ|Koniec súboru|Dosyanýn Sonu|ë¦ÎÅÃØ ÆÁÊÌÕ|Îļþ½áÊø|ÀÉ®×¥½ºÝ)\\)", false); +static TQRegExp re_cache_fill ("^Cache fill: *([0-9]+[.,]?[0-9]*) *%", false); +static TQRegExp re_generating_index ("^Generating Index: *([0-9]+[.,]?[0-9]*) *%", false); +static TQRegExp re_mpeg12 ("mpeg[12]", false); +static TQRegExp re_version ("^MPlayer *0\\.9.* \\(C\\) "); +static TQRegExp re_crash ("^ID_SIGNAL=([0-9]+)$"); +static TQRegExp re_paused ("^ID_PAUSED$"); + +static TQCString command_quit ("quit\n"); +static TQCString command_pause ("pause\n"); +static TQCString command_visibility ("sub_visibility\n"); +static TQCString command_seek_100 ("seek 100 1\n"); +static TQCString command_seek_99 ("seek 99 1\n"); +static TQCString command_seek_95 ("seek 95 1\n"); +static TQCString command_seek_90 ("seek 90 1\n"); +static TQCString command_seek_50 ("seek 50 1\n"); KPlayerLineOutputProcess::KPlayerLineOutputProcess (void) { @@ -290,8 +290,8 @@ KPlayerProcess::KPlayerProcess (void) m_fifo_offset = 0; m_fifo_notifier = 0; m_fifo_timer = 0; - QString home (QDir::homeDirPath()); - QDir (home).mkdir (".mplayer"); + TQString home (TQDir::homeDirPath()); + TQDir (home).mkdir (".mplayer"); m_cache.setAutoDelete (true); } @@ -321,8 +321,8 @@ void KPlayerProcess::transferTemporaryFile (void) { if ( properties() -> useKioslave() && properties() -> useTemporaryFile() && ! m_temporary_file ) { - QFileInfo fi (properties() -> url().fileName()); - QString extension (fi.extension(false).lower()); + TQFileInfo fi (properties() -> url().fileName()); + TQString extension (fi.extension(false).lower()); if ( ! extension.isEmpty() ) extension = "." + extension; m_temporary_file = new KTempFile (locateLocal ("tmp", "kpl"), extension); @@ -337,10 +337,10 @@ void KPlayerProcess::transferTemporaryFile (void) m_temp_job = KIO::get (properties() -> url(), false, false); m_temp_job -> setWindow (kPlayerWorkspace()); m_temp_job -> addMetaData ("PropagateHttpHeader", "true"); - connect (m_temp_job, SIGNAL (data (KIO::Job*, const QByteArray&)), SLOT (transferTempData (KIO::Job*, const QByteArray&))); + connect (m_temp_job, SIGNAL (data (KIO::Job*, const TQByteArray&)), SLOT (transferTempData (KIO::Job*, const TQByteArray&))); connect (m_temp_job, SIGNAL (result (KIO::Job*)), SLOT (transferTempDone (KIO::Job*))); connect (m_temp_job, SIGNAL (percent (KIO::Job*, unsigned long)), SLOT (transferProgress (KIO::Job*, unsigned long))); - connect (m_temp_job, SIGNAL (infoMessage (KIO::Job*, const QString&)), SLOT (transferInfoMessage (KIO::Job*, const QString&))); + connect (m_temp_job, SIGNAL (infoMessage (KIO::Job*, const TQString&)), SLOT (transferInfoMessage (KIO::Job*, const TQString&))); transferProgress (m_temp_job, 0); m_delayed_helper = true; } @@ -379,13 +379,13 @@ void KPlayerProcess::setState (State state) emit stateChanged (state, previous); } -QString KPlayerProcess::positionString (void) const +TQString KPlayerProcess::positionString (void) const { - QString l (properties() -> lengthString()), p (timeString (position(), true)); + TQString l (properties() -> lengthString()), p (timeString (position(), true)); return l.isEmpty() ? p : p + " / " + l; } -void KPlayerProcess::sendHelperCommand (QCString& command) +void KPlayerProcess::sendHelperCommand (TQCString& command) { if ( ! m_helper ) return; @@ -395,7 +395,7 @@ void KPlayerProcess::sendHelperCommand (QCString& command) #endif } -void KPlayerProcess::sendPlayerCommand (QCString& command) +void KPlayerProcess::sendPlayerCommand (TQCString& command) { if ( ! m_player ) return; @@ -433,11 +433,11 @@ void KPlayerProcess::get_info (void) } m_helper = new KPlayerLineOutputProcess; *m_helper << properties() -> executablePath() << "-slave" << "-ao" << "null" << "-vo" << "x11" - << "-wid" << QString::number (kPlayerWorkspace() -> hiddenWidget() -> winId()); + << "-wid" << TQString::number (kPlayerWorkspace() -> hiddenWidget() -> winId()); if ( properties() -> cache() == 1 || ! properties() -> url().isLocalFile() && ! properties() -> useKioslave() ) *m_helper << "-nocache"; else if ( properties() -> cache() == 2 ) - *m_helper << "-cache" << QString::number (properties() -> cacheSize()); + *m_helper << "-cache" << TQString::number (properties() -> cacheSize()); connect (m_helper, SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)), SLOT (receivedHelperLine (KPlayerLineOutputProcess*, char*, int))); if ( ! run (m_helper) ) @@ -463,12 +463,12 @@ void KPlayerProcess::play (void) start(); } -QString resourcePath (const QString& filename) +TQString resourcePath (const TQString& filename) { #ifdef DEBUG_KPLAYER_PROCESS kdDebugTime() << "Looking for " << filename << "\n"; #endif - QString path (KGlobal::dirs() -> findResource ("appdata", filename)); + TQString path (KGlobal::dirs() -> findResource ("appdata", filename)); #ifdef DEBUG_KPLAYER_PROCESS kdDebugTime() << " appdata '" << path << "'\n"; #endif @@ -518,8 +518,8 @@ void KPlayerProcess::start (void) }*/ m_player = new KPlayerLineOutputProcess; *m_player << properties() -> executablePath() << "-zoom" << "-noautosub" << "-slave" - << "-wid" << QString::number (kPlayerWidget() -> winId()) << "-stop-xscreensaver"; - QString driver (properties() -> videoDriverString()); + << "-wid" << TQString::number (kPlayerWidget() -> winId()) << "-stop-xscreensaver"; + TQString driver (properties() -> videoDriverString()); if ( ! driver.isEmpty() ) { if ( driver.startsWith ("xvmc") ) @@ -532,7 +532,7 @@ void KPlayerProcess::start (void) if ( ! driver.isEmpty() ) *m_player << "-ao" << driver; if ( properties() -> softwareVolume() ) - *m_player << "-softvol" << "-softvol-max" << QString::number (properties() -> maximumSoftwareVolume()); + *m_player << "-softvol" << "-softvol-max" << TQString::number (properties() -> maximumSoftwareVolume()); else if ( driver.startsWith ("alsa") || driver.startsWith ("oss") ) { driver = properties() -> mixerDevice(); @@ -542,11 +542,11 @@ void KPlayerProcess::start (void) if ( ! driver.isEmpty() ) *m_player << "-mixer-channel" << driver; } - *m_player << "-osdlevel" << QCString().setNum (properties() -> osdLevel()); - *m_player << "-contrast" << QCString().setNum (settings() -> contrast()); - *m_player << "-brightness" << QCString().setNum (settings() -> brightness()); - *m_player << "-hue" << QCString().setNum (settings() -> hue()); - *m_player << "-saturation" << QCString().setNum (settings() -> saturation()); + *m_player << "-osdlevel" << TQCString().setNum (properties() -> osdLevel()); + *m_player << "-contrast" << TQCString().setNum (settings() -> contrast()); + *m_player << "-brightness" << TQCString().setNum (settings() -> brightness()); + *m_player << "-hue" << TQCString().setNum (settings() -> hue()); + *m_player << "-saturation" << TQCString().setNum (settings() -> saturation()); if ( settings() -> frameDrop() == 0 ) *m_player << "-noframedrop"; else if ( settings() -> frameDrop() == 1 ) @@ -557,21 +557,21 @@ void KPlayerProcess::start (void) if ( cache == 0 && properties() -> useKioslave() && (! properties() -> useTemporaryFile() || ! m_temporary_file) ) *m_player << "-cache" << "1024"; else if ( cache == 2 ) - *m_player << "-cache" << QString().setNum (properties() -> cacheSize()); + *m_player << "-cache" << TQString().setNum (properties() -> cacheSize()); else if ( cache == 1 ) *m_player << "-nocache"; if ( properties() -> videoScaler() > 0 ) - *m_player << "-sws" << QCString().setNum (properties() -> videoScaler()); + *m_player << "-sws" << TQCString().setNum (properties() -> videoScaler()); m_audio_delay = settings() -> audioDelay(); if ( m_audio_delay != 0 ) - *m_player << "-delay" << QCString().setNum (m_audio_delay); + *m_player << "-delay" << TQCString().setNum (m_audio_delay); if ( properties() -> hasVideoID() ) - *m_player << "-vid" << QCString().setNum (properties() -> videoID()); + *m_player << "-vid" << TQCString().setNum (properties() -> videoID()); m_audio_id = properties() -> audioID(); if ( m_audio_id > -1 ) - *m_player << "-aid" << QCString().setNum (m_audio_id); + *m_player << "-aid" << TQCString().setNum (m_audio_id); m_subtitles.clear(); - m_vobsub = QString::null; + m_vobsub = TQString::null; m_subtitle_index = properties() -> subtitleIndex(); if ( settings() -> hasSubtitles() ) { @@ -580,17 +580,17 @@ void KPlayerProcess::start (void) m_vobsub = settings() -> vobsubSubtitles(); *m_player << "-vobsub" << m_vobsub; if ( properties() -> hasVobsubID() ) - *m_player << "-vobsubid" << QString::number (properties() -> vobsubID()); + *m_player << "-vobsubid" << TQString::number (properties() -> vobsubID()); else m_send_subtitle_index = m_subtitle_index; } else if ( settings() -> showSubtitles() ) { if ( properties() -> hasSubtitleID() ) - *m_player << "-sid" << QString::number (properties() -> subtitleID()); + *m_player << "-sid" << TQString::number (properties() -> subtitleID()); else if ( settings() -> hasExternalSubtitles() ) { - QString urls (settings() -> currentSubtitles()); + TQString urls (settings() -> currentSubtitles()); if ( urls.find (',') < 0 ) *m_player << "-sub" << urls; else @@ -603,11 +603,11 @@ void KPlayerProcess::start (void) } m_subtitle_delay = settings() -> subtitleDelay(); if ( m_subtitle_delay != 0 ) - *m_player << "-subdelay" << QCString().setNum (m_subtitle_delay); + *m_player << "-subdelay" << TQCString().setNum (m_subtitle_delay); m_subtitle_position = settings() -> subtitlePosition(); if ( m_subtitle_position != 100 ) - *m_player << "-subpos" << QCString().setNum (m_subtitle_position); - QString font (configuration() -> subtitleFontName()); + *m_player << "-subpos" << TQCString().setNum (m_subtitle_position); + TQString font (configuration() -> subtitleFontName()); if ( configuration() -> subtitleFontBold() ) font += ":bold"; if ( configuration() -> subtitleFontItalic() ) @@ -615,12 +615,12 @@ void KPlayerProcess::start (void) *m_player << "-fontconfig" << "-font" << font; *m_player << "-subfont-autoscale" << (configuration() -> subtitleAutoscale() ? "3" : "0"); if ( configuration() -> subtitleTextSize() ) - *m_player << "-subfont-text-scale" << QString::number (configuration() -> subtitleTextSize()); + *m_player << "-subfont-text-scale" << TQString::number (configuration() -> subtitleTextSize()); if ( configuration() -> hasSubtitleFontOutline() ) *m_player << "-ffactor" << configuration() -> subtitleFontOutlineString(); if ( configuration() -> hasSubtitleTextWidth() ) *m_player << "-subwidth" << configuration() -> subtitleTextWidthString(); - const QString& encoding (properties() -> subtitleEncoding()); + const TQString& encoding (properties() -> subtitleEncoding()); if ( encoding == "UTF-8" ) *m_player << "-utf8"; else if ( ! encoding.isEmpty() ) @@ -637,7 +637,7 @@ void KPlayerProcess::start (void) if ( ! properties() -> videoDriverString().startsWith ("sdl") && ! properties() -> videoDriverString().startsWith ("svga") ) { - QString path = resourcePath ("input.conf"); + TQString path = resourcePath ("input.conf"); if ( ! path.isEmpty() ) *m_player << "-input" << "conf=" + path; #ifdef DEBUG_KPLAYER_PROCESS @@ -653,12 +653,12 @@ void KPlayerProcess::start (void) delete m_temporary_file; m_temporary_file = 0; } - QString ext (properties() -> extension()); + TQString ext (properties() -> extension()); if ( re_ext.search (ext) >= 0 ) ext.prepend ('.'); else ext = ""; - m_fifo_name = QFile::encodeName (QDir::homeDirPath() + "/.mplayer/kpstream" + ext); + m_fifo_name = TQFile::encodeName (TQDir::homeDirPath() + "/.mplayer/kpstream" + ext); removeDataFifo(); #ifdef HAVE_MKFIFO #ifdef DEBUG_KPLAYER_PROCESS @@ -679,7 +679,7 @@ void KPlayerProcess::start (void) #endif } else - m_fifo_name = QCString(); + 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)), @@ -704,9 +704,9 @@ void KPlayerProcess::start (void) m_slave_job = KIO::get (properties() -> url(), false, false); m_slave_job -> setWindow (kPlayerWorkspace()); m_slave_job -> addMetaData ("PropagateHttpHeader", "true"); - connect (m_slave_job, SIGNAL (data (KIO::Job*, const QByteArray&)), SLOT (transferData (KIO::Job*, const QByteArray&))); + connect (m_slave_job, SIGNAL (data (KIO::Job*, const TQByteArray&)), SLOT (transferData (KIO::Job*, const TQByteArray&))); connect (m_slave_job, SIGNAL (result (KIO::Job*)), SLOT (transferDone (KIO::Job*))); - connect (m_slave_job, SIGNAL (infoMessage (KIO::Job*, const QString&)), SLOT (transferInfoMessage (KIO::Job*, const QString&))); + connect (m_slave_job, SIGNAL (infoMessage (KIO::Job*, const TQString&)), SLOT (transferInfoMessage (KIO::Job*, const TQString&))); m_cache_size = properties() -> cache() == 2 ? properties() -> cacheSize() * 1024 : 1048576; m_first_chunk = true; #ifdef DEBUG_KPLAYER_PROCESS @@ -737,11 +737,11 @@ void KPlayerProcess::restart (void) bool KPlayerProcess::run (KPlayerLineOutputProcess* player) { - static QRegExp re_space (" +"); + static TQRegExp re_space (" +"); #ifdef DEBUG_KPLAYER_PROCESS kdDebugTime() << "Process: Run\n"; #endif - QString codec (properties() -> videoCodecString()); + TQString codec (properties() -> videoCodecString()); if ( ! codec.isEmpty() ) *player << "-vc" << codec; codec = properties() -> audioCodecString(); @@ -755,9 +755,9 @@ bool KPlayerProcess::run (KPlayerLineOutputProcess* player) else if ( properties() -> buildNewIndex() == 2 ) *player << "-forceidx"; *player << "-noquiet" << "-msglevel" << "identify=4"; - QString commandline = properties() -> commandLine(); + TQString commandline = properties() -> commandLine(); if ( ! commandline.isEmpty() ) - *player << QStringList::split (re_space, commandline); + *player << TQStringList::split (re_space, commandline); codec = properties() -> deviceSetting(); if ( ! codec.isEmpty() ) *player << properties() -> deviceOption() << codec; @@ -766,7 +766,7 @@ bool KPlayerProcess::run (KPlayerLineOutputProcess* player) else *player << "--"; if ( properties() -> useKioslave() ) - *player << (properties() -> useTemporaryFile() && m_temporary_file ? QFile::encodeName (m_temporary_file -> name()) : m_fifo_name); + *player << (properties() -> useTemporaryFile() && m_temporary_file ? TQFile::encodeName (m_temporary_file -> name()) : m_fifo_name); else *player << properties() -> urlString(); connect (player, SIGNAL (processExited (KProcess*)), SLOT (playerProcessExited (KProcess*))); @@ -930,17 +930,17 @@ void KPlayerProcess::absoluteSeek (int seconds) else seconds --; } - QCString s ("seek "); + TQCString s ("seek "); // broken codec workaround if ( properties() -> length() >= MIN_VIDEO_LENGTH && re_mpeg12.search (properties() -> videoCodecString()) >= 0 && properties() -> deviceOption().isEmpty() ) { seconds = limit (int (float (seconds) / properties() -> length() * 100 + 0.5), 0, 100); - s += QCString().setNum (seconds) + " 1\n"; + s += TQCString().setNum (seconds) + " 1\n"; } else - s += QCString().setNum (seconds) + " 2\n"; + s += TQCString().setNum (seconds) + " 2\n"; sendPlayerCommand (s); m_seek = true; m_seek_origin = position(); @@ -954,14 +954,14 @@ void KPlayerProcess::relativeSeek (int seconds) { if ( ! m_player || m_quit || seconds == 0 ) return; - QCString s ("seek "); + TQCString s ("seek "); // broken codec workaround if ( (seconds > 4 || seconds < -4) && properties() -> length() >= MIN_VIDEO_LENGTH && re_mpeg12.search (properties() -> videoCodecString()) >= 0 && properties() -> deviceOption().isEmpty() ) { //seconds = limit (int ((m_position + seconds) / properties() -> length() * 100 + 0.5), 0, 100); - //s += QCString().setNum (seconds) + " 1\n"; + //s += TQCString().setNum (seconds) + " 1\n"; //if ( m_send_seek ) // m_absolute_seek += seconds; //else @@ -969,7 +969,7 @@ void KPlayerProcess::relativeSeek (int seconds) return; } else - s += QCString().setNum (seconds) + "\n"; + s += TQCString().setNum (seconds) + "\n"; sendPlayerCommand (s); m_seek = true; } @@ -984,8 +984,8 @@ void KPlayerProcess::volume (int volume) return; } volume = limit (volume, 0, 100); - QCString s ("volume "); - s += QCString().setNum (volume) + " 1\n"; + TQCString s ("volume "); + s += TQCString().setNum (volume) + " 1\n"; sendPlayerCommand (s); m_send_volume = false; } @@ -999,8 +999,8 @@ void KPlayerProcess::frameDrop (int frame_drop) m_send_frame_drop = true; return; } - QCString s ("frame_drop "); - s += QCString().setNum (frame_drop) + "\n"; + TQCString s ("frame_drop "); + s += TQCString().setNum (frame_drop) + "\n"; sendPlayerCommand (s); m_send_frame_drop = false; } @@ -1015,8 +1015,8 @@ void KPlayerProcess::contrast (int contrast) return; } contrast = limit (contrast, -100, 100); - QCString s ("contrast "); - s += QCString().setNum (contrast) + " 1\n"; + TQCString s ("contrast "); + s += TQCString().setNum (contrast) + " 1\n"; sendPlayerCommand (s); m_send_contrast = false; } @@ -1031,8 +1031,8 @@ void KPlayerProcess::brightness (int brightness) return; } brightness = limit (brightness, -100, 100); - QCString s ("brightness "); - s += QCString().setNum (brightness) + " 1\n"; + TQCString s ("brightness "); + s += TQCString().setNum (brightness) + " 1\n"; sendPlayerCommand (s); m_send_brightness = false; } @@ -1047,8 +1047,8 @@ void KPlayerProcess::hue (int hue) return; } hue = limit (hue, -100, 100); - QCString s ("hue "); - s += QCString().setNum (hue) + " 1\n"; + TQCString s ("hue "); + s += TQCString().setNum (hue) + " 1\n"; sendPlayerCommand (s); m_send_hue = false; } @@ -1063,8 +1063,8 @@ void KPlayerProcess::saturation (int saturation) return; } saturation = limit (saturation, -100, 100); - QCString s ("saturation "); - s += QCString().setNum (saturation) + " 1\n"; + TQCString s ("saturation "); + s += TQCString().setNum (saturation) + " 1\n"; sendPlayerCommand (s); m_send_saturation = false; } @@ -1086,8 +1086,8 @@ void KPlayerProcess::subtitleMove (int position, bool absolute) position += m_send_subtitle_position; if ( position == 0 ) return; - QCString s ("sub_pos "); - s += QCString().setNum (position) + "\n"; + TQCString s ("sub_pos "); + s += TQCString().setNum (position) + "\n"; sendPlayerCommand (s); m_send_subtitle_position = 0; } @@ -1109,8 +1109,8 @@ void KPlayerProcess::subtitleDelay (float delay, bool absolute) delay += m_send_subtitle_delay; if ( delay < 0.001 && delay > - 0.001 ) return; - QCString s ("sub_delay "); - s += QCString().setNum (- delay) + "\n"; + TQCString s ("sub_delay "); + s += TQCString().setNum (- delay) + "\n"; sendPlayerCommand (s); m_send_subtitle_delay = 0; } @@ -1124,8 +1124,8 @@ void KPlayerProcess::subtitleIndex (int index) m_send_subtitle_index = index; return; } - QCString s ("sub_select "); - s += QCString().setNum (index) + "\n"; + TQCString s ("sub_select "); + s += TQCString().setNum (index) + "\n"; sendPlayerCommand (s); m_subtitle_index = index; m_send_subtitle_index = -2; @@ -1166,7 +1166,7 @@ void KPlayerProcess::subtitles (void) m_send_subtitle_load = false; return; } - QString subtitle (settings() -> currentSubtitles()); + TQString subtitle (settings() -> currentSubtitles()); index = m_subtitles.findIndex (subtitle); if ( index >= 0 ) { @@ -1179,7 +1179,7 @@ void KPlayerProcess::subtitles (void) m_send_subtitle_load = true; return; } - QCString s ("sub_load "); + TQCString s ("sub_load "); s += '"' + subtitle.utf8() + "\"\n"; sendPlayerCommand (s); m_send_subtitle_load = false; @@ -1202,8 +1202,8 @@ void KPlayerProcess::audioDelay (float delay, bool absolute) delay += m_send_audio_delay; if ( delay < 0.001 && delay > - 0.001 ) return; - QCString s ("audio_delay "); - s += QCString().setNum (- delay) + "\n"; + TQCString s ("audio_delay "); + s += TQCString().setNum (- delay) + "\n"; sendPlayerCommand (s); m_send_audio_delay = 0; } @@ -1219,11 +1219,11 @@ void KPlayerProcess::audioID (int id) } if ( id != m_audio_id ) { - QRegExp demuxers (configuration() -> switchAudioDemuxers()); + TQRegExp demuxers (configuration() -> switchAudioDemuxers()); if ( demuxers.search (properties() -> demuxerString()) >= 0 ) { - QCString s ("switch_audio "); - s += QCString().setNum (id) + "\n"; + TQCString s ("switch_audio "); + s += TQCString().setNum (id) + "\n"; sendPlayerCommand (s); m_audio_id = id; } @@ -1233,7 +1233,7 @@ void KPlayerProcess::audioID (int id) m_send_audio_id = false; } -void KPlayerProcess::transferData (KIO::Job* job, const QByteArray& data) +void KPlayerProcess::transferData (KIO::Job* job, const TQByteArray& data) { if ( job && job == m_slave_job && m_player ) { @@ -1244,13 +1244,13 @@ void KPlayerProcess::transferData (KIO::Job* job, const QByteArray& data) #ifdef DEBUG_KPLAYER_KIOSLAVE kdDebugTime() << "Process: Cache: Creating new chunk, size " << data.size() << "\n"; #endif - m_cache.append (new QByteArray (data.copy())); + m_cache.append (new TQByteArray (data.copy())); } else { - QByteArray* array = m_cache.last(); + TQByteArray* array = m_cache.last(); int size = array -> size(); - array -> resize (size + data.size(), QGArray::SpeedOptim); + array -> resize (size + data.size(), TQGArray::SpeedOptim); #ifdef DEBUG_KPLAYER_KIOSLAVE if ( array -> size() != size + data.size() ) kdDebugTime() << "Process: Cache: Size mismatch: " << size << " + " << data.size() << " = " << array -> size() << "\n"; @@ -1286,7 +1286,7 @@ void KPlayerProcess::transferData (KIO::Job* job, const QByteArray& data) } } -void KPlayerProcess::transferTempData (KIO::Job* job, const QByteArray& data) +void KPlayerProcess::transferTempData (KIO::Job* job, const TQByteArray& data) { if ( job && job == m_temp_job && m_temporary_file ) { @@ -1323,7 +1323,7 @@ void KPlayerProcess::transferProgress (KIO::Job* job, unsigned long progress) #endif } -void KPlayerProcess::transferInfoMessage (KIO::Job* job, const QString& message) +void KPlayerProcess::transferInfoMessage (KIO::Job* job, const TQString& message) { if ( job && (job == m_slave_job || job == m_temp_job) ) emit messageReceived (message); @@ -1340,7 +1340,7 @@ void KPlayerProcess::transferDone (KIO::Job* job) #endif if ( job -> error() != 0 && (job -> error() != 20 || ! m_quit) || error_page ) { - QString errorString; + TQString errorString; if ( job -> error() != 0 ) { errorString = job -> errorString(); @@ -1399,7 +1399,7 @@ void KPlayerProcess::transferTempDone (KIO::Job* job) #endif if ( job -> error() != 0 && (job -> error() != 20 || ! m_quit) || m_temp_job -> isErrorPage() ) { - QString errorString; + TQString errorString; if ( job -> error() != 0 ) errorString = job -> errorString(); else if ( m_temp_job -> isErrorPage() ) @@ -1420,12 +1420,12 @@ void KPlayerProcess::transferTempDone (KIO::Job* job) } /*if ( m_temp_job -> isErrorPage() ) emit messageReceived ("HTTP request returned an error"); - QString errorString (job -> errorString()); + TQString errorString (job -> errorString()); if ( ! errorString.isEmpty() ) emit messageReceived (errorString); KURL url (settings() -> url()); - QStringList errors (job -> detailedErrorStrings (&url)); - for ( QStringList::Iterator it = errors.begin(); it != errors.end(); ++ it ) + TQStringList errors (job -> detailedErrorStrings (&url)); + for ( TQStringList::Iterator it = errors.begin(); it != errors.end(); ++ it ) if ( ! (*it).isEmpty() ) emit messageReceived (*it);*/ emit errorDetected(); @@ -1521,7 +1521,7 @@ void KPlayerProcess::sendFifoData (void) delete m_fifo_timer; m_fifo_timer = 0; } - m_fifo_notifier = new QSocketNotifier (m_fifo_handle, QSocketNotifier::Write); + 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))); } @@ -1530,14 +1530,14 @@ void KPlayerProcess::sendFifoData (void) #ifdef DEBUG_KPLAYER_PROCESS kdDebugTime() << "Process: fifo open failed, creating timer\n"; #endif - m_fifo_timer = new QTimer (this); + m_fifo_timer = new TQTimer (this); connect (m_fifo_timer, SIGNAL (timeout()), SLOT (sendFifoData())); m_fifo_timer -> start (100); } } if ( m_fifo_handle >= 0 ) { - QByteArray* array = m_cache.first(); + TQByteArray* array = m_cache.first(); if ( array && array -> size() > m_fifo_offset ) { #ifdef DEBUG_KPLAYER_KIOSLAVE @@ -1569,7 +1569,7 @@ void KPlayerProcess::playerDataWritten (int fd) #ifdef DEBUG_KPLAYER_KIOSLAVE kdDebugTime() << "Process: Cache: Data written\n"; #endif - QByteArray* array = m_cache.first(); + TQByteArray* array = m_cache.first(); if ( array && array -> size() <= m_fifo_offset ) { #ifdef DEBUG_KPLAYER_KIOSLAVE @@ -1617,7 +1617,7 @@ void KPlayerProcess::playerProcessExited (KProcess *proc) if ( m_slave_job ) m_slave_job -> kill (false); removeDataFifo(); - m_fifo_name = QCString(); + m_fifo_name = TQCString(); if ( ! m_quit ) setState (Idle); } @@ -1701,7 +1701,7 @@ void KPlayerProcess::receivedOutputLine (KPlayerLineOutputProcess* proc, char* s else if ( m_state < Playing || strncmp (str, "ID_", 3) == 0 || strncmp (str, "Name", 4) == 0 || strncmp (str, "ICY Info:", 9) == 0 ) { - QSize size (properties() -> originalSize()); + TQSize size (properties() -> originalSize()); bool hadVideo = properties() -> hasVideo(); bool hadLength = properties() -> hasLength(); properties() -> extractMeta (str, true); @@ -1808,8 +1808,8 @@ void KPlayerProcess::receivedOutputLine (KPlayerLineOutputProcess* proc, char* s #ifdef DEBUG_KPLAYER_PROCESS kdDebugTime() << "Process: Sending audio delay\n"; #endif - QCString s ("audio_delay "); - s += QCString().setNum (- m_send_audio_delay) + "\n"; + TQCString s ("audio_delay "); + s += TQCString().setNum (- m_send_audio_delay) + "\n"; sendPlayerCommand (s); m_send_audio_delay = 0; } @@ -1818,8 +1818,8 @@ void KPlayerProcess::receivedOutputLine (KPlayerLineOutputProcess* proc, char* s #ifdef DEBUG_KPLAYER_PROCESS kdDebugTime() << "Process: Sending subtitle delay\n"; #endif - QCString s ("sub_delay "); - s += QCString().setNum (- m_send_subtitle_delay) + "\n"; + TQCString s ("sub_delay "); + s += TQCString().setNum (- m_send_subtitle_delay) + "\n"; sendPlayerCommand (s); m_send_subtitle_delay = 0; } @@ -1828,8 +1828,8 @@ void KPlayerProcess::receivedOutputLine (KPlayerLineOutputProcess* proc, char* s #ifdef DEBUG_KPLAYER_PROCESS kdDebugTime() << "Process: Sending subtitle position\n"; #endif - QCString s ("sub_pos "); - s += QCString().setNum (m_send_subtitle_position) + "\n"; + TQCString s ("sub_pos "); + s += TQCString().setNum (m_send_subtitle_position) + "\n"; sendPlayerCommand (s); m_send_subtitle_position = 0; } @@ -1955,7 +1955,7 @@ void KPlayerProcess::receivedOutputLine (KPlayerLineOutputProcess* proc, char* s } else if ( ! m_quit ) { - emit messageReceived (QString::fromLocal8Bit (str)); + emit messageReceived (TQString::fromLocal8Bit (str)); #ifdef DEBUG_KPLAYER_PROCESS kdDebugTime() << "process >> " << str << "\n"; #endif diff --git a/kplayer/kplayerprocess.h b/kplayer/kplayerprocess.h index 44bb301..77b4db3 100644 --- a/kplayer/kplayerprocess.h +++ b/kplayer/kplayerprocess.h @@ -20,9 +20,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include class KPlayerConfiguration; class KPlayerTrackProperties; @@ -108,7 +108,7 @@ protected: /**Handles the MPlayer process invocation, input and output. *@author kiriuja */ -class KPlayerProcess : public QObject +class KPlayerProcess : public TQObject { Q_OBJECT @@ -176,7 +176,7 @@ public: float position (void) const { return m_position; } /** Current position as string. */ - QString positionString (void) const; + TQString positionString (void) const; /** Changes volume level. */ void volume (int); @@ -232,9 +232,9 @@ protected: KPlayerConfiguration* configuration (void) const; /** Sends the given command to the MPlayer process. */ - void sendPlayerCommand (QCString&); + void sendPlayerCommand (TQCString&); /** Sends the given command to the MPlayer helper process. */ - void sendHelperCommand (QCString&); + void sendHelperCommand (TQCString&); /** Closes and unlinks the named pipe. */ void removeDataFifo (void); @@ -262,22 +262,22 @@ protected: void transferTemporaryFile (void); /** Name of named pipe used to send data to MPlayer. */ - QCString m_fifo_name; + TQCString m_fifo_name; /** Handle of named pipe used to send data to MPlayer. */ int m_fifo_handle; /** Offset of data to send. */ uint m_fifo_offset; /** Fifo notifier object. */ - QSocketNotifier* m_fifo_notifier; + TQSocketNotifier* m_fifo_notifier; /** Fifo timer object. */ - QTimer* m_fifo_timer; + TQTimer* m_fifo_timer; /** Transfer job. */ KIO::TransferJob* m_slave_job; /** Temporary file transfer job. */ KIO::TransferJob* m_temp_job; /** Cached transfer data. */ - QPtrList m_cache; + TQPtrList m_cache; /** Temporary file from KIOSlave. */ KTempFile* m_temporary_file; @@ -288,9 +288,9 @@ protected: /** Current subtitle index. */ int m_subtitle_index; /** Current list of external subtitles. */ - QStringList m_subtitles; + TQStringList m_subtitles; /** Current vobsub external subtitles. */ - QString m_vobsub; + TQString m_vobsub; /** Current audio delay. */ float m_audio_delay; @@ -324,13 +324,13 @@ protected slots: /** Receives notification when the data has been written to the fifo. */ void playerDataWritten (int); /** Transfers data from a KIOSlave to an MPlayer process. */ - void transferData (KIO::Job*, const QByteArray&); + void transferData (KIO::Job*, const TQByteArray&); /** Transfers data from a KIOSlave to a temporary file. */ - void transferTempData (KIO::Job*, const QByteArray&); + void transferTempData (KIO::Job*, const TQByteArray&); /** Emits file transfer progress signal. */ void transferProgress (KIO::Job*, unsigned long); /** Emits message received signal. */ - void transferInfoMessage (KIO::Job*, const QString&); + void transferInfoMessage (KIO::Job*, const TQString&); /** Processes the result of a slave transfer job. */ void transferDone (KIO::Job*); /** Processes the result of a temporary file transfer job. */ @@ -350,7 +350,7 @@ signals: /** Emitted when the video size becomes known. */ void sizeAvailable (void); /** Emitted when a message is received from the mplayer process. */ - void messageReceived (QString); + void messageReceived (TQString); /** Emitted when MPlayer fails to play a file. */ void errorDetected (void); }; diff --git a/kplayer/kplayerproperties.cpp b/kplayer/kplayerproperties.cpp index 97b10fb..3d7d2ab 100644 --- a/kplayer/kplayerproperties.cpp +++ b/kplayer/kplayerproperties.cpp @@ -16,8 +16,8 @@ #include #include #include -#include -#include +#include +#include #define KPLAYER_PROCESS_SIZE_IDS #ifdef DEBUG @@ -34,33 +34,33 @@ #endif const KURL KPlayerProperties::nullUrl; -const QSize KPlayerProperties::nullSize; -const QStringList KPlayerProperties::nullStringList; -const QMap KPlayerProperties::nullIntegerStringMap; +const TQSize KPlayerProperties::nullSize; +const TQStringList KPlayerProperties::nullStringList; +const TQMap KPlayerProperties::nullIntegerStringMap; KPlayerPropertyInfoMap KPlayerProperties::m_info; KPlayerStringPropertyInfo KPlayerProperties::m_meta_info; -QStringList KPlayerProperties::m_meta_attributes; +TQStringList KPlayerProperties::m_meta_attributes; KPlayerMediaMap KPlayerMedia::m_media_map; int KPlayerItemProperties::m_meta_info_timer = 0; #ifdef DEBUG kdbgstream kdDebugTime (void) { - return kdbgstream (0, 0) << QTime::currentTime().toString ("hh:mm:ss:zzz "); + return kdbgstream (0, 0) << TQTime::currentTime().toString ("hh:mm:ss:zzz "); } #endif -int compareStrings (const QString& s1, const QString& s2) +int compareStrings (const TQString& s1, const TQString& s2) { int r = s1.lower().localeAwareCompare (s2.lower()); return r ? r : s1.localeAwareCompare (s2); } -QString timeString (float l, bool zero_ok) +TQString timeString (float l, bool zero_ok) { l += 0.02; if ( ! zero_ok && l < 0.05 ) - return QString (""); + return TQString (""); int lHour = int (l) / 3600; if ( lHour > 0 ) l -= lHour * 3600; @@ -77,7 +77,7 @@ QString timeString (float l, bool zero_ok) lMinute ++; l -= 60; } - QString s; + TQString s; if ( lHour > 0 ) s.sprintf ("%u:%02u:%04.1f", lHour, lMinute, l); else if ( lMinute > 0 ) @@ -87,12 +87,12 @@ QString timeString (float l, bool zero_ok) return s; } -float stringToFloat (const QString& stime) +float stringToFloat (const TQString& stime) { int comma = stime.find (','); if ( comma >= 0 ) stime [comma] = '.'; - QStringList sl = QStringList::split (':', stime); + TQStringList sl = TQStringList::split (':', stime); int i = 0, n = 0; if ( sl.count() > 4 || sl.count() < 1 ) return 0; @@ -105,7 +105,7 @@ float stringToFloat (const QString& stime) return sl[i].toFloat() + n; } -static void capitalize (QString& key) +static void capitalize (TQString& key) { for ( uint n = 0; n < key.length(); n ++ ) if ( key[n].isLetter() ) @@ -115,7 +115,7 @@ static void capitalize (QString& key) } } -static void capitalizeWords (QString& key) +static void capitalizeWords (TQString& key) { bool inword = false; for ( uint n = 0; n < key.length(); n ++ ) @@ -141,7 +141,7 @@ KPlayerPropertyInfo::~KPlayerPropertyInfo() { } -bool KPlayerPropertyInfo::exists (KPlayerProperties* properties, const QString& name) const +bool KPlayerPropertyInfo::exists (KPlayerProperties* properties, const TQString& name) const { return properties -> config() -> hasKey (name); } @@ -226,7 +226,7 @@ KPlayerProperty* KPlayerFrequencyPropertyInfo::copy (const KPlayerProperty* prop return new KPlayerFrequencyProperty (* (KPlayerFrequencyProperty*) property); } -bool KPlayerFrequencyPropertyInfo::exists (KPlayerProperties* properties, const QString&) const +bool KPlayerFrequencyPropertyInfo::exists (KPlayerProperties* properties, const TQString&) const { return properties -> needsFrequency(); } @@ -320,7 +320,7 @@ KPlayerProperty* KPlayerComboStringPropertyInfo::copy (const KPlayerProperty* pr return new KPlayerComboStringProperty (* (KPlayerComboStringProperty*) property); } -bool KPlayerComboStringPropertyInfo::exists (KPlayerProperties* properties, const QString& name) const +bool KPlayerComboStringPropertyInfo::exists (KPlayerProperties* properties, const TQString& name) const { return KPlayerStringPropertyInfo::exists (properties, name) || KPlayerStringPropertyInfo::exists (properties, name + " Option"); @@ -355,7 +355,7 @@ KPlayerProperty* KPlayerStringHistoryPropertyInfo::copy (const KPlayerProperty* return new KPlayerStringHistoryProperty (* (KPlayerStringHistoryProperty*) property); } -bool KPlayerStringHistoryPropertyInfo::exists (KPlayerProperties* properties, const QString& name) const +bool KPlayerStringHistoryPropertyInfo::exists (KPlayerProperties* properties, const TQString& name) const { return KPlayerStringPropertyInfo::exists (properties, name) || KPlayerStringPropertyInfo::exists (properties, name + " 0"); @@ -376,7 +376,7 @@ KPlayerProperty* KPlayerNamePropertyInfo::copy (const KPlayerProperty* property) return new KPlayerNameProperty (* (KPlayerNameProperty*) property); } -bool KPlayerNamePropertyInfo::exists (KPlayerProperties* properties, const QString&) const +bool KPlayerNamePropertyInfo::exists (KPlayerProperties* properties, const TQString&) const { return properties != properties -> configuration(); } @@ -395,7 +395,7 @@ KPlayerProperty* KPlayerAppendablePropertyInfo::copy (const KPlayerProperty* pro return new KPlayerAppendableProperty (* (KPlayerAppendableProperty*) property); } -bool KPlayerAppendablePropertyInfo::exists (KPlayerProperties* properties, const QString& name) const +bool KPlayerAppendablePropertyInfo::exists (KPlayerProperties* properties, const TQString& name) const { return KPlayerStringPropertyInfo::exists (properties, name) || KPlayerStringPropertyInfo::exists (properties, name + " Option"); @@ -461,12 +461,12 @@ KPlayerProperty::~KPlayerProperty() { } -QString KPlayerProperty::asString (void) const +TQString KPlayerProperty::asString (void) const { - return QString::null; + return TQString::null; } -void KPlayerProperty::fromString (const QString&) +void KPlayerProperty::fromString (const TQString&) { } @@ -475,11 +475,11 @@ int KPlayerProperty::compare (KPlayerProperty*) const return 0; } -void KPlayerProperty::read (KConfig*, const QString&) +void KPlayerProperty::read (KConfig*, const TQString&) { } -void KPlayerProperty::save (KConfig*, const QString&) const +void KPlayerProperty::save (KConfig*, const TQString&) const { } @@ -492,7 +492,7 @@ KPlayerBooleanProperty::~KPlayerBooleanProperty() { } -QString KPlayerBooleanProperty::asString (void) const +TQString KPlayerBooleanProperty::asString (void) const { return value() ? i18n("yes") : i18n("no"); } @@ -502,12 +502,12 @@ int KPlayerBooleanProperty::compare (KPlayerProperty* property) const return value() == ((KPlayerBooleanProperty*) property) -> value() ? 0 : value() ? 1 : -1; } -void KPlayerBooleanProperty::read (KConfig* config, const QString& name) +void KPlayerBooleanProperty::read (KConfig* config, const TQString& name) { setValue (config -> readBoolEntry (name, value())); } -void KPlayerBooleanProperty::save (KConfig* config, const QString& name) const +void KPlayerBooleanProperty::save (KConfig* config, const TQString& name) const { config -> writeEntry (name, value()); } @@ -516,12 +516,12 @@ KPlayerIntegerProperty::~KPlayerIntegerProperty() { } -QString KPlayerIntegerProperty::asString (void) const +TQString KPlayerIntegerProperty::asString (void) const { - return QString::number (value()); + return TQString::number (value()); } -void KPlayerIntegerProperty::fromString (const QString& value) +void KPlayerIntegerProperty::fromString (const TQString& value) { setValue (value.toInt()); } @@ -532,12 +532,12 @@ int KPlayerIntegerProperty::compare (KPlayerProperty* property) const return value() == property_value ? 0 : value() > property_value ? 1 : -1; } -void KPlayerIntegerProperty::read (KConfig* config, const QString& name) +void KPlayerIntegerProperty::read (KConfig* config, const TQString& name) { setValue (config -> readNumEntry (name, value())); } -void KPlayerIntegerProperty::save (KConfig* config, const QString& name) const +void KPlayerIntegerProperty::save (KConfig* config, const TQString& name) const { config -> writeEntry (name, value()); } @@ -565,7 +565,7 @@ void KPlayerRelativeProperty::setValue (int value, int current) } } -QString KPlayerRelativeProperty::asString (void) const +TQString KPlayerRelativeProperty::asString (void) const { return (option() == 0 ? '=' : option() > 0 ? '+' : '-') + KPlayerIntegerProperty::asString(); } @@ -584,13 +584,13 @@ int KPlayerRelativeProperty::compare (KPlayerProperty* property) const return result; } -void KPlayerRelativeProperty::read (KConfig* config, const QString& name) +void KPlayerRelativeProperty::read (KConfig* config, const TQString& name) { KPlayerIntegerProperty::read (config, name); setOption (config -> readNumEntry (name + " Option")); } -void KPlayerRelativeProperty::save (KConfig* config, const QString& name) const +void KPlayerRelativeProperty::save (KConfig* config, const TQString& name) const { if ( option() ) { @@ -603,9 +603,9 @@ KPlayerCacheProperty::~KPlayerCacheProperty() { } -QString KPlayerCacheProperty::asString (void) const +TQString KPlayerCacheProperty::asString (void) const { - return value() > 3 ? KPlayerIntegerProperty::asString() : QString::null; + return value() > 3 ? KPlayerIntegerProperty::asString() : TQString::null; } int KPlayerCacheProperty::compare (KPlayerProperty* property) const @@ -614,7 +614,7 @@ int KPlayerCacheProperty::compare (KPlayerProperty* property) const return value() == property_value || value() < 4 && property_value < 4 ? 0 : value() > property_value ? 1 : -1; } -void KPlayerCacheProperty::read (KConfig* config, const QString& name) +void KPlayerCacheProperty::read (KConfig* config, const TQString& name) { KPlayerIntegerProperty::read (config, name); if ( value() == 2 ) @@ -625,9 +625,9 @@ KPlayerFrequencyProperty::~KPlayerFrequencyProperty() { } -QString KPlayerFrequencyProperty::asString (void) const +TQString KPlayerFrequencyProperty::asString (void) const { - return QString::number ((float) value() / 1000); + return TQString::number ((float) value() / 1000); } int KPlayerFrequencyProperty::compare (KPlayerProperty* property) const @@ -637,7 +637,7 @@ int KPlayerFrequencyProperty::compare (KPlayerProperty* property) const return my_value == property_value ? 0 : my_value > property_value ? 1 : -1; } -void KPlayerFrequencyProperty::save (KConfig* config, const QString& name) const +void KPlayerFrequencyProperty::save (KConfig* config, const TQString& name) const { if ( m_value ) KPlayerIntegerProperty::save (config, name); @@ -653,9 +653,9 @@ KPlayerFloatProperty::~KPlayerFloatProperty() { } -QString KPlayerFloatProperty::asString (void) const +TQString KPlayerFloatProperty::asString (void) const { - return QString::number (value()); + return TQString::number (value()); } int KPlayerFloatProperty::compare (KPlayerProperty* property) const @@ -664,12 +664,12 @@ int KPlayerFloatProperty::compare (KPlayerProperty* property) const return value() == property_value ? 0 : value() > property_value ? 1 : -1; } -void KPlayerFloatProperty::read (KConfig* config, const QString& name) +void KPlayerFloatProperty::read (KConfig* config, const TQString& name) { setValue (config -> readDoubleNumEntry (name, value())); } -void KPlayerFloatProperty::save (KConfig* config, const QString& name) const +void KPlayerFloatProperty::save (KConfig* config, const TQString& name) const { config -> writeEntry (name, value()); } @@ -678,7 +678,7 @@ KPlayerLengthProperty::~KPlayerLengthProperty() { } -QString KPlayerLengthProperty::asString (void) const +TQString KPlayerLengthProperty::asString (void) const { return timeString (value()); } @@ -687,25 +687,25 @@ KPlayerSizeProperty::~KPlayerSizeProperty() { } -QString KPlayerSizeProperty::asString (void) const +TQString KPlayerSizeProperty::asString (void) const { - return QString::number (value().width()) + "x" + QString::number (value().height()); + return TQString::number (value().width()) + "x" + TQString::number (value().height()); } int KPlayerSizeProperty::compare (KPlayerProperty* property) const { - const QSize& property_value = ((KPlayerSizeProperty*) property) -> value(); + const TQSize& property_value = ((KPlayerSizeProperty*) property) -> value(); int area = value().width() * value().height(); int property_area = property_value.width() * property_value.height(); return area == property_area ? 0 : area > property_area ? 1 : -1; } -void KPlayerSizeProperty::read (KConfig* config, const QString& name) +void KPlayerSizeProperty::read (KConfig* config, const TQString& name) { setValue (config -> readSizeEntry (name, &m_value)); } -void KPlayerSizeProperty::save (KConfig* config, const QString& name) const +void KPlayerSizeProperty::save (KConfig* config, const TQString& name) const { config -> writeEntry (name, value()); } @@ -714,22 +714,22 @@ KPlayerDisplaySizeProperty::~KPlayerDisplaySizeProperty() { } -QSize KPlayerDisplaySizeProperty::value (const QSize& current) const +TQSize KPlayerDisplaySizeProperty::value (const TQSize& current) const { if ( option() == 1 ) return value(); - return QSize (current.width(), value().height() * current.width() / value().width()); + return TQSize (current.width(), value().height() * current.width() / value().width()); } -void KPlayerDisplaySizeProperty::setValue (const QSize& value, int option) +void KPlayerDisplaySizeProperty::setValue (const TQSize& value, int option) { setOption (option); setValue (value); } -QString KPlayerDisplaySizeProperty::asString (void) const +TQString KPlayerDisplaySizeProperty::asString (void) const { - return QString (option() == 1 ? i18n("size %1") : i18n("aspect %1")).arg (KPlayerSizeProperty::asString()); + return TQString (option() == 1 ? i18n("size %1") : i18n("aspect %1")).arg (KPlayerSizeProperty::asString()); } int KPlayerDisplaySizeProperty::compare (KPlayerProperty* property) const @@ -738,13 +738,13 @@ int KPlayerDisplaySizeProperty::compare (KPlayerProperty* property) const return option() == property_option ? KPlayerSizeProperty::compare (property) : option() > property_option ? 1 : -1; } -void KPlayerDisplaySizeProperty::read (KConfig* config, const QString& name) +void KPlayerDisplaySizeProperty::read (KConfig* config, const TQString& name) { KPlayerSizeProperty::read (config, name); setOption (config -> readNumEntry (name + " Option", 1)); } -void KPlayerDisplaySizeProperty::save (KConfig* config, const QString& name) const +void KPlayerDisplaySizeProperty::save (KConfig* config, const TQString& name) const { KPlayerSizeProperty::save (config, name); if ( option() != 1 ) @@ -755,12 +755,12 @@ KPlayerStringProperty::~KPlayerStringProperty() { } -QString KPlayerStringProperty::asString (void) const +TQString KPlayerStringProperty::asString (void) const { return value(); } -void KPlayerStringProperty::fromString (const QString& value) +void KPlayerStringProperty::fromString (const TQString& value) { setValue (value); } @@ -770,12 +770,12 @@ int KPlayerStringProperty::compare (KPlayerProperty* property) const return compareStrings (asString(), property -> asString()); } -void KPlayerStringProperty::read (KConfig* config, const QString& name) +void KPlayerStringProperty::read (KConfig* config, const TQString& name) { m_value = config -> readEntry (name, value()); } -void KPlayerStringProperty::save (KConfig* config, const QString& name) const +void KPlayerStringProperty::save (KConfig* config, const TQString& name) const { if ( ! value().isEmpty() ) config -> writeEntry (name, value()); @@ -785,18 +785,18 @@ KPlayerComboStringProperty::~KPlayerComboStringProperty() { } -QString KPlayerComboStringProperty::asString (void) const +TQString KPlayerComboStringProperty::asString (void) const { return option().isNull() ? value() : option(); } -void KPlayerComboStringProperty::read (KConfig* config, const QString& name) +void KPlayerComboStringProperty::read (KConfig* config, const TQString& name) { KPlayerStringProperty::read (config, name); setOption (config -> readEntry (name + " Option", option())); } -void KPlayerComboStringProperty::save (KConfig* config, const QString& name) const +void KPlayerComboStringProperty::save (KConfig* config, const TQString& name) const { KPlayerStringProperty::save (config, name); if ( ! option().isNull() ) @@ -805,7 +805,7 @@ void KPlayerComboStringProperty::save (KConfig* config, const QString& name) con bool KPlayerComboStringProperty::defaults (bool) { - setOption (QString::null); + setOption (TQString::null); return value().isEmpty(); } @@ -813,7 +813,7 @@ KPlayerTranslatedStringProperty::~KPlayerTranslatedStringProperty() { } -QString KPlayerTranslatedStringProperty::asString (void) const +TQString KPlayerTranslatedStringProperty::asString (void) const { if ( value().find ('/') < 0 ) return i18n(value().utf8()); @@ -830,7 +830,7 @@ KPlayerStringHistoryProperty::~KPlayerStringHistoryProperty() { } -void KPlayerStringHistoryProperty::setValue (const QString& value) +void KPlayerStringHistoryProperty::setValue (const TQString& value) { #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerStringHistoryProperty::setValue\n"; @@ -846,7 +846,7 @@ void KPlayerStringHistoryProperty::setValue (const QString& value) } } -void KPlayerStringHistoryProperty::read (KConfig* config, const QString& name) +void KPlayerStringHistoryProperty::read (KConfig* config, const TQString& name) { #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerStringHistoryProperty::read\n"; @@ -859,8 +859,8 @@ void KPlayerStringHistoryProperty::read (KConfig* config, const QString& name) kdDebugTime() << " History " << value() << "\n"; #endif } - QString history; - for ( int i = 0; i < 10 && config -> hasKey (history = name + " " + QString::number (i)); i ++ ) + TQString history; + for ( int i = 0; i < 10 && config -> hasKey (history = name + " " + TQString::number (i)); i ++ ) { m_history << config -> readEntry (history); #ifdef DEBUG_KPLAYER_PROPERTIES @@ -869,13 +869,13 @@ void KPlayerStringHistoryProperty::read (KConfig* config, const QString& name) } } -void KPlayerStringHistoryProperty::save (KConfig* config, const QString& name) const +void KPlayerStringHistoryProperty::save (KConfig* config, const TQString& name) const { #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerStringHistoryProperty::save\n"; #endif KPlayerStringProperty::save (config, name); - QStringList::ConstIterator it (history().begin()); + TQStringList::ConstIterator it (history().begin()); if ( it != history().end() && *it == value() ) ++ it; for ( int i = 0; i < 10 && it != history().end(); i ++ ) @@ -883,7 +883,7 @@ void KPlayerStringHistoryProperty::save (KConfig* config, const QString& name) c #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << " History " << *it << "\n"; #endif - config -> writeEntry (name + " " + QString::number (i), * it ++); + config -> writeEntry (name + " " + TQString::number (i), * it ++); } } */ @@ -892,12 +892,12 @@ KPlayerNameProperty::~KPlayerNameProperty() { } -QString KPlayerNameProperty::asString (void) const +TQString KPlayerNameProperty::asString (void) const { return value().isEmpty() ? m_properties -> defaultName() : value(); } -void KPlayerNameProperty::save (KConfig* config, const QString& name) const +void KPlayerNameProperty::save (KConfig* config, const TQString& name) const { if ( ! value().isEmpty() && value() != m_properties -> defaultName() ) KPlayerStringProperty::save (config, name); @@ -905,7 +905,7 @@ void KPlayerNameProperty::save (KConfig* config, const QString& name) const bool KPlayerNameProperty::defaults (bool) { - setValue (QString::null); + setValue (TQString::null); return false; } @@ -913,26 +913,26 @@ KPlayerAppendableProperty::~KPlayerAppendableProperty() { } -QString KPlayerAppendableProperty::appendableValue (const QString& current) const +TQString KPlayerAppendableProperty::appendableValue (const TQString& current) const { if ( option() == 0 ) return value(); return value().isEmpty() ? current : current.isEmpty() ? value() : current + " " + value(); } -void KPlayerAppendableProperty::setAppendableValue (const QString& value, bool append) +void KPlayerAppendableProperty::setAppendableValue (const TQString& value, bool append) { setOption (append); setValue (value); } -void KPlayerAppendableProperty::read (KConfig* config, const QString& name) +void KPlayerAppendableProperty::read (KConfig* config, const TQString& name) { KPlayerStringProperty::read (config, name); setOption (config -> readBoolEntry (name + " Option", false)); } -void KPlayerAppendableProperty::save (KConfig* config, const QString& name) const +void KPlayerAppendableProperty::save (KConfig* config, const TQString& name) const { KPlayerStringProperty::save (config, name); if ( option() ) @@ -948,19 +948,19 @@ bool KPlayerStringListProperty::defaults (bool) return false; } -void KPlayerStringListProperty::read (KConfig* config, const QString& name) +void KPlayerStringListProperty::read (KConfig* config, const TQString& name) { for ( int i = 0; i < config -> readNumEntry (name); i ++ ) - m_value.append (config -> readEntry ("Child" + QString::number (i))); + m_value.append (config -> readEntry ("Child" + TQString::number (i))); } -void KPlayerStringListProperty::save (KConfig* config, const QString& name) const +void KPlayerStringListProperty::save (KConfig* config, const TQString& name) const { int i = 0; - QStringList::ConstIterator iterator (value().begin()); + TQStringList::ConstIterator iterator (value().begin()); while ( iterator != value().end() ) { - config -> writeEntry ("Child" + QString::number (i), *iterator); + config -> writeEntry ("Child" + TQString::number (i), *iterator); ++ iterator; ++ i; } @@ -972,31 +972,31 @@ KPlayerIntegerStringMapProperty::~KPlayerIntegerStringMapProperty() { } -void KPlayerIntegerStringMapProperty::read (KConfig* config, const QString& name) +void KPlayerIntegerStringMapProperty::read (KConfig* config, const TQString& name) { - static QRegExp re_indexvalue ("^(\\d+)=(.*)$"); - QStringList values (QStringList::split (':', config -> readEntry (name))); - QStringList::ConstIterator iterator (values.begin()); + static TQRegExp re_indexvalue ("^(\\d+)=(.*)$"); + TQStringList values (TQStringList::split (':', config -> readEntry (name))); + TQStringList::ConstIterator iterator (values.begin()); while ( iterator != values.end() ) { if ( re_indexvalue.search (*iterator) >= 0 ) m_value.insert (re_indexvalue.cap (1).toInt(), re_indexvalue.cap (2)); else - m_value.insert ((*iterator).toInt(), QString::null); + m_value.insert ((*iterator).toInt(), TQString::null); ++ iterator; } } -void KPlayerIntegerStringMapProperty::save (KConfig* config, const QString& name) const +void KPlayerIntegerStringMapProperty::save (KConfig* config, const TQString& name) const { if ( value().count() > 1 || ! value().isEmpty() && ! ((KPlayerIntegerStringMapPropertyInfo*) KPlayerProperties::info (name)) -> multipleEntriesRequired() ) { - QStringList values; - QMap::ConstIterator iterator (value().begin()); + TQStringList values; + TQMap::ConstIterator iterator (value().begin()); while ( iterator != value().end() ) { - QString value (QString::number (iterator.key())); + TQString value (TQString::number (iterator.key())); if ( ! iterator.data().isEmpty() ) value += "=" + iterator.data(); values.append (value); @@ -1010,7 +1010,7 @@ KPlayerUrlProperty::~KPlayerUrlProperty() { } -QString KPlayerUrlProperty::asString (void) const +TQString KPlayerUrlProperty::asString (void) const { return value().isLocalFile() ? value().path() : value().prettyURL(); } @@ -1026,12 +1026,12 @@ KPlayerPersistentUrlProperty::~KPlayerPersistentUrlProperty() { } -void KPlayerPersistentUrlProperty::read (KConfig* config, const QString& name) +void KPlayerPersistentUrlProperty::read (KConfig* config, const TQString& name) { setValue (KURL::fromPathOrURL (config -> readEntry (name, value().url()))); } -void KPlayerPersistentUrlProperty::save (KConfig* config, const QString& name) const +void KPlayerPersistentUrlProperty::save (KConfig* config, const TQString& name) const { config -> writeEntry (name, value().url()); } @@ -1041,7 +1041,7 @@ bool KPlayerPersistentUrlProperty::defaults (bool) return true; } -int KPlayerPropertyCounts::count (const QString& key) const +int KPlayerPropertyCounts::count (const TQString& key) const { KPlayerPropertyCounts::ConstIterator iterator = find (key); return iterator == end() ? 0 : iterator.data(); @@ -1166,8 +1166,8 @@ void KPlayerProperties::load (void) } if ( config() -> hasKey ("Keys") ) { - QStringList keys (config() -> readListEntry ("Keys", ';')); - QStringList::ConstIterator keysit (keys.begin()); + TQStringList keys (config() -> readListEntry ("Keys", ';')); + TQStringList::ConstIterator keysit (keys.begin()); while ( keysit != keys.end() ) { if ( config() -> hasKey (*keysit) ) @@ -1192,7 +1192,7 @@ void KPlayerProperties::save (void) const #endif config() -> deleteGroup (configGroup()); config() -> setGroup (configGroup()); - QStringList keys; + TQStringList keys; KPlayerPropertyMap::ConstIterator iterator (m_properties.begin()); while ( iterator != m_properties.end() ) { @@ -1204,7 +1204,7 @@ void KPlayerProperties::save (void) const if ( ! keys.isEmpty() ) config() -> writeEntry ("Keys", keys.join (";")); if ( config() == KPlayerEngine::engine() -> meta() && ! config() -> entryMap (configGroup()).isEmpty() ) - config() -> writeEntry ("Date", QDateTime::currentDateTime()); + config() -> writeEntry ("Date", TQDateTime::currentDateTime()); } void KPlayerProperties::commit (void) @@ -1257,28 +1257,28 @@ void KPlayerProperties::diff (KPlayerProperties* properties) update(); } -int KPlayerProperties::compare (KPlayerProperties* properties, const QString& key) const +int KPlayerProperties::compare (KPlayerProperties* properties, const TQString& key) const { KPlayerProperty* p = property (key); KPlayerProperty* property = properties -> property (key); return p && property ? p -> compare (property) : p ? -1 : property ? 1 : 0; } -QStringList KPlayerProperties::defaultOrder (void) +TQStringList KPlayerProperties::defaultOrder (void) { #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerProperties::defaultOrder\n"; #endif - QStringList order (defaultAttributes()); + TQStringList order (defaultAttributes()); order << ""; KPlayerPropertyInfoMap::ConstIterator iterator (m_info.constBegin()); while ( iterator != m_info.constEnd() ) { - const QString& name (iterator.key()); + const TQString& name (iterator.key()); KPlayerPropertyInfo* info = iterator.data(); if ( info -> canShow() && name != "Track" ) { - QStringList::Iterator it (order.begin()); + TQStringList::Iterator it (order.begin()); while ( it != order.end() ) { KPlayerPropertyInfo* i = KPlayerMedia::info (*it); @@ -1293,19 +1293,19 @@ QStringList KPlayerProperties::defaultOrder (void) return order; } -KPlayerPropertyInfo* KPlayerProperties::info (const QString& key) +KPlayerPropertyInfo* KPlayerProperties::info (const TQString& key) { KPlayerPropertyInfoMap::ConstIterator iterator = m_info.find (key); return iterator == m_info.end() ? &m_meta_info : *iterator; } -KPlayerProperty* KPlayerProperties::property (const QString& key) const +KPlayerProperty* KPlayerProperties::property (const TQString& key) const { KPlayerPropertyMap::ConstIterator iterator = m_properties.find (key); return iterator == m_properties.end() ? 0 : iterator.data(); } -KPlayerProperty* KPlayerProperties::get (const QString& key) +KPlayerProperty* KPlayerProperties::get (const TQString& key) { /*#ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerProperties::get " << key << "\n"; @@ -1324,7 +1324,7 @@ KPlayerProperty* KPlayerProperties::get (const QString& key) return p; } -void KPlayerProperties::reset (const QString& key) +void KPlayerProperties::reset (const TQString& key) { #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerProperties::reset " << key << "\n"; @@ -1348,7 +1348,7 @@ void KPlayerProperties::beginUpdate (void) m_previous.insert (iterator.key(), info (iterator.key()) -> copy (iterator.data())); } -void KPlayerProperties::updated (const QString& key) +void KPlayerProperties::updated (const TQString& key) { if ( m_previous.isEmpty() ) return; @@ -1368,12 +1368,12 @@ void KPlayerProperties::updated (const QString& key) } } -int KPlayerProperties::getBooleanOption (const QString& key) const +int KPlayerProperties::getBooleanOption (const TQString& key) const { return ! has (key) ? 0 : getBoolean (key) ? 1 : 2; } -void KPlayerProperties::setBooleanOption (const QString& key, int value) +void KPlayerProperties::setBooleanOption (const TQString& key, int value) { if ( value == 0 ) reset (key); @@ -1384,18 +1384,18 @@ void KPlayerProperties::setBooleanOption (const QString& key, int value) } } -void KPlayerProperties::set (const QString& key, int value) +void KPlayerProperties::set (const TQString& key, int value) { ((KPlayerIntegerProperty*) get (key)) -> setValue (value); updated (key); } -int KPlayerProperties::getIntegerOption (const QString& key) const +int KPlayerProperties::getIntegerOption (const TQString& key) const { return has (key) ? getInteger (key) + 1 : 0; } -void KPlayerProperties::setIntegerOption (const QString& key, int value) +void KPlayerProperties::setIntegerOption (const TQString& key, int value) { if ( value == 0 ) reset (key); @@ -1403,17 +1403,17 @@ void KPlayerProperties::setIntegerOption (const QString& key, int value) set (key, value - 1); } -int KPlayerProperties::getRelative (const QString& key) const +int KPlayerProperties::getRelative (const TQString& key) const { return limit (getRelativeValue (key), getInteger (key + " Minimum"), getInteger (key + " Maximum")); } -int KPlayerProperties::getRelativeOption (const QString& key) const +int KPlayerProperties::getRelativeOption (const TQString& key) const { return has (key) ? ((KPlayerRelativeProperty*) m_properties [key]) -> option() + 1 : 0; } -void KPlayerProperties::setRelativeOption (const QString& key, int value, int option) +void KPlayerProperties::setRelativeOption (const TQString& key, int value, int option) { if ( option == 0 || value == 0 && option > 1 && option < 4 ) reset (key); @@ -1426,7 +1426,7 @@ void KPlayerProperties::setRelativeOption (const QString& key, int value, int op } } -int KPlayerProperties::getCacheOption (const QString& key) const +int KPlayerProperties::getCacheOption (const TQString& key) const { return has (key) ? getCache (key) + 1 : 0; } @@ -1441,23 +1441,23 @@ void KPlayerProperties::setCacheOption (int cache, int size) setIntegerOption ("Cache", cache < 3 ? cache : size <= 0 ? 2 : size < 4 ? 5 : size + 1); } -void KPlayerProperties::set (const QString& key, float value) +void KPlayerProperties::set (const TQString& key, float value) { ((KPlayerFloatProperty*) get (key)) -> setValue (value); updated (key); } -const QSize& KPlayerProperties::getSize (const QString& key) const +const TQSize& KPlayerProperties::getSize (const TQString& key) const { return has (key) ? ((KPlayerSizeProperty*) m_properties [key]) -> value() : nullSize; } -int KPlayerProperties::getSizeOption (const QString& key) const +int KPlayerProperties::getSizeOption (const TQString& key) const { return has (key) ? ((KPlayerDisplaySizeProperty*) m_properties [key]) -> option() : 0; } -void KPlayerProperties::setSize (const QString& key, const QSize& value) +void KPlayerProperties::setSize (const TQString& key, const TQSize& value) { if ( value.isEmpty() ) reset (key); @@ -1468,7 +1468,7 @@ void KPlayerProperties::setSize (const QString& key, const QSize& value) } } -void KPlayerProperties::setSize (const QString& key, const QSize& value, int option) +void KPlayerProperties::setSize (const TQString& key, const TQSize& value, int option) { if ( value.isValid() && value.width() > 0 && option != 0 ) { @@ -1479,22 +1479,22 @@ void KPlayerProperties::setSize (const QString& key, const QSize& value, int opt reset (key); } -QSize KPlayerProperties::getDisplaySize (const QString& key) const +TQSize KPlayerProperties::getDisplaySize (const TQString& key) const { return getSize (key); } -QString KPlayerProperties::asString (const QString& key) const +TQString KPlayerProperties::asString (const TQString& key) const { - return has (key) ? ((KPlayerProperty*) m_properties [key]) -> asString() : QString::null; + return has (key) ? ((KPlayerProperty*) m_properties [key]) -> asString() : TQString::null; } -QString KPlayerProperties::asIntegerString (const QString& key) const +TQString KPlayerProperties::asIntegerString (const TQString& key) const { - return has (key) ? ((KPlayerIntegerProperty*) m_properties [key]) -> KPlayerIntegerProperty::asString() : QString::null; + return has (key) ? ((KPlayerIntegerProperty*) m_properties [key]) -> KPlayerIntegerProperty::asString() : TQString::null; } -void KPlayerProperties::fromString (const QString& key, const QString& value) +void KPlayerProperties::fromString (const TQString& key, const TQString& value) { if ( value.isEmpty() && has (key) || ! value.isEmpty() && value != asString (key) ) { @@ -1507,27 +1507,27 @@ void KPlayerProperties::fromString (const QString& key, const QString& value) } } -void KPlayerProperties::set (const QString& key, const QString& value) +void KPlayerProperties::set (const TQString& key, const TQString& value) { ((KPlayerStringProperty*) get (key)) -> setValue (value); updated (key); } -void KPlayerProperties::setString (const QString& key, const QString& value) +void KPlayerProperties::setString (const TQString& key, const TQString& value) { - const QString& d (stringInfo (key) -> defaultValue()); + const TQString& d (stringInfo (key) -> defaultValue()); if ( d.isNull() && value.isEmpty() || value == d ) reset (key); else set (key, value); } -const QString& KPlayerProperties::getStringValue (const QString& key) const +const TQString& KPlayerProperties::getStringValue (const TQString& key) const { - return has (key) ? ((KPlayerStringProperty*) m_properties [key]) -> value() : QString::null; + return has (key) ? ((KPlayerStringProperty*) m_properties [key]) -> value() : TQString::null; } -void KPlayerProperties::setComboValue (const QString& key, const QString& value) +void KPlayerProperties::setComboValue (const TQString& key, const TQString& value) { if ( value.isEmpty() ) reset (key); @@ -1535,17 +1535,17 @@ void KPlayerProperties::setComboValue (const QString& key, const QString& value) set (key, value); } -bool KPlayerProperties::hasComboValue (const QString& key) const +bool KPlayerProperties::hasComboValue (const TQString& key) const { return has (key) && ! ((KPlayerStringProperty*) m_properties [key]) -> value().isEmpty(); } -const QString& KPlayerProperties::getStringOption (const QString& key) const +const TQString& KPlayerProperties::getStringOption (const TQString& key) const { - return has (key) ? ((KPlayerComboStringProperty*) m_properties [key]) -> option() : QString::null; + return has (key) ? ((KPlayerComboStringProperty*) m_properties [key]) -> option() : TQString::null; } -void KPlayerProperties::setStringOption (const QString& key, const QString& value) +void KPlayerProperties::setStringOption (const TQString& key, const TQString& value) { if ( value.isNull() && ! hasComboValue (key) ) reset (key); @@ -1556,22 +1556,22 @@ void KPlayerProperties::setStringOption (const QString& key, const QString& valu } } -bool KPlayerProperties::hasComboString (const QString& key) const +bool KPlayerProperties::hasComboString (const TQString& key) const { return ! getComboString (key).isEmpty(); } -/*const QStringList& KPlayerProperties::getHistory (const QString& key) const +/*const TQStringList& KPlayerProperties::getHistory (const TQString& key) const { return has (key) ? ((KPlayerStringHistoryProperty*) m_properties [key]) -> history() : nullStringList; }*/ -int KPlayerProperties::getAppendableOption (const QString& key) const +int KPlayerProperties::getAppendableOption (const TQString& key) const { return ! has (key) ? 0 : ((KPlayerAppendableProperty*) m_properties [key]) -> option() ? 2 : 1; } -void KPlayerProperties::setAppendable (const QString& key, const QString& value, int option) +void KPlayerProperties::setAppendable (const TQString& key, const TQString& value, int option) { if ( option == 0 || option == 2 && value.isEmpty() ) reset (key); @@ -1582,18 +1582,18 @@ void KPlayerProperties::setAppendable (const QString& key, const QString& value, } } -const QStringList& KPlayerProperties::getStringList (const QString& key) const +const TQStringList& KPlayerProperties::getStringList (const TQString& key) const { return has (key) ? ((KPlayerStringListProperty*) m_properties [key]) -> value() : nullStringList; } -void KPlayerProperties::addStringListEntry (const QString& key, const QString& entry) +void KPlayerProperties::addStringListEntry (const TQString& key, const TQString& entry) { ((KPlayerStringListProperty*) get (key)) -> addEntry (entry); updated (key); } -void KPlayerProperties::setStringList (const QString& key, const QStringList& value) +void KPlayerProperties::setStringList (const TQString& key, const TQStringList& value) { if ( value.isEmpty() ) reset (key); @@ -1604,22 +1604,22 @@ void KPlayerProperties::setStringList (const QString& key, const QStringList& va } } -const QMap& KPlayerProperties::getIntegerStringMap (const QString& key) const +const TQMap& KPlayerProperties::getIntegerStringMap (const TQString& key) const { return has (key) ? ((KPlayerIntegerStringMapProperty*) m_properties [key]) -> value() : nullIntegerStringMap; } -void KPlayerProperties::setIntegerStringMapKey (const QString& key, int id) +void KPlayerProperties::setIntegerStringMapKey (const TQString& key, int id) { KPlayerIntegerStringMapProperty* property = (KPlayerIntegerStringMapProperty*) get (key); if ( ! property -> value().contains (id) ) { - property -> setValue (id, QString::null); + property -> setValue (id, TQString::null); updated (key); } } -void KPlayerProperties::setIntegerStringMapKeyValue (const QString& key, int id, const QString& value) +void KPlayerProperties::setIntegerStringMapKeyValue (const TQString& key, int id, const TQString& value) { KPlayerIntegerStringMapProperty* property = (KPlayerIntegerStringMapProperty*) get (key); if ( property -> value() [id] != value ) @@ -1629,22 +1629,22 @@ void KPlayerProperties::setIntegerStringMapKeyValue (const QString& key, int id, } } -bool KPlayerProperties::hasIntegerStringMapKey (const QString& key, int id) const +bool KPlayerProperties::hasIntegerStringMapKey (const TQString& key, int id) const { return has (key) && ((KPlayerIntegerStringMapProperty*) m_properties [key]) -> value().contains (id); } -bool KPlayerProperties::hasIntegerStringMapValue (const QString& key, int id) const +bool KPlayerProperties::hasIntegerStringMapValue (const TQString& key, int id) const { return has (key) && ! ((KPlayerIntegerStringMapProperty*) m_properties [key]) -> value() [id].isEmpty(); } -const KURL& KPlayerProperties::getUrl (const QString& key) const +const KURL& KPlayerProperties::getUrl (const TQString& key) const { return has (key) ? ((KPlayerUrlProperty*) m_properties [key]) -> value() : nullUrl; } -void KPlayerProperties::setUrl (const QString& key, const KURL& value) +void KPlayerProperties::setUrl (const TQString& key, const KURL& value) { if ( value.isValid() ) { @@ -1655,22 +1655,22 @@ void KPlayerProperties::setUrl (const QString& key, const KURL& value) reset (key); } -bool KPlayerProperties::autoloadSubtitles (const QString&) const +bool KPlayerProperties::autoloadSubtitles (const TQString&) const { return false; } -bool KPlayerProperties::getVobsubSubtitles (const QString&, const KURL&) const +bool KPlayerProperties::getVobsubSubtitles (const TQString&, const KURL&) const { return false; } -bool KPlayerProperties::getPlaylist (const QString&, const KURL&) const +bool KPlayerProperties::getPlaylist (const TQString&, const KURL&) const { return false; } -bool KPlayerProperties::getUseKioslave (const QString&, const KURL&) const +bool KPlayerProperties::getUseKioslave (const TQString&, const KURL&) const { return false; } @@ -2195,17 +2195,17 @@ KConfig* KPlayerConfiguration::config (void) const return KPlayerEngine::engine() -> config(); } -QString KPlayerConfiguration::configGroup (void) const +TQString KPlayerConfiguration::configGroup (void) const { return "Player Options"; } -bool KPlayerConfiguration::getBoolean (const QString& key) const +bool KPlayerConfiguration::getBoolean (const TQString& key) const { return has (key) ? ((KPlayerBooleanProperty*) m_properties [key]) -> value() : booleanInfo (key) -> defaultValue(); } -void KPlayerConfiguration::setBoolean (const QString& key, bool value) +void KPlayerConfiguration::setBoolean (const TQString& key, bool value) { if ( value == (booleanInfo (key) -> defaultValue()) ) reset (key); @@ -2216,12 +2216,12 @@ void KPlayerConfiguration::setBoolean (const QString& key, bool value) } } -int KPlayerConfiguration::getInteger (const QString& key) const +int KPlayerConfiguration::getInteger (const TQString& key) const { return has (key) ? ((KPlayerIntegerProperty*) m_properties [key]) -> value() : integerInfo (key) -> defaultValue(); } -void KPlayerConfiguration::setInteger (const QString& key, int value) +void KPlayerConfiguration::setInteger (const TQString& key, int value) { if ( value == integerInfo (key) -> defaultValue() ) reset (key); @@ -2229,39 +2229,39 @@ void KPlayerConfiguration::setInteger (const QString& key, int value) set (key, value); } -int KPlayerConfiguration::getRelativeValue (const QString& key) const +int KPlayerConfiguration::getRelativeValue (const TQString& key) const { return getInteger (key); } -void KPlayerConfiguration::setRelative (const QString& key, int value) +void KPlayerConfiguration::setRelative (const TQString& key, int value) { setInteger (key, value); } -void KPlayerConfiguration::adjustRelative (const QString& key, int value) +void KPlayerConfiguration::adjustRelative (const TQString& key, int value) { setInteger (key, value); } -int KPlayerConfiguration::getCache (const QString& key) const +int KPlayerConfiguration::getCache (const TQString& key) const { int cache = has (key) ? ((KPlayerCacheProperty*) m_properties [key]) -> value() : integerInfo (key) -> defaultValue(); return cache > 2 ? 2 : cache; } -int KPlayerConfiguration::getCacheSize (const QString& key) const +int KPlayerConfiguration::getCacheSize (const TQString& key) const { int size = has (key) ? ((KPlayerCacheProperty*) m_properties [key]) -> value() : integerInfo (key) -> defaultValue(); return size > 3 ? size : 0; } -float KPlayerConfiguration::getFloat (const QString& key) const +float KPlayerConfiguration::getFloat (const TQString& key) const { return has (key) ? ((KPlayerFloatProperty*) m_properties [key]) -> value() : floatInfo (key) -> defaultValue(); } -void KPlayerConfiguration::setFloat (const QString& key, float value) +void KPlayerConfiguration::setFloat (const TQString& key, float value) { if ( value == floatInfo (key) -> defaultValue() ) reset (key); @@ -2269,46 +2269,46 @@ void KPlayerConfiguration::setFloat (const QString& key, float value) set (key, value); } -const QString& KPlayerConfiguration::getString (const QString& key) const +const TQString& KPlayerConfiguration::getString (const TQString& key) const { return has (key) ? ((KPlayerStringProperty*) m_properties [key]) -> value() : stringInfo (key) -> defaultValue(); } -const QString& KPlayerConfiguration::getComboString (const QString& key) const +const TQString& KPlayerConfiguration::getComboString (const TQString& key) const { return getString (key); } -QString KPlayerConfiguration::getAppendable (const QString& key) const +TQString KPlayerConfiguration::getAppendable (const TQString& key) const { return getString (key); } -bool KPlayerConfiguration::autoloadSubtitles (const QString& key) const +bool KPlayerConfiguration::autoloadSubtitles (const TQString& key) const { return getBoolean (key); } -bool vobsub (const QString& path); +bool vobsub (const TQString& path); -bool KPlayerConfiguration::getVobsubSubtitles (const QString&, const KURL& url) const +bool KPlayerConfiguration::getVobsubSubtitles (const TQString&, const KURL& url) const { return url.isValid() && url.isLocalFile() && vobsub (url.path()); } -bool KPlayerConfiguration::getPlaylist (const QString&, const KURL& url) const +bool KPlayerConfiguration::getPlaylist (const TQString&, const KURL& url) const { - static QRegExp re_playlist_url ("^(?:file|http|http_proxy|ftp|smb):/.*\\.(?:ram|smi|smil|rpm|asx|wax|wvx|pls|m3u|strm)(?:\\?|$)", false); + static TQRegExp re_playlist_url ("^(?:file|http|http_proxy|ftp|smb):/.*\\.(?:ram|smi|smil|rpm|asx|wax|wvx|pls|m3u|strm)(?:\\?|$)", false); return re_playlist_url.search (url.url()) >= 0; } -bool KPlayerConfiguration::getUseKioslave (const QString&, const KURL& url) const +bool KPlayerConfiguration::getUseKioslave (const TQString&, const KURL& url) const { - static QRegExp re_remote_url ("^[A-Za-z]+:/"); - static QRegExp re_mplayer_url ("^(?:file|http_proxy|mms|mmst|mmsu|rtp|rtsp|sip|pnm|dvd|vcd|tv|dvb|mf|cdda|cddb|cue|sdp|mpst|tivo):/", false); - static QRegExp re_http_url ("^http:/", false); - static QRegExp re_ftp_url ("^ftp:/", false); - static QRegExp re_smb_url ("^smb:/", false); + static TQRegExp re_remote_url ("^[A-Za-z]+:/"); + static TQRegExp re_mplayer_url ("^(?:file|http_proxy|mms|mmst|mmsu|rtp|rtsp|sip|pnm|dvd|vcd|tv|dvb|mf|cdda|cddb|cue|sdp|mpst|tivo):/", false); + static TQRegExp re_http_url ("^http:/", false); + static TQRegExp re_ftp_url ("^ftp:/", false); + static TQRegExp re_smb_url ("^smb:/", false); if ( re_http_url.search (url.url()) >= 0 ) return configuration() -> useKioslaveForHttp(); if ( re_ftp_url.search (url.url()) >= 0 ) @@ -2343,11 +2343,11 @@ void KPlayerConfiguration::itemReset (void) } } -QStringList KPlayerConfiguration::subtitleExtensions (void) const +TQStringList KPlayerConfiguration::subtitleExtensions (void) const { - static QRegExp re_split ("\\s*[,;:. ]\\s*"); - QStringList exts, extlist (QStringList::split (re_split, autoloadExtensionList())); - QStringList::ConstIterator extiterator (extlist.constBegin()); + static TQRegExp re_split ("\\s*[,;:. ]\\s*"); + TQStringList exts, extlist (TQStringList::split (re_split, autoloadExtensionList())); + TQStringList::ConstIterator extiterator (extlist.constBegin()); while ( extiterator != extlist.constEnd() ) { if ( ! (*extiterator).isEmpty() ) @@ -2357,10 +2357,10 @@ QStringList KPlayerConfiguration::subtitleExtensions (void) const return exts; } -QSize KPlayerConfiguration::autoexpandAspect (void) const +TQSize KPlayerConfiguration::autoexpandAspect (void) const { int option = subtitleAutoexpand(); - return option == 1 ? QSize (1, 1) : option == 2 ? QSize (4, 3) : option == 3 ? QSize (16, 9) : QSize(); + return option == 1 ? TQSize (1, 1) : option == 2 ? TQSize (4, 3) : option == 3 ? TQSize (16, 9) : TQSize(); } int KPlayerConfiguration::sliderMarksInterval (int span) const @@ -2401,7 +2401,7 @@ void KPlayerMedia::setParent (KPlayerMedia* media) } } -QString KPlayerMedia::configGroup (void) const +TQString KPlayerMedia::configGroup (void) const { return url().url(); } @@ -2420,12 +2420,12 @@ bool KPlayerMedia::release (void) return result; } -bool KPlayerMedia::getBoolean (const QString& key) const +bool KPlayerMedia::getBoolean (const TQString& key) const { return has (key) ? ((KPlayerBooleanProperty*) m_properties [key]) -> value() : parent() -> getBoolean (key); } -void KPlayerMedia::setBoolean (const QString& key, bool value) +void KPlayerMedia::setBoolean (const TQString& key, bool value) { if ( value == parent() -> getBoolean (key) ) reset (key); @@ -2436,12 +2436,12 @@ void KPlayerMedia::setBoolean (const QString& key, bool value) } } -int KPlayerMedia::getInteger (const QString& key) const +int KPlayerMedia::getInteger (const TQString& key) const { return has (key) ? ((KPlayerIntegerProperty*) m_properties [key]) -> value() : parent() -> getInteger (key); } -void KPlayerMedia::setInteger (const QString& key, int value) +void KPlayerMedia::setInteger (const TQString& key, int value) { if ( value == parent() -> getInteger (key) ) reset (key); @@ -2449,13 +2449,13 @@ void KPlayerMedia::setInteger (const QString& key, int value) set (key, value); } -int KPlayerMedia::getRelativeValue (const QString& key) const +int KPlayerMedia::getRelativeValue (const TQString& key) const { int current = parent() -> getRelativeValue (key); return has (key) ? ((KPlayerRelativeProperty*) m_properties [key]) -> value (current) : current; } -void KPlayerMedia::setRelative (const QString& key, int value) +void KPlayerMedia::setRelative (const TQString& key, int value) { int current = parent() -> getRelativeValue (key); if ( value == current ) @@ -2467,7 +2467,7 @@ void KPlayerMedia::setRelative (const QString& key, int value) } } -void KPlayerMedia::adjustRelative (const QString& key, int value) +void KPlayerMedia::adjustRelative (const TQString& key, int value) { int option = getRelativeOption (key); if ( option == 1 ) @@ -2491,7 +2491,7 @@ void KPlayerMedia::adjustRelative (const QString& key, int value) } } -int KPlayerMedia::getCache (const QString& key) const +int KPlayerMedia::getCache (const TQString& key) const { if ( ! has (key) ) return parent() -> getCache (key); @@ -2499,7 +2499,7 @@ int KPlayerMedia::getCache (const QString& key) const return cache > 2 ? 2 : cache; } -int KPlayerMedia::getCacheSize (const QString& key) const +int KPlayerMedia::getCacheSize (const TQString& key) const { if ( ! has (key) ) return parent() -> getCacheSize (key); @@ -2507,12 +2507,12 @@ int KPlayerMedia::getCacheSize (const QString& key) const return size > 3 ? size : 0; } -float KPlayerMedia::getFloat (const QString& key) const +float KPlayerMedia::getFloat (const TQString& key) const { return has (key) ? ((KPlayerFloatProperty*) m_properties [key]) -> value() : parent() -> getFloat (key); } -void KPlayerMedia::setFloat (const QString& key, float value) +void KPlayerMedia::setFloat (const TQString& key, float value) { if ( value == parent() -> getFloat (key) ) reset (key); @@ -2520,25 +2520,25 @@ void KPlayerMedia::setFloat (const QString& key, float value) set (key, value); } -const QString& KPlayerMedia::getString (const QString& key) const +const TQString& KPlayerMedia::getString (const TQString& key) const { return has (key) ? ((KPlayerStringProperty*) m_properties [key]) -> value() : parent() -> getString (key); } -const QString& KPlayerMedia::getComboString (const QString& key) const +const TQString& KPlayerMedia::getComboString (const TQString& key) const { return has (key) ? ((KPlayerComboStringProperty*) m_properties [key]) -> option() : parent() -> getComboString (key); } -QString KPlayerMedia::getAppendable (const QString& key) const +TQString KPlayerMedia::getAppendable (const TQString& key) const { - QString current (parent() -> getAppendable (key)); + TQString current (parent() -> getAppendable (key)); return has (key) ? ((KPlayerAppendableProperty*) m_properties [key]) -> appendableValue (current) : current; } KPlayerGenericProperties* KPlayerMedia::genericProperties (const KURL& url) { - QString urls (url.url()); + TQString urls (url.url()); KPlayerGenericProperties* properties = (KPlayerGenericProperties*) reference (urls); if ( ! properties ) { @@ -2551,7 +2551,7 @@ KPlayerGenericProperties* KPlayerMedia::genericProperties (const KURL& url) KPlayerDeviceProperties* KPlayerMedia::deviceProperties (const KURL& url) { - QString urls (url.url()); + TQString urls (url.url()); KPlayerDeviceProperties* properties = (KPlayerDeviceProperties*) reference (urls); if ( ! properties ) { @@ -2564,7 +2564,7 @@ KPlayerDeviceProperties* KPlayerMedia::deviceProperties (const KURL& url) KPlayerTVProperties* KPlayerMedia::tvProperties (const KURL& url) { - QString urls (url.url()); + TQString urls (url.url()); KPlayerTVProperties* properties = (KPlayerTVProperties*) reference (urls); if ( ! properties ) { @@ -2577,7 +2577,7 @@ KPlayerTVProperties* KPlayerMedia::tvProperties (const KURL& url) KPlayerDVBProperties* KPlayerMedia::dvbProperties (const KURL& url) { - QString urls (url.url()); + TQString urls (url.url()); KPlayerDVBProperties* properties = (KPlayerDVBProperties*) reference (urls); if ( ! properties ) { @@ -2590,7 +2590,7 @@ KPlayerDVBProperties* KPlayerMedia::dvbProperties (const KURL& url) KPlayerDiskProperties* KPlayerMedia::diskProperties (const KURL& url) { - QString urls (url.url()); + TQString urls (url.url()); KPlayerDiskProperties* properties = (KPlayerDiskProperties*) reference (urls); if ( ! properties ) { @@ -2603,7 +2603,7 @@ KPlayerDiskProperties* KPlayerMedia::diskProperties (const KURL& url) KPlayerDiskProperties* KPlayerMedia::diskProperties (KPlayerDeviceProperties* parent, const KURL& url) { - QString urls (url.url()); + TQString urls (url.url()); KPlayerDiskProperties* properties = (KPlayerDiskProperties*) reference (urls); if ( properties ) properties -> setParent (parent); @@ -2619,7 +2619,7 @@ KPlayerDiskProperties* KPlayerMedia::diskProperties (KPlayerDeviceProperties* pa KPlayerTrackProperties* KPlayerMedia::trackProperties (const KURL& url) { - QString urls (url.url()); + TQString urls (url.url()); KPlayerTrackProperties* properties = (KPlayerTrackProperties*) reference (urls); if ( ! properties ) { @@ -2647,7 +2647,7 @@ KPlayerTrackProperties* KPlayerMedia::trackProperties (const KURL& url) return properties; } -KPlayerMedia* KPlayerMedia::reference (const QString& urls) +KPlayerMedia* KPlayerMedia::reference (const TQString& urls) { #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerMedia::reference\n"; @@ -2668,7 +2668,7 @@ KPlayerMedia* KPlayerMedia::reference (const QString& urls) void KPlayerMedia::release (KPlayerMedia* media) { - QString urls (media -> url().url()); + TQString urls (media -> url().url()); if ( media -> release() ) m_media_map.remove (urls); } @@ -2693,17 +2693,17 @@ KConfig* KPlayerGenericProperties::config (void) const return KPlayerEngine::engine() -> store(); } -QString KPlayerGenericProperties::defaultName (void) const +TQString KPlayerGenericProperties::defaultName (void) const { return ! m_default_name.isEmpty() ? m_default_name : url().fileName().isEmpty() ? url().prettyURL() : url().fileName(); } -QString KPlayerGenericProperties::type (const QString& id) const +TQString KPlayerGenericProperties::type (const TQString& id) const { KURL u (url()); u.addPath (id); - QString urls (u.url()); + TQString urls (u.url()); KPlayerMediaMap::ConstIterator iterator = m_media_map.find (urls); if ( iterator != m_media_map.end() ) return ((KPlayerMediaProperties*) *iterator) -> type(); @@ -2711,7 +2711,7 @@ QString KPlayerGenericProperties::type (const QString& id) const return config() -> readEntry ("Type"); } -float KPlayerGenericProperties::msf (const QString& id) const +float KPlayerGenericProperties::msf (const TQString& id) const { KURL u (url()); u.addPath (id); @@ -2719,7 +2719,7 @@ float KPlayerGenericProperties::msf (const QString& id) const return config() -> readDoubleNumEntry ("MSF"); } -bool KPlayerGenericProperties::hidden (const QString& id) const +bool KPlayerGenericProperties::hidden (const TQString& id) const { KURL u (url()); u.addPath (id); @@ -2727,7 +2727,7 @@ bool KPlayerGenericProperties::hidden (const QString& id) const return config() -> readBoolEntry ("Hidden"); } -void KPlayerGenericProperties::setHidden (const QString& id, bool hidden) +void KPlayerGenericProperties::setHidden (const TQString& id, bool hidden) { KURL u (url()); u.addPath (id); @@ -2735,9 +2735,9 @@ void KPlayerGenericProperties::setHidden (const QString& id, bool hidden) return config() -> writeEntry ("Hidden", hidden); } -QString KPlayerGenericProperties::caption (void) const +TQString KPlayerGenericProperties::caption (void) const { - QString n (currentName()); + TQString n (currentName()); if ( n.isEmpty() && url().isLocalFile() ) n = url().path(); if ( n.isEmpty() ) @@ -2745,7 +2745,7 @@ QString KPlayerGenericProperties::caption (void) const return n; } -QString KPlayerGenericProperties::icon (void) const +TQString KPlayerGenericProperties::icon (void) const { return getString ("Icon"); } @@ -2765,24 +2765,24 @@ KPlayerMediaProperties::~KPlayerMediaProperties() #endif } -void KPlayerMediaProperties::setDisplaySize (const QSize& size, int option) +void KPlayerMediaProperties::setDisplaySize (const TQSize& size, int option) { setSize ("Display Size", size, option); } -QString KPlayerMediaProperties::demuxerString (void) const +TQString KPlayerMediaProperties::demuxerString (void) const { return demuxerOption(); //if ( ! demuxer.isEmpty() ) // demuxer += ","; } -QString KPlayerMediaProperties::audioDriverString (void) const +TQString KPlayerMediaProperties::audioDriverString (void) const { - QString driver (audioDriver()); + TQString driver (audioDriver()); if ( ! driver.isEmpty() ) { - QString device (audioDevice()); + TQString device (audioDevice()); if ( ! device.isEmpty() ) { device.replace (',', '.'); @@ -2796,29 +2796,29 @@ QString KPlayerMediaProperties::audioDriverString (void) const return driver; } -QString KPlayerMediaProperties::mixerChannelString (void) const +TQString KPlayerMediaProperties::mixerChannelString (void) const { - static QRegExp re_mixer_channel ("^(.*) +([0-9]+)$"); - QString channel (mixerChannel()); + static TQRegExp re_mixer_channel ("^(.*) +([0-9]+)$"); + TQString channel (mixerChannel()); if ( re_mixer_channel.search (channel) >= 0 ) channel = re_mixer_channel.cap(1) + "," + re_mixer_channel.cap(2); return channel; } -QString KPlayerMediaProperties::audioCodecString (void) const +TQString KPlayerMediaProperties::audioCodecString (void) const { - QString codec (audioCodecOption()); + TQString codec (audioCodecOption()); if ( ! codec.isEmpty() ) codec += ","; return codec; } -QString KPlayerMediaProperties::videoDriverString (void) const +TQString KPlayerMediaProperties::videoDriverString (void) const { - QString driver (videoDriver()); + TQString driver (videoDriver()); if ( ! driver.isEmpty() ) { - QString device (videoDevice()); + TQString device (videoDevice()); if ( ! device.isEmpty() ) { device.replace (',', '.'); @@ -2832,9 +2832,9 @@ QString KPlayerMediaProperties::videoDriverString (void) const return driver; } -QString KPlayerMediaProperties::videoCodecString (void) const +TQString KPlayerMediaProperties::videoCodecString (void) const { - QString codec (videoCodecOption()); + TQString codec (videoCodecOption()); if ( ! codec.isEmpty() ) codec += ","; return codec; @@ -2859,7 +2859,7 @@ KPlayerDeviceProperties::~KPlayerDeviceProperties() void KPlayerDeviceProperties::setupInfo (void) { KPlayerMediaProperties::setupInfo(); - setPath ("/" + m_url.path().section ('/', 1, 0xffffffff, QString::SectionSkipEmpty)); + setPath ("/" + m_url.path().section ('/', 1, 0xffffffff, TQString::SectionSkipEmpty)); } KPlayerTunerProperties::KPlayerTunerProperties (KPlayerProperties* parent, const KURL& url) @@ -2877,9 +2877,9 @@ KPlayerTunerProperties::~KPlayerTunerProperties() #endif } -int KPlayerTunerProperties::channelFrequency (const QString& id) const +int KPlayerTunerProperties::channelFrequency (const TQString& id) const { - QMap::ConstIterator iterator = m_frequencies.find (id); + TQMap::ConstIterator iterator = m_frequencies.find (id); if ( iterator == m_frequencies.end() ) { ((KPlayerTunerProperties*) this) -> channels(); @@ -3068,12 +3068,12 @@ KPlayerTVProperties::~KPlayerTVProperties() #endif } -QString KPlayerTVProperties::channelListFromCountry (void) +TQString KPlayerTVProperties::channelListFromCountry (void) { #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerTVProperties::channelListFromCountry\n"; #endif - QString country (KGlobal::locale() -> country().lower()); + TQString country (KGlobal::locale() -> country().lower()); #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << " Country " << country << "\n"; #endif @@ -3097,16 +3097,16 @@ void KPlayerTVProperties::setupMeta (void) setChannelList (channelListFromCountry()); } -QStringList KPlayerTVProperties::channels (void) +TQStringList KPlayerTVProperties::channels (void) { #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerTVProperties::channels\n"; kdDebugTime() << " URL " << url() << "\n"; #endif m_frequencies.clear(); - QString id; - QStringList channels; - const QString& channellist (channelList()); + TQString id; + TQStringList channels; + const TQString& channellist (channelList()); for ( uint i = 0; i < channellistcount; i ++ ) { const struct KPlayerChannelList& list = channellists[i]; @@ -3120,14 +3120,14 @@ QStringList KPlayerTVProperties::channels (void) { if ( group.first_channel >= 0 ) { - id = QString::number (c + group.first_channel).rightJustify (group.digits, '0'); + id = TQString::number (c + group.first_channel).rightJustify (group.digits, '0'); if ( group.prefix ) id = group.prefix + id; } else { id = group.prefix; - QChar& lastchr (id.ref (id.length() - 1)); + TQChar& lastchr (id.ref (id.length() - 1)); lastchr = lastchr.unicode() + c; } channels.append (id); @@ -3163,10 +3163,10 @@ void KPlayerDVBProperties::setupMeta (void) #endif if ( ! hasChannelList() ) { - QString paths[] = { QDir::homeDirPath() + "/.mplayer", "/etc/mplayer", "/usr/local/etc/mplayer" }; + TQString paths[] = { TQDir::homeDirPath() + "/.mplayer", "/etc/mplayer", "/usr/local/etc/mplayer" }; const char* globs[] = { "channels.conf", "channels.conf.sat", "channels.conf.ter", "channels.conf.cbl", "channels.conf.atsc", "channels.conf.*", "channels.conf*", "*channels.conf" }; - for ( uint i = 0; i < sizeof (paths) / sizeof (QString); i ++ ) + for ( uint i = 0; i < sizeof (paths) / sizeof (TQString); i ++ ) { #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << " Looking for channels file in " << paths[i] << "\n"; @@ -3176,14 +3176,14 @@ void KPlayerDVBProperties::setupMeta (void) #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << " Checking " << globs[j] << "\n"; #endif - QDir dir (paths[i], globs[j], QDir::Unsorted, QDir::Files); - const QFileInfoList* list = dir.entryInfoList(); + TQDir dir (paths[i], globs[j], TQDir::Unsorted, TQDir::Files); + const TQFileInfoList* list = dir.entryInfoList(); if ( list ) { - QFileInfoListIterator it (*list); - while ( QFileInfo* info = it.current() ) + TQFileInfoListIterator it (*list); + while ( TQFileInfo* info = it.current() ) { - QString path (info -> filePath()); + TQString path (info -> filePath()); #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << " Verifying " << path << "\n"; #endif @@ -3203,20 +3203,20 @@ void KPlayerDVBProperties::setupMeta (void) } } -QStringList KPlayerDVBProperties::channels (void) +TQStringList KPlayerDVBProperties::channels (void) { - static QRegExp re_channel ("^([^#:][^:]*):(\\d+):"); + static TQRegExp re_channel ("^([^#:][^:]*):(\\d+):"); #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerDVBProperties::channels\n"; kdDebugTime() << " URL " << url() << "\n"; #endif m_names.clear(); m_frequencies.clear(); - QStringList channels; + TQStringList channels; if ( hasChannelList() ) { - QString id; - QFile file (channelList()); + TQString id; + TQFile file (channelList()); file.open (IO_ReadOnly); while ( file.readLine (id, 1024) >= 0 ) { @@ -3225,16 +3225,16 @@ QStringList KPlayerDVBProperties::channels (void) #endif if ( re_channel.search (id) >= 0 ) { - QString name (re_channel.cap(1)); + TQString name (re_channel.cap(1)); int frequency = re_channel.cap(2).toInt(); if ( frequency > 20000000 ) frequency /= 1000; - QString base (name); + TQString base (name); base = base.replace ('/', '-').simplifyWhiteSpace(); id = base; int i = 0; while ( m_names.contains (id) ) - id = base + QString::number (i ++); + id = base + TQString::number (i ++); channels.append (id); m_names.insert (id, name); m_frequencies.insert (id, frequency); @@ -3300,7 +3300,7 @@ KPlayerTrackProperties::~KPlayerTrackProperties() #endif } -void KPlayerTrackProperties::setDisplaySize (const QSize& size, int option) +void KPlayerTrackProperties::setDisplaySize (const TQSize& size, int option) { if ( ! size.isEmpty() && hasOriginalSize() && (option == 1 && currentSize() == size || option == 2 && size.width() * currentSize().height() == size.height() * currentSize().width()) ) @@ -3314,19 +3314,19 @@ KConfig* KPlayerTrackProperties::config (void) const return KPlayerEngine::engine() -> meta(); } -QString KPlayerTrackProperties::deviceOption (void) const +TQString KPlayerTrackProperties::deviceOption (void) const { - return QString::null; + return TQString::null; } -QString KPlayerTrackProperties::deviceSetting (void) const +TQString KPlayerTrackProperties::deviceSetting (void) const { - return QString::null; + return TQString::null; } -QString KPlayerTrackProperties::extension (void) const +TQString KPlayerTrackProperties::extension (void) const { - return QFileInfo (url().fileName()).extension(false).lower(); + return TQFileInfo (url().fileName()).extension(false).lower(); } void KPlayerTrackProperties::setupMeta (void) @@ -3337,9 +3337,9 @@ void KPlayerTrackProperties::setupMeta (void) m_height_adjusted = hasOriginalSize(); } -void KPlayerTrackProperties::importMeta (QString key, QString value) +void KPlayerTrackProperties::importMeta (TQString key, TQString value) { - static QRegExp re_track ("^(?:Track|Pista) *[0-9]*$", false); + static TQRegExp re_track ("^(?:Track|Pista) *[0-9]*$", false); key = key.lower(); capitalizeWords (key); if ( key == "Layer" || key == "Version" || key == "Comment" || key == "Comments" @@ -3394,7 +3394,7 @@ void KPlayerTrackProperties::importMeta (QString key, QString value) } else { - QString lovalue (value.lower()); + TQString lovalue (value.lower()); if ( lovalue != "no title" && lovalue != "title" && lovalue != "artist" && lovalue != "album" && lovalue != "genre" && lovalue != "various artists" && lovalue != "various" && lovalue != "unknown" && lovalue != "other" @@ -3409,37 +3409,37 @@ void KPlayerTrackProperties::importMeta (QString key, QString value) } } -void KPlayerTrackProperties::extractMeta (const QString& str, bool update) +void KPlayerTrackProperties::extractMeta (const TQString& str, bool update) { - static QRegExp re_video ("^V(?:IDE)?O: *\\S+ +(\\d+)x(\\d+)"); - static QRegExp re_vo ("^V(?:IDE)?O:.* (\\d+)x(\\d+) +=> +(\\d+)x(\\d+)"); - static QRegExp re_vc ("^(?:ID_VIDEO_CODEC=|Selected video codec: \\[)([A-Za-z0-9,:.-]+)(?:$|\\])"); - static QRegExp re_ac ("^(?:ID_AUDIO_CODEC=|Selected audio codec: \\[)([A-Za-z0-9,:.-]+)(?:$|\\])"); + static TQRegExp re_video ("^V(?:IDE)?O: *\\S+ +(\\d+)x(\\d+)"); + static TQRegExp re_vo ("^V(?:IDE)?O:.* (\\d+)x(\\d+) +=> +(\\d+)x(\\d+)"); + static TQRegExp re_vc ("^(?:ID_VIDEO_CODEC=|Selected video codec: \\[)([A-Za-z0-9,:.-]+)(?:$|\\])"); + static TQRegExp re_ac ("^(?:ID_AUDIO_CODEC=|Selected audio codec: \\[)([A-Za-z0-9,:.-]+)(?:$|\\])"); #ifdef KPLAYER_PROCESS_SIZE_IDS - static QRegExp re_vw ("^ID_VIDEO_WIDTH=(\\d+)$"); - static QRegExp re_vh ("^ID_VIDEO_HEIGHT=(\\d+)$"); - static QRegExp re_va ("^ID_VIDEO_ASPECT=([0-9.]+)$"); + static TQRegExp re_vw ("^ID_VIDEO_WIDTH=(\\d+)$"); + static TQRegExp re_vh ("^ID_VIDEO_HEIGHT=(\\d+)$"); + static TQRegExp re_va ("^ID_VIDEO_ASPECT=([0-9.]+)$"); #endif - static QRegExp re_vbr ("^ID_VIDEO_BITRATE=(\\d+)$"); - static QRegExp re_vfr ("^ID_VIDEO_FPS=([0-9.]+)$"); - static QRegExp re_vid ("^ID_VIDEO_ID=(\\d+)$"); - static QRegExp re_abr ("^ID_AUDIO_BITRATE=(\\d+)$"); - static QRegExp re_asr ("^ID_AUDIO_RATE=(\\d+)$"); - static QRegExp re_ach ("^ID_AUDIO_NCH=(\\d+)$"); - static QRegExp re_aid ("^ID_AUDIO_ID=(\\d+)$"); - static QRegExp re_alang ("^ID_AID_(\\d+)_LANG=(.+)$"); - static QRegExp re_sid ("^ID_SUBTITLE_ID=(\\d+)$"); - static QRegExp re_slang ("^ID_SID_(\\d+)_LANG=(.+)$"); - static QRegExp re_vsid ("^ID_VOBSUB_ID=(\\d+)$"); - static QRegExp re_vslang ("^ID_VSID_(\\d+)_LANG=(.+)$"); - static QRegExp re_length ("^(?:ID|ANS)_LENGTH=(\\d+\\.?\\d*)$"); - static QRegExp re_demuxer ("^ID_DEMUXER=(.+)$"); - static QRegExp re_name_sc ("^Name *: *(.+)$"); - static QRegExp re_name ("^ID_CLIP_INFO_NAME[0-9]+=(.+)$"); - static QRegExp re_value ("^ID_CLIP_INFO_VALUE[0-9]+=(.+)$"); - static QRegExp re_icyinfo ("^ICY Info: StreamTitle='([^']*)'"); + static TQRegExp re_vbr ("^ID_VIDEO_BITRATE=(\\d+)$"); + static TQRegExp re_vfr ("^ID_VIDEO_FPS=([0-9.]+)$"); + static TQRegExp re_vid ("^ID_VIDEO_ID=(\\d+)$"); + static TQRegExp re_abr ("^ID_AUDIO_BITRATE=(\\d+)$"); + static TQRegExp re_asr ("^ID_AUDIO_RATE=(\\d+)$"); + static TQRegExp re_ach ("^ID_AUDIO_NCH=(\\d+)$"); + static TQRegExp re_aid ("^ID_AUDIO_ID=(\\d+)$"); + static TQRegExp re_alang ("^ID_AID_(\\d+)_LANG=(.+)$"); + static TQRegExp re_sid ("^ID_SUBTITLE_ID=(\\d+)$"); + static TQRegExp re_slang ("^ID_SID_(\\d+)_LANG=(.+)$"); + static TQRegExp re_vsid ("^ID_VOBSUB_ID=(\\d+)$"); + static TQRegExp re_vslang ("^ID_VSID_(\\d+)_LANG=(.+)$"); + static TQRegExp re_length ("^(?:ID|ANS)_LENGTH=(\\d+\\.?\\d*)$"); + static TQRegExp re_demuxer ("^ID_DEMUXER=(.+)$"); + static TQRegExp re_name_sc ("^Name *: *(.+)$"); + static TQRegExp re_name ("^ID_CLIP_INFO_NAME[0-9]+=(.+)$"); + static TQRegExp re_value ("^ID_CLIP_INFO_VALUE[0-9]+=(.+)$"); + static TQRegExp re_icyinfo ("^ICY Info: StreamTitle='([^']*)'"); static int width = 0; - static QString key; + static TQString key; static bool seen_length = false; if ( str.startsWith ("ID_FILENAME=") ) seen_length = false; @@ -3470,8 +3470,8 @@ void KPlayerTrackProperties::extractMeta (const QString& str, bool update) } else if ( (update || ! heightAdjusted()) && re_vo.search (str) >= 0 ) { - QSize res (re_vo.cap(1).toInt(), re_vo.cap(2).toInt()); - QSize size (re_vo.cap(3).toInt(), re_vo.cap(4).toInt()); + TQSize res (re_vo.cap(1).toInt(), re_vo.cap(2).toInt()); + TQSize size (re_vo.cap(3).toInt(), re_vo.cap(4).toInt()); if ( res == resolution() ) { setOriginalSize (size); @@ -3493,7 +3493,7 @@ void KPlayerTrackProperties::extractMeta (const QString& str, bool update) } else if ( (update || ! hasResolution()) && re_video.search (str) >= 0 ) { - setResolution (QSize (re_video.cap(1).toInt(), re_video.cap(2).toInt())); + setResolution (TQSize (re_video.cap(1).toInt(), re_video.cap(2).toInt())); #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "Process: Width " << resolution().width() << " Height " << resolution().height() << "\n"; #endif @@ -3508,7 +3508,7 @@ void KPlayerTrackProperties::extractMeta (const QString& str, bool update) } else if ( width > 0 && resolution().height() <= 0 && re_vh.search (str) >= 0 ) { - setResolution (QSize (width, re_vh.cap(1).toInt())); + setResolution (TQSize (width, re_vh.cap(1).toInt())); #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "Process: Height " << resolution().height() << "\n"; #endif @@ -3535,7 +3535,7 @@ void KPlayerTrackProperties::extractMeta (const QString& str, bool update) #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "Process: Aspect " << a << " (" << w << "x" << h << ")\n"; #endif - setOriginalSize (QSize (resolution().width(), (resolution().width() * h + w / 2) / w)); + setOriginalSize (TQSize (resolution().width(), (resolution().width() * h + w / 2) / w)); #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "Process: Adjusted height " << originalSize().height() << "\n"; #endif @@ -3713,22 +3713,22 @@ int KPlayerTrackProperties::fastSeek (void) const return seek; } -QSize KPlayerTrackProperties::getDisplaySize (const QString& key) const +TQSize KPlayerTrackProperties::getDisplaySize (const TQString& key) const { - const QSize& current (currentSize()); + const TQSize& current (currentSize()); return has (key) ? ((KPlayerDisplaySizeProperty*) m_properties [key]) -> value (current) : current; } -int KPlayerTrackProperties::getTrackOption (const QString& key) const +int KPlayerTrackProperties::getTrackOption (const TQString& key) const { if ( has (key) ) { int i = 1; - const QMap& ids (getIntegerStringMap (key + "s")); + const TQMap& ids (getIntegerStringMap (key + "s")); if ( ids.count() > 1 ) { int id = getInteger (key); - QMap::ConstIterator iterator (ids.constBegin()), end (ids.constEnd()); + TQMap::ConstIterator iterator (ids.constBegin()), end (ids.constEnd()); while ( iterator != end && iterator.key() != id ) { ++ iterator; @@ -3740,15 +3740,15 @@ int KPlayerTrackProperties::getTrackOption (const QString& key) const return 0; } -void KPlayerTrackProperties::setTrackOption (const QString& key, int value) +void KPlayerTrackProperties::setTrackOption (const TQString& key, int value) { if ( value == 0 ) reset (key); else { int i = 1, id = 0; - const QMap& ids (getIntegerStringMap (key + "s")); - QMap::ConstIterator iterator (ids.constBegin()), end (ids.constEnd()); + const TQMap& ids (getIntegerStringMap (key + "s")); + TQMap::ConstIterator iterator (ids.constBegin()), end (ids.constEnd()); while ( iterator != end && value != i ) { id = iterator.key(); @@ -3813,11 +3813,11 @@ void KPlayerTrackProperties::showSubtitleUrl (const KURL& url) bool KPlayerTrackProperties::needsExpanding (void) const { - //static QRegExp re_expand ("(?:^| )-vf +(?:[^ ]*,)?expand="); + //static TQRegExp re_expand ("(?:^| )-vf +(?:[^ ]*,)?expand="); if ( hasOriginalSize() && configuration() -> hasSubtitleAutoexpand() ) { - QSize aspect = configuration() -> autoexpandAspect(); - QSize size = hasDisplaySize() ? displaySize() : currentSize(); + TQSize aspect = configuration() -> autoexpandAspect(); + TQSize size = hasDisplaySize() ? displaySize() : currentSize(); return size.height() * aspect.width() * 20 < size.width() * aspect.height() * 19; } return false; @@ -3825,15 +3825,15 @@ bool KPlayerTrackProperties::needsExpanding (void) const void KPlayerTrackProperties::autoexpand (void) { - static QRegExp re_expand ("((?:^|.* )-vf +[^ ]+)(.*)"); + static TQRegExp re_expand ("((?:^|.* )-vf +[^ ]+)(.*)"); #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerTrackProperties::autoexpand\n"; #endif if ( hasOriginalSize() && configuration() -> hasSubtitleAutoexpand() ) { - QSize aspect = configuration() -> autoexpandAspect(); - const QSize& res = currentResolution(); - const QSize& size = currentSize(); + TQSize aspect = configuration() -> autoexpandAspect(); + const TQSize& res = currentResolution(); + const TQSize& size = currentSize(); int height = size.width() * aspect.height() * res.height() / (aspect.width() * size.height()); #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << " Resolution " << res.width() << "x" << res.height() << "\n"; @@ -3842,7 +3842,7 @@ void KPlayerTrackProperties::autoexpand (void) #endif if ( height > res.height() ) { - QString expand = "expand=" + QString::number (res.width()) + ":" + QString::number (height); + TQString expand = "expand=" + TQString::number (res.width()) + ":" + TQString::number (height); int offset = res.width() / 10; height -= res.height(); if ( offset + offset > height ) @@ -3851,7 +3851,7 @@ void KPlayerTrackProperties::autoexpand (void) offset = height; if ( subtitlePosition() > 50 ) offset = height - offset; - expand += ":0:" + QString::number (offset); + expand += ":0:" + TQString::number (offset); } #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << " Expand " << expand << "\n"; @@ -3862,8 +3862,8 @@ void KPlayerTrackProperties::autoexpand (void) setCommandLine (re_expand.cap(1) + "," + expand + re_expand.cap(2)); else setCommandLine (commandLineValue() + " -vf " + expand); - setCurrentResolution (QSize (size.width(), height)); - setCurrentSize (QSize (size.width(), size.width() * aspect.height() / aspect.width())); + setCurrentResolution (TQSize (size.width(), height)); + setCurrentSize (TQSize (size.width(), size.width() * aspect.height() / aspect.width())); resetDisplaySize(); } } @@ -3894,24 +3894,24 @@ void KPlayerDiskTrackProperties::setupInfo (void) : i18n("Track %1")).arg (url().fileName().rightJustify (parent() -> digits(), '0'))); } -QString KPlayerDiskTrackProperties::icon (void) const +TQString KPlayerDiskTrackProperties::icon (void) const { return parent() -> getString ("Type") == "Audio CD" ? "sound" : "video"; } -QString KPlayerDiskTrackProperties::deviceOption (void) const +TQString KPlayerDiskTrackProperties::deviceOption (void) const { return parent() -> type() == "DVD" ? "-dvd-device" : "-cdrom-device"; } -QString KPlayerDiskTrackProperties::deviceSetting (void) const +TQString KPlayerDiskTrackProperties::deviceSetting (void) const { return parent() -> pathString(); } -QString KPlayerDiskTrackProperties::urlString (void) const +TQString KPlayerDiskTrackProperties::urlString (void) const { - const QString& type = parent() -> type(); + const TQString& type = parent() -> type(); return (type == "DVD" ? "dvd://" : type == "Video CD" ? "vcd://" : "cdda://") + url().fileName(); } @@ -3931,7 +3931,7 @@ KPlayerChannelProperties::~KPlayerChannelProperties() #endif } -QString KPlayerChannelProperties::icon (void) const +TQString KPlayerChannelProperties::icon (void) const { return "video"; } @@ -3969,14 +3969,14 @@ KPlayerTVChannelProperties::~KPlayerTVChannelProperties() void KPlayerTVChannelProperties::setupInfo (void) { - static QRegExp re_channel ("^([A-Z]*)(\\d+)([A-Z]*)$"); + static TQRegExp re_channel ("^([A-Z]*)(\\d+)([A-Z]*)$"); #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerTVChannelProperties::setupInfo\n"; #endif KPlayerChannelProperties::setupInfo(); - QString id (url().fileName()); + TQString id (url().fileName()); setDefaultName (i18n("Channel %1").arg (re_channel.search (id) < 0 ? id : re_channel.cap(1) - + QString::number (re_channel.cap(2).toInt()).rightJustify (re_channel.cap(1).isEmpty() ? parent() -> digits() + + TQString::number (re_channel.cap(2).toInt()).rightJustify (re_channel.cap(1).isEmpty() ? parent() -> digits() : re_channel.cap(1) == "H" && re_channel.cap(2).length() == 1 ? 1 : 2, '0') + re_channel.cap(3))); setDefaultFrequency (parent() -> channelFrequency (id)); } @@ -3986,16 +3986,16 @@ bool KPlayerTVChannelProperties::canChangeFrequency (void) const return true; } -QString KPlayerTVChannelProperties::deviceOption (void) const +TQString KPlayerTVChannelProperties::deviceOption (void) const { return "-tv"; } -QString KPlayerTVChannelProperties::deviceSetting (void) const +TQString KPlayerTVChannelProperties::deviceSetting (void) const { - QString setting = "driver=" + inputDriver() + ":device=" + parent() -> pathString(); + TQString setting = "driver=" + inputDriver() + ":device=" + parent() -> pathString(); if ( frequency() != defaultFrequency() ) - setting += ":freq=" + QString::number (frequency()); + setting += ":freq=" + TQString::number (frequency()); else setting += ":chanlist=" + channelList() + ":channel=" + url().fileName(); if ( hasVideoNorm() || parent() -> hasVideoNorm() ) @@ -4004,31 +4004,31 @@ QString KPlayerTVChannelProperties::deviceSetting (void) const "PAL-BG", "PAL-DK", "PAL-I", "PAL-M", "PAL-N", "PAL-NC", "SECAM" }; int norm = videoNorm(); if ( norm >= 0 ) - setting += ":normid=" + QString::number (videoNorm()); + setting += ":normid=" + TQString::number (videoNorm()); else if ( norm < -1 && norm > - int (sizeof (norms) / sizeof (const char*)) - 2 ) - setting += QString (":norm=") + norms [- norm - 2]; + setting += TQString (":norm=") + norms [- norm - 2]; } if ( hasVideoFormat() || parent() -> hasVideoFormat() ) setting += ":outfmt=" + videoFormat(); if ( hasVideoInput() || parent() -> hasVideoInput() ) - setting += ":input=" + QString::number (videoInput()); + setting += ":input=" + TQString::number (videoInput()); if ( hasAudioMode() || parent() -> hasAudioMode() ) - setting += ":amode=" + QString::number (audioMode()) + ":forceaudio"; + setting += ":amode=" + TQString::number (audioMode()) + ":forceaudio"; if ( hasAudioInput() || parent() -> hasAudioInput() ) - setting += ":audioid=" + QString::number (audioInput()); - setting += QString (":immediatemode=") + (immediateMode() ? "1" : "0"); + setting += ":audioid=" + TQString::number (audioInput()); + setting += TQString (":immediatemode=") + (immediateMode() ? "1" : "0"); if ( alsaCapture() ) setting += ":alsa"; if ( hasCaptureDevice() || parent() -> hasCaptureDevice() ) setting += ":adevice=" + captureDevice(); if ( hasMjpegDecimation() || parent() -> hasMjpegDecimation() ) - setting += ":mjpeg:decimation=" + QString::number (mjpegDecimation()); + setting += ":mjpeg:decimation=" + TQString::number (mjpegDecimation()); if ( hasMjpegQuality() || parent() -> hasMjpegQuality() ) - setting += ":quality=" + QString::number (mjpegQuality()); + setting += ":quality=" + TQString::number (mjpegQuality()); return setting; } -QString KPlayerTVChannelProperties::urlString (void) const +TQString KPlayerTVChannelProperties::urlString (void) const { return "tv://"; } @@ -4054,7 +4054,7 @@ void KPlayerDVBChannelProperties::setupInfo (void) kdDebugTime() << "KPlayerDVBChannelProperties::setupInfo\n"; #endif KPlayerChannelProperties::setupInfo(); - QString id (url().fileName()); + TQString id (url().fileName()); setDefaultName (parent() -> channelName (id)); setDefaultFrequency (parent() -> channelFrequency (id)); } @@ -4064,28 +4064,28 @@ bool KPlayerDVBChannelProperties::canChangeFrequency (void) const return false; } -QString KPlayerDVBChannelProperties::deviceOption (void) const +TQString KPlayerDVBChannelProperties::deviceOption (void) const { return "-dvbin"; } -QString KPlayerDVBChannelProperties::deviceSetting (void) const +TQString KPlayerDVBChannelProperties::deviceSetting (void) const { - QString setting; - QRegExp re_card ("^kplayer:/devices/dev/dvb/adapter(\\d+)"); + TQString setting; + TQRegExp re_card ("^kplayer:/devices/dev/dvb/adapter(\\d+)"); if ( re_card.search (url().url()) >= 0 ) - setting = "card=" + QString::number (re_card.cap(1).toInt() + 1); + setting = "card=" + TQString::number (re_card.cap(1).toInt() + 1); if ( hasVideoInput() || parent() -> hasVideoInput() ) { if ( ! setting.isEmpty() ) setting += ":"; - setting += "vid=" + QString::number (videoInput()); + setting += "vid=" + TQString::number (videoInput()); } if ( hasAudioInput() || parent() -> hasAudioInput() ) { if ( ! setting.isEmpty() ) setting += ":"; - setting += "aid=" + QString::number (audioInput()); + setting += "aid=" + TQString::number (audioInput()); } if ( hasChannelList() || parent() -> hasChannelList() ) { @@ -4096,7 +4096,7 @@ QString KPlayerDVBChannelProperties::deviceSetting (void) const return setting; } -QString KPlayerDVBChannelProperties::urlString (void) const +TQString KPlayerDVBChannelProperties::urlString (void) const { return "dvb://" + defaultName(); } @@ -4128,7 +4128,7 @@ void KPlayerItemProperties::setupInfo (void) config() -> deleteEntry ("Video Size"); config() -> writeEntry ("Has Video", false); } - QString value (config() -> readEntry ("Full Screen")); + TQString value (config() -> readEntry ("Full Screen")); if ( value == "0" ) config() -> writeEntry ("Full Screen", false); else if ( value == "1" ) @@ -4171,7 +4171,7 @@ void KPlayerItemProperties::setupMeta (void) #endif if ( ! hasIcon() && m_meta_info_timer < 2000 ) { - QTime timer; + TQTime timer; timer.start(); KMimeType::Ptr mimetype (KMimeType::findByURL (url())); if ( mimetype != KMimeType::defaultMimeTypePtr() ) @@ -4180,13 +4180,13 @@ void KPlayerItemProperties::setupMeta (void) KFileMetaInfo info (url()); if ( info.isValid() ) { - QStringList keys (info.supportedKeys()); - for ( QStringList::ConstIterator iterator = keys.begin(); iterator != keys.end(); ++ iterator ) + TQStringList keys (info.supportedKeys()); + for ( TQStringList::ConstIterator iterator = keys.begin(); iterator != keys.end(); ++ iterator ) { - QString key (*iterator); + TQString key (*iterator); KFileMetaInfoItem item (info.item (key)); if ( item.isValid() && ! key.isEmpty() ) - if ( item.type() == QVariant::Size ) + if ( item.type() == TQVariant::Size ) { key = key.lower(); capitalizeWords (key); @@ -4200,7 +4200,7 @@ void KPlayerItemProperties::setupMeta (void) setSize (key, item.value().toSize()); } } - else if ( item.type() != QVariant::Bool ) + else if ( item.type() != TQVariant::Bool ) importMeta (key, item.value().toString()); } } @@ -4211,28 +4211,28 @@ void KPlayerItemProperties::setupMeta (void) KPlayerTrackProperties::setupMeta(); } -QString KPlayerItemProperties::urlString (void) const +TQString KPlayerItemProperties::urlString (void) const { return url().isLocalFile() ? url().path() : url().url(); } -bool KPlayerItemProperties::autoloadSubtitles (const QString& key) const +bool KPlayerItemProperties::autoloadSubtitles (const TQString& key) const { return url().isLocalFile() && (has (key) ? ((KPlayerBooleanProperty*) m_properties [key]) -> value() : parent() -> autoloadSubtitles (key)); } -bool KPlayerItemProperties::getVobsubSubtitles (const QString& key, const KURL& url) const +bool KPlayerItemProperties::getVobsubSubtitles (const TQString& key, const KURL& url) const { return has (key) ? ((KPlayerBooleanProperty*) m_properties [key]) -> value() : parent() -> getVobsubSubtitles (key, url); } -bool KPlayerItemProperties::getPlaylist (const QString& key, const KURL& url) const +bool KPlayerItemProperties::getPlaylist (const TQString& key, const KURL& url) const { return has (key) ? ((KPlayerBooleanProperty*) m_properties [key]) -> value() : parent() -> getPlaylist (key, url); } -bool KPlayerItemProperties::getUseKioslave (const QString& key, const KURL& url) const +bool KPlayerItemProperties::getUseKioslave (const TQString& key, const KURL& url) const { return has (key) ? ((KPlayerBooleanProperty*) m_properties [key]) -> value() : parent() -> getUseKioslave (key, url); } diff --git a/kplayer/kplayerproperties.h b/kplayer/kplayerproperties.h index 0856acf..57acbe1 100644 --- a/kplayer/kplayerproperties.h +++ b/kplayer/kplayerproperties.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include #ifdef DEBUG #include @@ -54,13 +54,13 @@ class KPlayerItemProperties; #define KPLAYER_PROPERTY_GROUP_LOCATION 7 /** Compares the given strings. */ -extern int compareStrings (const QString& s1, const QString& s2); +extern int compareStrings (const TQString& s1, const TQString& s2); /** Returns the given time length as string. */ -extern QString timeString (float length, bool zero_ok = false); +extern TQString timeString (float length, bool zero_ok = false); /** Converts a string to a floating point number, replacing a comma with a decimal point. */ -extern float stringToFloat (const QString&); +extern float stringToFloat (const TQString&); inline int limit (int value, int minValue, int maxValue = INT_MAX) { @@ -87,17 +87,17 @@ inline float flimit (float value, float minValue, float maxValue = FLT_MAX) /** The KPlayer media map by URL string. * @author kiriuja */ -typedef QMap KPlayerMediaMap; +typedef TQMap KPlayerMediaMap; /** The KPlayer property map by name. * @author kiriuja */ -typedef QMap KPlayerPropertyMap; +typedef TQMap KPlayerPropertyMap; /** The KPlayer property info map by name. * @author kiriuja */ -typedef QMap KPlayerPropertyInfoMap; +typedef TQMap KPlayerPropertyInfoMap; /** The KPlayer media property. * @author kiriuja @@ -111,16 +111,16 @@ public: virtual ~KPlayerProperty(); /** Returns the value as a string. */ - virtual QString asString (void) const; + virtual TQString asString (void) const; /** Sets the value from the given string. */ - virtual void fromString (const QString& value); + virtual void fromString (const TQString& value); /** Compares the value with that of another property of the same type. */ virtual int compare (KPlayerProperty*) const; /** Reads the value from the given config under the given name. */ - virtual void read (KConfig* config, const QString& name); + virtual void read (KConfig* config, const TQString& name); /** Saves the value to the given config under the given name. */ - virtual void save (KConfig* config, const QString& name) const; + virtual void save (KConfig* config, const TQString& name) const; /** Resets the value to the default and returns true if the property can be deleted. */ virtual bool defaults (bool can_reset); @@ -145,14 +145,14 @@ public: { m_value = value; } /** Returns the value as a string. */ - virtual QString asString (void) const; + virtual TQString asString (void) const; /** Compares the value with that of another property of the same type. */ virtual int compare (KPlayerProperty*) const; /** Reads the value from the given config under the given name. */ - virtual void read (KConfig*, const QString&); + virtual void read (KConfig*, const TQString&); /** Saves the value to the given config under the given name. */ - virtual void save (KConfig*, const QString&) const; + virtual void save (KConfig*, const TQString&) const; protected: /** Property value. */ @@ -178,16 +178,16 @@ public: { m_value = value; } /** Returns the value as a string. */ - virtual QString asString (void) const; + virtual TQString asString (void) const; /** Sets the value from the given string. */ - virtual void fromString (const QString& value); + virtual void fromString (const TQString& value); /** Compares the value with that of another property of the same type. */ virtual int compare (KPlayerProperty*) const; /** Reads the value from the given config under the given name. */ - virtual void read (KConfig*, const QString&); + virtual void read (KConfig*, const TQString&); /** Saves the value to the given config under the given name. */ - virtual void save (KConfig*, const QString&) const; + virtual void save (KConfig*, const TQString&) const; protected: /** Property value. */ @@ -225,14 +225,14 @@ public: { m_option = option; } /** Returns the value as a string. */ - virtual QString asString (void) const; + virtual TQString asString (void) const; /** Compares the value with that of another property of the same type. */ virtual int compare (KPlayerProperty*) const; /** Reads the value from the given config under the given name. */ - virtual void read (KConfig*, const QString&); + virtual void read (KConfig*, const TQString&); /** Saves the value to the given config under the given name. */ - virtual void save (KConfig*, const QString&) const; + virtual void save (KConfig*, const TQString&) const; protected: /** Property option. */ @@ -251,12 +251,12 @@ public: virtual ~KPlayerCacheProperty(); /** Returns the value as a string. */ - virtual QString asString (void) const; + virtual TQString asString (void) const; /** Compares the value with that of another property of the same type. */ virtual int compare (KPlayerProperty*) const; /** Reads the value from the given config under the given name. */ - virtual void read (KConfig*, const QString&); + virtual void read (KConfig*, const TQString&); }; /** The frequency property. @@ -280,12 +280,12 @@ public: void setValue (int value); /** Returns the value as a string. */ - virtual QString asString (void) const; + virtual TQString asString (void) const; /** Compares the value with that of another property of the same type. */ virtual int compare (KPlayerProperty*) const; /** Saves the value to the given config under the given name. */ - virtual void save (KConfig*, const QString&) const; + virtual void save (KConfig*, const TQString&) const; /** Resets the value to the default and returns true if the property can be deleted. */ virtual bool defaults (bool can_reset); @@ -314,14 +314,14 @@ public: { m_value = fabs (value) < 0.0001 ? 0 : value; } /** Returns the value as a string. */ - virtual QString asString (void) const; + virtual TQString asString (void) const; /** Compares the value with that of another property of the same type. */ virtual int compare (KPlayerProperty*) const; /** Reads the value from the given config under the given name. */ - virtual void read (KConfig*, const QString&); + virtual void read (KConfig*, const TQString&); /** Saves the value to the given config under the given name. */ - virtual void save (KConfig*, const QString&) const; + virtual void save (KConfig*, const TQString&) const; protected: /** Property value. */ @@ -340,7 +340,7 @@ public: virtual ~KPlayerLengthProperty(); /** Returns the value as a string. */ - virtual QString asString (void) const; + virtual TQString asString (void) const; }; /** The size property. @@ -355,25 +355,25 @@ public: virtual ~KPlayerSizeProperty(); /** Returns the property value. */ - const QSize& value (void) const + const TQSize& value (void) const { return m_value; } /** Sets the property value. */ - void setValue (const QSize& value) + void setValue (const TQSize& value) { m_value = value; } /** Returns the value as a string. */ - virtual QString asString (void) const; + virtual TQString asString (void) const; /** Compares the value with that of another property of the same type. */ virtual int compare (KPlayerProperty*) const; /** Reads the value from the given config under the given name. */ - virtual void read (KConfig*, const QString&); + virtual void read (KConfig*, const TQString&); /** Saves the value to the given config under the given name. */ - virtual void save (KConfig*, const QString&) const; + virtual void save (KConfig*, const TQString&) const; protected: /** Property value. */ - QSize m_value; + TQSize m_value; }; /** The display size property. @@ -388,16 +388,16 @@ public: virtual ~KPlayerDisplaySizeProperty(); /** Returns the property value. */ - const QSize& value (void) const + const TQSize& value (void) const { return m_value; } /** Sets the property value. */ - void setValue (const QSize& value) + void setValue (const TQSize& value) { m_value = value; } /** Returns the property value based on the option and the given value. */ - QSize value (const QSize& current) const; + TQSize value (const TQSize& current) const; /** Sets the property value and option. */ - void setValue (const QSize& value, int option); + void setValue (const TQSize& value, int option); /** Returns the property option. */ int option (void) const @@ -407,14 +407,14 @@ public: { m_option = option; } /** Returns the value as a string. */ - virtual QString asString (void) const; + virtual TQString asString (void) const; /** Compares the value with that of another property of the same type. */ virtual int compare (KPlayerProperty*) const; /** Reads the value from the given config under the given name. */ - virtual void read (KConfig*, const QString&); + virtual void read (KConfig*, const TQString&); /** Saves the value to the given config under the given name. */ - virtual void save (KConfig*, const QString&) const; + virtual void save (KConfig*, const TQString&) const; protected: /** Property option. */ @@ -433,27 +433,27 @@ public: virtual ~KPlayerStringProperty(); /** Returns the property value. */ - const QString& value (void) const + const TQString& value (void) const { return m_value; } /** Sets the property value. */ - void setValue (const QString& value) + void setValue (const TQString& value) { m_value = value; } /** Returns the value as a string. */ - virtual QString asString (void) const; + virtual TQString asString (void) const; /** Sets the value from the given string. */ - virtual void fromString (const QString& value); + virtual void fromString (const TQString& value); /** Compares the value with that of another property of the same type. */ virtual int compare (KPlayerProperty*) const; /** Reads the value from the given config under the given name. */ - virtual void read (KConfig*, const QString&); + virtual void read (KConfig*, const TQString&); /** Saves the value to the given config under the given name. */ - virtual void save (KConfig*, const QString&) const; + virtual void save (KConfig*, const TQString&) const; protected: /** Property value. */ - QString m_value; + TQString m_value; }; /** The combo string property. @@ -468,26 +468,26 @@ public: virtual ~KPlayerComboStringProperty(); /** Returns the property option. */ - const QString& option (void) const + const TQString& option (void) const { return m_option; } /** Sets the property option. */ - void setOption (const QString& option) + void setOption (const TQString& option) { m_option = option; } /** Returns the value as a string. */ - virtual QString asString (void) const; + virtual TQString asString (void) const; /** Reads the value from the given config under the given name. */ - virtual void read (KConfig*, const QString&); + virtual void read (KConfig*, const TQString&); /** Saves the value to the given config under the given name. */ - virtual void save (KConfig*, const QString&) const; + virtual void save (KConfig*, const TQString&) const; /** Resets the value to the default and returns true if the property can be deleted. */ virtual bool defaults (bool can_reset); protected: /** Property option. */ - QString m_option; + TQString m_option; }; /** The translated string property. @@ -502,7 +502,7 @@ public: virtual ~KPlayerTranslatedStringProperty(); /** Returns the value as a string. */ - virtual QString asString (void) const; + virtual TQString asString (void) const; }; #if 0 @@ -518,20 +518,20 @@ public: virtual ~KPlayerStringHistoryProperty(); /** Sets the property value. */ - virtual void setValue (const QString& value); + virtual void setValue (const TQString& value); /** Returns the string history. */ - const QStringList& history (void) const + const TQStringList& history (void) const { return m_history; } /** Reads the value from the given config under the given name. */ - virtual void read (KConfig*, const QString&); + virtual void read (KConfig*, const TQString&); /** Saves the value to the given config under the given name. */ - virtual void save (KConfig*, const QString&) const; + virtual void save (KConfig*, const TQString&) const; protected: /** String history. */ - QStringList m_history; + TQStringList m_history; }; #endif @@ -548,10 +548,10 @@ public: virtual ~KPlayerNameProperty(); /** Returns the value as a string. */ - virtual QString asString (void) const; + virtual TQString asString (void) const; /** Saves the value to the given config under the given name. */ - virtual void save (KConfig* config, const QString& name) const; + virtual void save (KConfig* config, const TQString& name) const; /** Resets the value to the default and returns true if the property can be deleted. */ virtual bool defaults (bool can_reset); @@ -573,9 +573,9 @@ public: virtual ~KPlayerAppendableProperty(); /** Returns the property value based on the option and the given value. */ - QString appendableValue (const QString& current) const; + TQString appendableValue (const TQString& current) const; /** Sets the property value and option. */ - void setAppendableValue (const QString& value, bool append); + void setAppendableValue (const TQString& value, bool append); /** Returns the property option. */ bool option (void) const @@ -585,9 +585,9 @@ public: { m_option = option; } /** Reads the value from the given config under the given name. */ - virtual void read (KConfig*, const QString&); + virtual void read (KConfig*, const TQString&); /** Saves the value to the given config under the given name. */ - virtual void save (KConfig*, const QString&) const; + virtual void save (KConfig*, const TQString&) const; protected: /** Property option. */ @@ -606,26 +606,26 @@ public: virtual ~KPlayerStringListProperty(); /** Returns the property value. */ - const QStringList& value (void) const + const TQStringList& value (void) const { return m_value; } /** Adds the given entry to the property value. */ - void addEntry (const QString& entry) + void addEntry (const TQString& entry) { m_value.append (entry); } /** Sets the property value. */ - void setValue (const QStringList& value) + void setValue (const TQStringList& value) { m_value = value; } /** Reads the value from the given config under the given name. */ - virtual void read (KConfig* config, const QString& name); + virtual void read (KConfig* config, const TQString& name); /** Saves the value to the given config under the given name. */ - virtual void save (KConfig* config, const QString& name) const; + virtual void save (KConfig* config, const TQString& name) const; /** Resets the value to the default and returns true if the property can be deleted. */ virtual bool defaults (bool can_reset); protected: /** Property value. */ - QStringList m_value; + TQStringList m_value; }; /** The integer string map property. @@ -640,20 +640,20 @@ public: virtual ~KPlayerIntegerStringMapProperty(); /** Returns the property value. */ - const QMap& value (void) const + const TQMap& value (void) const { return m_value; } /** Sets the property value. */ - void setValue (int key, const QString& value) + void setValue (int key, const TQString& value) { m_value.insert (key, value); } /** Reads the value from the given config under the given name. */ - virtual void read (KConfig* config, const QString& name); + virtual void read (KConfig* config, const TQString& name); /** Saves the value to the given config under the given name. */ - virtual void save (KConfig* config, const QString& name) const; + virtual void save (KConfig* config, const TQString& name) const; protected: /** Property value. */ - QMap m_value; + TQMap m_value; }; /** The URL property. @@ -675,7 +675,7 @@ public: { m_value = value; } /** Returns the value as a string. */ - virtual QString asString (void) const; + virtual TQString asString (void) const; /** Compares the value with that of another property of the same type. */ virtual int compare (KPlayerProperty*) const; @@ -696,9 +696,9 @@ public: virtual ~KPlayerPersistentUrlProperty(); /** Reads the value from the given config under the given name. */ - virtual void read (KConfig*, const QString&); + virtual void read (KConfig*, const TQString&); /** Saves the value to the given config under the given name. */ - virtual void save (KConfig*, const QString&) const; + virtual void save (KConfig*, const TQString&) const; /** Resets the value to the default and returns true if the property can be deleted. */ virtual bool defaults (bool can_reset); @@ -716,10 +716,10 @@ public: virtual ~KPlayerPropertyInfo(); /** Returns the property caption. */ - const QString& caption (void) const + const TQString& caption (void) const { return m_caption; } /** Sets the property caption. */ - void setCaption (const QString& caption) + void setCaption (const TQString& caption) { m_caption = caption; } /** Returns the property group. */ @@ -770,11 +770,11 @@ public: virtual KPlayerProperty* copy (const KPlayerProperty*) const = 0; /** Returns whether the property exists for the current URL. */ - virtual bool exists (KPlayerProperties* properties, const QString& name) const; + virtual bool exists (KPlayerProperties* properties, const TQString& name) const; protected: /** Caption. */ - QString m_caption; + TQString m_caption; /** Property group. */ int m_group; /** Flag indicating whether the property should be shown. */ @@ -894,7 +894,7 @@ public: virtual KPlayerProperty* copy (const KPlayerProperty*) const; /** Returns whether the property exists for the current URL. */ - virtual bool exists (KPlayerProperties* properties, const QString& name) const; + virtual bool exists (KPlayerProperties* properties, const TQString& name) const; }; /** The KPlayer float property information. @@ -988,10 +988,10 @@ public: virtual ~KPlayerStringPropertyInfo(); /** Returns the default property value. */ - const QString& defaultValue (void) const + const TQString& defaultValue (void) const { return m_default; } /** Sets the default property value. */ - void setDefaultValue (const QString& value) + void setDefaultValue (const TQString& value) { m_default = value; } /** Creates and returns a property of the corresponding type. */ @@ -1001,7 +1001,7 @@ public: protected: /** Default value. */ - QString m_default; + TQString m_default; }; /** The KPlayer combo string property information. @@ -1021,7 +1021,7 @@ public: virtual KPlayerProperty* copy (const KPlayerProperty*) const; /** Returns whether the property exists for the current URL. */ - virtual bool exists (KPlayerProperties* properties, const QString& name) const; + virtual bool exists (KPlayerProperties* properties, const TQString& name) const; }; /** The KPlayer translated string property information. @@ -1059,7 +1059,7 @@ public: virtual KPlayerProperty* copy (const KPlayerProperty*) const; /** Returns whether the property exists for the current URL. */ - virtual bool exists (KPlayerProperties* properties, const QString& name) const; + virtual bool exists (KPlayerProperties* properties, const TQString& name) const; }; #endif @@ -1080,7 +1080,7 @@ public: virtual KPlayerProperty* copy (const KPlayerProperty*) const; /** Returns whether the property exists for the current URL. */ - virtual bool exists (KPlayerProperties* properties, const QString& name) const; + virtual bool exists (KPlayerProperties* properties, const TQString& name) const; }; /** The KPlayer appendable property information. @@ -1100,7 +1100,7 @@ public: virtual KPlayerProperty* copy (const KPlayerProperty*) const; /** Returns whether the property exists for the current URL. */ - virtual bool exists (KPlayerProperties* properties, const QString& name) const; + virtual bool exists (KPlayerProperties* properties, const TQString& name) const; }; /** The KPlayer string list property information. @@ -1183,14 +1183,14 @@ public: /** The KPlayer property counts by name. * @author kiriuja */ -class KPlayerPropertyCounts : public QMap +class KPlayerPropertyCounts : public TQMap { public: /** Default constructor. Creates an empty map. */ KPlayerPropertyCounts (void) { } /** Returns the count for the given key. */ - int count (const QString& key) const; + int count (const TQString& key) const; /** Returns the number of properties. */ /** Adds the given counts. */ @@ -1202,7 +1202,7 @@ public: /** The KPlayer properties. * @author kiriuja */ -class KPlayerProperties : public QObject +class KPlayerProperties : public TQObject { Q_OBJECT @@ -1226,7 +1226,7 @@ public: /** Returns the config storage. */ virtual KConfig* config (void) const = 0; /** Returns the config group. */ - virtual QString configGroup (void) const = 0; + virtual TQString configGroup (void) const = 0; // Property access @@ -1235,54 +1235,54 @@ public: { return m_info; } /** Returns property information for the given key. */ - static KPlayerPropertyInfo* info (const QString& key); + static KPlayerPropertyInfo* info (const TQString& key); /** Returns boolean property information for the given key. */ - static KPlayerBooleanPropertyInfo* booleanInfo (const QString& key) + static KPlayerBooleanPropertyInfo* booleanInfo (const TQString& key) { return (KPlayerBooleanPropertyInfo*) info (key); } /** Returns integer property information for the given key. */ - static KPlayerIntegerPropertyInfo* integerInfo (const QString& key) + static KPlayerIntegerPropertyInfo* integerInfo (const TQString& key) { return (KPlayerIntegerPropertyInfo*) info (key); } /** Returns float property information for the given key. */ - static KPlayerFloatPropertyInfo* floatInfo (const QString& key) + static KPlayerFloatPropertyInfo* floatInfo (const TQString& key) { return (KPlayerFloatPropertyInfo*) info (key); } /** Returns string property information for the given key. */ - static KPlayerStringPropertyInfo* stringInfo (const QString& key) + static KPlayerStringPropertyInfo* stringInfo (const TQString& key) { return (KPlayerStringPropertyInfo*) info (key); } /** Returns default order of attributes. */ - static QStringList defaultOrder (void); + static TQStringList defaultOrder (void); /** Returns the list of default meta attributes. */ - static const QStringList& defaultAttributes (void) + static const TQStringList& defaultAttributes (void) { return m_meta_attributes; } /** Returns whether the property for the given key can be edited. */ - bool canEdit (const QString& key) + bool canEdit (const TQString& key) { return info (key) -> canEdit(); } /** Returns whether the property for the given key can be reset. */ - bool canReset (const QString& key) + bool canReset (const TQString& key) { return info (key) -> canReset(); } /** Returns the list of property keys. */ - QStringList keys (void) const; + TQStringList keys (void) const; /** Returns whether meta information for the given key is available. */ - bool has (const QString& key) const + bool has (const TQString& key) const { return m_properties.contains (key); } /** Returns whether meta information for the given key was available prior to the change. */ - bool had (const QString& key) const + bool had (const TQString& key) const { return m_previous.contains (key); } /** Returns the property with the given name if it exists. */ - KPlayerProperty* property (const QString& key) const; + KPlayerProperty* property (const TQString& key) const; /** Returns the property map. */ const KPlayerPropertyMap& properties (void) const { return m_properties; } /** Returns the property with the given name, creating it if necessary. */ - KPlayerProperty* get (const QString& key); + KPlayerProperty* get (const TQString& key); /** Removes the property with the given name. */ - void reset (const QString& key); + void reset (const TQString& key); /** Removes all properties from the store. */ void purge (void) { config() -> deleteGroup (configGroup()); } @@ -1290,7 +1290,7 @@ public: /** Compares the properties to the given properties and emits the updated signal. */ void diff (KPlayerProperties* media); /** Compares the property with the given name to that from the given properties. */ - int compare (KPlayerProperties* properties, const QString& key) const; + int compare (KPlayerProperties* properties, const TQString& key) const; /** Increments the given counts for existing properties. */ void count (KPlayerPropertyCounts& counts) const; @@ -1305,82 +1305,82 @@ public: const KPlayerPropertyCounts& removed (void) const { return m_removed; } - virtual bool getBoolean (const QString& key) const = 0; - virtual void setBoolean (const QString& key, bool value) = 0; - int getBooleanOption (const QString& key) const; - void setBooleanOption (const QString& key, int value); - - virtual int getInteger (const QString& key) const = 0; - virtual void setInteger (const QString& key, int value) = 0; - int getIntegerOption (const QString& key) const; - void setIntegerOption (const QString& key, int value); - void set (const QString& key, int value); - - virtual int getRelativeValue (const QString& key) const = 0; - int getRelative (const QString& key) const; - virtual void setRelative (const QString& key, int value) = 0; - virtual void adjustRelative (const QString& key, int value) = 0; - int getRelativeOption (const QString& key) const; - void setRelativeOption (const QString& key, int value, int option); - - virtual int getCache (const QString& key) const = 0; - virtual int getCacheSize (const QString& key) const = 0; - int getCacheOption (const QString& key) const; - - virtual float getFloat (const QString& key) const = 0; - virtual void setFloat (const QString& key, float value) = 0; - void set (const QString& key, float value); - - const QSize& getSize (const QString& key) const; - virtual QSize getDisplaySize (const QString& key) const; - int getSizeOption (const QString& key) const; - void setSize (const QString& key, const QSize& value); - void setSize (const QString& key, const QSize& value, int option); + virtual bool getBoolean (const TQString& key) const = 0; + virtual void setBoolean (const TQString& key, bool value) = 0; + int getBooleanOption (const TQString& key) const; + void setBooleanOption (const TQString& key, int value); + + virtual int getInteger (const TQString& key) const = 0; + virtual void setInteger (const TQString& key, int value) = 0; + int getIntegerOption (const TQString& key) const; + void setIntegerOption (const TQString& key, int value); + void set (const TQString& key, int value); + + virtual int getRelativeValue (const TQString& key) const = 0; + int getRelative (const TQString& key) const; + virtual void setRelative (const TQString& key, int value) = 0; + virtual void adjustRelative (const TQString& key, int value) = 0; + int getRelativeOption (const TQString& key) const; + void setRelativeOption (const TQString& key, int value, int option); + + virtual int getCache (const TQString& key) const = 0; + virtual int getCacheSize (const TQString& key) const = 0; + int getCacheOption (const TQString& key) const; + + virtual float getFloat (const TQString& key) const = 0; + virtual void setFloat (const TQString& key, float value) = 0; + void set (const TQString& key, float value); + + const TQSize& getSize (const TQString& key) const; + virtual TQSize getDisplaySize (const TQString& key) const; + int getSizeOption (const TQString& key) const; + void setSize (const TQString& key, const TQSize& value); + void setSize (const TQString& key, const TQSize& value, int option); /** Returns the value of the given key as a string. */ - QString asString (const QString& key) const; + TQString asString (const TQString& key) const; /** Returns the integer value of the given key as a string. */ - QString asIntegerString (const QString& key) const; + TQString asIntegerString (const TQString& key) const; /** Sets the value for the given key from the given string. */ - void fromString (const QString& key, const QString& value); + void fromString (const TQString& key, const TQString& value); - virtual const QString& getString (const QString& key) const = 0; - void setString (const QString& key, const QString& value); - void set (const QString& key, const QString& value); + virtual const TQString& getString (const TQString& key) const = 0; + void setString (const TQString& key, const TQString& value); + void set (const TQString& key, const TQString& value); - const QString& getStringValue (const QString& key) const; + const TQString& getStringValue (const TQString& key) const; - void setComboValue (const QString& key, const QString& value); - bool hasComboValue (const QString& key) const; + void setComboValue (const TQString& key, const TQString& value); + bool hasComboValue (const TQString& key) const; - virtual const QString& getComboString (const QString& key) const = 0; - bool hasComboString (const QString& key) const; - const QString& getStringOption (const QString& key) const; - void setStringOption (const QString& key, const QString& value); + virtual const TQString& getComboString (const TQString& key) const = 0; + bool hasComboString (const TQString& key) const; + const TQString& getStringOption (const TQString& key) const; + void setStringOption (const TQString& key, const TQString& value); - //const QStringList& getHistory (const QString& key) const; + //const TQStringList& getHistory (const TQString& key) const; - virtual QString getAppendable (const QString& key) const = 0; - int getAppendableOption (const QString& key) const; - void setAppendable (const QString& key, const QString& value, int option); + virtual TQString getAppendable (const TQString& key) const = 0; + int getAppendableOption (const TQString& key) const; + void setAppendable (const TQString& key, const TQString& value, int option); - const QStringList& getStringList (const QString& key) const; - void addStringListEntry (const QString& key, const QString& entry); - void setStringList (const QString& key, const QStringList& value); + const TQStringList& getStringList (const TQString& key) const; + void addStringListEntry (const TQString& key, const TQString& entry); + void setStringList (const TQString& key, const TQStringList& value); - const QMap& getIntegerStringMap (const QString& key) const; - void setIntegerStringMapKey (const QString& key, int id); - void setIntegerStringMapKeyValue (const QString& key, int id, const QString& lang); - bool hasIntegerStringMapKey (const QString& key, int id) const; - bool hasIntegerStringMapValue (const QString& key, int id) const; + const TQMap& getIntegerStringMap (const TQString& key) const; + void setIntegerStringMapKey (const TQString& key, int id); + void setIntegerStringMapKeyValue (const TQString& key, int id, const TQString& lang); + bool hasIntegerStringMapKey (const TQString& key, int id) const; + bool hasIntegerStringMapValue (const TQString& key, int id) const; - const KURL& getUrl (const QString& key) const; - void setUrl (const QString& key, const KURL& value); + const KURL& getUrl (const TQString& key) const; + void setUrl (const TQString& key, const KURL& value); - virtual bool autoloadSubtitles (const QString& key) const; - virtual bool getVobsubSubtitles (const QString& key, const KURL& url) const; - virtual bool getPlaylist (const QString& key, const KURL& url) const; - virtual bool getUseKioslave (const QString& key, const KURL& url) const; + virtual bool autoloadSubtitles (const TQString& key) const; + virtual bool getVobsubSubtitles (const TQString& key, const KURL& url) const; + virtual bool getPlaylist (const TQString& key, const KURL& url) const; + virtual bool getUseKioslave (const TQString& key, const KURL& url) const; /** Returns whether this media needs frequency. */ virtual bool needsFrequency (void) const; @@ -1422,9 +1422,9 @@ public: void setSubtitleClosedCaption (bool enable) { setBoolean ("Closed Caption", enable); } - const QString& subtitleEncoding (void) const + const TQString& subtitleEncoding (void) const { return getString ("Subtitle Encoding"); } - void setSubtitleEncoding (const QString& encoding) + void setSubtitleEncoding (const TQString& encoding) { set ("Subtitle Encoding", encoding); } bool hasSubtitleEncoding (void) const { return has ("Subtitle Encoding"); } @@ -1455,9 +1455,9 @@ public: void setAudioDelay (float value) { return setFloat ("Audio Delay", value); } - const QString& audioDriver (void) const + const TQString& audioDriver (void) const { return getString ("Audio Driver"); } - const QString& audioDevice (void) const + const TQString& audioDevice (void) const { return getString ("Audio Device"); } bool softwareVolume (void) const @@ -1465,14 +1465,14 @@ public: int maximumSoftwareVolume (void) const { return getInteger ("Maximum Software Volume"); } - const QString& mixerDevice (void) const + const TQString& mixerDevice (void) const { return getString ("Mixer Device"); } - const QString& mixerChannel (void) const + const TQString& mixerChannel (void) const { return getString ("Mixer Channel"); } - const QString& audioCodec (void) const + const TQString& audioCodec (void) const { return getStringValue ("Audio Codec"); } - void setAudioCodec (const QString& codec) + void setAudioCodec (const TQString& codec) { setComboValue ("Audio Codec", codec); } // Video properties @@ -1505,14 +1505,14 @@ public: void adjustSaturation (int saturation) { adjustRelative ("Saturation", saturation); } - const QString& videoDriver (void) const + const TQString& videoDriver (void) const { return getString ("Video Driver"); } - const QString& videoDevice (void) const + const TQString& videoDevice (void) const { return getString ("Video Device"); } - const QString& videoCodec (void) const + const TQString& videoCodec (void) const { return getStringValue ("Video Codec"); } - void setVideoCodec (const QString& codec) + void setVideoCodec (const TQString& codec) { setComboValue ("Video Codec", codec); } int videoScaler (void) const @@ -1532,21 +1532,21 @@ public: // Advanced properties - const QString& executablePath (void) const + const TQString& executablePath (void) const { return getString ("Executable Path"); } - void setExecutablePath (const QString& path) + void setExecutablePath (const TQString& path) { setString ("Executable Path", path); } - QString commandLine (void) const + TQString commandLine (void) const { return getAppendable ("Command Line"); } - void setCommandLine (const QString& line) + void setCommandLine (const TQString& line) { setString ("Command Line", line); } - //const QStringList& commandLineHistory (void) const + //const TQStringList& commandLineHistory (void) const // { return getHistory ("Command Line"); } - const QString& demuxer (void) const + const TQString& demuxer (void) const { return getStringValue ("Demuxer"); } - void setDemuxer (const QString& codec) + void setDemuxer (const TQString& codec) { setComboValue ("Demuxer", codec); } int frameDrop (void) const @@ -1594,15 +1594,15 @@ protected: /** Information about meta properties. */ static KPlayerStringPropertyInfo m_meta_info; /** List of default meta attributes. */ - static QStringList m_meta_attributes; + static TQStringList m_meta_attributes; /** Null URL. */ static const KURL nullUrl; /** Null size. */ - static const QSize nullSize; + static const TQSize nullSize; /** Null string list. */ - static const QStringList nullStringList; + static const TQStringList nullStringList; /** Null integer string map. */ - static const QMap nullIntegerStringMap; + static const TQMap nullIntegerStringMap; void load (void); void save (void) const; @@ -1610,7 +1610,7 @@ protected: void cleanup (void); void beginUpdate (void); - void updated (const QString& key); + void updated (const TQString& key); signals: /** Emitted when the properties are updated. */ @@ -1633,32 +1633,32 @@ public: /** Returns the config storage. */ virtual KConfig* config (void) const; /** Returns the config group. */ - virtual QString configGroup (void) const; - - virtual bool getBoolean (const QString& key) const; - virtual void setBoolean (const QString& key, bool value); - virtual int getInteger (const QString& key) const; - virtual void setInteger (const QString& key, int value); - virtual int getRelativeValue (const QString& key) const; - virtual void setRelative (const QString& key, int value); - virtual void adjustRelative (const QString& key, int value); - virtual int getCache (const QString& key) const; - virtual int getCacheSize (const QString& key) const; - virtual float getFloat (const QString& key) const; - virtual void setFloat (const QString& key, float value); - virtual const QString& getString (const QString& key) const; - virtual const QString& getComboString (const QString& key) const; - virtual QString getAppendable (const QString& key) const; - virtual bool autoloadSubtitles (const QString& key) const; - virtual bool getVobsubSubtitles (const QString& key, const KURL& url) const; - virtual bool getPlaylist (const QString& key, const KURL& url) const; - virtual bool getUseKioslave (const QString& key, const KURL& url) const; + virtual TQString configGroup (void) const; + + virtual bool getBoolean (const TQString& key) const; + virtual void setBoolean (const TQString& key, bool value); + virtual int getInteger (const TQString& key) const; + virtual void setInteger (const TQString& key, int value); + virtual int getRelativeValue (const TQString& key) const; + virtual void setRelative (const TQString& key, int value); + virtual void adjustRelative (const TQString& key, int value); + virtual int getCache (const TQString& key) const; + virtual int getCacheSize (const TQString& key) const; + virtual float getFloat (const TQString& key) const; + virtual void setFloat (const TQString& key, float value); + virtual const TQString& getString (const TQString& key) const; + virtual const TQString& getComboString (const TQString& key) const; + virtual TQString getAppendable (const TQString& key) const; + virtual bool autoloadSubtitles (const TQString& key) const; + virtual bool getVobsubSubtitles (const TQString& key, const KURL& url) const; + virtual bool getPlaylist (const TQString& key, const KURL& url) const; + virtual bool getUseKioslave (const TQString& key, const KURL& url) const; /** Returns the override flag for the given key. */ - bool override (const QString& key) + bool override (const TQString& key) { return info (key) -> override(); } /** Sets the override flag for the given key. */ - void setOverride (const QString& key, bool override) + void setOverride (const TQString& key, bool override) { info (key) -> setOverride (override); } /** Resets configuration for a new item. */ @@ -2108,9 +2108,9 @@ public: void resetAudioDelayStep (void) { reset ("Audio Delay Step"); } - void setAudioDriver (const QString& driver) + void setAudioDriver (const TQString& driver) { setString ("Audio Driver", driver); } - void setAudioDevice (const QString& device) + void setAudioDevice (const TQString& device) { setString ("Audio Device", device); } void setSoftwareVolume (bool value) @@ -2120,28 +2120,28 @@ public: void resetMaximumSoftwareVolume (void) { reset ("Maximum Software Volume"); } - void setMixerDevice (const QString& device) + void setMixerDevice (const TQString& device) { setString ("Mixer Device", device); } bool hasMixerDevice (void) const { return has ("Mixer Device"); } - void setMixerChannel (const QString& channel) + void setMixerChannel (const TQString& channel) { setString ("Mixer Channel", channel); } - const QString& switchAudioDemuxers (void) const + const TQString& switchAudioDemuxers (void) const { return getString ("Switch Audio Demuxers"); } // Video configuration - void setVideoDriver (const QString& driver) + void setVideoDriver (const TQString& driver) { setString ("Video Driver", driver); } - void setVideoDevice (const QString& device) + void setVideoDevice (const TQString& device) { setString ("Video Device", device); } // Subtitle configuration - const QString& subtitleFontName (void) const + const TQString& subtitleFontName (void) const { return getString ("Subtitle Font Name"); } - void setSubtitleFontName (const QString& name) + void setSubtitleFontName (const TQString& name) { setString ("Subtitle Font Name", name); } bool subtitleFontBold (void) const @@ -2172,7 +2172,7 @@ public: { setFloat ("Subtitle Font Outline", flimit (outline, 0, 10)); } bool hasSubtitleFontOutline (void) const { return has ("Subtitle Font Outline"); } - QString subtitleFontOutlineString (void) const + TQString subtitleFontOutlineString (void) const { return asString ("Subtitle Font Outline"); } int subtitleTextWidth (void) const @@ -2181,7 +2181,7 @@ public: { setInteger ("Subtitle Text Width", limit (width, 10, 100)); } bool hasSubtitleTextWidth (void) const { return has ("Subtitle Text Width"); } - QString subtitleTextWidthString (void) const + TQString subtitleTextWidthString (void) const { return asString ("Subtitle Text Width"); } bool subtitleEmbeddedFonts (void) const @@ -2209,14 +2209,14 @@ public: { reset ("Subtitle Autoexpand"); } bool hasSubtitleAutoexpand (void) const { return has ("Subtitle Autoexpand"); } - QSize autoexpandAspect (void) const; + TQSize autoexpandAspect (void) const; - const QString& autoloadExtensionList (void) const + const TQString& autoloadExtensionList (void) const { return getString ("Autoload Extension List"); } - void setAutoloadExtensionList (const QString& autoload) + void setAutoloadExtensionList (const TQString& autoload) { setString ("Autoload Extension List", autoload); } - QStringList subtitleExtensions (void) const; + TQStringList subtitleExtensions (void) const; // Advanced configuration @@ -2266,22 +2266,22 @@ public: { return m_references; } /** Returns the config group. */ - virtual QString configGroup (void) const; - - virtual bool getBoolean (const QString& key) const; - virtual void setBoolean (const QString& key, bool value); - virtual int getInteger (const QString& key) const; - virtual void setInteger (const QString& key, int value); - virtual int getRelativeValue (const QString& key) const; - virtual void setRelative (const QString& key, int value); - virtual void adjustRelative (const QString& key, int value); - virtual int getCache (const QString& key) const; - virtual int getCacheSize (const QString& key) const; - virtual float getFloat (const QString& key) const; - virtual void setFloat (const QString& key, float value); - virtual const QString& getString (const QString& key) const; - virtual const QString& getComboString (const QString& key) const; - virtual QString getAppendable (const QString& key) const; + virtual TQString configGroup (void) const; + + virtual bool getBoolean (const TQString& key) const; + virtual void setBoolean (const TQString& key, bool value); + virtual int getInteger (const TQString& key) const; + virtual void setInteger (const TQString& key, int value); + virtual int getRelativeValue (const TQString& key) const; + virtual void setRelative (const TQString& key, int value); + virtual void adjustRelative (const TQString& key, int value); + virtual int getCache (const TQString& key) const; + virtual int getCacheSize (const TQString& key) const; + virtual float getFloat (const TQString& key) const; + virtual void setFloat (const TQString& key, float value); + virtual const TQString& getString (const TQString& key) const; + virtual const TQString& getComboString (const TQString& key) const; + virtual TQString getAppendable (const TQString& key) const; /** Creates generic properties for the given URL based on configuration if needed and adds a reference. */ static KPlayerGenericProperties* genericProperties (const KURL& url); @@ -2298,7 +2298,7 @@ public: /** Creates track properties for the given URL if needed and adds a reference. */ static KPlayerTrackProperties* trackProperties (const KURL& url); /** Adds a reference and returns the media for the given URL if it is already loaded. */ - static KPlayerMedia* reference (const QString& urls); + static KPlayerMedia* reference (const TQString& urls); /** Releases the given media properties and removes them from the map when no references remain. */ static void release (KPlayerMedia* media); @@ -2333,38 +2333,38 @@ public: /** Returns the config storage. */ virtual KConfig* config (void) const; - QString name (void) const + TQString name (void) const { return asString ("Name"); } - void setName (const QString& name) + void setName (const TQString& name) { set ("Name", name); } bool hasName (void) const { return ! getString ("Name").isEmpty(); } - //const QStringList& nameHistory (void) const + //const TQStringList& nameHistory (void) const // { return getHistory ("Name"); } - QString defaultName (void) const; - void setDefaultName (const QString& name) + TQString defaultName (void) const; + void setDefaultName (const TQString& name) { m_default_name = name; } - const QString& temporaryName (void) const + const TQString& temporaryName (void) const { return m_temporary_name; } - void setTemporaryName (const QString& name) + void setTemporaryName (const TQString& name) { m_temporary_name = name; } - QString currentName (void) const + TQString currentName (void) const { return temporaryName().isEmpty() ? name() : temporaryName(); } - QString caption (void) const; + TQString caption (void) const; /** Returns icon name. */ - virtual QString icon (void) const; - void setIcon (const QString& icon) + virtual TQString icon (void) const; + void setIcon (const TQString& icon) { setString ("Icon", icon); } bool hasIcon (void) const { return has ("Icon"); } - const QStringList& children (void) const + const TQStringList& children (void) const { return getStringList ("Children"); } - void setChildren (const QStringList& children) + void setChildren (const TQStringList& children) { setStringList ("Children", children); } void resetChildren (void) { reset ("Children"); } @@ -2387,27 +2387,27 @@ public: bool hasCustomOrder (void) const { return has ("Custom Order"); } - const QString& groupingKey (void) const + const TQString& groupingKey (void) const { return getString ("Group By"); } - void setGroupingKey (const QString& key) + void setGroupingKey (const TQString& key) { setString ("Group By", key); } /** Returns the type property for the given ID. */ - QString type (const QString& id) const; + TQString type (const TQString& id) const; /** Returns the MSF property for the given ID. */ - float msf (const QString& id) const; + float msf (const TQString& id) const; /** Returns the hidden property for the given ID. */ - bool hidden (const QString& id) const; + bool hidden (const TQString& id) const; /** Sets the hidden property for the given ID. */ - void setHidden (const QString& id, bool hidden); + void setHidden (const TQString& id, bool hidden); protected: /** Default name. */ - QString m_default_name; + TQString m_default_name; /** Temporary name. */ - QString m_temporary_name; + TQString m_temporary_name; }; /** The KPlayer media properties. @@ -2431,46 +2431,46 @@ public: { setUrl ("Path", url); } bool hasPath (void) const { return has ("Path"); } - QString pathString (void) const + TQString pathString (void) const { return asString ("Path"); } - const QString& type (void) const + const TQString& type (void) const { return getString ("Type"); } - void setType (const QString& type) + void setType (const TQString& type) { setString ("Type", type); } void resetType (void) { return reset ("Type"); } bool hasType (void) const { return has ("Type"); } /** Translated type. */ - QString typeString (void) const + TQString typeString (void) const { return asString ("Type"); } - QSize displaySize (void) const + TQSize displaySize (void) const { return getDisplaySize ("Display Size"); } int displaySizeOption (void) const { return getSizeOption ("Display Size"); } bool hasDisplaySize (void) const { return has ("Display Size"); } - virtual void setDisplaySize (const QSize& size, int option); + virtual void setDisplaySize (const TQSize& size, int option); void resetDisplaySize (void) { reset ("Display Size"); } /** Display size as string. */ - QString displaySizeString (void) const + TQString displaySizeString (void) const { return asString ("Display Size"); } /** Display width as string. */ - QString displayWidthString (void) const - { return hasDisplaySize() ? QString::number (getSize ("Display Size").width()) : QString::null; } + TQString displayWidthString (void) const + { return hasDisplaySize() ? TQString::number (getSize ("Display Size").width()) : TQString::null; } /** Display height as string. */ - QString displayHeightString (void) const - { return hasDisplaySize() ? QString::number (getSize ("Display Size").height()) : QString::null; } + TQString displayHeightString (void) const + { return hasDisplaySize() ? TQString::number (getSize ("Display Size").height()) : TQString::null; } - const QString& channelList (void) const + const TQString& channelList (void) const { return getString ("Channel List"); } bool hasChannelList (void) const { return has ("Channel List"); } - const QString& inputDriver (void) const + const TQString& inputDriver (void) const { return getString ("Input Driver"); } // Size properties @@ -2496,7 +2496,7 @@ public: void setSubtitlePositionValue (int value) { return set ("Subtitle Position", limit (value, 0, 100)); } - QString subtitlePositionString (void) const + TQString subtitlePositionString (void) const { return asString ("Subtitle Position"); } bool hasSubtitlePosition (void) const { return has ("Subtitle Position"); } @@ -2505,7 +2505,7 @@ public: void setSubtitleDelayValue (float value) { return set ("Subtitle Delay", value); } - QString subtitleDelayString (void) const + TQString subtitleDelayString (void) const { return asString ("Subtitle Delay"); } bool hasSubtitleDelay (void) const { return has ("Subtitle Delay"); } @@ -2523,41 +2523,41 @@ public: { return getRelativeOption ("Volume"); } void setVolumeOption (int volume, int option) { setRelativeOption ("Volume", volume, option); } - QString volumeString (void) const + TQString volumeString (void) const { return asIntegerString ("Volume"); } void resetVolume (void) { reset ("Volume"); } void setAudioDelayValue (float value) { return set ("Audio Delay", value); } - QString audioDelayString (void) const + TQString audioDelayString (void) const { return asString ("Audio Delay"); } bool hasAudioDelay (void) const { return has ("Audio Delay"); } void resetAudioDelay (void) { reset ("Audio Delay"); } - const QString& audioCodecValue (void) const + const TQString& audioCodecValue (void) const { return getString ("Audio Codec"); } - const QString& audioCodecOption (void) const + const TQString& audioCodecOption (void) const { return getStringOption ("Audio Codec"); } - void setAudioCodecOption (const QString& codec) + void setAudioCodecOption (const TQString& codec) { setStringOption ("Audio Codec", codec); } - QString audioDriverString (void) const; - QString mixerChannelString (void) const; - QString audioCodecString (void) const; + TQString audioDriverString (void) const; + TQString mixerChannelString (void) const; + TQString audioCodecString (void) const; int audioMode (void) const { return getInteger ("Audio Mode"); } - QString audioModeString (void) const + TQString audioModeString (void) const { return asString ("Audio Mode"); } bool hasAudioMode (void) const { return has ("Audio Mode"); } int audioInput (void) const { return getInteger ("Audio Input"); } - QString audioInputString (void) const + TQString audioInputString (void) const { return asString ("Audio Input"); } bool hasAudioInput (void) const { return has ("Audio Input"); } @@ -2567,7 +2567,7 @@ public: bool alsaCapture (void) const { return getBoolean ("ALSA Capture"); } - const QString& captureDevice (void) const + const TQString& captureDevice (void) const { return getString ("Capture Device"); } bool hasCaptureDevice (void) const { return has ("Capture Device"); } @@ -2578,7 +2578,7 @@ public: { return getRelativeOption ("Contrast"); } void setContrastOption (int contrast, int option) { setRelativeOption ("Contrast", contrast, option); } - QString contrastString (void) const + TQString contrastString (void) const { return asIntegerString ("Contrast"); } void resetContrast (void) { reset ("Contrast"); } @@ -2587,7 +2587,7 @@ public: { return getRelativeOption ("Brightness"); } void setBrightnessOption (int brightness, int option) { setRelativeOption ("Brightness", brightness, option); } - QString brightnessString (void) const + TQString brightnessString (void) const { return asIntegerString ("Brightness"); } void resetBrightness (void) { reset ("Brightness"); } @@ -2596,7 +2596,7 @@ public: { return getRelativeOption ("Hue"); } void setHueOption (int hue, int option) { setRelativeOption ("Hue", hue, option); } - QString hueString (void) const + TQString hueString (void) const { return asIntegerString ("Hue"); } void resetHue (void) { reset ("Hue"); } @@ -2605,36 +2605,36 @@ public: { return getRelativeOption ("Saturation"); } void setSaturationOption (int saturation, int option) { setRelativeOption ("Saturation", saturation, option); } - QString saturationString (void) const + TQString saturationString (void) const { return asIntegerString ("Saturation"); } void resetSaturation (void) { reset ("Saturation"); } - const QString& videoCodecValue (void) const + const TQString& videoCodecValue (void) const { return getString ("Video Codec"); } - const QString& videoCodecOption (void) const + const TQString& videoCodecOption (void) const { return getStringOption ("Video Codec"); } - void setVideoCodecOption (const QString& codec) + void setVideoCodecOption (const TQString& codec) { setStringOption ("Video Codec", codec); } - QString videoDriverString (void) const; - QString videoCodecString (void) const; + TQString videoDriverString (void) const; + TQString videoCodecString (void) const; int videoInput (void) const { return getInteger ("Video Input"); } - QString videoInputString (void) const + TQString videoInputString (void) const { return asString ("Video Input"); } bool hasVideoInput (void) const { return has ("Video Input"); } - const QString& videoFormat (void) const + const TQString& videoFormat (void) const { return getString ("Video Format"); } bool hasVideoFormat (void) const { return has ("Video Format"); } int videoNorm (void) const { return getInteger ("Video Norm"); } - QString videoNormString (void) const + TQString videoNormString (void) const { return asString ("Video Norm"); } bool hasVideoNorm (void) const { return has ("Video Norm"); } @@ -2646,20 +2646,20 @@ public: int commandLineOption (void) const { return getAppendableOption ("Command Line"); } - const QString& commandLineValue (void) const + const TQString& commandLineValue (void) const { return getStringValue ("Command Line"); } - void setCommandLineOption (const QString& value, int option) + void setCommandLineOption (const TQString& value, int option) { return setAppendable ("Command Line", value, option); } bool hasCommandLine (void) const { return has ("Command Line"); } - const QString& demuxerValue (void) const + const TQString& demuxerValue (void) const { return getString ("Demuxer"); } - const QString& demuxerOption (void) const + const TQString& demuxerOption (void) const { return getStringOption ("Demuxer"); } - void setDemuxerOption (const QString& codec) + void setDemuxerOption (const TQString& codec) { setStringOption ("Demuxer", codec); } - QString demuxerString (void) const; + TQString demuxerString (void) const; int frameDropOption (void) const { return getIntegerOption ("Frame Dropping"); } @@ -2668,7 +2668,7 @@ public: int cacheOption (void) const { return getCacheOption ("Cache"); } - QString cacheSizeString (void) const + TQString cacheSizeString (void) const { return asString ("Cache"); } int buildNewIndexOption (void) const @@ -2683,14 +2683,14 @@ public: int mjpegDecimation (void) const { return getInteger ("Decimation"); } - QString mjpegDecimationString (void) const + TQString mjpegDecimationString (void) const { return asString ("Decimation"); } bool hasMjpegDecimation (void) const { return has ("Decimation"); } int mjpegQuality (void) const { return getInteger ("Compression"); } - QString mjpegQualityString (void) const + TQString mjpegQualityString (void) const { return asString ("Compression"); } bool hasMjpegQuality (void) const { return has ("Compression"); } @@ -2734,9 +2734,9 @@ public: virtual ~KPlayerTunerProperties(); /** Returns the list of channels. */ - virtual QStringList channels (void) = 0; + virtual TQStringList channels (void) = 0; /** Returns the frequency of the given channel. */ - int channelFrequency (const QString& id) const; + int channelFrequency (const TQString& id) const; void setVideoInput (int input) { setInteger ("Video Input", input); } @@ -2748,12 +2748,12 @@ public: void resetAudioInput (void) { reset ("Audio Input"); } - void setChannelList (const QString& list) + void setChannelList (const TQString& list) { setString ("Channel List", list); } protected: /** Default frequencies. */ - QMap m_frequencies; + TQMap m_frequencies; }; struct KPlayerChannelGroup @@ -2804,12 +2804,12 @@ public: virtual void setupMeta (void); /** Returns the list of TV channels. */ - virtual QStringList channels (void); + virtual TQStringList channels (void); - void setInputDriver (const QString& driver) + void setInputDriver (const TQString& driver) { setString ("Input Driver", driver); } - void setVideoFormat (const QString& format) + void setVideoFormat (const TQString& format) { setString ("Video Format", format); } void setVideoNorm (int norm) @@ -2826,7 +2826,7 @@ public: void setAlsaCapture (bool alsa) { setBoolean ("ALSA Capture", alsa); } - void setCaptureDevice (const QString& device) + void setCaptureDevice (const TQString& device) { setString ("Capture Device", device); } void setMjpegDecimation (int decimation) @@ -2836,7 +2836,7 @@ public: { setInteger ("Compression", quality); } /** Returns a channel list based on the KDE country setting. */ - static QString channelListFromCountry (void); + static TQString channelListFromCountry (void); }; /** The KPlayer DVB device properties. @@ -2856,14 +2856,14 @@ public: virtual void setupMeta (void); /** Returns the list of DVB channels. */ - QStringList channels (void); + TQStringList channels (void); /** Returns the name of the given channel. */ - const QString& channelName (const QString& id) const + const TQString& channelName (const TQString& id) const { return m_names [id]; } protected: /** Default names. */ - QMap m_names; + TQMap m_names; }; /** The KPlayer disk properties. @@ -2918,29 +2918,29 @@ public: virtual KConfig* config (void) const; /** Returns device option. */ - virtual QString deviceOption (void) const; + virtual TQString deviceOption (void) const; /** Returns device setting. */ - virtual QString deviceSetting (void) const; + virtual TQString deviceSetting (void) const; /** Returns URL string. */ - virtual QString urlString (void) const = 0; + virtual TQString urlString (void) const = 0; /** Returns the display size based on the option and the original size. */ - virtual QSize getDisplaySize (const QString& key) const; + virtual TQSize getDisplaySize (const TQString& key) const; /** Sets the display size and option. */ - virtual void setDisplaySize (const QSize& size, int option); + virtual void setDisplaySize (const TQSize& size, int option); /** Returns track ID option. */ - int getTrackOption (const QString& key) const; + int getTrackOption (const TQString& key) const; /** Sets track ID option. */ - void setTrackOption (const QString& key, int value); + void setTrackOption (const TQString& key, int value); /** Imports the given value under the given key. */ - void importMeta (QString key, QString value); + void importMeta (TQString key, TQString value); /** Extracts meta information from the given string and stores it in the properties, updating it if the update flag is set. */ - void extractMeta (const QString& str, bool update); + void extractMeta (const TQString& str, bool update); - QString extension (void) const; + TQString extension (void) const; float length (void) const { return getFloat ("Length"); } @@ -2949,7 +2949,7 @@ public: bool hasLength (void) const { return has ("Length"); } /** Time length as string. */ - QString lengthString (void) const + TQString lengthString (void) const { return asString ("Length"); } int normalSeek (void) const; @@ -2962,86 +2962,86 @@ public: bool hasTrack (void) const { return has ("Track"); } - const QSize& resolution (void) const + const TQSize& resolution (void) const { return getSize ("Resolution"); } - void setResolution (const QSize& size) + void setResolution (const TQSize& size) { setSize ("Resolution", size); } bool hasResolution (void) const { return has ("Resolution"); } /** Resolution size as string. */ - QString resolutionString (void) const + TQString resolutionString (void) const { return asString ("Resolution"); } /** Resolution width as string. */ - QString resolutionWidthString (void) const + TQString resolutionWidthString (void) const { - const QSize& size (resolution()); - return size.isEmpty() ? QString::null : QString::number (size.width()); + const TQSize& size (resolution()); + return size.isEmpty() ? TQString::null : TQString::number (size.width()); } /** Resolution height as string. */ - QString resolutionHeightString (void) const + TQString resolutionHeightString (void) const { - const QSize& size (resolution()); - return size.isEmpty() ? QString::null : QString::number (size.height()); + const TQSize& size (resolution()); + return size.isEmpty() ? TQString::null : TQString::number (size.height()); } - const QSize& originalSize (void) const + const TQSize& originalSize (void) const { return getSize ("Video Size"); } - void setOriginalSize (const QSize& size) + void setOriginalSize (const TQSize& size) { setSize ("Video Size", size); } bool hasOriginalSize (void) const { return has ("Video Size"); } /** Original size as string. */ - QString originalSizeString (void) const + TQString originalSizeString (void) const { return asString ("Video Size"); } /** Original width as string. */ - QString originalWidthString (void) const + TQString originalWidthString (void) const { - const QSize& size (originalSize()); - return size.isEmpty() ? QString::null : QString::number (size.width()); + const TQSize& size (originalSize()); + return size.isEmpty() ? TQString::null : TQString::number (size.width()); } /** Original height as string. */ - QString originalHeightString (void) const + TQString originalHeightString (void) const { - const QSize& size (originalSize()); - return size.isEmpty() ? QString::null : QString::number (size.height()); + const TQSize& size (originalSize()); + return size.isEmpty() ? TQString::null : TQString::number (size.height()); } - const QSize& currentResolution (void) const + const TQSize& currentResolution (void) const { return hasCurrentResolution() ? getSize ("Current Resolution") : resolution(); } - void setCurrentResolution (const QSize& size) + void setCurrentResolution (const TQSize& size) { setSize ("Current Resolution", size); } void resetCurrentResolution (void) { reset ("Current Resolution"); } bool hasCurrentResolution (void) const { return has ("Current Resolution"); } - const QSize& currentSize (void) const + const TQSize& currentSize (void) const { return hasCurrentSize() ? getSize ("Current Size") : originalSize(); } - void setCurrentSize (const QSize& size) + void setCurrentSize (const TQSize& size) { setSize ("Current Size", size); } void resetCurrentSize (void) { reset ("Current Size"); } bool hasCurrentSize (void) const { return has ("Current Size"); } /** Current size as string. */ - QString currentSizeString (void) const + TQString currentSizeString (void) const { return asString ("Current Size"); } /** Current width as string. */ - QString currentWidthString (void) const + TQString currentWidthString (void) const { - const QSize& size (currentSize()); - return size.isEmpty() ? QString::null : QString::number (size.width()); + const TQSize& size (currentSize()); + return size.isEmpty() ? TQString::null : TQString::number (size.width()); } /** Current height as string. */ - QString currentHeightString (void) const + TQString currentHeightString (void) const { - const QSize& size (currentSize()); - return size.isEmpty() ? QString::null : QString::number (size.height()); + const TQSize& size (currentSize()); + return size.isEmpty() ? TQString::null : TQString::number (size.height()); } - QSize originalAspect (void) const + TQSize originalAspect (void) const { return hasDisplaySize() ? displaySize() : originalSize(); } - QSize currentAspect (void) const + TQSize currentAspect (void) const { return hasDisplaySize() ? displaySize() : currentSize(); } bool hasVideo (void) const @@ -3074,16 +3074,16 @@ public: { return getUrl ("Subtitle URL"); } void setSubtitleUrl (const KURL& url) { setUrl ("Subtitle URL", url); } - void setSubtitleUrl (const QString& url) + void setSubtitleUrl (const TQString& url) { setSubtitleUrl (KURL::fromPathOrURL (url)); } bool hasSubtitleUrl (void) const { return has ("Subtitle URL"); } - QString subtitleUrlString (void) const + TQString subtitleUrlString (void) const { const KURL& u (subtitleUrl()); return u.isLocalFile() ? u.path() : u.url(); } - QString subtitlePath (void) const + TQString subtitlePath (void) const { return asString ("Subtitle URL"); } void resetSubtitleUrl (void) { reset ("Subtitle URL"); } @@ -3115,18 +3115,18 @@ public: { return getInteger ("Subtitle ID"); } void setSubtitleID (int id) { setInteger ("Subtitle ID", id); } - QString subtitleIDString (void) const + TQString subtitleIDString (void) const { return asString ("Subtitle ID"); } bool hasSubtitleID (void) const { return has ("Subtitle ID"); } void resetSubtitleID (void) { reset ("Subtitle ID"); } - const QMap& subtitleIDs (void) const + const TQMap& subtitleIDs (void) const { return getIntegerStringMap ("Subtitle IDs"); } void addSubtitleID (int sid) { setIntegerStringMapKey ("Subtitle IDs", sid); } - void setSubtitleLanguage (int sid, const QString& slang) + void setSubtitleLanguage (int sid, const TQString& slang) { setIntegerStringMapKeyValue ("Subtitle IDs", sid, slang); } bool hasSubtitleIDs (void) const { return has ("Subtitle IDs"); } @@ -3139,18 +3139,18 @@ public: { return getInteger ("Vobsub ID"); } void setVobsubID (int id) { setInteger ("Vobsub ID", id); } - QString vobsubIDString (void) const + TQString vobsubIDString (void) const { return asString ("Vobsub ID"); } bool hasVobsubID (void) const { return has ("Vobsub ID"); } void resetVobsubID (void) { reset ("Vobsub ID"); } - const QMap& vobsubIDs (void) const + const TQMap& vobsubIDs (void) const { return getIntegerStringMap ("Vobsub IDs"); } void addVobsubID (int sid) { setIntegerStringMapKey ("Vobsub IDs", sid); } - void setVobsubLanguage (int sid, const QString& slang) + void setVobsubLanguage (int sid, const TQString& slang) { setIntegerStringMapKeyValue ("Vobsub IDs", sid, slang); } bool hasVobsubIDs (void) const { return has ("Vobsub IDs"); } @@ -3167,7 +3167,7 @@ public: { setFloat ("Subtitle Framerate", framerate); } bool hasSubtitleFramerate (void) const { return has ("Subtitle Framerate"); } - QString subtitleFramerateString (void) const + TQString subtitleFramerateString (void) const { return asString ("Subtitle Framerate"); } void resetSubtitleFramerate (void) { reset ("Subtitle Framerate"); } @@ -3178,7 +3178,7 @@ public: { setInteger ("Audio Bitrate", bitrate); } bool hasAudioBitrate (void) const { return has ("Audio Bitrate"); } - QString audioBitrateString (void) const + TQString audioBitrateString (void) const { return asString ("Audio Bitrate"); } int samplerate (void) const @@ -3188,7 +3188,7 @@ public: bool hasSamplerate (void) const { return has ("Samplerate"); } /** Samplerate as string. */ - QString samplerateString (void) const + TQString samplerateString (void) const { return asString ("Samplerate"); } int channels (void) const @@ -3198,7 +3198,7 @@ public: bool hasChannels (void) const { return has ("Channels"); } /** Channels as string. */ - QString channelsString (void) const + TQString channelsString (void) const { return asString ("Channels"); } bool hasAudioCodec (void) const @@ -3214,16 +3214,16 @@ public: { return getTrackOption ("Audio ID"); } void setAudioIDOption (int option) { setTrackOption ("Audio ID", option); } - QString audioIDString (void) const + TQString audioIDString (void) const { return asString ("Audio ID"); } bool hasAudioID (void) const { return has ("Audio ID"); } - const QMap& audioIDs (void) const + const TQMap& audioIDs (void) const { return getIntegerStringMap ("Audio IDs"); } void addAudioID (int aid) { setIntegerStringMapKey ("Audio IDs", aid); } - void setAudioLanguage (int aid, const QString& alang) + void setAudioLanguage (int aid, const TQString& alang) { setIntegerStringMapKeyValue ("Audio IDs", aid, alang); } bool hasAudioID (int aid) const { return hasIntegerStringMapKey ("Audio IDs", aid); } @@ -3236,7 +3236,7 @@ public: { setInteger ("Video Bitrate", bitrate); } bool hasVideoBitrate (void) const { return has ("Video Bitrate"); } - QString videoBitrateString (void) const + TQString videoBitrateString (void) const { return asString ("Video Bitrate"); } float framerate (void) const @@ -3246,7 +3246,7 @@ public: bool hasFramerate (void) const { return has ("Framerate"); } /** Framerate as string. */ - QString framerateString (void) const + TQString framerateString (void) const { return asString ("Framerate"); } bool hasVideoCodec (void) const @@ -3262,12 +3262,12 @@ public: { return getTrackOption ("Video ID"); } void setVideoIDOption (int option) { setTrackOption ("Video ID", option); } - QString videoIDString (void) const + TQString videoIDString (void) const { return asString ("Video ID"); } bool hasVideoID (void) const { return has ("Video ID"); } - const QMap& videoIDs (void) const + const TQMap& videoIDs (void) const { return getIntegerStringMap ("Video IDs"); } void addVideoID (int vid) { setIntegerStringMapKey ("Video IDs", vid); } @@ -3323,14 +3323,14 @@ public: { return (KPlayerDiskProperties*) m_parent; } /** Returns icon name. */ - virtual QString icon (void) const; + virtual TQString icon (void) const; /** Returns device option. */ - virtual QString deviceOption (void) const; + virtual TQString deviceOption (void) const; /** Returns device setting. */ - virtual QString deviceSetting (void) const; + virtual TQString deviceSetting (void) const; /** Returns URL string. */ - virtual QString urlString (void) const; + virtual TQString urlString (void) const; }; /** The KPlayer channel properties. @@ -3351,7 +3351,7 @@ public: { return (KPlayerDeviceProperties*) m_parent; } /** Returns icon name. */ - virtual QString icon (void) const; + virtual TQString icon (void) const; /** Returns whether this media needs frequency. */ virtual bool needsFrequency (void) const; @@ -3363,7 +3363,7 @@ public: /** Sets the channel frequency. */ void setFrequency (int frequency); /** Frequency as string. */ - QString frequencyString (void) const + TQString frequencyString (void) const { return asString ("Frequency"); } /** Returns the default frequency. */ @@ -3401,11 +3401,11 @@ public: virtual bool canChangeFrequency (void) const; /** Returns device option. */ - virtual QString deviceOption (void) const; + virtual TQString deviceOption (void) const; /** Returns device setting. */ - virtual QString deviceSetting (void) const; + virtual TQString deviceSetting (void) const; /** Returns URL string. */ - virtual QString urlString (void) const; + virtual TQString urlString (void) const; }; /** The KPlayer DVB channel properties. @@ -3432,11 +3432,11 @@ public: virtual bool canChangeFrequency (void) const; /** Returns device option. */ - virtual QString deviceOption (void) const; + virtual TQString deviceOption (void) const; /** Returns device setting. */ - virtual QString deviceSetting (void) const; + virtual TQString deviceSetting (void) const; /** Returns URL string. */ - virtual QString urlString (void) const; + virtual TQString urlString (void) const; }; inline int KPlayerFrequencyProperty::value (void) const @@ -3467,13 +3467,13 @@ public: /** Initializes meta properties. */ virtual void setupMeta (void); - virtual bool autoloadSubtitles (const QString& key) const; - virtual bool getVobsubSubtitles (const QString& key, const KURL& url) const; - virtual bool getPlaylist (const QString& key, const KURL& url) const; - virtual bool getUseKioslave (const QString& key, const KURL& url) const; + virtual bool autoloadSubtitles (const TQString& key) const; + virtual bool getVobsubSubtitles (const TQString& key, const KURL& url) const; + virtual bool getPlaylist (const TQString& key, const KURL& url) const; + virtual bool getUseKioslave (const TQString& key, const KURL& url) const; /** Returns URL string. */ - virtual QString urlString (void) const; + virtual TQString urlString (void) const; int subtitleAutoloadOption (void) const { return getBooleanOption ("Autoload Subtitles"); } diff --git a/kplayer/kplayerpropertiesadvanced.ui b/kplayer/kplayerpropertiesadvanced.ui index 1296fd3..3a9cf7b 100644 --- a/kplayer/kplayerpropertiesadvanced.ui +++ b/kplayer/kplayerpropertiesadvanced.ui @@ -1,6 +1,6 @@ KPlayerPropertiesAdvancedPage - + KPlayerPropertiesAdvancedPage @@ -36,7 +36,7 @@ unnamed - + frame1 @@ -58,7 +58,7 @@ unnamed - + layout1 @@ -66,7 +66,7 @@ unnamed - + l_command_line @@ -86,7 +86,7 @@ Additional options that will be passed to MPlayer on the command line. See mplayer(1) manpage for a complete list of possible options. - + default @@ -112,7 +112,7 @@ Choose how to combine the options you specify here with the defaults set in KPlayer Settings. Default uses options from KPlayer Settings, Set To replaces them with the options set here, and Append adds these options to the defaults. - + c_command_line @@ -133,7 +133,7 @@ - + layout2 @@ -141,7 +141,7 @@ unnamed - + l_demuxer @@ -161,7 +161,7 @@ Property that shows and allows you to change the demultiplexer used for the file or stream. If the chosen demuxer fails, another one may be used. - + c_demuxer @@ -180,7 +180,7 @@ Property that shows and allows you to change the demultiplexer used for the file or stream. If the chosen demuxer fails, another one may be used. - + l_frame_drop @@ -200,7 +200,7 @@ If your system is too slow to play this file, MPlayer can drop some frames so playback does not slow down. Default uses the default from KPlayer Settings, None disables dropping, Soft drops fewer frames, and Hard drops more frames and may sometimes break decoding. If you select a frame dropping option from Player menu while holding Shift key, KPlayer will remember that choice in this property for the currently loaded file. - + default @@ -231,7 +231,7 @@ If your system is too slow to play this file, MPlayer can drop some frames so playback does not slow down. Default uses the default from KPlayer Settings, None disables dropping, Soft drops fewer frames, and Hard drops more frames and may sometimes break decoding. If you select a frame dropping option from Player menu while holding Shift key, KPlayer will remember that choice in this property for the currently loaded file. - + l_use_cache @@ -251,7 +251,7 @@ Option to choose whether to use cache and set its size. Default uses the option set in KPlayer Settings, Auto lets MPlayer use the its own configuration, None tells MPlayer to use no cache, and Set Size lets you set a specific size. - + default @@ -282,7 +282,7 @@ Option to choose whether to use cache and set its size. Default uses the option set in KPlayer Settings, Auto lets MPlayer use the its own configuration, None tells MPlayer to use no cache, and Set Size lets you set a specific size. - + c_cache_size @@ -310,7 +310,7 @@ Option to choose whether to use cache and set its size. Default uses the option set in KPlayer Settings, Auto lets MPlayer use the its own configuration, None tells MPlayer to use no cache, and Set Size lets you set a specific size. - + l_cache_size_kb @@ -335,7 +335,7 @@ Option to choose whether to use cache and set its size. Default uses the option set in KPlayer Settings, Auto lets MPlayer use the its own configuration, None tells MPlayer to use no cache, and Set Size lets you set a specific size. - + l_build_index @@ -355,7 +355,7 @@ Option to choose whether to build new index for seeking. Default uses the option from KPlayer Settings, Yes builds an index if the file does not have it, No tells MPlayer not to build index, and Force makes it always build an index. - + default @@ -386,7 +386,7 @@ Option to choose whether to build new index for seeking. Default uses the option from KPlayer Settings, Yes builds an index if the file does not have it, No tells MPlayer not to build index, and Force makes it always build an index. - + l_use_kioslave @@ -406,7 +406,7 @@ Option to choose whether to use a KDE I/O Slave to play this file. Auto decides it automatically using options set in KPlayer Settings. - + auto @@ -432,7 +432,7 @@ Option to choose whether to use a KDE I/O Slave to play this file. Auto decides it automatically using options set in KPlayer Settings. - + l_use_temporary_file @@ -452,7 +452,7 @@ Option to choose whether to use a temporary file for playing from KDE I/O Slave. Default uses the option from KPlayer Settings. This option has no effect for URLs passed directly to MPlayer. - + default @@ -480,7 +480,7 @@ - + l_compression @@ -488,7 +488,7 @@ unnamed - + c_compression @@ -502,7 +502,7 @@ Option to choose whether to use hardware compression and set image size and quality. - + full size @@ -528,7 +528,7 @@ Option to choose whether to use hardware compression and set image size and quality. - + l_quality @@ -548,7 +548,7 @@ Option to choose whether to use hardware compression and set image size and quality. - + c_quality @@ -576,7 +576,7 @@ Option to choose whether to use hardware compression and set image size and quality. - + l_spacer diff --git a/kplayer/kplayerpropertiesaudio.ui b/kplayer/kplayerpropertiesaudio.ui index be3b629..08789f6 100644 --- a/kplayer/kplayerpropertiesaudio.ui +++ b/kplayer/kplayerpropertiesaudio.ui @@ -1,6 +1,6 @@ KPlayerPropertiesAudioPage - + KPlayerPropertiesAudioPage @@ -28,7 +28,7 @@ unnamed - + frame1 @@ -50,7 +50,7 @@ unnamed - + layout3 @@ -58,7 +58,7 @@ unnamed - + l_track @@ -78,7 +78,7 @@ Option to choose the audio track to play. - + auto @@ -107,7 +107,7 @@ Option to choose the audio track to play. - + c_track @@ -132,7 +132,7 @@ Option to choose the audio track to play. - + l_volume @@ -152,7 +152,7 @@ Option to adjust sound volume level for this file. Default uses the same volume as for other files, Set To adjusts volume to the given level, Add and Subtract turn volume up and down respectively by the given amount. It is easier to set this option by moving volume slider while having Shift key pressed. - + default @@ -191,7 +191,7 @@ Option to adjust sound volume level for this file. Default uses the same volume as for other files, Set To adjusts volume to the given level, Add and Subtract turn volume up and down respectively by the given amount. It is easier to set this option by moving volume slider while having Shift key pressed. - + c_volume @@ -216,7 +216,7 @@ Option to adjust sound volume level for this file. Default uses the same volume as for other files, Set To adjusts volume to the given level, Add and Subtract turn volume up and down respectively by the given amount. It is easier to set this option by moving volume slider while having Shift key pressed. - + l_delay @@ -236,7 +236,7 @@ Option to set delay of sound relative to video for this file. By default sound is played without delay. An easier way to set this option is by using keyboard shortcuts for Audio Delay commands on Player/Audio menu. In the default configuration KPlayer will automatically store those changes in this property. - + default @@ -265,7 +265,7 @@ Option to set delay of sound relative to video for this file. By default sound is played without delay. An easier way to set this option is by using keyboard shortcuts for Audio Delay commands on Player/Audio menu. In the default configuration KPlayer will automatically store those changes in this property. - + c_delay @@ -290,7 +290,7 @@ Option to set delay of sound relative to video for this file. By default sound is played without delay. An easier way to set this option is by using keyboard shortcuts for Audio Delay commands on Player/Audio menu. In the default configuration KPlayer will automatically store those changes in this property. - + l_seconds @@ -315,7 +315,7 @@ Option to set delay of sound relative to video for this file. By default sound is played without delay. An easier way to set this option is by using keyboard shortcuts for Audio Delay commands on Player/Audio menu. In the default configuration KPlayer will automatically store those changes in this property. - + l_codec @@ -335,7 +335,7 @@ Option that lists available codecs and lets you choose the one to be used for this file. Default uses the option from KPlayer Settings, Auto lets MPlayer decide which codec to use automatically. - + c_codec @@ -354,7 +354,7 @@ Option that lists available codecs and lets you choose the one to be used for this file. Default uses the option from KPlayer Settings, Auto lets MPlayer decide which codec to use automatically. - + l_bitrate @@ -374,7 +374,7 @@ Property that shows audio bitrate of this file. - + c_bitrate @@ -396,7 +396,7 @@ Property that shows audio bitrate of this file. - + l_kbps @@ -421,7 +421,7 @@ Property that shows audio bitrate of this file. - + l_samplerate @@ -441,7 +441,7 @@ Property that shows audio sample rate of this file. - + c_samplerate @@ -463,7 +463,7 @@ Property that shows audio sample rate of this file. - + l_hz @@ -488,7 +488,7 @@ Property that shows audio sample rate of this file. - + l_mode @@ -508,7 +508,7 @@ Option to choose the audio mode to request from the device. - + auto @@ -552,7 +552,7 @@ Option to choose the audio mode to request from the device. - + l_input @@ -572,7 +572,7 @@ Option to specify the audio card input ID to use for capturing audio. - + auto @@ -601,7 +601,7 @@ Option to specify the audio card input ID to use for capturing audio. - + c_input @@ -618,7 +618,7 @@ Option to specify the audio card input ID to use for capturing audio. - + c_immediate @@ -640,7 +640,7 @@ Option to choose specify where audio comes from. Select this option if your TV card is connected with a cable to a sound card. When this option is not selected, audio comes along with video from the TV card. - + l_capture @@ -660,7 +660,7 @@ Option to specify the audio capture system and device. - + ALSA @@ -689,7 +689,7 @@ Option to specify the audio capture system and device. - + l_device @@ -717,7 +717,7 @@ Option to specify the audio capture system and device. - + c_device diff --git a/kplayer/kplayerpropertiesdevice.ui b/kplayer/kplayerpropertiesdevice.ui index 4859d07..c218b72 100644 --- a/kplayer/kplayerpropertiesdevice.ui +++ b/kplayer/kplayerpropertiesdevice.ui @@ -1,6 +1,6 @@ KPlayerPropertiesDevicePage - + KPlayerPropertiesDevicePage @@ -28,7 +28,7 @@ unnamed - + frame1 @@ -50,7 +50,7 @@ unnamed - + layout3 @@ -58,7 +58,7 @@ unnamed - + l_name @@ -78,7 +78,7 @@ Option to give a descriptive name for the device. The name will be displayed in the multimedia library and on the menu. - + c_name @@ -97,7 +97,7 @@ Option to give a descriptive name for the device. The name will be displayed in the multimedia library and on the menu. - + l_path @@ -117,7 +117,7 @@ Option to specify the path to the device node. - + c_path @@ -139,7 +139,7 @@ Option to specify the path to the device node. - + l_type @@ -159,7 +159,7 @@ Option that lets you choose the type of the device. - + c_type @@ -198,7 +198,7 @@ Option that lets you choose the type of the device. - + l_channel_list @@ -218,7 +218,7 @@ Option to choose the available channels according to your location. - + c_channel_list @@ -237,7 +237,7 @@ Option to choose the available channels according to your location. - + l_driver @@ -257,7 +257,7 @@ Option to choose the input driver. - + BSD Bt848 @@ -291,7 +291,7 @@ Option to choose the input driver. - + l_channel_file @@ -311,7 +311,7 @@ Option to specify the path to the file containing the list of available channels. - + c_channel_file @@ -339,9 +339,9 @@ c_path - textChanged (const QString&) + textChanged (const TQString&) KPlayerPropertiesDevicePage - pathChanged (const QString&) + pathChanged (const TQString&) c_type @@ -351,7 +351,7 @@ - pathChanged (const QString&) + pathChanged (const TQString&) typeChanged (int) diff --git a/kplayer/kplayerpropertiesdialog.cpp b/kplayer/kplayerpropertiesdialog.cpp index a9b7a58..fc46dfc 100644 --- a/kplayer/kplayerpropertiesdialog.cpp +++ b/kplayer/kplayerpropertiesdialog.cpp @@ -16,16 +16,16 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include -QString languageName (int id, QString language); +TQString languageName (int id, TQString language); #ifdef DEBUG #define DEBUG_KPLAYER_PROPERTIES_DIALOG @@ -35,24 +35,24 @@ QString languageName (int id, QString language); #include "kplayerpropertiesdialog.moc" #include "kplayerproperties.h" -static QString s_default_entry (i18n("%1 (%2)")); -static QRegExp re_key_value ("^([^:]+): *(.*)$"); +static TQString s_default_entry (i18n("%1 (%2)")); +static TQRegExp re_key_value ("^([^:]+): *(.*)$"); -QString listEntry (QComboBox* combo, bool hasDefault = false) +TQString listEntry (TQComboBox* combo, bool hasDefault = false) { if ( hasDefault && combo -> currentItem() == 0 ) - return QString::null; + return TQString::null; if ( combo -> currentItem() == 0 || hasDefault && combo -> currentItem() == 1 ) return ""; if ( re_key_value.search (combo -> currentText()) >= 0 ) return re_key_value.cap(1); - return QString::null; + return TQString::null; } KPlayerPropertiesDialog::KPlayerPropertiesDialog (void) : KDialogBase (TreeList, i18n("File Properties"), Help | Default | Ok | Apply | Cancel, Ok) { - QApplication::connect (this, SIGNAL (aboutToShowPage (QWidget*)), this, SLOT (pageAboutToShow(QWidget*))); + TQApplication::connect (this, SIGNAL (aboutToShowPage (TQWidget*)), this, SLOT (pageAboutToShow(TQWidget*))); } KPlayerPropertiesDialog::~KPlayerPropertiesDialog (void) @@ -82,33 +82,33 @@ void KPlayerPropertiesDialog::setup (const KURL& url) kdDebugTime() << "KPlayerPropertiesDialog::setup\n"; #endif setupMedia (url); - QFrame* frame = addPage (i18n("General"), i18n("General Properties")); - QBoxLayout* layout = new QVBoxLayout (frame, 0, 0); + TQFrame* frame = addPage (i18n("General"), i18n("General Properties")); + TQBoxLayout* layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); m_general = createGeneralPage (frame, "general"); m_general -> setup (url); frame = addPage (i18n("Size"), i18n("Size Properties")); - layout = new QVBoxLayout (frame, 0, 0); + layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); m_size = createSizePage (frame, "size"); m_size -> setup (url); frame = addPage (i18n("Video"), i18n("Video Properties")); - layout = new QVBoxLayout (frame, 0, 0); + layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); m_video = createVideoPage (frame, "video"); m_video -> setup (url); frame = addPage (i18n("Audio"), i18n("Audio Properties")); - layout = new QVBoxLayout (frame, 0, 0); + layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); m_audio = createAudioPage (frame, "audio"); m_audio -> setup (url); frame = addPage (i18n("Subtitles"), i18n("Subtitle Properties")); - layout = new QVBoxLayout (frame, 0, 0); + layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); m_subtitles = createSubtitlesPage (frame, "subtitles"); m_subtitles -> setup (url); frame = addPage (i18n("Advanced"), i18n("Advanced Properties")); - layout = new QVBoxLayout (frame, 0, 0); + layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); m_advanced = createAdvancedPage (frame, "advanced"); m_advanced -> setup (url); @@ -116,18 +116,18 @@ void KPlayerPropertiesDialog::setup (const KURL& url) KListView* view = (KListView*) child (0, "KListView"); if ( view ) view -> setMinimumSize (view -> sizeHint()); - layout = (QBoxLayout*) child (0, "QHBoxLayout"); + layout = (TQBoxLayout*) child (0, "TQHBoxLayout"); if ( layout ) layout -> insertSpacing (0, 6); KConfig* config = kPlayerConfig(); config -> setGroup ("Dialog Options"); - QString name (config -> readEntry ("Properties Dialog Page")); + TQString name (config -> readEntry ("Properties Dialog Page")); if ( ! name.isEmpty() ) { - QFrame* frame = (QFrame*) child (name.latin1()); + TQFrame* frame = (TQFrame*) child (name.latin1()); if ( frame ) { - frame = (QFrame*) frame -> parent(); + frame = (TQFrame*) frame -> parent(); if ( frame ) showPage (pageIndex (frame)); } @@ -136,9 +136,9 @@ void KPlayerPropertiesDialog::setup (const KURL& url) int y = config -> readNumEntry ("Properties Dialog Top", -1);*/ int w = config -> readNumEntry ("Properties Dialog Width"); int h = config -> readNumEntry ("Properties Dialog Height"); -//QSize size (config -> readNumEntry ("Properties Dialog Width"), +//TQSize size (config -> readNumEntry ("Properties Dialog Width"), // config -> readNumEntry ("Properties Dialog Height")); -//QSize hint = minimumSizeHint(); +//TQSize hint = minimumSizeHint(); //if ( size.width() < hint.width() || size.height() < hint.height() ) // size = sizeHint(); //setGeometry (x, y, size.width(), size.height()); @@ -171,15 +171,15 @@ void KPlayerPropertiesDialog::slotDefault (void) KDialogBase::slotDefault(); } -void KPlayerPropertiesDialog::pageAboutToShow (QWidget* page) +void KPlayerPropertiesDialog::pageAboutToShow (TQWidget* page) { #ifdef DEBUG_KPLAYER_PROPERTIES_DIALOG kdDebugTime() << "KPlayerPropertiesDialog::pageAboutToShow\n"; #endif - QObject* object = page -> child (0, "QFrame"); + TQObject* object = page -> child (0, "TQFrame"); KConfig* config = kPlayerConfig(); config -> setGroup ("Dialog Options"); - QString name; + TQString name; if ( object ) { name = object -> name (""); @@ -225,7 +225,7 @@ KPlayerPropertiesDialog* KPlayerPropertiesDialog::createDialog (KPlayerTrackProp return new KPlayerItemPropertiesDialog; else { - const QString& type = ((KPlayerMediaProperties*) properties -> parent()) -> type(); + const TQString& type = ((KPlayerMediaProperties*) properties -> parent()) -> type(); if ( type == "TV" || type == "DVB" ) return new KPlayerChannelPropertiesDialog; } @@ -247,32 +247,32 @@ void KPlayerDevicePropertiesDialog::setupMedia (const KURL& url) m_properties = KPlayerMedia::deviceProperties (url); } -KPlayerPropertiesGeneral* KPlayerDevicePropertiesDialog::createGeneralPage (QFrame* frame, const QString& name) +KPlayerPropertiesGeneral* KPlayerDevicePropertiesDialog::createGeneralPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesDeviceGeneral (frame, name.utf8()); } -KPlayerPropertiesSize* KPlayerDevicePropertiesDialog::createSizePage (QFrame* frame, const QString& name) +KPlayerPropertiesSize* KPlayerDevicePropertiesDialog::createSizePage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesDeviceSize (frame, name.utf8()); } -KPlayerPropertiesSubtitles* KPlayerDevicePropertiesDialog::createSubtitlesPage (QFrame* frame, const QString& name) +KPlayerPropertiesSubtitles* KPlayerDevicePropertiesDialog::createSubtitlesPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesDeviceSubtitles (frame, name.utf8()); } -KPlayerPropertiesAudio* KPlayerDevicePropertiesDialog::createAudioPage (QFrame* frame, const QString& name) +KPlayerPropertiesAudio* KPlayerDevicePropertiesDialog::createAudioPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesDeviceAudio (frame, name.utf8()); } -KPlayerPropertiesVideo* KPlayerDevicePropertiesDialog::createVideoPage (QFrame* frame, const QString& name) +KPlayerPropertiesVideo* KPlayerDevicePropertiesDialog::createVideoPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesDeviceVideo (frame, name.utf8()); } -KPlayerPropertiesAdvanced* KPlayerDevicePropertiesDialog::createAdvancedPage (QFrame* frame, const QString& name) +KPlayerPropertiesAdvanced* KPlayerDevicePropertiesDialog::createAdvancedPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesDeviceAdvanced (frame, name.utf8()); } @@ -292,22 +292,22 @@ void KPlayerTVDevicePropertiesDialog::setupMedia (const KURL& url) m_properties = KPlayerMedia::tvProperties (url); } -KPlayerPropertiesGeneral* KPlayerTVDevicePropertiesDialog::createGeneralPage (QFrame* frame, const QString& name) +KPlayerPropertiesGeneral* KPlayerTVDevicePropertiesDialog::createGeneralPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesTVDeviceGeneral (frame, name.utf8()); } -KPlayerPropertiesAudio* KPlayerTVDevicePropertiesDialog::createAudioPage (QFrame* frame, const QString& name) +KPlayerPropertiesAudio* KPlayerTVDevicePropertiesDialog::createAudioPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesTVDeviceAudio (frame, name.utf8()); } -KPlayerPropertiesVideo* KPlayerTVDevicePropertiesDialog::createVideoPage (QFrame* frame, const QString& name) +KPlayerPropertiesVideo* KPlayerTVDevicePropertiesDialog::createVideoPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesTVDeviceVideo (frame, name.utf8()); } -KPlayerPropertiesAdvanced* KPlayerTVDevicePropertiesDialog::createAdvancedPage (QFrame* frame, const QString& name) +KPlayerPropertiesAdvanced* KPlayerTVDevicePropertiesDialog::createAdvancedPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesTVDeviceAdvanced (frame, name.utf8()); } @@ -327,17 +327,17 @@ void KPlayerDVBDevicePropertiesDialog::setupMedia (const KURL& url) m_properties = KPlayerMedia::dvbProperties (url); } -KPlayerPropertiesGeneral* KPlayerDVBDevicePropertiesDialog::createGeneralPage (QFrame* frame, const QString& name) +KPlayerPropertiesGeneral* KPlayerDVBDevicePropertiesDialog::createGeneralPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesDVBDeviceGeneral (frame, name.utf8()); } -KPlayerPropertiesAudio* KPlayerDVBDevicePropertiesDialog::createAudioPage (QFrame* frame, const QString& name) +KPlayerPropertiesAudio* KPlayerDVBDevicePropertiesDialog::createAudioPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesDVBDeviceAudio (frame, name.utf8()); } -KPlayerPropertiesVideo* KPlayerDVBDevicePropertiesDialog::createVideoPage (QFrame* frame, const QString& name) +KPlayerPropertiesVideo* KPlayerDVBDevicePropertiesDialog::createVideoPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesDVBDeviceVideo (frame, name.utf8()); } @@ -357,32 +357,32 @@ void KPlayerDiskTrackPropertiesDialog::setupMedia (const KURL& url) m_properties = KPlayerMedia::trackProperties (url); } -KPlayerPropertiesGeneral* KPlayerDiskTrackPropertiesDialog::createGeneralPage (QFrame* frame, const QString& name) +KPlayerPropertiesGeneral* KPlayerDiskTrackPropertiesDialog::createGeneralPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesDiskTrackGeneral (frame, name.utf8()); } -KPlayerPropertiesSize* KPlayerDiskTrackPropertiesDialog::createSizePage (QFrame* frame, const QString& name) +KPlayerPropertiesSize* KPlayerDiskTrackPropertiesDialog::createSizePage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesTrackSize (frame, name.utf8()); } -KPlayerPropertiesSubtitles* KPlayerDiskTrackPropertiesDialog::createSubtitlesPage (QFrame* frame, const QString& name) +KPlayerPropertiesSubtitles* KPlayerDiskTrackPropertiesDialog::createSubtitlesPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesDiskTrackSubtitles (frame, name.utf8()); } -KPlayerPropertiesAudio* KPlayerDiskTrackPropertiesDialog::createAudioPage (QFrame* frame, const QString& name) +KPlayerPropertiesAudio* KPlayerDiskTrackPropertiesDialog::createAudioPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesTrackAudio (frame, name.utf8()); } -KPlayerPropertiesVideo* KPlayerDiskTrackPropertiesDialog::createVideoPage (QFrame* frame, const QString& name) +KPlayerPropertiesVideo* KPlayerDiskTrackPropertiesDialog::createVideoPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesTrackVideo (frame, name.utf8()); } -KPlayerPropertiesAdvanced* KPlayerDiskTrackPropertiesDialog::createAdvancedPage (QFrame* frame, const QString& name) +KPlayerPropertiesAdvanced* KPlayerDiskTrackPropertiesDialog::createAdvancedPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesTrackAdvanced (frame, name.utf8()); } @@ -394,12 +394,12 @@ KPlayerChannelPropertiesDialog::~KPlayerChannelPropertiesDialog (void) #endif } -KPlayerPropertiesGeneral* KPlayerChannelPropertiesDialog::createGeneralPage (QFrame* frame, const QString& name) +KPlayerPropertiesGeneral* KPlayerChannelPropertiesDialog::createGeneralPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesChannelGeneral (frame, name.utf8()); } -KPlayerPropertiesSubtitles* KPlayerChannelPropertiesDialog::createSubtitlesPage (QFrame* frame, const QString& name) +KPlayerPropertiesSubtitles* KPlayerChannelPropertiesDialog::createSubtitlesPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesChannelSubtitles (frame, name.utf8()); } @@ -411,24 +411,24 @@ KPlayerItemPropertiesDialog::~KPlayerItemPropertiesDialog (void) #endif } -KPlayerPropertiesGeneral* KPlayerItemPropertiesDialog::createGeneralPage (QFrame* frame, const QString& name) +KPlayerPropertiesGeneral* KPlayerItemPropertiesDialog::createGeneralPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesItemGeneral (frame, name.utf8()); } -KPlayerPropertiesSubtitles* KPlayerItemPropertiesDialog::createSubtitlesPage (QFrame* frame, const QString& name) +KPlayerPropertiesSubtitles* KPlayerItemPropertiesDialog::createSubtitlesPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesItemSubtitles (frame, name.utf8()); } -KPlayerPropertiesAdvanced* KPlayerItemPropertiesDialog::createAdvancedPage (QFrame* frame, const QString& name) +KPlayerPropertiesAdvanced* KPlayerItemPropertiesDialog::createAdvancedPage (TQFrame* frame, const TQString& name) { return new KPlayerPropertiesItemAdvanced (frame, name.utf8()); } -/*void setupHistory (QComboBox* combo, const QStringList& history) +/*void setupHistory (TQComboBox* combo, const TQStringList& history) { - for ( QStringList::ConstIterator it (history.begin()); it != history.end(); ++ it ) + for ( TQStringList::ConstIterator it (history.begin()); it != history.end(); ++ it ) { combo -> insertItem (*it); #ifdef DEBUG_KPLAYER_PROPERTIES_DIALOG @@ -437,7 +437,7 @@ KPlayerPropertiesAdvanced* KPlayerItemPropertiesDialog::createAdvancedPage (QFra } }*/ -KPlayerPropertiesGeneral::KPlayerPropertiesGeneral (QWidget* parent, const char* name) +KPlayerPropertiesGeneral::KPlayerPropertiesGeneral (TQWidget* parent, const char* name) : KPlayerPropertiesGeneralPage (parent, name) { } @@ -528,7 +528,7 @@ void KPlayerPropertiesGeneral::save (void) properties() -> setName (c_name -> text()); } -KPlayerPropertiesDeviceGeneral::KPlayerPropertiesDeviceGeneral (QWidget* parent, const char* name) +KPlayerPropertiesDeviceGeneral::KPlayerPropertiesDeviceGeneral (TQWidget* parent, const char* name) : KPlayerPropertiesGeneral (parent, name) { } @@ -559,7 +559,7 @@ void KPlayerPropertiesDeviceGeneral::load (void) KPlayerPropertiesGeneral::load(); } -KPlayerPropertiesTVDeviceGeneral::KPlayerPropertiesTVDeviceGeneral (QWidget* parent, const char* name) +KPlayerPropertiesTVDeviceGeneral::KPlayerPropertiesTVDeviceGeneral (TQWidget* parent, const char* name) : KPlayerPropertiesDeviceGeneral (parent, name) { } @@ -587,14 +587,14 @@ void KPlayerPropertiesTVDeviceGeneral::setupControls (void) void KPlayerPropertiesTVDeviceGeneral::load (void) { - const QString& list (properties() -> channelList()); + const TQString& list (properties() -> channelList()); for ( uint i = 0; c_channels -> count(); i ++ ) if ( channellists[i].id == list ) { c_channels -> setCurrentItem (i); break; } - const QString& driver (properties() -> inputDriver()); + const TQString& driver (properties() -> inputDriver()); c_driver -> setCurrentItem (driver == "bsdbt848" ? 0 : driver == "v4l" ? 1 : 2); KPlayerPropertiesDeviceGeneral::load(); } @@ -607,7 +607,7 @@ void KPlayerPropertiesTVDeviceGeneral::save (void) KPlayerPropertiesDeviceGeneral::save(); } -KPlayerPropertiesDVBDeviceGeneral::KPlayerPropertiesDVBDeviceGeneral (QWidget* parent, const char* name) +KPlayerPropertiesDVBDeviceGeneral::KPlayerPropertiesDVBDeviceGeneral (TQWidget* parent, const char* name) : KPlayerPropertiesDeviceGeneral (parent, name) { } @@ -644,7 +644,7 @@ void KPlayerPropertiesDVBDeviceGeneral::save (void) KPlayerPropertiesDeviceGeneral::save(); } -KPlayerPropertiesTrackGeneral::KPlayerPropertiesTrackGeneral (QWidget* parent, const char* name) +KPlayerPropertiesTrackGeneral::KPlayerPropertiesTrackGeneral (TQWidget* parent, const char* name) : KPlayerPropertiesGeneral (parent, name) { } @@ -663,7 +663,7 @@ void KPlayerPropertiesTrackGeneral::load (void) KPlayerPropertiesGeneral::load(); } -KPlayerPropertiesDiskTrackGeneral::KPlayerPropertiesDiskTrackGeneral (QWidget* parent, const char* name) +KPlayerPropertiesDiskTrackGeneral::KPlayerPropertiesDiskTrackGeneral (TQWidget* parent, const char* name) : KPlayerPropertiesTrackGeneral (parent, name) { } @@ -686,7 +686,7 @@ void KPlayerPropertiesDiskTrackGeneral::load (void) KPlayerPropertiesTrackGeneral::load(); } -KPlayerPropertiesChannelGeneral::KPlayerPropertiesChannelGeneral (QWidget* parent, const char* name) +KPlayerPropertiesChannelGeneral::KPlayerPropertiesChannelGeneral (TQWidget* parent, const char* name) : KPlayerPropertiesDiskTrackGeneral (parent, name) { } @@ -716,7 +716,7 @@ void KPlayerPropertiesChannelGeneral::save (void) KPlayerPropertiesDiskTrackGeneral::save(); } -KPlayerPropertiesItemGeneral::KPlayerPropertiesItemGeneral (QWidget* parent, const char* name) +KPlayerPropertiesItemGeneral::KPlayerPropertiesItemGeneral (TQWidget* parent, const char* name) : KPlayerPropertiesTrackGeneral (parent, name) { } @@ -744,7 +744,7 @@ void KPlayerPropertiesItemGeneral::save (void) KPlayerPropertiesTrackGeneral::save(); } -KPlayerPropertiesSize::KPlayerPropertiesSize (QWidget* parent, const char* name) +KPlayerPropertiesSize::KPlayerPropertiesSize (TQWidget* parent, const char* name) : KPlayerPropertiesSizePage (parent, name) { } @@ -786,7 +786,7 @@ void KPlayerPropertiesSize::save (void) int height = labs (c_display_height -> text().toInt()); if ( width == 0 && c_display_size -> currentItem() == 2 && c_display_width -> text().stripWhiteSpace().toDouble() > 0 ) { - QRegExp re ("^\\s*(\\d*)[,.](\\d*)\\s*$"); + TQRegExp re ("^\\s*(\\d*)[,.](\\d*)\\s*$"); if ( re.search (c_display_width -> text()) >= 0 ) { width = (re.cap(1) + re.cap(2)).toInt(); @@ -801,7 +801,7 @@ void KPlayerPropertiesSize::save (void) width /= i; height /= i --; } - properties() -> setDisplaySize (QSize (width, height), c_display_size -> currentItem()); + properties() -> setDisplaySize (TQSize (width, height), c_display_size -> currentItem()); properties() -> setFullScreenOption (c_full_screen -> currentItem()); properties() -> setMaximizedOption (c_maximized -> currentItem()); properties() -> setMaintainAspectOption (c_maintain_aspect -> currentItem()); @@ -822,7 +822,7 @@ void KPlayerPropertiesSize::displaySizeChanged (int option) } } -KPlayerPropertiesDeviceSize::KPlayerPropertiesDeviceSize (QWidget* parent, const char* name) +KPlayerPropertiesDeviceSize::KPlayerPropertiesDeviceSize (TQWidget* parent, const char* name) : KPlayerPropertiesSize (parent, name) { } @@ -854,7 +854,7 @@ void KPlayerPropertiesDeviceSize::setupControls (void) c_current_height -> hide(); } -KPlayerPropertiesTrackSize::KPlayerPropertiesTrackSize (QWidget* parent, const char* name) +KPlayerPropertiesTrackSize::KPlayerPropertiesTrackSize (TQWidget* parent, const char* name) : KPlayerPropertiesSize (parent, name) { } @@ -878,7 +878,7 @@ void KPlayerPropertiesTrackSize::load (void) KPlayerPropertiesSize::load(); } -KPlayerPropertiesSubtitles::KPlayerPropertiesSubtitles (QWidget* parent, const char* name) +KPlayerPropertiesSubtitles::KPlayerPropertiesSubtitles (TQWidget* parent, const char* name) : KPlayerPropertiesSubtitlesPage (parent, name) { } @@ -987,7 +987,7 @@ void KPlayerPropertiesSubtitles::delayChanged (int option) } } -KPlayerPropertiesDeviceSubtitles::KPlayerPropertiesDeviceSubtitles (QWidget* parent, const char* name) +KPlayerPropertiesDeviceSubtitles::KPlayerPropertiesDeviceSubtitles (TQWidget* parent, const char* name) : KPlayerPropertiesSubtitles (parent, name) { } @@ -1010,7 +1010,7 @@ void KPlayerPropertiesDeviceSubtitles::setupControls (void) hideUrl(); } -KPlayerPropertiesTrackSubtitles::KPlayerPropertiesTrackSubtitles (QWidget* parent, const char* name) +KPlayerPropertiesTrackSubtitles::KPlayerPropertiesTrackSubtitles (TQWidget* parent, const char* name) : KPlayerPropertiesSubtitles (parent, name) { } @@ -1029,15 +1029,15 @@ void KPlayerPropertiesTrackSubtitles::addTracks (void) kdDebugTime() << "KPlayerPropertiesTrackSubtitles::addTracks\n"; #endif int i = 1; - const QMap& sids (properties() -> subtitleIDs()); - QMap::ConstIterator iterator (sids.constBegin()), end (sids.constEnd()); + const TQMap& sids (properties() -> subtitleIDs()); + TQMap::ConstIterator iterator (sids.constBegin()), end (sids.constEnd()); while ( iterator != end ) { c_track_set -> insertItem (languageName (iterator.key(), iterator.data()), i); ++ iterator; ++ i; } - const QMap& vsids (properties() -> vobsubIDs()); + const TQMap& vsids (properties() -> vobsubIDs()); iterator = vsids.constBegin(); end = vsids.constEnd(); while ( iterator != end ) @@ -1079,7 +1079,7 @@ void KPlayerPropertiesTrackSubtitles::trackChanged (int option) } } -KPlayerPropertiesChannelSubtitles::KPlayerPropertiesChannelSubtitles (QWidget* parent, const char* name) +KPlayerPropertiesChannelSubtitles::KPlayerPropertiesChannelSubtitles (TQWidget* parent, const char* name) : KPlayerPropertiesTrackSubtitles (parent, name) { } @@ -1095,7 +1095,7 @@ void KPlayerPropertiesChannelSubtitles::setupControls (void) hideUrl(); } -KPlayerPropertiesDiskTrackSubtitles::KPlayerPropertiesDiskTrackSubtitles (QWidget* parent, const char* name) +KPlayerPropertiesDiskTrackSubtitles::KPlayerPropertiesDiskTrackSubtitles (TQWidget* parent, const char* name) : KPlayerPropertiesTrackSubtitles (parent, name) { } @@ -1206,12 +1206,12 @@ const float framerates[] = { 60 }; -void fillEncodingCombobox (QComboBox* combobox) +void fillEncodingCombobox (TQComboBox* combobox) { for ( uint i = 0; i < sizeof (subtitleencodings) / sizeof (struct KPlayerSubtitleEncoding); i ++ ) { const struct KPlayerSubtitleEncoding& encoding = subtitleencodings[i]; - combobox -> insertItem (QString (encoding.id) + ": " + i18n(encoding.name)); + combobox -> insertItem (TQString (encoding.id) + ": " + i18n(encoding.name)); } } @@ -1219,7 +1219,7 @@ void KPlayerPropertiesDiskTrackSubtitles::setupEncoding (void) { fillEncodingCombobox (c_encoding); for ( uint i = 0; i < sizeof (framerates) / sizeof (float); ++ i ) - c_framerate -> insertItem (QString::number (framerates[i])); + c_framerate -> insertItem (TQString::number (framerates[i])); } void KPlayerPropertiesDiskTrackSubtitles::setupControls (void) @@ -1238,7 +1238,7 @@ void KPlayerPropertiesDiskTrackSubtitles::load (void) c_vobsub -> setCurrentItem (properties() -> vobsubSubtitlesOption()); if ( properties() -> hasSubtitleEncoding() ) { - QString encoding = properties() -> subtitleEncoding(); + TQString encoding = properties() -> subtitleEncoding(); if ( encoding.isEmpty() ) c_encoding -> setCurrentItem (1); else @@ -1279,7 +1279,7 @@ void KPlayerPropertiesDiskTrackSubtitles::save (void) KPlayerPropertiesTrackSubtitles::save(); } -KPlayerPropertiesItemSubtitles::KPlayerPropertiesItemSubtitles (QWidget* parent, const char* name) +KPlayerPropertiesItemSubtitles::KPlayerPropertiesItemSubtitles (TQWidget* parent, const char* name) : KPlayerPropertiesDiskTrackSubtitles (parent, name) { } @@ -1310,7 +1310,7 @@ void KPlayerPropertiesItemSubtitles::save (void) KPlayerPropertiesDiskTrackSubtitles::save(); } -KPlayerPropertiesAudio::KPlayerPropertiesAudio (QWidget* parent, const char* name) +KPlayerPropertiesAudio::KPlayerPropertiesAudio (TQWidget* parent, const char* name) : KPlayerPropertiesAudioPage (parent, name) { } @@ -1329,7 +1329,7 @@ void KPlayerPropertiesAudio::setup (const KURL& url) if ( engine() -> audioCodecCount() ) { c_codec -> clear(); - const QString& codec = properties() -> audioCodecValue(); + const TQString& codec = properties() -> audioCodecValue(); if ( codec.isEmpty() ) c_codec -> insertItem (i18n("default")); else @@ -1395,7 +1395,7 @@ void KPlayerPropertiesAudio::load (void) volumeChanged (c_volume_set -> currentItem()); c_delay_set -> setCurrentItem (properties() -> hasAudioDelay() ? 1 : 0); delayChanged (c_delay_set -> currentItem()); - const QString& codec (properties() -> audioCodecOption()); + const TQString& codec (properties() -> audioCodecOption()); c_codec -> setCurrentItem (codec.isNull() ? 0 : engine() -> audioCodecIndex (codec) + 2); } @@ -1433,7 +1433,7 @@ void KPlayerPropertiesAudio::delayChanged (int option) } } -KPlayerPropertiesDeviceAudio::KPlayerPropertiesDeviceAudio (QWidget* parent, const char* name) +KPlayerPropertiesDeviceAudio::KPlayerPropertiesDeviceAudio (TQWidget* parent, const char* name) : KPlayerPropertiesAudio (parent, name) { } @@ -1457,7 +1457,7 @@ void KPlayerPropertiesDeviceAudio::setupControls (void) hideTV(); } -KPlayerPropertiesTVDeviceAudio::KPlayerPropertiesTVDeviceAudio (QWidget* parent, const char* name) +KPlayerPropertiesTVDeviceAudio::KPlayerPropertiesTVDeviceAudio (TQWidget* parent, const char* name) : KPlayerPropertiesDVBDeviceAudio (parent, name) { } @@ -1497,7 +1497,7 @@ void KPlayerPropertiesTVDeviceAudio::save (void) KPlayerPropertiesDVBDeviceAudio::save(); } -KPlayerPropertiesDVBDeviceAudio::KPlayerPropertiesDVBDeviceAudio (QWidget* parent, const char* name) +KPlayerPropertiesDVBDeviceAudio::KPlayerPropertiesDVBDeviceAudio (TQWidget* parent, const char* name) : KPlayerPropertiesDeviceAudio (parent, name) { } @@ -1548,7 +1548,7 @@ void KPlayerPropertiesDVBDeviceAudio::inputChanged (int option) } } -KPlayerPropertiesTrackAudio::KPlayerPropertiesTrackAudio (QWidget* parent, const char* name) +KPlayerPropertiesTrackAudio::KPlayerPropertiesTrackAudio (TQWidget* parent, const char* name) : KPlayerPropertiesAudio (parent, name) { } @@ -1566,11 +1566,11 @@ void KPlayerPropertiesTrackAudio::setupControls (void) #ifdef DEBUG_KPLAYER_PROPERTIES_DIALOG kdDebugTime() << "KPlayerPropertiesTrackAudio::setupControls\n"; #endif - const QMap& ids (properties() -> audioIDs()); + const TQMap& ids (properties() -> audioIDs()); if ( ids.count() > 1 ) { int i = 1; - QMap::ConstIterator iterator (ids.constBegin()), end (ids.constEnd()); + TQMap::ConstIterator iterator (ids.constBegin()), end (ids.constEnd()); while ( iterator != end ) { c_track_set -> insertItem (languageName (iterator.key(), iterator.data()), i); @@ -1612,7 +1612,7 @@ void KPlayerPropertiesTrackAudio::trackChanged (int option) } } -KPlayerPropertiesVideo::KPlayerPropertiesVideo (QWidget* parent, const char* name) +KPlayerPropertiesVideo::KPlayerPropertiesVideo (TQWidget* parent, const char* name) : KPlayerPropertiesVideoPage (parent, name) { } @@ -1631,7 +1631,7 @@ void KPlayerPropertiesVideo::setup (const KURL& url) if ( engine() -> videoCodecCount() ) { c_codec -> clear(); - const QString& codec = properties() -> videoCodecValue(); + const TQString& codec = properties() -> videoCodecValue(); if ( codec.isEmpty() ) c_codec -> insertItem (i18n("default")); else @@ -1699,7 +1699,7 @@ void KPlayerPropertiesVideo::load (void) hueChanged (c_hue_set -> currentItem()); c_saturation_set -> setCurrentItem (properties() -> saturationOption()); saturationChanged (c_saturation_set -> currentItem()); - const QString& codec (properties() -> videoCodecOption()); + const TQString& codec (properties() -> videoCodecOption()); c_codec -> setCurrentItem (codec.isNull() ? 0 : engine() -> videoCodecIndex (codec) + 2); } @@ -1760,7 +1760,7 @@ void KPlayerPropertiesVideo::saturationChanged (int option) } } -KPlayerPropertiesDeviceVideo::KPlayerPropertiesDeviceVideo (QWidget* parent, const char* name) +KPlayerPropertiesDeviceVideo::KPlayerPropertiesDeviceVideo (TQWidget* parent, const char* name) : KPlayerPropertiesVideo (parent, name) { } @@ -1784,7 +1784,7 @@ void KPlayerPropertiesDeviceVideo::setupControls (void) hideTV(); } -KPlayerPropertiesTVDeviceVideo::KPlayerPropertiesTVDeviceVideo (QWidget* parent, const char* name) +KPlayerPropertiesTVDeviceVideo::KPlayerPropertiesTVDeviceVideo (TQWidget* parent, const char* name) : KPlayerPropertiesDVBDeviceVideo (parent, name) { } @@ -1808,7 +1808,7 @@ void KPlayerPropertiesTVDeviceVideo::setupControls (void) void KPlayerPropertiesTVDeviceVideo::load (void) { - const QString& format (properties() -> videoFormat()); + const TQString& format (properties() -> videoFormat()); int i; for ( i = 1; i < c_format -> count(); i ++ ) if ( c_format -> text (i) == format ) @@ -1844,7 +1844,7 @@ void KPlayerPropertiesTVDeviceVideo::normChanged (int option) } } -KPlayerPropertiesDVBDeviceVideo::KPlayerPropertiesDVBDeviceVideo (QWidget* parent, const char* name) +KPlayerPropertiesDVBDeviceVideo::KPlayerPropertiesDVBDeviceVideo (TQWidget* parent, const char* name) : KPlayerPropertiesDeviceVideo (parent, name) { } @@ -1895,7 +1895,7 @@ void KPlayerPropertiesDVBDeviceVideo::inputChanged (int option) } } -KPlayerPropertiesTrackVideo::KPlayerPropertiesTrackVideo (QWidget* parent, const char* name) +KPlayerPropertiesTrackVideo::KPlayerPropertiesTrackVideo (TQWidget* parent, const char* name) : KPlayerPropertiesVideo (parent, name) { } @@ -1913,11 +1913,11 @@ void KPlayerPropertiesTrackVideo::setupControls (void) #ifdef DEBUG_KPLAYER_PROPERTIES_DIALOG kdDebugTime() << "KPlayerPropertiesTrackVideo::setupControls\n"; #endif - const QMap& ids (properties() -> videoIDs()); + const TQMap& ids (properties() -> videoIDs()); if ( ids.count() > 1 ) { int i = 1; - QMap::ConstIterator iterator (ids.constBegin()), end (ids.constEnd()); + TQMap::ConstIterator iterator (ids.constBegin()), end (ids.constEnd()); while ( iterator != end ) { c_track_set -> insertItem (languageName (iterator.key(), iterator.data()), i); @@ -1959,7 +1959,7 @@ void KPlayerPropertiesTrackVideo::trackChanged (int option) } } -KPlayerPropertiesAdvanced::KPlayerPropertiesAdvanced (QWidget* parent, const char* name) +KPlayerPropertiesAdvanced::KPlayerPropertiesAdvanced (TQWidget* parent, const char* name) : KPlayerPropertiesAdvancedPage (parent, name) { } @@ -1978,7 +1978,7 @@ void KPlayerPropertiesAdvanced::setup (const KURL& url) if ( engine() -> demuxerCount() ) { c_demuxer -> clear(); - const QString& demuxer = properties() -> demuxerValue(); + const TQString& demuxer = properties() -> demuxerValue(); if ( demuxer.isEmpty() ) c_demuxer -> insertItem (i18n("default")); else @@ -2028,7 +2028,7 @@ void KPlayerPropertiesAdvanced::load (void) { c_command_line_option -> setCurrentItem (properties() -> commandLineOption()); commandLineChanged (c_command_line_option -> currentItem()); - const QString& demuxer (properties() -> demuxerOption()); + const TQString& demuxer (properties() -> demuxerOption()); c_demuxer -> setCurrentItem (demuxer.isNull() ? 0 : engine() -> demuxerIndex (demuxer) + 2); c_frame_drop -> setCurrentItem (properties() -> frameDropOption()); c_use_cache -> setCurrentItem (properties() -> cacheOption()); @@ -2071,7 +2071,7 @@ void KPlayerPropertiesAdvanced::cacheChanged (int cache) } } -KPlayerPropertiesDeviceAdvanced::KPlayerPropertiesDeviceAdvanced (QWidget* parent, const char* name) +KPlayerPropertiesDeviceAdvanced::KPlayerPropertiesDeviceAdvanced (TQWidget* parent, const char* name) : KPlayerPropertiesAdvanced (parent, name) { } @@ -2084,7 +2084,7 @@ void KPlayerPropertiesDeviceAdvanced::setupMedia (const KURL& url) m_properties = KPlayerMedia::deviceProperties (url); } -KPlayerPropertiesTVDeviceAdvanced::KPlayerPropertiesTVDeviceAdvanced (QWidget* parent, const char* name) +KPlayerPropertiesTVDeviceAdvanced::KPlayerPropertiesTVDeviceAdvanced (TQWidget* parent, const char* name) : KPlayerPropertiesDeviceAdvanced (parent, name) { } @@ -2133,7 +2133,7 @@ void KPlayerPropertiesTVDeviceAdvanced::compressionChanged (bool checked) c_decimation -> setFocus(); } -KPlayerPropertiesTrackAdvanced::KPlayerPropertiesTrackAdvanced (QWidget* parent, const char* name) +KPlayerPropertiesTrackAdvanced::KPlayerPropertiesTrackAdvanced (TQWidget* parent, const char* name) : KPlayerPropertiesAdvanced (parent, name) { } @@ -2146,7 +2146,7 @@ void KPlayerPropertiesTrackAdvanced::setupMedia (const KURL& url) m_properties = KPlayerMedia::trackProperties (url); } -KPlayerPropertiesItemAdvanced::KPlayerPropertiesItemAdvanced (QWidget* parent, const char* name) +KPlayerPropertiesItemAdvanced::KPlayerPropertiesItemAdvanced (TQWidget* parent, const char* name) : KPlayerPropertiesTrackAdvanced (parent, name) { } diff --git a/kplayer/kplayerpropertiesdialog.h b/kplayer/kplayerpropertiesdialog.h index d13a6dc..c98db2f 100644 --- a/kplayer/kplayerpropertiesdialog.h +++ b/kplayer/kplayerpropertiesdialog.h @@ -40,7 +40,7 @@ class KPlayerPropertiesGeneral : public KPlayerPropertiesGeneralPage Q_OBJECT public: - KPlayerPropertiesGeneral (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesGeneral (TQWidget* parent = 0, const char* name = 0); virtual ~KPlayerPropertiesGeneral(); void setup (const KURL&); @@ -69,7 +69,7 @@ class KPlayerPropertiesDeviceGeneral : public KPlayerPropertiesGeneral Q_OBJECT public: - KPlayerPropertiesDeviceGeneral (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesDeviceGeneral (TQWidget* parent = 0, const char* name = 0); virtual void setupMedia (const KURL&); virtual void setupControls (void); @@ -84,7 +84,7 @@ class KPlayerPropertiesTVDeviceGeneral : public KPlayerPropertiesDeviceGeneral Q_OBJECT public: - KPlayerPropertiesTVDeviceGeneral (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesTVDeviceGeneral (TQWidget* parent = 0, const char* name = 0); virtual void setupMedia (const KURL&); virtual void setupControls (void); @@ -100,7 +100,7 @@ class KPlayerPropertiesDVBDeviceGeneral : public KPlayerPropertiesDeviceGeneral Q_OBJECT public: - KPlayerPropertiesDVBDeviceGeneral (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesDVBDeviceGeneral (TQWidget* parent = 0, const char* name = 0); virtual void setupMedia (const KURL&); virtual void setupControls (void); @@ -116,7 +116,7 @@ class KPlayerPropertiesTrackGeneral : public KPlayerPropertiesGeneral Q_OBJECT public: - KPlayerPropertiesTrackGeneral (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesTrackGeneral (TQWidget* parent = 0, const char* name = 0); virtual void setupMedia (const KURL&); virtual void load (void); @@ -130,7 +130,7 @@ class KPlayerPropertiesDiskTrackGeneral : public KPlayerPropertiesTrackGeneral Q_OBJECT public: - KPlayerPropertiesDiskTrackGeneral (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesDiskTrackGeneral (TQWidget* parent = 0, const char* name = 0); virtual void setupControls (void); virtual void load (void); @@ -144,7 +144,7 @@ class KPlayerPropertiesChannelGeneral : public KPlayerPropertiesDiskTrackGeneral Q_OBJECT public: - KPlayerPropertiesChannelGeneral (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesChannelGeneral (TQWidget* parent = 0, const char* name = 0); virtual void setupControls (void); virtual void load (void); @@ -159,7 +159,7 @@ class KPlayerPropertiesItemGeneral : public KPlayerPropertiesTrackGeneral Q_OBJECT public: - KPlayerPropertiesItemGeneral (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesItemGeneral (TQWidget* parent = 0, const char* name = 0); virtual void setupControls (void); virtual void load (void); @@ -174,7 +174,7 @@ class KPlayerPropertiesSize : public KPlayerPropertiesSizePage Q_OBJECT public: - KPlayerPropertiesSize (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesSize (TQWidget* parent = 0, const char* name = 0); virtual ~KPlayerPropertiesSize(); void setup (const KURL&); @@ -197,7 +197,7 @@ class KPlayerPropertiesDeviceSize : public KPlayerPropertiesSize Q_OBJECT public: - KPlayerPropertiesDeviceSize (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesDeviceSize (TQWidget* parent = 0, const char* name = 0); virtual void setupMedia (const KURL&); virtual void setupControls (void); @@ -211,7 +211,7 @@ class KPlayerPropertiesTrackSize : public KPlayerPropertiesSize Q_OBJECT public: - KPlayerPropertiesTrackSize (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesTrackSize (TQWidget* parent = 0, const char* name = 0); virtual void setupMedia (const KURL&); virtual void load (void); @@ -225,7 +225,7 @@ class KPlayerPropertiesSubtitles : public KPlayerPropertiesSubtitlesPage Q_OBJECT public: - KPlayerPropertiesSubtitles (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesSubtitles (TQWidget* parent = 0, const char* name = 0); virtual ~KPlayerPropertiesSubtitles(); void setup (const KURL&); @@ -253,7 +253,7 @@ class KPlayerPropertiesDeviceSubtitles : public KPlayerPropertiesSubtitles Q_OBJECT public: - KPlayerPropertiesDeviceSubtitles (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesDeviceSubtitles (TQWidget* parent = 0, const char* name = 0); virtual void setupMedia (const KURL&); virtual void setupControls (void); @@ -267,7 +267,7 @@ class KPlayerPropertiesTrackSubtitles : public KPlayerPropertiesSubtitles Q_OBJECT public: - KPlayerPropertiesTrackSubtitles (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesTrackSubtitles (TQWidget* parent = 0, const char* name = 0); virtual void setupMedia (const KURL&); void addTracks (void); @@ -286,7 +286,7 @@ class KPlayerPropertiesChannelSubtitles : public KPlayerPropertiesTrackSubtitles Q_OBJECT public: - KPlayerPropertiesChannelSubtitles (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesChannelSubtitles (TQWidget* parent = 0, const char* name = 0); virtual void setupControls (void); @@ -299,7 +299,7 @@ class KPlayerPropertiesDiskTrackSubtitles : public KPlayerPropertiesTrackSubtitl Q_OBJECT public: - KPlayerPropertiesDiskTrackSubtitles (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesDiskTrackSubtitles (TQWidget* parent = 0, const char* name = 0); virtual void setupControls (void); void setupEncoding (void); @@ -315,7 +315,7 @@ class KPlayerPropertiesItemSubtitles : public KPlayerPropertiesDiskTrackSubtitle Q_OBJECT public: - KPlayerPropertiesItemSubtitles (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesItemSubtitles (TQWidget* parent = 0, const char* name = 0); virtual void setupControls (void); virtual void load (void); @@ -330,7 +330,7 @@ class KPlayerPropertiesAudio : public KPlayerPropertiesAudioPage Q_OBJECT public: - KPlayerPropertiesAudio (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesAudio (TQWidget* parent = 0, const char* name = 0); virtual ~KPlayerPropertiesAudio(); void setup (const KURL&); @@ -360,7 +360,7 @@ class KPlayerPropertiesDeviceAudio : public KPlayerPropertiesAudio Q_OBJECT public: - KPlayerPropertiesDeviceAudio (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesDeviceAudio (TQWidget* parent = 0, const char* name = 0); virtual void setupMedia (const KURL&); virtual void setupControls (void); @@ -374,7 +374,7 @@ class KPlayerPropertiesDVBDeviceAudio : public KPlayerPropertiesDeviceAudio Q_OBJECT public: - KPlayerPropertiesDVBDeviceAudio (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesDVBDeviceAudio (TQWidget* parent = 0, const char* name = 0); virtual void setupMedia (const KURL&); virtual void setupControls (void); @@ -393,7 +393,7 @@ class KPlayerPropertiesTVDeviceAudio : public KPlayerPropertiesDVBDeviceAudio Q_OBJECT public: - KPlayerPropertiesTVDeviceAudio (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesTVDeviceAudio (TQWidget* parent = 0, const char* name = 0); virtual void setupMedia (const KURL&); virtual void setupControls (void); @@ -409,7 +409,7 @@ class KPlayerPropertiesTrackAudio : public KPlayerPropertiesAudio Q_OBJECT public: - KPlayerPropertiesTrackAudio (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesTrackAudio (TQWidget* parent = 0, const char* name = 0); virtual void setupMedia (const KURL&); virtual void setupControls (void); @@ -428,7 +428,7 @@ class KPlayerPropertiesVideo : public KPlayerPropertiesVideoPage Q_OBJECT public: - KPlayerPropertiesVideo (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesVideo (TQWidget* parent = 0, const char* name = 0); virtual ~KPlayerPropertiesVideo(); void setup (const KURL&); @@ -461,7 +461,7 @@ class KPlayerPropertiesDeviceVideo : public KPlayerPropertiesVideo Q_OBJECT public: - KPlayerPropertiesDeviceVideo (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesDeviceVideo (TQWidget* parent = 0, const char* name = 0); virtual void setupMedia (const KURL&); virtual void setupControls (void); @@ -475,7 +475,7 @@ class KPlayerPropertiesDVBDeviceVideo : public KPlayerPropertiesDeviceVideo Q_OBJECT public: - KPlayerPropertiesDVBDeviceVideo (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesDVBDeviceVideo (TQWidget* parent = 0, const char* name = 0); virtual void setupMedia (const KURL&); virtual void setupControls (void); @@ -494,7 +494,7 @@ class KPlayerPropertiesTVDeviceVideo : public KPlayerPropertiesDVBDeviceVideo Q_OBJECT public: - KPlayerPropertiesTVDeviceVideo (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesTVDeviceVideo (TQWidget* parent = 0, const char* name = 0); virtual void setupMedia (const KURL&); virtual void setupControls (void); @@ -513,7 +513,7 @@ class KPlayerPropertiesTrackVideo : public KPlayerPropertiesVideo Q_OBJECT public: - KPlayerPropertiesTrackVideo (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesTrackVideo (TQWidget* parent = 0, const char* name = 0); virtual void setupMedia (const KURL&); virtual void setupControls (void); @@ -532,7 +532,7 @@ class KPlayerPropertiesAdvanced : public KPlayerPropertiesAdvancedPage Q_OBJECT public: - KPlayerPropertiesAdvanced (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesAdvanced (TQWidget* parent = 0, const char* name = 0); virtual ~KPlayerPropertiesAdvanced(); void setup (const KURL&); @@ -560,7 +560,7 @@ class KPlayerPropertiesDeviceAdvanced : public KPlayerPropertiesAdvanced Q_OBJECT public: - KPlayerPropertiesDeviceAdvanced (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesDeviceAdvanced (TQWidget* parent = 0, const char* name = 0); virtual void setupMedia (const KURL&); @@ -573,7 +573,7 @@ class KPlayerPropertiesTVDeviceAdvanced : public KPlayerPropertiesDeviceAdvanced Q_OBJECT public: - KPlayerPropertiesTVDeviceAdvanced (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesTVDeviceAdvanced (TQWidget* parent = 0, const char* name = 0); virtual void setupMedia (const KURL&); virtual void setupControls (void); @@ -592,7 +592,7 @@ class KPlayerPropertiesTrackAdvanced : public KPlayerPropertiesAdvanced Q_OBJECT public: - KPlayerPropertiesTrackAdvanced (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesTrackAdvanced (TQWidget* parent = 0, const char* name = 0); virtual void setupMedia (const KURL&); @@ -605,7 +605,7 @@ class KPlayerPropertiesItemAdvanced : public KPlayerPropertiesTrackAdvanced Q_OBJECT public: - KPlayerPropertiesItemAdvanced (QWidget* parent = 0, const char* name = 0); + KPlayerPropertiesItemAdvanced (TQWidget* parent = 0, const char* name = 0); virtual void setupControls (void); virtual void load (void); @@ -639,12 +639,12 @@ protected: virtual void slotApply (void); virtual void slotDefault (void); - virtual KPlayerPropertiesGeneral* createGeneralPage (QFrame* frame, const QString& name) = 0; - virtual KPlayerPropertiesSize* createSizePage (QFrame* frame, const QString& name) = 0; - virtual KPlayerPropertiesSubtitles* createSubtitlesPage (QFrame* frame, const QString& name) = 0; - virtual KPlayerPropertiesAudio* createAudioPage (QFrame* frame, const QString& name) = 0; - virtual KPlayerPropertiesVideo* createVideoPage (QFrame* frame, const QString& name) = 0; - virtual KPlayerPropertiesAdvanced* createAdvancedPage (QFrame* frame, const QString& name) = 0; + virtual KPlayerPropertiesGeneral* createGeneralPage (TQFrame* frame, const TQString& name) = 0; + virtual KPlayerPropertiesSize* createSizePage (TQFrame* frame, const TQString& name) = 0; + virtual KPlayerPropertiesSubtitles* createSubtitlesPage (TQFrame* frame, const TQString& name) = 0; + virtual KPlayerPropertiesAudio* createAudioPage (TQFrame* frame, const TQString& name) = 0; + virtual KPlayerPropertiesVideo* createVideoPage (TQFrame* frame, const TQString& name) = 0; + virtual KPlayerPropertiesAdvanced* createAdvancedPage (TQFrame* frame, const TQString& name) = 0; KPlayerPropertiesGeneral* m_general; KPlayerPropertiesSize* m_size; @@ -656,7 +656,7 @@ protected: KPlayerMediaProperties* m_properties; protected slots: - void pageAboutToShow (QWidget*); + void pageAboutToShow (TQWidget*); }; /** The KPlayer device properties dialog. @@ -672,12 +672,12 @@ public: virtual void setupMedia (const KURL&); - virtual KPlayerPropertiesGeneral* createGeneralPage (QFrame* frame, const QString& name); - virtual KPlayerPropertiesSize* createSizePage (QFrame* frame, const QString& name); - virtual KPlayerPropertiesSubtitles* createSubtitlesPage (QFrame* frame, const QString& name); - virtual KPlayerPropertiesAudio* createAudioPage (QFrame* frame, const QString& name); - virtual KPlayerPropertiesVideo* createVideoPage (QFrame* frame, const QString& name); - virtual KPlayerPropertiesAdvanced* createAdvancedPage (QFrame* frame, const QString& name); + virtual KPlayerPropertiesGeneral* createGeneralPage (TQFrame* frame, const TQString& name); + virtual KPlayerPropertiesSize* createSizePage (TQFrame* frame, const TQString& name); + virtual KPlayerPropertiesSubtitles* createSubtitlesPage (TQFrame* frame, const TQString& name); + virtual KPlayerPropertiesAudio* createAudioPage (TQFrame* frame, const TQString& name); + virtual KPlayerPropertiesVideo* createVideoPage (TQFrame* frame, const TQString& name); + virtual KPlayerPropertiesAdvanced* createAdvancedPage (TQFrame* frame, const TQString& name); KPlayerDeviceProperties* properties (void) const { return (KPlayerDeviceProperties*) KPlayerPropertiesDialog::properties(); } @@ -696,10 +696,10 @@ public: virtual void setupMedia (const KURL&); - virtual KPlayerPropertiesGeneral* createGeneralPage (QFrame* frame, const QString& name); - virtual KPlayerPropertiesAudio* createAudioPage (QFrame* frame, const QString& name); - virtual KPlayerPropertiesVideo* createVideoPage (QFrame* frame, const QString& name); - virtual KPlayerPropertiesAdvanced* createAdvancedPage (QFrame* frame, const QString& name); + virtual KPlayerPropertiesGeneral* createGeneralPage (TQFrame* frame, const TQString& name); + virtual KPlayerPropertiesAudio* createAudioPage (TQFrame* frame, const TQString& name); + virtual KPlayerPropertiesVideo* createVideoPage (TQFrame* frame, const TQString& name); + virtual KPlayerPropertiesAdvanced* createAdvancedPage (TQFrame* frame, const TQString& name); KPlayerTVProperties* properties (void) const { return (KPlayerTVProperties*) KPlayerPropertiesDialog::properties(); } @@ -718,9 +718,9 @@ public: virtual void setupMedia (const KURL&); - virtual KPlayerPropertiesGeneral* createGeneralPage (QFrame* frame, const QString& name); - virtual KPlayerPropertiesAudio* createAudioPage (QFrame* frame, const QString& name); - virtual KPlayerPropertiesVideo* createVideoPage (QFrame* frame, const QString& name); + virtual KPlayerPropertiesGeneral* createGeneralPage (TQFrame* frame, const TQString& name); + virtual KPlayerPropertiesAudio* createAudioPage (TQFrame* frame, const TQString& name); + virtual KPlayerPropertiesVideo* createVideoPage (TQFrame* frame, const TQString& name); KPlayerDVBProperties* properties (void) const { return (KPlayerDVBProperties*) KPlayerPropertiesDialog::properties(); } @@ -739,12 +739,12 @@ public: virtual void setupMedia (const KURL&); - virtual KPlayerPropertiesGeneral* createGeneralPage (QFrame* frame, const QString& name); - virtual KPlayerPropertiesSize* createSizePage (QFrame* frame, const QString& name); - virtual KPlayerPropertiesSubtitles* createSubtitlesPage (QFrame* frame, const QString& name); - virtual KPlayerPropertiesAudio* createAudioPage (QFrame* frame, const QString& name); - virtual KPlayerPropertiesVideo* createVideoPage (QFrame* frame, const QString& name); - virtual KPlayerPropertiesAdvanced* createAdvancedPage (QFrame* frame, const QString& name); + virtual KPlayerPropertiesGeneral* createGeneralPage (TQFrame* frame, const TQString& name); + virtual KPlayerPropertiesSize* createSizePage (TQFrame* frame, const TQString& name); + virtual KPlayerPropertiesSubtitles* createSubtitlesPage (TQFrame* frame, const TQString& name); + virtual KPlayerPropertiesAudio* createAudioPage (TQFrame* frame, const TQString& name); + virtual KPlayerPropertiesVideo* createVideoPage (TQFrame* frame, const TQString& name); + virtual KPlayerPropertiesAdvanced* createAdvancedPage (TQFrame* frame, const TQString& name); KPlayerDiskTrackProperties* properties (void) const { return (KPlayerDiskTrackProperties*) KPlayerPropertiesDialog::properties(); } @@ -761,8 +761,8 @@ public: KPlayerChannelPropertiesDialog (void) { } virtual ~KPlayerChannelPropertiesDialog(); - virtual KPlayerPropertiesGeneral* createGeneralPage (QFrame* frame, const QString& name); - virtual KPlayerPropertiesSubtitles* createSubtitlesPage (QFrame* frame, const QString& name); + virtual KPlayerPropertiesGeneral* createGeneralPage (TQFrame* frame, const TQString& name); + virtual KPlayerPropertiesSubtitles* createSubtitlesPage (TQFrame* frame, const TQString& name); KPlayerChannelProperties* properties (void) const { return (KPlayerChannelProperties*) KPlayerPropertiesDialog::properties(); } @@ -779,9 +779,9 @@ public: KPlayerItemPropertiesDialog (void) { } virtual ~KPlayerItemPropertiesDialog(); - virtual KPlayerPropertiesGeneral* createGeneralPage (QFrame* frame, const QString& name); - virtual KPlayerPropertiesSubtitles* createSubtitlesPage (QFrame* frame, const QString& name); - virtual KPlayerPropertiesAdvanced* createAdvancedPage (QFrame* frame, const QString& name); + virtual KPlayerPropertiesGeneral* createGeneralPage (TQFrame* frame, const TQString& name); + virtual KPlayerPropertiesSubtitles* createSubtitlesPage (TQFrame* frame, const TQString& name); + virtual KPlayerPropertiesAdvanced* createAdvancedPage (TQFrame* frame, const TQString& name); KPlayerItemProperties* properties (void) const { return (KPlayerItemProperties*) KPlayerPropertiesDialog::properties(); } diff --git a/kplayer/kplayerpropertiesgeneral.ui b/kplayer/kplayerpropertiesgeneral.ui index b2c999a..179ee22 100644 --- a/kplayer/kplayerpropertiesgeneral.ui +++ b/kplayer/kplayerpropertiesgeneral.ui @@ -1,6 +1,6 @@ KPlayerPropertiesGeneralPage - + KPlayerPropertiesGeneralPage @@ -28,7 +28,7 @@ unnamed - + frame1 @@ -50,7 +50,7 @@ unnamed - + l_name @@ -78,7 +78,7 @@ Property that shows and allows you to change the name that KPlayer will display for this file or stream. - + c_name @@ -97,7 +97,7 @@ Property that shows and allows you to change the name that KPlayer will display for this file or stream. - + l_url @@ -125,7 +125,7 @@ Property that shows remote URL or local file path of this file or stream. - + c_url @@ -150,7 +150,7 @@ Property that shows remote URL or local file path of this file or stream. - + frame2 @@ -172,7 +172,7 @@ unnamed - + layout3 @@ -180,7 +180,7 @@ unnamed - + l_type @@ -200,7 +200,7 @@ Property that shows the type of the device. - + c_type @@ -222,7 +222,7 @@ Property that shows the type of the device. - + l_frequency @@ -242,7 +242,7 @@ Property that shows and allows you to change the frequency used to tune in to the channel. - + c_frequency @@ -261,7 +261,7 @@ Property that shows and allows you to change the frequency used to tune in to the channel. - + l_mhz @@ -286,7 +286,7 @@ Property that shows and allows you to change the frequency used to tune in to the channel. - + l_length @@ -306,7 +306,7 @@ Property that shows the time length of the file or stream. - + c_length @@ -328,7 +328,7 @@ Property that shows the time length of the file or stream. - + l_playlist @@ -348,7 +348,7 @@ Option to choose whether this is a playlist file or not. Auto determines that automatically based on extension. If autodetection gets it wrong, MPlayer will fail to play the file, and you will then have to set this option correctly. - + auto @@ -382,7 +382,7 @@ Option to choose whether this is a playlist file or not. Auto determines that automatically based on extension. If autodetection gets it wrong, MPlayer will fail to play the file, and you will then have to set this option correctly. - + l_channels @@ -402,7 +402,7 @@ Option to choose the available channels according to your location. - + c_channels @@ -421,7 +421,7 @@ Option to choose the available channels according to your location. - + l_driver @@ -441,7 +441,7 @@ Option to choose the input driver. - + BSD Bt848 @@ -475,7 +475,7 @@ Option to choose the input driver. - + l_channel_file @@ -495,7 +495,7 @@ Option to specify the path to the file containing the list of available channels. - + c_channel_file diff --git a/kplayer/kplayerpropertiessize.ui b/kplayer/kplayerpropertiessize.ui index 7328b00..ad86c2b 100644 --- a/kplayer/kplayerpropertiessize.ui +++ b/kplayer/kplayerpropertiessize.ui @@ -1,6 +1,6 @@ KPlayerPropertiesSizePage - + KPlayerPropertiesSizePage @@ -28,7 +28,7 @@ unnamed - + frame1 @@ -50,7 +50,7 @@ unnamed - + layout1 @@ -58,7 +58,7 @@ unnamed - + l_resolution @@ -78,7 +78,7 @@ Property that shows the video resolution in pixels. - + c_resolution_width @@ -98,7 +98,7 @@ Property that shows the video resolution in pixels. - + l_resolution_by @@ -118,7 +118,7 @@ Property that shows the video resolution in pixels. - + c_resolution_height @@ -138,7 +138,7 @@ Property that shows the video resolution in pixels. - + l_original_size @@ -158,7 +158,7 @@ Property that shows the original video size in pixels. - + c_original_width @@ -178,7 +178,7 @@ Property that shows the original video size in pixels. - + l_original_by @@ -198,7 +198,7 @@ Property that shows the original video size in pixels. - + c_original_height @@ -218,7 +218,7 @@ Property that shows the original video size in pixels. - + l_current_size @@ -238,7 +238,7 @@ Property that shows the current video size in pixels. - + c_current_width @@ -258,7 +258,7 @@ Property that shows the current video size in pixels. - + l_current_by @@ -278,7 +278,7 @@ Property that shows the current video size in pixels. - + c_current_height @@ -298,7 +298,7 @@ Property that shows the current video size in pixels. - + l_display_size @@ -318,7 +318,7 @@ Option to set initial video display size or aspect. Auto will choose the initial display size based on the Minimum Initial Video Width option in KPlayer Settings. Set Size allows you to set a specific size, and Set Aspect lets you set a specific aspect. It is easier to set this property by resizing KPlayer window or choosing a size or aspect option from View menu while holding Shift key down. - + auto @@ -344,7 +344,7 @@ Option to set initial video display size or aspect. Auto will choose the initial display size based on the Minimum Initial Video Width option in KPlayer Settings. Set Size allows you to set a specific size, and Set Aspect lets you set a specific aspect. It is easier to set this property by resizing KPlayer window or choosing a size or aspect option from View menu while holding Shift key down. - + c_display_width @@ -361,7 +361,7 @@ Option to set initial video display size or aspect. Auto will choose the initial display size based on the Minimum Initial Video Width option in KPlayer Settings. Set Size allows you to set a specific size, and Set Aspect lets you set a specific aspect. It is easier to set this property by resizing KPlayer window or choosing a size or aspect option from View menu while holding Shift key down. - + l_display_by @@ -381,7 +381,7 @@ Option to set initial video display size or aspect. Auto will choose the initial display size based on the Minimum Initial Video Width option in KPlayer Settings. Set Size allows you to set a specific size, and Set Aspect lets you set a specific aspect. It is easier to set this property by resizing KPlayer window or choosing a size or aspect option from View menu while holding Shift key down. - + c_display_height @@ -398,7 +398,7 @@ Option to set initial video display size or aspect. Auto will choose the initial display size based on the Minimum Initial Video Width option in KPlayer Settings. Set Size allows you to set a specific size, and Set Aspect lets you set a specific aspect. It is easier to set this property by resizing KPlayer window or choosing a size or aspect option from View menu while holding Shift key down. - + l_full_screen @@ -418,7 +418,7 @@ Option to choose whether to start playing this file in a full screen window. Default does not change the window state for this file. It is easier to set this property by switching to full screen or restoring KPlayer window while holding Shift key down. - + default @@ -444,7 +444,7 @@ Option to choose whether to start playing this file in a full screen window. Default does not change the window state for this file. It is easier to set this property by switching to full screen or restoring KPlayer window while holding Shift key down. - + l_maximized @@ -464,7 +464,7 @@ Option to choose whether to start playing this file in a maximized or normal window. Default does not change the window state for this file. If the full screen option is also set, it will take precedence. It is easier to set this property by maximizing or restoring KPlayer window while holding Shift key down. - + default @@ -490,7 +490,7 @@ Option to choose whether to start playing this file in a maximized or normal window. Default does not change the window state for this file. If the full screen option is also set, it will take precedence. It is easier to set this property by maximizing or restoring KPlayer window while holding Shift key down. - + l_maintain_aspect @@ -510,7 +510,7 @@ Option to maintain video aspect when resizing KPlayer window. Default leaves the maintain aspect option unchanged for this file. It is easier to set this property by clicking Maintain Aspect button on the main KPlayer toolbar while holding Shift key down. - + default diff --git a/kplayer/kplayerpropertiessubtitles.ui b/kplayer/kplayerpropertiessubtitles.ui index e52c0b1..46b2b81 100644 --- a/kplayer/kplayerpropertiessubtitles.ui +++ b/kplayer/kplayerpropertiessubtitles.ui @@ -1,6 +1,6 @@ KPlayerPropertiesSubtitlesPage - + KPlayerPropertiesSubtitlesPage @@ -28,7 +28,7 @@ unnamed - + frame1 @@ -50,7 +50,7 @@ unnamed - + layout1 @@ -58,7 +58,7 @@ unnamed - + l_track @@ -78,7 +78,7 @@ Option to choose the subtitle track to play. - + none @@ -112,7 +112,7 @@ Option to choose the subtitle track to play. - + c_track @@ -137,7 +137,7 @@ Option to choose the subtitle track to play. - + l_url @@ -157,7 +157,7 @@ Property that shows and allows you to change the path to external subtitle file. KPlayer will store subtitles you load with Load Subtitles command on File menu in this property. - + c_url @@ -179,7 +179,7 @@ Property that shows and allows you to change the path to external subtitle file. KPlayer will store subtitles you load with Load Subtitles command on File menu in this property. - + l_vobsub @@ -199,7 +199,7 @@ Option to specify the type of the external subtitle file. Usually you can let KPlayer determine the type automatically. One exception is when you specify a VobSub .sub file in the external path field. In that case you have to select the VobSub option here. - + auto @@ -225,7 +225,7 @@ Option to specify the type of the external subtitle file. Usually you can let KPlayer determine the type automatically. One exception is when you specify a VobSub .sub file in the external path field. In that case you have to select the VobSub option here. - + l_encoding @@ -245,7 +245,7 @@ Option to specify the encoding of the subtitle file. - + default @@ -277,7 +277,7 @@ Option to specify the encoding of the subtitle file. - + l_framerate @@ -297,7 +297,7 @@ Option to specify the frame rate of the subtitle file. - + auto @@ -324,7 +324,7 @@ Option to specify the frame rate of the subtitle file. - + l_autoload @@ -344,7 +344,7 @@ Option to automatically load subtitles for this file. Default uses options from Subtitles page in KPlayer Settings. - + default @@ -370,7 +370,7 @@ Option to automatically load subtitles for this file. Default uses options from Subtitles page in KPlayer Settings. - + l_position @@ -390,7 +390,7 @@ Option to set vertical position of subtitles. Default will use the same subtitle position as for other files. An easy way to set this property is by using keyboard shortcuts for subtitle position commands on Player/Subtitles menu while holding Shift down. - + default @@ -411,7 +411,7 @@ Option to set vertical position of subtitles. Default will use the same subtitle position as for other files. An easy way to set this property is by using keyboard shortcuts for subtitle position commands on Player/Subtitles menu while holding Shift down. - + c_position @@ -428,7 +428,7 @@ Option to set vertical position of subtitles. Default will use the same subtitle position as for other files. An easy way to set this property is by using keyboard shortcuts for subtitle position commands on Player/Subtitles menu while holding Shift down. - + l_delay @@ -448,7 +448,7 @@ Option to set delay of subtitles relative to video. By default subtitles are played without delay. An easier way to set this option is by using keyboard shortcuts for subtitle delay commands on Player/Subtitles menu. In the default configuration KPlayer will automatically store those changes in this property. - + default @@ -469,7 +469,7 @@ Option to set delay of subtitles relative to video. By default subtitles are played without delay. An easier way to set this option is by using keyboard shortcuts for subtitle delay commands on Player/Subtitles menu. In the default configuration KPlayer will automatically store those changes in this property. - + c_delay @@ -486,7 +486,7 @@ Option to set delay of subtitles relative to video. By default subtitles are played without delay. An easier way to set this option is by using keyboard shortcuts for subtitle delay commands on Player/Subtitles menu. In the default configuration KPlayer will automatically store those changes in this property. - + l_delay_seconds @@ -511,7 +511,7 @@ Option to set delay of subtitles relative to video. By default subtitles are played without delay. An easier way to set this option is by using keyboard shortcuts for subtitle delay commands on Player/Subtitles menu. In the default configuration KPlayer will automatically store those changes in this property. - + l_closed_caption @@ -531,7 +531,7 @@ Option to display closed caption subtitles if they are available. - + default diff --git a/kplayer/kplayerpropertiesvideo.ui b/kplayer/kplayerpropertiesvideo.ui index 51ba737..77e20e6 100644 --- a/kplayer/kplayerpropertiesvideo.ui +++ b/kplayer/kplayerpropertiesvideo.ui @@ -1,6 +1,6 @@ KPlayerPropertiesVideoPage - + KPlayerPropertiesVideoPage @@ -28,7 +28,7 @@ unnamed - + frame1 @@ -50,7 +50,7 @@ unnamed - + layout1 @@ -58,7 +58,7 @@ unnamed - + l_track @@ -78,7 +78,7 @@ Option to choose the video track to play. - + auto @@ -107,7 +107,7 @@ Option to choose the video track to play. - + c_track @@ -132,7 +132,7 @@ Option to choose the video track to play. - + l_contrast @@ -152,7 +152,7 @@ Option to adjust video contrast level for this file. Default uses the same contrast as for other files, Set To adjusts contrast to the given level, Add and Subtract turn contrast up and down respectively by the given amount. It is easier to set this option by moving contrast slider while holding Shift key down. - + default @@ -191,7 +191,7 @@ Option to adjust video contrast level for this file. Default uses the same contrast as for other files, Set To adjusts contrast to the given level, Add and Subtract turn contrast up and down respectively by the given amount. It is easier to set this option by moving contrast slider while holding Shift key down. - + c_contrast @@ -208,7 +208,7 @@ Option to adjust video contrast level for this file. Default uses the same contrast as for other files, Set To adjusts contrast to the given level, Add and Subtract turn contrast up and down respectively by the given amount. It is easier to set this option by moving contrast slider while holding Shift key down. - + l_empty @@ -224,7 +224,7 @@ - + l_brightness @@ -244,7 +244,7 @@ Option to adjust video brightness level for this file. Default uses the same brightness as for other files, Set To adjusts brightness to the given level, Add and Subtract turn brightness up and down respectively by the given amount. It is easier to set this option by moving brightness slider while holding Shift key down. - + default @@ -283,7 +283,7 @@ Option to adjust video brightness level for this file. Default uses the same brightness as for other files, Set To adjusts brightness to the given level, Add and Subtract turn brightness up and down respectively by the given amount. It is easier to set this option by moving brightness slider while holding Shift key down. - + c_brightness @@ -300,7 +300,7 @@ Option to adjust video brightness level for this file. Default uses the same brightness as for other files, Set To adjusts brightness to the given level, Add and Subtract turn brightness up and down respectively by the given amount. It is easier to set this option by moving brightness slider while holding Shift key down. - + l_hue @@ -320,7 +320,7 @@ Option to adjust video hue for this file. Default uses the same hue as for other files, Set To adjusts hue to the given level, Add and Subtract turn hue up and down respectively by the given amount. It is easier to set this option by moving hue slider while holding Shift key down. - + default @@ -359,7 +359,7 @@ Option to adjust video hue for this file. Default uses the same hue as for other files, Set To adjusts hue to the given level, Add and Subtract turn hue up and down respectively by the given amount. It is easier to set this option by moving hue slider while holding Shift key down. - + c_hue @@ -376,7 +376,7 @@ Option to adjust video hue for this file. Default uses the same hue as for other files, Set To adjusts hue to the given level, Add and Subtract turn hue up and down respectively by the given amount. It is easier to set this option by moving hue slider while holding Shift key down. - + l_saturation @@ -396,7 +396,7 @@ Option to adjust video saturation level for this file. Default uses the same saturation as for other files, Set To adjusts saturation to the given level, Add and Subtract turn saturation up and down respectively by the given amount. It is easier to set this option by moving saturation slider while holding Shift key down. - + default @@ -435,7 +435,7 @@ Option to adjust video saturation level for this file. Default uses the same saturation as for other files, Set To adjusts saturation to the given level, Add and Subtract turn saturation up and down respectively by the given amount. It is easier to set this option by moving saturation slider while holding Shift key down. - + c_saturation @@ -452,7 +452,7 @@ Option to adjust video saturation level for this file. Default uses the same saturation as for other files, Set To adjusts saturation to the given level, Add and Subtract turn saturation up and down respectively by the given amount. It is easier to set this option by moving saturation slider while holding Shift key down. - + l_codec @@ -472,7 +472,7 @@ Option that lists available codecs and lets you choose the one to be used for this file. Default uses the option from KPlayer Settings, Auto lets MPlayer decide which codec to use automatically. - + c_codec @@ -491,7 +491,7 @@ Option that lists available codecs and lets you choose the one to be used for this file. Default uses the option from KPlayer Settings, Auto lets MPlayer decide which codec to use automatically. - + l_bitrate @@ -511,7 +511,7 @@ Property that shows video bitrate of this file. - + c_bitrate @@ -533,7 +533,7 @@ Property that shows video bitrate of this file. - + l_kbps @@ -550,7 +550,7 @@ Property that shows video bitrate of this file. - + l_framerate @@ -570,7 +570,7 @@ Property that shows video frame rate of this file. - + c_framerate @@ -592,7 +592,7 @@ Property that shows video frame rate of this file. - + l_fps @@ -609,7 +609,7 @@ Property that shows video frame rate of this file. - + l_input @@ -629,7 +629,7 @@ Option to specify the video card input ID to use for capturing video. - + auto @@ -658,7 +658,7 @@ Option to specify the video card input ID to use for capturing video. - + c_input @@ -675,7 +675,7 @@ Option to specify the video card input ID to use for capturing video. - + l_format @@ -695,7 +695,7 @@ Option to specify the output format to request from the device. - + auto @@ -899,7 +899,7 @@ Option to specify the output format to request from the device. - + l_norm @@ -919,7 +919,7 @@ Option to specify the video norm to request from the device. - + auto @@ -1003,7 +1003,7 @@ Option to specify the video norm to request from the device. - + c_norm_id diff --git a/kplayer/kplayersettings.cpp b/kplayer/kplayersettings.cpp index abbc14b..41f9369 100644 --- a/kplayer/kplayersettings.cpp +++ b/kplayer/kplayersettings.cpp @@ -18,8 +18,8 @@ #endif #include -#include -#include +#include +#include #ifdef DEBUG #define DEBUG_KPLAYER_SETTINGS @@ -137,7 +137,7 @@ void KPlayerSettings::setMaximized (bool maximized) properties ("Maximized") -> setMaximized (maximized); } -void KPlayerSettings::setMaintainAspect (bool maintain, QSize aspect) +void KPlayerSettings::setMaintainAspect (bool maintain, TQSize aspect) { #ifdef DEBUG_KPLAYER_SETTINGS kdDebugTime() << "Settings::setMaintainAspect (" << maintain << ", " << aspect.width() << "x" << aspect.height() << ")\n"; @@ -154,7 +154,7 @@ void KPlayerSettings::setMaintainAspect (bool maintain, QSize aspect) } } -void KPlayerSettings::setAspect (QSize aspect) +void KPlayerSettings::setAspect (TQSize aspect) { #ifdef DEBUG_KPLAYER_SETTINGS kdDebugTime() << "Settings::setAspect " << m_aspect.width() << "x" << m_aspect.height() << " => " << aspect.width() << "x" << aspect.height() << "\n"; @@ -167,7 +167,7 @@ void KPlayerSettings::setAspect (QSize aspect) setAspectOverride (! aspect.isEmpty() && ! m_aspect.isEmpty() && aspect.width() * m_aspect.height() != aspect.height() * m_aspect.width()); } -void KPlayerSettings::setDisplaySize (QSize size) +void KPlayerSettings::setDisplaySize (TQSize size) { #ifdef DEBUG_KPLAYER_SETTINGS kdDebugTime() << "Settings::setDisplaySize (" << size.width() << "x" << size.height() << ")\n"; @@ -255,35 +255,35 @@ void KPlayerSettings::setSaturation (int saturation) properties() -> adjustSaturation (saturation); } -QString KPlayerSettings::currentSubtitles (void) const +TQString KPlayerSettings::currentSubtitles (void) const { if ( properties() -> hasSubtitleUrl() ) { - QString subtitle (properties() -> subtitleUrlString()); + TQString subtitle (properties() -> subtitleUrlString()); if ( subtitles().find (subtitle) != subtitles().end() ) return subtitle; } return subtitles().first(); } -QString KPlayerSettings::currentSubtitlePath (void) const +TQString KPlayerSettings::currentSubtitlePath (void) const { - QString current (currentSubtitles()); + TQString current (currentSubtitles()); return hasVobsubSubtitles() && current != properties() -> subtitleUrlString() ? vobsubSubtitles() : current; } -static bool vobsubExtension (const QString& path) +static bool vobsubExtension (const TQString& path) { return path.endsWith (".idx", false) || path.endsWith (".ifo", false) || path.endsWith (".sub", false); } -bool vobsub (const QString& path) +bool vobsub (const TQString& path) { if ( ! vobsubExtension (path) ) return false; if ( ! path.endsWith (".sub", false) ) return true; - QFile file (path); + TQFile file (path); if ( ! file.open (IO_ReadOnly) ) return false; char data [4]; @@ -292,7 +292,7 @@ bool vobsub (const QString& path) return length == sizeof (data) && memcmp (data, "\0\0\1\272", sizeof (data)) == 0; } -void KPlayerSettings::addSubtitlePath (const QString& path) +void KPlayerSettings::addSubtitlePath (const TQString& path) { if ( path == properties() -> subtitleUrlString() ? properties() -> vobsubSubtitles() : vobsub (path) ) { @@ -323,7 +323,7 @@ void KPlayerSettings::setSubtitleDelay (float delay) properties ("Subtitle Delay") -> setSubtitleDelay (delay); } -bool KPlayerSettings::isAspect (QSize size) +bool KPlayerSettings::isAspect (TQSize size) { return ! size.isEmpty() && ! aspect().isEmpty() && size.width() * aspect().height() == size.height() * aspect().width(); } @@ -338,7 +338,7 @@ bool KPlayerSettings::isZoomFactor (int m, int d) #endif if ( fullScreen() || maximized() || ! properties() -> hasOriginalSize() ) return false; - QSize size (properties() -> currentSize() * m / d); + TQSize size (properties() -> currentSize() * m / d); if ( ! aspect().isEmpty() ) size.setHeight (size.width() * aspect().height() / aspect().width()); bool result = size == displaySize(); @@ -348,9 +348,9 @@ bool KPlayerSettings::isZoomFactor (int m, int d) return result; } -QSize KPlayerSettings::adjustDisplaySize (bool user_zoom, bool user_resize) +TQSize KPlayerSettings::adjustDisplaySize (bool user_zoom, bool user_resize) { - QSize size (! user_zoom && constrainedSize() ? constrainSize (kPlayerWorkspace() -> size()) + TQSize size (! user_zoom && constrainedSize() ? constrainSize (kPlayerWorkspace() -> size()) : adjustSize (displaySize())); #ifdef DEBUG_KPLAYER_SETTINGS kdDebugTime() << "Settings::adjustDisplaySize (" << user_zoom << ", " << user_resize << ") " << size.width() << "x" << size.height() << "\n"; @@ -394,11 +394,11 @@ bool KPlayerSettings::setInitialDisplaySize (void) } if ( displaySizeOverride() ) return ! aspectOverride(); - QSize size; + TQSize size; if ( properties() -> displaySizeOption() == 1 ) size = properties() -> displaySize(); else if ( ! properties() -> hasOriginalSize() ) - size = QSize (configuration() -> minimumInitialWidth(), 0); + size = TQSize (configuration() -> minimumInitialWidth(), 0); else { int d = 1, n = (configuration() -> minimumInitialWidth() - 1) / properties() -> currentSize().width(); @@ -417,7 +417,7 @@ bool KPlayerSettings::setInitialDisplaySize (void) return true; } -QSize KPlayerSettings::constrainSize (QSize size) const +TQSize KPlayerSettings::constrainSize (TQSize size) const { #ifdef DEBUG_KPLAYER_SETTINGS kdDebugTime() << "Settings::constrainSize " << size.width() << "x" << size.height() << "\n"; @@ -425,7 +425,7 @@ QSize KPlayerSettings::constrainSize (QSize size) const return adjustSize (size, size.width() * aspect().height() > size.height() * aspect().width()); } -QSize KPlayerSettings::adjustSize (QSize size, bool horizontally) const +TQSize KPlayerSettings::adjustSize (TQSize size, bool horizontally) const { #ifdef DEBUG_KPLAYER_SETTINGS kdDebugTime() << "Settings::adjustSize " << size.width() << "x" << size.height() << " " << horizontally << "\n"; diff --git a/kplayer/kplayersettings.h b/kplayer/kplayersettings.h index d3542d2..a16e4bb 100644 --- a/kplayer/kplayersettings.h +++ b/kplayer/kplayersettings.h @@ -21,7 +21,7 @@ /** The KPlayer settings. *@author kiriuja */ -class KPlayerSettings : public QObject +class KPlayerSettings : public TQObject { Q_OBJECT @@ -38,11 +38,11 @@ public: KPlayerConfiguration* configuration (void) const { return KPlayerEngine::engine() -> configuration(); } /** Returns the properties for the given key. */ - KPlayerProperties* properties (const QString& key) const + KPlayerProperties* properties (const TQString& key) const { return configuration() -> override (key) ? (KPlayerProperties*) configuration() : (KPlayerProperties*) properties(); } - void setOverride (const QString& key, bool override) + void setOverride (const TQString& key, bool override) { configuration() -> setOverride (key, override); } /** Loads the given URL settings and makes the necessary adjustments. */ @@ -77,29 +77,29 @@ public: { return properties ("Saturation") -> saturation(); } void setSaturation (int); - QSize aspect (void) const + TQSize aspect (void) const { return m_aspect; } - void setAspect (QSize aspect); + void setAspect (TQSize aspect); bool aspectOverride (void) const { return configuration() -> override ("Aspect"); } void setAspectOverride (bool override) { configuration() -> setOverride ("Aspect", override); } - QSize displaySize (void) const + TQSize displaySize (void) const { return m_display_size; } - void setDisplaySize (QSize size); + void setDisplaySize (TQSize size); bool displaySizeOverride (void) const { return configuration() -> override ("Display Size"); } void setDisplaySizeOverride (bool override) { configuration() -> setOverride ("Display Size", override); } - QSize adjustDisplaySize (bool, bool); + TQSize adjustDisplaySize (bool, bool); bool setInitialDisplaySize (void); - bool isAspect (QSize); + bool isAspect (TQSize); bool isZoomFactor (int, int = 1); bool fullScreen (void); @@ -111,14 +111,14 @@ public: bool maintainAspect (void) const { return properties ("Maintain Aspect") -> maintainAspect(); } - void setMaintainAspect (bool, QSize); + void setMaintainAspect (bool, TQSize); bool constrainedSize (void) { return fullScreen() || maximized() || ! configuration() -> resizeAutomatically() || KPlayerEngine::engine() -> light(); } - QSize constrainSize (QSize size) const; - QSize adjustSize (QSize size, bool horizontally = false) const; + TQSize constrainSize (TQSize size) const; + TQSize adjustSize (TQSize size, bool horizontally = false) const; bool control (void) const { return m_control; } @@ -157,13 +157,13 @@ public: { return properties() -> showInternalSubtitles() || (hasExternalSubtitles() || hasVobsubSubtitles()) && properties() -> showSubtitles(); } - QString currentSubtitles (void) const; - const QStringList& subtitles (void) const + TQString currentSubtitles (void) const; + const TQStringList& subtitles (void) const { return m_subtitles; } bool hasExternalSubtitles (void) const { return ! m_subtitles.isEmpty(); } - const QString& vobsubSubtitles (void) const + const TQString& vobsubSubtitles (void) const { return m_vobsub; } bool hasVobsubSubtitles (void) const { return ! m_vobsub.isEmpty(); } @@ -171,11 +171,11 @@ public: { return showSubtitles() && hasVobsubSubtitles() && currentSubtitles() != properties() -> subtitleUrlString() && ! properties() -> hasSubtitleID(); } - QString currentSubtitlePath (void) const; + TQString currentSubtitlePath (void) const; - void addSubtitlePath (const QString& path); + void addSubtitlePath (const TQString& path); void clearSubtitles (void) - { m_subtitles.clear(); m_vobsub = QString::null; } + { m_subtitles.clear(); m_vobsub = TQString::null; } int subtitlePosition (void) const { return properties ("Subtitle Position") -> subtitlePosition(); } @@ -194,16 +194,16 @@ public: protected: KPlayerTrackProperties* m_properties; bool m_last_full_screen; - QSize m_display_size; - QSize m_aspect; + TQSize m_display_size; + TQSize m_aspect; bool m_control; bool m_shift; bool m_no_control; bool m_no_shift; bool m_fake_control; bool m_fake_shift; - QStringList m_subtitles; - QString m_vobsub; + TQStringList m_subtitles; + TQString m_vobsub; }; inline KPlayerTrackProperties* KPlayerEngine::properties (void) const diff --git a/kplayer/kplayersettingsadvanced.ui b/kplayer/kplayersettingsadvanced.ui index 9ec5437..7de3a87 100644 --- a/kplayer/kplayersettingsadvanced.ui +++ b/kplayer/kplayersettingsadvanced.ui @@ -1,6 +1,6 @@ KPlayerSettingsAdvancedPage - + KPlayerSettingsAdvancedPage @@ -36,7 +36,7 @@ unnamed - + frame1 @@ -58,7 +58,7 @@ unnamed - + l_executable_path @@ -78,7 +78,7 @@ Path to MPlayer executable, either absolute path or a name to look for in the current environment path. - + c_executable_path @@ -100,7 +100,7 @@ Path to MPlayer executable, either absolute path or a name to look for in the current environment path. - + l_command_line @@ -120,7 +120,7 @@ Additional options that will be passed to MPlayer on the command line. See mplayer(1) manpage for a complete list of possible options. You can also choose this option for individual file or URL in File Properties. - + c_command_line @@ -142,7 +142,7 @@ Additional options that will be passed to MPlayer on the command line. See mplayer(1) manpage for a complete list of possible options. You can also choose this option for individual file or URL in File Properties. - + layout2 @@ -150,7 +150,7 @@ unnamed - + l_demuxer @@ -170,7 +170,7 @@ Property that shows and allows you to change the demultiplexer that should be used to handle file formats. If the chosen demuxer fails on a particular file, another one may be used. - + c_demuxer @@ -189,7 +189,7 @@ Property that shows and allows you to change the demultiplexer that should be used to handle file formats. If the chosen demuxer fails on a particular file, another one may be used. - + l_frame_drop @@ -209,7 +209,7 @@ If your system is too slow to play a file, MPlayer can drop some frames so playback does not slow down. None disables dropping, Soft drops less frames, and Hard drops more frames and may sometimes break decoding. You can also choose this option for individual file or URL in File Properties. - + none @@ -235,7 +235,7 @@ If your system is too slow to play a file, MPlayer can drop some frames so playback does not slow down. None disables dropping, Soft drops less frames, and Hard drops more frames and may sometimes break decoding. You can also choose this option for individual file or URL in File Properties. - + l_use_cache @@ -255,7 +255,7 @@ Option to choose whether to use cache and set its size. Auto lets MPlayer use the its own configuration, None tells MPlayer to use no cache, and Set Size lets you set a specific size. You can also choose this option for individual file or URL in File Properties. - + auto @@ -281,7 +281,7 @@ Option to choose whether to use cache and set its size. Auto lets MPlayer use the its own configuration, None tells MPlayer to use no cache, and Set Size lets you set a specific size. You can also choose this option for individual file or URL in File Properties. - + c_cache_size @@ -309,7 +309,7 @@ Option to choose whether to use cache and set its size. Auto lets MPlayer use the its own configuration, None tells MPlayer to use no cache, and Set Size lets you set a specific size. You can also choose this option for individual file or URL in File Properties. - + l_cache_size_kb @@ -334,7 +334,7 @@ Option to choose whether to use cache and set its size. Auto lets MPlayer use the its own configuration, None tells MPlayer to use no cache, and Set Size lets you set a specific size. You can also choose this option for individual file or URL in File Properties. - + l_build_index @@ -354,7 +354,7 @@ Option to choose whether to build new index for seeking. Yes builds an index if the file does not have it, No tells MPlayer not to build index, and Force makes it always build an index. You can also choose this option for individual file or URL in File Properties. - + yes @@ -382,7 +382,7 @@ - + c_use_temporary_file @@ -396,7 +396,7 @@ Option to choose whether to use a temporary file for playing from KDE I/O Slave. This option has no effect for URLs passed directly to MPlayer. You can also choose it for individual file or URL in File Properties. - + layout4 @@ -404,7 +404,7 @@ unnamed - + l_use_kioslave @@ -421,7 +421,7 @@ Option to choose whether to use a KDE I/O Slave to play selected URL types. You can also choose this option for individual file or stream in File Properties. - + c_use_kioslave_for_http @@ -435,7 +435,7 @@ Option to choose whether to use a KDE I/O Slave to play HTTP URLs. You can also choose this option for individual file or stream in File Properties. - + c_use_kioslave_for_ftp @@ -449,7 +449,7 @@ Option to choose whether to use a KDE I/O Slave to play FTP URLs. You can also choose this option for individual file in File Properties. - + c_use_kioslave_for_smb @@ -473,7 +473,7 @@ - + l_osd_level @@ -501,7 +501,7 @@ Option to choose what to include in On Screen Display inside the video area. Since KPlayer can display almost everything outside the video area, the recommended choice is Subtitles Only. - + subtitles only diff --git a/kplayer/kplayersettingsaudio.ui b/kplayer/kplayersettingsaudio.ui index b374bdc..86d5ae3 100644 --- a/kplayer/kplayersettingsaudio.ui +++ b/kplayer/kplayersettingsaudio.ui @@ -1,6 +1,6 @@ KPlayerSettingsAudioPage - + KPlayerSettingsAudioPage @@ -28,7 +28,7 @@ unnamed - + frame1 @@ -50,7 +50,7 @@ unnamed - + layout0 @@ -58,7 +58,7 @@ unnamed - + l_driver @@ -78,7 +78,7 @@ Option that lists available audio outputs and lets you choose the one to use for playing sound. Recommended choices are OSS (the default) and ALSA (recommended when available). ARTS and SDL are not recommended. Auto will let MPlayer choose an audio output according to its own configuration. If you need to specify more than one output separated by comma, set this option to Auto and put them in Additional Command Line Arguments on Advanced page. - + c_driver @@ -97,7 +97,7 @@ Option that lists available audio outputs and lets you choose the one to use for playing sound. Recommended choices are OSS (the default) and ALSA (recommended when available). ARTS and SDL are not recommended. Auto will let MPlayer choose an audio output according to its own configuration. If you need to specify more than one output separated by comma, set this option to Auto and put them in Additional Command Line Arguments on Advanced page. - + l_device @@ -117,7 +117,7 @@ Option to specify audio device to use for the chosen audio output. Leave blank to use the default device. - + c_device @@ -136,7 +136,7 @@ Option to specify audio device to use for the chosen audio output. Leave blank to use the default device. - + c_softvol @@ -150,7 +150,7 @@ Option to choose whether to control volume in software independently of other programs. - + l_maximum @@ -170,7 +170,7 @@ Option to specify the maximum sound volume in percents of the normal volume level. - + c_maximum @@ -195,7 +195,7 @@ Option to specify the maximum sound volume in percents of the normal volume level. - + l_percent @@ -212,7 +212,7 @@ Option to specify the maximum sound volume in percents of the normal volume level. - + l_mixer @@ -232,7 +232,7 @@ Option to specify the mixer device to be used to control audio output volume. Leave blank to use the default device. - + c_mixer @@ -251,7 +251,7 @@ Option to specify the mixer device to be used to control audio output volume. Leave blank to use the default device. - + l_channel @@ -271,7 +271,7 @@ Option to specify the mixer channel to be used to control audio output volume. Leave blank to use the default channel. - + c_channel @@ -293,7 +293,7 @@ Option to specify the mixer channel to be used to control audio output volume. Leave blank to use the default channel. - + l_codec @@ -313,7 +313,7 @@ Option that lists available codecs and lets you choose the one to be used for decoding audio. Auto is the recommended choice, it lets MPlayer decide which codec to use automatically. If you need to tell MPlayer to use a particular codec for a given file or stream, set this option in File Properties. - + c_codec @@ -334,7 +334,7 @@ - + layout1 @@ -342,7 +342,7 @@ unnamed - + l_delay_step @@ -362,7 +362,7 @@ Option to specify the amount in seconds by which to change audio delay when using Increase/Decrease Delay commands on Player/Audio menu or the corresponding keyboard shortcuts. - + c_delay_step @@ -379,7 +379,7 @@ Option to specify the amount in seconds by which to change audio delay when using Increase/Decrease Delay commands on Player/Audio menu or the corresponding keyboard shortcuts. - + l_delay_seconds @@ -419,15 +419,15 @@ c_device - textChanged(const QString&) + textChanged(const TQString&) KPlayerSettingsAudioPage - deviceChanged(const QString&) + deviceChanged(const TQString&) c_mixer - textChanged(const QString&) + textChanged(const TQString&) KPlayerSettingsAudioPage - mixerChanged(const QString&) + mixerChanged(const TQString&) c_softvol @@ -438,8 +438,8 @@ driverChanged(int) - deviceChanged(const QString&) - mixerChanged(const QString&) + deviceChanged(const TQString&) + mixerChanged(const TQString&) softvolChanged(bool) diff --git a/kplayer/kplayersettingsbrightness.ui b/kplayer/kplayersettingsbrightness.ui index 2ad8bbf..67afa47 100644 --- a/kplayer/kplayersettingsbrightness.ui +++ b/kplayer/kplayersettingsbrightness.ui @@ -1,6 +1,6 @@ KPlayerSettingsBrightnessPage - + KPlayerSettingsBrightnessPage @@ -28,7 +28,7 @@ unnamed - + frame4 @@ -50,7 +50,7 @@ unnamed - + l_brightness_minimum @@ -78,7 +78,7 @@ Option to specify a lower limit on the video brightness setting. - + c_brightness_minimum @@ -106,7 +106,7 @@ Option to specify a lower limit on the video brightness setting. - + l_brightness_maximum @@ -134,7 +134,7 @@ Option to specify an upper limit on the video brightness setting. - + c_brightness_maximum @@ -162,7 +162,7 @@ Option to specify an upper limit on the video brightness setting. - + l_brightness_step @@ -190,7 +190,7 @@ Option to specify the amount by which to change video brightness when using Increase/Decrease Brightness commands on Player/Video menu or the corresponding keyboard shortcuts. - + c_brightness_step @@ -218,7 +218,7 @@ Option to specify the amount by which to change video brightness when using Increase/Decrease Brightness commands on Player/Video menu or the corresponding keyboard shortcuts. - + layout2 @@ -229,7 +229,7 @@ 6 - + c_brightness_reset @@ -243,7 +243,7 @@ Option to reset video brightness to a specific setting for each new file or KPlayer session. - + l_brightness_to @@ -271,7 +271,7 @@ Option to reset video brightness to a specific setting for each new file or KPlayer session. - + c_brightness_default @@ -299,7 +299,7 @@ Option to reset video brightness to a specific setting for each new file or KPlayer session. - + l_brightness_every @@ -327,7 +327,7 @@ Option to reset video brightness to a specific setting for each new file or KPlayer session. - + file diff --git a/kplayer/kplayersettingscontrast.ui b/kplayer/kplayersettingscontrast.ui index 802c150..16265a1 100644 --- a/kplayer/kplayersettingscontrast.ui +++ b/kplayer/kplayersettingscontrast.ui @@ -1,6 +1,6 @@ KPlayerSettingsContrastPage - + KPlayerSettingsContrastPage @@ -28,7 +28,7 @@ unnamed - + frame4 @@ -50,7 +50,7 @@ unnamed - + l_contrast_minimum @@ -78,7 +78,7 @@ Option to specify a lower limit on the video contrast setting. - + c_contrast_minimum @@ -106,7 +106,7 @@ Option to specify a lower limit on the video contrast setting. - + l_contrast_maximum @@ -134,7 +134,7 @@ Option to specify an upper limit on the video contrast setting. - + c_contrast_maximum @@ -162,7 +162,7 @@ Option to specify an upper limit on the video contrast setting. - + l_contrast_step @@ -190,7 +190,7 @@ Option to specify the amount by which to change video contrast when using Increase/Decrease Contrast commands on Player/Video menu or the corresponding keyboard shortcuts. - + c_contrast_step @@ -218,7 +218,7 @@ Option to specify the amount by which to change video contrast when using Increase/Decrease Contrast commands on Player/Video menu or the corresponding keyboard shortcuts. - + layout3 @@ -229,7 +229,7 @@ 6 - + c_contrast_reset @@ -243,7 +243,7 @@ Option to reset video contrast to a specific setting for each new file or KPlayer session. - + l_contrast_to @@ -271,7 +271,7 @@ Option to reset video contrast to a specific setting for each new file or KPlayer session. - + c_contrast_default @@ -299,7 +299,7 @@ Option to reset video contrast to a specific setting for each new file or KPlayer session. - + l_contrast_every @@ -327,7 +327,7 @@ Option to reset video contrast to a specific setting for each new file or KPlayer session. - + file diff --git a/kplayer/kplayersettingscontrols.ui b/kplayer/kplayersettingscontrols.ui index 891b561..05401a7 100644 --- a/kplayer/kplayersettingscontrols.ui +++ b/kplayer/kplayersettingscontrols.ui @@ -1,6 +1,6 @@ KPlayerSettingsControlsPage - + KPlayerSettingsControlsPage @@ -28,7 +28,7 @@ unnamed - + frame1 @@ -50,7 +50,7 @@ unnamed - + c_shift @@ -66,7 +66,7 @@ - + frame1 @@ -88,7 +88,7 @@ unnamed - + l_remember @@ -102,7 +102,7 @@ Option to choose whether to automatically remember any changes and adjustments made to the settings you select below in the file properties for the currently loaded file. The selected settings will be stored even if you do not hold Shift. This is most useful for settings that are almost always file specific, like subtitle URL, subtitle delay, and audio delay. - + c_spacer @@ -130,7 +130,7 @@ - + c_size @@ -144,7 +144,7 @@ Option to choose whether to automatically remember the video display size you choose by resizing the KPlayer window in the file properties for the currently loaded file. If this option is not selected, you can still make KPlayer remember the display size by holding down Shift key before and while you resize the window. - + c_aspect @@ -158,7 +158,7 @@ Option to choose whether to automatically remember the video aspect you choose by using commands on View menu in the file properties for the currently loaded file. If this option is selected, KPlayer will remember the video aspect in the current file's properties, then automatically reset it to the previous setting when another file is loaded. If this option is not selected, you can still make KPlayer remember the video aspect by holding down the Shift key when choosing an aspect command. - + c_full_screen @@ -172,7 +172,7 @@ Option to choose whether to automatically remember the setting for the full screen option you choose on the View menu in the file properties for the currently loaded file. If this option is selected, KPlayer will remember the full screen option in the current file's properties, then automatically reset it to the previous setting when another file is loaded. If this option is not selected, you can still make KPlayer remember the full screen option by holding down the Shift key when choosing it. - + c_maximized @@ -186,7 +186,7 @@ Option to choose whether to automatically remember whether the window is maximized in the file properties for the currently loaded file. If this option is selected, KPlayer will remember the maximized state in the current file's properties, then automatically reset it to the previous setting when another file is loaded. If this option is not selected, you can still make KPlayer remember the maximized state by holding down the Shift key when maximizing the KPlayer window. - + c_maintain_aspect @@ -200,7 +200,7 @@ Option to choose whether to automatically remember the setting for the maintain aspect option in the file properties for the currently loaded file. If this option is selected, KPlayer will remember the maintain aspect option in the current file's properties, then automatically reset it to the previous setting when another file is loaded. If this option is not selected, you can still make KPlayer remember the maintain aspect option by holding down the Shift key when clicking the maintain aspect toolbar button or choosing an aspect option from View menu. - + c_volume @@ -214,7 +214,7 @@ Option to choose whether to automatically remember volume adjustments in file properties for the currently loaded file. If this option is selected, KPlayer will remember volume adjustments in the current file's properties, then automatically reset the volume to the previous setting when another file is loaded. If this option is not selected, you can still make KPlayer remember volume adjustments by holding down the Shift key when making them. - + c_audio_delay @@ -228,7 +228,7 @@ Option to choose whether to automatically remember the audio delay setting in file properties for the currently loaded file. If this option is selected, KPlayer will remember the audio delay in the current file's properties, then automatically reset the audio delay when another file is loaded. If this option is not selected, you can still make KPlayer remember the audio delay by holding down the Shift key when changing it. - + c_contrast @@ -242,7 +242,7 @@ Option to choose whether to automatically remember contrast adjustments in the file properties for the currently loaded file. If this option is selected, KPlayer will remember contrast adjustments in the current file's properties, then automatically reset contrast to the previous setting when another file is loaded. If this option is not selected, you can still make KPlayer remember contrast adjustments by holding down the Shift key when making them. - + c_brightness @@ -256,7 +256,7 @@ Option to choose whether to automatically remember brightness adjustments in the file properties for the currently loaded file. If this option is selected, KPlayer will remember brightness adjustments in the current file's properties, then automatically reset brightness to the previous setting when another file is loaded. If this option is not selected, you can still make KPlayer remember brightness adjustments by holding down the Shift key when making them. - + c_hue @@ -270,7 +270,7 @@ Option to choose whether to automatically remember hue adjustments in the file properties for the currently loaded file. If this option is selected, KPlayer will remember hue adjustments in the current file's properties, then automatically reset hue to the previous setting when another file is loaded. If this option is not selected, you can still make KPlayer remember hue adjustments by holding down the Shift key when making them. - + c_saturation @@ -284,7 +284,7 @@ Option to choose whether to automatically remember saturation adjustments in the file properties for the currently loaded file. If this option is selected, KPlayer will remember saturation adjustments in the current file's properties, then automatically reset saturation to the previous setting when another file is loaded. If this option is not selected, you can still make KPlayer remember saturation adjustments by holding down the Shift key when making them. - + c_subtitle_position @@ -298,7 +298,7 @@ Option to choose whether to automatically remember the subtitles' vertical position in the file properties for the currently loaded file. If this option is selected, KPlayer will remember the subtitles' position in the current file's properties, then automatically reset the subtitles' position when another file is loaded. If this option is not selected, you can still make KPlayer remember the subtitles' position by holding down the Shift key when changing it. - + c_subtitle_delay @@ -312,7 +312,7 @@ Option to choose whether to automatically remember the subtitle delay in the file properties for the currently loaded file. If this option is selected, KPlayer will remember the subtitle delay in the current file's properties, then automatically reset the subtitle delay when another file is loaded. If this option is not selected, you can still make KPlayer remember the subtitle delay by holding down the Shift key when changing it. - + c_frame_drop diff --git a/kplayer/kplayersettingsdialog.cpp b/kplayer/kplayersettingsdialog.cpp index 8b83391..2628f72 100644 --- a/kplayer/kplayersettingsdialog.cpp +++ b/kplayer/kplayersettingsdialog.cpp @@ -17,15 +17,15 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -38,86 +38,86 @@ #include "kplayerengine.h" #include "kplayersettings.h" -static QString s_default_entry (i18n("%1 (%2)")); -static QRegExp re_key_value ("^([^:]+): *(.*)$"); +static TQString s_default_entry (i18n("%1 (%2)")); +static TQRegExp re_key_value ("^([^:]+): *(.*)$"); -KPlayerSettingsDialog::KPlayerSettingsDialog (QWidget* parent) +KPlayerSettingsDialog::KPlayerSettingsDialog (TQWidget* parent) : KDialogBase (TreeList, i18n("KPlayer Preferences"), Help | Default | Ok | Apply | Cancel, Ok, parent) { //m_initial_move = false; - QApplication::connect (this, SIGNAL (aboutToShowPage (QWidget*)), this, SLOT (pageAboutToShow(QWidget*))); - QFrame* frame = addPage (i18n("General"), i18n("General Settings")); - QBoxLayout* layout = new QVBoxLayout (frame, 0, 0); + TQApplication::connect (this, SIGNAL (aboutToShowPage (TQWidget*)), this, SLOT (pageAboutToShow(TQWidget*))); + TQFrame* frame = addPage (i18n("General"), i18n("General Settings")); + TQBoxLayout* layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); m_general = new KPlayerSettingsGeneral (frame, "general"); frame = addPage (i18n("Controls"), i18n("Control Settings")); - layout = new QVBoxLayout (frame, 0, 0); + layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); m_controls = new KPlayerSettingsControls (frame, "controls"); frame = addPage (i18n("Video"), i18n("Video Settings")); - layout = new QVBoxLayout (frame, 0, 0); + layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); m_video = new KPlayerSettingsVideo (frame, "video"); frame = addPage (i18n("Audio"), i18n("Audio Settings")); - layout = new QVBoxLayout (frame, 0, 0); + layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); m_audio = new KPlayerSettingsAudio (frame, "audio"); frame = addPage (i18n("Subtitles"), i18n("Subtitle Settings")); - layout = new QVBoxLayout (frame, 0, 0); + layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); m_subtitles = new KPlayerSettingsSubtitles (frame, "subtitles"); frame = addPage (i18n("Advanced"), i18n("Advanced Settings")); - layout = new QVBoxLayout (frame, 0, 0); + layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); m_advanced = new KPlayerSettingsAdvanced (frame, "advanced"); - frame = addPage (QStringList() << i18n("Controls") << i18n("Progress"), i18n("Progress Control Settings")); - layout = new QVBoxLayout (frame, 0, 0); + frame = addPage (TQStringList() << i18n("Controls") << i18n("Progress"), i18n("Progress Control Settings")); + layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); m_progress = new KPlayerSettingsProgress (frame, "progress"); - frame = addPage (QStringList() << i18n("Controls") << i18n("Volume"), i18n("Volume Control Settings")); - layout = new QVBoxLayout (frame, 0, 0); + frame = addPage (TQStringList() << i18n("Controls") << i18n("Volume"), i18n("Volume Control Settings")); + layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); m_volume = new KPlayerSettingsVolume (frame, "volume"); - frame = addPage (QStringList() << i18n("Controls") << i18n("Contrast"), i18n("Contrast Control Settings")); - layout = new QVBoxLayout (frame, 0, 0); + frame = addPage (TQStringList() << i18n("Controls") << i18n("Contrast"), i18n("Contrast Control Settings")); + layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); m_contrast = new KPlayerSettingsContrast (frame, "contrast"); - frame = addPage (QStringList() << i18n("Controls") << i18n("Brightness"), i18n("Brightness Control Settings")); - layout = new QVBoxLayout (frame, 0, 0); + frame = addPage (TQStringList() << i18n("Controls") << i18n("Brightness"), i18n("Brightness Control Settings")); + layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); m_brightness = new KPlayerSettingsBrightness (frame, "brightness"); - frame = addPage (QStringList() << i18n("Controls") << i18n("Hue"), i18n("Hue Control Settings")); - layout = new QVBoxLayout (frame, 0, 0); + frame = addPage (TQStringList() << i18n("Controls") << i18n("Hue"), i18n("Hue Control Settings")); + layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); m_hue = new KPlayerSettingsHue (frame, "hue"); - frame = addPage (QStringList() << i18n("Controls") << i18n("Saturation"), i18n("Saturation Control Settings")); - layout = new QVBoxLayout (frame, 0, 0); + frame = addPage (TQStringList() << i18n("Controls") << i18n("Saturation"), i18n("Saturation Control Settings")); + layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); m_saturation = new KPlayerSettingsSaturation (frame, "saturation"); - frame = addPage (QStringList() << i18n("Controls") << i18n("Sliders"), i18n("Slider Control Settings")); - layout = new QVBoxLayout (frame, 0, 0); + frame = addPage (TQStringList() << i18n("Controls") << i18n("Sliders"), i18n("Slider Control Settings")); + layout = new TQVBoxLayout (frame, 0, 0); layout -> setAutoAdd (true); m_sliders = new KPlayerSettingsSliders (frame, "sliders"); setHelp ("settings"); KListView* view = (KListView*) child (0, "KListView"); if ( view ) { - for ( QListViewItem* item = view -> firstChild(); item; item = item -> nextSibling() ) + for ( TQListViewItem* item = view -> firstChild(); item; item = item -> nextSibling() ) item -> setOpen (true); view -> setMinimumSize (view -> sizeHint()); } - layout = (QBoxLayout*) child (0, "QHBoxLayout"); + layout = (TQBoxLayout*) child (0, "TQHBoxLayout"); if ( layout ) layout -> insertSpacing (0, 6); KConfig* config = kPlayerConfig(); config -> setGroup ("Dialog Options"); - QString name (config -> readEntry ("Settings Dialog Page")); + TQString name (config -> readEntry ("Settings Dialog Page")); if ( ! name.isEmpty() ) { - frame = (QFrame*) child (name.latin1()); + frame = (TQFrame*) child (name.latin1()); if ( frame ) { - frame = (QFrame*) frame -> parent(); + frame = (TQFrame*) frame -> parent(); if ( frame ) showPage (pageIndex (frame)); } @@ -126,9 +126,9 @@ KPlayerSettingsDialog::KPlayerSettingsDialog (QWidget* parent) int y = config -> readNumEntry ("Settings Dialog Top", -1);*/ int w = config -> readNumEntry ("Settings Dialog Width"); int h = config -> readNumEntry ("Settings Dialog Height"); -//QSize size (config -> readNumEntry ("Settings Dialog Width"), +//TQSize size (config -> readNumEntry ("Settings Dialog Width"), // config -> readNumEntry ("Settings Dialog Height")); -//QSize hint = minimumSizeHint(); +//TQSize hint = minimumSizeHint(); //if ( size.width() < hint.width() || size.height() < hint.height() ) // size = sizeHint(); //setGeometry (x, y, size.width(), size.height()); @@ -172,7 +172,7 @@ KPlayerSettingsDialog::~KPlayerSettingsDialog (void) config -> writeEntry ("Settings Dialog Height", height()); } -/*void KPlayerSettingsDialog::moveEvent (QMoveEvent* event) +/*void KPlayerSettingsDialog::moveEvent (TQMoveEvent* event) { #ifdef DEBUG_KPLAYER_SETTINGS_DIALOG kdDebugTime() << "KPlayerSettingsDialog move " << event -> oldPos().x() << "x" << event -> oldPos().y() @@ -196,7 +196,7 @@ KPlayerSettingsDialog::~KPlayerSettingsDialog (void) m_initial_move = false; } -void KPlayerSettingsDialog::resizeEvent (QResizeEvent* event) +void KPlayerSettingsDialog::resizeEvent (TQResizeEvent* event) { #ifdef DEBUG_KPLAYER_SETTINGS_DIALOG kdDebugTime() << "KPlayerSettingsDialog resize " << event -> oldSize(). width() << "x" << event -> oldSize(). height() @@ -205,7 +205,7 @@ void KPlayerSettingsDialog::resizeEvent (QResizeEvent* event) KDialogBase::resizeEvent (event); } -void KPlayerSettingsDialog::showEvent (QShowEvent* event) +void KPlayerSettingsDialog::showEvent (TQShowEvent* event) { #ifdef DEBUG_KPLAYER_SETTINGS_DIALOG kdDebugTime() << "KPlayerSettingsDialog::showEvent\n"; @@ -249,16 +249,16 @@ void KPlayerSettingsDialog::slotDefault (void) KDialogBase::slotDefault(); } -void KPlayerSettingsDialog::pageAboutToShow (QWidget* page) +void KPlayerSettingsDialog::pageAboutToShow (TQWidget* page) { #ifdef DEBUG_KPLAYER_SETTINGS_DIALOG kdDebugTime() << "KPlayerSettingsDialog::pageAboutToShow\n"; #endif m_advanced -> refreshLists(); - QObject* object = page -> child (0, "QFrame"); + TQObject* object = page -> child (0, "TQFrame"); KConfig* config = kPlayerConfig(); config -> setGroup ("Dialog Options"); - QString name; + TQString name; if ( object ) { name = object -> name (""); @@ -282,7 +282,7 @@ void KPlayerSettingsDialog::slotOk (void) KDialogBase::slotOk(); } -//void dumpObject (const QObject* object, int indent, int depth = 20); +//void dumpObject (const TQObject* object, int indent, int depth = 20); void KPlayerSettingsDialog::slotApply (void) { @@ -308,12 +308,12 @@ void KPlayerSettingsDialog::slotApply (void) KDialogBase::slotApply(); } -KPlayerSettingsAdvanced::KPlayerSettingsAdvanced (QWidget* parent, const char* name) +KPlayerSettingsAdvanced::KPlayerSettingsAdvanced (TQWidget* parent, const char* name) : KPlayerSettingsAdvancedPage (parent, name) { loadLists(); load(); - QApplication::connect (kPlayerEngine(), SIGNAL (updated()), this, SLOT (refresh())); + TQApplication::connect (kPlayerEngine(), SIGNAL (updated()), this, SLOT (refresh())); } void KPlayerSettingsAdvanced::refresh (void) @@ -378,7 +378,7 @@ void KPlayerSettingsAdvanced::refreshLists (void) void KPlayerSettingsAdvanced::cacheChanged (int cache) { if ( cache == 2 ) - c_cache_size -> setText (QString::number (configuration() -> cacheSize())); + c_cache_size -> setText (TQString::number (configuration() -> cacheSize())); else c_cache_size -> setText (""); c_cache_size -> setEnabled (cache == 2); @@ -390,13 +390,13 @@ void KPlayerSettingsAdvanced::cacheChanged (int cache) } } -KPlayerSettingsAudio::KPlayerSettingsAudio (QWidget* parent, const char* name) +KPlayerSettingsAudio::KPlayerSettingsAudio (TQWidget* parent, const char* name) : KPlayerSettingsAudioPage (parent, name) { m_amixer_running = false; loadLists(); load(); - QApplication::connect (kPlayerEngine(), SIGNAL (updated()), this, SLOT (refresh())); + TQApplication::connect (kPlayerEngine(), SIGNAL (updated()), this, SLOT (refresh())); } void KPlayerSettingsAudio::refresh (void) @@ -451,7 +451,7 @@ void KPlayerSettingsAudio::load (void) c_softvol -> setChecked (m_softvol); softvolChanged (m_softvol); c_codec -> setCurrentItem (engine() -> audioCodecIndex (configuration() -> audioCodec()) + 1); - c_delay_step -> setText (QString::number (configuration() -> audioDelayStep())); + c_delay_step -> setText (TQString::number (configuration() -> audioDelayStep())); } void KPlayerSettingsAudio::save (void) @@ -488,7 +488,7 @@ void KPlayerSettingsAudio::defaultAlsaChannels (void) #ifdef DEBUG_KPLAYER_SETTINGS_DIALOG kdDebugTime() << "KPlayerSettingsAudio::defaultAlsaChannels\n"; #endif - QString text = c_channel -> currentText(); + TQString text = c_channel -> currentText(); c_channel -> insertItem ("Master"); c_channel -> insertItem ("PCM"); c_channel -> insertItem ("Line"); @@ -506,7 +506,7 @@ void KPlayerSettingsAudio::runAmixer (void) c_channel -> clear(); KPlayerLineOutputProcess* amixer = new KPlayerLineOutputProcess; *amixer << "amixer"; - QString mixer = c_mixer -> text(); + TQString mixer = c_mixer -> text(); if ( ! mixer.isEmpty() ) { *amixer << "-D" << mixer; @@ -525,12 +525,12 @@ void KPlayerSettingsAudio::runAmixer (void) void KPlayerSettingsAudio::amixerOutput (KPlayerLineOutputProcess*, char* str, int) { - static QString control; + static TQString control; #ifdef DEBUG_KPLAYER_SETTINGS_DIALOG kdDebugTime() << " amixer: " << str << "\n"; #endif - static QRegExp re_control ("^Simple mixer control '(.*)'"); - static QRegExp re_pvolume ("^ +Capabilities:.* pvolume"); + static TQRegExp re_control ("^Simple mixer control '(.*)'"); + static TQRegExp re_pvolume ("^ +Capabilities:.* pvolume"); if ( re_control.search (str) >= 0 ) { control = re_control.cap(1); @@ -540,7 +540,7 @@ void KPlayerSettingsAudio::amixerOutput (KPlayerLineOutputProcess*, char* str, i } else if ( re_pvolume.search (str) >= 0 ) { - QString text = c_channel -> currentText(); + TQString text = c_channel -> currentText(); c_channel -> insertItem (control); c_channel -> setEditText (text); #ifdef DEBUG_KPLAYER_SETTINGS_DIALOG @@ -568,7 +568,7 @@ void KPlayerSettingsAudio::driverChanged (int index) kdDebugTime() << "KPlayerSettingsAudio::driverChanged\n"; kdDebugTime() << " Index " << index << "\n"; #endif - QString driver (listEntry (c_driver)); + TQString driver (listEntry (c_driver)); #ifdef DEBUG_KPLAYER_SETTINGS_DIALOG kdDebugTime() << " Driver " << driver << "\n"; #endif @@ -600,7 +600,7 @@ void KPlayerSettingsAudio::driverChanged (int index) m_driver = driver; } -void KPlayerSettingsAudio::deviceChanged (const QString& device) +void KPlayerSettingsAudio::deviceChanged (const TQString& device) { #ifdef DEBUG_KPLAYER_SETTINGS_DIALOG kdDebugTime() << "KPlayerSettingsAudio::deviceChanged\n"; @@ -611,7 +611,7 @@ void KPlayerSettingsAudio::deviceChanged (const QString& device) m_device = device; } -void KPlayerSettingsAudio::mixerChanged (const QString&) +void KPlayerSettingsAudio::mixerChanged (const TQString&) { #ifdef DEBUG_KPLAYER_SETTINGS_DIALOG kdDebugTime() << "KPlayerSettingsAudio::mixerChanged\n"; @@ -626,9 +626,9 @@ void KPlayerSettingsAudio::softvolChanged (bool checked) kdDebugTime() << "KPlayerSettingsAudio::softvolChanged\n"; kdDebugTime() << " Checked " << checked << "\n"; #endif - c_maximum -> setText (checked ? QString::number (configuration() -> maximumSoftwareVolume()) : ""); + c_maximum -> setText (checked ? TQString::number (configuration() -> maximumSoftwareVolume()) : ""); c_maximum -> setEnabled (checked); - QString driver (listEntry (c_driver)); + TQString driver (listEntry (c_driver)); bool empty = checked || driver != configuration() -> audioDriver() || driver != "alsa" && driver != "oss" && driver != "sun"; c_mixer -> setText (empty ? "" : configuration() -> hasMixerDevice() @@ -638,7 +638,7 @@ void KPlayerSettingsAudio::softvolChanged (bool checked) m_softvol = checked; } -KPlayerSettingsControls::KPlayerSettingsControls (QWidget* parent, const char* name) +KPlayerSettingsControls::KPlayerSettingsControls (TQWidget* parent, const char* name) : KPlayerSettingsControlsPage (parent, name) { load(); @@ -689,7 +689,7 @@ void KPlayerSettingsControls::rememberSizeChanged (bool checked) c_aspect -> setEnabled (! checked); } -KPlayerSettingsGeneral::KPlayerSettingsGeneral (QWidget* parent, const char* name) +KPlayerSettingsGeneral::KPlayerSettingsGeneral (TQWidget* parent, const char* name) : KPlayerSettingsGeneralPage (parent, name) { load(); @@ -699,10 +699,10 @@ void KPlayerSettingsGeneral::load (void) { c_resize_automatically -> setChecked (configuration() -> resizeAutomatically()); resizeAutomaticallyChanged (configuration() -> resizeAutomatically()); - c_playlist_menu_size -> setText (QString::number (configuration() -> playlistMenuSize())); - c_recent_menu_size -> setText (QString::number (configuration() -> recentMenuSize())); - c_recent_list_size -> setText (QString::number (configuration() -> recentListSize())); - c_cache_size_limit -> setText (QString::number (configuration() -> cacheSizeLimit())); + c_playlist_menu_size -> setText (TQString::number (configuration() -> playlistMenuSize())); + c_recent_menu_size -> setText (TQString::number (configuration() -> recentMenuSize())); + c_recent_list_size -> setText (TQString::number (configuration() -> recentListSize())); + c_cache_size_limit -> setText (TQString::number (configuration() -> cacheSizeLimit())); c_allow_duplicate_entries -> setChecked (configuration() -> allowDuplicateEntries()); c_show_messages_on_error -> setChecked (configuration() -> showMessagesOnError()); } @@ -723,14 +723,14 @@ void KPlayerSettingsGeneral::save (void) void KPlayerSettingsGeneral::resizeAutomaticallyChanged (bool resizeAutomaticallyChecked) { if ( resizeAutomaticallyChecked ) - c_minimum_initial_width -> setText (QString::number (configuration() -> minimumInitialWidth())); + c_minimum_initial_width -> setText (TQString::number (configuration() -> minimumInitialWidth())); else c_minimum_initial_width -> setText (""); c_minimum_initial_width -> setEnabled (resizeAutomaticallyChecked); l_minimum_initial_width -> setEnabled (resizeAutomaticallyChecked); } -KPlayerSettingsSliders::KPlayerSettingsSliders (QWidget* parent, const char* name) +KPlayerSettingsSliders::KPlayerSettingsSliders (TQWidget* parent, const char* name) : KPlayerSettingsSlidersPage (parent, name) { load(); @@ -738,8 +738,8 @@ KPlayerSettingsSliders::KPlayerSettingsSliders (QWidget* parent, const char* nam void KPlayerSettingsSliders::load (void) { - c_preferred_slider_length -> setText (QString::number (configuration() -> preferredSliderLength())); - c_minimum_slider_length -> setText (QString::number (configuration() -> minimumSliderLength())); + c_preferred_slider_length -> setText (TQString::number (configuration() -> preferredSliderLength())); + c_minimum_slider_length -> setText (TQString::number (configuration() -> minimumSliderLength())); c_show_slider_marks -> setChecked (configuration() -> showSliderMarks()); showMarksChanged (c_show_slider_marks -> isChecked()); } @@ -767,7 +767,7 @@ void KPlayerSettingsSliders::save (void) void KPlayerSettingsSliders::showMarksChanged (bool showMarksChecked) { if ( showMarksChecked ) - c_slider_marks -> setText (QString::number (configuration() -> sliderMarks())); + c_slider_marks -> setText (TQString::number (configuration() -> sliderMarks())); else c_slider_marks -> setText (""); l_slider_marks -> setEnabled (showMarksChecked); @@ -775,7 +775,7 @@ void KPlayerSettingsSliders::showMarksChanged (bool showMarksChecked) l_slider_marks_percent -> setEnabled (showMarksChecked); } -KPlayerSettingsSubtitles::KPlayerSettingsSubtitles (QWidget* parent, const char* name) +KPlayerSettingsSubtitles::KPlayerSettingsSubtitles (TQWidget* parent, const char* name) : KPlayerSettingsSubtitlesPage (parent, name) { m_initialized = m_recursion = false; @@ -784,17 +784,17 @@ KPlayerSettingsSubtitles::KPlayerSettingsSubtitles (QWidget* parent, const char* m_initialized = true; } -void fillEncodingCombobox (QComboBox* combobox); +void fillEncodingCombobox (TQComboBox* combobox); void KPlayerSettingsSubtitles::loadLists (void) { - QValueList sizes (QFontDatabase::standardSizes()); - QValueList::ConstIterator it (sizes.begin()); + TQValueList sizes (TQFontDatabase::standardSizes()); + TQValueList::ConstIterator it (sizes.begin()); for ( int i = 1; i < *it; ++ i ) - c_text_size -> insertItem (QString::number (i)); + c_text_size -> insertItem (TQString::number (i)); while ( it != sizes.end() ) { - c_text_size -> insertItem (QString::number (*it)); + c_text_size -> insertItem (TQString::number (*it)); ++ it; } fillEncodingCombobox (c_encoding); @@ -806,19 +806,19 @@ void KPlayerSettingsSubtitles::load (void) c_bold -> setChecked (configuration() -> subtitleFontBold()); c_italic -> setChecked (configuration() -> subtitleFontItalic()); if ( configuration() -> subtitleTextSize() ) - c_text_size -> setEditText (QString::number (configuration() -> subtitleTextSize())); + c_text_size -> setEditText (TQString::number (configuration() -> subtitleTextSize())); else c_text_size -> setCurrentItem (0); c_autoscale -> setChecked (configuration() -> subtitleAutoscale()); - c_outline -> setText (QString::number (configuration() -> subtitleFontOutline())); + c_outline -> setText (TQString::number (configuration() -> subtitleFontOutline())); outlineEditChanged (c_outline -> text()); - c_width -> setText (QString::number (configuration() -> subtitleTextWidth())); + c_width -> setText (TQString::number (configuration() -> subtitleTextWidth())); widthEditChanged (c_width -> text()); - c_position_step -> setText (QString::number (configuration() -> subtitlePositionStep())); - c_delay_step -> setText (QString::number (configuration() -> subtitleDelayStep())); + c_position_step -> setText (TQString::number (configuration() -> subtitlePositionStep())); + c_delay_step -> setText (TQString::number (configuration() -> subtitleDelayStep())); if ( configuration() -> hasSubtitleEncoding() ) { - QString encoding = configuration() -> subtitleEncoding(); + TQString encoding = configuration() -> subtitleEncoding(); c_encoding -> setEditText (encoding); encoding += ": "; for ( int i = 1; i < c_encoding -> count(); ++ i ) @@ -875,10 +875,10 @@ void KPlayerSettingsSubtitles::save (void) void KPlayerSettingsSubtitles::widthSliderChanged (int value) { if ( ! m_recursion ) - c_width -> setText (QString::number (value)); + c_width -> setText (TQString::number (value)); } -void KPlayerSettingsSubtitles::widthEditChanged (const QString& value) +void KPlayerSettingsSubtitles::widthEditChanged (const TQString& value) { int number = value.toInt(); if ( number < 10 ) @@ -893,10 +893,10 @@ void KPlayerSettingsSubtitles::widthEditChanged (const QString& value) void KPlayerSettingsSubtitles::outlineSliderChanged (int value) { if ( ! m_recursion ) - c_outline -> setText (QString::number (float (value) / 20)); + c_outline -> setText (TQString::number (float (value) / 20)); } -void KPlayerSettingsSubtitles::outlineEditChanged (const QString& value) +void KPlayerSettingsSubtitles::outlineEditChanged (const TQString& value) { int number = int (value.toFloat() * 20 + 0.5); if ( number < 0 ) @@ -943,12 +943,12 @@ void KPlayerSettingsSubtitles::autoloadSubtitlesChanged (bool autoloadSubtitlesC } } -KPlayerSettingsVideo::KPlayerSettingsVideo (QWidget* parent, const char* name) +KPlayerSettingsVideo::KPlayerSettingsVideo (TQWidget* parent, const char* name) : KPlayerSettingsVideoPage (parent, name) { loadLists(); load(); - QApplication::connect (engine(), SIGNAL (updated()), this, SLOT (refresh())); + TQApplication::connect (engine(), SIGNAL (updated()), this, SLOT (refresh())); } void KPlayerSettingsVideo::refresh (void) @@ -1016,7 +1016,7 @@ void KPlayerSettingsVideo::driverChanged (int index) c_device -> setEnabled (index > 0); } -KPlayerSettingsProgress::KPlayerSettingsProgress (QWidget* parent, const char* name) +KPlayerSettingsProgress::KPlayerSettingsProgress (TQWidget* parent, const char* name) : KPlayerSettingsProgressPage (parent, name) { load(); @@ -1024,9 +1024,9 @@ KPlayerSettingsProgress::KPlayerSettingsProgress (QWidget* parent, const char* n void KPlayerSettingsProgress::load (void) { - c_progress_seek -> setText (QString::number (configuration() -> progressNormalSeek())); + c_progress_seek -> setText (TQString::number (configuration() -> progressNormalSeek())); c_progress_seek_units -> setCurrentItem (configuration() -> progressNormalSeekUnits()); - c_progress_fast -> setText (QString::number (configuration() -> progressFastSeek())); + c_progress_fast -> setText (TQString::number (configuration() -> progressFastSeek())); c_progress_fast_units -> setCurrentItem (configuration() -> progressFastSeekUnits()); } @@ -1038,7 +1038,7 @@ void KPlayerSettingsProgress::save (void) configuration() -> setProgressFastSeek (labs (c_progress_fast -> text().toInt())); } -KPlayerSettingsVolume::KPlayerSettingsVolume (QWidget* parent, const char* name) +KPlayerSettingsVolume::KPlayerSettingsVolume (TQWidget* parent, const char* name) : KPlayerSettingsVolumePage (parent, name) { load(); @@ -1046,9 +1046,9 @@ KPlayerSettingsVolume::KPlayerSettingsVolume (QWidget* parent, const char* name) void KPlayerSettingsVolume::load (void) { - c_volume_minimum -> setText (QString::number (configuration() -> volumeMinimum())); - c_volume_maximum -> setText (QString::number (configuration() -> volumeMaximum())); - c_volume_step -> setText (QString::number (configuration() -> volumeStep())); + c_volume_minimum -> setText (TQString::number (configuration() -> volumeMinimum())); + c_volume_maximum -> setText (TQString::number (configuration() -> volumeMaximum())); + c_volume_step -> setText (TQString::number (configuration() -> volumeStep())); c_volume_reset -> setChecked (configuration() -> volumeReset()); resetChanged (configuration() -> volumeReset()); } @@ -1069,7 +1069,7 @@ void KPlayerSettingsVolume::resetChanged (bool resetChecked) { if ( resetChecked ) { - c_volume_default -> setText (QString::number (configuration() -> initialVolume())); + c_volume_default -> setText (TQString::number (configuration() -> initialVolume())); c_volume_every -> setCurrentItem (0); c_volume_every -> setCurrentText (i18n("file")); c_volume_every -> setCurrentItem (configuration() -> volumeEvery()); @@ -1089,7 +1089,7 @@ void KPlayerSettingsVolume::resetChanged (bool resetChecked) } } -KPlayerSettingsContrast::KPlayerSettingsContrast (QWidget* parent, const char* name) +KPlayerSettingsContrast::KPlayerSettingsContrast (TQWidget* parent, const char* name) : KPlayerSettingsContrastPage (parent, name) { load(); @@ -1097,9 +1097,9 @@ KPlayerSettingsContrast::KPlayerSettingsContrast (QWidget* parent, const char* n void KPlayerSettingsContrast::load (void) { - c_contrast_minimum -> setText (QString::number (configuration() -> contrastMinimum())); - c_contrast_maximum -> setText (QString::number (configuration() -> contrastMaximum())); - c_contrast_step -> setText (QString::number (configuration() -> contrastStep())); + c_contrast_minimum -> setText (TQString::number (configuration() -> contrastMinimum())); + c_contrast_maximum -> setText (TQString::number (configuration() -> contrastMaximum())); + c_contrast_step -> setText (TQString::number (configuration() -> contrastStep())); c_contrast_reset -> setChecked (configuration() -> contrastReset()); resetChanged (configuration() -> contrastReset()); } @@ -1120,7 +1120,7 @@ void KPlayerSettingsContrast::resetChanged (bool resetChecked) { if ( resetChecked ) { - c_contrast_default -> setText (QString::number (configuration() -> initialContrast())); + c_contrast_default -> setText (TQString::number (configuration() -> initialContrast())); c_contrast_every -> setCurrentItem (0); c_contrast_every -> setCurrentText (i18n("file")); c_contrast_every -> setCurrentItem (configuration() -> contrastEvery()); @@ -1140,7 +1140,7 @@ void KPlayerSettingsContrast::resetChanged (bool resetChecked) } } -KPlayerSettingsBrightness::KPlayerSettingsBrightness (QWidget* parent, const char* name) +KPlayerSettingsBrightness::KPlayerSettingsBrightness (TQWidget* parent, const char* name) : KPlayerSettingsBrightnessPage (parent, name) { load(); @@ -1148,9 +1148,9 @@ KPlayerSettingsBrightness::KPlayerSettingsBrightness (QWidget* parent, const cha void KPlayerSettingsBrightness::load (void) { - c_brightness_minimum -> setText (QString::number (configuration() -> brightnessMinimum())); - c_brightness_maximum -> setText (QString::number (configuration() -> brightnessMaximum())); - c_brightness_step -> setText (QString::number (configuration() -> brightnessStep())); + c_brightness_minimum -> setText (TQString::number (configuration() -> brightnessMinimum())); + c_brightness_maximum -> setText (TQString::number (configuration() -> brightnessMaximum())); + c_brightness_step -> setText (TQString::number (configuration() -> brightnessStep())); c_brightness_reset -> setChecked (configuration() -> brightnessReset()); resetChanged (configuration() -> brightnessReset()); } @@ -1171,7 +1171,7 @@ void KPlayerSettingsBrightness::resetChanged (bool resetChecked) { if ( resetChecked ) { - c_brightness_default -> setText (QString::number (configuration() -> initialBrightness())); + c_brightness_default -> setText (TQString::number (configuration() -> initialBrightness())); c_brightness_every -> setCurrentItem (0); c_brightness_every -> setCurrentText (i18n("file")); c_brightness_every -> setCurrentItem (configuration() -> brightnessEvery()); @@ -1191,7 +1191,7 @@ void KPlayerSettingsBrightness::resetChanged (bool resetChecked) } } -KPlayerSettingsHue::KPlayerSettingsHue (QWidget* parent, const char* name) +KPlayerSettingsHue::KPlayerSettingsHue (TQWidget* parent, const char* name) : KPlayerSettingsHuePage (parent, name) { load(); @@ -1199,9 +1199,9 @@ KPlayerSettingsHue::KPlayerSettingsHue (QWidget* parent, const char* name) void KPlayerSettingsHue::load (void) { - c_hue_minimum -> setText (QString::number (configuration() -> hueMinimum())); - c_hue_maximum -> setText (QString::number (configuration() -> hueMaximum())); - c_hue_step -> setText (QString::number (configuration() -> hueStep())); + c_hue_minimum -> setText (TQString::number (configuration() -> hueMinimum())); + c_hue_maximum -> setText (TQString::number (configuration() -> hueMaximum())); + c_hue_step -> setText (TQString::number (configuration() -> hueStep())); c_hue_reset -> setChecked (configuration() -> hueReset()); resetChanged (configuration() -> hueReset()); } @@ -1222,7 +1222,7 @@ void KPlayerSettingsHue::resetChanged (bool resetChecked) { if ( resetChecked ) { - c_hue_default -> setText (QString::number (configuration() -> initialHue())); + c_hue_default -> setText (TQString::number (configuration() -> initialHue())); c_hue_every -> setCurrentItem (0); c_hue_every -> setCurrentText (i18n("file")); c_hue_every -> setCurrentItem (configuration() -> hueEvery()); @@ -1242,7 +1242,7 @@ void KPlayerSettingsHue::resetChanged (bool resetChecked) } } -KPlayerSettingsSaturation::KPlayerSettingsSaturation (QWidget* parent, const char* name) +KPlayerSettingsSaturation::KPlayerSettingsSaturation (TQWidget* parent, const char* name) : KPlayerSettingsSaturationPage (parent, name) { load(); @@ -1250,9 +1250,9 @@ KPlayerSettingsSaturation::KPlayerSettingsSaturation (QWidget* parent, const cha void KPlayerSettingsSaturation::load (void) { - c_saturation_minimum -> setText (QString::number (configuration() -> saturationMinimum())); - c_saturation_maximum -> setText (QString::number (configuration() -> saturationMaximum())); - c_saturation_step -> setText (QString::number (configuration() -> saturationStep())); + c_saturation_minimum -> setText (TQString::number (configuration() -> saturationMinimum())); + c_saturation_maximum -> setText (TQString::number (configuration() -> saturationMaximum())); + c_saturation_step -> setText (TQString::number (configuration() -> saturationStep())); c_saturation_reset -> setChecked (configuration() -> saturationReset()); resetChanged (configuration() -> saturationReset()); } @@ -1273,7 +1273,7 @@ void KPlayerSettingsSaturation::resetChanged (bool resetChecked) { if ( resetChecked ) { - c_saturation_default -> setText (QString::number (configuration() -> initialSaturation())); + c_saturation_default -> setText (TQString::number (configuration() -> initialSaturation())); c_saturation_every -> setCurrentItem (0); c_saturation_every -> setCurrentText (i18n("file")); c_saturation_every -> setCurrentItem (configuration() -> saturationEvery()); diff --git a/kplayer/kplayersettingsdialog.h b/kplayer/kplayersettingsdialog.h index 974b0f4..2c7710b 100644 --- a/kplayer/kplayersettingsdialog.h +++ b/kplayer/kplayersettingsdialog.h @@ -33,14 +33,14 @@ #include "kplayersettingssaturation.h" #include "kplayerproperties.h" -QString listEntry (QComboBox* combo, bool hasDefault = false); +TQString listEntry (TQComboBox* combo, bool hasDefault = false); class KPlayerSettingsAdvanced : public KPlayerSettingsAdvancedPage { Q_OBJECT public: - KPlayerSettingsAdvanced (QWidget* parent = 0, const char* name = 0); + KPlayerSettingsAdvanced (TQWidget* parent = 0, const char* name = 0); KPlayerEngine* engine (void) { return KPlayerEngine::engine(); } @@ -64,7 +64,7 @@ class KPlayerSettingsAudio : public KPlayerSettingsAudioPage Q_OBJECT public: - KPlayerSettingsAudio (QWidget* parent = 0, const char* name = 0); + KPlayerSettingsAudio (TQWidget* parent = 0, const char* name = 0); KPlayerEngine* engine (void) { return KPlayerEngine::engine(); } @@ -88,14 +88,14 @@ protected: void runAmixer (void); void defaultAlsaChannels (void); virtual void driverChanged (int); - virtual void deviceChanged (const QString&); - virtual void mixerChanged (const QString&); + virtual void deviceChanged (const TQString&); + virtual void mixerChanged (const TQString&); virtual void softvolChanged (bool); /** Last selected driver. */ - QString m_driver; + TQString m_driver; /** Last entered device. */ - QString m_device; + TQString m_device; /** Last software volume setting. */ bool m_softvol; /** Amixer tracking flags. */ @@ -107,7 +107,7 @@ class KPlayerSettingsControls : public KPlayerSettingsControlsPage Q_OBJECT public: - KPlayerSettingsControls (QWidget* parent = 0, const char* name = 0); + KPlayerSettingsControls (TQWidget* parent = 0, const char* name = 0); KPlayerConfiguration* configuration (void) { return KPlayerEngine::engine() -> configuration(); } @@ -124,7 +124,7 @@ class KPlayerSettingsSliders : public KPlayerSettingsSlidersPage Q_OBJECT public: - KPlayerSettingsSliders (QWidget* parent = 0, const char* name = 0); + KPlayerSettingsSliders (TQWidget* parent = 0, const char* name = 0); KPlayerConfiguration* configuration (void) { return KPlayerEngine::engine() -> configuration(); } @@ -141,7 +141,7 @@ class KPlayerSettingsGeneral : public KPlayerSettingsGeneralPage Q_OBJECT public: - KPlayerSettingsGeneral (QWidget* parent = 0, const char* name = 0); + KPlayerSettingsGeneral (TQWidget* parent = 0, const char* name = 0); KPlayerConfiguration* configuration (void) { return KPlayerEngine::engine() -> configuration(); } @@ -158,7 +158,7 @@ class KPlayerSettingsSubtitles : public KPlayerSettingsSubtitlesPage Q_OBJECT public: - KPlayerSettingsSubtitles (QWidget* parent = 0, const char* name = 0); + KPlayerSettingsSubtitles (TQWidget* parent = 0, const char* name = 0); KPlayerConfiguration* configuration (void) { return KPlayerEngine::engine() -> configuration(); } @@ -169,9 +169,9 @@ public: protected: virtual void widthSliderChanged (int); - virtual void widthEditChanged (const QString&); + virtual void widthEditChanged (const TQString&); virtual void outlineSliderChanged (int); - virtual void outlineEditChanged (const QString&); + virtual void outlineEditChanged (const TQString&); virtual void autoexpandChanged (bool); virtual void autoloadSubtitlesChanged (bool); /** Recursion prevention. */ @@ -185,7 +185,7 @@ class KPlayerSettingsVideo : public KPlayerSettingsVideoPage Q_OBJECT public: - KPlayerSettingsVideo (QWidget* parent = 0, const char* name = 0); + KPlayerSettingsVideo (TQWidget* parent = 0, const char* name = 0); KPlayerEngine* engine (void) { return KPlayerEngine::engine(); } @@ -208,7 +208,7 @@ class KPlayerSettingsProgress : public KPlayerSettingsProgressPage Q_OBJECT public: - KPlayerSettingsProgress (QWidget* parent = 0, const char* name = 0); + KPlayerSettingsProgress (TQWidget* parent = 0, const char* name = 0); KPlayerConfiguration* configuration (void) { return KPlayerEngine::engine() -> configuration(); } @@ -222,7 +222,7 @@ class KPlayerSettingsVolume : public KPlayerSettingsVolumePage Q_OBJECT public: - KPlayerSettingsVolume (QWidget* parent = 0, const char* name = 0); + KPlayerSettingsVolume (TQWidget* parent = 0, const char* name = 0); KPlayerConfiguration* configuration (void) { return KPlayerEngine::engine() -> configuration(); } @@ -239,7 +239,7 @@ class KPlayerSettingsContrast : public KPlayerSettingsContrastPage Q_OBJECT public: - KPlayerSettingsContrast (QWidget* parent = 0, const char* name = 0); + KPlayerSettingsContrast (TQWidget* parent = 0, const char* name = 0); KPlayerConfiguration* configuration (void) { return KPlayerEngine::engine() -> configuration(); } @@ -256,7 +256,7 @@ class KPlayerSettingsBrightness : public KPlayerSettingsBrightnessPage Q_OBJECT public: - KPlayerSettingsBrightness (QWidget* parent = 0, const char* name = 0); + KPlayerSettingsBrightness (TQWidget* parent = 0, const char* name = 0); KPlayerConfiguration* configuration (void) { return KPlayerEngine::engine() -> configuration(); } @@ -273,7 +273,7 @@ class KPlayerSettingsHue : public KPlayerSettingsHuePage Q_OBJECT public: - KPlayerSettingsHue (QWidget* parent = 0, const char* name = 0); + KPlayerSettingsHue (TQWidget* parent = 0, const char* name = 0); KPlayerConfiguration* configuration (void) { return KPlayerEngine::engine() -> configuration(); } @@ -290,7 +290,7 @@ class KPlayerSettingsSaturation : public KPlayerSettingsSaturationPage Q_OBJECT public: - KPlayerSettingsSaturation (QWidget* parent = 0, const char* name = 0); + KPlayerSettingsSaturation (TQWidget* parent = 0, const char* name = 0); KPlayerConfiguration* configuration (void) { return KPlayerEngine::engine() -> configuration(); } @@ -310,7 +310,7 @@ class KPlayerSettingsDialog : public KDialogBase Q_OBJECT public: - KPlayerSettingsDialog (QWidget*); + KPlayerSettingsDialog (TQWidget*); virtual ~KPlayerSettingsDialog(); /** Configuration. */ @@ -318,9 +318,9 @@ public: { return KPlayerEngine::engine() -> configuration(); } protected: -/*virtual void moveEvent (QMoveEvent*); - virtual void resizeEvent (QResizeEvent*); - virtual void showEvent (QShowEvent*); +/*virtual void moveEvent (TQMoveEvent*); + virtual void resizeEvent (TQResizeEvent*); + virtual void showEvent (TQShowEvent*); virtual void windowActivationChange (bool); bool m_initial_move;*/ @@ -344,7 +344,7 @@ protected: virtual void slotDefault (void); protected slots: - void pageAboutToShow (QWidget*); + void pageAboutToShow (TQWidget*); }; #endif diff --git a/kplayer/kplayersettingsgeneral.ui b/kplayer/kplayersettingsgeneral.ui index 900e654..28da85c 100644 --- a/kplayer/kplayersettingsgeneral.ui +++ b/kplayer/kplayersettingsgeneral.ui @@ -1,6 +1,6 @@ KPlayerSettingsGeneralPage - + KPlayerSettingsGeneralPage @@ -28,7 +28,7 @@ unnamed - + frame1 @@ -50,7 +50,7 @@ unnamed - + c_resize_automatically @@ -64,7 +64,7 @@ Option to choose whether to automatically resize main KPlayer window so that the video area is of the desired size. - + layout4 @@ -72,7 +72,7 @@ unnamed - + l_minimum_initial_width @@ -100,7 +100,7 @@ Option to choose the minimum horizontal size that the video area should be when loading and starting to play a new file. KPlayer will take the original video size and enlarge it in 50% increments until it is at least this size. - + c_minimum_initial_width @@ -128,7 +128,7 @@ Option to choose the minimum horizontal size that the video area should be when loading and starting to play a new file. KPlayer will take the original video size and enlarge it in 50% increments until it is at least this size. - + l_minimum_initial_width_pixels @@ -153,7 +153,7 @@ Option to choose the minimum horizontal size that the video area should be when loading and starting to play a new file. KPlayer will take the original video size and enlarge it in 50% increments until it is at least this size. - + l_playlist_menu_size @@ -181,7 +181,7 @@ Option to specify the maximum number of entries on Play List and Add To Playlist menus. - + c_playlist_menu_size @@ -209,7 +209,7 @@ Option to specify the maximum number of entries on Play List and Add To Playlist menus. - + l_recent_menu_size @@ -237,7 +237,7 @@ Option to specify the maximum number of entries on the Play Recent menu. If this number is exceeded, the oldest entries will be removed. - + c_recent_menu_size @@ -265,7 +265,7 @@ Option to specify the maximum number of entries on the Play Recent menu. If this number is exceeded, the oldest entries will be removed. - + l_recent_list_size @@ -293,7 +293,7 @@ Option to specify the maximum number of entries on the Recent list in the multimedia library. If this number is exceeded, the oldest entries will be removed. - + c_recent_list_size @@ -321,7 +321,7 @@ Option to specify the maximum number of entries on the Recent list in the multimedia library. If this number is exceeded, the oldest entries will be removed. - + l_cache_size_limit @@ -349,7 +349,7 @@ Option that shows and allows you to change the maximum number of entries for which KPlayer remembers properties, even if they are no longer on playlist. If the limit is exceeded, the oldest existing entries are removed from cache. - + c_cache_size_limit @@ -379,7 +379,7 @@ - + c_allow_duplicate_entries @@ -393,7 +393,7 @@ Option to choose whether to allow multiple entries having the exact same URL on playlist. Duplicate entries will have the same set of file properties. If this option is not selected, and you put a new entry with the same URL as an existing one on a playlist, the old entry will be removed. - + c_show_messages_on_error diff --git a/kplayer/kplayersettingshue.ui b/kplayer/kplayersettingshue.ui index 152e041..59fabcc 100644 --- a/kplayer/kplayersettingshue.ui +++ b/kplayer/kplayersettingshue.ui @@ -1,6 +1,6 @@ KPlayerSettingsHuePage - + KPlayerSettingsHuePage @@ -28,7 +28,7 @@ unnamed - + frame4 @@ -50,7 +50,7 @@ unnamed - + l_hue_minimum @@ -78,7 +78,7 @@ Option to specify a lower limit on the video hue setting. - + c_hue_minimum @@ -106,7 +106,7 @@ Option to specify a lower limit on the video hue setting. - + l_hue_maximum @@ -134,7 +134,7 @@ Option to specify an upper limit on the video hue setting. - + c_hue_maximum @@ -162,7 +162,7 @@ Option to specify an upper limit on the video hue setting. - + l_hue_step @@ -190,7 +190,7 @@ Option to specify the amount by which to change video hue when using Increase/Decrease Hue commands on Player/Video menu or the corresponding keyboard shortcuts. - + c_hue_step @@ -218,7 +218,7 @@ Option to specify the amount by which to change video hue when using Increase/Decrease Hue commands on Player/Video menu or the corresponding keyboard shortcuts. - + layout2 @@ -229,7 +229,7 @@ 6 - + c_hue_reset @@ -243,7 +243,7 @@ Option to reset video hue to a specific setting for each new file or KPlayer session. - + l_hue_to @@ -271,7 +271,7 @@ Option to reset video hue to a specific setting for each new file or KPlayer session. - + c_hue_default @@ -299,7 +299,7 @@ Option to reset video hue to a specific setting for each new file or KPlayer session. - + l_hue_every @@ -327,7 +327,7 @@ Option to reset video hue to a specific setting for each new file or KPlayer session. - + file diff --git a/kplayer/kplayersettingsprogress.ui b/kplayer/kplayersettingsprogress.ui index d5d9a7b..bd47519 100644 --- a/kplayer/kplayersettingsprogress.ui +++ b/kplayer/kplayersettingsprogress.ui @@ -1,6 +1,6 @@ KPlayerSettingsProgressPage - + KPlayerSettingsProgressPage @@ -28,7 +28,7 @@ unnamed - + frame4 @@ -50,7 +50,7 @@ unnamed - + layout2 @@ -58,7 +58,7 @@ unnamed - + l_progress_seek @@ -86,7 +86,7 @@ Option to specify the amount by which playback will be moved forward or backward when using Forward/Backward commands on Player menu, either in seconds or in percents of time length of the file if it is known. - + c_progress_seek @@ -114,7 +114,7 @@ Option to specify the amount by which playback will be moved forward or backward when using Forward/Backward commands on Player menu, either in seconds or in percents of time length of the file if it is known. - + percent @@ -135,7 +135,7 @@ Option to specify the amount by which playback will be moved forward or backward when using Forward/Backward commands on Player menu, either in seconds or in percents of time length of the file if it is known. - + l_progress_fast @@ -163,7 +163,7 @@ Option to specify the amount by which playback will be moved forward or backward when using Fast Forward/Backward commands on Player menu, either in seconds or in percents of time length of the file if it is known. - + c_progress_fast @@ -191,7 +191,7 @@ Option to specify the amount by which playback will be moved forward or backward when using Fast Forward/Backward commands on Player menu, either in seconds or in percents of time length of the file if it is known. - + percent diff --git a/kplayer/kplayersettingssaturation.ui b/kplayer/kplayersettingssaturation.ui index 0e63d2e..10c014e 100644 --- a/kplayer/kplayersettingssaturation.ui +++ b/kplayer/kplayersettingssaturation.ui @@ -1,6 +1,6 @@ KPlayerSettingsSaturationPage - + KPlayerSettingsSaturationPage @@ -28,7 +28,7 @@ unnamed - + frame4 @@ -50,7 +50,7 @@ unnamed - + l_saturation_minimum @@ -78,7 +78,7 @@ Option to specify a lower limit on the video saturation setting. - + c_saturation_minimum @@ -106,7 +106,7 @@ Option to specify a lower limit on the video saturation setting. - + l_saturation_maximum @@ -134,7 +134,7 @@ Option to specify an upper limit on the video saturation setting. - + c_saturation_maximum @@ -162,7 +162,7 @@ Option to specify an upper limit on the video saturation setting. - + l_saturation_step @@ -190,7 +190,7 @@ Option to specify the amount by which to change video saturation when using Increase/Decrease Saturation commands on Player/Video menu or the corresponding keyboard shortcuts. - + c_saturation_step @@ -218,7 +218,7 @@ Option to specify the amount by which to change video saturation when using Increase/Decrease Saturation commands on Player/Video menu or the corresponding keyboard shortcuts. - + layout3 @@ -229,7 +229,7 @@ 6 - + c_saturation_reset @@ -243,7 +243,7 @@ Option to reset video saturation to a specific setting for each new file or KPlayer session. - + l_saturation_to @@ -271,7 +271,7 @@ Option to reset video saturation to a specific setting for each new file or KPlayer session. - + c_saturation_default @@ -299,7 +299,7 @@ Option to reset video saturation to a specific setting for each new file or KPlayer session. - + l_saturation_every @@ -327,7 +327,7 @@ Option to reset video saturation to a specific setting for each new file or KPlayer session. - + file diff --git a/kplayer/kplayersettingssliders.ui b/kplayer/kplayersettingssliders.ui index d410a43..8e8da3e 100644 --- a/kplayer/kplayersettingssliders.ui +++ b/kplayer/kplayersettingssliders.ui @@ -1,6 +1,6 @@ KPlayerSettingsSlidersPage - + KPlayerSettingsSlidersPage @@ -28,7 +28,7 @@ unnamed - + frame4 @@ -50,7 +50,7 @@ unnamed - + layout3 @@ -58,7 +58,7 @@ unnamed - + l_minimum_slider_length @@ -86,7 +86,7 @@ Option that shows and allows you to change minimum length of slider control. It affects sliders embedded in toolbars. - + c_minimum_slider_length @@ -114,7 +114,7 @@ Option that shows and allows you to change minimum length of slider control. It affects sliders embedded in toolbars. - + l_minimum_slider_length_pixels @@ -139,7 +139,7 @@ Option that shows and allows you to change minimum length of slider control. It affects sliders embedded in toolbars. - + l_preferred_slider_length @@ -167,7 +167,7 @@ Option that shows and allows you to change preferred length of slider control. It affects both popup sliders and sliders embedded in toolbars. - + c_preferred_slider_length @@ -195,7 +195,7 @@ Option that shows and allows you to change preferred length of slider control. It affects both popup sliders and sliders embedded in toolbars. - + l_preferred_slider_length_pixels @@ -220,7 +220,7 @@ Option that shows and allows you to change preferred length of slider control. It affects both popup sliders and sliders embedded in toolbars. - + c_show_slider_marks @@ -234,7 +234,7 @@ Option to show slider marks on slider controls. - + l_slider_marks @@ -262,7 +262,7 @@ Option to specify the distance between tick marks on the a slider, in percents of slider length. - + c_slider_marks @@ -290,7 +290,7 @@ Option to specify the distance between tick marks on sliders, in percents of slider length. - + l_slider_marks_percent diff --git a/kplayer/kplayersettingssubtitles.ui b/kplayer/kplayersettingssubtitles.ui index 4d1e14e..3104efc 100644 --- a/kplayer/kplayersettingssubtitles.ui +++ b/kplayer/kplayersettingssubtitles.ui @@ -1,6 +1,6 @@ KPlayerSettingsSubtitlesPage - + KPlayerSettingsSubtitlesPage @@ -28,7 +28,7 @@ unnamed - + frame1 @@ -50,7 +50,7 @@ unnamed - + l_font_name @@ -92,7 +92,7 @@ Option to specify the name of the font for displaying subtitles and other OSD text. - + c_bold @@ -106,7 +106,7 @@ Option to choose bold font for displaying subtitles and other OSD text. - + c_italic @@ -120,7 +120,7 @@ Option to choose italic font for displaying subtitles and other OSD text. - + l_text_size @@ -140,7 +140,7 @@ Option to specify the size of subtitle text. - + auto @@ -167,7 +167,7 @@ Option to specify the size of subtitle text. - + c_autoscale @@ -181,7 +181,7 @@ Option to automatically scale subtitles and other OSD elements. - + l_outline @@ -201,7 +201,7 @@ Option to specify the outline of the font for displaying subtitles and other OSD text. - + c_outline_slider @@ -235,7 +235,7 @@ Option to specify the outline of the font for displaying subtitles and other OSD text. - + c_outline @@ -252,7 +252,7 @@ Option to specify the width of the subtitle area in percent of the video width. - + l_width @@ -272,7 +272,7 @@ Option to specify the width of the subtitle area in percent of the video width. - + c_width_slider @@ -306,7 +306,7 @@ Option to specify the width of the subtitle area in percent of the video width. - + c_width @@ -323,7 +323,7 @@ Option to specify the width of the subtitle area in percent of the video width. - + l_width_percent @@ -340,7 +340,7 @@ Option to specify the width of the subtitle area in percent of the video width. - + l_position_step @@ -360,7 +360,7 @@ Option to specify the amount in percents of video height by which to move subtitles when using Move Up/Down commands on Player/Subtitles menu or the corresponding keyboard shortcuts. - + c_position_step @@ -377,7 +377,7 @@ Option to specify the amount in percents of video height by which to move subtitles when using Move Up/Down commands on Player/Subtitles menu or the corresponding keyboard shortcuts. - + l_position_percent @@ -394,7 +394,7 @@ Option to specify the amount in percents of video height by which to move subtitles when using Move Up/Down commands on Player/Subtitles menu or the corresponding keyboard shortcuts. - + l_delay_step @@ -414,7 +414,7 @@ Option to specify the amount in seconds by which to change subtitle delay when using Increase/Decrease Delay commands on Player/Subtitles menu or the corresponding keyboard shortcuts. - + c_delay_step @@ -431,7 +431,7 @@ Option to specify the amount in seconds by which to change subtitle delay when using Increase/Decrease Delay commands on Player/Subtitles menu or the corresponding keyboard shortcuts. - + l_delay_seconds @@ -448,7 +448,7 @@ Option to specify the amount in seconds by which to change subtitle delay when using Increase/Decrease Delay commands on Player/Subtitles menu or the corresponding keyboard shortcuts. - + l_encoding @@ -468,7 +468,7 @@ Option to specify the encoding of the subtitle file. - + auto @@ -495,7 +495,7 @@ Option to specify the encoding of the subtitle file. - + c_embedded_fonts @@ -509,7 +509,7 @@ Option to use embedded fonts if they are available to display subtitles. - + c_closed_caption @@ -523,7 +523,7 @@ Option to display closed caption subtitles if they are available. - + c_subtitles_autoexpand @@ -537,7 +537,7 @@ Option to automatically expand the video area to fit subtitles below the video. - + 1:1 @@ -571,7 +571,7 @@ Option to specify the aspect ratio of the expanded video area. The video will only be expanded if it has a higher aspect ratio than the one you choose. - + c_subtitles_autoload @@ -585,7 +585,7 @@ Option to automatically load subtitle types selected below by looking for subtitle files with the same name as the currently loaded file and the corresponding subtitle extension. - + l_extensions @@ -605,7 +605,7 @@ Option that lets you give a list of extensions that will be used to automatically load subtitles. If you enter multiple extensions, separate them by commas, semicolons, colons, periods or spaces. Extensions you give will be converted to lower and upper case when looking for files. Subtitles with mixed case extensions cannot be autoloaded at this time. - + c_subtitles_list @@ -629,9 +629,9 @@ c_width - textChanged(const QString&) + textChanged(const TQString&) KPlayerSettingsSubtitlesPage - widthEditChanged(const QString&) + widthEditChanged(const TQString&) c_outline_slider @@ -641,9 +641,9 @@ c_outline - textChanged(const QString&) + textChanged(const TQString&) KPlayerSettingsSubtitlesPage - outlineEditChanged(const QString&) + outlineEditChanged(const TQString&) c_subtitles_autoexpand @@ -660,9 +660,9 @@ widthSliderChanged(int) - widthEditChanged(const QString&) + widthEditChanged(const TQString&) outlineSliderChanged(int) - outlineEditChanged(const QString&) + outlineEditChanged(const TQString&) autoexpandChanged(bool) autoloadSubtitlesChanged(bool) diff --git a/kplayer/kplayersettingsvideo.ui b/kplayer/kplayersettingsvideo.ui index 4809906..5c44df6 100644 --- a/kplayer/kplayersettingsvideo.ui +++ b/kplayer/kplayersettingsvideo.ui @@ -1,6 +1,6 @@ KPlayerSettingsVideoPage - + KPlayerSettingsVideoPage @@ -28,7 +28,7 @@ unnamed - + frame1 @@ -50,7 +50,7 @@ unnamed - + layout1 @@ -58,7 +58,7 @@ unnamed - + l_driver @@ -78,7 +78,7 @@ Option that lists available video outputs and lets you choose the one to use for playing video. Recommended choice depends on the video card you have. For Matrox card try XMGA, for other cards either XVidix (if supported) or XVideo provide the best quality. With NVidia drivers you can also try XVMC output. If after trying hard you cannot make any of these work, you can use X11 output as the last resort. Video outputs that open a separate window instead of using KPlayer video area are not recommended. Auto will let MPlayer choose a video output according to its own configuration. If you need to specify more than one output separated by comma, set this option to Auto and put them in Additional Command Line Arguments on Advanced page. - + c_driver @@ -97,7 +97,7 @@ Option that lists available video outputs and lets you choose the one to use for playing video. Recommended choice depends on the video card you have. For Matrox card try XMGA, for other cards either XVidix (if supported) or XVideo provide the best quality. With NVidia drivers you can also try XVMC output. If after trying hard you cannot make any of these work, you can use X11 output as the last resort. Video outputs that open a separate window instead of using KPlayer video area are not recommended. Auto will let MPlayer choose a video output according to its own configuration. If you need to specify more than one output separated by comma, set this option to Auto and put them in Additional Command Line Arguments on Advanced page. - + l_device @@ -117,7 +117,7 @@ Option to specify video device to use for the chosen video output. Leave blank to use the default device. - + c_device @@ -145,7 +145,7 @@ Option to specify video device to use for the chosen video output. Leave blank to use the default device. - + l_codec @@ -165,7 +165,7 @@ Option that lists available codecs and lets you choose the one to be used for decoding video. Auto is the recommended choice, it lets MPlayer decide which codec to use automatically. If you need to tell MPlayer to use a particular codec for a given file or stream, set this option in File Properties. - + c_codec @@ -184,7 +184,7 @@ Option that lists available codecs and lets you choose the one to be used for decoding video. Auto is the recommended choice, it lets MPlayer decide which codec to use automatically. If you need to tell MPlayer to use a particular codec for a given file or stream, set this option in File Properties. - + l_scaler @@ -204,7 +204,7 @@ Option to specify the video scaler to be used when doing software scaling. Software scaling consumes considerable amount of system resources, so unless you have plenty of them and software scaling gives you better image quality, you should choose a video output above that uses hardware scaling. - + c_scaler @@ -280,7 +280,7 @@ - + c_doublebuffering @@ -294,7 +294,7 @@ Option to choose whether double buffering should be used for video output. This option is recommended, it gives smoother display in many cases. - + c_direct_rendering diff --git a/kplayer/kplayersettingsvolume.ui b/kplayer/kplayersettingsvolume.ui index 1a74e54..108fb16 100644 --- a/kplayer/kplayersettingsvolume.ui +++ b/kplayer/kplayersettingsvolume.ui @@ -1,6 +1,6 @@ KPlayerSettingsVolumePage - + KPlayerSettingsVolumePage @@ -28,7 +28,7 @@ unnamed - + frame4 @@ -50,7 +50,7 @@ unnamed - + l_volume_minimum @@ -78,7 +78,7 @@ Option to specify a lower limit on the sound volume setting. - + c_volume_minimum @@ -106,7 +106,7 @@ Option to specify a lower limit on the sound volume setting. - + l_volume_maximum @@ -134,7 +134,7 @@ Option to specify an upper limit on the sound volume setting. - + c_volume_maximum @@ -162,7 +162,7 @@ Option to specify an upper limit on the sound volume setting. - + l_volume_step @@ -190,7 +190,7 @@ Option to specify the amount by which to change sound volume when using Increase/Decrease Volume commands on Player/Audio menu or the corresponding keyboard shortcuts. - + c_volume_step @@ -218,7 +218,7 @@ Option to specify the amount by which to change sound volume when using Increase/Decrease Volume commands on Player/Audio menu or the corresponding keyboard shortcuts. - + layout3 @@ -229,7 +229,7 @@ 6 - + c_volume_reset @@ -243,7 +243,7 @@ Option to reset sound volume to a specific setting for each new file or KPlayer session. - + l_volume_to @@ -271,7 +271,7 @@ Option to reset sound volume to a specific setting for each new file or KPlayer session. - + c_volume_default @@ -299,7 +299,7 @@ Option to reset sound volume to a specific setting for each new file or KPlayer session. - + l_volume_every @@ -327,7 +327,7 @@ Option to reset sound volume to a specific setting for each new file or KPlayer session. - + file diff --git a/kplayer/kplayerslideraction.cpp b/kplayer/kplayerslideraction.cpp index 703e947..dd18263 100644 --- a/kplayer/kplayerslideraction.cpp +++ b/kplayer/kplayerslideraction.cpp @@ -16,9 +16,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #ifdef DEBUG #define DEBUG_KPLAYER_SLIDERS @@ -37,7 +37,7 @@ KPlayerPopupFrame::~KPlayerPopupFrame() #endif } -void KPlayerPopupFrame::keyPressEvent (QKeyEvent* ev) +void KPlayerPopupFrame::keyPressEvent (TQKeyEvent* ev) { switch ( ev -> key() ) { @@ -50,15 +50,15 @@ void KPlayerPopupFrame::keyPressEvent (QKeyEvent* ev) } } -KPlayerPopupSliderAction::KPlayerPopupSliderAction (const QString& text, - const QString& pix, const KShortcut& shortcut, const QObject* receiver, - const char* slot, QObject* parent, const char* name) +KPlayerPopupSliderAction::KPlayerPopupSliderAction (const TQString& text, + const TQString& pix, const KShortcut& shortcut, const TQObject* receiver, + const char* slot, TQObject* parent, const char* name) : KAction (text, pix, shortcut, parent, name) { m_frame = new KPlayerPopupFrame; - m_frame -> setFrameStyle (QFrame::PopupPanel | QFrame::Raised); + m_frame -> setFrameStyle (TQFrame::PopupPanel | TQFrame::Raised); m_frame -> setLineWidth (2); - m_slider = new KPlayerSlider (Qt::Vertical, m_frame); + m_slider = new KPlayerSlider (TQt::Vertical, m_frame); m_frame -> resize (36, m_slider -> sizeHint().height() + 4); m_slider -> setGeometry (m_frame -> contentsRect()); #ifdef DEBUG_KPLAYER_SLIDERS @@ -66,7 +66,7 @@ KPlayerPopupSliderAction::KPlayerPopupSliderAction (const QString& text, #endif connect (m_slider, SIGNAL (changed (int)), receiver, slot); if ( ! text.isEmpty() ) - QToolTip::add (m_slider, text); + TQToolTip::add (m_slider, text); } KPlayerPopupSliderAction::~KPlayerPopupSliderAction() @@ -79,13 +79,13 @@ KPlayerPopupSliderAction::~KPlayerPopupSliderAction() void KPlayerPopupSliderAction::slotActivated (void) { KAction::slotActivated(); - QWidget* button = 0; + TQWidget* button = 0; #ifdef DEBUG_KPLAYER_SLIDERS if ( sender() ) kdDebugTime() << "Sender class name: " << sender() -> className() << "\n"; #endif if ( sender() && sender() -> inherits ("KToolBarButton") ) - button = (QWidget*) sender(); + button = (TQWidget*) sender(); else { KToolBar* toolbar = 0; @@ -102,20 +102,20 @@ void KPlayerPopupSliderAction::slotActivated (void) button = toolbar -> getButton (itemId (index)); } } - QPoint point; + TQPoint point; if ( button ) { - point = button -> mapToGlobal (QPoint (0, button -> height())); - if ( point.y() + m_frame -> height() > QApplication::desktop() -> height() ) + point = button -> mapToGlobal (TQPoint (0, button -> height())); + if ( point.y() + m_frame -> height() > TQApplication::desktop() -> height() ) point.setY (point.y() - button -> height() - m_frame -> height()); } else { - point = QCursor::pos() - QPoint (m_frame -> width() / 2, m_frame -> height() / 2); - if ( point.x() + m_frame -> width() > QApplication::desktop() -> width() ) - point.setX (QApplication::desktop() -> width() - m_frame -> width()); - if ( point.y() + m_frame -> height() > QApplication::desktop() -> height() ) - point.setY (QApplication::desktop() -> height() - m_frame -> height()); + point = TQCursor::pos() - TQPoint (m_frame -> width() / 2, m_frame -> height() / 2); + if ( point.x() + m_frame -> width() > TQApplication::desktop() -> width() ) + point.setX (TQApplication::desktop() -> width() - m_frame -> width()); + if ( point.y() + m_frame -> height() > TQApplication::desktop() -> height() ) + point.setY (TQApplication::desktop() -> height() - m_frame -> height()); if ( point.x() < 0 ) point.setX (0); if ( point.y() < 0 ) @@ -124,16 +124,16 @@ void KPlayerPopupSliderAction::slotActivated (void) #ifdef DEBUG_KPLAYER_SLIDERS kdDebugTime() << "Point: " << point.x() << "x" << point.y() << "\n"; #endif - QWhatsThis::add (m_frame, whatsThis()); - QWhatsThis::add (m_slider, whatsThis()); + TQWhatsThis::add (m_frame, whatsThis()); + TQWhatsThis::add (m_slider, whatsThis()); m_frame -> move (point); m_frame -> show(); m_slider -> setFocus(); } -KPlayerSliderAction::KPlayerSliderAction (const QString& text, const KShortcut& cut, - const QObject* receiver, const char* slot, KActionCollection* parent, const char* name) - : KWidgetAction (new KPlayerSlider (Qt::Horizontal, 0, name), text, cut, 0, 0, parent, name) +KPlayerSliderAction::KPlayerSliderAction (const TQString& text, const KShortcut& cut, + const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name) + : KWidgetAction (new KPlayerSlider (TQt::Horizontal, 0, name), text, cut, 0, 0, parent, name) { setAutoSized (true); setShortcutConfigurable (false); @@ -147,20 +147,20 @@ KPlayerSliderAction::~KPlayerSliderAction() #endif } -int KPlayerSliderAction::plug (QWidget* widget, int index) +int KPlayerSliderAction::plug (TQWidget* widget, int index) { int result = KWidgetAction::plug (widget, index); if ( result < 0 ) return result; KToolBar* toolbar = (KToolBar*) widget; if ( ! text().isEmpty() ) - QToolTip::add (slider(), text()); + TQToolTip::add (slider(), text()); orientationChanged (toolbar -> orientation()); connect (toolbar, SIGNAL (orientationChanged (Orientation)), this, SLOT (orientationChanged (Orientation))); return result; } -void KPlayerSliderAction::unplug (QWidget* widget) +void KPlayerSliderAction::unplug (TQWidget* widget) { KWidgetAction::unplug (widget); if ( ! slider() || ! isPlugged() || widget != slider() -> parent() ) @@ -174,8 +174,8 @@ void KPlayerSliderAction::orientationChanged (Orientation orientation) slider() -> setOrientation (orientation); } -KPlayerSlider::KPlayerSlider (Qt::Orientation orientation, QWidget* parent, const char* name) - : QSlider (orientation, parent, name) +KPlayerSlider::KPlayerSlider (TQt::Orientation orientation, TQWidget* parent, const char* name) + : TQSlider (orientation, parent, name) { m_dragging = m_changing_orientation = false; connect (this, SIGNAL (valueChanged (int)), this, SLOT (sliderValueChanged (int))); @@ -188,16 +188,16 @@ KPlayerSlider::~KPlayerSlider() #endif } -QSize KPlayerSlider::sizeHint() const +TQSize KPlayerSlider::sizeHint() const { #ifdef DEBUG_KPLAYER_SLIDER_HINTS kdDebugTime() << "KPlayerSlider::sizeHint\n"; #endif - QSize hint = QSlider::sizeHint(); + TQSize hint = TQSlider::sizeHint(); if ( KPlayerEngine::engine() ) { int length = KPlayerEngine::engine() -> configuration() -> preferredSliderLength(); - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) { if ( hint.width() < length ) hint.setWidth (length); @@ -214,16 +214,16 @@ QSize KPlayerSlider::sizeHint() const return hint; } -QSize KPlayerSlider::minimumSizeHint() const +TQSize KPlayerSlider::minimumSizeHint() const { #ifdef DEBUG_KPLAYER_SLIDER_HINTS kdDebugTime() << "KPlayerSlider::minimumSizeHint\n"; #endif - QSize hint = QSlider::minimumSizeHint(); + TQSize hint = TQSlider::minimumSizeHint(); if ( KPlayerEngine::engine() ) { int length = KPlayerEngine::engine() -> configuration() -> minimumSliderLength(); - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) { if ( hint.width() < length ) hint.setWidth (length); @@ -245,59 +245,59 @@ void KPlayerSlider::setOrientation (Orientation o) if ( o == orientation() ) return; m_changing_orientation = true; - int minValue = QSlider::minValue(); - int maxValue = QSlider::maxValue(); - int value = QSlider::value(); - QSlider::setOrientation (o); - QSlider::setMinValue (- maxValue); - QSlider::setMaxValue (- minValue); - QSlider::setValue (- value); + int minValue = TQSlider::minValue(); + int maxValue = TQSlider::maxValue(); + int value = TQSlider::value(); + TQSlider::setOrientation (o); + TQSlider::setMinValue (- maxValue); + TQSlider::setMaxValue (- minValue); + TQSlider::setValue (- value); m_changing_orientation = false; } int KPlayerSlider::minValue (void) const { - if ( orientation() == Qt::Horizontal ) - return QSlider::minValue(); - return - QSlider::maxValue(); + if ( orientation() == TQt::Horizontal ) + return TQSlider::minValue(); + return - TQSlider::maxValue(); } void KPlayerSlider::setMinValue (int minValue) { - if ( orientation() == Qt::Horizontal ) - QSlider::setMinValue (minValue); + if ( orientation() == TQt::Horizontal ) + TQSlider::setMinValue (minValue); else - QSlider::setMaxValue (- minValue); + TQSlider::setMaxValue (- minValue); } int KPlayerSlider::maxValue (void) const { - if ( orientation() == Qt::Horizontal ) - return QSlider::maxValue(); - return - QSlider::minValue(); + if ( orientation() == TQt::Horizontal ) + return TQSlider::maxValue(); + return - TQSlider::minValue(); } void KPlayerSlider::setMaxValue (int maxValue) { - if ( orientation() == Qt::Horizontal ) - QSlider::setMaxValue (maxValue); + if ( orientation() == TQt::Horizontal ) + TQSlider::setMaxValue (maxValue); else - QSlider::setMinValue (- maxValue); + TQSlider::setMinValue (- maxValue); } int KPlayerSlider::value (void) const { - if ( orientation() == Qt::Horizontal ) - return QSlider::value(); - return - QSlider::value(); + if ( orientation() == TQt::Horizontal ) + return TQSlider::value(); + return - TQSlider::value(); } void KPlayerSlider::setValue (int value, int) { - if ( orientation() == Qt::Horizontal ) - QSlider::setValue (value); + if ( orientation() == TQt::Horizontal ) + TQSlider::setValue (value); else - QSlider::setValue (- value); + TQSlider::setValue (- value); } void KPlayerSlider::setup (int minValue, int maxValue, int value, @@ -307,7 +307,7 @@ void KPlayerSlider::setup (int minValue, int maxValue, int value, setMaxValue (maxValue); setLineStep (lineStep); setPageStep (pageStep); - setTickmarks (tickMarks ? QSlider::Both : QSlider::NoMarks); + setTickmarks (tickMarks ? TQSlider::Both : TQSlider::NoMarks); setTickInterval (tickInterval); setValue (value); updateGeometry(); @@ -319,25 +319,25 @@ void KPlayerSlider::sliderValueChanged (int) emit changed (value()); } -void KPlayerSlider::mousePressEvent (QMouseEvent* event) +void KPlayerSlider::mousePressEvent (TQMouseEvent* event) { - m_dragging = (event -> stateAfter() & (Qt::LeftButton | Qt::MidButton)) != 0; + m_dragging = (event -> stateAfter() & (TQt::LeftButton | TQt::MidButton)) != 0; #ifdef DEBUG_KPLAYER_SLIDERS kdDebugTime() << "Popup slider mouse press " << event -> state() << " -> " << event -> stateAfter() << " -> " << m_dragging << "\n"; #endif - QSlider::mousePressEvent (event); + TQSlider::mousePressEvent (event); } -void KPlayerSlider::mouseReleaseEvent (QMouseEvent* event) +void KPlayerSlider::mouseReleaseEvent (TQMouseEvent* event) { - m_dragging = (event -> stateAfter() & (Qt::LeftButton | Qt::MidButton)) != 0; + m_dragging = (event -> stateAfter() & (TQt::LeftButton | TQt::MidButton)) != 0; #ifdef DEBUG_KPLAYER_SLIDERS kdDebugTime() << "Popup slider mouse release " << event -> state() << " -> " << event -> stateAfter() << " -> " << m_dragging << "\n"; #endif - QSlider::mouseReleaseEvent (event); + TQSlider::mouseReleaseEvent (event); } -void KPlayerSlider::keyPressEvent (QKeyEvent* event) +void KPlayerSlider::keyPressEvent (TQKeyEvent* event) { int key = event -> key(); if ( key == Key_Left || key == Key_Right || (event -> state() & (ControlButton | AltButton | MetaButton)) != 0 @@ -347,22 +347,22 @@ void KPlayerSlider::keyPressEvent (QKeyEvent* event) event -> ignore(); return; } - QSlider::keyPressEvent (event); + TQSlider::keyPressEvent (event); } -void KPlayerSlider::wheelEvent (QWheelEvent* event) +void KPlayerSlider::wheelEvent (TQWheelEvent* event) { static int remainder = 0; - static QSlider* owner = 0; + static TQSlider* owner = 0; if ( owner != this ) { owner = this; remainder = 0; } int delta = event -> delta(); - if ( orientation() != Qt::Horizontal ) + if ( orientation() != TQt::Horizontal ) delta = - delta; - delta *= (event -> state() & Qt::ControlButton) == Qt::ControlButton ? pageStep() : lineStep(); + delta *= (event -> state() & TQt::ControlButton) == TQt::ControlButton ? pageStep() : lineStep(); int offset = (delta + remainder + (delta > 0 ? 60 : -60)) / 120; remainder += delta - offset * 120; #ifdef DEBUG_KPLAYER_SLIDERS @@ -372,6 +372,6 @@ void KPlayerSlider::wheelEvent (QWheelEvent* event) << " spontaneous " << event -> spontaneous() << "\n"; #endif if ( offset != 0 ) - QSlider::setValue (QSlider::value() + offset); + TQSlider::setValue (TQSlider::value() + offset); event -> accept(); } diff --git a/kplayer/kplayerslideraction.h b/kplayer/kplayerslideraction.h index ac6dcf6..bc5137b 100644 --- a/kplayer/kplayerslideraction.h +++ b/kplayer/kplayerslideraction.h @@ -17,26 +17,26 @@ #define KPLAYERSLIDERACTION_H #include -#include -#include +#include +#include -/**KPlayer's slider widget. Works around the Qt upside-down slider bug. +/**KPlayer's slider widget. Works around the TQt upside-down slider bug. *@author kiriuja */ -class KPlayerSlider : public QSlider +class KPlayerSlider : public TQSlider { Q_OBJECT public: - /** The KPlayerSlider constructor. Parameters are passed on to QSlider. */ - KPlayerSlider (Qt::Orientation, QWidget* parent = 0, const char* name = 0); + /** The KPlayerSlider constructor. Parameters are passed on to TQSlider. */ + KPlayerSlider (TQt::Orientation, TQWidget* parent = 0, const char* name = 0); /** The KPlayerSlider destructor. Does nothing. */ virtual ~KPlayerSlider(); /** The size hint. */ - virtual QSize sizeHint() const; + virtual TQSize sizeHint() const; /** The minimum size hint. */ - virtual QSize minimumSizeHint() const; + virtual TQSize minimumSizeHint() const; /** The minimum value. */ int minValue (void) const; @@ -48,7 +48,7 @@ public: void setMaxValue (int); /** The current value. */ int value (void) const; - /** Sets the current value. The extra parameter prevents overriding of the virtual QSlider::setValue. */ + /** Sets the current value. The extra parameter prevents overriding of the virtual TQSlider::setValue. */ void setValue (int, int = 0); // do not override the virtual setValue /** Sets up the slider by setting all options in one go. */ @@ -65,7 +65,7 @@ signals: void changed (int); protected slots: - /** Receives the valueChanged signal from QSlider. */ + /** Receives the valueChanged signal from TQSlider. */ void sliderValueChanged (int); /** Keeps track of dragging state. */ //void sliderThumbPressed (void); @@ -74,13 +74,13 @@ protected slots: protected: /** Filters keystrokes. */ - virtual void keyPressEvent (QKeyEvent*); + virtual void keyPressEvent (TQKeyEvent*); /** Remember mouse button state. */ - virtual void mousePressEvent (QMouseEvent*); + virtual void mousePressEvent (TQMouseEvent*); /** Remember mouse button state. */ - virtual void mouseReleaseEvent (QMouseEvent*); + virtual void mouseReleaseEvent (TQMouseEvent*); /** Processes the wheel event. Reverses direction when the slider is horizontal. */ - virtual void wheelEvent (QWheelEvent*); + virtual void wheelEvent (TQWheelEvent*); /** Dragging state. */ bool m_dragging; @@ -95,20 +95,20 @@ protected: /**KPlayer popup frame. *@author kiriuja */ -class KPlayerPopupFrame : public QHBox +class KPlayerPopupFrame : public TQHBox { Q_OBJECT public: - /** The KPlayerPopupFrame constructor. Parameters are passed on to QHBox. */ - KPlayerPopupFrame (QWidget* parent = 0, const char* name = 0) - : QHBox (parent, name, WType_Popup) { } + /** The KPlayerPopupFrame constructor. Parameters are passed on to TQHBox. */ + KPlayerPopupFrame (TQWidget* parent = 0, const char* name = 0) + : TQHBox (parent, name, WType_Popup) { } /** The KPlayerPopupFrame destructor. Does nothing. */ virtual ~KPlayerPopupFrame(); protected: /** Closes the popup frame when Alt, Tab, Esc, Enter or Return is pressed. */ - virtual void keyPressEvent (QKeyEvent*); + virtual void keyPressEvent (TQKeyEvent*); }; /**Action representing a popup slider activated by a toolbar button. @@ -120,8 +120,8 @@ class KPlayerPopupSliderAction : public KAction public: /** The KPlayerPopupSliderAction constructor. Parameters are passed on to KAction. */ - KPlayerPopupSliderAction (const QString& text, const QString& pix, const KShortcut& shortcut, - const QObject* receiver, const char* slot, QObject* parent = 0, const char* name = 0); + KPlayerPopupSliderAction (const TQString& text, const TQString& pix, const KShortcut& shortcut, + const TQObject* receiver, const char* slot, TQObject* parent = 0, const char* name = 0); /** The KPlayerPopupSliderAction destructor. */ virtual ~KPlayerPopupSliderAction(); @@ -149,7 +149,7 @@ class KPlayerSliderAction : public KWidgetAction public: /** The KPlayerSliderAction constructor. Parameters are passed on to KAction. */ - KPlayerSliderAction (const QString& text, const KShortcut&, const QObject* receiver, + KPlayerSliderAction (const TQString& text, const KShortcut&, const TQObject* receiver, const char* slot, KActionCollection* parent = 0, const char* name = 0); /** The KPlayerSliderAction destructor. */ virtual ~KPlayerSliderAction(); @@ -159,9 +159,9 @@ public: { return (KPlayerSlider*) widget(); } /** Plugs the slider into the toolbar. */ - virtual int plug (QWidget* widget, int index = -1); + virtual int plug (TQWidget* widget, int index = -1); /** Unplugs the slider from the toolbar. */ - virtual void unplug (QWidget* widget); + virtual void unplug (TQWidget* widget); protected slots: /** Changes the slider orientation when the toolbar orientation changes. */ diff --git a/kplayer/kplayersource.cpp b/kplayer/kplayersource.cpp index 0866ddf..cc2670c 100644 --- a/kplayer/kplayersource.cpp +++ b/kplayer/kplayersource.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ #include -#include +#include #ifdef DEBUG #define DEBUG_KPLAYER_SOURCE @@ -25,7 +25,7 @@ #include "kplayernode.h" #include "kplayerproperties.h" -static QRegExp re_semicolon ("; *"); +static TQRegExp re_semicolon ("; *"); KPlayerSource::KPlayerSource (KPlayerContainerNode* parent) { @@ -55,7 +55,7 @@ bool KPlayerSource::has (bool groups) kdDebugTime() << " ID " << parent() -> id() << "\n"; #endif bool group; - QString id; + TQString id; start (groups); return next (group, id); } @@ -93,7 +93,7 @@ void KPlayerSource::start (bool groups) } } -bool KPlayerSource::next (bool& group, QString& id) +bool KPlayerSource::next (bool& group, TQString& id) { #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << "KPlayerSource::next\n"; @@ -117,13 +117,13 @@ bool KPlayerSource::next (bool& group, QString& id) return false; } -bool KPlayerSource::verify (const QString& id) +bool KPlayerSource::verify (const TQString& id) { #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << "KPlayerSource::verify '" << id << "'\n"; #endif bool group; - QString groupid; + TQString groupid; start (true); while ( next (group, groupid) ) if ( groupid == id ) @@ -193,7 +193,7 @@ void KPlayerSource::removed (KPlayerContainerNode*, const KPlayerNodeList& nodes emit nodesRemoved (list); } -bool KPlayerSource::find (KPlayerContainerNode* node, const QString& id) +bool KPlayerSource::find (KPlayerContainerNode* node, const TQString& id) { #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << "KPlayerSource::find '" << id << "'\n"; @@ -233,7 +233,7 @@ void KPlayerListSource::enumStart (bool) kdDebugTime() << "KPlayerListSource::start\n"; kdDebugTime() << " ID " << parent() -> id() << "\n"; #endif - const QStringList& children (parent() -> media() -> children()); + const TQStringList& children (parent() -> media() -> children()); m_iterator = children.begin(); m_end = children.end(); #ifdef DEBUG_KPLAYER_SOURCE @@ -241,7 +241,7 @@ void KPlayerListSource::enumStart (bool) #endif } -bool KPlayerListSource::enumNext (bool& group, QString& id) +bool KPlayerListSource::enumNext (bool& group, TQString& id) { #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << "KPlayerListSource::next\n"; @@ -305,7 +305,7 @@ bool KPlayerFixedSource::canRemove (void) const return false; } -bool KPlayerFixedSource::enumNext (bool& group, QString& id) +bool KPlayerFixedSource::enumNext (bool& group, TQString& id) { #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << "KPlayerFixedSource::next\n"; @@ -377,7 +377,7 @@ void KPlayerDevicesSource::enumStart (bool groups) KPlayerListSource::enumStart (groups); } -bool KPlayerDevicesSource::enumNext (bool& group, QString& id) +bool KPlayerDevicesSource::enumNext (bool& group, TQString& id) { #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << "KPlayerDevicesSource::next\n"; @@ -452,7 +452,7 @@ void KPlayerDiskSource::enumStart (bool groups) m_tracks = groups ? 0 : parent() -> tracks(); } -bool KPlayerDiskSource::enumNext (bool& group, QString& id) +bool KPlayerDiskSource::enumNext (bool& group, TQString& id) { #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << "KPlayerDiskSource::next\n"; @@ -461,7 +461,7 @@ bool KPlayerDiskSource::enumNext (bool& group, QString& id) { ++ m_track; group = false; - id = QString::number (m_track); + id = TQString::number (m_track); return true; } return false; @@ -497,7 +497,7 @@ void KPlayerTunerSource::enumStart (bool groups) } } -bool KPlayerTunerSource::enumNext (bool& group, QString& id) +bool KPlayerTunerSource::enumNext (bool& group, TQString& id) { #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << "KPlayerTunerSource::next\n"; @@ -534,7 +534,7 @@ KPlayerStoreSource::~KPlayerStoreSource() #endif } -bool KPlayerStoreSource::enumNext (bool& group, QString& id) +bool KPlayerStoreSource::enumNext (bool& group, TQString& id) { #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << "KPlayerStoreSource::next\n"; @@ -570,13 +570,13 @@ KPlayerDirectorySource::KPlayerDirectorySource (KPlayerContainerNode* parent) #endif m_iterator = 0; m_directory = parent -> url().path(); - m_directory.setFilter (QDir::All); - m_directory.setSorting (QDir::Name); + m_directory.setFilter (TQDir::All); + m_directory.setSorting (TQDir::Name); m_watch.addDir (m_directory.path()); if ( m_watch.internalMethod() != KDirWatch::Stat ) { m_watch.startScan(); - connect (&m_watch, SIGNAL (dirty (const QString&)), SLOT (dirty (const QString&))); + connect (&m_watch, SIGNAL (dirty (const TQString&)), SLOT (dirty (const TQString&))); } #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << " Path " << m_directory.path() << "\n"; @@ -607,10 +607,10 @@ bool KPlayerDirectorySource::canRemove (void) const return false; } -bool checkMimeType (const QString& path) +bool checkMimeType (const TQString& path) { KMimeType::Ptr mimetype (KMimeType::findByPath (path)); - const QString& name (mimetype -> name().lower()); + const TQString& name (mimetype -> name().lower()); #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << " Mime Type " << name << "\n"; #endif @@ -626,24 +626,24 @@ bool checkMimeType (const QString& path) || name.startsWith ("uri/mms") || name.startsWith ("uri/pnm") || name.startsWith ("uri/rtsp"); } -bool checkFileInfo (const QFileInfo* info) +bool checkFileInfo (const TQFileInfo* info) { return info -> fileName() != "." && info -> fileName() != ".." && info -> exists() && info -> isReadable() && (info -> isDir() || checkMimeType (info -> filePath())); } -void KPlayerDirectorySource::dirty (const QString&) +void KPlayerDirectorySource::dirty (const TQString&) { #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << "KPlayerDirectorySource::dirty\n"; kdDebugTime() << " Path " << m_directory.path() << "\n"; #endif - const QFileInfoList* list = m_directory.entryInfoList(); + const TQFileInfoList* list = m_directory.entryInfoList(); if ( ! list ) return; - QStringList previous; - for ( QFileInfoListIterator iterator (*list); iterator.current(); ++ iterator ) + TQStringList previous; + for ( TQFileInfoListIterator iterator (*list); iterator.current(); ++ iterator ) previous << iterator.current() -> fileName(); #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << " Previous " << previous.count() << "\n"; @@ -655,11 +655,11 @@ void KPlayerDirectorySource::dirty (const QString&) #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << " Current " << list -> count() << "\n"; #endif - QFileInfoList current; - for ( QFileInfoListIterator it (*list); it.current(); ++ it ) + TQFileInfoList current; + for ( TQFileInfoListIterator it (*list); it.current(); ++ it ) { - QFileInfo* info = it.current(); - QString name (info -> fileName()); + TQFileInfo* info = it.current(); + TQString name (info -> fileName()); if ( previous.contains (name) ) previous.remove (name); else if ( checkFileInfo (info) ) @@ -674,12 +674,12 @@ void KPlayerDirectorySource::dirty (const QString&) } } -bool KPlayerDirectorySource::verify (const QString& id) +bool KPlayerDirectorySource::verify (const TQString& id) { #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << "KPlayerDirectorySource::verify '" << id << "'\n"; #endif - QFileInfo info (m_directory, id); + TQFileInfo info (m_directory, id); return info.exists() && info.isDir(); } @@ -691,24 +691,24 @@ void KPlayerDirectorySource::enumStart (bool groups) #endif delete m_iterator; m_iterator = 0; - const QFileInfoList* list = m_directory.entryInfoList(); + const TQFileInfoList* list = m_directory.entryInfoList(); if ( list ) { - m_iterator = new QFileInfoListIterator (*list); + m_iterator = new TQFileInfoListIterator (*list); #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << " Count " << list -> count() << "\n"; #endif } } -bool KPlayerDirectorySource::enumNext (bool& group, QString& id) +bool KPlayerDirectorySource::enumNext (bool& group, TQString& id) { #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << "KPlayerDirectorySource::next\n"; #endif if ( ! m_iterator ) return false; - QFileInfo* info; + TQFileInfo* info; do { info = m_iterator -> current(); @@ -763,7 +763,7 @@ void KPlayerOriginSource::enumStart (bool groups) parent() -> origin() -> source() -> start (groups); } -bool KPlayerOriginSource::enumNext (bool& group, QString& id) +bool KPlayerOriginSource::enumNext (bool& group, TQString& id) { #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << "KPlayerOriginSource::next\n"; @@ -791,7 +791,7 @@ void KPlayerOriginSource::added (KPlayerContainerNode*, const KPlayerNodeList& n #endif if ( after ) { - QString id (after -> id()); + TQString id (after -> id()); if ( ! after -> isContainer() && parent() -> isGroup() && ! parent() -> origin() -> isGroup() ) id = parent() -> origin() -> metaurl (id).url(); after = parent() -> nodeById (id); @@ -815,11 +815,11 @@ void KPlayerOriginSource::removed (KPlayerContainerNode*, const KPlayerNodeList& #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << "KPlayerOriginSource::removed\n"; #endif - QStringList ids; + TQStringList ids; KPlayerNodeListIterator iterator (nodes); while ( KPlayerNode* node = iterator.current() ) { - QString id (node -> id()); + TQString id (node -> id()); if ( ! node -> isContainer() && parent() -> isGroup() && ! parent() -> origin() -> isGroup() ) id = parent() -> origin() -> metaurl (id).url(); ids << id; @@ -879,14 +879,14 @@ void KPlayerKeySource::enumStart (bool groups) parent() -> origin() -> source() -> start (groups); } -bool KPlayerKeySource::match (const QString& id) +bool KPlayerKeySource::match (const TQString& id) { - QString value (meta (id, parent() -> parentKey())); - QStringList values (QStringList::split (re_semicolon, value)); + TQString value (meta (id, parent() -> parentKey())); + TQStringList values (TQStringList::split (re_semicolon, value)); return values.contains (parent() -> id()) > 0; } -bool KPlayerKeySource::enumNext (bool& group, QString& id) +bool KPlayerKeySource::enumNext (bool& group, TQString& id) { #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << "KPlayerKeySource::next\n"; @@ -933,7 +933,7 @@ void KPlayerKeySource::added (const KPlayerNodeList& nodes) list.append (node); if ( ! parent() -> groupingKey().isEmpty() ) { - QString value (node -> meta (parent() -> groupingKey())); + TQString value (node -> meta (parent() -> groupingKey())); if ( ! map.contains (value) && ! parent() -> nodeById (value) ) { groups.append (new KPlayerCollectionNode); @@ -962,7 +962,7 @@ void KPlayerKeySource::brand (const KPlayerNodeList& nodes) brand (((KPlayerContainerNode*) node) -> nodes()); else { - QString value (node -> meta (parent() -> parentKey())); + TQString value (node -> meta (parent() -> parentKey())); if ( value.isEmpty() ) value = parent() -> id(); else @@ -989,8 +989,8 @@ void KPlayerKeySource::remove (const KPlayerNodeList& nodes) } else { - QString value (node -> meta (parent() -> parentKey())); - QStringList values (QStringList::split (re_semicolon, value)); + TQString value (node -> meta (parent() -> parentKey())); + TQStringList values (TQStringList::split (re_semicolon, value)); if ( values.remove (parent() -> id()) <= 0 || values.isEmpty() ) list.append (node); else @@ -1081,12 +1081,12 @@ void KPlayerSearchSource::enumStart (bool groups) parent() -> origin() -> source() -> start (groups); } -bool KPlayerSearchSource::match (const QString& id) +bool KPlayerSearchSource::match (const TQString& id) { return meta (id, "Name") == parent() -> id(); } -bool KPlayerSearchSource::enumNext (bool& group, QString& id) +bool KPlayerSearchSource::enumNext (bool& group, TQString& id) { #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << "KPlayerSearchSource::next\n"; @@ -1163,7 +1163,7 @@ void KPlayerGroupSource::enumStart (bool groups) } } -bool KPlayerGroupSource::enumNext (bool& group, QString& id) +bool KPlayerGroupSource::enumNext (bool& group, TQString& id) { #ifdef DEBUG_KPLAYER_SOURCE kdDebugTime() << "KPlayerGroupSource::next\n"; @@ -1217,7 +1217,7 @@ void KPlayerGroupSource::added (KPlayerContainerNode*, const KPlayerNodeList& no KPlayerNodeListIterator iterator (nodes); while ( KPlayerNode* node = iterator.current() ) { - QString value (node -> meta (parent() -> groupingKey())); + TQString value (node -> meta (parent() -> groupingKey())); if ( ! map.contains (value) && ! parent() -> nodeById (value) ) { groups.append (new KPlayerCollectionNode); @@ -1247,7 +1247,7 @@ void KPlayerGroupSource::remove (KPlayerContainerNode* node, const KPlayerNodeLi return; node -> remove (nodes); bool group; - QString id; + TQString id; node -> source() -> start (true); while ( node -> source() -> next (group, id) ) remove ((KPlayerContainerNode*) node -> nodeById (id), nodes); diff --git a/kplayer/kplayersource.h b/kplayer/kplayersource.h index b82a411..f2d09cf 100644 --- a/kplayer/kplayersource.h +++ b/kplayer/kplayersource.h @@ -17,7 +17,7 @@ #define KPLAYERSOURCE_H #include -#include +#include class KPlayerCollectionNode; class KPlayerContainerNode; @@ -34,7 +34,7 @@ class KPlayerNodeList; /**Source class, responsible for routing of subnodes into and out of the node. *@author kiriuja */ -class KPlayerSource : public QObject +class KPlayerSource : public TQObject { Q_OBJECT @@ -56,9 +56,9 @@ public: /** Initializes the node retrieval process. */ void start (bool groups); /** Retrieves the id of the next node. */ - bool next (bool& group, QString& id); + bool next (bool& group, TQString& id); /** Verifies the given id. */ - virtual bool verify (const QString& id); + virtual bool verify (const TQString& id); /** Saves the node data into the source. */ virtual void save (void); @@ -85,17 +85,17 @@ protected: /** Initializes the node retrieval process. */ virtual void enumStart (bool groups) = 0; /** Retrieves the id of the next node. */ - virtual bool enumNext (bool& group, QString& id) = 0; + virtual bool enumNext (bool& group, TQString& id) = 0; /** Connects the given node and all subnodes. */ void connectNodes (KPlayerContainerNode* node); /** Searches for a node with the given ID in the given node and its subnodes. */ - bool find (KPlayerContainerNode* node, const QString& id); + bool find (KPlayerContainerNode* node, const TQString& id); /** Parent node. */ KPlayerContainerNode* m_parent; /** Parent node iterator. */ - QPtrListIterator* m_iterator; + TQPtrListIterator* m_iterator; /** Flag stored by start() for next(). */ bool m_groups; @@ -129,12 +129,12 @@ protected: /** Initializes the node retrieval process. */ virtual void enumStart (bool groups); /** Retrieves the id of the next node. */ - virtual bool enumNext (bool& group, QString& id); + virtual bool enumNext (bool& group, TQString& id); /** Current iterator. */ - QStringList::ConstIterator m_iterator; + TQStringList::ConstIterator m_iterator; /** End iterator. */ - QStringList::ConstIterator m_end; + TQStringList::ConstIterator m_end; }; /**Fixed source class, handles subnodes of a fixed node. @@ -159,10 +159,10 @@ public: protected: /** Retrieves the id of the next node. */ - virtual bool enumNext (bool& group, QString& id); + virtual bool enumNext (bool& group, TQString& id); /** List of fixed IDs. */ - QStringList m_fixed_ids; + TQStringList m_fixed_ids; }; /**Root source class, handles subnodes of the root node. @@ -211,10 +211,10 @@ protected: /** Initializes the node retrieval process. */ virtual void enumStart (bool groups); /** Retrieves the id of the next node. */ - virtual bool enumNext (bool& group, QString& id); + virtual bool enumNext (bool& group, TQString& id); /** List of pending devices. */ - QStringList m_pending; + TQStringList m_pending; }; /**Device source class, handles device nodes. @@ -259,7 +259,7 @@ protected: /** Initializes the node retrieval process. */ virtual void enumStart (bool groups); /** Retrieves the id of the next node. */ - virtual bool enumNext (bool& group, QString& id); + virtual bool enumNext (bool& group, TQString& id); /** Number of tracks. */ int m_tracks; @@ -284,10 +284,10 @@ protected: /** Initializes the node retrieval process. */ virtual void enumStart (bool groups); /** Retrieves the id of the next node. */ - virtual bool enumNext (bool& group, QString& id); + virtual bool enumNext (bool& group, TQString& id); /** List of pending devices. */ - QStringList m_pending; + TQStringList m_pending; /** List source. */ KPlayerListSource m_list; }; @@ -310,7 +310,7 @@ public: protected: /** Retrieves the id of the next node. */ - virtual bool enumNext (bool& group, QString& id); + virtual bool enumNext (bool& group, TQString& id); }; /**Directory source class, handles subnodes in filesystem directory. @@ -334,22 +334,22 @@ public: virtual bool canRemove (void) const; /** Verifies the given id. */ - virtual bool verify (const QString& id); + virtual bool verify (const TQString& id); protected slots: /** Receives dirty signal from directory watch. */ - void dirty (const QString& path); + void dirty (const TQString& path); protected: /** Initializes the node retrieval process. */ virtual void enumStart (bool groups); /** Retrieves the id of the next node. */ - virtual bool enumNext (bool& group, QString& id); + virtual bool enumNext (bool& group, TQString& id); /** Directory. */ - QDir m_directory; + TQDir m_directory; /** Entry info iterator. */ - QFileInfoListIterator* m_iterator; + TQFileInfoListIterator* m_iterator; /** Directory watch. */ KDirWatch m_watch; }; @@ -390,7 +390,7 @@ protected: /** Initializes the node retrieval process. */ virtual void enumStart (bool groups); /** Retrieves the id of the next node. */ - virtual bool enumNext (bool& group, QString& id); + virtual bool enumNext (bool& group, TQString& id); }; #if 0 @@ -415,7 +415,7 @@ public: { return (KPlayerCollectionNode*) m_parent; } /** Matches the meta information for the given ID against the criteria. */ - bool match (const QString& id); + bool match (const TQString& id); /** Adds the given nodes into the list of nodes, optionally linking to the origin. */ virtual KPlayerNode* add (const KPlayerNodeList& nodes, bool link, KPlayerNode* after = 0); @@ -435,7 +435,7 @@ protected: /** Initializes the node retrieval process. */ virtual void enumStart (bool groups); /** Retrieves the id of the next node. */ - virtual bool enumNext (bool& group, QString& id); + virtual bool enumNext (bool& group, TQString& id); }; /**Group source class, handles subnodes of a grouped node. @@ -471,7 +471,7 @@ protected: /** Initializes the node retrieval process. */ virtual void enumStart (bool groups); /** Retrieves the id of the next node. */ - virtual bool enumNext (bool& group, QString& id); + virtual bool enumNext (bool& group, TQString& id); /** Removes the given nodes from the given node and its subnodes. */ void remove (KPlayerContainerNode* node, const KPlayerNodeList& nodes); @@ -522,7 +522,7 @@ public: virtual bool canRemove (void) const; /** Matches the meta information for the given ID against the criteria. */ - bool match (const QString& id); + bool match (const TQString& id); //public slots: /** Adds the given nodes into the list of nodes. */ @@ -534,7 +534,7 @@ protected: /** Initializes the node retrieval process. */ virtual void enumStart (bool groups); /** Retrieves the id of the next node. */ - virtual bool enumNext (bool& group, QString& id); + virtual bool enumNext (bool& group, TQString& id); /** Current node. */ KPlayerContainerNode* m_current; diff --git a/kplayer/kplayerwidget.cpp b/kplayer/kplayerwidget.cpp index ca24af1..c3f374b 100644 --- a/kplayer/kplayerwidget.cpp +++ b/kplayer/kplayerwidget.cpp @@ -15,8 +15,8 @@ #include #include -#include -#include +#include +#include #ifdef DEBUG #define DEBUG_KPLAYER_WIDGET @@ -57,18 +57,18 @@ void KPlayerWidgetUnmapHandler (uint wid) kPlayerWidget() -> unmapHandler (wid); } -KPlayerWidget::KPlayerWidget (QWidget *parent, const char *name) - : QWidget (parent, name) +KPlayerWidget::KPlayerWidget (TQWidget *parent, const char *name) + : TQWidget (parent, name) { #ifdef DEBUG_KPLAYER_WIDGET kdDebugTime() << "Creating widget\n"; #endif connect (kPlayerProcess(), SIGNAL (stateChanged (KPlayerProcess::State, KPlayerProcess::State)), SLOT (playerStateChanged (KPlayerProcess::State, KPlayerProcess::State))); - QWhatsThis::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 (QWidget::NoFocus); + 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); - setEraseColor (QColor (0, 0, 0)); - setMinimumSize (QSize (0, 0)); + setEraseColor (TQColor (0, 0, 0)); + setMinimumSize (TQSize (0, 0)); KPlayerSetX11EventFilter(); } @@ -115,20 +115,20 @@ void KPlayerWidget::unmapHandler (uint wid) } } -void KPlayerWidget::showEvent (QShowEvent* event) +void KPlayerWidget::showEvent (TQShowEvent* event) { - QWidget::showEvent (event); + TQWidget::showEvent (event); //if ( kPlayerProcess() -> is09Version() ) sendConfigureEvent(); } -void KPlayerWidget::resizeEvent (QResizeEvent* event) +void KPlayerWidget::resizeEvent (TQResizeEvent* event) { #ifdef DEBUG_KPLAYER_WIDGET kdDebugTime() << "Widget " << event -> oldSize().width() << "x" << event -> oldSize().height() << " => " << event -> size().width() << "x" << event -> size().height() << "\n"; #endif - QWidget::resizeEvent (event); + TQWidget::resizeEvent (event); /*if ( kPlayerProcess() -> is09Version() ) { KPlayerX11UnmapWindow (winId()); @@ -146,73 +146,73 @@ void KPlayerWidget::resizeEvent (QResizeEvent* event) #endif } -void KPlayerWidget::mouseMoveEvent (QMouseEvent* event) +void KPlayerWidget::mouseMoveEvent (TQMouseEvent* event) { - QWidget::mouseMoveEvent (event); + TQWidget::mouseMoveEvent (event); event -> ignore(); } -void KPlayerWidget::mousePressEvent (QMouseEvent* event) +void KPlayerWidget::mousePressEvent (TQMouseEvent* event) { #ifdef DEBUG_KPLAYER_WIDGET kdDebugTime() << "KPlayerWidget mouse press event\n"; #endif - QWidget::mousePressEvent (event); + TQWidget::mousePressEvent (event); event -> ignore(); } -void KPlayerWidget::mouseReleaseEvent (QMouseEvent* event) +void KPlayerWidget::mouseReleaseEvent (TQMouseEvent* event) { #ifdef DEBUG_KPLAYER_WIDGET kdDebugTime() << "KPlayerWidget mouse release event\n"; #endif - QWidget::mouseReleaseEvent (event); + TQWidget::mouseReleaseEvent (event); event -> ignore(); } -void KPlayerWidget::mouseDoubleClickEvent (QMouseEvent* event) +void KPlayerWidget::mouseDoubleClickEvent (TQMouseEvent* event) { #ifdef DEBUG_KPLAYER_WIDGET kdDebugTime() << "KPlayerWidget mouse double click\n"; #endif - QWidget::mouseDoubleClickEvent (event); + TQWidget::mouseDoubleClickEvent (event); event -> ignore(); } -void KPlayerWidget::contextMenuEvent (QContextMenuEvent* event) +void KPlayerWidget::contextMenuEvent (TQContextMenuEvent* event) { #ifdef DEBUG_KPLAYER_WIDGET kdDebugTime() << "KPlayerWidget context menu event\n"; #endif - QWidget::contextMenuEvent (event); + TQWidget::contextMenuEvent (event); event -> ignore(); } -void KPlayerWidget::wheelEvent (QWheelEvent* event) +void KPlayerWidget::wheelEvent (TQWheelEvent* event) { #ifdef DEBUG_KPLAYER_WIDGET kdDebugTime() << "Widget wheel event: delta " << event -> delta() << " position " << event -> x() << "x" << event -> y() << " global " << event -> globalX() << "x" << event -> globalY() << " state " << event -> state() << " orientation " << event -> orientation() << " accepted " << event -> isAccepted() << " spontaneous " << event -> spontaneous() << "\n"; #endif - QWidget::wheelEvent (event); + TQWidget::wheelEvent (event); event -> ignore(); } -void KPlayerWidget::focusInEvent (QFocusEvent* event) +void KPlayerWidget::focusInEvent (TQFocusEvent* event) { #ifdef DEBUG_KPLAYER_WIDGET kdDebugTime() << "Widget focus in event\n"; #endif - QWidget::focusInEvent (event); + TQWidget::focusInEvent (event); } -void KPlayerWidget::focusOutEvent (QFocusEvent* event) +void KPlayerWidget::focusOutEvent (TQFocusEvent* event) { #ifdef DEBUG_KPLAYER_WIDGET kdDebugTime() << "Widget focus out event\n"; #endif - QWidget::focusOutEvent (event); + TQWidget::focusOutEvent (event); } void KPlayerWidget::playerStateChanged (KPlayerProcess::State state, KPlayerProcess::State) @@ -230,8 +230,8 @@ void KPlayerWidget::playerStateChanged (KPlayerProcess::State state, KPlayerProc sendConfigureEvent(); } -KPlayerWorkspace::KPlayerWorkspace (QWidget* parent, const char* name) - : QWidget (parent, name), m_timer (this) +KPlayerWorkspace::KPlayerWorkspace (TQWidget* parent, const char* name) + : TQWidget (parent, name), m_timer (this) { #ifdef DEBUG_KPLAYER_WORKSPACE kdDebugTime() << "Creating workspace\n"; @@ -241,22 +241,22 @@ KPlayerWorkspace::KPlayerWorkspace (QWidget* parent, const char* name) 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())); - QWhatsThis::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 (QColor (0, 0, 0)); - setMinimumSize (QSize (0, 0)); - setFocusPolicy (QWidget::StrongFocus); - QWidget* proxy = new QWidget (parent); - proxy -> setEraseColor (QColor (0, 0, 0)); - proxy -> setFocusPolicy (QWidget::StrongFocus); + 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)); + setFocusPolicy (TQWidget::StrongFocus); + TQWidget* proxy = new TQWidget (parent); + proxy -> setEraseColor (TQColor (0, 0, 0)); + proxy -> setFocusPolicy (TQWidget::StrongFocus); proxy -> setGeometry (-4, -4, 1, 1); proxy -> lower(); proxy -> show(); setFocusProxy (proxy); - m_hidden_widget = new QWidget (this); + m_hidden_widget = new TQWidget (this); m_hidden_widget -> setGeometry (-10, -10, 5, 5); } -void KPlayerWorkspace::setDisplaySize (QSize size) +void KPlayerWorkspace::setDisplaySize (TQSize size) { #ifdef DEBUG_KPLAYER_WORKSPACE kdDebugTime() << "Workspace::setDisplaySize (" << size.width() << "x" << size.height() << ")\n"; @@ -272,17 +272,17 @@ void KPlayerWorkspace::resizeHandler (bool resizing) return; m_resizing = resizing; if ( ! resizing ) - QTimer::singleShot (0, this, SIGNAL(userResize())); + TQTimer::singleShot (0, this, SIGNAL(userResize())); } -void KPlayerWorkspace::resizeEvent (QResizeEvent* event) +void KPlayerWorkspace::resizeEvent (TQResizeEvent* event) { static bool recursion = false; #ifdef DEBUG_KPLAYER_WORKSPACE kdDebugTime() << "WSpace " << event -> oldSize(). width() << "x" << event -> oldSize(). height() << " => " << event -> size(). width() << "x" << event -> size(). height() << "\n"; #endif - QWidget::resizeEvent (event); + TQWidget::resizeEvent (event); if ( ! recursion && ! m_resizing ) { recursion = true; @@ -291,13 +291,13 @@ void KPlayerWorkspace::resizeEvent (QResizeEvent* event) } } -void KPlayerWorkspace::mouseMoveEvent (QMouseEvent* event) +void KPlayerWorkspace::mouseMoveEvent (TQMouseEvent* event) { - QWidget::mouseMoveEvent (event); + TQWidget::mouseMoveEvent (event); mouseActivity(); } -void KPlayerWorkspace::contextMenuEvent (QContextMenuEvent* event) +void KPlayerWorkspace::contextMenuEvent (TQContextMenuEvent* event) { #ifdef DEBUG_KPLAYER_WORKSPACE kdDebugTime() << "KPlayerWorkspace context menu\n"; @@ -306,13 +306,13 @@ void KPlayerWorkspace::contextMenuEvent (QContextMenuEvent* event) event -> accept(); } -void KPlayerWorkspace::mousePressEvent (QMouseEvent* event) +void KPlayerWorkspace::mousePressEvent (TQMouseEvent* event) { #ifdef DEBUG_KPLAYER_WIDGET kdDebugTime() << "KPlayerWorkspace mouse press event\n"; #endif - QWidget::mousePressEvent (event); - if ( kPlayerEngine() -> light() && event -> button() == Qt::RightButton ) + TQWidget::mousePressEvent (event); + if ( kPlayerEngine() -> light() && event -> button() == TQt::RightButton ) { emit contextMenu (event -> globalPos()); event -> accept(); @@ -322,35 +322,35 @@ void KPlayerWorkspace::mousePressEvent (QMouseEvent* event) mouseActivity(); } -void KPlayerWorkspace::mouseReleaseEvent (QMouseEvent* event) +void KPlayerWorkspace::mouseReleaseEvent (TQMouseEvent* event) { #ifdef DEBUG_KPLAYER_WIDGET kdDebugTime() << "KPlayerWorkspace mouse release event\n"; #endif - QWidget::mouseReleaseEvent (event); + TQWidget::mouseReleaseEvent (event); event -> ignore(); mouseActivity(); } -void KPlayerWorkspace::mouseDoubleClickEvent (QMouseEvent* event) +void KPlayerWorkspace::mouseDoubleClickEvent (TQMouseEvent* event) { #ifdef DEBUG_KPLAYER_WORKSPACE kdDebugTime() << "KPlayerWorkspace mouse double click\n"; #endif - QWidget::mouseDoubleClickEvent (event); + TQWidget::mouseDoubleClickEvent (event); kPlayerEngine() -> doubleClick(); event -> accept(); mouseActivity(); } -void KPlayerWorkspace::wheelEvent (QWheelEvent* event) +void KPlayerWorkspace::wheelEvent (TQWheelEvent* event) { #ifdef DEBUG_KPLAYER_WORKSPACE kdDebugTime() << "Workspace wheel event: delta " << event -> delta() << " position " << event -> x() << "x" << event -> y() << " global " << event -> globalX() << "x" << event -> globalY() << " state " << event -> state() << " orientation " << event -> orientation() << " accepted " << event -> isAccepted() << " spontaneous " << event -> spontaneous() << "\n"; #endif - QWidget::wheelEvent (event); + TQWidget::wheelEvent (event); kPlayerEngine() -> wheel (event -> delta(), event -> state()); event -> accept(); mouseActivity(); @@ -358,7 +358,7 @@ void KPlayerWorkspace::wheelEvent (QWheelEvent* event) void KPlayerWorkspace::windowActivationChange (bool old) { - QWidget::windowActivationChange (old); + TQWidget::windowActivationChange (old); bool active = isActiveWindow(); #ifdef DEBUG_KPLAYER_WORKSPACE kdDebugTime() << "Workspace activation " << old << " -> " << active << "\n"; @@ -371,20 +371,20 @@ void KPlayerWorkspace::windowActivationChange (bool old) #endif } -void KPlayerWorkspace::focusInEvent (QFocusEvent* event) +void KPlayerWorkspace::focusInEvent (TQFocusEvent* event) { #ifdef DEBUG_KPLAYER_WORKSPACE kdDebugTime() << "Workspace focus in event\n"; #endif - QWidget::focusInEvent (event); + TQWidget::focusInEvent (event); } -void KPlayerWorkspace::focusOutEvent (QFocusEvent* event) +void KPlayerWorkspace::focusOutEvent (TQFocusEvent* event) { #ifdef DEBUG_KPLAYER_WORKSPACE kdDebugTime() << "Workspace focus out event\n"; #endif - QWidget::focusOutEvent (event); + TQWidget::focusOutEvent (event); } void KPlayerWorkspace::mouseActivity (void) diff --git a/kplayer/kplayerwidget.h b/kplayer/kplayerwidget.h index 7d26255..e4d0408 100644 --- a/kplayer/kplayerwidget.h +++ b/kplayer/kplayerwidget.h @@ -16,22 +16,22 @@ #ifndef KPLAYERWIDGET_H #define KPLAYERWIDGET_H -#include -#include +#include +#include #include "kplayerprocess.h" /** The KPlayer widget where mplayer video output is displayed. *@author kiriuja */ -class KPlayerWidget : public QWidget +class KPlayerWidget : public TQWidget { Q_OBJECT public: /** The widget constructor. Initializes internal data structures. - Parameters are passed to the QWidget constructor. */ - KPlayerWidget (QWidget* parent = 0, const char* name = 0); + Parameters are passed to the TQWidget constructor. */ + KPlayerWidget (TQWidget* parent = 0, const char* name = 0); /** The widget destructor. Frees allocated memory. */ virtual ~KPlayerWidget(); @@ -43,24 +43,24 @@ public: protected: /** Processes the widget resize event. Ensures that MPlayer continues to display video. Emits resized signal. */ - virtual void resizeEvent (QResizeEvent*); + virtual void resizeEvent (TQResizeEvent*); /** Processes the widget show event. Ensures that MPlayer continues to display video with correct size. */ - virtual void showEvent (QShowEvent*); + virtual void showEvent (TQShowEvent*); /** Ignores a mouse move event. */ - virtual void mouseMoveEvent (QMouseEvent*); + virtual void mouseMoveEvent (TQMouseEvent*); /** Ignores a mouse press event. */ - virtual void mousePressEvent (QMouseEvent*); + virtual void mousePressEvent (TQMouseEvent*); /** Ignores a mouse release event. */ - virtual void mouseReleaseEvent (QMouseEvent*); + virtual void mouseReleaseEvent (TQMouseEvent*); /** Ignores a mouse double click event. */ - virtual void mouseDoubleClickEvent (QMouseEvent*); + virtual void mouseDoubleClickEvent (TQMouseEvent*); /** Ignores a context menu event. */ - virtual void contextMenuEvent (QContextMenuEvent*); + virtual void contextMenuEvent (TQContextMenuEvent*); /** Ignores a wheel event. */ - virtual void wheelEvent (QWheelEvent*); - virtual void focusInEvent (QFocusEvent*); - virtual void focusOutEvent (QFocusEvent*); + virtual void wheelEvent (TQWheelEvent*); + virtual void focusInEvent (TQFocusEvent*); + virtual void focusOutEvent (TQFocusEvent*); protected slots: /** Receives the stateChanged signal from KPlayerProcess. */ @@ -70,25 +70,25 @@ protected slots: /** The KPlayer workspace that contains the video widget. *@author kiriuja */ -class KPlayerWorkspace : public QWidget +class KPlayerWorkspace : public TQWidget { Q_OBJECT public: /** The workspace constructor. Creates the KPlayerWidget. - Parameters are passed to the QWidget constructor. */ - KPlayerWorkspace (QWidget* parent = 0, const char* name = 0); + Parameters are passed to the TQWidget constructor. */ + KPlayerWorkspace (TQWidget* parent = 0, const char* name = 0); /** Returns a pointer to the KPlayerWidget object. */ KPlayerWidget* widget (void) const { return m_widget; } /** Returns a pointer to the hidden widget object. */ - QWidget* hiddenWidget (void) const + TQWidget* hiddenWidget (void) const { return m_hidden_widget; } /** Resizes the widget to the given size. */ - void setDisplaySize (QSize); + void setDisplaySize (TQSize); /** Handles resizing done by the window manager. * @param resizing true if resizing has started, false if resizing has completed @@ -101,22 +101,22 @@ public: protected: /** Processes the widget resize event. Resizes the KPlayerWidget to the video size. */ - virtual void resizeEvent (QResizeEvent*); + virtual void resizeEvent (TQResizeEvent*); /** Shows mouse cursor and starts timer. */ - virtual void mouseMoveEvent (QMouseEvent*); + virtual void mouseMoveEvent (TQMouseEvent*); /** Emits context menu signal on a right click in a part. */ - virtual void mousePressEvent (QMouseEvent*); + virtual void mousePressEvent (TQMouseEvent*); /** Ignores a mouse release event. */ - virtual void mouseReleaseEvent (QMouseEvent*); + virtual void mouseReleaseEvent (TQMouseEvent*); /** Processes mouse double click event. Sends a doubleClick signal to the engine. */ - virtual void mouseDoubleClickEvent (QMouseEvent*); + virtual void mouseDoubleClickEvent (TQMouseEvent*); /** Processes the wheel event. Sends a wheelZoom signal to the engine. */ - virtual void wheelEvent (QWheelEvent*); + virtual void wheelEvent (TQWheelEvent*); /** Emits the contextMenu signal. */ - virtual void contextMenuEvent (QContextMenuEvent*); + virtual void contextMenuEvent (TQContextMenuEvent*); virtual void windowActivationChange (bool); - virtual void focusInEvent (QFocusEvent*); - virtual void focusOutEvent (QFocusEvent*); + virtual void focusInEvent (TQFocusEvent*); + virtual void focusOutEvent (TQFocusEvent*); /** Starts timer and sets the cursor. */ void mouseActivity (void); @@ -127,7 +127,7 @@ protected: KPlayerWidget* m_widget; /** The pointer to the hidden widget object. */ - QWidget* m_hidden_widget; + TQWidget* m_hidden_widget; // Following should be private /** Window manager is resizing the top level window. */ @@ -135,7 +135,7 @@ protected: /** Mouse activity indicator. */ bool m_mouse_activity; /** Mouse activity timer. */ - QTimer m_timer; + TQTimer m_timer; signals: /** Emitted when the widget is resized. */ @@ -143,7 +143,7 @@ signals: /** Emitted when the widget is resized by the user. */ void userResize (void); /** Emitted when the context menu event is received. */ - void contextMenu (const QPoint& global_position); + void contextMenu (const TQPoint& global_position); protected slots: /** Set the mouse cursor and tracking. */ diff --git a/kplayer/x11.cpp b/kplayer/x11.cpp index 63e4719..8bb92ec 100644 --- a/kplayer/x11.cpp +++ b/kplayer/x11.cpp @@ -313,31 +313,31 @@ int KPlayerX11EventFilter (XEvent* event) return 0; } -Display* qt_xdisplay (void); -extern Time qt_x_time; +Display* tqt_xdisplay (void); +extern Time tqt_x_time; void KPlayerX11SetInputFocus (uint id) { - XSetInputFocus (qt_xdisplay(), id, RevertToNone, qt_x_time); - XFlush (qt_xdisplay()); + XSetInputFocus (tqt_xdisplay(), id, RevertToNone, tqt_x_time); + XFlush (tqt_xdisplay()); } void KPlayerX11MapWindow (uint id) { - XMapWindow (qt_xdisplay(), id); - XFlush (qt_xdisplay()); + XMapWindow (tqt_xdisplay(), id); + XFlush (tqt_xdisplay()); } void KPlayerX11UnmapWindow (uint id) { - XUnmapWindow (qt_xdisplay(), id); - XFlush (qt_xdisplay()); + XUnmapWindow (tqt_xdisplay(), id); + XFlush (tqt_xdisplay()); } void KPlayerX11ClearExposeWindow (uint id) { - XClearArea (qt_xdisplay(), id, 0, 0, 0, 0, True); - XFlush (qt_xdisplay()); + XClearArea (tqt_xdisplay(), id, 0, 0, 0, 0, True); + XFlush (tqt_xdisplay()); } void KPlayerX11SendConfigureEvent (uint id, int w, int h) @@ -345,9 +345,9 @@ void KPlayerX11SendConfigureEvent (uint id, int w, int h) #ifdef DEBUG_KPLAYER_RESIZE kdDebugTime() << "KPlayerX11SendConfigureEvent " << id << " " << w << "x" << h << "\n"; #endif - XConfigureEvent event = { ConfigureNotify, 0, True, qt_xdisplay(), id, id, 0, 0, w, h, 0, None, False }; - XSendEvent (qt_xdisplay(), event.event, True, StructureNotifyMask, (XEvent*) &event); - XFlush (qt_xdisplay()); + XConfigureEvent event = { ConfigureNotify, 0, True, tqt_xdisplay(), id, id, 0, 0, w, h, 0, None, False }; + XSendEvent (tqt_xdisplay(), event.event, True, StructureNotifyMask, (XEvent*) &event); + XFlush (tqt_xdisplay()); } void KPlayerX11SendConfigureEvent (uint id, int x, int y, int w, int h) @@ -355,15 +355,15 @@ void KPlayerX11SendConfigureEvent (uint id, int x, int y, int w, int h) #ifdef DEBUG_KPLAYER_RESIZE kdDebugTime() << "KPlayerX11SendConfigureEvent " << id << " " << x << "x" << y << " " << w << "x" << h << "\n"; #endif - XConfigureEvent event = { ConfigureNotify, 0, True, qt_xdisplay(), id, id, x, y, w, h, 0, None, False }; - XSendEvent (qt_xdisplay(), event.event, True, StructureNotifyMask, (XEvent*) &event); - XFlush (qt_xdisplay()); + XConfigureEvent event = { ConfigureNotify, 0, True, tqt_xdisplay(), id, id, x, y, w, h, 0, None, False }; + XSendEvent (tqt_xdisplay(), event.event, True, StructureNotifyMask, (XEvent*) &event); + XFlush (tqt_xdisplay()); } void KPlayerX11DiscardConfigureEvents (uint id) { XEvent event; - while ( XCheckTypedWindowEvent (qt_xdisplay(), id, ConfigureNotify, &event) ) + while ( XCheckTypedWindowEvent (tqt_xdisplay(), id, ConfigureNotify, &event) ) #ifdef DEBUG_KPLAYER_RESIZE kdDebugTime() << "Discarded ConfigureEvent " << event.xconfigure.event << " " << event.xconfigure.window << " " << event.xconfigure.send_event << " " << event.xconfigure.serial @@ -383,7 +383,7 @@ void KPlayerX11GetKeyboardMouseState (uint id) Window root, child; int root_x, root_y, win_x, win_y; uint state; - if ( XQueryPointer (qt_xdisplay(), id, &root, &child, &root_x, &root_y, &win_x, &win_y, &state) ) + if ( XQueryPointer (tqt_xdisplay(), id, &root, &child, &root_x, &root_y, &win_x, &win_y, &state) ) { #ifdef DEBUG_KPLAYER_KEY kdDebugTime() << " root " << root << " " << root_x << "x" << root_y << " child " << child @@ -393,21 +393,21 @@ void KPlayerX11GetKeyboardMouseState (uint id) } } -extern QX11EventFilter qt_set_x11_event_filter (QX11EventFilter); +extern QX11EventFilter tqt_set_x11_event_filter (QX11EventFilter); static int KPlayerX11EventFilterCount = 0; void KPlayerSetX11EventFilter (void) { if ( ! KPlayerX11EventFilterCount ++ ) - PreviousX11EventFilter = qt_set_x11_event_filter (KPlayerX11EventFilter); + PreviousX11EventFilter = tqt_set_x11_event_filter (KPlayerX11EventFilter); } void KPlayerResetX11EventFilter (void) { if ( -- KPlayerX11EventFilterCount ) return; - qt_set_x11_event_filter (PreviousX11EventFilter); + tqt_set_x11_event_filter (PreviousX11EventFilter); PreviousX11EventFilter = 0; }