From 737adcefbfa3dd66bcba31656ba33766c347c529 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 8 Mar 2026 20:44:23 +0900 Subject: Remove use of KDE_IS_VERSION Signed-off-by: Michele Calgaro --- cervisia/cvsservice/sshagent.cpp | 1 - kapptemplate/kapp/app.cpp | 5 --- kbabel/catalogmanager/catalogmanager.cpp | 4 --- kbabel/catalogmanager/catalogmanager.h | 1 - kbabel/catalogmanager/catalogmanagerview.cpp | 9 ----- kbabel/common/kbmailer.cpp | 8 ----- kbabel/commonui/context.cpp | 9 ----- kbabel/kbabel/kbabel.h | 1 - kbabel/kbabel/kbabelview.cpp | 20 ----------- kbabel/kbabel/main.cpp | 4 --- .../modules/dbsearchengine/KDBSearchEngine.cpp | 6 ---- kbugbuster/gui/cwbuglistcontainer.cpp | 2 -- kbugbuster/gui/kbbmainwindow.cpp | 10 ------ umbrello/umbrello/codegenerationpolicy.cpp | 1 - .../umbrello/docgenerators/docbookgenerator.cpp | 8 ----- umbrello/umbrello/main.cpp | 5 --- umbrello/umbrello/uml.cpp | 40 ---------------------- umbrello/umbrello/uml.h | 13 ------- umbrello/umbrello/umldoc.cpp | 4 --- umbrello/umbrello/umlviewimageexporterall.cpp | 8 ----- 20 files changed, 159 deletions(-) diff --git a/cervisia/cvsservice/sshagent.cpp b/cervisia/cvsservice/sshagent.cpp index 80ce2fd8..368b226a 100644 --- a/cervisia/cvsservice/sshagent.cpp +++ b/cervisia/cvsservice/sshagent.cpp @@ -23,7 +23,6 @@ #include #include #include -#include #include #include diff --git a/kapptemplate/kapp/app.cpp b/kapptemplate/kapp/app.cpp index fb7a2a97..0a5e2879 100644 --- a/kapptemplate/kapp/app.cpp +++ b/kapptemplate/kapp/app.cpp @@ -13,7 +13,6 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp #include #include -#include #include #include #include @@ -114,11 +113,7 @@ void ${APP_NAME}::saveProperties(TDEConfig *config) // later when this app is restored if (!m_view->currentURL().isNull()) { -#if KDE_IS_VERSION(3,1,3) config->writePathEntry("lastURL", m_view->currentURL()); -#else - config->writeEntry("lastURL", m_view->currentURL()); -#endif } } diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp index 4ef617c1..32e07bd8 100644 --- a/kbabel/catalogmanager/catalogmanager.cpp +++ b/kbabel/catalogmanager/catalogmanager.cpp @@ -533,11 +533,7 @@ void CatalogManager::setupActions() action = new TDEAction(i18n("&Delete"),Key_Delete,_catalogManager,TQ_SLOT(slotDeleteFile()),actionCollection(), "delete"); action->setEnabled(false); -#if KDE_IS_VERSION( 3, 2, 90 ) setupGUI(); -#else - createGUI(); -#endif } void CatalogManager::setupStatusBar() diff --git a/kbabel/catalogmanager/catalogmanager.h b/kbabel/catalogmanager/catalogmanager.h index bec8791a..cea0a949 100644 --- a/kbabel/catalogmanager/catalogmanager.h +++ b/kbabel/catalogmanager/catalogmanager.h @@ -41,7 +41,6 @@ #include #include -#include #include #include #include diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp index f8de3fc5..30044bba 100644 --- a/kbabel/catalogmanager/catalogmanagerview.cpp +++ b/kbabel/catalogmanager/catalogmanagerview.cpp @@ -70,7 +70,6 @@ #include #include #include -#include #include #include @@ -438,11 +437,7 @@ void CatalogManagerView::loadMarks() if( url.isEmpty() ) return; TQString filename; -#if KDE_IS_VERSION( 3, 2, 90 ) if (!TDEIO::NetAccess::download( url, filename, this ) ) -#else - if( !TDEIO::NetAccess::download( url, filename ) ) -#endif { KMessageBox::error(this,i18n( "Error while trying to open file:\n %1").arg(url.prettyURL())); @@ -523,12 +518,8 @@ void CatalogManagerView::saveMarks() } } -#if KDE_IS_VERSION( 3, 4, 92 ) // Support for partially remote TDEIO slave like media: const KURL url ( TDEIO::NetAccess::mostLocalURL( url2, this ) ); -#else - const KURL url ( url2 ); -#endif kdDebug() << "Saving marks: " << url2.prettyURL() << " most-local: " << url.prettyURL() << endl; TQFile* file = 0; diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp index 471660f0..585d5a5b 100644 --- a/kbabel/common/kbmailer.cpp +++ b/kbabel/common/kbmailer.cpp @@ -79,11 +79,7 @@ void KBabelMailer::sendOneFile(const TQString& fileName) void KBabelMailer::sendOneFile( const KURL& url) { -#if KDE_IS_VERSION( 3, 5, 0) const KURL localUrl( TDEIO::NetAccess::mostLocalURL( url, m_parent ) ); -#else - const KURL localUrl( url ); -#endif if ( localUrl.isLocalFile() ) { sendOneFile( localUrl.path() ); @@ -182,12 +178,8 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName, // add files to this archive TQStringList::const_iterator it; for (it = fileList.constBegin(); it != fileList.constEnd(); ++it) { -#if KDE_IS_VERSION( 3, 5, 0 ) // Try to get a local URL instead of a remote one const KURL url( TDEIO::NetAccess::mostLocalURL( KURL::fromPathOrURL( *it ), m_parent ) ); -#else - const KURL url( KURL::fromPathOrURL( *it ) ); -#endif TQString poTempName; if ( !TDEIO::NetAccess::download( url, poTempName, m_parent ) ) { KMessageBox::error( m_parent, i18n("Error while trying to read file %1.").arg( url.prettyURL() ) ); diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp index 6b1719a7..0ddfea84 100644 --- a/kbabel/commonui/context.cpp +++ b/kbabel/commonui/context.cpp @@ -52,7 +52,6 @@ #include #include #include -#include #include #include @@ -127,20 +126,12 @@ TQValueList SourceContext::resolvePath( const TQString& packageDir, // Find the directory name of the PO file, if the PO file is local // ### TODO: find a way to allow remote files too TQString poDir; -#if KDE_IS_VERSION( 3, 5, 0 ) const KURL localUrl( TDEIO::NetAccess::mostLocalURL( urlPoFile, m_parent ) ); if ( localUrl.isLocalFile() ) { const TQFileInfo fi( localUrl.path() ); poDir = fi.dirPath( true ); } -#else - if ( urlPoFile.isLocalFile() ) - { - const TQFileInfo fi( urlPoFile.path() ); - poDir = fi.dirPath( true ); - } -#endif #if 0 kdDebug() << "CONTEXT VARIABLE START" << endl; diff --git a/kbabel/kbabel/kbabel.h b/kbabel/kbabel/kbabel.h index b131fe76..1ebd9bb1 100644 --- a/kbabel/kbabel/kbabel.h +++ b/kbabel/kbabel/kbabel.h @@ -40,7 +40,6 @@ #endif #include -#include #include #include #include diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp index adb07ac7..8b5a1469 100644 --- a/kbabel/kbabel/kbabelview.cpp +++ b/kbabel/kbabel/kbabelview.cpp @@ -56,7 +56,6 @@ #include #include -#include #include #include #include @@ -1105,11 +1104,7 @@ void KBabelView::open() void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfModified, bool newView) { -#if KDE_IS_VERSION( 3, 5, 0) KURL url = TDEIO::NetAccess::mostLocalURL(_url,this); -#else - KURL url = _url; -#endif url.cleanPath(); KURL cu = currentURL(); @@ -1675,19 +1670,11 @@ bool KBabelView::checkSyntax(bool msgOnlyAtError,bool question) } else { -#if KDE_IS_VERSION ( 3, 4, 0 ) msg += "\n"; msg += i18n("Please edit the file again."); msg += "\n\n"; msg += i18n("Output of \"msgfmt --statistics\":\n"); KMessageBox::errorList( this, msg, outputLines ); -#else - msg += i18n("Output of \"msgfmt --statistics\":\n"); - msg += output; - msg += "\n\n"; - msg += i18n("Please edit the file again."); - KMessageBox::error( this, msg ); -#endif returnCode=false; } break; @@ -1713,16 +1700,9 @@ bool KBabelView::checkSyntax(bool msgOnlyAtError,bool question) } else { -#if KDE_IS_VERSION ( 3, 4, 0 ) msg += "\n"; msg += i18n("Please edit the file again."); KMessageBox::errorList( this, msg, outputLines ); -#else - msg += output; - msg += "\n\n"; - msg += i18n("Please edit the file again."); - KMessageBox::error( this, msg ); -#endif returnCode=false; } diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp index 37132825..49276760 100644 --- a/kbabel/kbabel/main.cpp +++ b/kbabel/kbabel/main.cpp @@ -119,11 +119,7 @@ int KBabelApp::newInstance() } // see if we are starting with session management -#if KDE_IS_VERSION(3,3,0) if (!restoringSession()) -#else - if (!isRestored() || !first) -#endif { kdDebug () << "Suspending DCOP" << endl; tdeApp->dcopClient()->suspend(); diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp index 9fee3217..5c5b9f53 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp @@ -32,7 +32,6 @@ #include #include -#include #include #include #include @@ -1110,14 +1109,9 @@ KDBSearchEngine::saveSettings (TDEConfigBase * config) { // updateSettings(); //maybe with autoupdate TDEConfigGroupSaver cgs (config, "KDBSearchEngine"); -#if KDE_IS_VERSION(3,1,3) config->writePathEntry ("Filename", dbname); -#else - config->writeEntry ("Filename", dbname); -#endif config->writeEntry ("Language", lang); - config->writeEntry ("CaseSensitive", sens); config->writeEntry ("Normalize", norm); config->writeEntry ("RemoveContext", comm); diff --git a/kbugbuster/gui/cwbuglistcontainer.cpp b/kbugbuster/gui/cwbuglistcontainer.cpp index a4607581..859c8bee 100644 --- a/kbugbuster/gui/cwbuglistcontainer.cpp +++ b/kbugbuster/gui/cwbuglistcontainer.cpp @@ -24,9 +24,7 @@ #include #include #include -#if KDE_IS_VERSION( 3, 2, 90 ) #include -#endif #include #include "bugsystem.h" diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp index 57c1ec30..ed345137 100644 --- a/kbugbuster/gui/kbbmainwindow.cpp +++ b/kbugbuster/gui/kbbmainwindow.cpp @@ -199,10 +199,8 @@ void KBBMainWindow::initActions() TQ_SLOT( replyPrivateBug() ), actionCollection(), "cmd_replyprivate" ); KStdAction::showMenubar(this, TQ_SLOT( slotToggleMenubar() ), actionCollection() ); -#if KDE_IS_VERSION( 3, 1, 90 ) createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); -#endif m_disconnectedAction = new TDEToggleAction( i18n("&Disconnected Mode"), 0, this, @@ -219,16 +217,12 @@ void KBBMainWindow::initActions() TDEToggleAction *toggleTmp = new TDEToggleAction( i18n("Show Closed Bugs"), "application-x-trash", 0, this, TQ_SLOT( slotToggleDone() ), actionCollection(), "cmd_toggle_done" ); -#if KDE_IS_VERSION( 3, 2, 90 ) toggleTmp->setCheckedState(i18n("Hide Closed Bugs")); -#endif toggleTmp->setChecked( KBBPrefs::instance()->mShowClosedBugs ); toggleTmp =new TDEToggleAction( i18n("Show Wishes"), "bookmark", 0, this, TQ_SLOT( slotToggleWishes() ), actionCollection(), "cmd_toggle_wishes" ); -#if KDE_IS_VERSION( 3, 2, 90 ) toggleTmp->setCheckedState(i18n("Hide Wishes")); -#endif toggleTmp->setChecked(KBBPrefs::instance()->mShowWishes); mSelectServerAction = new TDESelectAction( i18n( "Select Server" ), 0, 0, @@ -248,11 +242,7 @@ void KBBMainWindow::initActions() "debug_showbugsource" ); } -#if KDE_IS_VERSION( 3, 2, 90 ) setupGUI( (ToolBar | Keys | StatusBar | Save | Create ), "kbugbusterui.rc" ); -#else - createGUI(); -#endif } void KBBMainWindow::slotToggleMenubar() diff --git a/umbrello/umbrello/codegenerationpolicy.cpp b/umbrello/umbrello/codegenerationpolicy.cpp index 6de00068..f976a3fd 100644 --- a/umbrello/umbrello/codegenerationpolicy.cpp +++ b/umbrello/umbrello/codegenerationpolicy.cpp @@ -28,7 +28,6 @@ // kde includes #include -#include #include #include diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.cpp b/umbrello/umbrello/docgenerators/docbookgenerator.cpp index 79be6dac..c7129003 100644 --- a/umbrello/umbrello/docgenerators/docbookgenerator.cpp +++ b/umbrello/umbrello/docgenerators/docbookgenerator.cpp @@ -73,15 +73,7 @@ TDEIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir) destDir, false); if (!errors.empty()) { -#if KDE_IS_VERSION(3,4,0) KMessageBox::errorList(app, i18n("Some errors happened when exporting the images:"), errors); -#else - TQString errorsCaption; - for (TQStringList::Iterator it = errors.begin(); it != errors.end(); ++it) { - errorsCaption += "\n" + *it; - } - KMessageBox::error(app, i18n("Some errors happened when exporting the images:") + errorsCaption); -#endif return 0; } diff --git a/umbrello/umbrello/main.cpp b/umbrello/umbrello/main.cpp index ae015af5..149b221e 100644 --- a/umbrello/umbrello/main.cpp +++ b/umbrello/umbrello/main.cpp @@ -151,14 +151,9 @@ TDEStartupLogo* showStartupLogo(TDEConfig* cfg, bool showGUI) { cfg->setGroup( "General Options" ); bool showLogo = cfg->readBoolEntry( "logo", true ); if (showGUI && showLogo) { -#if KDE_IS_VERSION(3,3,90) startLogo = new TDEStartupLogo(0); startLogo->setHideEnabled(true); KWin::setMainWindow(startLogo, UMLApp::app()->winId()); -#else - startLogo = new TDEStartupLogo(UMLApp::app()); - startLogo->setHideEnabled(true); -#endif KWin::setState(startLogo->winId(), NET::KeepAbove); startLogo->show(); TQApplication::flushX(); diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp index 46c874c2..48a46f7a 100644 --- a/umbrello/umbrello/uml.cpp +++ b/umbrello/umbrello/uml.cpp @@ -318,11 +318,7 @@ void UMLApp::initActions() { initStatusBar(); //call this here because the statusBar is shown/hidden by setupGUI() // use the absolute path to your umbrelloui.rc file for testing purpose in setupGUI(); -#if KDE_IS_VERSION(3,2,90) setupGUI(); -#else - createGUI(); -#endif TQPopupMenu* menu = findMenu( menuBar(), TQString("settings") ); menu->insertItem(i18n("&Windows"), dockHideShowMenu(), -1, 0); } @@ -406,10 +402,7 @@ void UMLApp::initView() { if (optionState.generalState.tabdiagrams) { m_viewStack = NULL; m_tabWidget = new KTabWidget(m_mainDock, "tab_widget"); - -#if KDE_IS_VERSION(3,3,89) m_tabWidget->setAutomaticResizeTabs( true ); -#endif m_newSessionButton = new TDEToolBarButton("tab_new", 0, m_tabWidget); m_newSessionButton->setIconSet( SmallIcon( "tab_new" ) ); @@ -856,39 +849,6 @@ void UMLApp::slotEditPaste() { m_doc -> setModified( true ); } -//Remove these once we stop supporting KDE 3.1 -// #if !KDE_IS_VERSION(3,1,90) - -void UMLApp::slotViewToolBar() { - slotStatusMsg(i18n("Toggling toolbar...")); - - /////////////////////////////////////////////////////////////////// - // turn Toolbar on or off - - if(!viewToolBar->isChecked()) { - toolBar("mainToolBar")->hide(); - } else { - toolBar("mainToolBar")->show(); - } - - slotStatusMsg(i18n("Ready.")); -} - -void UMLApp::slotViewStatusBar() { - slotStatusMsg(i18n("Toggle the statusbar...")); - /////////////////////////////////////////////////////////////////// - //turn Statusbar on or off - if(!viewStatusBar->isChecked()) { - statusBar()->hide(); - } else { - statusBar()->show(); - } - - slotStatusMsg(i18n("Ready.")); -} -// #endif - - void UMLApp::slotStatusMsg(const TQString &text) { /////////////////////////////////////////////////////////////////// // change status message permanently diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h index 23051ab2..fe947ab3 100644 --- a/umbrello/umbrello/uml.h +++ b/umbrello/umbrello/uml.h @@ -22,7 +22,6 @@ #include #include -#include #include // forward declaration of the UML classes @@ -520,18 +519,6 @@ public slots: */ void slotEditPaste(); - /** - * Toggles the toolbar. - * Deprecated. For compatibility with KDE 3.1, remove if we stop supporting KDE 3.1 - */ - void slotViewToolBar(); - - /** - * Toggles the statusbar. - * Deprecated. For compatibility with KDE 3.1, remove if we stop supporting KDE 3.1 - */ - void slotViewStatusBar(); - /** * Autolayouts the current class diagram */ diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp index fec8cc85..570e5c71 100644 --- a/umbrello/umbrello/umldoc.cpp +++ b/umbrello/umbrello/umldoc.cpp @@ -23,7 +23,6 @@ // kde includes #include -#include #include #include #include @@ -578,14 +577,11 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) { } archive->addLocalFile(tmp_xmi_file.name(), tmpTQString); archive->close(); - -#if KDE_IS_VERSION(3,4,89) if (!archive->closeSucceeded()) { KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error")); return false; } -#endif // now the xmi file was added to the archive, so we can delete it tmp_xmi_file.close(); tmp_xmi_file.unlink(); diff --git a/umbrello/umbrello/umlviewimageexporterall.cpp b/umbrello/umbrello/umlviewimageexporterall.cpp index aeb53301..dded1875 100644 --- a/umbrello/umbrello/umlviewimageexporterall.cpp +++ b/umbrello/umbrello/umlviewimageexporterall.cpp @@ -60,15 +60,7 @@ void UMLViewImageExporterAll::exportAllViews() { UMLViewImageExporterModel::mimeTypeToImageType(m_dialog->m_imageType->currentFilter()), KURL(m_dialog->m_kURL->url()), m_dialog->m_useFolders->isChecked()); if (!errors.empty()) { -#if KDE_IS_VERSION(3,4,0) KMessageBox::errorList(app, i18n("Some errors happened when exporting the images:"), errors); -#else - TQString errorsCaption; - for (TQStringList::Iterator it = errors.begin(); it != errors.end(); ++it) { - errorsCaption += "\n" + *it; - } - KMessageBox::error(app, i18n("Some errors happened when exporting the images:") + errorsCaption); -#endif } umlDoc->writeToStatusBar(i18n("Ready.")); } -- cgit v1.2.3