Use smaller guns than "using namespace std" which creates conflicts with

more modern STL implementations.

7 files changed, 46 insertions, 27 deletions

diff --git a/graphics/impress/distinfo b/graphics/impress/distinfo
index 4f320fdac8a..dce6081eccf 100644
--- a/graphics/impress/distinfo
+++ b/graphics/impress/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 21:34:04 agc Exp $
+$NetBSD: distinfo,v 1.9 2020/05/14 19:27:41 joerg Exp $
 
 SHA1 (imp1.1b9.tar.gz) = 73d3ce69d2d31af0b8e6bfb3825ebcd2f519024c
 RMD160 (imp1.1b9.tar.gz) = 2f0d49d90baa1c92edf564bf163147679c4cbaf4
@@ -6,14 +6,14 @@ SHA512 (imp1.1b9.tar.gz) = 1b4c086717a57fe539c14f0ee4fd23bf7beaa5d4614e17b6ce787
 Size (imp1.1b9.tar.gz) = 1334533 bytes
 SHA1 (patch-aa) = a872102d3b3205b6e8e4d44839b150e94aa6fd8a
 SHA1 (patch-ab) = f6e71dbd213cfdc447535bc25325c9417a99c498
-SHA1 (patch-ac) = ea5784b8da9276076aa76f98bc61445d70fafb54
+SHA1 (patch-ac) = 2b3c403b3c111a8104234f33318c878251fc8067
 SHA1 (patch-ad) = c9c1e3533423efa3484543ca16aca80362134373
-SHA1 (patch-font3d_build.h) = b0ea326fad30e5b96eb2b9e0d376969cec5de90f
-SHA1 (patch-font3d_font3d.cc) = 99b0a41b0347e3ed94ecdcc3519c987ff8d5ea6a
+SHA1 (patch-font3d_build.h) = 0f41eebdcc056e31318a1ce8ace83e0a5027db46
+SHA1 (patch-font3d_font3d.cc) = 637171446d50de0e1913126c433529bd05d3ebc0
 SHA1 (patch-font3d_font3d.h) = 42f74e7bb4c67de08f67b3f8bd37a732f23f7ad4
-SHA1 (patch-font3d_geometry.cc) = a4449a16aa3f4175c0460aedde60c152458c264b
-SHA1 (patch-font3d_geometry.h) = 09d0c66e0e568fc4f33d37c54d30cdc376e7acb5
-SHA1 (patch-font3d_vector.h) = 2be02ddcf448a6a5fcad69a3a7d70c5da629fc6d
+SHA1 (patch-font3d_geometry.cc) = 4834919389fd382a48ceacb3e70628edda54e6e5
+SHA1 (patch-font3d_geometry.h) = ccf6935ca6e44fa427eb2d72bb473c97d3544e9b
+SHA1 (patch-font3d_vector.h) = 123c600863fbb951a116d34f1c07809377d418cc
 SHA1 (patch-pstoedit__3.21_src_drvtk.cpp) = 7d6b3ffea8fab4bc35a8561f42545d944669a3a1
 SHA1 (patch-pstoedit__3.21_src_drvtk.h) = 39395b97d9ced63930732ae6912692d1243a34b9
 SHA1 (patch-src_drvtk.cpp) = 24bc80930f3870930ff06ffbed68eaab086faa9b
diff --git a/graphics/impress/patches/patch-ac b/graphics/impress/patches/patch-ac
index d734829413b..4a8e4bc2b79 100644
--- a/graphics/impress/patches/patch-ac
+++ b/graphics/impress/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2011/11/25 21:57:36 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2020/05/14 19:27:41 joerg Exp $
 
 --- font3d/build.cc.orig	2000-07-16 02:37:31.000000000 +0000
 +++ font3d/build.cc
@@ -11,7 +11,15 @@ $NetBSD: patch-ac,v 1.2 2011/11/25 21:57:36 joerg Exp $
  
  #include "vector.h"
  #include "truetype.h"
-@@ -367,7 +367,7 @@ void PolygonizeContour(TTFont&   font,
+@@ -37,6 +37,7 @@
+ #include "font3d.h"
+ #include "build.h"
+ 
++using std::endl, std::cout;
+ 
+ //==============================================================================================
+ //  PolygonizeContour()
+@@ -367,7 +368,7 @@ void PolygonizeContour(TTFont&   font,
           }
        }
  
diff --git a/graphics/impress/patches/patch-font3d_build.h b/graphics/impress/patches/patch-font3d_build.h
index b80029606af..c195f81ecc0 100644
--- a/graphics/impress/patches/patch-font3d_build.h
+++ b/graphics/impress/patches/patch-font3d_build.h
@@ -1,15 +1,13 @@
-$NetBSD: patch-font3d_build.h,v 1.1 2011/11/25 21:57:36 joerg Exp $
+$NetBSD: patch-font3d_build.h,v 1.2 2020/05/14 19:27:41 joerg Exp $
 
---- font3d/build.h.orig	2011-11-25 18:27:44.000000000 +0000
+--- font3d/build.h.orig	2000-07-16 02:37:31.000000000 +0000
 +++ font3d/build.h
-@@ -31,7 +31,9 @@
+@@ -31,7 +31,7 @@
  #ifndef __BUILD_H__
  #define __BUILD_H__
  
 -#include <iostream.h>
 +#include <iostream>
-+
-+using namespace std;
  
  #include "truetype.h"
  #include "geometry.h"
diff --git a/graphics/impress/patches/patch-font3d_font3d.cc b/graphics/impress/patches/patch-font3d_font3d.cc
index f30e9dc7026..448959800cd 100644
--- a/graphics/impress/patches/patch-font3d_font3d.cc
+++ b/graphics/impress/patches/patch-font3d_font3d.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-font3d_font3d.cc,v 1.1 2011/11/25 21:57:36 joerg Exp $
+$NetBSD: patch-font3d_font3d.cc,v 1.2 2020/05/14 19:27:41 joerg Exp $
 
---- font3d/font3d.cc.orig	2011-11-25 18:27:38.000000000 +0000
+--- font3d/font3d.cc.orig	2000-07-16 02:37:31.000000000 +0000
 +++ font3d/font3d.cc
 @@ -30,8 +30,8 @@
  
@@ -13,3 +13,11 @@ $NetBSD: patch-font3d_font3d.cc,v 1.1 2011/11/25 21:57:36 joerg Exp $
  #include <stdio.h>
  #include <string.h>
  
+@@ -39,6 +39,7 @@
+ #include "build.h"
+ #include "font3d.h"
+ 
++using std::ios, std::ofstream, std::setprecision, std::ifstream, std::endl, std::cout;
+ 
+ //==============================================================================================
+ //  PrintGreeting()
diff --git a/graphics/impress/patches/patch-font3d_geometry.cc b/graphics/impress/patches/patch-font3d_geometry.cc
index cda261a4505..4e8c6c8fc98 100644
--- a/graphics/impress/patches/patch-font3d_geometry.cc
+++ b/graphics/impress/patches/patch-font3d_geometry.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-font3d_geometry.cc,v 1.1 2011/11/25 21:57:36 joerg Exp $
+$NetBSD: patch-font3d_geometry.cc,v 1.2 2020/05/14 19:27:41 joerg Exp $
 
---- font3d/geometry.cc.orig	2011-11-25 18:27:42.000000000 +0000
+--- font3d/geometry.cc.orig	2000-07-16 02:37:31.000000000 +0000
 +++ font3d/geometry.cc
-@@ -31,7 +31,7 @@
+@@ -31,11 +31,12 @@
  #include <math.h>
  #include <stddef.h>
  #include <stdio.h>
@@ -11,3 +11,8 @@ $NetBSD: patch-font3d_geometry.cc,v 1.1 2011/11/25 21:57:36 joerg Exp $
  
  #include "vector.h"
  #include "geometry.h"
+ 
++using std::endl, std::cout;
+ 
+ //==============================================================================================
+ //  TRIANGLELIST::Empty()                                                             (PUBLIC)
diff --git a/graphics/impress/patches/patch-font3d_geometry.h b/graphics/impress/patches/patch-font3d_geometry.h
index 0f7a9d4a078..657976e9d76 100644
--- a/graphics/impress/patches/patch-font3d_geometry.h
+++ b/graphics/impress/patches/patch-font3d_geometry.h
@@ -1,14 +1,14 @@
-$NetBSD: patch-font3d_geometry.h,v 1.1 2011/11/25 21:57:36 joerg Exp $
+$NetBSD: patch-font3d_geometry.h,v 1.2 2020/05/14 19:27:41 joerg Exp $
 
---- font3d/geometry.h.orig	2011-11-25 18:27:25.000000000 +0000
+--- font3d/geometry.h.orig	2000-07-16 02:37:31.000000000 +0000
 +++ font3d/geometry.h
-@@ -31,7 +31,8 @@
+@@ -31,8 +31,7 @@
  #ifndef __GEOMETRY_H__
  #define __GEOMETRY_H__
  
 -#include <iostream.h>
+-
 +#include <iostream>
-+using namespace std;
- 
  #include "vector.h"
  
+ #define  TRUE          1
diff --git a/graphics/impress/patches/patch-font3d_vector.h b/graphics/impress/patches/patch-font3d_vector.h
index 9ed7fb6112b..c49737e397e 100644
--- a/graphics/impress/patches/patch-font3d_vector.h
+++ b/graphics/impress/patches/patch-font3d_vector.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-font3d_vector.h,v 1.1 2011/11/25 21:57:36 joerg Exp $
+$NetBSD: patch-font3d_vector.h,v 1.2 2020/05/14 19:27:41 joerg Exp $
 
---- font3d/vector.h.orig	2011-11-25 18:27:15.000000000 +0000
+--- font3d/vector.h.orig	2000-07-16 02:37:31.000000000 +0000
 +++ font3d/vector.h
 @@ -73,7 +73,9 @@
  #define __VECTOR_H__
@@ -9,7 +9,7 @@ $NetBSD: patch-font3d_vector.h,v 1.1 2011/11/25 21:57:36 joerg Exp $
 -#include <iostream.h>
 +#include <iostream>
 +
-+using namespace std;
++using std::ostream;
  
     class vector
     {