author | mickeyl <mickeyl> | 2005-01-15 23:07:36 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-01-15 23:07:36 (UTC) |
commit | 972d0500299d6bed8e0890810f9c120390268dcf (patch) (unidiff) | |
tree | f38d1a12f290d4e47c012483a113a67b7dfc2f30 /noncore | |
parent | 490b0398b7e11f1485b902a6d9b99b9152be2492 (diff) | |
download | opie-972d0500299d6bed8e0890810f9c120390268dcf.zip opie-972d0500299d6bed8e0890810f9c120390268dcf.tar.gz opie-972d0500299d6bed8e0890810f9c120390268dcf.tar.bz2 |
kbill no longer needs STL
-rw-r--r-- | noncore/games/kbill/MCursor.cc | 7 | ||||
-rw-r--r-- | noncore/games/kbill/Picture.cc | 6 | ||||
-rw-r--r-- | noncore/games/kbill/config.in | 2 | ||||
-rw-r--r-- | noncore/games/kbill/kbill.pro | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/noncore/games/kbill/MCursor.cc b/noncore/games/kbill/MCursor.cc index c581693..93dd559 100644 --- a/noncore/games/kbill/MCursor.cc +++ b/noncore/games/kbill/MCursor.cc | |||
@@ -19,9 +19,10 @@ | |||
19 | #ifdef KDEVER | 19 | #ifdef KDEVER |
20 | #include <kapp.h> | 20 | #include <kapp.h> |
21 | #include <kstandarddirs.h> | 21 | #include <kstandarddirs.h> |
22 | #endif | 22 | #endif |
23 | #include <iostream> | 23 | #include <opie2/odebug.h> |
24 | using namespace Opie::Core; | ||
24 | #include <qpe/resource.h> | 25 | #include <qpe/resource.h> |
25 | MCursor::~MCursor() { | 26 | MCursor::~MCursor() { |
26 | delete cursor; | 27 | delete cursor; |
27 | } | 28 | } |
@@ -36,16 +37,16 @@ void MCursor::load(const char *name, int masked) { | |||
36 | file = dirs.findResource("data","kbill/bitmaps/" + QString::fromLocal8Bit(name) + ".xbm"); | 37 | file = dirs.findResource("data","kbill/bitmaps/" + QString::fromLocal8Bit(name) + ".xbm"); |
37 | 38 | ||
38 | QBitmap bitmap, mask; | 39 | QBitmap bitmap, mask; |
39 | if (bitmap.load(file) == FALSE) { | 40 | if (bitmap.load(file) == FALSE) { |
40 | std::cerr << "cannot open " << file << std::endl; | 41 | oerr << "cannot open " << file << oendl; |
41 | exit(1); | 42 | exit(1); |
42 | } | 43 | } |
43 | if (masked == SEP_MASK) { | 44 | if (masked == SEP_MASK) { |
44 | // mfile.sprintf ("%sbitmaps/%s_mask.xbm", (const char*)dir, name); | 45 | // mfile.sprintf ("%sbitmaps/%s_mask.xbm", (const char*)dir, name); |
45 | mfile = file = dirs.findResource("data","kbill/bitmaps/" + QString::fromLocal8Bit(name) + "_mask.xbm"); | 46 | mfile = file = dirs.findResource("data","kbill/bitmaps/" + QString::fromLocal8Bit(name) + "_mask.xbm"); |
46 | if (mask.load(mfile) == FALSE) { | 47 | if (mask.load(mfile) == FALSE) { |
47 | std::cerr << "cannot open " << file << std::endl; | 48 | oerr << "cannot open " << file << oendl; |
48 | exit(1); | 49 | exit(1); |
49 | } | 50 | } |
50 | } | 51 | } |
51 | else | 52 | else |
diff --git a/noncore/games/kbill/Picture.cc b/noncore/games/kbill/Picture.cc index 9d46257..cf96ddf 100644 --- a/noncore/games/kbill/Picture.cc +++ b/noncore/games/kbill/Picture.cc | |||
@@ -15,10 +15,10 @@ | |||
15 | * * | 15 | * * |
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | #include "Picture.h" | 17 | #include "Picture.h" |
18 | 18 | ||
19 | #include <iostream> | 19 | #include <opie2/odebug.h> |
20 | 20 | using namespace Opie::Core; | |
21 | #include <qpe/resource.h> | 21 | #include <qpe/resource.h> |
22 | #ifdef KDEVER | 22 | #ifdef KDEVER |
23 | #include <kapp.h> | 23 | #include <kapp.h> |
24 | #include <kstandarddirs.h> | 24 | #include <kstandarddirs.h> |
@@ -47,9 +47,9 @@ void Picture::load(const char *name, int index) { | |||
47 | } | 47 | } |
48 | kdDebug() << file << std::endl; | 48 | kdDebug() << file << std::endl; |
49 | pix = new QPixmap(); | 49 | pix = new QPixmap(); |
50 | if (pix->load(file) == FALSE) | 50 | if (pix->load(file) == FALSE) |
51 | std::cerr << "cannot open " << file << std::endl; | 51 | oerr << "cannot open " << file << oendl; |
52 | width = pix->width(); | 52 | width = pix->width(); |
53 | height = pix->height(); | 53 | height = pix->height(); |
54 | #endif | 54 | #endif |
55 | QString sindex; | 55 | QString sindex; |
diff --git a/noncore/games/kbill/config.in b/noncore/games/kbill/config.in index ba830a9..a505e34 100644 --- a/noncore/games/kbill/config.in +++ b/noncore/games/kbill/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config KBILL | 1 | config KBILL |
2 | boolean "opie-kbill (hit Bill before he can infect your network with a wannabe OS)" | 2 | boolean "opie-kbill (hit Bill before he can infect your network with a wannabe OS)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE |
diff --git a/noncore/games/kbill/kbill.pro b/noncore/games/kbill/kbill.pro index 8ecad10..c1d2652 100644 --- a/noncore/games/kbill/kbill.pro +++ b/noncore/games/kbill/kbill.pro | |||
@@ -9,8 +9,8 @@ Spark.cc UI.cpp inputbox.cpp kbill.cpp | |||
9 | INTERFACES = helpdialog.ui | 9 | INTERFACES = helpdialog.ui |
10 | TARGET = kbill | 10 | TARGET = kbill |
11 | INCLUDEPATH+= $(OPIEDIR)/include | 11 | INCLUDEPATH+= $(OPIEDIR)/include |
12 | DEPENDPATH+= $(OPIEDIR)/include | 12 | DEPENDPATH+= $(OPIEDIR)/include |
13 | LIBS += -lqpe -lstdc++ | 13 | LIBS += -lqpe -lopiecore2 |
14 | DESTDIR = $(OPIEDIR)/bin | 14 | DESTDIR = $(OPIEDIR)/bin |
15 | 15 | ||
16 | include( $(OPIEDIR)/include.pro ) | 16 | include( $(OPIEDIR)/include.pro ) |