properly scope thse stl stuff please!

[chaz/openbox] / util / epist / actions.hh

diff --git a/util/epist/actions.hh b/util/epist/actions.hh
index 66d320b70fafbb00c3ec397a7cf48ad6c8a272fa..9a7a60435340dc36b951e5b54f8228b2ffe19ebf 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
-#include <list>
 
 extern "C" {
-#include <X11/X.h>
+#include <X11/Xlib.h>
 }
+
+#include <list>
+
 class Action {
 public:
     // xOr: this is crap.
@@ -47,7 +71,7 @@ public:
   };
 
 private:
-  enum Action::ActionType _type;
+  enum ActionType _type;
   const KeyCode _keycode;
   const int _modifierMask;
   
@@ -56,9 +80,9 @@ public:
   inline const KeyCode keycode() const { return _keycode; }
   inline const int modifierMask() const { return _modifierMask; }
 
-  Action::Action(enum ActionType type, KeyCode keycode, int modifierMask);
+  Action(enum ActionType type, KeyCode keycode, int modifierMask);
 };
   
-typedef list<Action> ActionList;
+typedef std::list<Action> ActionList;
 
 #endif