From 03b0b804eb016e2d9ae851db960e843d0d629e0a Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 8 Mar 2026 20:44:13 +0900 Subject: Remove use of KDE_IS_VERSION Signed-off-by: Michele Calgaro --- certmanager/certificatewizardimpl.cpp | 8 -------- kaddressbook/addresseditwidget.cpp | 4 ---- kaddressbook/addresseeeditorwidget.cpp | 9 --------- kaddressbook/kabcore.cpp | 14 +++----------- kaddressbook/ldapsearchdialog.cpp | 5 ----- kaddressbook/printing/printingwizard.cpp | 5 ----- kaddressbook/printing/printsortmode.cpp | 3 --- kaddressbook/printing/printsortmode.h | 6 ------ kaddressbook/views/configuretableviewdialog.cpp | 7 ------- kalarm/birthdaydlg.cpp | 8 +------- kalarm/fontcolour.h | 1 - kalarm/kalarm.h | 2 -- kalarm/lib/spinbox.cpp | 5 ----- kalarm/mainwindowbase.cpp | 3 --- kmail/filterlogdlg.cpp | 7 ------- kmail/kmaddrbook.h | 2 -- kmail/kmail_part.h | 1 - kmail/kmcomposewin.h | 1 - kmail/kmedit.h | 1 - kmail/kmkernel.h | 1 - kmail/kmmainwin.h | 1 - kmail/kmsender.cpp | 1 - kmail/kmsender.h | 1 - kmail/kmsender_p.h | 1 - kmail/searchwindow.cpp | 6 ------ knode/headerview.cpp | 1 - knode/kncomposer.cpp | 1 - knode/kncomposer.h | 3 --- knode/knhdrviewitem.cpp | 1 - knode/knode_part.h | 1 - knotes/knote.cpp | 2 -- korganizer/actionmanager.cpp | 1 - korganizer/koagendaview.cpp | 4 ---- korganizer/komailclient.cpp | 4 ---- korganizer/korgac/alarmdockwindow.cpp | 8 -------- korganizer/printing/calprinter.cpp | 5 ----- korganizer/urihandler.cpp | 2 -- libkmime/kmime_util.cpp | 7 ------- libkpgp/kpgpui.cpp | 17 ----------------- libtdepim/kaddrbook.cpp | 10 +++------- libtdepim/kaddrbook.h | 1 - libtdepim/kfoldertree.cpp | 3 --- libtdepim/linklocator.cpp | 11 ----------- tderesources/groupwise/tdeioslave/groupwise.cpp | 1 - tderesources/kolab/tdeabc/contact.cpp | 9 --------- tderesources/newexchange/exchangeconvertercontact.cpp | 9 --------- tderesources/scalix/tdeioslave/scalix.cpp | 1 - tderesources/slox/tdeabcresourceslox.cpp | 10 ---------- 48 files changed, 7 insertions(+), 208 deletions(-) diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index a52c2e52..8cfd4bf7 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -387,14 +387,6 @@ TQString CertificateWizardImpl::caEMailAddress() const { void CertificateWizardImpl::slotURLSelected( const TQString& _url ) { KURL url = KURL::fromPathOrURL( _url.stripWhiteSpace() ); -#if ! KDE_IS_VERSION(3,2,90) - // The application/pkcs10 mimetype didn't have a native extension, - // so the filedialog didn't have the checkbox for auto-adding it. - TQString fileName = url.fileName(); - int pos = fileName.findRev( '.' ); - if ( pos < 0 ) // no extension - url.setFileName( fileName + ".p10" ); -#endif storeUR->setURL( url.prettyURL() ); } diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index 97b01d08..173411f4 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -314,11 +314,9 @@ AddressEditDialog::AddressEditDialog( const TDEABC::Address::List &list, mCountryCombo->setEditable( true ); mCountryCombo->setDuplicatesEnabled( false ); -#if KDE_IS_VERSION(3,3,0) TQPushButton *labelButton = new TQPushButton( i18n( "Edit Label..." ), page ); topLayout->addMultiCellWidget( labelButton, 7, 7, 0, 1 ); connect( labelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editLabel() ) ); -#endif fillCountryCombo(); label->setBuddy( mCountryCombo ); @@ -435,7 +433,6 @@ void AddressEditDialog::changeType() void AddressEditDialog::editLabel() { -#if KDE_IS_VERSION(3,3,0) bool ok = false; TQString result = KInputDialog::getMultiLineText( TDEABC::Address::labelLabel(), TDEABC::Address::labelLabel(), @@ -444,7 +441,6 @@ void AddressEditDialog::editLabel() mLabel = result; modified(); } -#endif } void AddressEditDialog::updateAddressEdits() diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index d2b79a92..584b0c74 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -542,11 +542,9 @@ void AddresseeEditorWidget::load() mRoleEdit->setText( mAddressee.role() ); mOrgEdit->setText( mAddressee.organization() ); -#if KDE_IS_VERSION(3,5,8) mDepartmentEdit->setText( mAddressee.department() ); // compatibility with older versions if ( mAddressee.department().isEmpty() ) -#endif mDepartmentEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Department" ) ); mURLEdit->setURL( mAddressee.url() ); mURLEdit->home( false ); @@ -590,14 +588,7 @@ void AddresseeEditorWidget::save() mAddressee.setRole( mRoleEdit->text() ); mAddressee.setOrganization( mOrgEdit->text() ); -#if KDE_IS_VERSION(3,5,8) mAddressee.setDepartment( mDepartmentEdit->text() ); -#else - if ( !mDepartmentEdit->text().isEmpty() ) - mAddressee.insertCustom( "KADDRESSBOOK", "X-Department", mDepartmentEdit->text() ); - else - mAddressee.removeCustom( "KADDRESSBOOK", "X-Department" ); -#endif TQString homepage = mURLEdit->text().stripWhiteSpace(); if ( homepage.isEmpty() ) diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 00e6cfe5..68ce3faa 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include @@ -119,10 +118,6 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, } mAddressBook->setErrorHandler( new TDEABC::GuiErrorHandler( mWidget ) ); -#if ! KDE_IS_VERSION(3,5,8) - mAddressBook->addCustomField( i18n( "Department" ), TDEABC::Field::Organization, - "X-Department", "KADDRESSBOOK" ); -#endif mAddressBook->addCustomField( i18n( "Profession" ), TDEABC::Field::Organization, "X-Profession", "KADDRESSBOOK" ); mAddressBook->addCustomField( i18n( "Assistant's Name" ), TDEABC::Field::Organization, @@ -761,7 +756,6 @@ void KABCore::addEmail( const TQString &aStr ) TDEABC::Addressee::parseEmailAddress( aStr, fullName, email ); -#if KDE_IS_VERSION(3,4,89) // This ugly hack will be removed in 4.0 // addressbook may not be reloaded yet, as done asynchronously sometimes, so wait while ( !mAddressBook->loadingHasFinished() ) { @@ -769,7 +763,7 @@ void KABCore::addEmail( const TQString &aStr ) // use sleep here to reduce cpu usage usleep( 100 ); } -#endif + // End of ugly hack // Try to lookup the addressee matching the email address bool found = false; @@ -818,7 +812,6 @@ void KABCore::editContact( const TQString &uid ) if ( uidList.count() > 0 ) localUID = *( uidList.at( 0 ) ); } -#if KDE_IS_VERSION(3,4,89) // This ugly hack will be removed in 4.0 // for calls with given uid, as done from commandline and DCOP // addressbook may not be reloaded yet, as done asynchronously, so wait @@ -827,7 +820,7 @@ void KABCore::editContact( const TQString &uid ) // use sleep here to reduce cpu usage usleep( 100 ); } -#endif + // End of ugly hack TDEABC::Addressee addr = mAddressBook->findByUid( localUID ); if ( !addr.isEmpty() ) { @@ -979,7 +972,6 @@ void KABCore::extensionDeleted( const TQStringList &uidList ) TQString KABCore::getNameByPhone( const TQString &phone ) { -#if KDE_IS_VERSION(3,4,89) // This ugly hack will be removed in 4.0 // addressbook may not be reloaded yet, as done asynchronously, so wait while ( !mAddressBook->loadingHasFinished() ) { @@ -987,7 +979,7 @@ TQString KABCore::getNameByPhone( const TQString &phone ) // use sleep here to reduce cpu usage usleep( 100 ); } -#endif + // End of ugly hack TQRegExp r( "[/*/-/ ]" ); TQString localPhone( phone ); diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index 8b5b62e0..bc603bad 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -501,12 +501,7 @@ TDEABC::Addressee LDAPSearchDialog::convertLdapAttributesToAddressee( const KPIM addr.setOrganization( asUtf8( attrs[ "o" ].first() ) ); if ( addr.organization().isEmpty() ) addr.setOrganization( asUtf8( attrs[ "Company" ].first() ) ); - -#if KDE_IS_VERSION(3,5,8) addr.setDepartment( asUtf8( attrs[ "department" ].first() ) ); -#else - addr.insertCustom( "KADDRESSBOOK", "X-Department", asUtf8( attrs[ "department" ].first() ) ); -#endif // Address TDEABC::Address workAddr( TDEABC::Address::Work ); diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp index 85bbb6d0..578c2ce0 100644 --- a/kaddressbook/printing/printingwizard.cpp +++ b/kaddressbook/printing/printingwizard.cpp @@ -199,13 +199,8 @@ void PrintingWizard::print() } list.setReverseSorting( !mStylePage->sortAscending() ); - -#if KDE_IS_VERSION(3,3,91) PrintSortMode sortMode( mStylePage->sortField() ); list.sortByMode( &sortMode ); -#else - list.sortByField( mStylePage->sortField() ); -#endif } kdDebug(5720) << "PrintingWizardImpl::print: printing " diff --git a/kaddressbook/printing/printsortmode.cpp b/kaddressbook/printing/printsortmode.cpp index edbb9acc..4f56be4a 100644 --- a/kaddressbook/printing/printsortmode.cpp +++ b/kaddressbook/printing/printsortmode.cpp @@ -25,8 +25,6 @@ #include "printsortmode.h" -#if KDE_IS_VERSION(3,3,91) - PrintSortMode::PrintSortMode( TDEABC::Field *field, bool ascending ) : mSortField( field ), mAscending( ascending ) { @@ -73,4 +71,3 @@ bool PrintSortMode::lesser( const TDEABC::Addressee &first, return lesser; } -#endif diff --git a/kaddressbook/printing/printsortmode.h b/kaddressbook/printing/printsortmode.h index fca9f6ba..a65e766e 100644 --- a/kaddressbook/printing/printsortmode.h +++ b/kaddressbook/printing/printsortmode.h @@ -24,10 +24,6 @@ #ifndef PRINTSORTMODE_H #define PRINTSORTMODE_H -#include - -#if KDE_IS_VERSION(3,3,91) - #include class PrintSortMode : public TDEABC::SortMode @@ -45,6 +41,4 @@ class PrintSortMode : public TDEABC::SortMode bool mAscending; }; -#endif // KDE_IS_VERSION - #endif // PRINTSORTMODE_H diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index eb508b3d..9b34f8b6 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -29,7 +29,6 @@ #include #include -#include #include #include #include @@ -92,9 +91,7 @@ void LookAndFeelPage::restoreSettings( TDEConfig *config ) mBackgroundBox->setChecked(config->readBoolEntry("Background", false)); mBackgroundName->lineEdit()->setText(config->readPathEntry("BackgroundName")); -#if KDE_IS_VERSION(3,2,90) mIMPresenceBox->setChecked( config->readBoolEntry( "InstantMessagingPresence", false ) ); -#endif } void LookAndFeelPage::saveSettings( TDEConfig *config ) @@ -104,9 +101,7 @@ void LookAndFeelPage::saveSettings( TDEConfig *config ) config->writeEntry("ToolTips", mToolTipBox->isChecked()); config->writeEntry("Background", mBackgroundBox->isChecked()); config->writePathEntry("BackgroundName", mBackgroundName->lineEdit()->text()); -#if KDE_IS_VERSION(3,2,90) config->writeEntry( "InstantMessagingPresence", mIMPresenceBox->isChecked() ); -#endif } void LookAndFeelPage::initGUI() @@ -142,10 +137,8 @@ void LookAndFeelPage::initGUI() mToolTipBox = new TQCheckBox(i18n("Enable contact tooltips"), this, "mToolTipBox"); layout->addWidget(mToolTipBox); -#if KDE_IS_VERSION(3,2,90) mIMPresenceBox = new TQCheckBox( i18n( "Show instant messaging presence" ), this, "mIMPresenceBox" ); layout->addWidget( mIMPresenceBox ); -#endif } void LookAndFeelPage::enableBackgroundToggled(bool enabled) diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index 6ebe07a6..02ba9987 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -195,15 +195,9 @@ void BirthdayDlg::loadAddressBook() { if (!mAddressBook) { -#if KDE_IS_VERSION(3,1,90) - mAddressBook = TDEABC::StdAddressBook::self(true); + mAddressBook = TDEABC::StdAddressBook::self(true); if (mAddressBook) connect(mAddressBook, TQ_SIGNAL(addressBookChanged(AddressBook*)), TQ_SLOT(updateSelectionList())); -#else - mAddressBook = TDEABC::StdAddressBook::self(); - if (mAddressBook) - updateSelectionList(); -#endif } else updateSelectionList(); diff --git a/kalarm/fontcolour.h b/kalarm/fontcolour.h index c70bcc56..4a4eb52b 100644 --- a/kalarm/fontcolour.h +++ b/kalarm/fontcolour.h @@ -21,7 +21,6 @@ #ifndef FONTCOLOUR_H #define FONTCOLOUR_H -#include #include #include #include diff --git a/kalarm/kalarm.h b/kalarm/kalarm.h index ddf6ad64..5389a559 100644 --- a/kalarm/kalarm.h +++ b/kalarm/kalarm.h @@ -29,8 +29,6 @@ #define KALARM_VERSION "1.5.5" #define KALARM_NAME "KAlarm" -#include - #define AUTOSTART_BY_KALARMD // temporary fix for autostart before session restoration // #define OLD_DCOP // retain DCOP pre-1.2 compatibility diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp index 667d5c7c..96fd3a8c 100644 --- a/kalarm/lib/spinbox.cpp +++ b/kalarm/lib/spinbox.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include #include #include "spinbox.moc" @@ -63,10 +62,8 @@ void SpinBox::init() delete spinwidgets; editor()->installEventFilter(this); // handle shift-up/down arrow presses -#if KDE_IS_VERSION(3,1,90) // Detect when the text field is edited connect(editor(), TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textEdited())); -#endif } void SpinBox::setReadOnly(bool ro) @@ -226,12 +223,10 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e) shift = ((we->state() & (TQt::ShiftButton | TQt::AltButton)) == TQt::ShiftButton); break; } -#if KDE_IS_VERSION(3,1,90) case TQEvent::Leave: if (mEdited) interpretText(); break; -#endif default: break; } diff --git a/kalarm/mainwindowbase.cpp b/kalarm/mainwindowbase.cpp index 78dac9fa..3396dbe1 100644 --- a/kalarm/mainwindowbase.cpp +++ b/kalarm/mainwindowbase.cpp @@ -19,7 +19,6 @@ */ #include "kalarm.h" -#include #include "kalarmapp.h" #include "mainwindowbase.moc" @@ -42,9 +41,7 @@ void MainWindowBase::closeEvent(TQCloseEvent* ce) */ bool MainWindowBase::queryExit() { -#if KDE_IS_VERSION(3,1,90) if (tdeApp->sessionSaving()) return true; -#endif return disableQuit ? false : TDEMainWindow::queryExit(); } diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp index 6ea6e29d..b862b90f 100644 --- a/kmail/filterlogdlg.cpp +++ b/kmail/filterlogdlg.cpp @@ -31,7 +31,6 @@ #include "filterlog.h" #include -#include #include #include #include @@ -155,12 +154,6 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) this, TQ_SLOT(slotLogStateChanged(void))); setInitialSize( TQSize( 500, 500 ) ); -#if !KDE_IS_VERSION( 3, 2, 91 ) - // HACK - KWin keeps all dialogs on top of their mainwindows, but that's probably - // wrong (#76026), and should be done only for modals. CVS HEAD should get - // proper fix in KWin (see also searchwindow.cpp) - XDeleteProperty( tqt_xdisplay(), winId(), XA_WM_TRANSIENT_FOR ); -#endif } diff --git a/kmail/kmaddrbook.h b/kmail/kmaddrbook.h index 26cd9c0b..e39d4a18 100644 --- a/kmail/kmaddrbook.h +++ b/kmail/kmaddrbook.h @@ -21,8 +21,6 @@ #define KMAddrBook_h #include - -#include #include class TQWidget; diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h index daef055d..b1e48c70 100644 --- a/kmail/kmail_part.h +++ b/kmail/kmail_part.h @@ -27,7 +27,6 @@ #include "kmailpartIface.h" -#include #include #include #include diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index 76f46060..479096cf 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -30,7 +30,6 @@ #include #include -#include #include #include diff --git a/kmail/kmedit.h b/kmail/kmedit.h index 7327327e..c8a1078a 100644 --- a/kmail/kmedit.h +++ b/kmail/kmedit.h @@ -5,7 +5,6 @@ #ifndef __KMAIL_KMEDIT_H__ #define __KMAIL_KMEDIT_H__ -#include #include #include #include diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index ea3610bb..fba22199 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -9,7 +9,6 @@ #include #include -#include #include #include diff --git a/kmail/kmmainwin.h b/kmail/kmmainwin.h index 9e12e71c..990d6a8a 100644 --- a/kmail/kmmainwin.h +++ b/kmail/kmmainwin.h @@ -21,7 +21,6 @@ #define __KMMAINWIN #include -#include "tdeversion.h" #include "tqstring.h" class KMMainWidget; diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp index cf1e7272..fd4cf5e8 100644 --- a/kmail/kmsender.cpp +++ b/kmail/kmsender.cpp @@ -14,7 +14,6 @@ using namespace KMime::Types; #include #include #include -#include #include #include #include diff --git a/kmail/kmsender.h b/kmail/kmsender.h index 7e2cbf4e..afc8dd6c 100644 --- a/kmail/kmsender.h +++ b/kmail/kmsender.h @@ -32,7 +32,6 @@ #include #include #include -#include class KMMessage; class KMFolder; diff --git a/kmail/kmsender_p.h b/kmail/kmsender_p.h index da2a2cbd..ca5f1e9b 100644 --- a/kmail/kmsender_p.h +++ b/kmail/kmsender_p.h @@ -10,7 +10,6 @@ #include #include #include -#include class TDEProcess; diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp index 84f0d385..53747363 100644 --- a/kmail/searchwindow.cpp +++ b/kmail/searchwindow.cpp @@ -121,12 +121,6 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, mLastFocus(0), mKMMainWidget(w) { -#if !KDE_IS_VERSION( 3, 2, 91 ) - // HACK - KWin keeps all dialogs on top of their mainwindows, but that's probably - // wrong (#76026), and should be done only for modals. CVS HEAD should get - // proper fix in KWin (l.lunak@kde.org) - XDeleteProperty( tqt_xdisplay(), winId(), XA_WM_TRANSIENT_FOR ); -#endif KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon()); TDEConfig* config = KMKernel::config(); diff --git a/knode/headerview.cpp b/knode/headerview.cpp index cae8da28..2d7850c5 100644 --- a/knode/headerview.cpp +++ b/knode/headerview.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include "knglobals.h" diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index 4a43a9d5..565cc95f 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -17,7 +17,6 @@ #include #include #include -#include #include "addressesdialog.h" using KPIM::AddressesDialog; #include "recentaddresses.h" diff --git a/knode/kncomposer.h b/knode/kncomposer.h index 00dc1551..6505eaa6 100644 --- a/knode/kncomposer.h +++ b/knode/kncomposer.h @@ -23,9 +23,6 @@ #include #include -#include -#include - #include #include diff --git a/knode/knhdrviewitem.cpp b/knode/knhdrviewitem.cpp index 1e31a1b9..85a1fb68 100644 --- a/knode/knhdrviewitem.cpp +++ b/knode/knhdrviewitem.cpp @@ -17,7 +17,6 @@ #include #include -#include #include #include diff --git a/knode/knode_part.h b/knode/knode_part.h index 99f810c5..c083ec20 100644 --- a/knode/knode_part.h +++ b/knode/knode_part.h @@ -25,7 +25,6 @@ #define KNODE_PART_H -#include #include #include #include diff --git a/knotes/knote.cpp b/knotes/knote.cpp index e0ac842a..f03943c9 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -1360,14 +1360,12 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev ) return true; } -#if KDE_IS_VERSION( 3, 5, 1 ) if ( ev->type() == TQEvent::MouseButtonRelease ) { NETRootInfo wm_root( tqt_xdisplay(), NET::WMMoveResize ); wm_root.moveResizeRequest( winId(), e->globalX(), e->globalY(), NET::MoveResizeCancel ); return false; } -#endif if ( m_menu && ( ev->type() == TQEvent::MouseButtonPress ) && ( e->button() == TQt::RightButton ) ) diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index 6e43d25d..3faa41b8 100644 --- a/korganizer/actionmanager.cpp +++ b/korganizer/actionmanager.cpp @@ -68,7 +68,6 @@ #include #include #include -#include #include #include diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 7df989cb..90cd4099 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -287,11 +287,7 @@ KOAgendaView::KOAgendaView( Calendar *cal, mSplitterAgenda = new TQSplitter(TQt::Vertical,this); topLayout->addWidget(mSplitterAgenda); -#if KDE_IS_VERSION( 3, 1, 93 ) mSplitterAgenda->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); -#else - mSplitterAgenda->setOpaqueResize(); -#endif mAllDayFrame = new TQHBox(mSplitterAgenda); diff --git a/korganizer/komailclient.cpp b/korganizer/komailclient.cpp index a03db92a..e259854a 100644 --- a/korganizer/komailclient.cpp +++ b/korganizer/komailclient.cpp @@ -292,9 +292,7 @@ int KOMailClient::kMailOpenComposer(const TQString& arg0,const TQString& arg1, arg << arg4; arg << arg5; arg << arg6; -#if KDE_IS_VERSION( 3, 2, 90 ) tdeApp->updateRemoteUserTimestamp( "kmail" ); -#endif if (tdeApp->dcopClient()->call("kmail","KMailIface","openComposer(TQString,TQString,TQString,TQString,TQString,int,KURL)", data, replyType, replyData ) ) { if ( replyType == "int" ) { TQDataStream _reply_stream( replyData, IO_ReadOnly ); @@ -344,9 +342,7 @@ int KOMailClient::kMailOpenComposer( const TQString& arg0, const TQString& arg1, arg << arg13; arg << arg14; arg << identity; -#if KDE_IS_VERSION( 3, 2, 90 ) tdeApp->updateRemoteUserTimestamp("kmail"); -#endif if ( tdeApp->dcopClient()->call("kmail","KMailIface", "openComposer(TQString,TQString,TQString,TQString,TQString,int,TQString,TQCString,TQCString,TQCString,TQCString,TQCString,TQString,TQCString,TQCString,uint)", data, replyType, replyData ) ) { if ( replyType == "int" ) { diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index c5960b76..96c2f338 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/korganizer/korgac/alarmdockwindow.cpp @@ -27,7 +27,6 @@ #include #include -#include #include #include #include @@ -85,17 +84,10 @@ AlarmDockWindow::AlarmDockWindow( const char *name ) if ( !quit ) { kdDebug(5890) << "No Quit standard action." << endl; } else { -#if KDE_IS_VERSION(3,3,90) quit->disconnect( TQ_SIGNAL( activated() ), this, TQ_SLOT( maybeQuit() ) ); connect( quit, TQ_SIGNAL( activated() ), TQ_SLOT( slotQuit() ) ); } -#else //FIXME: remove for KDE 4.0 - quit->disconnect( TQ_SIGNAL( activated() ), tqApp, - TQ_SLOT( closeAllWindows() ) ); - } - connect( this, TQ_SIGNAL( quitSelected() ), TQ_SLOT( slotQuit() ) ); -#endif TQToolTip::add(this, mName ); } diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp index 596ece08..5205d09e 100644 --- a/korganizer/printing/calprinter.cpp +++ b/korganizer/printing/calprinter.cpp @@ -36,7 +36,6 @@ #include #include #include -#include #include "korganizer/corehelper.h" @@ -233,11 +232,7 @@ CalPrintDialog::~CalPrintDialog() void CalPrintDialog::setPreview(bool preview) { -#if KDE_IS_VERSION( 3, 1, 93 ) setButtonOK( preview ? i18n("&Preview") : KStdGuiItem::print() ); -#else - setButtonOKText( preview ? i18n("&Preview") : i18n("&Print...") ); -#endif } void CalPrintDialog::setPrintType( int i ) diff --git a/korganizer/urihandler.cpp b/korganizer/urihandler.cpp index 27a6e970..64e2676e 100644 --- a/korganizer/urihandler.cpp +++ b/korganizer/urihandler.cpp @@ -107,9 +107,7 @@ bool UriHandler::process( TQWidget *parent, const TQString &uri ) replyTypeStr, replyData ); if ( foundAbbrowser ) { // KAddressbook is already running, so just DCOP to it to bring up the contact editor -#if KDE_IS_VERSION( 3, 2, 90 ) tdeApp->updateRemoteUserTimestamp("kaddressbook"); -#endif DCOPRef kaddressbook( "kaddressbook", "KAddressBookIface" ); kaddressbook.send( "showContactEditor", uid ); return true; diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp index 1df85e61..057d9e2b 100644 --- a/libkmime/kmime_util.cpp +++ b/libkmime/kmime_util.cpp @@ -24,10 +24,7 @@ #include #include #include -#include -#if KDE_IS_VERSION( 3, 1, 90 ) #include -#endif #include #include // for TQStrIList @@ -672,11 +669,7 @@ DateFormatter::fancy(time_t otime) const if ( old.date().year() == weekday.date().year() && old.date().dayOfYear() == weekday.date().dayOfYear() ) return i18n( "1. weekday, 2. time", "%1 %2" ). -#if KDE_IS_VERSION( 3, 1, 90 ) arg( locale->calendar()->weekDayName( old.date() ) ). -#else - arg( locale->weekDayName( old.date().dayOfWeek() ) ). -#endif arg( locale->formatTime( old.time(), true) ); } } diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index 2d364aea..be9f552e 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -43,9 +43,7 @@ #include #include #include -#if KDE_IS_VERSION( 3, 1, 90 ) #include -#endif #include "kpgp.h" #include "kpgpui.h" @@ -1657,22 +1655,7 @@ void CipherTextDialog::setMinimumSize() mEditBox->setMinimumHeight( mEditBox->fontMetrics().lineSpacing() * 25 ); int textWidth = mEditBox->contentsWidth() + 30; - - -#if KDE_IS_VERSION( 3, 1, 90 ) int maxWidth = TDEGlobalSettings::desktopGeometry(parentWidget()).width()-100; -#else - TDEConfig gc("kdeglobals", false, false); - gc.setGroup("Windows"); - int maxWidth; - if (TQApplication::desktop()->isVirtualDesktop() && - gc.readBoolEntry("XineramaEnabled", true) && - gc.readBoolEntry("XineramaPlacementEnabled", true)) { - maxWidth = TQApplication::desktop()->screenGeometry(TQApplication::desktop()->screenNumber(parentWidget())).width()-100; - } else { - maxWidth = TQApplication::desktop()->geometry().width()-100; - } -#endif mEditBox->setMinimumWidth( TQMIN( textWidth, maxWidth ) ); } diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp index cb831d41..2752f95e 100644 --- a/libtdepim/kaddrbook.cpp +++ b/libtdepim/kaddrbook.cpp @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include @@ -45,7 +44,6 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) { // if we have to reload the address book then we should also wait until // it's completely reloaded -#if KDE_IS_VERSION(3,4,89) // This ugly hack will be removed in 4.0 while ( !ab->loadingHasFinished() ) { TQApplication::eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); @@ -53,7 +51,7 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) { // use sleep here to reduce cpu usage usleep( 100 ); } -#endif + // End of ugly hack TDEABC::Addressee::List addressees = ab->findByEmail( email ); @@ -98,7 +96,6 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) { // if we have to reload the address book then we should also wait until // it's completely reloaded -#if KDE_IS_VERSION(3,4,89) // This ugly hack will be removed in 4.0 while ( !ab->loadingHasFinished() ) { TQApplication::eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); @@ -106,7 +103,7 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) { // use sleep here to reduce cpu usage usleep( 100 ); } -#endif + // End of ugly hack TDEABC::Addressee::List addressees = ab->findByEmail( email ); @@ -255,7 +252,6 @@ TQString KAddrBookExternal::expandDistributionList( const TQString& listName ) TDEABC::Resource* KAddrBookExternal::selectResourceForSaving( TDEABC::AddressBook *addressBook ) { -#if KDE_IS_VERSION(3,4,89) // This ugly hack will be removed in 4.0 while ( !addressBook->loadingHasFinished() ) { TQApplication::eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); @@ -263,7 +259,7 @@ TDEABC::Resource* KAddrBookExternal::selectResourceForSaving( TDEABC::AddressBoo // use sleep here to reduce cpu usage usleep( 100 ); } -#endif + // End of ugly hack // Select a resource TQPtrList tdeabcResources = addressBook->resources(); diff --git a/libtdepim/kaddrbook.h b/libtdepim/kaddrbook.h index 4ec2b6fc..0d235796 100644 --- a/libtdepim/kaddrbook.h +++ b/libtdepim/kaddrbook.h @@ -7,7 +7,6 @@ #include -#include #include #include diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp index bccbc8aa..92815276 100644 --- a/libtdepim/kfoldertree.cpp +++ b/libtdepim/kfoldertree.cpp @@ -1,5 +1,4 @@ #include "kfoldertree.h" -#include #include #include #include @@ -372,9 +371,7 @@ KFolderTree::KFolderTree( TQWidget *parent, const char* name ) setRootIsDecorated(true); setSelectionModeExt(Extended); setAlternateBackground(TQColor()); -#if KDE_IS_VERSION( 3, 3, 90 ) setShadeSortColumn ( false ); -#endif setFullWidth(true); disableAutoSelection(); setColumnWidth( 0, 120 ); //reasonable default size diff --git a/libtdepim/linklocator.cpp b/libtdepim/linklocator.cpp index 8092ed85..30fda573 100644 --- a/libtdepim/linklocator.cpp +++ b/libtdepim/linklocator.cpp @@ -22,7 +22,6 @@ #include "linklocator.h" #include "pimemoticons.h" -#include #include #include #include @@ -400,20 +399,10 @@ TQString LinkLocator::getEmoticon() } else { const TQString imageName = (*s_smileyEmoticonNameMap)[smiley]; - -#if KDE_IS_VERSION( 3, 3, 91 ) const TQString iconPath = locate( "emoticons", EmotIcons::theme() + TQString::fromLatin1( "/" ) + imageName + TQString::fromLatin1(".png") ); -#else - const TQString iconPath = locate( "data", - TQString::fromLatin1( "kopete/pics/emoticons/" )+ - EmotIcons::theme() + - TQString::fromLatin1( "/" ) + - imageName + TQString::fromLatin1(".png") ); -#endif - const TQString dataUrl = pngToDataUrl( iconPath ); if ( dataUrl.isEmpty() ) { htmlRep = TQString(); diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp index 47fbb452..2f5f2045 100644 --- a/tderesources/groupwise/tdeioslave/groupwise.cpp +++ b/tderesources/groupwise/tdeioslave/groupwise.cpp @@ -38,7 +38,6 @@ #include #include #include -#include #include #include diff --git a/tderesources/kolab/tdeabc/contact.cpp b/tderesources/kolab/tdeabc/contact.cpp index 7d594735..b0138cdb 100644 --- a/tderesources/kolab/tdeabc/contact.cpp +++ b/tderesources/kolab/tdeabc/contact.cpp @@ -33,7 +33,6 @@ #include "contact.h" #include "resourcekolab.h" -#include #include #include #include @@ -1022,11 +1021,7 @@ void Contact::setFields( const TDEABC::Addressee* addressee ) setOrganization( addressee->organization() ); setWebPage( addressee->url().url() ); setIMAddress( addressee->custom( "KADDRESSBOOK", "X-IMAddress" ) ); -#if KDE_IS_VERSION(3,5,8) setDepartment( addressee->department()); -#else - setDepartment( addressee->custom( "KADDRESSBOOK", "X-Department" ) ); -#endif setOfficeLocation( addressee->custom( "KADDRESSBOOK", "X-Office" ) ); setProfession( addressee->custom( "KADDRESSBOOK", "X-Profession" ) ); setRole( addressee->role() ); @@ -1182,11 +1177,7 @@ void Contact::saveTo( TDEABC::Addressee* addressee ) addressee->setOrganization( organization() ); addressee->setUrl( webPage() ); addressee->insertCustom( "KADDRESSBOOK", "X-IMAddress", imAddress() ); -#if KDE_IS_VERSION(3,5,8) addressee->setDepartment( department() ); -#else - addressee->insertCustom( "KADDRESSBOOK", "X-Department", department() ); -#endif addressee->insertCustom( "KADDRESSBOOK", "X-Office", officeLocation() ); addressee->insertCustom( "KADDRESSBOOK", "X-Profession", profession() ); addressee->setRole( role() ); diff --git a/tderesources/newexchange/exchangeconvertercontact.cpp b/tderesources/newexchange/exchangeconvertercontact.cpp index c6f3599f..e31dd45b 100644 --- a/tderesources/newexchange/exchangeconvertercontact.cpp +++ b/tderesources/newexchange/exchangeconvertercontact.cpp @@ -21,7 +21,6 @@ #include "exchangeconvertercontact.h" #include #include -#include #include @@ -254,11 +253,7 @@ bool ExchangeConverterContact::readAddressee( const TQDomElement &node, Addresse addressee.setOrganization( tmpstr ); if ( WebdavHandler::extractString( node, "department", tmpstr ) ) { -#if KDE_IS_VERSION(3,5,8) addressee.setDepartment( tmpstr ); -#else - addressee.insertCustom( "KADDRESSBOOK", "X-Department", tmpstr ); -#endif } if ( WebdavHandler::extractString( node, "roomnumber", tmpstr ) ) addressee.insertCustom( "KADDRESSBOOK", "X-Office", tmpstr ); @@ -450,11 +445,7 @@ TQDomDocument ExchangeConverterContact::createWebDAV( Addressee addr ) domContactProperty( "title", addr.role() ); domContactProperty( "o", addr.organization() ); -#if KDE_IS_VERSION(3,5,8) domContactProperty( "department", addr.department() ); -#else - domContactProperty( "department", addr.custom( "KADDRESSBOOK", "X-Department" ) ); -#endif domContactProperty( "roomnumber", addr.custom( "KADDRESSBOOK", "X-Office" ) ); domContactProperty( "profession", addr.custom( "KADDRESSBOOK", "X-Profession" ) ); domContactProperty( "manager", addr.custom( "KADDRESSBOOK", "X-ManagersName" ) ); diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp index 165f4772..9945ebd0 100644 --- a/tderesources/scalix/tdeioslave/scalix.cpp +++ b/tderesources/scalix/tdeioslave/scalix.cpp @@ -24,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/tderesources/slox/tdeabcresourceslox.cpp b/tderesources/slox/tdeabcresourceslox.cpp index bcd719ba..a32bed50 100644 --- a/tderesources/slox/tdeabcresourceslox.cpp +++ b/tderesources/slox/tdeabcresourceslox.cpp @@ -21,7 +21,6 @@ #include -#include #include #include #include @@ -356,11 +355,7 @@ void ResourceSlox::parseContactAttribute( const TQDomElement &e, Addressee &a ) } else if ( tag == fieldName( Organization ) ) { a.setOrganization( text ); } else if ( tag == fieldName( Department ) ) { -#if KDE_IS_VERSION(3,5,8) a.setDepartment( text ); -#else - a.insertCustom( "KADDRESSBOOK", "X-Department", text ); -#endif } else if ( tag == fieldName( FamilyName ) ) { a.setFamilyName( text ); } else if ( tag == fieldName( GivenName) ) { @@ -549,13 +544,8 @@ void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop else WebdavHandler::addSloxElement( this, doc, prop, fieldName( Birthday ) ); WebdavHandler::addSloxElement( this, doc, prop, fieldName( Role ), a.role() ); -#if KDE_IS_VERSION(3,5,8) WebdavHandler::addSloxElement( this, doc, prop, fieldName( Department ), a.department( ) ); -#else - WebdavHandler::addSloxElement( this, doc, prop, fieldName( Department ), - a.custom( "KADDRESSBOOK", "X-Department" ) ); -#endif if ( type() == "ox" ) { // OX only fields WebdavHandler::addSloxElement( this, doc, prop, fieldName( DisplayName ), a.formattedName() ); WebdavHandler::addSloxElement( this, doc, prop, fieldName( SecondName ), a.additionalName() ); -- cgit v1.2.3