summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/oxygen/kmolcalc.cpp2
-rw-r--r--noncore/games/kbill/MCursor.cc6
-rw-r--r--noncore/games/kbill/Picture.cc6
-rw-r--r--noncore/unsupported/qpdf/QOutputDev.cpp12
4 files changed, 14 insertions, 12 deletions
diff --git a/noncore/apps/oxygen/kmolcalc.cpp b/noncore/apps/oxygen/kmolcalc.cpp
index 33666b1..1d41b0f 100644
--- a/noncore/apps/oxygen/kmolcalc.cpp
+++ b/noncore/apps/oxygen/kmolcalc.cpp
@@ -17,5 +17,5 @@
17#include <qfile.h> 17#include <qfile.h>
18#include <qpe/qpeapplication.h> 18#include <qpe/qpeapplication.h>
19#include <iostream.h> 19#include <iostream>
20 20
21 21
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
@@ -26,5 +26,5 @@
26#include <kstandarddirs.h> 26#include <kstandarddirs.h>
27#endif 27#endif
28#include <iostream.h> 28#include <iostream>
29#include <qpe/resource.h> 29#include <qpe/resource.h>
30MCursor::~MCursor() { 30MCursor::~MCursor() {
@@ -43,5 +43,5 @@ void MCursor::load(const char *name, int masked) {
43 QBitmap bitmap, mask; 43 QBitmap bitmap, mask;
44 if (bitmap.load(file) == FALSE) { 44 if (bitmap.load(file) == FALSE) {
45 cerr << "cannot open " << file << endl; 45 std::cerr << "cannot open " << file << std::endl;
46 exit(1); 46 exit(1);
47 } 47 }
@@ -50,5 +50,5 @@ void MCursor::load(const char *name, int masked) {
50 mfile = file = dirs.findResource("data","kbill/bitmaps/" + QString::fromLocal8Bit(name) + "_mask.xbm"); 50 mfile = file = dirs.findResource("data","kbill/bitmaps/" + QString::fromLocal8Bit(name) + "_mask.xbm");
51 if (mask.load(mfile) == FALSE) { 51 if (mask.load(mfile) == FALSE) {
52 cerr << "cannot open " << file << endl; 52 std::cerr << "cannot open " << file << std::endl;
53 exit(1); 53 exit(1);
54 } 54 }
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
@@ -18,5 +18,5 @@
18#include "objects.h" 18#include "objects.h"
19 19
20#include <iostream.h> 20#include <iostream>
21 21
22#include <qstring.h> 22#include <qstring.h>
@@ -48,8 +48,8 @@ void Picture::load(const char *name, int index) {
48 file = dirs.findResource("data","kbill/pixmaps/" + QString::fromLocal8Bit(name) + ".xpm"); 48 file = dirs.findResource("data","kbill/pixmaps/" + QString::fromLocal8Bit(name) + ".xpm");
49 } 49 }
50 kdDebug() << file << endl; 50 kdDebug() << file << std::endl;
51 pix = new QPixmap(); 51 pix = new QPixmap();
52 if (pix->load(file) == FALSE) 52 if (pix->load(file) == FALSE)
53 cerr << "cannot open " << file << endl; 53 std::cerr << "cannot open " << file << std::endl;
54 width = pix->width(); 54 width = pix->width();
55 height = pix->height(); 55 height = pix->height();
diff --git a/noncore/unsupported/qpdf/QOutputDev.cpp b/noncore/unsupported/qpdf/QOutputDev.cpp
index f587a33..52237f5 100644
--- a/noncore/unsupported/qpdf/QOutputDev.cpp
+++ b/noncore/unsupported/qpdf/QOutputDev.cpp
@@ -20,4 +20,6 @@
20#include <ctype.h> 20#include <ctype.h>
21#include <math.h> 21#include <math.h>
22#include <iostream>
23
22#include "GString.h" 24#include "GString.h"
23#include "Object.h" 25#include "Object.h"
@@ -671,5 +673,5 @@ void QOutputDev::drawChar ( GfxState *state, fp_t x, fp_t y,
671 oldmat = m_painter-> worldMatrix ( ); 673 oldmat = m_painter-> worldMatrix ( );
672 674
673 cerr << endl << "ROTATED: " << m11 << ", " << m12 << ", " << m21 << ", " << m22 << " / SIZE: " << fsize << " / TEXT: " << str. local8Bit ( ) << endl << endl; 675 std::cerr << std::endl << "ROTATED: " << m11 << ", " << m12 << ", " << m21 << ", " << m22 << " / SIZE: " << fsize << " / TEXT: " << str. local8Bit ( ) << endl << endl;
674 676
675 QWMatrix mat ( lrint ( m11 / fsize ), lrint ( m12 / fsize ), -lrint ( m21 / fsize ), -lrint ( m22 / fsize ), lrint ( x1 ), lrint ( y1 )); 677 QWMatrix mat ( lrint ( m11 / fsize ), lrint ( m12 / fsize ), -lrint ( m21 / fsize ), -lrint ( m22 / fsize ), lrint ( x1 ), lrint ( y1 ));
@@ -778,6 +780,6 @@ void QOutputDev::drawImageMask ( GfxState *state, Object */*ref*/, Stream *str,
778 QWMatrix mat ( ctm [0] / width, ctm [1], ctm [2], ctm [3] / height, ctm [4], ctm [5] ); 780 QWMatrix mat ( ctm [0] / width, ctm [1], ctm [2], ctm [3] / height, ctm [4], ctm [5] );
779 781
780 cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << endl 782 std::cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << std::endl
781 << " - M=" << mat. m11 ( ) << "/" << mat. m12 ( ) << "/" << mat. m21 ( ) << "/" << mat. m22 ( ) << endl; 783 << " - M=" << mat. m11 ( ) << "/" << mat. m12 ( ) << "/" << mat. m21 ( ) << "/" << mat. m22 ( ) << std::endl;
782 784
783 QWMatrix oldmat = m_painter-> worldMatrix ( ); 785 QWMatrix oldmat = m_painter-> worldMatrix ( );
@@ -907,6 +909,6 @@ void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int wi
907 QWMatrix mat ( ctm [0] / width, ctm [1], ctm [2], ctm [3] / height, ctm [4], ctm [5] ); 909 QWMatrix mat ( ctm [0] / width, ctm [1], ctm [2], ctm [3] / height, ctm [4], ctm [5] );
908 910
909 cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << endl 911 std::cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << std::endl
910 << " - M=" << mat. m11 ( ) << "/" << mat. m12 ( ) << "/" << mat. m21 ( ) << "/" << mat. m22 ( ) << endl; 912 << " - M=" << mat. m11 ( ) << "/" << mat. m12 ( ) << "/" << mat. m21 ( ) << "/" << mat. m22 ( ) << std::endl;
911 913
912 QWMatrix oldmat = m_painter-> worldMatrix ( ); 914 QWMatrix oldmat = m_painter-> worldMatrix ( );