[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    kdebase/khelpcenter compilation fix
From:       fenix <fenix () club-internet ! fr>
Date:       2002-06-17 3:39:32
[Download RAW message or body]

Hi,

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

  FeniX

["khc.diff" (khc.diff)]

? khc.diff
Index: docmetainfo.cpp
===================================================================
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 @@
 
 #include "docmetainfo.h"
 
-using namespace KHC;
+namespace KHC {
 
 DocMetaInfo *DocMetaInfo::mSelf = 0;
 
@@ -236,3 +236,5 @@
 
   traverser->finishTraversal();
 }
+
+};
Index: docmetainfo.h
===================================================================
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 @@
 
 #include "docentry.h"
 
-class HTMLSearch;
-
 namespace KHC {
 
+class HTMLSearch;
 class DocEntryTraverser;
 
 /*!
Index: htmlsearch.cpp
===================================================================
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"
 
-using namespace KHC;
+namespace KHC {
 
 HTMLSearch::HTMLSearch()
 {
@@ -57,3 +57,5 @@
 
   return testFile;
 }
+
+};
Index: htmlsearchconfig.cpp
===================================================================
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"
 
-using namespace KHC;
+namespace KHC {
 
 HtmlSearchConfig::HtmlSearchConfig(QWidget *parent, const char *name)
   : QWidget(parent, name)
@@ -153,3 +153,6 @@
 {
   kapp->invokeBrowser(url);
 }
+
+};
+
Index: searchengine.cpp
===================================================================
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"
 
-using namespace KHC;
+namespace KHC {
 
 SearchTraverser::SearchTraverser( SearchEngine *engine, int level ) :
   mEngine( engine), mLevel( level ), mEntry( 0 )
@@ -312,3 +312,5 @@
 
   emit searchFinished();  
 }
+
+};
Index: searchwidget.cpp
===================================================================
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"
 
-using namespace KHC;
+namespace KHC {
 
 SearchWidget::SearchWidget( QWidget *parent )
   : QWidget( parent ),
@@ -308,3 +308,5 @@
     }
   }
 }
+
+};


[prev in list] [next in list] [prev in thread] [next in thread]