From kde-core-devel  Mon Jun 17 03:39:32 2002
From: fenix <fenix () club-internet ! fr>
Date: Mon, 17 Jun 2002 03:39:32 +0000
To: kde-core-devel
Subject: kdebase/khelpcenter compilation fix
X-MARC-Message: https://marc.info/?l=kde-core-devel&m=102432945824439
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--=-kbLbToiyC1i9mjmy47xq"


--=-kbLbToiyC1i9mjmy47xq
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hi,

 khelpcenter don't build with gcc v3.1 with some namespace errors
this patch fix it ... can you apply it thx

  FeniX

--=-kbLbToiyC1i9mjmy47xq
Content-Disposition: attachment; filename=khc.diff
Content-Transfer-Encoding: quoted-printable
Content-Type: text/x-diff; name=khc.diff; charset=ISO-8859-15

? khc.diff
Index: docmetainfo.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/kde/kdebase/khelpcenter/docmetainfo.cpp,v
retrieving revision 1.9
diff -u -u -r1.9 docmetainfo.cpp
--- docmetainfo.cpp	12 Jun 2002 15:31:46 -0000	1.9
+++ docmetainfo.cpp	16 Jun 2002 21:18:48 -0000
@@ -13,7 +13,7 @@
=20
 #include "docmetainfo.h"
=20
-using namespace KHC;
+namespace KHC {
=20
 DocMetaInfo *DocMetaInfo::mSelf =3D 0;
=20
@@ -236,3 +236,5 @@
=20
   traverser->finishTraversal();
 }
+
+};
Index: docmetainfo.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/kde/kdebase/khelpcenter/docmetainfo.h,v
retrieving revision 1.6
diff -u -u -r1.6 docmetainfo.h
--- docmetainfo.h	12 Jun 2002 15:31:46 -0000	1.6
+++ docmetainfo.h	16 Jun 2002 21:18:48 -0000
@@ -8,10 +8,9 @@
=20
 #include "docentry.h"
=20
-class HTMLSearch;
-
 namespace KHC {
=20
+class HTMLSearch;
 class DocEntryTraverser;
=20
 /*!
Index: htmlsearch.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/kde/kdebase/khelpcenter/htmlsearch.cpp,v
retrieving revision 1.10
diff -u -u -r1.10 htmlsearch.cpp
--- htmlsearch.cpp	12 Jun 2002 13:49:24 -0000	1.10
+++ htmlsearch.cpp	16 Jun 2002 21:18:48 -0000
@@ -8,7 +8,7 @@
 #include "htmlsearch.h"
 #include "htmlsearch.moc"
=20
-using namespace KHC;
+namespace KHC {
=20
 HTMLSearch::HTMLSearch()
 {
@@ -57,3 +57,5 @@
=20
   return testFile;
 }
+
+};
Index: htmlsearchconfig.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/kde/kdebase/khelpcenter/htmlsearchconfig.cpp,v
retrieving revision 1.1
diff -u -u -r1.1 htmlsearchconfig.cpp
--- htmlsearchconfig.cpp	12 Jun 2002 13:49:24 -0000	1.1
+++ htmlsearchconfig.cpp	16 Jun 2002 21:18:48 -0000
@@ -45,7 +45,7 @@
 #include "htmlsearchconfig.h"
 #include "htmlsearchconfig.moc"
=20
-using namespace KHC;
+namespace KHC {
=20
 HtmlSearchConfig::HtmlSearchConfig(QWidget *parent, const char *name)
   : QWidget(parent, name)
@@ -153,3 +153,6 @@
 {
   kapp->invokeBrowser(url);
 }
+
+};
+
Index: searchengine.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/kde/kdebase/khelpcenter/searchengine.cpp,v
retrieving revision 1.6
diff -u -u -r1.6 searchengine.cpp
--- searchengine.cpp	12 Jun 2002 13:49:24 -0000	1.6
+++ searchengine.cpp	16 Jun 2002 21:18:48 -0000
@@ -25,7 +25,7 @@
 #include "searchengine.h"
 #include "searchengine.moc"
=20
-using namespace KHC;
+namespace KHC {
=20
 SearchTraverser::SearchTraverser( SearchEngine *engine, int level ) :
   mEngine( engine), mLevel( level ), mEntry( 0 )
@@ -312,3 +312,5 @@
=20
   emit searchFinished(); =20
 }
+
+};
Index: searchwidget.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/kde/kdebase/khelpcenter/searchwidget.cpp,v
retrieving revision 1.9
diff -u -u -r1.9 searchwidget.cpp
--- searchwidget.cpp	12 Jun 2002 13:49:24 -0000	1.9
+++ searchwidget.cpp	16 Jun 2002 21:18:48 -0000
@@ -57,7 +57,7 @@
 #include "searchwidget.h"
 #include "searchwidget.moc"
=20
-using namespace KHC;
+namespace KHC {
=20
 SearchWidget::SearchWidget( QWidget *parent )
   : QWidget( parent ),
@@ -308,3 +308,5 @@
     }
   }
 }
+
+};

--=-kbLbToiyC1i9mjmy47xq--