| author | mickeyl <mickeyl> | 2005-01-15 23:07:36 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2005-01-15 23:07:36 (UTC) |
| commit | 972d0500299d6bed8e0890810f9c120390268dcf (patch) (side-by-side diff) | |
| tree | f38d1a12f290d4e47c012483a113a67b7dfc2f30 | |
| 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 @@ -20,7 +20,8 @@ #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; @@ -37,14 +38,14 @@ void MCursor::load(const char *name, int masked) { 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); } } 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 @@ -16,8 +16,8 @@ ***************************************************************************/ #include "Picture.h" -#include <iostream> - +#include <opie2/odebug.h> +using namespace Opie::Core; #include <qpe/resource.h> #ifdef KDEVER #include <kapp.h> @@ -48,7 +48,7 @@ void Picture::load(const char *name, int index) { 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 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 @@ -10,7 +10,7 @@ INTERFACES = helpdialog.ui TARGET = kbill INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lstdc++ +LIBS += -lqpe -lopiecore2 DESTDIR = $(OPIEDIR)/bin include( $(OPIEDIR)/include.pro ) |