WE DONT USE BASE DISPLAY FOR ANYTHING ANY MORE!!@^!*@*!! YAY

[chaz/openbox] / src / configuration.hh

diff --git a/src/configuration.hh b/src/configuration.hh
index 8f4a315745a2420ce7a1463911a6aacd8a197e29..a45bd3f8ac193021f635c0227d8be9b62e9d4c43 100644 (file)
--- a/src/configuration.hh
+++ b/src/configuration.hh
@@ -1,25 +1,4 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-// Configuration.hh for Blackbox - an X11 Window manager
-// Copyright (c) 2002 - 2002 Ben Jansens (ben@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   __Configuration_hh
 #define   __Configuration_hh
 
@@ -27,6 +6,8 @@
 #include <X11/Xresource.h>
 #include <string>
 
+namespace ob {
+
 /*
  * The Configuration class is a generic wrapper for configuration settings.
  *
@@ -95,4 +76,6 @@ private:
   XrmDatabase _database;
 };
 
+}
+
 #endif // __Configuration_hh