From c1a8ab88def2e7ffb3e6d7e2111eb7cfd95f8df5 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 10 Mar 2026 17:26:03 +0900 Subject: Remove use of TDE_VERSION Signed-off-by: Michele Calgaro --- bibletime/bibletime.cpp | 5 - bibletime/bibletime_init.cpp | 134 --------------------- bibletime/frontend/cbtconfig.cpp | 5 - bibletime/frontend/display/chtmlreaddisplay.cpp | 16 --- .../frontend/displaywindow/cbookreadwindow.cpp | 5 - .../frontend/displaywindow/cdisplaywindow.cpp | 8 -- .../frontend/displaywindow/clexiconreadwindow.cpp | 8 -- 7 files changed, 181 deletions(-) diff --git a/bibletime/bibletime.cpp b/bibletime/bibletime.cpp index f03c0e3..322cb32 100644 --- a/bibletime/bibletime.cpp +++ b/bibletime/bibletime.cpp @@ -40,7 +40,6 @@ #include //TDE includes -#include #include #include #include @@ -55,11 +54,7 @@ using namespace Profile; BibleTime::BibleTime() : BibleTimeInterface("BibleTimeInterface"), -#if TDE_VERSION >= 0x030200 TDEMainWindow(TDEMainWindow::NoDCOPObject, 0,0, WType_TopLevel), -#else -TDEMainWindow(0,0, WType_TopLevel), -#endif m_windowActionCollection(0), m_initialized(false), m_moduleList(0), diff --git a/bibletime/bibletime_init.cpp b/bibletime/bibletime_init.cpp index 1f032bf..6b5f6cb 100644 --- a/bibletime/bibletime_init.cpp +++ b/bibletime/bibletime_init.cpp @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include @@ -62,7 +61,6 @@ #include #include #include -#include //Sword includes #include @@ -107,11 +105,6 @@ void BibleTime::initActions() { action = KStdAction::quit(tdeApp, TQ_SLOT( quit() ), actionCollection()); action->setToolTip( CResMgr::mainMenu::file::quit::tooltip ); - #if TDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - action = new TDEAction(i18n("Search in &open work(s)"), CResMgr::mainMenu::mainIndex::search::icon, CResMgr::mainMenu::mainIndex::search::accel, @@ -120,11 +113,6 @@ void BibleTime::initActions() { ); action->setToolTip( CResMgr::mainMenu::mainIndex::search::tooltip ); - #if TDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - action = new TDEAction(i18n("Search in standard &Bible"), CResMgr::mainMenu::mainIndex::searchdefaultbible::icon, CResMgr::mainMenu::mainIndex::searchdefaultbible::accel, @@ -133,20 +121,9 @@ void BibleTime::initActions() { ); action->setToolTip( CResMgr::mainMenu::mainIndex::searchdefaultbible::tooltip ); - #if TDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - m_viewToolbar_action = KStdAction::showToolbar(this, TQ_SLOT( slotToggleToolbar() ), actionCollection()); m_viewToolbar_action->setToolTip( CResMgr::mainMenu::view::showToolBar::tooltip ); - #if TDE_VERSION_MINOR < 1 - - m_viewToolbar_action->plugAccel( accel() ); - #endif - - m_viewMainIndex_action = new TDEToggleAction(i18n("&Show bookshelf"), CResMgr::mainMenu::view::showMainIndex::icon, CResMgr::mainMenu::view::showMainIndex::accel, @@ -154,11 +131,6 @@ void BibleTime::initActions() { CResMgr::mainMenu::view::showMainIndex::actionName); m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showMainIndex::tooltip ); - #if TDE_VERSION_MINOR < 1 - - m_viewMainIndex_action->plugAccel( accel() ); - #endif - m_viewInfoDisplay_action = new TDEToggleAction(i18n("Show &mag"), CResMgr::mainMenu::view::showInfoDisplay::icon, CResMgr::mainMenu::view::showInfoDisplay::accel, @@ -166,19 +138,9 @@ void BibleTime::initActions() { CResMgr::mainMenu::view::showInfoDisplay::actionName); m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showInfoDisplay::tooltip ); - #if TDE_VERSION_MINOR < 1 - - m_viewInfoDisplay_action->plugAccel( accel() ); - #endif - action = KStdAction::preferences(this, TQ_SLOT( slotSettingsOptions() ), actionCollection()); action->setToolTip( CResMgr::mainMenu::settings::optionsDialog::tooltip ); - #if TDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - action = new TDEAction(i18n("Bookshelf &Manager"), CResMgr::mainMenu::settings::swordSetupDialog::icon, CResMgr::mainMenu::settings::swordSetupDialog::accel, @@ -186,11 +148,6 @@ void BibleTime::initActions() { CResMgr::mainMenu::settings::swordSetupDialog::actionName ); action->setToolTip( CResMgr::mainMenu::settings::swordSetupDialog::tooltip ); - #if TDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - //delete help action if TDE created it if ( actionCollection()->action( KStdAction::stdName(KStdAction::ConfigureToolbars) )) { actionCollection()->remove @@ -200,11 +157,6 @@ void BibleTime::initActions() { } action = KStdAction::configureToolbars(this, TQ_SLOT( slotSettingsToolbar() ), actionCollection()); action->setToolTip( CResMgr::mainMenu::settings::editToolBar::tooltip ); - #if TDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - m_windowArrangementMode_action = new TDEActionMenu(i18n("&Arrangement mode"), CResMgr::mainMenu::window::arrangementMode::icon, actionCollection(), @@ -220,11 +172,6 @@ void BibleTime::initActions() { m_windowManualMode_action->setToolTip( CResMgr::mainMenu::window::arrangementMode::manual::tooltip ); - #if TDE_VERSION_MINOR < 1 - - m_windowManualMode_action->plugAccel( accel() ); - #endif - m_windowArrangementMode_action->insert( m_windowManualMode_action ); @@ -237,11 +184,6 @@ void BibleTime::initActions() { m_windowAutoTileVertical_action->setToolTip( CResMgr::mainMenu::window::arrangementMode::autoTileVertical::tooltip ); - #if TDE_VERSION_MINOR < 1 - - m_windowAutoTileVertical_action->plugAccel( accel() ); - #endif - m_windowArrangementMode_action->insert( m_windowAutoTileVertical_action ); @@ -254,11 +196,6 @@ void BibleTime::initActions() { m_windowAutoTileHorizontal_action->setToolTip( CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::tooltip ); - #if TDE_VERSION_MINOR < 1 - - m_windowAutoTileHorizontal_action->plugAccel( accel() ); - #endif - m_windowArrangementMode_action->insert( m_windowAutoTileHorizontal_action ); @@ -271,11 +208,6 @@ void BibleTime::initActions() { m_windowAutoCascade_action->setToolTip( CResMgr::mainMenu::window::arrangementMode::autoCascade::tooltip ); - #if TDE_VERSION_MINOR < 1 - // tqWarning("Plug accel"); - m_windowAutoCascade_action->plugAccel( accel() ); - #endif - m_windowArrangementMode_action->insert( m_windowAutoCascade_action ); m_windowCascade_action = new TDEAction(i18n("&Cascade"), @@ -286,12 +218,6 @@ void BibleTime::initActions() { ); m_windowCascade_action->setToolTip( CResMgr::mainMenu::window::cascade::tooltip ); - #if TDE_VERSION_MINOR < 1 - - m_windowCascade_action->plugAccel( accel() ); - #endif - - m_windowTileVertical_action = new TDEAction(i18n("Tile &vertically"), CResMgr::mainMenu::window::tileVertical::icon, CResMgr::mainMenu::window::tileVertical::accel, @@ -299,11 +225,6 @@ void BibleTime::initActions() { CResMgr::mainMenu::window::tileVertical::actionName ); m_windowTileVertical_action->setToolTip( CResMgr::mainMenu::window::tileVertical::tooltip ); - #if TDE_VERSION_MINOR < 1 - - m_windowTileVertical_action->plugAccel( accel() ); - #endif - m_windowTileHorizontal_action = new TDEAction(i18n("Tile &horizontally"), CResMgr::mainMenu::window::tileHorizontal::icon, CResMgr::mainMenu::window::tileHorizontal::accel, @@ -312,12 +233,6 @@ void BibleTime::initActions() { ); m_windowTileHorizontal_action->setToolTip( CResMgr::mainMenu::window::tileHorizontal::tooltip ); - #if TDE_VERSION_MINOR < 1 - - m_windowTileHorizontal_action->plugAccel( accel() ); - #endif - - m_windowCloseAll_action = new TDEAction(i18n("Cl&ose all"), CResMgr::mainMenu::window::closeAll::icon, CResMgr::mainMenu::window::closeAll::accel, @@ -325,11 +240,6 @@ void BibleTime::initActions() { CResMgr::mainMenu::window::closeAll::actionName ); m_windowCloseAll_action->setToolTip( CResMgr::mainMenu::window::closeAll::tooltip ); - #if TDE_VERSION_MINOR < 1 - - m_windowCloseAll_action->plugAccel( accel() ); - #endif - m_windowSaveProfile_action = new TDEActionMenu(i18n("&Save session"), CResMgr::mainMenu::window::saveProfile::icon, @@ -338,11 +248,6 @@ void BibleTime::initActions() { ); m_windowSaveProfile_action->setToolTip( CResMgr::mainMenu::window::saveProfile::tooltip ); m_windowSaveProfile_action->setDelayed( false ); - #if TDE_VERSION_MINOR < 1 - - m_windowSaveProfile_action->plugAccel( accel() ); - #endif - m_windowSaveToNewProfile_action = new TDEAction(i18n("Save as &new session"), CResMgr::mainMenu::window::saveToNewProfile::icon, @@ -351,11 +256,6 @@ void BibleTime::initActions() { CResMgr::mainMenu::window::saveToNewProfile::actionName ); m_windowSaveToNewProfile_action->setToolTip( CResMgr::mainMenu::window::saveToNewProfile::tooltip ); - #if TDE_VERSION_MINOR < 1 - - m_windowSaveToNewProfile_action->plugAccel( accel() ); - #endif - m_windowLoadProfile_action = new TDEActionMenu(i18n("&Load session"), CResMgr::mainMenu::window::loadProfile::icon, @@ -364,11 +264,6 @@ void BibleTime::initActions() { ); m_windowLoadProfile_action->setToolTip( CResMgr::mainMenu::window::loadProfile::tooltip ); m_windowLoadProfile_action->setDelayed( false ); - #if TDE_VERSION_MINOR < 1 - - m_windowLoadProfile_action->plugAccel( accel() ); - #endif - m_windowDeleteProfile_action = new TDEActionMenu(i18n("&Delete session"), CResMgr::mainMenu::window::deleteProfile::icon, actionCollection(), @@ -376,11 +271,6 @@ void BibleTime::initActions() { ); m_windowLoadProfile_action->setToolTip( CResMgr::mainMenu::window::deleteProfile::tooltip ); m_windowLoadProfile_action->setDelayed( false ); - #if TDE_VERSION_MINOR < 1 - - m_windowDeleteProfile_action->plugAccel( accel() ); - #endif - m_windowFullscreen_action = new TDEToggleAction(i18n("&Fullscreen mode"), CResMgr::mainMenu::window::showFullscreen::icon, CResMgr::mainMenu::window::showFullscreen::accel, @@ -389,10 +279,6 @@ void BibleTime::initActions() { ); m_windowFullscreen_action->setToolTip( CResMgr::mainMenu::window::showFullscreen::tooltip ); m_windowFullscreen_action->setShortcutConfigurable(true); - #if TDE_VERSION_MINOR < 1 - - m_windowFullscreen_action->plugAccel( accel() ); - #endif //connect the profile popups to the right slots TDEPopupMenu* loadPopup = m_windowLoadProfile_action->popupMenu(); @@ -418,11 +304,6 @@ void BibleTime::initActions() { ); action->setToolTip( CResMgr::mainMenu::help::handbook::tooltip ); - #if TDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - action = new TDEAction(i18n("&Bible Study Howto"), CResMgr::mainMenu::help::bibleStudyHowTo::icon, CResMgr::mainMenu::help::bibleStudyHowTo::accel, @@ -431,11 +312,6 @@ void BibleTime::initActions() { ); action->setToolTip( CResMgr::mainMenu::help::bibleStudyHowTo::tooltip ); - #if TDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - if ( actionCollection()->action( KStdAction::stdName( KStdAction::WhatsThis ) ) ) { //delete "What's this" action if TDE created it already TDEAction* action = actionCollection()->action(KStdAction::stdName( KStdAction::WhatsThis )); actionCollection()->remove @@ -449,11 +325,6 @@ void BibleTime::initActions() { } action = KStdAction::reportBug(m_helpMenu, TQ_SLOT(reportBug()), actionCollection()); action->setToolTip(CResMgr::mainMenu::help::bugreport::tooltip); - #if TDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - action = new TDEAction(i18n("&Daily tip"), CResMgr::mainMenu::help::dailyTip::icon, CResMgr::mainMenu::help::dailyTip::accel, @@ -461,11 +332,6 @@ void BibleTime::initActions() { CResMgr::mainMenu::help::dailyTip::actionName ); action->setToolTip(CResMgr::mainMenu::help::dailyTip::tooltip); - #if TDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - if ( actionCollection()->action( KStdAction::stdName( KStdAction::AboutApp ) ) ) { //delete About TDE action if TDE created it actionCollection()->remove (actionCollection()->action(KStdAction::stdName( KStdAction::AboutApp ))); diff --git a/bibletime/frontend/cbtconfig.cpp b/bibletime/frontend/cbtconfig.cpp index db723d9..fc9c467 100644 --- a/bibletime/frontend/cbtconfig.cpp +++ b/bibletime/frontend/cbtconfig.cpp @@ -25,13 +25,8 @@ #include //TDE includes -#include #include -#if TDE_VERSION >= 0x030200 #include -#else -#include -#endif #include #include #include diff --git a/bibletime/frontend/display/chtmlreaddisplay.cpp b/bibletime/frontend/display/chtmlreaddisplay.cpp index dd1367d..864f305 100644 --- a/bibletime/frontend/display/chtmlreaddisplay.cpp +++ b/bibletime/frontend/display/chtmlreaddisplay.cpp @@ -24,9 +24,6 @@ #include "util/cpointers.h" #include "util/scoped_resource.h" -//We will need to reference this in the TQt includes -#include - //TQt includes #include #include @@ -35,10 +32,6 @@ #include #include #include -#if TDE_VERSION < 0x030300 -//We will need to show the error message. -#include -#endif //TDE includes #include @@ -494,16 +487,7 @@ void CHTMLReadDisplay::zoomOut() { } void CHTMLReadDisplay::openFindTextDialog() { -#if TDE_VERSION >= 0x030300 findText(); -#else - TQMessageBox::information(0, "Not Supported", - "This copy of BibleTime was built against a version of KDE older\n" - "than 3.3 (probably due to your distro), so this search feature\n" - "does not work.\n\n" - "This is a known issue. If we do not have a fix for the next\n" - "version of BibleTime, we will remove the option."); -#endif } #include "chtmlreaddisplay.moc" diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.cpp b/bibletime/frontend/displaywindow/cbookreadwindow.cpp index 1e09b28..41b221c 100644 --- a/bibletime/frontend/displaywindow/cbookreadwindow.cpp +++ b/bibletime/frontend/displaywindow/cbookreadwindow.cpp @@ -29,7 +29,6 @@ //TDE includes #include #include -#include using namespace Profile; @@ -146,10 +145,6 @@ void CBookReadWindow::initToolbars() { if (action) { action->plug(buttonsToolBar()); } - - #if TDE_VERSION_MINOR < 1 - action->plugAccel( accel() ); - #endif } /** Is called when the action was executed to toggle the tree view. */ diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.cpp b/bibletime/frontend/displaywindow/cdisplaywindow.cpp index ccdeafc..e914b34 100644 --- a/bibletime/frontend/displaywindow/cdisplaywindow.cpp +++ b/bibletime/frontend/displaywindow/cdisplaywindow.cpp @@ -38,11 +38,7 @@ #include "util/cresmgr.h" - -//TQt includes - //TDE includes -#include #include #include @@ -77,11 +73,7 @@ CWriteWindow* CDisplayWindow::createWriteInstance(ListCSwordModuleInfo modules, } CDisplayWindow::CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea *parent, const char *name ) -#if TDE_VERSION >= 0x030200 : TDEMainWindow(TDEMainWindow::NoDCOPObject, parent, name, WDestructiveClose), -#else -: TDEMainWindow(parent, name, WDestructiveClose), -#endif m_mdi(parent), m_filterOptions(), m_displayOptions(), diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp index 9638a28..06c0d51 100644 --- a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp +++ b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp @@ -26,15 +26,11 @@ #include "util/ctoolclass.h" #include "util/cresmgr.h" -//TQt includes - //TDE includes #include #include #include #include -#include -// #include CLexiconReadWindow::CLexiconReadWindow(ListCSwordModuleInfo moduleList, CMDIArea* parent, const char *name) : CReadWindow(moduleList, parent,name) { setKey( CSwordKey::createInstance(moduleList.first()) ); @@ -188,10 +184,6 @@ void CLexiconReadWindow::initToolbars() { if (action) { action->plug(buttonsToolBar()); } - #if TDE_VERSION_MINOR < 1 - action->plugAccel( accel() ); - #endif - setDisplaySettingsButton( new CDisplaySettingsButton( &displayOptions(), &filterOptions(), modules(), buttonsToolBar()) ); buttonsToolBar()->insertWidget(2,displaySettingsButton()->size().width(), displaySettingsButton()); } -- cgit v1.2.3