[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-core-devel
Subject: PATCH: replace iostream.h by iostream (kdelibs)
From: Michael Ritzert <michael () ritzert ! de>
Date: 2001-12-23 12:34:43
[Download RAW message or body]
Hi all,
here is a patch (against kdelibs CVS HEAD) to replace all occurences of
iostream.h by iostream. This is because GCC 3.1 will deprecate the old .h
headers and gives a warning about it. (iostream is standard, iostream.h just
common practice.)
Please test with other compilers and give me the Ok to commit.
Similar patches for kdebase and later kdenetwork will follow.
Michael
PS: Please keep me on CC.
["iostream.patch" (text/x-diff)]
diff -u -r /home/ritzert/KDECVS/kdelibs/arts/artsc/artscbackend.cc \
./arts/artsc/artscbackend.cc
--- /home/ritzert/KDECVS/kdelibs/arts/artsc/artscbackend.cc Fri Nov 30 20:09:07 2001
+++ ./arts/artsc/artscbackend.cc Sun Dec 23 12:56:56 2001
@@ -22,7 +22,7 @@
*/
-#include <iostream.h>
+#include <iostream>
#include <algorithm>
#include "artsc.h"
#include "soundserver.h"
diff -u -r /home/ritzert/KDECVS/kdelibs/arts/flow/resample.cc ./arts/flow/resample.cc
--- /home/ritzert/KDECVS/kdelibs/arts/flow/resample.cc Tue Aug 7 19:04:05 2001
+++ ./arts/flow/resample.cc Sun Dec 23 12:56:56 2001
@@ -22,7 +22,7 @@
#include "resample.h"
#include "debug.h"
-#include <iostream.h>
+#include <iostream>
#include <math.h>
#include <assert.h>
#include <stdio.h>
diff -u -r /home/ritzert/KDECVS/kdelibs/arts/knotify/knotify.cpp \
./arts/knotify/knotify.cpp
--- /home/ritzert/KDECVS/kdelibs/arts/knotify/knotify.cpp Fri Oct 12 19:02:30 2001
+++ ./arts/knotify/knotify.cpp Sun Dec 23 12:56:56 2001
@@ -23,7 +23,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <iostream.h>
+#include <iostream>
#include <string>
#include <kdebug.h>
diff -u -r /home/ritzert/KDECVS/kdelibs/arts/mcop/connect.cc ./arts/mcop/connect.cc
--- /home/ritzert/KDECVS/kdelibs/arts/mcop/connect.cc Fri Sep 29 00:42:37 2000
+++ ./arts/mcop/connect.cc Sun Dec 23 12:56:56 2001
@@ -27,7 +27,7 @@
#ifdef NDEBUG
#define mywarning(a,b)
#else
-#include <iostream.h>
+#include <iostream>
#define mywarning(a,b) if (!(a)) arts_warning("MCOP connection warning: %s",b)
#endif
diff -u -r /home/ritzert/KDECVS/kdelibs/arts/mcop/dynamicrequest.cc \
./arts/mcop/dynamicrequest.cc
--- /home/ritzert/KDECVS/kdelibs/arts/mcop/dynamicrequest.cc Fri Sep 29 00:42:37 2000
+++ ./arts/mcop/dynamicrequest.cc Sun Dec 23 12:56:56 2001
@@ -23,7 +23,7 @@
#include "dynamicrequest.h"
#include "core.h"
#include "debug.h"
-#include <iostream.h>
+#include <iostream>
using namespace Arts;
using namespace std;
diff -u -r /home/ritzert/KDECVS/kdelibs/arts/tests/testchangenotify.cc \
./arts/tests/testchangenotify.cc
--- /home/ritzert/KDECVS/kdelibs/arts/tests/testchangenotify.cc Thu Jun 28 16:54:02 \
2001
+++ ./arts/tests/testchangenotify.cc Sun Dec 23 12:56:56 2001
@@ -25,7 +25,7 @@
#include "value.h"
#include "connect.h"
#include "test.h"
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
using namespace std;
diff -u -r /home/ritzert/KDECVS/kdelibs/arts/tests/testremote.cc \
./arts/tests/testremote.cc
--- /home/ritzert/KDECVS/kdelibs/arts/tests/testremote.cc Sun Apr 22 02:19:37 2001
+++ ./arts/tests/testremote.cc Sun Dec 23 12:56:56 2001
@@ -26,7 +26,7 @@
#include "value.h"
#include "test.h"
#include "connect.h"
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
using namespace std;
diff -u -r /home/ritzert/KDECVS/kdelibs/arts/tests/testwrapper.cc \
./arts/tests/testwrapper.cc
--- /home/ritzert/KDECVS/kdelibs/arts/tests/testwrapper.cc Thu Jun 28 16:54:02 2001
+++ ./arts/tests/testwrapper.cc Sun Dec 23 12:56:56 2001
@@ -24,7 +24,7 @@
#include "wrapper.h"
#include "test.h"
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
using namespace std;
diff -u -r /home/ritzert/KDECVS/kdelibs/kabc/vcard/EmailParam.cpp \
./kabc/vcard/EmailParam.cpp
--- /home/ritzert/KDECVS/kdelibs/kabc/vcard/EmailParam.cpp Fri Nov 16 21:11:42 2001
+++ ./kabc/vcard/EmailParam.cpp Sun Dec 23 12:56:56 2001
@@ -21,7 +21,7 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <iostream.h>
+#include <iostream>
#include <VCardEmailParam.h>
#include <VCardParam.h>
diff -u -r /home/ritzert/KDECVS/kdelibs/kabc/vcard/include/VCardDefines.h \
./kabc/vcard/include/VCardDefines.h
--- /home/ritzert/KDECVS/kdelibs/kabc/vcard/include/VCardDefines.h Fri Nov 16 \
21:11:42 2001
+++ ./kabc/vcard/include/VCardDefines.h Sun Dec 23 12:56:56 2001
@@ -31,7 +31,7 @@
#if 0
#ifndef NDEBUG
# include <qcstring.h>
-# include <iostream.h>
+# include <iostream>
# ifdef __GNUG__
# define vDebug(a) cerr << className() << ":" << __FUNCTION__ << " (" \
<< __LINE__ << "): " << QCString((a)).data() << endl;
diff -u -r /home/ritzert/KDECVS/kdelibs/kdecore/tests/kdebugtest.cpp \
./kdecore/tests/kdebugtest.cpp
--- /home/ritzert/KDECVS/kdelibs/kdecore/tests/kdebugtest.cpp Mon Apr 2 19:33:54 \
2001
+++ ./kdecore/tests/kdebugtest.cpp Sun Dec 23 12:56:56 2001
@@ -1,7 +1,7 @@
#include <kdebug.h>
#include <qwidget.h>
#include <kinstance.h>
-#include <iostream.h>
+#include <iostream>
#include <qapplication.h>
class TestWidget : public QWidget
diff -u -r /home/ritzert/KDECVS/kdelibs/kdefx/kimageeffect.cpp \
./kdefx/kimageeffect.cpp
--- /home/ritzert/KDECVS/kdelibs/kdefx/kimageeffect.cpp Fri Nov 30 20:09:10 2001
+++ ./kdefx/kimageeffect.cpp Sun Dec 23 13:01:50 2001
@@ -12,7 +12,7 @@
#include <qimage.h>
#include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
#include "kimageeffect.h"
@@ -32,7 +32,8 @@
if (size.width() == 0 || size.height() == 0) {
#ifndef NDEBUG
- cerr << "WARNING: KImageEffect::gradient: invalid image" << endl;
+ std::cerr << "WARNING: KImageEffect::gradient: invalid image"
+ << std::endl;
#endif
return image;
}
@@ -320,7 +321,8 @@
if (size.width() == 0 || size.height() == 0) {
#ifndef NDEBUG
- cerr << "WARNING: KImageEffect::unbalancedGradient : invalid image\n";
+ std::cerr << "WARNING: KImageEffect::unbalancedGradient : "
+ "invalid image\n";
#endif
return image;
}
@@ -541,7 +543,7 @@
{
if (image.width() == 0 || image.height() == 0) {
#ifndef NDEBUG
- cerr << "WARNING: KImageEffect::intensity : invalid image\n";
+ std::cerr << "WARNING: KImageEffect::intensity : invalid image\n";
#endif
return image;
}
@@ -608,7 +610,8 @@
{
if (image.width() == 0 || image.height() == 0) {
#ifndef NDEBUG
- cerr << "WARNING: KImageEffect::channelIntensity : invalid image\n";
+ std::cerr << "WARNING: KImageEffect::channelIntensity : "
+ "invalid image\n";
#endif
return image;
}
@@ -700,7 +703,7 @@
if (image.width() == 0 || image.height() == 0 ||
modImage.width() == 0 || modImage.height() == 0) {
#ifndef NDEBUG
- cerr << "WARNING: KImageEffect::modulate : invalid image\n";
+ std::cerr << "WARNING: KImageEffect::modulate : invalid image\n";
#endif
return image;
}
@@ -828,7 +831,7 @@
{
if (image.width() == 0 || image.height() == 0) {
#ifndef NDEBUG
- cerr << "WARNING: KImageEffect::blend : invalid image\n";
+ std::cerr << "WARNING: KImageEffect::blend : invalid image\n";
#endif
return image;
}
@@ -1014,7 +1017,8 @@
}
}
#ifndef NDEBUG
- else cerr << "KImageEffect::blend effect not implemented" << endl;
+ else std::cerr << "KImageEffect::blend effect not implemented"
+ << std::endl;
#endif
return image;
}
@@ -1046,7 +1050,7 @@
image2.width() == 0 || image2.height() == 0 ||
blendImage.width() == 0 || blendImage.height() == 0) {
#ifndef NDEBUG
- cerr << "KImageEffect::blend effect invalid image" << endl;
+ std::cerr << "KImageEffect::blend effect invalid image" << std::endl;
#endif
return image1;
}
@@ -1146,7 +1150,7 @@
{
if (image.width() == 0 || image.height() == 0) {
#ifndef NDEBUG
- cerr << "KImageEffect::hash effect invalid image" << endl;
+ std::cerr << "KImageEffect::hash effect invalid image" << std::endl;
#endif
return image;
}
@@ -1656,7 +1660,7 @@
)
{
#ifndef NDEBUG
- cerr << "KImageEffect::blend : Sizes not correct\n" ;
+ std::cerr << "KImageEffect::blend : Sizes not correct\n" ;
#endif
return false;
}
diff -u -r /home/ritzert/KDECVS/kdelibs/kdeui/kkeydialog.cpp ./kdeui/kkeydialog.cpp
--- /home/ritzert/KDECVS/kdelibs/kdeui/kkeydialog.cpp Tue Dec 11 21:29:21 2001
+++ ./kdeui/kkeydialog.cpp Sun Dec 23 12:56:56 2001
@@ -681,7 +681,7 @@
}
}
-//#include <iostream.h>
+//#include <iostream>
void KKeyChooser::setKey( KAccelShortcut cut )
{
kdDebug(125) << "KKeyChooser::setKey( " << cut.toString() << " )" << endl;
diff -u -r /home/ritzert/KDECVS/kdelibs/kfile/acl_prop_page/kaclmanipulation.cpp \
./kfile/acl_prop_page/kaclmanipulation.cpp
--- /home/ritzert/KDECVS/kdelibs/kfile/acl_prop_page/kaclmanipulation.cpp Sun Oct 7 \
11:52:08 2001
+++ ./kfile/acl_prop_page/kaclmanipulation.cpp Sun Dec 23 12:56:56 2001
@@ -55,7 +55,7 @@
#include <qptrlist.h>
#include <qstring.h>
-#include <iostream.h>
+#include <iostream>
#include "kaclmanipulation.h"
diff -u -r /home/ritzert/KDECVS/kdelibs/khtml/testrender.cpp ./khtml/testrender.cpp
--- /home/ritzert/KDECVS/kdelibs/khtml/testrender.cpp Wed Dec 5 19:06:57 2001
+++ ./khtml/testrender.cpp Sun Dec 23 12:56:56 2001
@@ -20,7 +20,7 @@
// See testrender.h for a description of this program
-// #include <iostream.h>
+// #include <iostream>
#include <qlayout.h>
#include <qlabel.h>
#include <qprogressbar.h>
diff -u -r /home/ritzert/KDECVS/kdelibs/kjs/nodes.cpp ./kjs/nodes.cpp
--- /home/ritzert/KDECVS/kdelibs/kjs/nodes.cpp Fri Dec 14 11:38:23 2001
+++ ./kjs/nodes.cpp Sun Dec 23 12:56:56 2001
@@ -24,7 +24,7 @@
#include "nodes.h"
#include <assert.h>
-#include <iostream.h>
+#include <iostream>
#include <math.h>
#include <stdio.h>
#ifdef KJS_DEBUG_MEM
diff -u -r /home/ritzert/KDECVS/kdelibs/kjs/testkjs.cpp ./kjs/testkjs.cpp
--- /home/ritzert/KDECVS/kdelibs/kjs/testkjs.cpp Sun Nov 11 11:45:25 2001
+++ ./kjs/testkjs.cpp Sun Dec 23 12:56:56 2001
@@ -22,7 +22,7 @@
*/
#include <stdio.h>
-#include <iostream.h>
+#include <iostream>
#include "value.h"
#include "object.h"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic