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 /noncore/games | |
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/games/kbill/MCursor.cc | 6 | ||||
-rw-r--r-- | noncore/games/kbill/Picture.cc | 6 |
2 files changed, 6 insertions, 6 deletions
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 @@ -22,13 +22,13 @@ #include <qwidget.h> #include <qstring.h> #ifdef KDEVER #include <kapp.h> #include <kstandarddirs.h> #endif -#include <iostream.h> +#include <iostream> #include <qpe/resource.h> MCursor::~MCursor() { delete cursor; } void MCursor::load(const char *name, int masked) { @@ -39,20 +39,20 @@ 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 mask = bitmap; #endif 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 @@ -14,13 +14,13 @@ * (at your option) any later version. * * * ***************************************************************************/ #include "Picture.h" #include "objects.h" -#include <iostream.h> +#include <iostream> #include <qstring.h> #include <qpe/resource.h> #ifdef KDEVER #include <kapp.h> #include <kstandarddirs.h> @@ -44,16 +44,16 @@ void Picture::load(const char *name, int index) { sindex.setNum(index); // kdDebug() << "kbill/pixmaps/" + QString::fromLocal8Bit(name) + "_" + sindex + ".xpm"; 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; pix = new QPixmap(); sindex.setNum(index); |