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
@@ -1,64 +1,65 @@
 /***************************************************************************
                           MCursor.cc  -  description
                              -------------------
     begin                : Thu Dec 30 1999
     copyright            : (C) 1999 by Jurrien Loonstra
     email                : j.h.loonstra@st.hanze.nl
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 #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) {
         
         #ifdef KDEVER
         QString file, mfile;
         KStandardDirs dirs;
 
 
         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
 
         QBitmap bitmap, mask;
         bitmap = Resource::loadBitmap("kbill/bitmaps/" + QString::fromLocal8Bit(name));
 
         if (masked == SEP_MASK)
             mask = bitmap = Resource::loadBitmap("kbill/bitmaps/" + QString::fromLocal8Bit(name) + "_mask.xbm");
         else
            mask = bitmap;
         cursor = new QCursor(bitmap, mask, bitmap.width() / 2, bitmap.height() / 2);
 }
 
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
@@ -1,70 +1,70 @@
 /***************************************************************************
                           Picture.cc  -  description
                              -------------------
     begin                : Thu Dec 30 1999
     copyright            : (C) 1999 by Jurrien Loonstra
     email                : j.h.loonstra@st.hanze.nl
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   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
 void Picture::load(const char *name, int index) {
         //QString dir = KApplication::kde_datadir(), file;
         // QString dir = locate("data",""),file;
         // dir += "/kbill/";
         // if (index>=0)
         //      file.sprintf ("%spixmaps/%s_%d.xpm", (const char *)dir, name, index);
         // else
         //      file.sprintf("%spixmaps/%s.xpm", (const char *)dir, name);
 #ifdef KDEVER
         KStandardDirs dirs;
         QString file;
 
         if (index>=0) {
         //kdDebug() << "Here";
         QString sindex;
         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 << 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);
 if (index>=0)
 pix->load(Resource::findPixmap("kbill/pixmaps/" + QString::fromLocal8Bit(name) +"_"+ sindex));
 else
 pix->load(Resource::findPixmap("kbill/pixmaps/" + QString::fromLocal8Bit(name)));
 
         width = pix->width();
         height = pix->height();
 
 }
 
 QPixmap* Picture::getPixmap() {
         return pix;
 }
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
@@ -1,16 +1,16 @@
         TEMPLATE = app
         CONFIG  = qt warn_on 
         HEADERS = kbill.h field.h Bucket.h Cable.h Computer.h Game.h Horde.h \
 Library.h MCursor.h Monster.h Network.h Picture.h Spark.h Strings.h \
 UI.h  objects.h inputbox.h
         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 )