From e3fd6cf415c0b22b7ad86f8137c2dd71d6f6f917 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 6 Mar 2026 11:58:29 +0900 Subject: Remove use of KDE_IS_VERSION Signed-off-by: Michele Calgaro --- src/kmplayer.h | 4 ---- src/kmplayerapp.cpp | 6 ------ src/kmplayerprocess.cpp | 22 ---------------------- src/kmplayervdr.cpp | 4 ---- src/kmplayervdr.h | 2 -- src/kmplayerview.cpp | 2 -- src/pref.cpp | 9 --------- 7 files changed, 49 deletions(-) diff --git a/src/kmplayer.h b/src/kmplayer.h index b03928c..d997697 100644 --- a/src/kmplayer.h +++ b/src/kmplayer.h @@ -161,11 +161,7 @@ private: TDEAction * editVolumeDec; TDEAction * toggleView; TDEAction * viewSyncEditMode; -#if KDE_IS_VERSION(3,1,90) TDEToggleAction * viewFullscreen; -#else - TDEAction * viewFullscreen; -#endif TDEToggleAction * viewEditMode; TDEToggleAction * viewToolBar; TDEToggleAction * viewStatusBar; diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp index 1c48f90..b3b1ef9 100644 --- a/src/kmplayerapp.cpp +++ b/src/kmplayerapp.cpp @@ -604,11 +604,7 @@ TDE_NO_EXPORT void KMPlayerApp::initActions () { new TDEAction (i18n ("Show Popup Menu"), TDEShortcut (), m_view->controlPanel (), TQ_SLOT (showPopupMenu ()), ac, "view_show_popup_menu"); new TDEAction (i18n ("Show Language Menu"), TDEShortcut (TQt::Key_L), m_view->controlPanel (), TQ_SLOT (showLanguageMenu ()), ac, "view_show_lang_menu"); viewKeepRatio = new TDEToggleAction (i18n ("&Keep Width/Height Ratio"), 0, this, TQ_SLOT (keepSizeRatio ()), ac, "view_keep_ratio"); -#if KDE_IS_VERSION(3,1,90) viewFullscreen = KStdAction::fullScreen (this, TQ_SLOT(fullScreen ()), ac, 0, "view_fullscreen"); -#else - viewFullscreen = new TDEAction (i18n("&Full Screen"), 0, 0, this, TQ_SLOT(fullScreen ()), ac, "view_fullscreen"); -#endif /*TDEAction *playact =*/ new TDEAction (i18n ("P&lay"), TQString ("media-playback-start"), TDEShortcut (), m_player, TQ_SLOT (play ()), ac, "play"); /*TDEAction *pauseact =*/ new TDEAction (i18n ("&Pause"), TQString ("media-playback-pause"), TDEShortcut (), m_player, TQ_SLOT (pause ()), ac, "pause"); /*TDEAction *stopact =*/ new TDEAction (i18n ("&Stop"), TQString ("media-playback-stop"), TDEShortcut (), m_player, TQ_SLOT (stop ()), ac, "stop"); @@ -1503,9 +1499,7 @@ TDE_NO_EXPORT void KMPlayerApp::slotStatusMsg (const TQString &text) { TDE_NO_EXPORT void KMPlayerApp::fullScreen () { if (sender()->inherits("TDEAction")) m_view->fullScreen(); -#if KDE_IS_VERSION(3,1,90) viewFullscreen->setChecked (m_view->isFullScreen ()); -#endif if (m_view->isFullScreen()) hide (); else { diff --git a/src/kmplayerprocess.cpp b/src/kmplayerprocess.cpp index 230bc73..1439b84 100644 --- a/src/kmplayerprocess.cpp +++ b/src/kmplayerprocess.cpp @@ -208,16 +208,12 @@ bool Process::play (Source * src, NodePtr _mrl) { TQString url = m ? m->absolutePath () : TQString (); bool changed = m_url != url; m_url = url; -#if KDE_IS_VERSION(3,3,91) if (!changed || KURL (m_url).isLocalFile ()) return deMediafiedPlay (); m_url = url; m_job = TDEIO::stat (m_url, false); connect(m_job, TQ_SIGNAL (result(TDEIO::Job *)), this, TQ_SLOT(result(TDEIO::Job *))); return true; -#else - return deMediafiedPlay (); -#endif } bool Process::deMediafiedPlay () { @@ -225,7 +221,6 @@ bool Process::deMediafiedPlay () { } void Process::result (TDEIO::Job * job) { -#if KDE_IS_VERSION(3,3,91) TDEIO::UDSEntry entry = static_cast (job)->statResult (); TDEIO::UDSEntry::iterator e = entry.end (); for (TDEIO::UDSEntry::iterator it = entry.begin (); it != e; ++it) @@ -235,7 +230,6 @@ void Process::result (TDEIO::Job * job) { } m_job = 0L; deMediafiedPlay (); -#endif } void Process::terminateJobs () { @@ -316,15 +310,7 @@ TDE_NO_EXPORT bool MPlayerBase::quit () { ::kill (-1 * ::getpid (), SIGTERM); signal(SIGTERM, oldhandler); } -#if KDE_IS_VERSION(3, 1, 90) m_process->wait(2); -#else - TQTime t; - t.start (); - do { - TDEProcessController::theTDEProcessController->waitForProcessExit (2); - } while (t.elapsed () < 2000 && m_process->isRunning ()); -#endif if (m_process->isRunning ()) Process::quit (); processStopped (0L); @@ -1343,15 +1329,7 @@ bool CallbackProcess::quit () { m_backend->quit (); else if (viewer ()) viewer ()->sendKeyEvent ('q'); -#if KDE_IS_VERSION(3, 1, 90) m_process->wait(1); -#else - TQTime t; - t.start (); - do { - TDEProcessController::theTDEProcessController->waitForProcessExit (2); - } while (t.elapsed () < 1000 && m_process->isRunning ()); -#endif } return Process::quit (); } diff --git a/src/kmplayervdr.cpp b/src/kmplayervdr.cpp index 0a57e0a..0ad2b59 100644 --- a/src/kmplayervdr.cpp +++ b/src/kmplayervdr.cpp @@ -53,9 +53,7 @@ #include #include #include -#if KDE_IS_VERSION(3, 1, 90) #include -#endif #include "kmplayer_backend_stub.h" #include "kmplayer_callback.h" @@ -490,11 +488,9 @@ TDE_NO_EXPORT void KMPlayerVDRSource::sendCommand () { } TDE_NO_EXPORT void KMPlayerVDRSource::customCmd () { -#if KDE_IS_VERSION(3, 1, 90) TQString cmd = KInputDialog::getText (i18n ("Custom VDR command"), i18n ("You can pass commands to VDR.\nEnter 'HELP' to see a list of available commands.\nYou can see VDR response in the console window.\n\nVDR Command:"), TQString(), 0, m_player->view ()); if (!cmd.isEmpty ()) queueCommand (TQString (cmd + TQChar ('\n')).local8Bit ()); -#endif } TDE_NO_EXPORT void KMPlayerVDRSource::timerEvent (TQTimerEvent * e) { diff --git a/src/kmplayervdr.h b/src/kmplayervdr.h index dd49eb5..7609b0a 100644 --- a/src/kmplayervdr.h +++ b/src/kmplayervdr.h @@ -132,9 +132,7 @@ private: act_setup, act_channels, act_menu, act_red, act_green, act_yellow, act_blue, act_0, act_1, act_2, act_3, act_4, act_5, act_6, act_7, act_8, act_9, -#if KDE_IS_VERSION(3, 1, 90) act_custom, -#endif act_last }; void queueCommand (const char * cmd); diff --git a/src/kmplayerview.cpp b/src/kmplayerview.cpp index ed9b5f6..03dc11d 100644 --- a/src/kmplayerview.cpp +++ b/src/kmplayerview.cpp @@ -198,9 +198,7 @@ TDE_NO_EXPORT void View::init (TDEActionCollection * action_collection) { m_status_bar->setMaximumSize (2500, sbsize.height ()); m_viewer = new Viewer (m_widgetstack, this); m_widgettypes [WT_Video] = m_viewer; -#if KDE_IS_VERSION(3,1,90) setVideoWidget (m_view_area); -#endif m_multiedit = new TextEdit (m_widgetstack, this); m_multiedit->setTextFormat (TQt::PlainText); diff --git a/src/pref.cpp b/src/pref.cpp index 4e28e3a..22592a1 100644 --- a/src/pref.cpp +++ b/src/pref.cpp @@ -504,13 +504,8 @@ TDE_NO_EXPORT void PrefRecordPage::playingStopped () { if (!url->lineEdit()->text().isEmpty()) { m_player->settings ()->recordfile = url->lineEdit()->text(); m_player->settings ()->replaytime = replaytime->text ().toInt (); -#if KDE_IS_VERSION(3,1,90) int id = recorder->selectedId (); int replayid = replay->selectedId (); -#else - int id = recorder->id (recorder->selected ()); - int replayid = replay->id (replay->selectedId ()); -#endif m_player->settings ()->recorder = Settings::Recorder (id); m_player->settings ()->replayoption = Settings::ReplayOption (replayid); for (RecorderPage * p = m_recorders; p; p = p->next) @@ -561,11 +556,7 @@ TDE_NO_EXPORT void PrefMEncoderPage::formatClicked (int id) { } TDE_NO_EXPORT void PrefMEncoderPage::record () { -#if KDE_IS_VERSION(3,1,90) m_player->settings ()->recordcopy = !format->selectedId (); -#else - m_player->settings ()->recordcopy = !format->id (format->selected ()); -#endif m_player->settings ()->mencoderarguments = arguments->text (); RecorderPage::record (); } -- cgit v1.2.3