Bug#115303: qub_0.4.9-2(unstable/hppa): patch for g++-3

[James Troup <james@nocrew.org>]

tags 115303 + patch
thanks

In addition to John's patch for g++-2.96, the following changes are
required for g++-3.

A complete build log can be found at
http://buildd.debian.org/build.php?arch=hppa&pkg=qub&ver=0.4.9-2

-- 
James

diff -ur qub-0.4.9.old/lib/libfunUtil/ClassLoader.c++ qub-0.4.9/lib/libfunUtil/ClassLoader.c++
--- qub-0.4.9.old/lib/libfunUtil/ClassLoader.c++	Wed May 31 12:51:26 2000
+++ qub-0.4.9/lib/libfunUtil/ClassLoader.c++	Mon Nov 26 00:25:31 2001
@@ -25,6 +25,8 @@
 #include <qregexp.h>
 #include <iostream.h>
 
+using namespace std;
+
 //  Debugging macro for seeing when dso's are opened & closed
 #if 1
 #define DLOPEN_TRACE(a) cout << "DLOPEN_TRACE: " << a << endl
diff -ur qub-0.4.9.old/lib/libfunUtil/ConfigFile.c++ qub-0.4.9/lib/libfunUtil/ConfigFile.c++
--- qub-0.4.9.old/lib/libfunUtil/ConfigFile.c++	Fri Dec 15 02:51:22 2000
+++ qub-0.4.9/lib/libfunUtil/ConfigFile.c++	Mon Nov 26 00:28:56 2001
@@ -319,7 +319,7 @@
 
 
 bool
-ConfigFile::saveToText( ostream &os) const
+ConfigFile::saveToText( std::ostream &os) const
 {
 	NOT_DONE("saveToText() should be better about wrapping long lines... what it does is unsafe!");
 	QString ts;
@@ -350,7 +350,7 @@
 }
 
 bool
-ConfigFile::loadFromText( istream &is)
+ConfigFile::loadFromText( std::istream &is)
 {
   //debug( "========== loading..." );
 	//  stomp our current contents.
diff -ur qub-0.4.9.old/lib/libfunUtil/ConfigFile.h qub-0.4.9/lib/libfunUtil/ConfigFile.h
--- qub-0.4.9.old/lib/libfunUtil/ConfigFile.h	Fri Dec 15 02:51:22 2000
+++ qub-0.4.9/lib/libfunUtil/ConfigFile.h	Mon Nov 26 00:29:59 2001
@@ -41,8 +41,7 @@
 #include <fun/Serializer.h>
 #include <fun/Deserializer.h>
 
-class istream;
-class ostream;
+#include <iostream>
 
 //namespace fun {
 
@@ -238,12 +237,12 @@
 	/**
 	*  Loads this ConfigFile from the given input stream.
 	*/
-	bool loadFromText( istream &is);
+	bool loadFromText( std::istream &is);
 
 	/**
 	*  Stores this ConfigFile to the given output stream.
 	*/
-	bool saveToText( ostream &os) const;
+	bool saveToText( std::ostream &os) const;
 
 	/**
 	* This take a different ConfigFile and merges in any new values
diff -ur qub-0.4.9.old/lib/libfunUtil/SerialTree.h qub-0.4.9/lib/libfunUtil/SerialTree.h
--- qub-0.4.9.old/lib/libfunUtil/SerialTree.h	Mon Jan  1 01:47:11 2001
+++ qub-0.4.9/lib/libfunUtil/SerialTree.h	Mon Nov 26 00:33:49 2001
@@ -18,6 +18,7 @@
 #ifndef _FUN_SERIALTREE_H
 #define _FUN_SERIALTREE_H
 
+#include <iostream>
 #include <fun/Serializable.h>
 #include <fun/Serializer.h>
 #include <fun/Deserializer.h>
@@ -25,8 +26,6 @@
 //#include <qdom.h>  //  for QDomNode
 
 class QDomDocument;
-class istream;
-class ostream;
 class QDomNode;
 class QDomElement;
 class QTextStream;
@@ -164,11 +163,11 @@
 	*  is responsible for deleting.  Otherwise, it returns NULL, and you
 	*  must consult steaming goat entrails to ascertain the reason.
 	*/
-	static SerialTree *loadFromTextStream(istream &is);
+	static SerialTree *loadFromTextStream(std::istream &is);
 	/**
 	*  Save the tree as text to the given output stream.
 	*/
-	bool saveToTextStream(ostream &os);
+	bool saveToTextStream(std::ostream &os);
 	/**
 	 * Returns an XML string.
 	 */
Only in qub-0.4.9.old/lib/libfunUtil/test: Makefile.in
diff -ur qub-0.4.9.old/lib/libfunUtil/test/testTree.c++ qub-0.4.9/lib/libfunUtil/test/testTree.c++
--- qub-0.4.9.old/lib/libfunUtil/test/testTree.c++	Wed May 31 12:57:07 2000
+++ qub-0.4.9/lib/libfunUtil/test/testTree.c++	Mon Nov 26 00:39:08 2001
@@ -7,6 +7,8 @@
 #include <fun/ClassLoader.h>
 #include <qlist.h>
 
+using namespace std;
+
 class Bar;
 
 class Foo : public Serializable