From 66471be268237194222f618a624945f568d9cf41 Mon Sep 17 00:00:00 2001
From: Arjen Baart <arjen@andromeda.nl>
Date: Thu, 13 Jan 2011 16:46:39 +0100
Subject: [PATCH] Explicit conversion of pathname components to String objects.

---
 src/dateyacc.h   | 99 +++++++++++++++++++++++++++++++++++++++++++-------------
 src/filedialog.h |  2 +-
 src/regfile.xpm  | 35 ++++++++++----------
 3 files changed, 95 insertions(+), 41 deletions(-)

diff --git a/src/dateyacc.h b/src/dateyacc.h
index 6463750..7298827 100644
--- a/src/dateyacc.h
+++ b/src/dateyacc.h
@@ -1,30 +1,83 @@
-#ifndef BISON_DATEYACC_H
-# define BISON_DATEYACC_H
 
-#ifndef YYSTYPE
-typedef union {
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+   
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     DAY_NAME = 258,
+     MONTH_NAME = 259,
+     NUM9 = 260,
+     NUM23 = 261,
+     NUM59 = 262,
+     NUM99 = 263,
+     NUM2359 = 264,
+     NUM9999 = 265,
+     NUM235959 = 266,
+     NUM991231 = 267,
+     NUM99991231 = 268,
+     AMPM = 269,
+     STD_ZONE = 270,
+     DST_ZONE = 271,
+     DST_SUFFIX = 272
+   };
+#endif
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{
+
+/* Line 1676 of yacc.c  */
+#line 64 "dateyacc.y"
+
     int IntVal;
-} yystype;
-# define YYSTYPE yystype
+
+
+
+/* Line 1676 of yacc.c  */
+#line 75 "dateyacc.h"
+} YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
 #endif
-# define	DAY_NAME	257
-# define	MONTH_NAME	258
-# define	NUM9	259
-# define	NUM23	260
-# define	NUM59	261
-# define	NUM99	262
-# define	NUM2359	263
-# define	NUM9999	264
-# define	NUM235959	265
-# define	NUM991231	266
-# define	NUM99991231	267
-# define	AMPM	268
-# define	STD_ZONE	269
-# define	DST_ZONE	270
-# define	DST_SUFFIX	271
-
 
 extern YYSTYPE yylval;
 
-#endif /* not BISON_DATEYACC_H */
+
diff --git a/src/filedialog.h b/src/filedialog.h
index 536a939..2fc426f 100644
--- a/src/filedialog.h
+++ b/src/filedialog.h
@@ -58,7 +58,7 @@ public:
 
    String PathName()
    {
-      return *diredit + "/" + *fileedit;
+      return String(*diredit) + "/" + String(*fileedit);
    }
 
    virtual int DoCommand(int code);
diff --git a/src/regfile.xpm b/src/regfile.xpm
index c3752fd..b325611 100644
--- a/src/regfile.xpm
+++ b/src/regfile.xpm
@@ -1,19 +1,20 @@
 /* XPM */
 static char * regfile_xpm[] = {
-"16 13 3 1",
-" 	c #FFFFFFFFFFFF",
-".	c #000000000000",
-"X	c #0000FFFFFFFF",
-"      ..........",
-"     ..XXXXXXXX.",
-"    ...XXXXXXXX.",
-"   .XX.XXXXXXXX.",
-"  .XXX.XXXXXXXX.",
-" ..XXX.XXXXXXXX.",
-".......XXXXXXXX.",
-".XXXXXXXXXXXXXX.",
-".XXXXXXXXXXXXXX.",
-".XXXXXXXXXXXXXX.",
-".XXXXXXXXXXXXXX.",
-".XXXXXXXXXXXXXX.",
-"................"};
+"16 13 4 1",
+" 	c None",
+".	c #FFFFFF",
+"+	c #000000",
+"@	c #00FFFF",
+"......++++++++++",
+".....++@@@@@@@@+",
+"....+++@@@@@@@@+",
+"...+@@+@@@@@@@@+",
+"..+@@@+@@@@@@@@+",
+".++@@@+@@@@@@@@+",
+"+++++++@@@@@@@@+",
+"+@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@+",
+"++++++++++++++++"};
-- 
2.11.0