namespace and include fix for uses of iostream in STL

4 files changed, 14 insertions, 12 deletions

diff --git a/noncore/apps/oxygen/kmolcalc.cpp b/noncore/apps/oxygen/kmolcalc.cpp
index 33666b1..1d41b0f 100644
--- a/noncore/apps/oxygen/kmolcalc.cpp
+++ b/noncore/apps/oxygen/kmolcalc.cpp
@@ -15,9 +15,9 @@
 #include <qdict.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qpe/qpeapplication.h>
-#include <iostream.h>
+#include <iostream>
 
 
 /**
  * Construct a new calculator object.
diff --git a/noncore/games/kbill/MCursor.cc b/noncore/games/kbill/MCursor.cc
index 30f7577..a3cb340 100644
--- a/noncore/games/kbill/MCursor.cc
+++ b/noncore/games/kbill/MCursor.cc
@@ -24,9 +24,9 @@
 #ifdef KDEVER
 #include <kapp.h>
 #include <kstandarddirs.h>
 #endif
-#include <iostream.h>
+#include <iostream>
 #include <qpe/resource.h>
 MCursor::~MCursor() {
 	delete cursor;
 }
@@ -41,16 +41,16 @@ void MCursor::load(const char *name, int masked) {
 	file = dirs.findResource("data","kbill/bitmaps/" + QString::fromLocal8Bit(name)  + ".xbm");
 
 	QBitmap bitmap, mask;
 	if (bitmap.load(file) == FALSE) {
-		cerr << "cannot open " << file << endl;
+		std::cerr << "cannot open " << file << std::endl;
 		exit(1);
 	}
 	if (masked == SEP_MASK) {
 //		mfile.sprintf ("%sbitmaps/%s_mask.xbm", (const char*)dir, name);
 		mfile = file = dirs.findResource("data","kbill/bitmaps/" + QString::fromLocal8Bit(name)  + "_mask.xbm");
 		if (mask.load(mfile) == FALSE) {
-			cerr << "cannot open " << file << endl;
+			std::cerr << "cannot open " << file << std::endl;
 			exit(1);
 		}
 	}
 	else
diff --git a/noncore/games/kbill/Picture.cc b/noncore/games/kbill/Picture.cc
index 79e19ba..fe0eff8 100644
--- a/noncore/games/kbill/Picture.cc
+++ b/noncore/games/kbill/Picture.cc
@@ -16,9 +16,9 @@
  ***************************************************************************/
 #include "Picture.h"
 #include "objects.h"
 
-#include <iostream.h>
+#include <iostream>
 
 #include <qstring.h>
 #include <qpe/resource.h>
 #ifdef KDEVER
@@ -46,12 +46,12 @@ void Picture::load(const char *name, int index) {
 	   file = dirs.findResource("data","kbill/pixmaps/" + QString::fromLocal8Bit(name) + "_" + sindex + ".xpm");
 	} else {
 	  file = dirs.findResource("data","kbill/pixmaps/" + QString::fromLocal8Bit(name) + ".xpm");
 	}
-	kdDebug() << file << endl;
+	kdDebug() << file << std::endl;
 	pix = new QPixmap();
 	if (pix->load(file) == FALSE)
-		cerr << "cannot open " << file << endl;
+		std::cerr << "cannot open " << file << std::endl;
 	width = pix->width();
 	height = pix->height();
 #endif
 QString sindex;
diff --git a/noncore/unsupported/qpdf/QOutputDev.cpp b/noncore/unsupported/qpdf/QOutputDev.cpp
index f587a33..52237f5 100644
--- a/noncore/unsupported/qpdf/QOutputDev.cpp
+++ b/noncore/unsupported/qpdf/QOutputDev.cpp
@@ -18,8 +18,10 @@
 #include <unistd.h>
 #include <string.h>
 #include <ctype.h>
 #include <math.h>
+#include <iostream>
+
 #include "GString.h"
 #include "Object.h"
 #include "Stream.h"
 #include "Link.h"
@@ -669,9 +671,9 @@ void QOutputDev::drawChar ( GfxState *state, fp_t x, fp_t y,
 
 		if ( dorot ) {	
 			oldmat = m_painter-> worldMatrix ( );
 
-			cerr << endl << "ROTATED: " << m11 << ", " << m12 << ", " << m21 << ", " << m22 << " / SIZE: " << fsize << " / TEXT: " << str. local8Bit ( ) << endl << endl;
+			std::cerr << std::endl << "ROTATED: " << m11 << ", " << m12 << ", " << m21 << ", " << m22 << " / SIZE: " << fsize << " / TEXT: " << str. local8Bit ( ) << endl << endl;
 						
 			QWMatrix mat ( lrint ( m11 / fsize ), lrint ( m12 / fsize ), -lrint ( m21 / fsize ), -lrint ( m22 / fsize ), lrint ( x1 ), lrint ( y1 ));
 			
 			m_painter-> setWorldMatrix ( mat );
@@ -776,10 +778,10 @@ void QOutputDev::drawImageMask ( GfxState *state, Object */*ref*/, Stream *str,
 			
 #ifndef QT_NO_TRANSFORMATIONS			
 	QWMatrix mat ( ctm [0] / width, ctm [1], ctm [2], ctm [3] / height, ctm [4], ctm [5] );
 	
-	cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << endl 
-	         << " - M=" << mat. m11 ( ) << "/" << mat. m12 ( ) << "/" << mat. m21 ( ) << "/" << mat. m22 ( ) << endl;
+	std::cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << std::endl 
+	         << " - M=" << mat. m11 ( ) << "/" << mat. m12 ( ) << "/" << mat. m21 ( ) << "/" << mat. m22 ( ) << std::endl;
 	         
 	QWMatrix oldmat = m_painter-> worldMatrix ( );
 	m_painter-> setWorldMatrix ( mat, true );
 
@@ -905,10 +907,10 @@ void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int wi
 
 #ifndef QT_NO_TRANSFORMATIONS			
 	QWMatrix mat ( ctm [0] / width, ctm [1], ctm [2], ctm [3] / height, ctm [4], ctm [5] );
 
-	cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << endl 
-	         << " - M=" << mat. m11 ( ) << "/" << mat. m12 ( ) << "/" << mat. m21 ( ) << "/" << mat. m22 ( ) << endl;
+	std::cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << std::endl 
+	         << " - M=" << mat. m11 ( ) << "/" << mat. m12 ( ) << "/" << mat. m21 ( ) << "/" << mat. m22 ( ) << std::endl;
 
 	QWMatrix oldmat = m_painter-> worldMatrix ( );
 	m_painter-> setWorldMatrix ( mat, true );