add file headers and couple fixups

diff --git a/util/epist/actions.cc b/util/epist/actions.cc
index a36cf81514a11bce8717e84107af26e5fbd59c82..d4beaacb7df62aa9d53ca866ae8a2330c0093e94 100644 (file)
--- a/util/epist/actions.cc
+++ b/util/epist/actions.cc
@@ -1,3 +1,25 @@
+// -*- mode: C++; indent-tabs-mode: nil; -*-
+// actions.cc for Epistophy - a key handler for NETWM/EWMH window managers.
+// Copyright (c) 2002 - 2002 Ben Jansens <ben at orodu.net>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+

 #include "actions.hh"
 
 Action::Action(enum ActionType type, KeyCode keycode, int modifierMask):
 #include "actions.hh"
 
 Action::Action(enum ActionType type, KeyCode keycode, int modifierMask):

diff --git a/util/epist/actions.hh b/util/epist/actions.hh
index 3471f4c4c54709abfd6dc26287e3ab7a4a1570fe..531d54d21f3349a7db99ed8904f5ecd117c7b47e 100644 (file)
--- a/util/epist/actions.hh
+++ b/util/epist/actions.hh
@@ -1,10 +1,34 @@
+// -*- mode: C++; indent-tabs-mode: nil; -*-
+// actions.hh for Epistophy - a key handler for NETWM/EWMH window managers.
+// Copyright (c) 2002 - 2002 Ben Jansens <ben at orodu.net>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+

 #ifndef __actions_hh
 #define __actions_hh
 #ifndef __actions_hh
 #define __actions_hh

-#include <list>

 
 extern "C" {
 
 extern "C" {

-#include <X11/X.h>
+#include <X11/Xlib.h>

 }
 }

+
+#include <list>
+

 class Action {
 public:
     // xOr: this is crap.
 class Action {
 public:
     // xOr: this is crap.