summaryrefslogtreecommitdiff
path: root/sysutils/xosview/patches/patch-ao
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/xosview/patches/patch-ao')
-rw-r--r--sysutils/xosview/patches/patch-ao34
1 files changed, 9 insertions, 25 deletions
diff --git a/sysutils/xosview/patches/patch-ao b/sysutils/xosview/patches/patch-ao
index 93fe5516b36..f69546d735c 100644
--- a/sysutils/xosview/patches/patch-ao
+++ b/sysutils/xosview/patches/patch-ao
@@ -1,43 +1,28 @@
-$NetBSD: patch-ao,v 1.1 2003/09/30 23:03:59 christos Exp $
+$NetBSD: patch-ao,v 1.2 2003/10/01 00:33:54 christos Exp $
--- xosview.cc.orig 1999-02-16 09:08:34.000000000 -0500
-+++ xosview.cc 2003-09-30 18:41:24.000000000 -0400
-@@ -6,7 +6,7 @@
- //
- // $Id: patch-ao,v 1.1 2003/09/30 23:03:59 christos Exp $
++++ xosview.cc 2003-09-30 20:30:35.000000000 -0400
+@@ -8,3 +8,3 @@
//
-#include <iostream.h>
+#include <iostream>
#include <unistd.h>
- #include <string.h>
- #include <stdlib.h>
-@@ -312,7 +312,7 @@
- {
- switch (argv[0][1]) {
+@@ -314,3 +314,3 @@
case 'v':
- cerr << versionString << endl;
+ std::cerr << versionString << std::endl;
exit(0);
- case 'n': // Check for -name option that was already parsed
- // and acted upon by main().
-@@ -335,12 +335,12 @@
- #endif
- case '-': /* Check for --version argument. */
+@@ -337,3 +337,3 @@
if (!strncasecmp(*argv, "--version", 10)) {
- cerr << versionString << endl;
+ std::cerr << versionString << std::endl;
exit(0);
- }
- /* Fall through to default/error case. */
+@@ -342,3 +342,3 @@
default:
- cerr << "Ignoring unknown option '" << argv[0] << "'.\n";
+ std::cerr << "Ignoring unknown option '" << argv[0] << "'.\n";
break;
- }
- argc--;
-@@ -355,19 +355,19 @@
- }
-
+@@ -357,5 +357,5 @@
void XOSView::visibilityEvent( XVisibilityEvent &event ){
- //cerr <<"XOSView::visibilityEvent() : ";
+ //std::cerr <<"XOSView::visibilityEvent() : ";
@@ -45,7 +30,7 @@ $NetBSD: patch-ao,v 1.1 2003/09/30 23:03:59 christos Exp $
- //cerr <<"hidden";
+ //std::cerr <<"hidden";
_isvisible = false;
- }
+@@ -363,6 +363,6 @@
else {
- //cerr <<"not hidden";
+ //std::cerr <<"not hidden";
@@ -54,9 +39,8 @@ $NetBSD: patch-ao,v 1.1 2003/09/30 23:03:59 christos Exp $
- //cerr <<endl;
+ //std::cerr <<std::endl;
}
-
+@@ -370,3 +370,3 @@
void XOSView::unmapEvent( XUnmapEvent & ){
- //cerr <<"XOSView::unmapEvent()" <<endl;
+ //std::cerr <<"XOSView::unmapEvent()" <<std::endl;
_isvisible = false;
- }