kbill no longer needs STL

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
@@ -22,3 +22,4 @@
 #endif
-#include <iostream>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 #include <qpe/resource.h>
@@ -39,3 +40,3 @@ void MCursor::load(const char *name, int masked) {
         if (bitmap.load(file) == FALSE) {
-                std::cerr << "cannot open " << file << std::endl;
+                oerr << "cannot open " << file << oendl;
                 exit(1);
@@ -46,3 +47,3 @@ void MCursor::load(const char *name, int masked) {
                 if (mask.load(mfile) == FALSE) {
-                        std::cerr << "cannot open " << file << std::endl;
+                        oerr << "cannot open " << file << oendl;
                         exit(1);
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
@@ -18,4 +18,4 @@
 
-#include <iostream>
-
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 #include <qpe/resource.h>
@@ -50,3 +50,3 @@ void Picture::load(const char *name, int index) {
         if (pix->load(file) == FALSE)
-                std::cerr << "cannot open " << file << std::endl;
+                oerr << "cannot open " << file << oendl;
         width = pix->width();
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
@@ -3,2 +3,2 @@
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 )
+    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
@@ -12,3 +12,3 @@ INCLUDEPATH	+= $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
-        LIBS    += -lqpe -lstdc++
+        LIBS    += -lqpe -lopiecore2
         DESTDIR =  $(OPIEDIR)/bin