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
@@ -17,13 +17,14 @@
 #include "MCursor.h"
 
 #ifdef KDEVER
 #include <kapp.h>
 #include <kstandarddirs.h>
 #endif
-#include <iostream>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 #include <qpe/resource.h>
 MCursor::~MCursor() {
 	delete cursor;
 }
 
 void MCursor::load(const char *name, int masked) {
@@ -34,20 +35,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) {
-		std::cerr << "cannot open " << file << std::endl;
+		oerr << "cannot open " << file << oendl;
 		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) {
-			std::cerr << "cannot open " << file << std::endl;
+			oerr << "cannot open " << file << oendl;
 			exit(1);
 		}
 	}
 	else
 	mask = bitmap;
 	#endif
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
@@ -13,14 +13,14 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 #include "Picture.h"
 
-#include <iostream>
-
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 #include <qpe/resource.h>
 #ifdef KDEVER
 #include <kapp.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #endif
@@ -45,13 +45,13 @@ void Picture::load(const char *name, int index) {
 	} else {
 	  file = dirs.findResource("data","kbill/pixmaps/" + QString::fromLocal8Bit(name) + ".xpm");
 	}
 	kdDebug() << file << std::endl;
 	pix = new QPixmap();
 	if (pix->load(file) == FALSE)
-		std::cerr << "cannot open " << file << std::endl;
+		oerr << "cannot open " << file << oendl;
 	width = pix->width();
 	height = pix->height();
 #endif
 QString sindex;
 pix = new QPixmap();
 sindex.setNum(index);
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 @@
   config KBILL
     boolean "opie-kbill (hit Bill before he can infect your network with a wannabe OS)"
     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
@@ -7,10 +7,10 @@ SOURCES		= field.cpp Bucket.cc Cable.cc Computer.cc Game.cc Horde.cc \
 Library.cc MCursor.cc Monster.cc  Network.cc Picture.cc \ 
 Spark.cc UI.cpp inputbox.cpp kbill.cpp
 INTERFACES = helpdialog.ui
 TARGET 		= kbill
 INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
-LIBS		+= -lqpe -lstdc++
+LIBS		+= -lqpe -lopiecore2
 DESTDIR 	=  $(OPIEDIR)/bin
 
 include( $(OPIEDIR)/include.pro )