aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk
diff options
context:
space:
mode:
authormathias <mathias>2007-04-17 07:52:40 (GMT)
committermathias <mathias>2007-04-17 07:52:40 (GMT)
commit6ac57655d9b0cf02d449aa9a01c7a82f5f3bbffa (patch)
tree13906ff4f8b3beee31b866695f742971407ee795 /src/FbTk
parent20a339fc066e5580777ea17f22bec8fde0e817dd (diff)
downloadfluxbox_pavel-6ac57655d9b0cf02d449aa9a01c7a82f5f3bbffa.zip
fluxbox_pavel-6ac57655d9b0cf02d449aa9a01c7a82f5f3bbffa.tar.bz2
basicly cosmetic changes, patch by slava semushin
Diffstat (limited to 'src/FbTk')
-rw-r--r--src/FbTk/FbWindow.hh1
-rw-r--r--src/FbTk/I18n.hh2
-rw-r--r--src/FbTk/ImageControl.cc4
-rw-r--r--src/FbTk/MenuItem.hh1
-rw-r--r--src/FbTk/Timer.hh11
-rw-r--r--src/FbTk/XLayer.hh2
-rw-r--r--src/FbTk/XLayerItem.hh3
7 files changed, 6 insertions, 18 deletions
diff --git a/src/FbTk/FbWindow.hh b/src/FbTk/FbWindow.hh
index c5494b0..a1b93cc 100644
--- a/src/FbTk/FbWindow.hh
+++ b/src/FbTk/FbWindow.hh
@@ -26,7 +26,6 @@
26 26
27#include "FbDrawable.hh" 27#include "FbDrawable.hh"
28 28
29#include <X11/Xlib.h>
30#include <memory> 29#include <memory>
31#include <string> 30#include <string>
32#include <set> 31#include <set>
diff --git a/src/FbTk/I18n.hh b/src/FbTk/I18n.hh
index 9a936d8..298c64c 100644
--- a/src/FbTk/I18n.hh
+++ b/src/FbTk/I18n.hh
@@ -60,8 +60,6 @@ void catclose(nl_catd cat);
60 60
61#endif // HAVE_NL_TYPES_H 61#endif // HAVE_NL_TYPES_H
62 62
63#include <string>
64
65// Some defines to help out 63// Some defines to help out
66#ifdef NLS 64#ifdef NLS
67#define _FB_USES_NLS \ 65#define _FB_USES_NLS \
diff --git a/src/FbTk/ImageControl.cc b/src/FbTk/ImageControl.cc
index c1fa7a5..5f9f644 100644
--- a/src/FbTk/ImageControl.cc
+++ b/src/FbTk/ImageControl.cc
@@ -61,10 +61,6 @@
61 #include <stdio.h> 61 #include <stdio.h>
62#endif 62#endif
63 63
64#ifdef HAVE_CTYPE_H
65#include <ctype.h>
66#endif // HAVE_CTYPE_H
67
68#include <iostream> 64#include <iostream>
69 65
70using std::cerr; 66using std::cerr;
diff --git a/src/FbTk/MenuItem.hh b/src/FbTk/MenuItem.hh
index 701b624..afb6be9 100644
--- a/src/FbTk/MenuItem.hh
+++ b/src/FbTk/MenuItem.hh
@@ -30,7 +30,6 @@
30#include "ITypeAheadable.hh" 30#include "ITypeAheadable.hh"
31#include "FbString.hh" 31#include "FbString.hh"
32 32
33#include <string>
34#include <memory> 33#include <memory>
35 34
36namespace FbTk { 35namespace FbTk {
diff --git a/src/FbTk/Timer.hh b/src/FbTk/Timer.hh
index 189c2af..bd55435 100644
--- a/src/FbTk/Timer.hh
+++ b/src/FbTk/Timer.hh
@@ -76,9 +76,9 @@ public:
76 76
77 int isTiming() const { return m_timing; } 77 int isTiming() const { return m_timing; }
78 int getInterval() const { return m_interval; } 78 int getInterval() const { return m_interval; }
79 79
80 int doOnce() const { return m_once; } 80 int doOnce() const { return m_once; }
81 81
82 const timeval &getTimeout() const { return m_timeout; } 82 const timeval &getTimeout() const { return m_timeout; }
83 const timeval &getStartTime() const { return m_start; } 83 const timeval &getStartTime() const { return m_start; }
84 void makeEndTime(timeval &tm) const; 84 void makeEndTime(timeval &tm) const;
@@ -92,12 +92,12 @@ private:
92 static void addTimer(Timer *timer); 92 static void addTimer(Timer *timer);
93 /// remove a timer from the static list 93 /// remove a timer from the static list
94 static void removeTimer(Timer *timer); 94 static void removeTimer(Timer *timer);
95 95
96 typedef std::list<Timer *> TimerList; 96 typedef std::list<Timer *> TimerList;
97 static TimerList m_timerlist; ///< list of all timers, sorted by next trigger time (start + timeout) 97 static TimerList m_timerlist; ///< list of all timers, sorted by next trigger time (start + timeout)
98 98
99 RefCount<Command> m_handler; ///< what to do on a timeout 99 RefCount<Command> m_handler; ///< what to do on a timeout
100 100
101 bool m_timing; ///< clock running? 101 bool m_timing; ///< clock running?
102 bool m_once; ///< do timeout only once? 102 bool m_once; ///< do timeout only once?
103 int m_interval; ///< Is an interval-only timer (e.g. clock) 103 int m_interval; ///< Is an interval-only timer (e.g. clock)
@@ -105,7 +105,6 @@ private:
105 105
106 timeval m_start; ///< start time 106 timeval m_start; ///< start time
107 timeval m_timeout; ///< time length 107 timeval m_timeout; ///< time length
108
109}; 108};
110 109
111} // end namespace FbTk 110} // end namespace FbTk
diff --git a/src/FbTk/XLayer.hh b/src/FbTk/XLayer.hh
index 660886e..238f698 100644
--- a/src/FbTk/XLayer.hh
+++ b/src/FbTk/XLayer.hh
@@ -42,7 +42,7 @@ public:
42 42
43 typedef std::list<XLayerItem *> ItemList; 43 typedef std::list<XLayerItem *> ItemList;
44 typedef std::list<XLayerItem *>::iterator iterator; 44 typedef std::list<XLayerItem *>::iterator iterator;
45 45
46 //typedef std::list<XLayerItem *>::reverse_iterator reverse_iterator; 46 //typedef std::list<XLayerItem *>::reverse_iterator reverse_iterator;
47 47
48 void setLayerNum(int layernum) { m_layernum = layernum; }; 48 void setLayerNum(int layernum) { m_layernum = layernum; };
diff --git a/src/FbTk/XLayerItem.hh b/src/FbTk/XLayerItem.hh
index 90d2167..e17d162 100644
--- a/src/FbTk/XLayerItem.hh
+++ b/src/FbTk/XLayerItem.hh
@@ -30,9 +30,6 @@
30#include "NotCopyable.hh" 30#include "NotCopyable.hh"
31#include "FbWindow.hh" 31#include "FbWindow.hh"
32 32
33#include <X11/Xlib.h>
34
35
36namespace FbTk { 33namespace FbTk {
37 34
38class XLayerItem : public LayerItem, private NotCopyable { 35class XLayerItem : public LayerItem, private NotCopyable {