diff --git a/configuredialog.cpp b/configuredialog.cpp
index deb288cd8..98d71b790 100644
--- a/configuredialog.cpp
+++ b/configuredialog.cpp
@@ -2441,13 +2441,8 @@ AppearancePageMessageTagTab::AppearancePageMessageTagTab( QWidget * parent )
QLabel *sclabel = new QLabel( i18n("Shortc&ut:") , mTagSettingGroupBox );
sclabel->setBuddy( mKeySequenceWidget );
settings->addWidget( sclabel, 6, 0 );
-#if KDE_IS_VERSION(4,0,60)
mKeySequenceWidget->setCheckActionCollections(
kmkernel->getKMMainWidget()->actionCollections() );
-#else
- mKeySequenceWidget->setCheckActionList(
- kmkernel->getKMMainWidget()->actionList() );
-#endif
connect( mKeySequenceWidget, SIGNAL( keySequenceChanged( const QKeySequence & ) ),
this, SLOT( slotEmitChangeCheck() ) );
diff --git a/customtemplates.cpp b/customtemplates.cpp
index dbb91fc87..27317c089 100644
--- a/customtemplates.cpp
+++ b/customtemplates.cpp
@@ -84,13 +84,8 @@ CustomTemplates::CustomTemplates( QWidget *parent, const char *name )
connect( mKeySequenceWidget, SIGNAL( keySequenceChanged( const QKeySequence& ) ),
this, SLOT( slotShortcutChanged( const QKeySequence& ) ) );
-#if KDE_IS_VERSION(4,0,60)
mKeySequenceWidget->setCheckActionCollections(
kmkernel->getKMMainWidget()->actionCollections() );
-#else
- mKeySequenceWidget->setCheckActionList(
- kmkernel->getKMMainWidget()->actionList() );
-#endif
mReplyPix = KIconLoader().loadIcon( "mail-reply-sender", KIconLoader::Small );
mReplyAllPix = KIconLoader().loadIcon( "mail-reply-all", KIconLoader::Small );
diff --git a/foldershortcutdialog.cpp b/foldershortcutdialog.cpp
index 560d7c3ca..563a2fa17 100644
--- a/foldershortcutdialog.cpp
+++ b/foldershortcutdialog.cpp
@@ -81,11 +81,7 @@ FolderShortcutDialog::FolderShortcutDialog( KMFolder *folder,
connect( this, SIGNAL( okClicked() ), SLOT( slotOk() ) );
mKeySeqWidget->setKeySequence( folder->shortcut().primary(),
KKeySequenceWidget::NoValidate );
-#if KDE_IS_VERSION(4,0,60)
mKeySeqWidget->setCheckActionCollections( mMainWidget->actionCollections() );
-#else
- mKeySeqWidget->setCheckActionList( mMainWidget->actionList() );
-#endif
}
FolderShortcutDialog::~FolderShortcutDialog()
diff --git a/kmfilterdlg.cpp b/kmfilterdlg.cpp
index ebb24edd2..35f8942d5 100644
--- a/kmfilterdlg.cpp
+++ b/kmfilterdlg.cpp
@@ -257,13 +257,8 @@ KMFilterDlg::KMFilterDlg(QWidget* parent, bool popFilter, bool createDummyFilter
mKeySeqWidget->setObjectName( "FilterShortcutSelector" );
gl->addWidget( mKeySeqWidget, 7, 3, 1, 1);
mKeySeqWidget->setEnabled( false );
-#if KDE_IS_VERSION(4,0,60)
mKeySeqWidget->setCheckActionCollections(
kmkernel->getKMMainWidget()->actionCollections() );
-#else
- mKeySeqWidget->setCheckActionList(
- kmkernel->getKMMainWidget()->actionList() );
-#endif
mConfigureToolbar = new QCheckBox( i18n("Additionally add this filter to the toolbar"), mAdvOptsGroup );
gl->addWidget( mConfigureToolbar, 8, 0, 1, 4 );
mConfigureToolbar->setEnabled( false );
diff --git a/kmmessage.cpp b/kmmessage.cpp
index 1bbe10956..58b1041bd 100644
--- a/kmmessage.cpp
+++ b/kmmessage.cpp
@@ -1700,7 +1700,6 @@ void KMMessage::initHeader( uint id )
setSubject("");
setDateToday();
-#if KDE_IS_VERSION(4,0,60)
// user agent, e.g. KMail/1.9.50 (Windows/5.0; KDE/3.97.1; i686; svn-762186; 2008-01-15)
QStringList extraInfo;
# if defined KMAIL_SVN_REVISION_STRING && defined KMAIL_SVN_LAST_CHANGE
@@ -1709,18 +1708,6 @@ void KMMessage::initHeader( uint id )
setHeaderField("User-Agent",
KProtocolManager::userAgentForApplication( "KMail", KMAIL_VERSION, extraInfo )
);
-#else
- //
- // user agent, e.g. KMail/1.9.50 (KDE/3.97.1; svn-762186; 2008-01-15)
- setHeaderField("User-Agent", QString::fromLatin1("KMail/" KMAIL_VERSION " (KDE/%1.%2.%3")
- .arg( KDE::versionMajor() ).arg( KDE::versionMinor() ).arg( KDE::versionRelease() )
-# if defined KMAIL_SVN_REVISION_STRING && defined KMAIL_SVN_LAST_CHANGE
- + "; " KMAIL_SVN_REVISION_STRING "; " KMAIL_SVN_LAST_CHANGE
-# endif
- + ")"
- );
- //
-#endif
// This will allow to change Content-Type:
setHeaderField("Content-Type","text/plain");
diff --git a/snippetdlg.cpp b/snippetdlg.cpp
index aa6705259..0fa8d47a8 100644
--- a/snippetdlg.cpp
+++ b/snippetdlg.cpp
@@ -38,11 +38,7 @@ SnippetDlg::SnippetDlg( KActionCollection* ac, QWidget* parent, bool modal,
setupUi( this );
setModal( modal );
-#if KDE_IS_VERSION(4,0,60)
keyWidget->setCheckActionCollections( QList() << ac );
-#else
- keyWidget->setCheckActionList( ac->actions() );
-#endif
//TODO tab order in designer!
setTabOrder( snippetText, keyWidget );