diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/options.h | 8 | ||||
| -rw-r--r-- | lib/syncAction.cpp | 90 |
2 files changed, 0 insertions, 98 deletions
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 <tdeversion.h> #include <tdelocale.h> -#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 <iostream> 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) { |