diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2007-12-30 06:44:11 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2007-12-30 06:44:11 (GMT) |
commit | 4cc810b0d39917d37fa08034ac7dd509292c9ce3 (patch) | |
tree | 88c04dae96cda14478872c7aa34861c2f977ecb2 /src/FbTk | |
parent | de6d340ba3a1a64ee46e6562d0bdab062cb92a1e (diff) | |
download | fluxbox-4cc810b0d39917d37fa08034ac7dd509292c9ce3.zip fluxbox-4cc810b0d39917d37fa08034ac7dd509292c9ce3.tar.bz2 |
remove some (hopefully) unneeded header includes
Diffstat (limited to 'src/FbTk')
-rw-r--r-- | src/FbTk/BoolMenuItem.hh | 3 | ||||
-rw-r--r-- | src/FbTk/Button.hh | 1 | ||||
-rw-r--r-- | src/FbTk/Color.hh | 2 | ||||
-rw-r--r-- | src/FbTk/Container.hh | 1 | ||||
-rw-r--r-- | src/FbTk/EventManager.cc | 1 | ||||
-rw-r--r-- | src/FbTk/EventManager.hh | 3 | ||||
-rw-r--r-- | src/FbTk/Font.hh | 1 | ||||
-rw-r--r-- | src/FbTk/FontImp.hh | 6 | ||||
-rw-r--r-- | src/FbTk/ImageControl.hh | 2 | ||||
-rw-r--r-- | src/FbTk/IntMenuItem.hh | 3 | ||||
-rw-r--r-- | src/FbTk/KeyUtil.cc | 2 | ||||
-rw-r--r-- | src/FbTk/KeyUtil.hh | 1 | ||||
-rw-r--r-- | src/FbTk/Menu.cc | 1 | ||||
-rw-r--r-- | src/FbTk/Menu.hh | 5 | ||||
-rw-r--r-- | src/FbTk/MenuTheme.hh | 1 | ||||
-rw-r--r-- | src/FbTk/MultLayers.cc | 1 | ||||
-rw-r--r-- | src/FbTk/MultiButtonMenuItem.cc | 1 | ||||
-rw-r--r-- | src/FbTk/Resource.hh | 4 | ||||
-rw-r--r-- | src/FbTk/SearchResult.cc | 2 | ||||
-rw-r--r-- | src/FbTk/SearchResult.hh | 4 | ||||
-rw-r--r-- | src/FbTk/Shape.hh | 1 | ||||
-rw-r--r-- | src/FbTk/TextBox.hh | 2 | ||||
-rw-r--r-- | src/FbTk/TextButton.hh | 1 | ||||
-rw-r--r-- | src/FbTk/TextureRender.cc | 2 | ||||
-rw-r--r-- | src/FbTk/TextureRender.hh | 4 | ||||
-rw-r--r-- | src/FbTk/XLayer.cc | 2 | ||||
-rw-r--r-- | src/FbTk/XLayer.hh | 2 | ||||
-rw-r--r-- | src/FbTk/XLayerItem.hh | 3 | ||||
-rw-r--r-- | src/FbTk/XrmDatabaseHelper.hh | 1 |
29 files changed, 29 insertions, 34 deletions
diff --git a/src/FbTk/BoolMenuItem.hh b/src/FbTk/BoolMenuItem.hh index 2e8b2c3..7390066 100644 --- a/src/FbTk/BoolMenuItem.hh +++ b/src/FbTk/BoolMenuItem.hh | |||
@@ -23,10 +23,11 @@ | |||
23 | #define FBTK_BOOLMENUITEM_HH | 23 | #define FBTK_BOOLMENUITEM_HH |
24 | 24 | ||
25 | #include "MenuItem.hh" | 25 | #include "MenuItem.hh" |
26 | #include "Accessor.hh" | ||
27 | 26 | ||
28 | namespace FbTk { | 27 | namespace FbTk { |
29 | 28 | ||
29 | class Accessor<class T>; | ||
30 | |||
30 | /// a bool menu item | 31 | /// a bool menu item |
31 | class BoolMenuItem: public FbTk::MenuItem { | 32 | class BoolMenuItem: public FbTk::MenuItem { |
32 | public: | 33 | public: |
diff --git a/src/FbTk/Button.hh b/src/FbTk/Button.hh index 89a754c..4b2ef8b 100644 --- a/src/FbTk/Button.hh +++ b/src/FbTk/Button.hh | |||
@@ -33,7 +33,6 @@ | |||
33 | #include "Text.hh" | 33 | #include "Text.hh" |
34 | 34 | ||
35 | #include <X11/Xlib.h> | 35 | #include <X11/Xlib.h> |
36 | #include <memory> | ||
37 | 36 | ||
38 | namespace FbTk { | 37 | namespace FbTk { |
39 | 38 | ||
diff --git a/src/FbTk/Color.hh b/src/FbTk/Color.hh index 2b72e97..efba705 100644 --- a/src/FbTk/Color.hh +++ b/src/FbTk/Color.hh | |||
@@ -27,8 +27,6 @@ | |||
27 | #ifndef FBTK_COLOR_HH | 27 | #ifndef FBTK_COLOR_HH |
28 | #define FBTK_COLOR_HH | 28 | #define FBTK_COLOR_HH |
29 | 29 | ||
30 | #include "NotCopyable.hh" | ||
31 | |||
32 | namespace FbTk { | 30 | namespace FbTk { |
33 | 31 | ||
34 | /// Allocates rgb color and pixel value | 32 | /// Allocates rgb color and pixel value |
diff --git a/src/FbTk/Container.hh b/src/FbTk/Container.hh index 5fa13f3..954f929 100644 --- a/src/FbTk/Container.hh +++ b/src/FbTk/Container.hh | |||
@@ -29,7 +29,6 @@ | |||
29 | #include "Text.hh" // for Orientation | 29 | #include "Text.hh" // for Orientation |
30 | 30 | ||
31 | #include <list> | 31 | #include <list> |
32 | #include <functional> | ||
33 | 32 | ||
34 | namespace FbTk { | 33 | namespace FbTk { |
35 | 34 | ||
diff --git a/src/FbTk/EventManager.cc b/src/FbTk/EventManager.cc index fd26950..29f8962 100644 --- a/src/FbTk/EventManager.cc +++ b/src/FbTk/EventManager.cc | |||
@@ -22,6 +22,7 @@ | |||
22 | // $Id$ | 22 | // $Id$ |
23 | 23 | ||
24 | #include "EventManager.hh" | 24 | #include "EventManager.hh" |
25 | #include "EventHandler.hh" | ||
25 | #include "FbWindow.hh" | 26 | #include "FbWindow.hh" |
26 | #include "App.hh" | 27 | #include "App.hh" |
27 | 28 | ||
diff --git a/src/FbTk/EventManager.hh b/src/FbTk/EventManager.hh index 149649b..e39ad7d 100644 --- a/src/FbTk/EventManager.hh +++ b/src/FbTk/EventManager.hh | |||
@@ -21,12 +21,13 @@ | |||
21 | 21 | ||
22 | // $Id$ | 22 | // $Id$ |
23 | 23 | ||
24 | #include "EventHandler.hh" | ||
25 | #include <map> | 24 | #include <map> |
25 | #include <X11/Xlib.h> | ||
26 | 26 | ||
27 | namespace FbTk { | 27 | namespace FbTk { |
28 | 28 | ||
29 | class FbWindow; | 29 | class FbWindow; |
30 | class EventHandler; | ||
30 | 31 | ||
31 | /** | 32 | /** |
32 | singleton mediator for EventHandlers | 33 | singleton mediator for EventHandlers |
diff --git a/src/FbTk/Font.hh b/src/FbTk/Font.hh index 4806c43..13bf12b 100644 --- a/src/FbTk/Font.hh +++ b/src/FbTk/Font.hh | |||
@@ -25,7 +25,6 @@ | |||
25 | #define FBTK_FONT_HH | 25 | #define FBTK_FONT_HH |
26 | 26 | ||
27 | #include <X11/Xlib.h> | 27 | #include <X11/Xlib.h> |
28 | #include <X11/Xresource.h> | ||
29 | 28 | ||
30 | #ifdef HAVE_CONFIG_H | 29 | #ifdef HAVE_CONFIG_H |
31 | #include "config.h" | 30 | #include "config.h" |
diff --git a/src/FbTk/FontImp.hh b/src/FbTk/FontImp.hh index 378c45f..83cb032 100644 --- a/src/FbTk/FontImp.hh +++ b/src/FbTk/FontImp.hh | |||
@@ -24,13 +24,11 @@ | |||
24 | #ifndef FBTK_FONTIMP_HH | 24 | #ifndef FBTK_FONTIMP_HH |
25 | #define FBTK_FONTIMP_HH | 25 | #define FBTK_FONTIMP_HH |
26 | 26 | ||
27 | #include "Color.hh" | 27 | #include "Text.hh" |
28 | #include "Font.hh" | 28 | #include "FbString.hh" |
29 | 29 | ||
30 | #include <X11/Xlib.h> | 30 | #include <X11/Xlib.h> |
31 | 31 | ||
32 | #include <string> | ||
33 | |||
34 | namespace FbTk { | 32 | namespace FbTk { |
35 | 33 | ||
36 | class FbDrawable; | 34 | class FbDrawable; |
diff --git a/src/FbTk/ImageControl.hh b/src/FbTk/ImageControl.hh index a2c5e92..08a797f 100644 --- a/src/FbTk/ImageControl.hh +++ b/src/FbTk/ImageControl.hh | |||
@@ -34,9 +34,7 @@ | |||
34 | #include "NotCopyable.hh" | 34 | #include "NotCopyable.hh" |
35 | 35 | ||
36 | #include <X11/Xlib.h> | 36 | #include <X11/Xlib.h> |
37 | #include <X11/Xutil.h> | ||
38 | #include <list> | 37 | #include <list> |
39 | #include <set> | ||
40 | 38 | ||
41 | namespace FbTk { | 39 | namespace FbTk { |
42 | 40 | ||
diff --git a/src/FbTk/IntMenuItem.hh b/src/FbTk/IntMenuItem.hh index a1431fb..69d5409 100644 --- a/src/FbTk/IntMenuItem.hh +++ b/src/FbTk/IntMenuItem.hh | |||
@@ -23,12 +23,13 @@ | |||
23 | #define FBTK_INTMENUITEM_HH | 23 | #define FBTK_INTMENUITEM_HH |
24 | 24 | ||
25 | #include "MenuItem.hh" | 25 | #include "MenuItem.hh" |
26 | #include "Accessor.hh" | ||
27 | 26 | ||
28 | #include <string> | 27 | #include <string> |
29 | 28 | ||
30 | namespace FbTk { | 29 | namespace FbTk { |
31 | 30 | ||
31 | class Accessor<class T>; | ||
32 | |||
32 | /// Changes an resource integer value between min and max | 33 | /// Changes an resource integer value between min and max |
33 | class IntMenuItem: public FbTk::MenuItem { | 34 | class IntMenuItem: public FbTk::MenuItem { |
34 | public: | 35 | public: |
diff --git a/src/FbTk/KeyUtil.cc b/src/FbTk/KeyUtil.cc index a6ca632..bd3bee1 100644 --- a/src/FbTk/KeyUtil.cc +++ b/src/FbTk/KeyUtil.cc | |||
@@ -24,6 +24,8 @@ | |||
24 | #include "KeyUtil.hh" | 24 | #include "KeyUtil.hh" |
25 | #include "App.hh" | 25 | #include "App.hh" |
26 | 26 | ||
27 | #include <X11/keysym.h> | ||
28 | |||
27 | #include <string> | 29 | #include <string> |
28 | #ifdef HAVE_CSTRING | 30 | #ifdef HAVE_CSTRING |
29 | #include <cstring> | 31 | #include <cstring> |
diff --git a/src/FbTk/KeyUtil.hh b/src/FbTk/KeyUtil.hh index 9311561..5044e86 100644 --- a/src/FbTk/KeyUtil.hh +++ b/src/FbTk/KeyUtil.hh | |||
@@ -25,7 +25,6 @@ | |||
25 | #define FBTK_KEYUTIL_HH | 25 | #define FBTK_KEYUTIL_HH |
26 | 26 | ||
27 | #include <X11/Xlib.h> | 27 | #include <X11/Xlib.h> |
28 | #include <X11/keysym.h> | ||
29 | 28 | ||
30 | #include <memory> | 29 | #include <memory> |
31 | 30 | ||
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc index 00dcc54..af2515a 100644 --- a/src/FbTk/Menu.cc +++ b/src/FbTk/Menu.cc | |||
@@ -45,6 +45,7 @@ | |||
45 | #include "SimpleCommand.hh" | 45 | #include "SimpleCommand.hh" |
46 | #include "FbPixmap.hh" | 46 | #include "FbPixmap.hh" |
47 | 47 | ||
48 | #include <X11/Xutil.h> | ||
48 | #include <X11/Xatom.h> | 49 | #include <X11/Xatom.h> |
49 | #include <X11/keysym.h> | 50 | #include <X11/keysym.h> |
50 | 51 | ||
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh index 53b1375..45adb71 100644 --- a/src/FbTk/Menu.hh +++ b/src/FbTk/Menu.hh | |||
@@ -34,10 +34,7 @@ | |||
34 | 34 | ||
35 | #include "FbWindow.hh" | 35 | #include "FbWindow.hh" |
36 | #include "EventHandler.hh" | 36 | #include "EventHandler.hh" |
37 | #include "RefCount.hh" | ||
38 | #include "Command.hh" | ||
39 | #include "Observer.hh" | 37 | #include "Observer.hh" |
40 | #include "FbPixmap.hh" | ||
41 | #include "MenuTheme.hh" | 38 | #include "MenuTheme.hh" |
42 | #include "Timer.hh" | 39 | #include "Timer.hh" |
43 | #include "FbString.hh" | 40 | #include "FbString.hh" |
@@ -45,8 +42,10 @@ | |||
45 | 42 | ||
46 | namespace FbTk { | 43 | namespace FbTk { |
47 | 44 | ||
45 | class Command; | ||
48 | class MenuItem; | 46 | class MenuItem; |
49 | class ImageControl; | 47 | class ImageControl; |
48 | class RefCount<class T>; | ||
50 | 49 | ||
51 | /// Base class for menus | 50 | /// Base class for menus |
52 | class Menu: public FbTk::EventHandler, FbTk::FbWindowRenderer, | 51 | class Menu: public FbTk::EventHandler, FbTk::FbWindowRenderer, |
diff --git a/src/FbTk/MenuTheme.hh b/src/FbTk/MenuTheme.hh index 1e82b6d..e829e80 100644 --- a/src/FbTk/MenuTheme.hh +++ b/src/FbTk/MenuTheme.hh | |||
@@ -30,7 +30,6 @@ | |||
30 | #include "Shape.hh" | 30 | #include "Shape.hh" |
31 | #include "Texture.hh" | 31 | #include "Texture.hh" |
32 | #include "Text.hh" | 32 | #include "Text.hh" |
33 | #include "Subject.hh" | ||
34 | #include "PixmapWithMask.hh" | 33 | #include "PixmapWithMask.hh" |
35 | #include "GContext.hh" | 34 | #include "GContext.hh" |
36 | 35 | ||
diff --git a/src/FbTk/MultLayers.cc b/src/FbTk/MultLayers.cc index 2980e41..af97cba 100644 --- a/src/FbTk/MultLayers.cc +++ b/src/FbTk/MultLayers.cc | |||
@@ -26,6 +26,7 @@ | |||
26 | #include "XLayer.hh" | 26 | #include "XLayer.hh" |
27 | #include "XLayerItem.hh" | 27 | #include "XLayerItem.hh" |
28 | #include "App.hh" | 28 | #include "App.hh" |
29 | #include "FbWindow.hh" | ||
29 | 30 | ||
30 | using namespace FbTk; | 31 | using namespace FbTk; |
31 | 32 | ||
diff --git a/src/FbTk/MultiButtonMenuItem.cc b/src/FbTk/MultiButtonMenuItem.cc index 591c13d..fff133b 100644 --- a/src/FbTk/MultiButtonMenuItem.cc +++ b/src/FbTk/MultiButtonMenuItem.cc | |||
@@ -24,6 +24,7 @@ | |||
24 | 24 | ||
25 | #include "MultiButtonMenuItem.hh" | 25 | #include "MultiButtonMenuItem.hh" |
26 | #include "PixmapWithMask.hh" | 26 | #include "PixmapWithMask.hh" |
27 | #include "Command.hh" | ||
27 | 28 | ||
28 | namespace FbTk { | 29 | namespace FbTk { |
29 | 30 | ||
diff --git a/src/FbTk/Resource.hh b/src/FbTk/Resource.hh index 63137e7..29ab939 100644 --- a/src/FbTk/Resource.hh +++ b/src/FbTk/Resource.hh | |||
@@ -31,16 +31,12 @@ | |||
31 | #include <list> | 31 | #include <list> |
32 | #include <iostream> | 32 | #include <iostream> |
33 | 33 | ||
34 | #include <X11/Xlib.h> | ||
35 | #include <X11/Xresource.h> | ||
36 | #include <exception> | 34 | #include <exception> |
37 | #include <typeinfo> | 35 | #include <typeinfo> |
38 | #include "XrmDatabaseHelper.hh" | 36 | #include "XrmDatabaseHelper.hh" |
39 | 37 | ||
40 | namespace FbTk { | 38 | namespace FbTk { |
41 | 39 | ||
42 | class XrmDatabaseHelper; | ||
43 | |||
44 | class ResourceException: public std::exception { | 40 | class ResourceException: public std::exception { |
45 | public: | 41 | public: |
46 | ResourceException(const std::string &err): | 42 | ResourceException(const std::string &err): |
diff --git a/src/FbTk/SearchResult.cc b/src/FbTk/SearchResult.cc index 3f36edc..68d9ecf 100644 --- a/src/FbTk/SearchResult.cc +++ b/src/FbTk/SearchResult.cc | |||
@@ -20,7 +20,7 @@ | |||
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | #include "SearchResult.hh" | 22 | #include "SearchResult.hh" |
23 | #include <vector> | 23 | #include "ITypeAheadable.hh" |
24 | 24 | ||
25 | namespace FbTk { | 25 | namespace FbTk { |
26 | 26 | ||
diff --git a/src/FbTk/SearchResult.hh b/src/FbTk/SearchResult.hh index 5e8852b..a28249c 100644 --- a/src/FbTk/SearchResult.hh +++ b/src/FbTk/SearchResult.hh | |||
@@ -23,10 +23,12 @@ | |||
23 | #define FBTK_SEARCHRESULT_HH | 23 | #define FBTK_SEARCHRESULT_HH |
24 | 24 | ||
25 | #include <vector> | 25 | #include <vector> |
26 | #include "ITypeAheadable.hh" | 26 | #include <string> |
27 | 27 | ||
28 | namespace FbTk { | 28 | namespace FbTk { |
29 | 29 | ||
30 | class ITypeAheadable; | ||
31 | |||
30 | class SearchResult { | 32 | class SearchResult { |
31 | public: | 33 | public: |
32 | typedef std::vector < ITypeAheadable* > BaseItems; | 34 | typedef std::vector < ITypeAheadable* > BaseItems; |
diff --git a/src/FbTk/Shape.hh b/src/FbTk/Shape.hh index be49652..9d71e70 100644 --- a/src/FbTk/Shape.hh +++ b/src/FbTk/Shape.hh | |||
@@ -25,7 +25,6 @@ | |||
25 | #include "FbPixmap.hh" | 25 | #include "FbPixmap.hh" |
26 | 26 | ||
27 | #include <X11/Xlib.h> | 27 | #include <X11/Xlib.h> |
28 | #include <memory> | ||
29 | #include <vector> | 28 | #include <vector> |
30 | 29 | ||
31 | namespace FbTk { | 30 | namespace FbTk { |
diff --git a/src/FbTk/TextBox.hh b/src/FbTk/TextBox.hh index 78676a1..fbf533e 100644 --- a/src/FbTk/TextBox.hh +++ b/src/FbTk/TextBox.hh | |||
@@ -25,8 +25,6 @@ | |||
25 | #define FBTK_TEXTBOX_HH | 25 | #define FBTK_TEXTBOX_HH |
26 | 26 | ||
27 | #include "FbWindow.hh" | 27 | #include "FbWindow.hh" |
28 | #include "Color.hh" | ||
29 | #include "Text.hh" | ||
30 | #include "EventHandler.hh" | 28 | #include "EventHandler.hh" |
31 | 29 | ||
32 | #include <string> | 30 | #include <string> |
diff --git a/src/FbTk/TextButton.hh b/src/FbTk/TextButton.hh index 1189448..7c2a96b 100644 --- a/src/FbTk/TextButton.hh +++ b/src/FbTk/TextButton.hh | |||
@@ -26,7 +26,6 @@ | |||
26 | 26 | ||
27 | #include "Button.hh" | 27 | #include "Button.hh" |
28 | #include "Text.hh" | 28 | #include "Text.hh" |
29 | #include "FbPixmap.hh" | ||
30 | 29 | ||
31 | #include <string> | 30 | #include <string> |
32 | 31 | ||
diff --git a/src/FbTk/TextureRender.cc b/src/FbTk/TextureRender.cc index 5d9c7d5..0814a3a 100644 --- a/src/FbTk/TextureRender.cc +++ b/src/FbTk/TextureRender.cc | |||
@@ -32,6 +32,8 @@ | |||
32 | #include "GContext.hh" | 32 | #include "GContext.hh" |
33 | #include "I18n.hh" | 33 | #include "I18n.hh" |
34 | 34 | ||
35 | #include <X11/Xutil.h> | ||
36 | |||
35 | #include <iostream> | 37 | #include <iostream> |
36 | #include <string> | 38 | #include <string> |
37 | #ifdef HAVE_CSTDIO | 39 | #ifdef HAVE_CSTDIO |
diff --git a/src/FbTk/TextureRender.hh b/src/FbTk/TextureRender.hh index 7f796b7..2c01ae0 100644 --- a/src/FbTk/TextureRender.hh +++ b/src/FbTk/TextureRender.hh | |||
@@ -27,15 +27,15 @@ | |||
27 | #ifndef FBTK_TEXTURRENDER_HH | 27 | #ifndef FBTK_TEXTURRENDER_HH |
28 | #define FBTK_TEXTURRENDER_HH | 28 | #define FBTK_TEXTURRENDER_HH |
29 | 29 | ||
30 | #include "Texture.hh" | ||
31 | #include "Text.hh" | 30 | #include "Text.hh" |
32 | 31 | ||
33 | #include <X11/Xlib.h> | 32 | #include <X11/Xlib.h> |
34 | 33 | ||
35 | namespace FbTk { | 34 | namespace FbTk { |
36 | 35 | ||
36 | class Color; | ||
37 | class ImageControl; | 37 | class ImageControl; |
38 | 38 | class Texture; | |
39 | 39 | ||
40 | /// Renders texture to pixmap | 40 | /// Renders texture to pixmap |
41 | /** | 41 | /** |
diff --git a/src/FbTk/XLayer.cc b/src/FbTk/XLayer.cc index 6c44ad9..bf09d1e 100644 --- a/src/FbTk/XLayer.cc +++ b/src/FbTk/XLayer.cc | |||
@@ -25,6 +25,8 @@ | |||
25 | #include "XLayer.hh" | 25 | #include "XLayer.hh" |
26 | #include "XLayerItem.hh" | 26 | #include "XLayerItem.hh" |
27 | #include "App.hh" | 27 | #include "App.hh" |
28 | #include "FbWindow.hh" | ||
29 | #include "MultLayers.hh" | ||
28 | 30 | ||
29 | #include <iostream> | 31 | #include <iostream> |
30 | 32 | ||
diff --git a/src/FbTk/XLayer.hh b/src/FbTk/XLayer.hh index 238f698..25faa84 100644 --- a/src/FbTk/XLayer.hh +++ b/src/FbTk/XLayer.hh | |||
@@ -28,10 +28,10 @@ | |||
28 | 28 | ||
29 | #include <list> | 29 | #include <list> |
30 | #include "Layer.hh" | 30 | #include "Layer.hh" |
31 | #include "MultLayers.hh" | ||
32 | 31 | ||
33 | namespace FbTk { | 32 | namespace FbTk { |
34 | 33 | ||
34 | class MultLayers; | ||
35 | class XLayerItem; | 35 | class XLayerItem; |
36 | 36 | ||
37 | class XLayer : public FbTk::Layer<XLayerItem, std::list<XLayerItem *> > { | 37 | class XLayer : public FbTk::Layer<XLayerItem, std::list<XLayerItem *> > { |
diff --git a/src/FbTk/XLayerItem.hh b/src/FbTk/XLayerItem.hh index e17d162..c67d046 100644 --- a/src/FbTk/XLayerItem.hh +++ b/src/FbTk/XLayerItem.hh | |||
@@ -28,10 +28,11 @@ | |||
28 | #include "LayerItem.hh" | 28 | #include "LayerItem.hh" |
29 | #include "XLayer.hh" | 29 | #include "XLayer.hh" |
30 | #include "NotCopyable.hh" | 30 | #include "NotCopyable.hh" |
31 | #include "FbWindow.hh" | ||
32 | 31 | ||
33 | namespace FbTk { | 32 | namespace FbTk { |
34 | 33 | ||
34 | class FbWindow; | ||
35 | |||
35 | class XLayerItem : public LayerItem, private NotCopyable { | 36 | class XLayerItem : public LayerItem, private NotCopyable { |
36 | public: | 37 | public: |
37 | typedef std::list<FbWindow *> Windows; | 38 | typedef std::list<FbWindow *> Windows; |
diff --git a/src/FbTk/XrmDatabaseHelper.hh b/src/FbTk/XrmDatabaseHelper.hh index 7ad512d..ac1a0e7 100644 --- a/src/FbTk/XrmDatabaseHelper.hh +++ b/src/FbTk/XrmDatabaseHelper.hh | |||
@@ -25,7 +25,6 @@ | |||
25 | #ifndef FBTK_XRMDATABASEHELPER_HH | 25 | #ifndef FBTK_XRMDATABASEHELPER_HH |
26 | #define FBTK_XRMDATABASEHELPER_HH | 26 | #define FBTK_XRMDATABASEHELPER_HH |
27 | 27 | ||
28 | #include <X11/Xlib.h> | ||
29 | #include <X11/Xresource.h> | 28 | #include <X11/Xresource.h> |
30 | 29 | ||
31 | /** | 30 | /** |