From e1b1ecd2e9858dca67ed1da90799f1ea34fc9b71 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon, 26 May 2014 10:17:12 -0700
Subject: unifdef -Unotyet -UNOTYET

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
 psgeom.c   | 34 ----------------------------------
 utils.h    |  8 --------
 xkbprint.c | 33 ---------------------------------
 3 files changed, 75 deletions(-)

diff --git a/psgeom.c b/psgeom.c
index 563cf15..e86426c 100644
--- a/psgeom.c
+++ b/psgeom.c
@@ -727,10 +727,6 @@ PSFileTrailer(FILE *out, PSState *state)
     if (!state->args->wantEPS)
         fprintf(out, "%%%%Trailer\n");
     fprintf(out, "%%%%EOF\n");
-#ifdef NOTYET
-    fprintf(out, "%%%%BoundingBox %d %d\n");
-    fprintf(out, "%%%%DocumentFonts: \n");
-#endif
     return;
 }
 
@@ -1267,36 +1263,6 @@ PSKeycapsSymbol(KeySym sym, unsigned char *buf,
         buf[0] = XKC_ISO_Prev_Group_Lock;
         return True;
     }
-#ifdef NOTYET
-    if (font_rtrn != NULL)
-        font_rtrn = FONT_MOUSECAPS;
-    switch (sym) {
-    case XK_Pointer_Up:
-        buf[0] = XKC_Mouse_Pointer_Up;
-        return True;
-    case XK_Pointer_Down:
-        buf[0] = XKC_Mouse_Pointer_Down;
-        return True;
-    case XK_Pointer_Left:
-        buf[0] = XKC_Mouse_Pointer_Left;
-        return True;
-    case XK_Pointer_Right:
-        buf[0] = XKC_Mouse_Pointer_Right;
-        return True;
-    case XK_Pointer_Button1:
-        buf[0] = XKC_Mouse_Pointer_Button1;
-        return True;
-    case XK_Pointer_Button2:
-        buf[0] = XKC_Mouse_Pointer_Button2;
-        return True;
-    case XK_Pointer_Button3:
-        buf[0] = XKC_Mouse_Pointer_Button3;
-        return True;
-    case XK_Pointer_Button4:
-        buf[0] = XKC_Mouse_Pointer_Button4;
-        return True;
-    }
-#endif
     return False;
 }
 
diff --git a/utils.h b/utils.h
index 9676cc8..7a08166 100644
--- a/utils.h
+++ b/utils.h
@@ -73,14 +73,6 @@ typedef int Comparison;
 #define	comparisonText(c)	((c)?((c)<0?"Less":"Greater"):"Equal")
 #endif
 
-#ifdef notyet
-typedef union {
-    int i;
-    unsigned u;
-    void *p;
-    void *(*fp) ();
-} Union;
-#endif
 
 /***====================================================================***/
 
diff --git a/xkbprint.c b/xkbprint.c
index 4a87ef1..2a48a98 100644
--- a/xkbprint.c
+++ b/xkbprint.c
@@ -59,13 +59,6 @@
 #define	INPUT_XKB	1
 #define	INPUT_XKM	2
 
-#ifdef notyet
-static char *fileTypeExt[] = {
-    "XXX",
-    "xkm",
-    "xkb"
-};
-#endif
 
 static unsigned         outputFormat = WANT_DEFAULT;
 static char *           wantLocale = "C";
@@ -77,9 +70,6 @@ static char *           inDpyName;
 static char *           outDpyName;
 static Display *        inDpy;
 static Display *        outDpy;
-#ifdef NOTYET
-static Bool             computeDflts = False;
-#endif
 static XKBPrintArgs     args;
 static unsigned         warningLevel = 5;
 static Bool             synch;
@@ -194,9 +184,6 @@ parseArgs(int argc, char *argv[])
         }
 #endif
         else if (strcmp(argv[i], "-dflts") == 0) {
-#ifdef NOTYET
-            computeDflts = True;
-#endif
             uWarning("Compute defaults not implemented yet\n");
         }
         else if (strcmp(argv[i], "-diffs") == 0) {
@@ -225,15 +212,6 @@ parseArgs(int argc, char *argv[])
             else
                 args.grid = tmp;
         }
-#ifdef NOTYET
-        else if (strncmp(argv[i], "-I", 2) == 0) {
-            if (!XkbAddDirectoryToPath(&argv[i][2])) {
-                uAction("Exiting\n");
-                exit(1);
-            }
-            uInternalError("Includes not implemented yet\n");
-        }
-#endif
         else if (strcmp(argv[i], "-if") == 0) {
             if (++i >= argc) {
                 uWarning("Internal Font name not specified\n");
@@ -636,11 +614,6 @@ GetDisplay(char *program, char *dpyName)
 
 /***====================================================================***/
 
-#ifdef notyet
-#define MAX_INCLUDE_OPTS	10
-static char *includeOpt[MAX_INCLUDE_OPTS];
-static int numIncludeOpts = 0;
-#endif
 
 int
 main(int argc, char *argv[])
@@ -751,12 +724,6 @@ main(int argc, char *argv[])
         if (XkbGetGeometry(inDpy, result.xkb) != Success) {
             uFatalError("Cannot load geometry for %s\n", inDpyName);
         }
-#ifdef NOTYET
-        if (computeDflts)
-            ok = (ComputeKbdDefaults(result.xkb) == Success);
-        else
-            ok = True;
-#endif
         if (args.label == LABEL_AUTO)
             args.label = LABEL_SYMBOLS;
     }
-- 
cgit v1.2.3