use <vector.h> -> <vector>, <iostream.h> -> <iostream>, <fstream.h> -> <fstream>

and sprinkle some 'using namespace std', so that this builds also
with gcc 3.3

9 files changed, 151 insertions, 1 deletions

diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo
index 849012c2866..4bcb80fdcd0 100644
--- a/audio/kdemultimedia3/distinfo
+++ b/audio/kdemultimedia3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2003/09/17 23:04:32 markd Exp $
+$NetBSD: distinfo,v 1.21 2003/11/08 16:05:49 jdolecek Exp $
 
 SHA1 (kdemultimedia-3.1.4.tar.bz2) = 62263f8d12a460043114ea87da0171497efff511
 Size (kdemultimedia-3.1.4.tar.bz2) = 5932776 bytes
@@ -57,3 +57,11 @@ SHA1 (patch-co) = b484ad7c770a3bd9554051af64e2545fac5a677f
 SHA1 (patch-cp) = 8b16a472b150d54810c09126a01723d9a9d9f0d5
 SHA1 (patch-cq) = ad009ff763b321eaa07c8e23a9ad386040c4e897
 SHA1 (patch-cr) = 6159763aaf0ae2b738e31c06ada0da5c47d0692c
+SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5
+SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e
+SHA1 (patch-cu) = 2fde531192bbd1d9358319b4233f6afed8ed5abc
+SHA1 (patch-cv) = 2e8136615448dc2efbd6cdb3e4ad7621dbaecfe1
+SHA1 (patch-cw) = 280c2743c48f78c96b05ef9f7f703c822ef482e1
+SHA1 (patch-cx) = ea42ab342abf2c2cff4c13fa71ab6e01bab5736c
+SHA1 (patch-cy) = 949d3ae7b9037213f5a737018a0dcabe2200dd57
+SHA1 (patch-cz) = 5f4909bbc6f0828aa1d69ed4437622e35e116c46
diff --git a/audio/kdemultimedia3/patches/patch-cs b/audio/kdemultimedia3/patches/patch-cs
new file mode 100644
index 00000000000..243f1a3866a
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-cs
@@ -0,0 +1,22 @@
+$NetBSD: patch-cs,v 1.3 2003/11/08 16:05:49 jdolecek Exp $
+
+--- mpeglib/lib/util/audio/audioIO_SDL.cpp.orig	2003-11-08 13:24:41.000000000 +0100
++++ mpeglib/lib/util/audio/audioIO_SDL.cpp	2003-11-08 13:24:58.000000000 +0100
+@@ -11,7 +11,7 @@
+  */
+ #include "../../input/bufferInputStream.h"
+ #include <assert.h>
+-#include <iostream.h>
++#include <iostream>
+ #if defined WIN32
+ #include <SDL.h>
+ #include <SDL_audio.h>
+@@ -20,6 +20,8 @@
+ #include <SDL/SDL_audio.h>
+ #endif
+ 
++using namespace std;
++
+ //static  SDL_AudioSpec actual;
+ static  BufferInputStream* audioRing;
+ static  TimeStamp* dummy;
diff --git a/audio/kdemultimedia3/patches/patch-ct b/audio/kdemultimedia3/patches/patch-ct
new file mode 100644
index 00000000000..c00e146495f
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-ct
@@ -0,0 +1,21 @@
+$NetBSD: patch-ct,v 1.1 2003/11/08 16:05:49 jdolecek Exp $
+
+--- mpeglib/example/yaf/yafvorbis/vorbis_control.cpp.orig	2003-11-08 13:30:14.000000000 +0100
++++ mpeglib/example/yaf/yafvorbis/vorbis_control.cpp	2003-11-08 13:29:46.000000000 +0100
+@@ -19,7 +19,7 @@
+ 
+ 
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
+@@ -33,6 +33,7 @@
+ #include <getopt.h>
+ #endif
+ 
++using namespace std;
+ 
+ 
+ 
diff --git a/audio/kdemultimedia3/patches/patch-cu b/audio/kdemultimedia3/patches/patch-cu
new file mode 100644
index 00000000000..f279faa4730
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-cu
@@ -0,0 +1,13 @@
+$NetBSD: patch-cu,v 1.1 2003/11/08 16:05:49 jdolecek Exp $
+
+--- arts/runtime/artsbuilderloader_impl.cc.orig	2003-11-08 14:02:27.000000000 +0100
++++ arts/runtime/artsbuilderloader_impl.cc	2003-11-08 14:02:37.000000000 +0100
+@@ -22,7 +22,7 @@
+ 
+ #include "artsbuilder.h"
+ #include "debug.h"
+-#include <fstream.h>
++#include <fstream>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <stdio.h>
diff --git a/audio/kdemultimedia3/patches/patch-cv b/audio/kdemultimedia3/patches/patch-cv
new file mode 100644
index 00000000000..a9b88b99974
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-cv
@@ -0,0 +1,18 @@
+$NetBSD: patch-cv,v 1.1 2003/11/08 16:05:49 jdolecek Exp $
+
+--- arts/modules/env_mixeritem_impl.cc.orig	2003-11-08 14:03:31.000000000 +0100
++++ arts/modules/env_mixeritem_impl.cc	2003-11-08 14:03:42.000000000 +0100
+@@ -4,10 +4,12 @@
+ #include "connect.h"
+ #include "../runtime/sequenceutils.h"
+ #include <stdio.h>
+-#include <vector.h>
++#include <vector>
+ 
+ #include <klocale.h>
+ 
++using namespace std;
++
+ namespace Arts {
+ namespace Environment {
+ 
diff --git a/audio/kdemultimedia3/patches/patch-cw b/audio/kdemultimedia3/patches/patch-cw
new file mode 100644
index 00000000000..4b39362f9b2
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-cw
@@ -0,0 +1,17 @@
+$NetBSD: patch-cw,v 1.1 2003/11/08 16:05:49 jdolecek Exp $
+
+--- arts/tools/environmentview.cpp.orig	2003-11-08 14:04:20.000000000 +0100
++++ arts/tools/environmentview.cpp	2003-11-08 14:04:30.000000000 +0100
+@@ -29,10 +29,11 @@
+ #include "main.h"
+ #include <stdio.h>
+ #include <fstream>
+-#include <vector.h>
++#include <vector>
+ 
+ #define DEFAULT_ENV_FILENAME "~/default.arts-env"
+ 
++using namespace std;
+ using namespace Arts;
+ using Environment::Container;
+ using Environment::Item;
diff --git a/audio/kdemultimedia3/patches/patch-cx b/audio/kdemultimedia3/patches/patch-cx
new file mode 100644
index 00000000000..21dd3172433
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-cx
@@ -0,0 +1,19 @@
+$NetBSD: patch-cx,v 1.1 2003/11/08 16:05:49 jdolecek Exp $
+
+--- mpeglib/lib/mpegplay/recon.h.orig	2003-11-08 14:08:31.000000000 +0100
++++ mpeglib/lib/mpegplay/recon.h	2003-11-08 14:08:41.000000000 +0100
+@@ -15,11 +15,13 @@
+ #define __RECON_H
+ 
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include "../util/render/pictureArray.h"
+ #include "copyFunctions.h"
+ #include "videoDecoder.h"
+ 
++using namespace std;
++
+ class Recon {
+ 
+ 
diff --git a/audio/kdemultimedia3/patches/patch-cy b/audio/kdemultimedia3/patches/patch-cy
new file mode 100644
index 00000000000..457e9c16071
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-cy
@@ -0,0 +1,17 @@
+$NetBSD: patch-cy,v 1.1 2003/11/08 16:05:49 jdolecek Exp $
+
+--- mpeglib/lib/mpegplay/copyFunctions.h.orig	2003-11-08 14:08:58.000000000 +0100
++++ mpeglib/lib/mpegplay/copyFunctions.h	2003-11-08 14:09:07.000000000 +0100
+@@ -17,9 +17,11 @@
+ #define MAX_NEG_CROP 32768
+ #define NUM_CROP_ENTRIES (2048+2*MAX_NEG_CROP)
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include "../util/mmx/mmx.h"
+ 
++using namespace std;
++
+ extern "C" {
+ #include <string.h>
+ }
diff --git a/audio/kdemultimedia3/patches/patch-cz b/audio/kdemultimedia3/patches/patch-cz
new file mode 100644
index 00000000000..c647d192af3
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-cz
@@ -0,0 +1,15 @@
+$NetBSD: patch-cz,v 1.1 2003/11/08 16:05:49 jdolecek Exp $
+
+--- mpeglib/lib/mpegplay/copyFunctions_asm.h.orig	2003-11-08 14:09:16.000000000 +0100
++++ mpeglib/lib/mpegplay/copyFunctions_asm.h	2003-11-08 14:09:26.000000000 +0100
+@@ -18,7 +18,9 @@
+ #include "config.h"
+ #endif
+ 
+-#include <iostream.h>
++#include <iostream>
++
++using namespace std;
+ 
+ class CopyFunctions_ASM {
+