24 files changed, 61 insertions, 61 deletions
diff --git a/src/Basemenu.hh b/src/Basemenu.hh
index 126f06e..14f7c67 100644
--- a/src/Basemenu.hh
+++ b/src/Basemenu.hh
@@ -22,10 +22,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-// $Id: Basemenu.hh,v 1.6 2002/02/08 13:20:23 fluxgen Exp $
+// $Id: Basemenu.hh,v 1.7 2002/02/17 19:00:04 fluxgen Exp $
-#ifndef   _BASEMENU_HH_
+#ifndef   BASEMENU_HH
-#define   _BASEMENU_HH_
+#define   BASEMENU_HH
 #include <X11/Xlib.h>
 #include <vector>
diff --git a/src/Clientmenu.hh b/src/Clientmenu.hh
index 6edc7f8..d49f5dd 100644
--- a/src/Clientmenu.hh
+++ b/src/Clientmenu.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-#ifndef   _CLIENTMENU_HH_
+#ifndef   CLIENTMENU_HH
-#define   _CLIENTMENU_HH_
+#define   CLIENTMENU_HH
 // forward declarations
 class Clientmenu;
diff --git a/src/Configmenu.hh b/src/Configmenu.hh
index 28adafb..eceac82 100644
--- a/src/Configmenu.hh
+++ b/src/Configmenu.hh
@@ -22,10 +22,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-// $Id: Configmenu.hh,v 1.2 2002/01/09 14:11:20 fluxgen Exp $
+// $Id: Configmenu.hh,v 1.3 2002/02/17 18:57:47 fluxgen Exp $
-#ifndef   _CONFIGMENU_HH_
+#ifndef   CONFIGMENU_HH
-#define   _CONFIGMENU_HH_
+#define   CONFIGMENU_HH
 // forward declaration
 class Configmenu;
diff --git a/src/DrawUtil.hh b/src/DrawUtil.hh
index 19d2cac..5131c70 100644
--- a/src/DrawUtil.hh
+++ b/src/DrawUtil.hh
@@ -19,10 +19,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-// $Id: DrawUtil.hh,v 1.2 2002/01/09 14:11:20 fluxgen Exp $
+// $Id: DrawUtil.hh,v 1.3 2002/02/17 19:00:14 fluxgen Exp $
-#ifndef _DRAWUTIL_HH_
+#ifndef DRAWUTIL_HH
-#define _DRAWUTIL_HH_
+#define DRAWUTIL_HH
 #include <X11/Xlib.h>
diff --git a/src/Icon.hh b/src/Icon.hh
index e6512f7..af4f28a 100644
--- a/src/Icon.hh
+++ b/src/Icon.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-#ifndef _ICON_HH_
+#ifndef ICON_HH
-#define _ICON_HH_
+#define ICON_HH
 // forward declaration
 class Iconmenu;
diff --git a/src/IconBar.hh b/src/IconBar.hh
index 06ea007..d0202a3 100644
--- a/src/IconBar.hh
+++ b/src/IconBar.hh
@@ -19,10 +19,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-// $Id: IconBar.hh,v 1.5 2002/02/04 22:43:15 fluxgen Exp $
+// $Id: IconBar.hh,v 1.6 2002/02/17 18:57:47 fluxgen Exp $
-#ifndef _ICONBAR_HH_
+#ifndef ICONBAR_HH
-#define _ICONBAR_HH_
+#define ICONBAR_HH
 #include <vector>
 #include "Window.hh"
diff --git a/src/Image.hh b/src/Image.hh
index 7f7c746..94953f9 100644
--- a/src/Image.hh
+++ b/src/Image.hh
@@ -22,10 +22,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-// $Id: Image.hh,v 1.4 2002/02/04 22:41:27 fluxgen Exp $
+// $Id: Image.hh,v 1.5 2002/02/17 18:57:47 fluxgen Exp $
-#ifndef   _IMAGE_HH_
+#ifndef   IMAGE_HH
-#define   _IMAGE_HH_
+#define   IMAGE_HH
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/src/Keys.hh b/src/Keys.hh
index 659be93..143715b 100644
--- a/src/Keys.hh
+++ b/src/Keys.hh
@@ -19,10 +19,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-// $Id: Keys.hh,v 1.5 2002/02/04 06:42:00 fluxgen Exp $
+// $Id: Keys.hh,v 1.6 2002/02/17 18:57:47 fluxgen Exp $
-#ifndef _KEYS_HH_
+#ifndef KEYS_HH
-#define _KEYS_HH_
+#define KEYS_HH
 #include <string>
 #include <vector>
diff --git a/src/LinkedList.hh b/src/LinkedList.hh
index aa6bc28..fa6d570 100644
--- a/src/LinkedList.hh
+++ b/src/LinkedList.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
 // DEALINGS IN THE SOFTWARE.
  
-#ifndef   _LINKEDLIST_HH_
+#ifndef   LINKEDLIST_HH
-#define   _LINKEDLIST_HH_
+#define   LINKEDLIST_HH
 class __llist_node {
diff --git a/src/Netizen.hh b/src/Netizen.hh
index bb12735..5e7dbed 100644
--- a/src/Netizen.hh
+++ b/src/Netizen.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-#ifndef  _NETIZEN_HH_
+#ifndef  NETIZEN_HH
-#define  _NETIZEN_HH_
+#define  NETIZEN_HH
 // forward declaration
 class Netizen;
diff --git a/src/NotCopyable.hh b/src/NotCopyable.hh
index dea4aae..1d119f0 100644
--- a/src/NotCopyable.hh
+++ b/src/NotCopyable.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-#ifndef _NOTCOPYABLE_HH_
+#ifndef NOTCOPYABLE_HH
-#define _NOTCOPYABLE_HH_
+#define NOTCOPYABLE_HH
 // inherit this class to 
 // disable assignment and copy
 class NotCopyable
diff --git a/src/Resource.hh b/src/Resource.hh
index 9b314e7..42156a8 100644
--- a/src/Resource.hh
+++ b/src/Resource.hh
@@ -19,10 +19,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-// $Id: Resource.hh,v 1.2 2002/01/21 02:11:49 fluxgen Exp $
+// $Id: Resource.hh,v 1.3 2002/02/17 18:57:47 fluxgen Exp $
-#ifndef _RESOURCE_HH_
+#ifndef RESOURCE_HH
-#define _RESOURCE_HH_
+#define RESOURCE_HH
 #include "NotCopyable.hh"
 #include <string>
diff --git a/src/Rootmenu.hh b/src/Rootmenu.hh
index 839bcbc..0fabc43 100644
--- a/src/Rootmenu.hh
+++ b/src/Rootmenu.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-#ifndef  _ROOTMENU_HH_
+#ifndef  ROOTMENU_HH
-#define  _ROOTMENU_HH_
+#define  ROOTMENU_HH
 // forward declarations
 class Rootmenu;
diff --git a/src/Slit.hh b/src/Slit.hh
index 43a91e9..2c29af6 100644
--- a/src/Slit.hh
+++ b/src/Slit.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
 // DEALINGS IN THE SOFTWARE.
  
-#ifndef   _SLIT_HH_
+#ifndef   SLIT_HH
-#define   _SLIT_HH_
+#define   SLIT_HH
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/src/StringUtil.hh b/src/StringUtil.hh
index 4ac3bff..a931fa2 100644
--- a/src/StringUtil.hh
+++ b/src/StringUtil.hh
@@ -19,10 +19,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-//$Id: StringUtil.hh,v 1.5 2002/01/21 01:56:39 fluxgen Exp $
+//$Id: StringUtil.hh,v 1.6 2002/02/17 18:52:20 fluxgen Exp $
-#ifndef _STRINGUTIL_HH_
+#ifndef STRINGUTIL_HH
-#define _STRINGUTIL_HH_
+#define STRINGUTIL_HH
 #include <string>
diff --git a/src/Tab.hh b/src/Tab.hh
index 4f3af12..d23255a 100644
--- a/src/Tab.hh
+++ b/src/Tab.hh
@@ -19,10 +19,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-// $Id: Tab.hh,v 1.10 2002/02/04 06:51:15 fluxgen Exp $
+// $Id: Tab.hh,v 1.11 2002/02/17 18:52:02 fluxgen Exp $
-#ifndef _TAB_HH_
+#ifndef TAB_HH
-#define _TAB_HH_
+#define TAB_HH
 #ifndef _IMAGE_HH_
 #include "Image.hh"
diff --git a/src/Theme.hh b/src/Theme.hh
index 0365114..5cafbf6 100644
--- a/src/Theme.hh
+++ b/src/Theme.hh
@@ -42,10 +42,10 @@
 //  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 //  DEALINGS IN THE SOFTWARE.
-// $Id: Theme.hh,v 1.5 2002/01/08 00:14:40 fluxgen Exp $
+// $Id: Theme.hh,v 1.6 2002/02/17 18:49:50 fluxgen Exp $
-#ifndef _THEME_HH_
+#ifndef THEME_HH
-#define _THEME_HH_
+#define THEME_HH
 #ifndef _IMAGE_HH_
diff --git a/src/Timer.hh b/src/Timer.hh
index 0cc6bbe..bf40c3c 100644
--- a/src/Timer.hh
+++ b/src/Timer.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
 // DEALINGS IN THE SOFTWARE.
  
-#ifndef   _TIMER_HH_
+#ifndef   TIMER_HH
-#define   _TIMER_HH_
+#define   TIMER_HH
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index 4872500..adbe7e3 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -19,10 +19,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-// $Id: Toolbar.hh,v 1.6 2002/02/04 22:38:41 fluxgen Exp $
+// $Id: Toolbar.hh,v 1.7 2002/02/17 18:49:02 fluxgen Exp $
-#ifndef   _TOOLBAR_HH_
+#ifndef   TOOLBAR_HH
-#define   _TOOLBAR_HH_
+#define   TOOLBAR_HH
 #include <X11/Xlib.h>
 #ifndef _BASEMENU_HH_
diff --git a/src/Windowmenu.hh b/src/Windowmenu.hh
index 794d091..b4b9781 100644
--- a/src/Windowmenu.hh
+++ b/src/Windowmenu.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-#ifndef   _WINDOWMENU_HH_
+#ifndef   WINDOWMENU_HH
-#define   _WINDOWMENU_HH_
+#define   WINDOWMENU_HH
 // forward declaration
 class Windowmenu;
diff --git a/src/Workspace.hh b/src/Workspace.hh
index 0c76f0c..1d49625 100644
--- a/src/Workspace.hh
+++ b/src/Workspace.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-#ifndef   _WORKSPACE_HH_
+#ifndef   WORKSPACE_HH
-#define   _WORKSPACE_HH_
+#define   WORKSPACE_HH
 #include <X11/Xlib.h>
 #include <string>
diff --git a/src/Workspacemenu.hh b/src/Workspacemenu.hh
index 8e2cc48..fc18654 100644
--- a/src/Workspacemenu.hh
+++ b/src/Workspacemenu.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-#ifndef   _WORKSPACEMENU_HH_
+#ifndef   WORKSPACEMENU_HH
-#define   _WORKSPACEMENU_HH_
+#define   WORKSPACEMENU_HH
 // forward declaration
 class Workspacemenu;
diff --git a/src/XrmDatabaseHelper.hh b/src/XrmDatabaseHelper.hh
index b062065..ed8d761 100644
--- a/src/XrmDatabaseHelper.hh
+++ b/src/XrmDatabaseHelper.hh
@@ -19,14 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-// $Id: XrmDatabaseHelper.hh,v 1.3 2002/02/04 07:03:46 fluxgen Exp $
+// $Id: XrmDatabaseHelper.hh,v 1.4 2002/02/17 18:44:07 fluxgen Exp $
 // This is a helper for XrmDatabase
 // when database goes out of scope
 // the XrmDatabase variable will be destroyed.
-#ifndef _XRMDATABASEHELPER_HH_
+#ifndef XRMDATABASEHELPER_HH
-#define _XRMDATABASEHELPER_HH_
+#define XRMDATABASEHELPER_HH
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
diff --git a/src/i18n.hh b/src/i18n.hh
index 46b5c1c..15d5a92 100644
--- a/src/i18n.hh
+++ b/src/i18n.hh
@@ -22,10 +22,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-// $Id: i18n.hh,v 1.4 2002/01/11 11:54:48 fluxgen Exp $
+// $Id: i18n.hh,v 1.5 2002/02/17 18:41:44 fluxgen Exp $
-#ifndef   _I18N_HH_
+#ifndef   I18N_HH
-#define   _I18N_HH_
+#define   I18N_HH
 #ifdef    NLS
 #  include "../nls/blackbox-nls.hh"

diff --git a/src/Basemenu.hh b/src/Basemenu.hh index 126f06e..14f7c67 100644 --- a/src/Basemenu.hh +++ b/src/Basemenu.hh
@@ -22,10 +22,10 @@
22	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	22	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23	// DEALINGS IN THE SOFTWARE.	23	// DEALINGS IN THE SOFTWARE.
24		24
25	// $Id: Basemenu.hh,v 1.6 2002/02/08 13:20:23 fluxgen Exp $	25	// $Id: Basemenu.hh,v 1.7 2002/02/17 19:00:04 fluxgen Exp $
26		26
27	#ifndef _BASEMENU_HH_	27	#ifndef BASEMENU_HH
28	#define _BASEMENU_HH_	28	#define BASEMENU_HH
29		29
30	#include <X11/Xlib.h>	30	#include <X11/Xlib.h>
31	#include <vector>	31	#include <vector>


diff --git a/src/Clientmenu.hh b/src/Clientmenu.hh index 6edc7f8..d49f5dd 100644 --- a/src/Clientmenu.hh +++ b/src/Clientmenu.hh
@@ -19,8 +19,8 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	#ifndef _CLIENTMENU_HH_	22	#ifndef CLIENTMENU_HH
23	#define _CLIENTMENU_HH_	23	#define CLIENTMENU_HH
24		24
25	// forward declarations	25	// forward declarations
26	class Clientmenu;	26	class Clientmenu;


diff --git a/src/Configmenu.hh b/src/Configmenu.hh index 28adafb..eceac82 100644 --- a/src/Configmenu.hh +++ b/src/Configmenu.hh
@@ -22,10 +22,10 @@
22	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	22	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23	// DEALINGS IN THE SOFTWARE.	23	// DEALINGS IN THE SOFTWARE.
24		24
25	// $Id: Configmenu.hh,v 1.2 2002/01/09 14:11:20 fluxgen Exp $	25	// $Id: Configmenu.hh,v 1.3 2002/02/17 18:57:47 fluxgen Exp $
26		26
27	#ifndef _CONFIGMENU_HH_	27	#ifndef CONFIGMENU_HH
28	#define _CONFIGMENU_HH_	28	#define CONFIGMENU_HH
29		29
30	// forward declaration	30	// forward declaration
31	class Configmenu;	31	class Configmenu;


diff --git a/src/DrawUtil.hh b/src/DrawUtil.hh index 19d2cac..5131c70 100644 --- a/src/DrawUtil.hh +++ b/src/DrawUtil.hh
@@ -19,10 +19,10 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	// $Id: DrawUtil.hh,v 1.2 2002/01/09 14:11:20 fluxgen Exp $	22	// $Id: DrawUtil.hh,v 1.3 2002/02/17 19:00:14 fluxgen Exp $
23		23
24	#ifndef _DRAWUTIL_HH_	24	#ifndef DRAWUTIL_HH
25	#define _DRAWUTIL_HH_	25	#define DRAWUTIL_HH
26		26
27	#include <X11/Xlib.h>	27	#include <X11/Xlib.h>
28		28


diff --git a/src/Icon.hh b/src/Icon.hh index e6512f7..af4f28a 100644 --- a/src/Icon.hh +++ b/src/Icon.hh
@@ -19,8 +19,8 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	#ifndef _ICON_HH_	22	#ifndef ICON_HH
23	#define _ICON_HH_	23	#define ICON_HH
24		24
25	// forward declaration	25	// forward declaration
26	class Iconmenu;	26	class Iconmenu;


diff --git a/src/IconBar.hh b/src/IconBar.hh index 06ea007..d0202a3 100644 --- a/src/IconBar.hh +++ b/src/IconBar.hh
@@ -19,10 +19,10 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	// $Id: IconBar.hh,v 1.5 2002/02/04 22:43:15 fluxgen Exp $	22	// $Id: IconBar.hh,v 1.6 2002/02/17 18:57:47 fluxgen Exp $
23		23
24	#ifndef _ICONBAR_HH_	24	#ifndef ICONBAR_HH
25	#define _ICONBAR_HH_	25	#define ICONBAR_HH
26		26
27	#include <vector>	27	#include <vector>
28	#include "Window.hh"	28	#include "Window.hh"


diff --git a/src/Image.hh b/src/Image.hh index 7f7c746..94953f9 100644 --- a/src/Image.hh +++ b/src/Image.hh
@@ -22,10 +22,10 @@
22	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	22	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23	// DEALINGS IN THE SOFTWARE.	23	// DEALINGS IN THE SOFTWARE.
24		24
25	// $Id: Image.hh,v 1.4 2002/02/04 22:41:27 fluxgen Exp $	25	// $Id: Image.hh,v 1.5 2002/02/17 18:57:47 fluxgen Exp $
26		26
27	#ifndef _IMAGE_HH_	27	#ifndef IMAGE_HH
28	#define _IMAGE_HH_	28	#define IMAGE_HH
29		29
30	#include <X11/Xlib.h>	30	#include <X11/Xlib.h>
31	#include <X11/Xutil.h>	31	#include <X11/Xutil.h>


diff --git a/src/Keys.hh b/src/Keys.hh index 659be93..143715b 100644 --- a/src/Keys.hh +++ b/src/Keys.hh
@@ -19,10 +19,10 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	// $Id: Keys.hh,v 1.5 2002/02/04 06:42:00 fluxgen Exp $	22	// $Id: Keys.hh,v 1.6 2002/02/17 18:57:47 fluxgen Exp $
23		23
24	#ifndef _KEYS_HH_	24	#ifndef KEYS_HH
25	#define _KEYS_HH_	25	#define KEYS_HH
26		26
27	#include <string>	27	#include <string>
28	#include <vector>	28	#include <vector>


diff --git a/src/LinkedList.hh b/src/LinkedList.hh index aa6bc28..fa6d570 100644 --- a/src/LinkedList.hh +++ b/src/LinkedList.hh
@@ -19,8 +19,8 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	#ifndef _LINKEDLIST_HH_	22	#ifndef LINKEDLIST_HH
23	#define _LINKEDLIST_HH_	23	#define LINKEDLIST_HH
24		24
25		25
26	class __llist_node {	26	class __llist_node {


diff --git a/src/Netizen.hh b/src/Netizen.hh index bb12735..5e7dbed 100644 --- a/src/Netizen.hh +++ b/src/Netizen.hh
@@ -19,8 +19,8 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	#ifndef _NETIZEN_HH_	22	#ifndef NETIZEN_HH
23	#define _NETIZEN_HH_	23	#define NETIZEN_HH
24		24
25	// forward declaration	25	// forward declaration
26	class Netizen;	26	class Netizen;


diff --git a/src/NotCopyable.hh b/src/NotCopyable.hh index dea4aae..1d119f0 100644 --- a/src/NotCopyable.hh +++ b/src/NotCopyable.hh
@@ -19,8 +19,8 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	#ifndef _NOTCOPYABLE_HH_	22	#ifndef NOTCOPYABLE_HH
23	#define _NOTCOPYABLE_HH_	23	#define NOTCOPYABLE_HH
24	// inherit this class to	24	// inherit this class to
25	// disable assignment and copy	25	// disable assignment and copy
26	class NotCopyable	26	class NotCopyable


diff --git a/src/Resource.hh b/src/Resource.hh index 9b314e7..42156a8 100644 --- a/src/Resource.hh +++ b/src/Resource.hh
@@ -19,10 +19,10 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	// $Id: Resource.hh,v 1.2 2002/01/21 02:11:49 fluxgen Exp $	22	// $Id: Resource.hh,v 1.3 2002/02/17 18:57:47 fluxgen Exp $
23		23
24	#ifndef _RESOURCE_HH_	24	#ifndef RESOURCE_HH
25	#define _RESOURCE_HH_	25	#define RESOURCE_HH
26		26
27	#include "NotCopyable.hh"	27	#include "NotCopyable.hh"
28	#include <string>	28	#include <string>


diff --git a/src/Rootmenu.hh b/src/Rootmenu.hh index 839bcbc..0fabc43 100644 --- a/src/Rootmenu.hh +++ b/src/Rootmenu.hh
@@ -19,8 +19,8 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	#ifndef _ROOTMENU_HH_	22	#ifndef ROOTMENU_HH
23	#define _ROOTMENU_HH_	23	#define ROOTMENU_HH
24		24
25	// forward declarations	25	// forward declarations
26	class Rootmenu;	26	class Rootmenu;


diff --git a/src/Slit.hh b/src/Slit.hh index 43a91e9..2c29af6 100644 --- a/src/Slit.hh +++ b/src/Slit.hh
@@ -19,8 +19,8 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	#ifndef _SLIT_HH_	22	#ifndef SLIT_HH
23	#define _SLIT_HH_	23	#define SLIT_HH
24		24
25	#include <X11/Xlib.h>	25	#include <X11/Xlib.h>
26	#include <X11/Xutil.h>	26	#include <X11/Xutil.h>


diff --git a/src/StringUtil.hh b/src/StringUtil.hh index 4ac3bff..a931fa2 100644 --- a/src/StringUtil.hh +++ b/src/StringUtil.hh
@@ -19,10 +19,10 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	//$Id: StringUtil.hh,v 1.5 2002/01/21 01:56:39 fluxgen Exp $	22	//$Id: StringUtil.hh,v 1.6 2002/02/17 18:52:20 fluxgen Exp $
23		23
24	#ifndef _STRINGUTIL_HH_	24	#ifndef STRINGUTIL_HH
25	#define _STRINGUTIL_HH_	25	#define STRINGUTIL_HH
26		26
27	#include <string>	27	#include <string>
28		28


diff --git a/src/Tab.hh b/src/Tab.hh index 4f3af12..d23255a 100644 --- a/src/Tab.hh +++ b/src/Tab.hh
@@ -19,10 +19,10 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	// $Id: Tab.hh,v 1.10 2002/02/04 06:51:15 fluxgen Exp $	22	// $Id: Tab.hh,v 1.11 2002/02/17 18:52:02 fluxgen Exp $
23		23
24	#ifndef _TAB_HH_	24	#ifndef TAB_HH
25	#define _TAB_HH_	25	#define TAB_HH
26		26
27	#ifndef _IMAGE_HH_	27	#ifndef _IMAGE_HH_
28	#include "Image.hh"	28	#include "Image.hh"


diff --git a/src/Theme.hh b/src/Theme.hh index 0365114..5cafbf6 100644 --- a/src/Theme.hh +++ b/src/Theme.hh
@@ -42,10 +42,10 @@
42	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	42	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
43	// DEALINGS IN THE SOFTWARE.	43	// DEALINGS IN THE SOFTWARE.
44		44
45	// $Id: Theme.hh,v 1.5 2002/01/08 00:14:40 fluxgen Exp $	45	// $Id: Theme.hh,v 1.6 2002/02/17 18:49:50 fluxgen Exp $
46		46
47	#ifndef _THEME_HH_	47	#ifndef THEME_HH
48	#define _THEME_HH_	48	#define THEME_HH
49		49
50		50
51	#ifndef _IMAGE_HH_	51	#ifndef _IMAGE_HH_


diff --git a/src/Timer.hh b/src/Timer.hh index 0cc6bbe..bf40c3c 100644 --- a/src/Timer.hh +++ b/src/Timer.hh
@@ -19,8 +19,8 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	#ifndef _TIMER_HH_	22	#ifndef TIMER_HH
23	#define _TIMER_HH_	23	#define TIMER_HH
24		24
25	#ifdef HAVE_CONFIG_H	25	#ifdef HAVE_CONFIG_H
26	#include "../config.h"	26	#include "../config.h"


diff --git a/src/Toolbar.hh b/src/Toolbar.hh index 4872500..adbe7e3 100644 --- a/src/Toolbar.hh +++ b/src/Toolbar.hh
@@ -19,10 +19,10 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	// $Id: Toolbar.hh,v 1.6 2002/02/04 22:38:41 fluxgen Exp $	22	// $Id: Toolbar.hh,v 1.7 2002/02/17 18:49:02 fluxgen Exp $
23		23
24	#ifndef _TOOLBAR_HH_	24	#ifndef TOOLBAR_HH
25	#define _TOOLBAR_HH_	25	#define TOOLBAR_HH
26		26
27	#include <X11/Xlib.h>	27	#include <X11/Xlib.h>
28	#ifndef _BASEMENU_HH_	28	#ifndef _BASEMENU_HH_


diff --git a/src/Windowmenu.hh b/src/Windowmenu.hh index 794d091..b4b9781 100644 --- a/src/Windowmenu.hh +++ b/src/Windowmenu.hh
@@ -19,8 +19,8 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	#ifndef _WINDOWMENU_HH_	22	#ifndef WINDOWMENU_HH
23	#define _WINDOWMENU_HH_	23	#define WINDOWMENU_HH
24		24
25	// forward declaration	25	// forward declaration
26	class Windowmenu;	26	class Windowmenu;


diff --git a/src/Workspace.hh b/src/Workspace.hh index 0c76f0c..1d49625 100644 --- a/src/Workspace.hh +++ b/src/Workspace.hh
@@ -19,8 +19,8 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	#ifndef _WORKSPACE_HH_	22	#ifndef WORKSPACE_HH
23	#define _WORKSPACE_HH_	23	#define WORKSPACE_HH
24		24
25	#include <X11/Xlib.h>	25	#include <X11/Xlib.h>
26	#include <string>	26	#include <string>


diff --git a/src/Workspacemenu.hh b/src/Workspacemenu.hh index 8e2cc48..fc18654 100644 --- a/src/Workspacemenu.hh +++ b/src/Workspacemenu.hh
@@ -19,8 +19,8 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	#ifndef _WORKSPACEMENU_HH_	22	#ifndef WORKSPACEMENU_HH
23	#define _WORKSPACEMENU_HH_	23	#define WORKSPACEMENU_HH
24		24
25	// forward declaration	25	// forward declaration
26	class Workspacemenu;	26	class Workspacemenu;


diff --git a/src/XrmDatabaseHelper.hh b/src/XrmDatabaseHelper.hh index b062065..ed8d761 100644 --- a/src/XrmDatabaseHelper.hh +++ b/src/XrmDatabaseHelper.hh
@@ -19,14 +19,14 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	// $Id: XrmDatabaseHelper.hh,v 1.3 2002/02/04 07:03:46 fluxgen Exp $	22	// $Id: XrmDatabaseHelper.hh,v 1.4 2002/02/17 18:44:07 fluxgen Exp $
23		23
24	// This is a helper for XrmDatabase	24	// This is a helper for XrmDatabase
25	// when database goes out of scope	25	// when database goes out of scope
26	// the XrmDatabase variable will be destroyed.	26	// the XrmDatabase variable will be destroyed.
27		27
28	#ifndef _XRMDATABASEHELPER_HH_	28	#ifndef XRMDATABASEHELPER_HH
29	#define _XRMDATABASEHELPER_HH_	29	#define XRMDATABASEHELPER_HH
30		30
31	#include <X11/Xlib.h>	31	#include <X11/Xlib.h>
32	#include <X11/Xresource.h>	32	#include <X11/Xresource.h>


diff --git a/src/i18n.hh b/src/i18n.hh index 46b5c1c..15d5a92 100644 --- a/src/i18n.hh +++ b/src/i18n.hh
@@ -22,10 +22,10 @@
22	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	22	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23	// DEALINGS IN THE SOFTWARE.	23	// DEALINGS IN THE SOFTWARE.
24		24
25	// $Id: i18n.hh,v 1.4 2002/01/11 11:54:48 fluxgen Exp $	25	// $Id: i18n.hh,v 1.5 2002/02/17 18:41:44 fluxgen Exp $
26		26
27	#ifndef _I18N_HH_	27	#ifndef I18N_HH
28	#define _I18N_HH_	28	#define I18N_HH
29		29
30	#ifdef NLS	30	#ifdef NLS
31	# include "../nls/blackbox-nls.hh"	31	# include "../nls/blackbox-nls.hh"