From 1754ec47b18d279138e1f37e9c693a87dc49f921 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 5 Mar 2026 21:55:08 +0900 Subject: Remove use of KDE_IS_VERSION Signed-off-by: Michele Calgaro --- src/digikam/albumfiletip.cpp | 6 ------ src/digikam/albumfolderview.cpp | 12 ------------ src/digikam/albumiconview.cpp | 13 ------------- src/digikam/albumpropsedit.cpp | 5 ----- src/digikam/datefolderview.cpp | 7 ------- src/digikam/digikamapp.cpp | 22 ---------------------- src/digikam/main.cpp | 4 ---- src/digikam/monthwidget.cpp | 12 ------------ src/digikam/searchfolderview.cpp | 10 ---------- src/digikam/tageditdlg.cpp | 7 ------- src/digikam/timelineview.cpp | 16 ---------------- src/imageplugins/hotpixels/blackframeparser.cpp | 5 ----- src/libs/widgets/common/sidebar.cpp | 4 ---- src/showfoto/showfoto.cpp | 4 ---- src/tdeioslave/digikamalbums.cpp | 2 -- src/utilities/cameragui/cameraui.cpp | 10 ---------- src/utilities/cameragui/renamecustomizer.cpp | 11 ----------- src/utilities/imageeditor/editor/editorwindow.cpp | 2 -- src/utilities/setup/setupcollections.cpp | 14 -------------- src/utilities/slideshow/slideshow.cpp | 8 -------- 20 files changed, 174 deletions(-) diff --git a/src/digikam/albumfiletip.cpp b/src/digikam/albumfiletip.cpp index 1950eab6..17e1d553 100644 --- a/src/digikam/albumfiletip.cpp +++ b/src/digikam/albumfiletip.cpp @@ -161,13 +161,7 @@ void AlbumFileTip::reposition() d->corner = 0; // should the tooltip be shown to the left or to the right of the ivi ? -#if KDE_IS_VERSION(3,2,0) TQRect desk = TDEGlobalSettings::desktopGeometry(rect.center()); -#else - TQRect desk = TQApplication::desktop()->screenGeometry( - TQApplication::desktop()->screenNumber(rect.center()) ); -#endif - if (rect.center().x() + width() > desk.right()) { // to the left diff --git a/src/digikam/albumfolderview.cpp b/src/digikam/albumfolderview.cpp index 6e9048ab..1c1a7f1f 100644 --- a/src/digikam/albumfolderview.cpp +++ b/src/digikam/albumfolderview.cpp @@ -46,11 +46,7 @@ #include #include -#if KDE_IS_VERSION(3,2,0) #include -#else -#include -#endif // Local includes. @@ -868,17 +864,9 @@ void AlbumFolderView::albumRename(AlbumFolderViewItem* item) TQString oldTitle(album->title()); bool ok; - -#if KDE_IS_VERSION(3,2,0) TQString title = KInputDialog::getText(i18n("Rename Album (%1)").arg(oldTitle), i18n("Enter new album name:"), oldTitle, &ok, this); -#else - TQString title = KLineEditDlg::getText(i18n("Rename Item (%1)").arg(oldTitle), - i18n("Enter new album name:"), - oldTitle, &ok, this); -#endif - if (!ok) return; diff --git a/src/digikam/albumiconview.cpp b/src/digikam/albumiconview.cpp index e68d003f..eca93464 100644 --- a/src/digikam/albumiconview.cpp +++ b/src/digikam/albumiconview.cpp @@ -81,13 +81,8 @@ extern "C" #include #include #include - -#if KDE_IS_VERSION(3,2,0) #include #include -#else -#include -#endif // LibKipi includes. @@ -963,17 +958,9 @@ void AlbumIconView::slotRename(AlbumIconItem* item) name.truncate(fi.fileName().length() - ext.length()); bool ok; - -#if KDE_IS_VERSION(3,2,0) TQString newName = KInputDialog::getText(i18n("Rename Item (%1)").arg(fi.fileName()), i18n("Enter new name (without extension):"), name, &ok, this); -#else - TQString newName = KLineEditDlg::getText(i18n("Rename Item (%1)").arg(fi.fileName()), - i18n("Enter new name (without extension):"), - name, &ok, this); -#endif - if (!ok) return; diff --git a/src/digikam/albumpropsedit.cpp b/src/digikam/albumpropsedit.cpp index 703d8c4a..06db8ad4 100644 --- a/src/digikam/albumpropsedit.cpp +++ b/src/digikam/albumpropsedit.cpp @@ -50,13 +50,8 @@ #include #include #include - #include -#if KDE_IS_VERSION(3,2,0) #include -#else -#include -#endif // Local includes. diff --git a/src/digikam/datefolderview.cpp b/src/digikam/datefolderview.cpp index 4c52dc41..db97b9a7 100644 --- a/src/digikam/datefolderview.cpp +++ b/src/digikam/datefolderview.cpp @@ -38,11 +38,8 @@ #include #include #include - #include -#if KDE_IS_VERSION(3,2,0) #include -#endif // Local includes. @@ -102,11 +99,7 @@ DateFolderItem::DateFolderItem(TQListViewItem* parent, DAlbum* album) { m_count = 0; m_album = album; -#if KDE_IS_VERSION(3,2,0) m_name = TDEGlobal::locale()->calendar()->monthName(m_album->date(), false); -#else - m_name = TDEGlobal::locale()->monthName(m_album->date(), false); -#endif setText(0, m_name); } diff --git a/src/digikam/digikamapp.cpp b/src/digikam/digikamapp.cpp index a723ccd4..0cf84da4 100644 --- a/src/digikam/digikamapp.cpp +++ b/src/digikam/digikamapp.cpp @@ -1363,7 +1363,6 @@ TQString DigikamApp::convertToLocalUrl( const TQString& folder ) KURL url( folder ); if( !url.isLocalFile() ) { -#if KDE_IS_VERSION(3,4,91) // Support for system:/ and media:/ (c) Stephan Kulow KURL mlu = TDEIO::NetAccess::mostLocalURL( url, 0 ); if (mlu.isLocalFile()) @@ -1397,23 +1396,6 @@ TQString DigikamApp::convertToLocalUrl( const TQString& folder ) } return path; -#else -#ifndef UDS_LOCAL_PATH -#define UDS_LOCAL_PATH (72 | TDEIO::UDS_STRING) -#else - using namespace TDEIO; -#endif - TDEIO::UDSEntry e; - if( TDEIO::NetAccess::stat( url, e, 0 ) ) - { - const TDEIO::UDSEntry::ConstIterator end = e.end(); - for( TDEIO::UDSEntry::ConstIterator it = e.begin(); it != end; ++it ) - { - if( (*it).m_uds == UDS_LOCAL_PATH && !(*it).m_str.isEmpty() ) - return KURL::fromPathOrURL( (*it).m_str ).path(); - } - } -#endif } return url.path(); @@ -1775,16 +1757,12 @@ void DigikamApp::slotToggleFullScreen() void DigikamApp::slotShowTip() { -#if KDE_IS_VERSION(3,2,0) TQStringList tipsFiles; tipsFiles.append("digikam/tips"); tipsFiles.append("kipi/tips"); KTipDialog::showMultiTip(this, tipsFiles, true); -#else - KTipDialog::showTip(this, "digikam/tips", true); -#endif } void DigikamApp::slotShowKipiHelp() diff --git a/src/digikam/main.cpp b/src/digikam/main.cpp index 77609197..b0c9f468 100644 --- a/src/digikam/main.cpp +++ b/src/digikam/main.cpp @@ -121,7 +121,6 @@ int main(int argc, char *argv[]) else if (args && args->isSet("download-from")) digikam->downloadFrom(args->getOption("download-from")); -#if KDE_IS_VERSION(3,2,0) TQStringList tipsFiles; tipsFiles.append("digikam/tips"); tipsFiles.append("kipi/tips"); @@ -130,9 +129,6 @@ int main(int argc, char *argv[]) TDEGlobal::locale()->insertCatalogue("libkdcraw"); KTipDialog::showMultiTip(0, tipsFiles, false); -#else - KTipDialog::showTip(0, "digikam/tips", false); -#endif return app.exec(); } diff --git a/src/digikam/monthwidget.cpp b/src/digikam/monthwidget.cpp index 665318fd..ae652175 100644 --- a/src/digikam/monthwidget.cpp +++ b/src/digikam/monthwidget.cpp @@ -242,14 +242,9 @@ void MonthWidget::drawContents(TQPainter *) rsmall = r; rsmall.setWidth(r.width() - 2); rsmall.setHeight(r.height() - 2); -#if KDE_IS_VERSION(3,2,0) p.drawText(rsmall, TQt::AlignVCenter|TQt::AlignHCenter, TDEGlobal::locale()->calendar()->weekDayName(i, true) .remove(2,1)); -#else - p.drawText(rsmall, TQt::AlignVCenter|TQt::AlignHCenter, - TDEGlobal::locale()->weekDayName(i, true).remove(2,1)); -#endif index++; } @@ -258,17 +253,10 @@ void MonthWidget::drawContents(TQPainter *) fnBold.setPointSize(fnBold.pointSize()+2); p.setFont(fnBold); -#if KDE_IS_VERSION(3,2,0) p.drawText(r, TQt::AlignCenter, TQString("%1 %2") .arg(TDEGlobal::locale()->calendar()->monthName(d->month, false)) .arg(TDEGlobal::locale()->calendar()->year(TQDate(d->year,d->month,1)))); -#else - p.drawText(r, TQt::AlignCenter, - TQString("%1 %2") - .arg(TDEGlobal::locale()->monthName(d->month)) - .arg(TQString::number(d->year))); -#endif p.end(); diff --git a/src/digikam/searchfolderview.cpp b/src/digikam/searchfolderview.cpp index c302d700..69067883 100644 --- a/src/digikam/searchfolderview.cpp +++ b/src/digikam/searchfolderview.cpp @@ -38,12 +38,7 @@ #include #include #include - -#if KDE_IS_VERSION(3,2,0) #include -#else -#include -#endif // Local includes. @@ -238,13 +233,8 @@ bool SearchFolderView::checkName( KURL& url ) TQString label = i18n( "Search name already exists." "\nPlease enter a new name:" ); bool ok; -#if KDE_IS_VERSION(3,2,0) TQString newTitle = KInputDialog::getText( i18n("Name exists"), label, albumTitle, &ok, this ); -#else - TQString newTitle = KLineEditDlg::getText( i18n("Name exists"), label, - albumTitle, ok, this ); -#endif if (!ok) return false; diff --git a/src/digikam/tageditdlg.cpp b/src/digikam/tageditdlg.cpp index f801aa52..76da27d8 100644 --- a/src/digikam/tageditdlg.cpp +++ b/src/digikam/tageditdlg.cpp @@ -218,16 +218,9 @@ void TagEditDlg::slotIconResetClicked() void TagEditDlg::slotIconChanged() { -#if KDE_IS_VERSION(3,3,0) TDEIconDialog dlg(this); dlg.setup(TDEIcon::NoGroup, TDEIcon::Application, false, 20, false, false, false); TQString icon = dlg.openDialog(); -#else - TQString icon = TDEIconDialog::getIcon(TDEIcon::NoGroup, TDEIcon::Application, false, 20); - if (icon.startsWith("/")) - return; -#endif - if (icon.isEmpty() || icon == d->icon) return; diff --git a/src/digikam/timelineview.cpp b/src/digikam/timelineview.cpp index a287f817..94180578 100644 --- a/src/digikam/timelineview.cpp +++ b/src/digikam/timelineview.cpp @@ -47,12 +47,7 @@ #include #include #include - -#if KDE_IS_VERSION(3,2,0) #include -#else -#include -#endif // Local includes. @@ -570,11 +565,7 @@ bool TimeLineView::checkName(TQString& name) TQString label = i18n( "Search name already exists.\n" "Please enter a new name:" ); bool ok; -#if KDE_IS_VERSION(3,2,0) TQString newTitle = KInputDialog::getText(i18n("Name exists"), label, name, &ok, this); -#else - TQString newTitle = KLineEditDlg::getText(i18n("Name exists"), label, name, ok, this); -#endif if (!ok) return false; name = newTitle; @@ -622,16 +613,9 @@ void TimeLineView::slotRenameAlbum(SAlbum* salbum) TQString oldName(salbum->title()); bool ok; -#if KDE_IS_VERSION(3,2,0) TQString name = KInputDialog::getText(i18n("Rename Album (%1)").arg(oldName), i18n("Enter new album name:"), oldName, &ok, this); -#else - TQString name = KLineEditDlg::getText(i18n("Rename Album (%1)").arg(oldName), - i18n("Enter new album name:"), - oldName, &ok, this); -#endif - if (!ok || name == oldName || name.isEmpty()) return; if (!checkName(name)) return; diff --git a/src/imageplugins/hotpixels/blackframeparser.cpp b/src/imageplugins/hotpixels/blackframeparser.cpp index 96a26138..14dd85e5 100644 --- a/src/imageplugins/hotpixels/blackframeparser.cpp +++ b/src/imageplugins/hotpixels/blackframeparser.cpp @@ -74,12 +74,7 @@ void BlackFrameParser::parseHotPixels(const TQString &file) void BlackFrameParser::parseBlackFrame(const KURL &url) { -#if KDE_IS_VERSION(3,2,0) TDEIO::NetAccess::download(url, m_localFile, tdeApp->activeWindow()); -#else - TDEIO::NetAccess::download(url, m_localFile); -#endif - if (!m_imageLoaderThread) { m_imageLoaderThread = new LoadSaveThread(); diff --git a/src/libs/widgets/common/sidebar.cpp b/src/libs/widgets/common/sidebar.cpp index 2b00d670..95139958 100644 --- a/src/libs/widgets/common/sidebar.cpp +++ b/src/libs/widgets/common/sidebar.cpp @@ -118,11 +118,7 @@ void Sidebar::updateMinimumWidth() void Sidebar::setSplitter(TQSplitter *sp) { -#if KDE_IS_VERSION(3,3,0) setStyle(KMultiTabBar::VSNET); -#else - setStyle(KMultiTabBar::KDEV3); -#endif d->splitter = sp; d->stack = new TQWidgetStack(d->splitter); diff --git a/src/showfoto/showfoto.cpp b/src/showfoto/showfoto.cpp index b7b09cd3..96c0cf71 100644 --- a/src/showfoto/showfoto.cpp +++ b/src/showfoto/showfoto.cpp @@ -628,11 +628,7 @@ void ShowFoto::slotOpenURL(const KURL& url) return; TQString localFile; -#if KDE_IS_VERSION(3,2,0) TDEIO::NetAccess::download(url, localFile, this); -#else - TDEIO::NetAccess::download(url, localFile); -#endif m_canvas->load(localFile, m_IOFileSettings); diff --git a/src/tdeioslave/digikamalbums.cpp b/src/tdeioslave/digikamalbums.cpp index 5c9ffeeb..31d7b41a 100644 --- a/src/tdeioslave/digikamalbums.cpp +++ b/src/tdeioslave/digikamalbums.cpp @@ -1307,11 +1307,9 @@ bool tdeio_digikamalbums::createUDSEntry(const TQString& path, TDEIO::UDSEntry& // copying the database entry: // Disabling this as a temporary solution for bug #137282 // This code is intended as a fix for bug #122653. -#if KDE_IS_VERSION(3,4,0) atom.m_uds = TDEIO::UDS_LOCAL_PATH; atom.m_str = path; entry.append(atom); -#endif */ return true; diff --git a/src/utilities/cameragui/cameraui.cpp b/src/utilities/cameragui/cameraui.cpp index cc995dca..4190e14b 100644 --- a/src/utilities/cameragui/cameraui.cpp +++ b/src/utilities/cameragui/cameraui.cpp @@ -67,12 +67,7 @@ #include #include #include - -#if KDE_IS_VERSION(3,2,0) #include -#else -#include -#endif // LibKDcraw includes. @@ -1063,12 +1058,7 @@ void CameraUI::slotUploadItems(const KURL::List& urls) TQString msg(i18n("Camera Folder %1 already contains item %2
" "Please enter a new file name (without extension):") .arg(cameraFolder).arg(fi.fileName())); -#if KDE_IS_VERSION(3,2,0) name = KInputDialog::getText(i18n("File already exists"), msg, name, &ok, this); - -#else - name = KLineEditDlg::getText(i18n("File already exists"), msg, name, &ok, this); -#endif if (!ok) return; } diff --git a/src/utilities/cameragui/renamecustomizer.cpp b/src/utilities/cameragui/renamecustomizer.cpp index 4d593959..433db21f 100644 --- a/src/utilities/cameragui/renamecustomizer.cpp +++ b/src/utilities/cameragui/renamecustomizer.cpp @@ -45,11 +45,7 @@ #include #include #include -#if KDE_IS_VERSION(3,2,0) #include -#else -#include -#endif // Local includes. @@ -445,16 +441,9 @@ void RenameCustomizer::slotDateTimeButtonClicked() "yyyy-MM-dd hh:mm:ss " "for 2006-08-24 14:24:18.

"); -#if KDE_IS_VERSION(3,2,0) TQString newFormat = KInputDialog::getText(i18n("Change Date and Time Format"), message, d->dateTimeFormatString, &ok, this); -#else - TQString newFormat = KLineEditDlg::getText(i18n("Change Date and Time Format"), - message, - d->dateTimeFormatString, &ok, this); -#endif - if (!ok) return; diff --git a/src/utilities/imageeditor/editor/editorwindow.cpp b/src/utilities/imageeditor/editor/editorwindow.cpp index 819627e1..623f6d6d 100644 --- a/src/utilities/imageeditor/editor/editorwindow.cpp +++ b/src/utilities/imageeditor/editor/editorwindow.cpp @@ -621,9 +621,7 @@ void EditorWindow::printImage(KURL url) TQString appName = tdeApp->aboutData()->appName(); printer.setDocName( url.filename() ); printer.setCreator( appName ); -#if KDE_IS_VERSION(3,2,0) printer.setUsePrinterResolution(true); -#endif KPrinter::addDialogPage( new ImageEditorPrintDialogPage(image, this, TQString(appName.append(" page")).ascii() )); diff --git a/src/utilities/setup/setupcollections.cpp b/src/utilities/setup/setupcollections.cpp index 10a25c31..e12dd6cb 100644 --- a/src/utilities/setup/setupcollections.cpp +++ b/src/utilities/setup/setupcollections.cpp @@ -46,12 +46,7 @@ #include #include #include - -#if KDE_IS_VERSION(3,2,0) #include -#else -#include -#endif // Local includes. @@ -174,19 +169,10 @@ void SetupCollections::slotCollectionSelectionChanged() void SetupCollections::slotAddCollection() { bool ok; - -#if KDE_IS_VERSION(3,2,0) TQString newCollection = KInputDialog::getText(i18n("New Collection Name"), i18n("Enter new collection name:"), TQString(), &ok, this); -#else - TQString newCollection = - KLineEditDlg::getText(i18n("New Collection Name"), - i18n("Enter new collection name:"), - TQString(), &ok, this); -#endif - if (!ok) return; bool found = false; diff --git a/src/utilities/slideshow/slideshow.cpp b/src/utilities/slideshow/slideshow.cpp index 08a4f997..4c4662c5 100644 --- a/src/utilities/slideshow/slideshow.cpp +++ b/src/utilities/slideshow/slideshow.cpp @@ -103,19 +103,11 @@ SlideShow::SlideShow(const SlideShowSettings& settings) // --------------------------------------------------------------- -#if KDE_IS_VERSION(3,2,0) TQRect deskRect = TDEGlobalSettings::desktopGeometry(this); d->deskX = deskRect.x(); d->deskY = deskRect.y(); d->deskWidth = deskRect.width(); d->deskHeight = deskRect.height(); -#else - TQRect deskRect = TQApplication::desktop()->screenGeometry(this); - d->deskX = deskRect.x(); - d->deskY = deskRect.y(); - d->deskWidth = deskRect.width(); - d->deskHeight = deskRect.height(); -#endif move(d->deskX, d->deskY); resize(d->deskWidth, d->deskHeight); -- cgit v1.2.3