unifdef NOTYET

This has been ifdef'd out since at least 2003, time to accept that it won't be
handled. One part was unreachable code anyway, the second part affects
GeomDoodads which are unnecessary and barely used anyway.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

2 files changed, 0 insertions, 25 deletions

diff --git a/src/cout.c b/src/cout.c
index 9e09fd9..ce34366 100644
--- a/src/cout.c
+++ b/src/cout.c
@@ -826,10 +826,6 @@ WriteCHdrGeomSections(FILE *file, XkbDescPtr xkb, XkbGeometryPtr geom)
     for (s = 0, section = geom->sections; s < geom->num_sections;
          s++, section++) {
         WriteCHdrGeomRows(file, xkb, section, s);
-#ifdef NOTYET
-        if (section->num_doodads > 0)
-            WriteCHdrGeomDoodads(file, xkb, geom, section, s);
-#endif
         if (section->num_overlays > 0)
             WriteCHdrGeomOverlays(file, xkb, section, s);
     }
diff --git a/src/srvmisc.c b/src/srvmisc.c
index cbf1ec8..5511edd 100644
--- a/src/srvmisc.c
+++ b/src/srvmisc.c
@@ -51,10 +51,6 @@ XkbWriteToServer(XkbFileInfo *result)
         return False;
     if (!XkbSetIndicatorMap(dpy, ~0, xkb))
         return False;
-#ifdef NOTYET
-    if (!XkbSetControls(dpy, XkbAllControlsMask, xkb))
-        return False;
-#endif
     if (!XkbSetCompatMap(dpy, XkbAllCompatMask, xkb, True))
         return False;
     if (!XkbSetNames(dpy, XkbAllNamesMask, 0, xkb->map->num_types, xkb))
@@ -64,23 +60,6 @@ XkbWriteToServer(XkbFileInfo *result)
             return False;
     }
     return True;
-#ifdef NOTYET
-    switch (result->type) {
-    case XkmSemanticsFile:
-        func = WriteCHdrSemantics;
-        break;
-    case XkmLayoutFile:
-        func = WriteCHdrLayout;
-        break;
-    case XkmKeymapFile:
-        func = WriteCHdrKeymap;
-        break;
-    default:
-        _XkbLibError(_XkbErrIllegalContents, "XkbWriteToServer", result->type);
-        break;
-    }
-    return ok;
-#endif
 }
 
 unsigned