Add local fixes for problem where code uses KDE_VERSION 305 to mean

the wrong thing (it's a long story).

8 files changed, 304 insertions, 0 deletions

diff --git a/editors/calligra/files/patch-karbon-karbon_view.cc b/editors/calligra/files/patch-karbon-karbon_view.cc
new file mode 100644
index 000000000000..5209dc9a610f
--- /dev/null
+++ b/editors/calligra/files/patch-karbon-karbon_view.cc
@@ -0,0 +1,29 @@
+--- ./karbon/karbon_view.cc.orig	Sat Aug 31 07:12:55 2002
++++ ./karbon/karbon_view.cc	Sun Nov 17 06:31:40 2002
+@@ -1086,7 +1086,7 @@
+     m_joinStyle->addState( new QPixmap( DesktopIcon( "join_miter" ) ) );
+     m_joinStyle->addState( new QPixmap( DesktopIcon( "join_round" ) ) );
+     m_joinStyle->setState( 0 );
+-#if KDE_VERSION >= 305
++#if KDE_VERSION >= 306
+ 	new KWidgetAction( m_joinStyle, i18n("Set Join Style"), 0, this, SLOT( slotJoinStyleClicked() ), actionCollection(), "setJoinStyle" );
+ #endif
+ 	connect( m_joinStyle, SIGNAL(clicked()), this, SLOT(slotJoinStyleClicked()) );
+@@ -1097,7 +1097,7 @@
+     m_capStyle->addState( new QPixmap( DesktopIcon( "cap_square" ) ) );
+     m_capStyle->addState( new QPixmap( DesktopIcon( "cap_round" ) ) );
+     m_capStyle->setState( 0 );
+-#if KDE_VERSION >= 305
++#if KDE_VERSION >= 306
+ 	new KWidgetAction( m_capStyle, i18n("Set Cap Style"), 0, this, SLOT( slotCapStyleClicked() ), actionCollection(), "setCapStyle" );
+ #endif
+ 	connect( m_capStyle, SIGNAL(clicked()), this, SLOT(slotCapStyleClicked()) );
+@@ -1109,7 +1109,7 @@
+ 				this, SLOT( selectionChanged() ) );
+ 		connect( m_strokeFillPreview, SIGNAL( fillChanged( const VFill & ) ),
+ 				this, SLOT( selectionChanged() ) );
+-#if KDE_VERSION >= 305
++#if KDE_VERSION >= 306
+ 		//new KWidgetAction( m_strokeFillPreview, i18n(""), 0, this, SLOT( ), actionCollection(), "preview" );
+ #endif
+ 		mainWindow()->toolBar( "Toolbox" )->insertWidget( 10, 30, m_strokeFillPreview );
diff --git a/editors/calligra/files/patch-kpresenter-kpresenter_dlg_config.cc b/editors/calligra/files/patch-kpresenter-kpresenter_dlg_config.cc
new file mode 100644
index 000000000000..012854cf57d2
--- /dev/null
+++ b/editors/calligra/files/patch-kpresenter-kpresenter_dlg_config.cc
@@ -0,0 +1,20 @@
+--- ./kpresenter/kpresenter_dlg_config.cc.orig	Sat Aug 31 07:13:35 2002
++++ ./kpresenter/kpresenter_dlg_config.cc	Sun Nov 17 06:30:28 2002
+@@ -305,7 +305,7 @@
+     grid1->addWidget( lab, 0, 0 );
+ 
+     bgColor = new KColorButton( oldBgColor,
+-#if KDE_VERSION >= 305
++#if KDE_VERSION >= 306
+                                 oldBgColor,
+ #endif
+                                 tmpQGroupBox );
+@@ -318,7 +318,7 @@
+     grid1->addWidget( lab, 2, 0 );
+ 
+     gridColor = new KColorButton( oldGridColor,
+-#if KDE_VERSION >= 305
++#if KDE_VERSION >= 306
+                                   oldGridColor,
+ #endif
+                                   tmpQGroupBox );
diff --git a/editors/calligra/files/patch-kpresenter-kpresenter_view.cc b/editors/calligra/files/patch-kpresenter-kpresenter_view.cc
new file mode 100644
index 000000000000..bb78c80bfee4
--- /dev/null
+++ b/editors/calligra/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;
diff --git a/editors/calligra/files/patch-kspread-kspread_dlg_preference.cc b/editors/calligra/files/patch-kspread-kspread_dlg_preference.cc
new file mode 100644
index 000000000000..c3398be9f749
--- /dev/null
+++ b/editors/calligra/files/patch-kspread-kspread_dlg_preference.cc
@@ -0,0 +1,20 @@
+--- ./kspread/kspread_dlg_preference.cc.orig	Mon Jul 29 09:24:21 2002
++++ ./kspread/kspread_dlg_preference.cc	Sun Nov 17 06:31:59 2002
+@@ -719,7 +719,7 @@
+   QLabel *label = new QLabel(i18n("&Grid color:"), tmpQGroupBox,"label20" );
+ 
+   gridColor = new KColorButton( _gridColor,
+-#if KDE_VERSION >= 305
++#if KDE_VERSION >= 306
+                                 Qt::lightGray,
+ #endif
+                                 tmpQGroupBox );
+@@ -736,7 +736,7 @@
+   QLabel * label2 = new QLabel( i18n("&Page borders:"), tmpQGroupBox, "label21" );
+ 
+   pageBorderColor = new KColorButton( _pbColor,
+-#if KDE_VERSION >= 305
++#if KDE_VERSION >= 306
+                                 Qt::red,
+ #endif
+                                 tmpQGroupBox );
diff --git a/editors/calligra/files/patch-kspread-kspread_view.cc b/editors/calligra/files/patch-kspread-kspread_view.cc
new file mode 100644
index 000000000000..6b481feb2b45
--- /dev/null
+++ b/editors/calligra/files/patch-kspread-kspread_view.cc
@@ -0,0 +1,47 @@
+--- ./kspread/kspread_view.cc.orig	Sat Aug 31 07:13:44 2002
++++ ./kspread/kspread_view.cc	Sun Nov 17 06:32:41 2002
+@@ -1426,7 +1426,7 @@
+     if(m_pDoc->getKSpellConfig())
+     {
+         m_pDoc->getKSpellConfig()->setIgnoreList(m_pDoc->spellListIgnoreAll());
+-#if KDE_VERSION >= 305
++#if KDE_VERSION >= 306
+         m_pDoc->getKSpellConfig()->setReplaceAllList(m_spell.replaceAll);
+ #endif
+ 
+@@ -1457,7 +1457,7 @@
+   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
+ 
+@@ -1567,7 +1567,7 @@
+   m_spell.firstSpellTable   = 0L;
+   m_spell.currentSpellTable = 0L;
+   m_spell.currentCell       = 0L;
+-#if KDE_VERSION >= 305
++#if KDE_VERSION >= 306
+   m_spell.replaceAll.clear();
+ #endif
+ 
+@@ -1713,7 +1713,7 @@
+             }
+         }
+     }
+-#if KDE_VERSION >= 305
++#if KDE_VERSION >= 306
+     m_spell.replaceAll.clear();
+ #endif
+ 
+@@ -1733,7 +1733,7 @@
+   m_spell.kspell->cleanUp();
+   delete m_spell.kspell;
+   m_spell.kspell = 0L;
+-#if KDE_VERSION >= 305
++#if KDE_VERSION >= 306
+   m_spell.replaceAll.clear();
+ #endif
+ 
diff --git a/editors/calligra/files/patch-kword-kwview.cc b/editors/calligra/files/patch-kword-kwview.cc
new file mode 100644
index 000000000000..ba97326d9e00
--- /dev/null
+++ b/editors/calligra/files/patch-kword-kwview.cc
@@ -0,0 +1,56 @@
+--- ./kword/kwview.cc.orig	Sat Aug 31 07:13:52 2002
++++ ./kword/kwview.cc	Sun Nov 17 06:33:20 2002
+@@ -1043,7 +1043,7 @@
+     // Necessary for the actions that are not plugged anywhere
+     // Deprecated with KDE-3.1.
+     // Note entirely sure it's necessary for 3.0, please test and report.
+-#if KDE_VERSION < 305
++#if KDE_VERSION < 306
+     KAccel * accel = new KAccel( this );
+     actNbsp->plugAccel( accel );
+     actSoftHyphen->plugAccel( accel );
+@@ -1928,7 +1928,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;
+@@ -1998,7 +1998,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;
+@@ -2073,7 +2073,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;
+@@ -4979,7 +4979,7 @@
+     if(m_doc->getKSpellConfig())
+     {
+         m_doc->getKSpellConfig()->setIgnoreList(m_doc->spellListIgnoreAll());
+-#if KDE_VERSION >= 305
++#if KDE_VERSION >= 306
+         m_doc->getKSpellConfig()->setReplaceAllList(m_spell.replaceAll);
+ #endif
+     }
+@@ -5000,7 +5000,7 @@
+     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
+ 
diff --git a/editors/calligra/files/patch-lib-kofficecore-koMainWindow.cc b/editors/calligra/files/patch-lib-kofficecore-koMainWindow.cc
new file mode 100644
index 000000000000..d11c803fe245
--- /dev/null
+++ b/editors/calligra/files/patch-lib-kofficecore-koMainWindow.cc
@@ -0,0 +1,38 @@
+--- ./lib/kofficecore/koMainWindow.cc.orig	Sat Aug 31 07:13:56 2002
++++ ./lib/kofficecore/koMainWindow.cc	Sun Nov 17 06:33:37 2002
+@@ -179,7 +179,7 @@
+     d->m_manager->setSelectionPolicy( KParts::PartManager::TriState );
+     d->m_manager->setAllowNestedParts( true );
+     d->m_manager->setIgnoreScrollBars( true );
+-#if KDE_VERSION > 305
++#if KDE_VERSION > 306
+     d->m_manager->setActivationButtonMask( Qt::LeftButton | Qt::MidButton );
+ #endif
+ 
+@@ -1115,7 +1115,7 @@
+     QApplication::sendEvent( d->m_activeView, &ev );
+ 
+     // As of KDE-3.1, the plugins are child XMLGUI objects of the part
+-#if KDE_VERSION < 305
++#if KDE_VERSION < 306
+     QPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects( d->m_activeView );
+     KParts::Plugin *plugin = plugins.last();
+     while ( plugin )
+@@ -1133,7 +1133,7 @@
+ 
+   if ( !d->bMainWindowGUIBuilt )
+   {
+-#if KDE_VERSION >= 305
++#if KDE_VERSION >= 306
+     // Load mainwindow plugins
+     KParts::Plugin::loadPlugins( this, this, instance(), true );
+ #endif
+@@ -1149,7 +1149,7 @@
+     factory->addClient( d->m_activeView );
+ 
+     // As of KDE-3.1, the plugins are child XMLGUI objects of the part
+-#if KDE_VERSION < 305
++#if KDE_VERSION < 306
+     QPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects( d->m_activeView );
+     QPtrListIterator<KParts::Plugin> pIt( plugins );
+     for (; pIt.current(); ++pIt )
diff --git a/editors/calligra/files/patch-lib-kotext-koParagDia.cc b/editors/calligra/files/patch-lib-kotext-koParagDia.cc
new file mode 100644
index 000000000000..96e6f7bc38d9
--- /dev/null
+++ b/editors/calligra/files/patch-lib-kotext-koParagDia.cc
@@ -0,0 +1,20 @@
+--- ./lib/kotext/koParagDia.cc.orig	Sun Sep  1 14:09:03 2002
++++ ./lib/kotext/koParagDia.cc	Sun Nov 17 06:33:53 2002
+@@ -1132,7 +1132,7 @@
+     grid->addWidget( lColor, 4, 0 );
+ 
+     bColor = new KColorButton( black,
+-#if KDE_VERSION >= 305
++#if KDE_VERSION >= 306
+                                 black,
+ #endif
+                                 this );
+@@ -1955,7 +1955,7 @@
+     QLabel *lcolor = new QLabel( i18n( "Color:" ), shadow );
+     grid2->addWidget(lcolor,0,0);
+     color = new KColorButton( black,
+-#if KDE_VERSION >= 305
++#if KDE_VERSION >= 306
+                               black,
+ #endif
+                               shadow );