author | kergoth <kergoth> | 2002-11-14 22:40:52 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-14 22:40:52 (UTC) |
commit | ec92de66e81b145119ff15bea0ad88436eb7bd4b (patch) (unidiff) | |
tree | a65e8adc4edd60d7822f75e8b574e8e97596773c | |
parent | 3f1d60609657ea69bda453f5c820a23ee5375ab8 (diff) | |
download | opie-ec92de66e81b145119ff15bea0ad88436eb7bd4b.zip opie-ec92de66e81b145119ff15bea0ad88436eb7bd4b.tar.gz opie-ec92de66e81b145119ff15bea0ad88436eb7bd4b.tar.bz2 |
namespace and include fix for uses of iostream in STL
-rw-r--r-- | noncore/apps/oxygen/kmolcalc.cpp | 2 | ||||
-rw-r--r-- | noncore/games/kbill/MCursor.cc | 6 | ||||
-rw-r--r-- | noncore/games/kbill/Picture.cc | 6 | ||||
-rw-r--r-- | noncore/unsupported/qpdf/QOutputDev.cpp | 12 |
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 | |||
@@ -7,25 +7,25 @@ | |||
7 | 7 | ||
8 | /** | 8 | /** |
9 | * KMOLCALC is the calculation engine. It knows about a hashtable of user defined atomic | 9 | * KMOLCALC is the calculation engine. It knows about a hashtable of user defined atomic |
10 | * weights and group definitions ELSTABLE, and the currently processed formula, stored | 10 | * weights and group definitions ELSTABLE, and the currently processed formula, stored |
11 | * as a list of elements and their coefficients, ELEMENTS. | 11 | * as a list of elements and their coefficients, ELEMENTS. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "kmolcalc.h" | 14 | #include "kmolcalc.h" |
15 | #include <qdict.h> | 15 | #include <qdict.h> |
16 | #include <qdir.h> | 16 | #include <qdir.h> |
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 | ||
22 | /** | 22 | /** |
23 | * Construct a new calculator object. | 23 | * Construct a new calculator object. |
24 | */ | 24 | */ |
25 | KMolCalc::KMolCalc() { | 25 | KMolCalc::KMolCalc() { |
26 | elements = new ElementList; | 26 | elements = new ElementList; |
27 | elstable = NULL; | 27 | elstable = NULL; |
28 | readElstable(); | 28 | readElstable(); |
29 | } | 29 | } |
30 | 30 | ||
31 | KMolCalc::~KMolCalc() { | 31 | KMolCalc::~KMolCalc() { |
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 @@ | |||
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | #include "MCursor.h" | 17 | #include "MCursor.h" |
18 | #include "objects.h" | 18 | #include "objects.h" |
19 | 19 | ||
20 | #include <qcursor.h> | 20 | #include <qcursor.h> |
21 | #include <qbitmap.h> | 21 | #include <qbitmap.h> |
22 | #include <qwidget.h> | 22 | #include <qwidget.h> |
23 | #include <qstring.h> | 23 | #include <qstring.h> |
24 | #ifdef KDEVER | 24 | #ifdef KDEVER |
25 | #include <kapp.h> | 25 | #include <kapp.h> |
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> |
30 | MCursor::~MCursor() { | 30 | MCursor::~MCursor() { |
31 | delete cursor; | 31 | delete cursor; |
32 | } | 32 | } |
33 | 33 | ||
34 | void MCursor::load(const char *name, int masked) { | 34 | void MCursor::load(const char *name, int masked) { |
35 | 35 | ||
36 | #ifdef KDEVER | 36 | #ifdef KDEVER |
37 | QString file, mfile; | 37 | QString file, mfile; |
38 | KStandardDirs dirs; | 38 | KStandardDirs dirs; |
39 | 39 | ||
40 | 40 | ||
41 | file = dirs.findResource("data","kbill/bitmaps/" + QString::fromLocal8Bit(name) + ".xbm"); | 41 | file = dirs.findResource("data","kbill/bitmaps/" + QString::fromLocal8Bit(name) + ".xbm"); |
42 | 42 | ||
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 | } |
48 | if (masked == SEP_MASK) { | 48 | if (masked == SEP_MASK) { |
49 | // mfile.sprintf ("%sbitmaps/%s_mask.xbm", (const char*)dir, name); | 49 | // mfile.sprintf ("%sbitmaps/%s_mask.xbm", (const char*)dir, name); |
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 | } |
55 | } | 55 | } |
56 | else | 56 | else |
57 | mask = bitmap; | 57 | mask = bitmap; |
58 | #endif | 58 | #endif |
59 | 59 | ||
60 | QBitmap bitmap, mask; | 60 | QBitmap bitmap, mask; |
61 | bitmap = Resource::loadBitmap("kbill/bitmaps/" + QString::fromLocal8Bit(name)); | 61 | bitmap = Resource::loadBitmap("kbill/bitmaps/" + QString::fromLocal8Bit(name)); |
62 | 62 | ||
63 | if (masked == SEP_MASK) | 63 | if (masked == SEP_MASK) |
64 | mask = bitmap = Resource::loadBitmap("kbill/bitmaps/" + QString::fromLocal8Bit(name) + "_mask.xbm"); | 64 | 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 @@ | |||
8 | 8 | ||
9 | /*************************************************************************** | 9 | /*************************************************************************** |
10 | * * | 10 | * * |
11 | * This program is free software; you can redistribute it and/or modify * | 11 | * This program is free software; you can redistribute it and/or modify * |
12 | * it under the terms of the GNU General Public License as published by * | 12 | * it under the terms of the GNU General Public License as published by * |
13 | * the Free Software Foundation; either version 2 of the License, or * | 13 | * the Free Software Foundation; either version 2 of the License, or * |
14 | * (at your option) any later version. * | 14 | * (at your option) any later version. * |
15 | * * | 15 | * * |
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | #include "Picture.h" | 17 | #include "Picture.h" |
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> |
23 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
24 | #ifdef KDEVER | 24 | #ifdef KDEVER |
25 | #include <kapp.h> | 25 | #include <kapp.h> |
26 | #include <kstandarddirs.h> | 26 | #include <kstandarddirs.h> |
27 | #include <kdebug.h> | 27 | #include <kdebug.h> |
28 | #endif | 28 | #endif |
29 | void Picture::load(const char *name, int index) { | 29 | void Picture::load(const char *name, int index) { |
30 | //QString dir = KApplication::kde_datadir(), file; | 30 | //QString dir = KApplication::kde_datadir(), file; |
31 | // QString dir = locate("data",""),file; | 31 | // QString dir = locate("data",""),file; |
32 | // dir += "/kbill/"; | 32 | // dir += "/kbill/"; |
@@ -38,28 +38,28 @@ void Picture::load(const char *name, int index) { | |||
38 | KStandardDirs dirs; | 38 | KStandardDirs dirs; |
39 | QString file; | 39 | QString file; |
40 | 40 | ||
41 | if (index>=0) { | 41 | if (index>=0) { |
42 | //kdDebug() << "Here"; | 42 | //kdDebug() << "Here"; |
43 | QString sindex; | 43 | QString sindex; |
44 | sindex.setNum(index); | 44 | sindex.setNum(index); |
45 | // kdDebug() << "kbill/pixmaps/" + QString::fromLocal8Bit(name) + "_" + sindex + ".xpm"; | 45 | // kdDebug() << "kbill/pixmaps/" + QString::fromLocal8Bit(name) + "_" + sindex + ".xpm"; |
46 | file = dirs.findResource("data","kbill/pixmaps/" + QString::fromLocal8Bit(name) + "_" + sindex + ".xpm"); | 46 | file = dirs.findResource("data","kbill/pixmaps/" + QString::fromLocal8Bit(name) + "_" + sindex + ".xpm"); |
47 | } else { | 47 | } else { |
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(); |
56 | #endif | 56 | #endif |
57 | QString sindex; | 57 | QString sindex; |
58 | pix = new QPixmap(); | 58 | pix = new QPixmap(); |
59 | sindex.setNum(index); | 59 | sindex.setNum(index); |
60 | if (index>=0) | 60 | if (index>=0) |
61 | pix->load(Resource::findPixmap("kbill/pixmaps/" + QString::fromLocal8Bit(name) +"_"+ sindex)); | 61 | pix->load(Resource::findPixmap("kbill/pixmaps/" + QString::fromLocal8Bit(name) +"_"+ sindex)); |
62 | else | 62 | else |
63 | pix->load(Resource::findPixmap("kbill/pixmaps/" + QString::fromLocal8Bit(name))); | 63 | pix->load(Resource::findPixmap("kbill/pixmaps/" + QString::fromLocal8Bit(name))); |
64 | 64 | ||
65 | width = pix->width(); | 65 | width = pix->width(); |
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 | |||
@@ -10,24 +10,26 @@ | |||
10 | #ifdef __GNUC__ | 10 | #ifdef __GNUC__ |
11 | #pragma implementation | 11 | #pragma implementation |
12 | #endif | 12 | #endif |
13 | 13 | ||
14 | #include <aconf.h> | 14 | #include <aconf.h> |
15 | #include <stdio.h> | 15 | #include <stdio.h> |
16 | #include <stdlib.h> | 16 | #include <stdlib.h> |
17 | #include <stddef.h> | 17 | #include <stddef.h> |
18 | #include <unistd.h> | 18 | #include <unistd.h> |
19 | #include <string.h> | 19 | #include <string.h> |
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" |
24 | #include "Stream.h" | 26 | #include "Stream.h" |
25 | #include "Link.h" | 27 | #include "Link.h" |
26 | #include "GfxState.h" | 28 | #include "GfxState.h" |
27 | #include "GfxFont.h" | 29 | #include "GfxFont.h" |
28 | #include "UnicodeMap.h" | 30 | #include "UnicodeMap.h" |
29 | #include "CharCodeToUnicode.h" | 31 | #include "CharCodeToUnicode.h" |
30 | #include "FontFile.h" | 32 | #include "FontFile.h" |
31 | #include "Error.h" | 33 | #include "Error.h" |
32 | #include "TextOutputDev.h" | 34 | #include "TextOutputDev.h" |
33 | #include "QOutputDev.h" | 35 | #include "QOutputDev.h" |
@@ -661,25 +663,25 @@ void QOutputDev::drawChar ( GfxState *state, fp_t x, fp_t y, | |||
661 | m12 *= state-> getHorizScaling ( ); | 663 | m12 *= state-> getHorizScaling ( ); |
662 | 664 | ||
663 | fp_t fsize = m_painter-> font ( ). pixelSize ( ); | 665 | fp_t fsize = m_painter-> font ( ). pixelSize ( ); |
664 | 666 | ||
665 | #ifndef QT_NO_TRANSFORMATIONS | 667 | #ifndef QT_NO_TRANSFORMATIONS |
666 | QWMatrix oldmat; | 668 | QWMatrix oldmat; |
667 | 669 | ||
668 | bool dorot = (( m12 < -0.1 ) || ( m12 > 0.1 )) && (( m21 < -0.1 ) || ( m21 > 0.1 )); | 670 | bool dorot = (( m12 < -0.1 ) || ( m12 > 0.1 )) && (( m21 < -0.1 ) || ( m21 > 0.1 )); |
669 | 671 | ||
670 | if ( dorot ) { | 672 | if ( dorot ) { |
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 )); |
676 | 678 | ||
677 | m_painter-> setWorldMatrix ( mat ); | 679 | m_painter-> setWorldMatrix ( mat ); |
678 | 680 | ||
679 | x1 = 0; | 681 | x1 = 0; |
680 | y1 = 0; | 682 | y1 = 0; |
681 | } | 683 | } |
682 | #endif | 684 | #endif |
683 | 685 | ||
684 | QPen oldpen = m_painter-> pen ( ); | 686 | QPen oldpen = m_painter-> pen ( ); |
685 | 687 | ||
@@ -768,26 +770,26 @@ void QOutputDev::drawImageMask ( GfxState *state, Object */*ref*/, Stream *str, | |||
768 | *scanline = ( alpha == 0 ) ? 0xff000000 | val : val; | 770 | *scanline = ( alpha == 0 ) ? 0xff000000 | val : val; |
769 | 771 | ||
770 | ctm [0] < 0 ? scanline-- : scanline++; | 772 | ctm [0] < 0 ? scanline-- : scanline++; |
771 | } | 773 | } |
772 | ctm [3] > 0 ? scanlines-- : scanlines++; | 774 | ctm [3] > 0 ? scanlines-- : scanlines++; |
773 | 775 | ||
774 | qApp-> processEvents ( ); | 776 | qApp-> processEvents ( ); |
775 | } | 777 | } |
776 | 778 | ||
777 | #ifndef QT_NO_TRANSFORMATIONS | 779 | #ifndef QT_NO_TRANSFORMATIONS |
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 ( ); |
784 | m_painter-> setWorldMatrix ( mat, true ); | 786 | m_painter-> setWorldMatrix ( mat, true ); |
785 | 787 | ||
786 | #ifdef QWS | 788 | #ifdef QWS |
787 | QPixmap pm; | 789 | QPixmap pm; |
788 | pm. convertFromImage ( img ); | 790 | pm. convertFromImage ( img ); |
789 | m_painter-> drawPixmap ( 0, 0, pm ); | 791 | m_painter-> drawPixmap ( 0, 0, pm ); |
790 | #else | 792 | #else |
791 | m_painter-> drawImage ( QPoint ( 0, 0 ), img ); | 793 | m_painter-> drawImage ( QPoint ( 0, 0 ), img ); |
792 | #endif | 794 | #endif |
793 | 795 | ||
@@ -897,26 +899,26 @@ void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int wi | |||
897 | 899 | ||
898 | ctm [0] < 0 ? scanline-- : scanline++; | 900 | ctm [0] < 0 ? scanline-- : scanline++; |
899 | } | 901 | } |
900 | ctm [3] > 0 ? scanlines-- : scanlines++; | 902 | ctm [3] > 0 ? scanlines-- : scanlines++; |
901 | 903 | ||
902 | qApp-> processEvents ( ); | 904 | qApp-> processEvents ( ); |
903 | } | 905 | } |
904 | 906 | ||
905 | 907 | ||
906 | #ifndef QT_NO_TRANSFORMATIONS | 908 | #ifndef QT_NO_TRANSFORMATIONS |
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 ( ); |
913 | m_painter-> setWorldMatrix ( mat, true ); | 915 | m_painter-> setWorldMatrix ( mat, true ); |
914 | 916 | ||
915 | #ifdef QWS | 917 | #ifdef QWS |
916 | QPixmap pm; | 918 | QPixmap pm; |
917 | pm. convertFromImage ( img ); | 919 | pm. convertFromImage ( img ); |
918 | m_painter-> drawPixmap ( 0, 0, pm ); | 920 | m_painter-> drawPixmap ( 0, 0, pm ); |
919 | #else | 921 | #else |
920 | m_painter-> drawImage ( QPoint ( 0, 0 ), img ); | 922 | m_painter-> drawImage ( QPoint ( 0, 0 ), img ); |
921 | #endif | 923 | #endif |
922 | 924 | ||