| author | kergoth <kergoth> | 2002-11-14 22:40:52 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2002-11-14 22:40:52 (UTC) |
| commit | ec92de66e81b145119ff15bea0ad88436eb7bd4b (patch) (side-by-side diff) | |
| tree | a65e8adc4edd60d7822f75e8b574e8e97596773c | |
| parent | 3f1d60609657ea69bda453f5c820a23ee5375ab8 (diff) | |
| download | opie-ec92de66e81b145119ff15bea0ad88436eb7bd4b.zip opie-ec92de66e81b145119ff15bea0ad88436eb7bd4b.tar.gz opie-ec92de66e81b145119ff15bea0ad88436eb7bd4b.tar.bz2 | |
namespace and include fix for uses of iostream in STL
| -rw-r--r-- | noncore/apps/oxygen/kmolcalc.cpp | 2 | ||||
| -rw-r--r-- | noncore/games/kbill/MCursor.cc | 6 | ||||
| -rw-r--r-- | noncore/games/kbill/Picture.cc | 6 | ||||
| -rw-r--r-- | noncore/unsupported/qpdf/QOutputDev.cpp | 12 |
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 @@ -16,7 +16,7 @@ #include <qdir.h> #include <qfile.h> #include <qpe/qpeapplication.h> -#include <iostream.h> +#include <iostream> /** 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 @@ -25,7 +25,7 @@ #include <kapp.h> #include <kstandarddirs.h> #endif -#include <iostream.h> +#include <iostream> #include <qpe/resource.h> MCursor::~MCursor() { delete cursor; @@ -42,14 +42,14 @@ void MCursor::load(const char *name, int masked) { 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); } } 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 @@ -17,7 +17,7 @@ #include "Picture.h" #include "objects.h" -#include <iostream.h> +#include <iostream> #include <qstring.h> #include <qpe/resource.h> @@ -47,10 +47,10 @@ void Picture::load(const char *name, int index) { } 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 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 @@ -19,6 +19,8 @@ #include <string.h> #include <ctype.h> #include <math.h> +#include <iostream> + #include "GString.h" #include "Object.h" #include "Stream.h" @@ -670,7 +672,7 @@ 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 )); @@ -777,8 +779,8 @@ 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 ); @@ -906,8 +908,8 @@ 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 ); |