From 8927ed0007f6fbe9d1aae5bdb2905e2eb3b120a2 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 7 Mar 2026 10:54:50 +0900 Subject: Remove use of KDE_IS_VERSION Signed-off-by: Michele Calgaro --- kpilot/dbFlagsEditor.cpp | 12 ------ kpilot/dbFlagsEditor_base.ui | 1 + kpilot/dbFlagsEditor_base.ui.h | 24 ----------- kpilot/fileInstaller.cpp | 4 -- kpilot/logWidget.cpp | 6 --- lib/options.h | 8 ---- lib/syncAction.cpp | 90 ------------------------------------------ 7 files changed, 1 insertion(+), 144 deletions(-) delete mode 100644 kpilot/dbFlagsEditor_base.ui.h diff --git a/kpilot/dbFlagsEditor.cpp b/kpilot/dbFlagsEditor.cpp index e49690e..82c68d7 100644 --- a/kpilot/dbFlagsEditor.cpp +++ b/kpilot/dbFlagsEditor.cpp @@ -85,21 +85,15 @@ void DBFlagsEditor::slotOk() TQDateTime ttime; ttime.setDate(widget->fCreationDate->date()); -#if KDE_IS_VERSION(3,1,9) ttime.setTime(widget->fCreationTime->time()); -#endif dbi->createDate=ttime.toTime_t(); ttime.setDate(widget->fModificationDate->date()); -#if KDE_IS_VERSION(3,1,9) ttime.setTime(widget->fModificationTime->time()); -#endif dbi->modifyDate=ttime.toTime_t(); ttime.setDate(widget->fBackupDate->date()); -#if KDE_IS_VERSION(3,1,9) ttime.setTime(widget->fBackupTime->time()); -#endif dbi->backupDate=ttime.toTime_t(); KDialogBase::slotOk(); @@ -136,21 +130,15 @@ void DBFlagsEditor::fillWidgets() TQDateTime ttime; ttime.setTime_t(dbi->createDate); widget->fCreationDate->setDate(ttime.date()); -#if KDE_IS_VERSION(3,1,9) widget->fCreationTime->setTime(ttime.time()); -#endif ttime.setTime_t(dbi->modifyDate); widget->fModificationDate->setDate(ttime.date()); -#if KDE_IS_VERSION(3,1,9) widget->fModificationTime->setTime(ttime.time()); -#endif ttime.setTime_t(dbi->backupDate); widget->fBackupDate->setDate(ttime.date()); -#if KDE_IS_VERSION(3,1,9) widget->fBackupTime->setTime(ttime.time()); -#endif } diff --git a/kpilot/dbFlagsEditor_base.ui b/kpilot/dbFlagsEditor_base.ui index a89aabd..9134e80 100644 --- a/kpilot/dbFlagsEditor_base.ui +++ b/kpilot/dbFlagsEditor_base.ui @@ -371,6 +371,7 @@ dbFlagsEditor_base.ui.h kdatewidget.h + ktimewidget.h diff --git a/kpilot/dbFlagsEditor_base.ui.h b/kpilot/dbFlagsEditor_base.ui.h deleted file mode 100644 index d39b77f..0000000 --- a/kpilot/dbFlagsEditor_base.ui.h +++ /dev/null @@ -1,24 +0,0 @@ -/**************************************************************************** -** ui.h extension file, included from the uic-generated form implementation. -** -** If you wish to add, delete or rename functions or slots use -** TQt Designer which will update this file, preserving your code. Create an -** init() function in place of a constructor, and a destroy() function in -** place of a destructor. -*****************************************************************************/ -#ifndef TDE_VERSION -#include -#endif - -#if KDE_IS_VERSION(3,1,90) -#include -#else -#warning "Workaround for KTimeWidget in KDE 3.1" -class KTimeWidget : public TQWidget -{ -public: - KTimeWidget(TQWidget *p, const char *n) : TQWidget(p,n) {}; -} ; - - -#endif diff --git a/kpilot/fileInstaller.cpp b/kpilot/fileInstaller.cpp index 070471a..48af56b 100644 --- a/kpilot/fileInstaller.cpp +++ b/kpilot/fileInstaller.cpp @@ -119,11 +119,7 @@ void FileInstaller::deleteFiles(const TQStringList &files) srcName.setPath(s); KURL destDir(fDirName + CSL1("/") + srcName.fileName()); -#if KDE_IS_VERSION(3,1,9) return TDEIO::NetAccess::copy(srcName, destDir, w); -#else - return TDEIO::NetAccess::copy(srcName,destDir); -#endif } diff --git a/kpilot/logWidget.cpp b/kpilot/logWidget.cpp index 97fecb0..f7596be 100644 --- a/kpilot/logWidget.cpp +++ b/kpilot/logWidget.cpp @@ -119,12 +119,6 @@ LogWidget::LogWidget(TQWidget * parent) : initialText.append(i18n("HotSync Log")); initialText.append(CSL1(TE_EOL)); -#if KDE_IS_VERSION(3,3,0) -#else - initialText.append(CSL1(TE_EOL "KDE 3.2 is no longer supported. Please update to KDE 3.3 or later." TE_EOL)); - initialText.append(CSL1(TE_EOL "You may be unable to do conflict resolution." TE_EOL)); -#endif - fLog->setText(initialText); fLog->scrollToBottom(); diff --git a/lib/options.h b/lib/options.h index 9fbcf22..1a3f401 100644 --- a/lib/options.h +++ b/lib/options.h @@ -44,14 +44,6 @@ #include #include -#if !(KDE_IS_VERSION(3,4,0)) -#error "This is KPilot for (really) KDE 3.5 and won't compile with KDE < 3.4.0" -#endif - -#if !(KDE_IS_VERSION(3,5,0)) -#warning "This is KPilot for KDE 3.5 and might not compile with KDE < 3.5.0" -#endif - #include "pilotLinkVersion.h" #include diff --git a/lib/syncAction.cpp b/lib/syncAction.cpp index c870ac9..d3eca6e 100644 --- a/lib/syncAction.cpp +++ b/lib/syncAction.cpp @@ -327,7 +327,6 @@ int SyncAction::questionYesNo(const TQString & text, startTickle(timeout); } -#if KDE_IS_VERSION(3,3,0) r = (KMessageBox::ButtonCode) KMessageBox::createKMessageBox(dialog, TQMessageBox::Question, text, @@ -336,50 +335,6 @@ int SyncAction::questionYesNo(const TQString & text, &checkboxReturn, 0); -#else - // The following code is taken from KDialogBase.cpp, - // part of the KDE 2.2 libraries. Copyright 2001 - // by Waldo Bastian. - // - // - TQVBox *topcontents = new TQVBox(dialog); - - topcontents->setSpacing(KDialog::spacingHint() * 2); - topcontents->setMargin(KDialog::marginHint() * 2); - - TQWidget *contents = new TQWidget(topcontents); - TQHBoxLayout *lay = new TQHBoxLayout(contents); - - lay->setSpacing(KDialog::spacingHint() * 2); - - lay->addStretch(1); - TQLabel *label1 = new TQLabel( contents); - label1->setPixmap(TQMessageBox::standardIcon(TQMessageBox::Information)); - lay->add( label1 ); - TQLabel *label2 = new TQLabel( text, contents); - label2->setMinimumSize(label2->sizeHint()); - lay->add(label2); - lay->addStretch(1); - - TQSize extraSize = TQSize(50, 30); - - TQCheckBox *checkbox = 0L; - if (!key.isEmpty()) - { - checkbox = new TQCheckBox(i18n("Do not ask again"),topcontents); - extraSize = TQSize(50,0); - } - - dialog->setMainWidget(topcontents); - dialog->enableButtonSeparator(false); - dialog->incInitialSize(extraSize); - - r = dialog->exec(); - if (checkbox) - { - checkboxReturn = checkbox->isChecked(); - } -#endif switch(r) { @@ -440,7 +395,6 @@ int SyncAction::questionYesNoCancel(const TQString & text, startTickle(timeout); } -#if KDE_IS_VERSION(3,3,0) r = KMessageBox::createKMessageBox(dialog, TQMessageBox::Question, text, @@ -448,50 +402,6 @@ int SyncAction::questionYesNoCancel(const TQString & text, (key.isEmpty() ? TQString() : i18n("&Do not ask again")), &checkboxReturn, 0); -#else - // The following code is taken from KDialogBase.cpp, - // part of the KDE 2.2 libraries. Copyright 2001 - // by Waldo Bastian. - // - // - TQVBox *topcontents = new TQVBox(dialog); - - topcontents->setSpacing(KDialog::spacingHint() * 2); - topcontents->setMargin(KDialog::marginHint() * 2); - - TQWidget *contents = new TQWidget(topcontents); - TQHBoxLayout *lay = new TQHBoxLayout(contents); - - lay->setSpacing(KDialog::spacingHint() * 2); - - lay->addStretch(1); - TQLabel *label1 = new TQLabel( contents); - label1->setPixmap(TQMessageBox::standardIcon(TQMessageBox::Information)); - lay->add( label1 ); - TQLabel *label2 = new TQLabel( text, contents); - label2->setMinimumSize(label2->sizeHint()); - lay->add(label2); - lay->addStretch(1); - - TQSize extraSize = TQSize(50, 30); - - TQCheckBox *checkbox = 0L; - if (!key.isEmpty()) - { - checkbox = new TQCheckBox(i18n("Do not ask again"),topcontents); - extraSize = TQSize(50,0); - } - - dialog->setMainWidget(topcontents); - dialog->enableButtonSeparator(false); - dialog->incInitialSize(extraSize); - - r = dialog->exec(); - if (checkbox) - { - checkboxReturn = checkbox->isChecked(); - } -#endif switch(r) { -- cgit v1.2.3