author | kergoth <kergoth> | 2002-11-14 22:40:52 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-14 22:40:52 (UTC) |
commit | ec92de66e81b145119ff15bea0ad88436eb7bd4b (patch) (unidiff) | |
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 | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <kapp.h> | 25 | #include <kapp.h> |
26 | #include <kstandarddirs.h> | 26 | #include <kstandarddirs.h> |
27 | #endif | 27 | #endif |
28 | #include <iostream.h> | 28 | #include <iostream> |
29 | #include <qpe/resource.h> | 29 | #include <qpe/resource.h> |
30 | MCursor::~MCursor() { | 30 | MCursor::~MCursor() { |
31 | delete cursor; | 31 | delete cursor; |
@@ -42,14 +42,14 @@ void MCursor::load(const char *name, int masked) { | |||
42 | 42 | ||
43 | QBitmap bitmap, mask; | 43 | QBitmap bitmap, mask; |
44 | if (bitmap.load(file) == FALSE) { | 44 | if (bitmap.load(file) == FALSE) { |
45 | cerr << "cannot open " << file << endl; | 45 | std::cerr << "cannot open " << file << std::endl; |
46 | exit(1); | 46 | exit(1); |
47 | } | 47 | } |
48 | if (masked == SEP_MASK) { | 48 | if (masked == SEP_MASK) { |
49 | // mfile.sprintf ("%sbitmaps/%s_mask.xbm", (const char*)dir, name); | 49 | // mfile.sprintf ("%sbitmaps/%s_mask.xbm", (const char*)dir, name); |
50 | mfile = file = dirs.findResource("data","kbill/bitmaps/" + QString::fromLocal8Bit(name) + "_mask.xbm"); | 50 | mfile = file = dirs.findResource("data","kbill/bitmaps/" + QString::fromLocal8Bit(name) + "_mask.xbm"); |
51 | if (mask.load(mfile) == FALSE) { | 51 | if (mask.load(mfile) == FALSE) { |
52 | cerr << "cannot open " << file << endl; | 52 | std::cerr << "cannot open " << file << std::endl; |
53 | exit(1); | 53 | exit(1); |
54 | } | 54 | } |
55 | } | 55 | } |
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 @@ | |||
17 | #include "Picture.h" | 17 | #include "Picture.h" |
18 | #include "objects.h" | 18 | #include "objects.h" |
19 | 19 | ||
20 | #include <iostream.h> | 20 | #include <iostream> |
21 | 21 | ||
22 | #include <qstring.h> | 22 | #include <qstring.h> |
23 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
@@ -47,10 +47,10 @@ void Picture::load(const char *name, int index) { | |||
47 | } else { | 47 | } else { |
48 | file = dirs.findResource("data","kbill/pixmaps/" + QString::fromLocal8Bit(name) + ".xpm"); | 48 | file = dirs.findResource("data","kbill/pixmaps/" + QString::fromLocal8Bit(name) + ".xpm"); |
49 | } | 49 | } |
50 | kdDebug() << file << endl; | 50 | kdDebug() << file << std::endl; |
51 | pix = new QPixmap(); | 51 | pix = new QPixmap(); |
52 | if (pix->load(file) == FALSE) | 52 | if (pix->load(file) == FALSE) |
53 | cerr << "cannot open " << file << endl; | 53 | std::cerr << "cannot open " << file << std::endl; |
54 | width = pix->width(); | 54 | width = pix->width(); |
55 | height = pix->height(); | 55 | height = pix->height(); |
56 | #endif | 56 | #endif |