File disable-new-kkeyseqwidget-api-r809986.diff of Package kdepim4

Overview Repositories Revisions Requests Users Attributes Meta

File disable-new-kkeyseqwidget-api-r809986.diff of Package kdepim4 (Revision ec8529b5d5ddd95e7cc1264cd4188fef)

Currently displaying revision ec8529b5d5ddd95e7cc1264cd4188fef , Show latest

Index: kmail/kmfilterdlg.cpp
===================================================================
--- kmail/kmfilterdlg.cpp	(revision 809986)
+++ kmail/kmfilterdlg.cpp	(revision 809985)
@@ -257,8 +257,13 @@ KMFilterDlg::KMFilterDlg(QWidget* parent
       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 );
Index: kmail/snippetdlg.cpp
===================================================================
--- kmail/snippetdlg.cpp	(revision 809986)
+++ kmail/snippetdlg.cpp	(revision 809985)
@@ -38,7 +38,11 @@ SnippetDlg::SnippetDlg( KActionCollectio
     setupUi( this );
     setModal( modal );
 
+#if KDE_IS_VERSION(4,0,60)
     keyWidget->setCheckActionCollections( QList<KActionCollection*>() << ac );
+#else
+    keyWidget->setCheckActionList( ac->actions() );
+#endif
 
     //TODO tab order in designer!
     setTabOrder( snippetText, keyWidget );
Index: kmail/kmmessage.cpp
===================================================================
--- kmail/kmmessage.cpp	(revision 809986)
+++ kmail/kmmessage.cpp	(revision 809985)
@@ -1700,6 +1700,7 @@ 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
@@ -1708,6 +1709,18 @@ void KMMessage::initHeader( uint id )
   setHeaderField("User-Agent",
     KProtocolManager::userAgentForApplication( "KMail", KMAIL_VERSION, extraInfo )
   );
+#else
+  // <FIXME remove later for KDE < 4.0.60 (jstaniek) >
+  // 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
+    + ")"
+  );
+  // </FIXME>
+#endif
 
   // This will allow to change Content-Type:
   setHeaderField("Content-Type","text/plain");
Index: kmail/foldershortcutdialog.cpp
===================================================================
--- kmail/foldershortcutdialog.cpp	(revision 809986)
+++ kmail/foldershortcutdialog.cpp	(revision 809985)
@@ -81,7 +81,11 @@ FolderShortcutDialog::FolderShortcutDial
   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()
Index: kmail/configuredialog.cpp
===================================================================
--- kmail/configuredialog.cpp	(revision 809986)
+++ kmail/configuredialog.cpp	(revision 809985)
@@ -2441,8 +2441,13 @@ AppearancePageMessageTagTab::AppearanceP
   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() ) );
Index: kmail/customtemplates.cpp
===================================================================
--- kmail/customtemplates.cpp	(revision 809986)
+++ kmail/customtemplates.cpp	(revision 809985)
@@ -84,8 +84,13 @@ CustomTemplates::CustomTemplates( QWidge
   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 );
Index: libkdepim/kmeditor.cpp
===================================================================
--- libkdepim/kmeditor.cpp	(revision 809986)
+++ libkdepim/kmeditor.cpp	(revision 809985)
@@ -359,8 +359,10 @@ void KMeditorPrivate::init()
   QShortcut * insertMode = new QShortcut( QKeySequence( Qt::Key_Insert ), q );
   q->connect( insertMode, SIGNAL( activated() ),
               q, SLOT( slotChangeInsertMode() ) );
+#if KDE_IS_VERSION(4,0,67)
   q->connect( q, SIGNAL( languageChanged(const QString &) ),
               q, SLOT( setSpellCheckLanguage(const QString &) ) );
+#endif
 }
 
 void KMeditor::slotChangeInsertMode()
@@ -448,6 +450,7 @@ void KMeditor::disableWordWrap()
 
 void KMeditor::contextMenuEvent( QContextMenuEvent *event )
 {
+#if KDE_IS_VERSION(4,0,73)
   // Obtain the cursor at the mouse position and the current cursor
   QTextCursor cursorAtMouse = cursorForPosition( event->pos() );
   int mousePos = cursorAtMouse.position();
@@ -542,6 +545,10 @@ void KMeditor::contextMenuEvent( QContex
       }
     }
   }
+#else
+  KTextEdit::contextMenuEvent( event );
+  kWarning() << "spell check menu not compiled in, kdelibs too old.";
+#endif
 }
 
 void KMeditor::slotPasteAsQuotation()
@@ -943,7 +950,9 @@ void KMeditor::setSpellCheckLanguage( co
     KTextEdit::highlighter()->setCurrentLanguage( language );
     KTextEdit::highlighter()->rehighlight();
   }
+#if KDE_IS_VERSION(4,0,60)
   KTextEdit::setSpellCheckingLanguage( language );
+#endif
 
   if ( language != d->language )
     emit spellcheckLanguageChanged( language );
@@ -974,10 +983,12 @@ void KMeditor::showSpellConfigDialog( co
 {
   KConfig config( configFileName );
   Sonnet::ConfigDialog dialog( &config, this );
+#if KDE_IS_VERSION(4,0,67)
   if ( !d->language.isEmpty() )
     dialog.setLanguage( d->language );
   connect( &dialog, SIGNAL( languageChanged(const QString &) ),
            this, SLOT( setSpellCheckLanguage(const QString &) ) );
+#endif
   dialog.setWindowIcon( KIcon( "internet-mail" ) );
   dialog.exec();
 }

Places

File disable-new-kkeyseqwidget-api-r809986.diff of Package kdepim4 (Revision ec8529b5d5ddd95e7cc1264cd4188fef)

Places