diff options
| author | Alan Eldridge <alane@FreeBSD.org> | 2002-11-17 19:35:49 +0000 |
|---|---|---|
| committer | Alan Eldridge <alane@FreeBSD.org> | 2002-11-17 19:35:49 +0000 |
| commit | 5d894f61193ca57b7d80c4385637fb9b69c0a08b (patch) | |
| tree | 903eb0331b232829e3a660fe28bc72ac8cf9c647 /editors/koffice-kde3/files/patch-kpresenter-kpresenter_view.cc | |
| parent | Update to 3.14. (diff) | |
Add local fixes for problem where code uses KDE_VERSION 305 to mean
the wrong thing (it's a long story).
Notes
Notes:
svn path=/head/; revision=70316
Diffstat (limited to 'editors/koffice-kde3/files/patch-kpresenter-kpresenter_view.cc')
| -rw-r--r-- | editors/koffice-kde3/files/patch-kpresenter-kpresenter_view.cc | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/editors/koffice-kde3/files/patch-kpresenter-kpresenter_view.cc b/editors/koffice-kde3/files/patch-kpresenter-kpresenter_view.cc new file mode 100644 index 000000000000..bb78c80bfee4 --- /dev/null +++ b/editors/koffice-kde3/files/patch-kpresenter-kpresenter_view.cc @@ -0,0 +1,74 @@ +--- ./kpresenter/kpresenter_view.cc.orig Sat Aug 31 07:13:36 2002 ++++ ./kpresenter/kpresenter_view.cc Sun Nov 17 06:31:18 2002 +@@ -3224,7 +3224,7 @@ + actionCollection(), "format_style" ); + connect( actionFormatStyle, SIGNAL( activated( int ) ), + this, SLOT( textStyleSelected( int ) ) ); +-#if KDE_VERSION >= 305 ++#if KDE_VERSION >= 306 + actionFormatStyle->setRemoveAmpersandsInCombo( true ); + #endif + updateStyleList(); +@@ -3972,7 +3972,7 @@ + { + QColor c = kPresenterDoc()->presPen().color(); + if ( KColorDialog::getColor( c +-#if KDE_VERSION >= 305 ++#if KDE_VERSION >= 306 + , Qt::red + #endif + ) ) { +@@ -5116,7 +5116,7 @@ + { + if (m_spell.kspell) return; // Already in progress + m_spell.macroCmdSpellCheck=0L; +-#if KDE_VERSION >= 305 ++#if KDE_VERSION >= 306 + m_spell.replaceAll.clear(); + #endif + +@@ -5173,7 +5173,7 @@ + if(m_pKPresenterDoc->getKSpellConfig()) + { + m_pKPresenterDoc->getKSpellConfig()->setIgnoreList(m_pKPresenterDoc->spellListIgnoreAll()); +-#if KDE_VERSION >= 305 ++#if KDE_VERSION >= 306 + m_pKPresenterDoc->getKSpellConfig()->setReplaceAllList(m_spell.replaceAll); + #endif + +@@ -5194,7 +5194,7 @@ + this, SLOT( spellCheckerDone( const QString & ) ) ); + QObject::connect( m_spell.kspell, SIGNAL( ignoreall (const QString & ) ), + this, SLOT( spellCheckerIgnoreAll( const QString & ) ) ); +-#if KDE_VERSION >= 305 ++#if KDE_VERSION >= 306 + QObject::connect( m_spell.kspell, SIGNAL( replaceall( const QString &, const QString & )), this, SLOT( spellCheckerReplaceAll( const QString &, const QString & ))); + #endif + +@@ -5323,7 +5323,7 @@ + { + m_pKPresenterDoc->setReadWrite(true); + m_spell.textObject.clear(); +-#if KDE_VERSION >= 305 ++#if KDE_VERSION >= 306 + m_spell.replaceAll.clear(); + #endif + +@@ -5362,7 +5362,7 @@ + m_spell.macroCmdSpellCheck=0L; + + m_pKPresenterDoc->setReadWrite(true); +-#if KDE_VERSION >= 305 ++#if KDE_VERSION >= 306 + m_spell.replaceAll.clear(); + #endif + +@@ -6273,7 +6273,7 @@ + // to individual actions + QStringList lstWithAccels; + // Generate unique accelerators for the menu items +-#if KDE_VERSION >= 305 // but only if the '&' will be removed from the combobox ++#if KDE_VERSION >= 306 // but only if the '&' will be removed from the combobox + KAccelGen::generate( lst, lstWithAccels ); + #else + lstWithAccels = lst; |