| -rw-r--r-- | noncore/games/kbill/MCursor.cc | 6 | ||||
| -rw-r--r-- | noncore/games/kbill/Picture.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/noncore/games/kbill/MCursor.cc b/noncore/games/kbill/MCursor.cc index 30f7577..a3cb340 100644 --- a/noncore/games/kbill/MCursor.cc +++ b/noncore/games/kbill/MCursor.cc @@ -16,49 +16,49 @@ ***************************************************************************/ #include "MCursor.h" #include "objects.h" #include <qcursor.h> #include <qbitmap.h> #include <qwidget.h> #include <qstring.h> #ifdef KDEVER #include <kapp.h> #include <kstandarddirs.h> #endif -#include <iostream.h> +#include <iostream> #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) { - cerr << "cannot open " << file << endl; + std::cerr << "cannot open " << file << std::endl; 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) { - cerr << "cannot open " << file << endl; + std::cerr << "cannot open " << file << std::endl; 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"); diff --git a/noncore/games/kbill/Picture.cc b/noncore/games/kbill/Picture.cc index 79e19ba..fe0eff8 100644 --- a/noncore/games/kbill/Picture.cc +++ b/noncore/games/kbill/Picture.cc @@ -8,25 +8,25 @@ /*************************************************************************** * * * 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 "objects.h" -#include <iostream.h> +#include <iostream> #include <qstring.h> #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/"; @@ -38,28 +38,28 @@ void Picture::load(const char *name, int index) { 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 << endl; + kdDebug() << file << std::endl; pix = new QPixmap(); if (pix->load(file) == FALSE) - cerr << "cannot open " << file << endl; + std::cerr << "cannot open " << file << std::endl; 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(); |