From de6d340ba3a1a64ee46e6562d0bdab062cb92a1e Mon Sep 17 00:00:00 2001 From: Mathias Gumz Date: Sun, 30 Dec 2007 01:36:37 +0100 Subject: forgotten inlines from previous round --- src/FbTk/FbDrawable.hh | 2 +- src/FbTk/MenuSeparator.hh | 2 +- src/FbTk/TypeAhead.hh | 2 +- src/ToolbarItem.hh | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/FbTk/FbDrawable.hh b/src/FbTk/FbDrawable.hh index 32f5c53..828295d 100644 --- a/src/FbTk/FbDrawable.hh +++ b/src/FbTk/FbDrawable.hh @@ -73,7 +73,7 @@ public: virtual unsigned int width() const = 0; virtual unsigned int height() const = 0; virtual unsigned int depth() const = 0; - static inline Display *display() { return s_display; } + static Display *display() { return s_display; } protected: static Display *s_display; // display connection // display connection }; diff --git a/src/FbTk/MenuSeparator.hh b/src/FbTk/MenuSeparator.hh index 38f15d3..3334f5e 100644 --- a/src/FbTk/MenuSeparator.hh +++ b/src/FbTk/MenuSeparator.hh @@ -36,7 +36,7 @@ public: bool highlight, bool draw_foreground, bool draw_background, int x, int y, unsigned int width, unsigned int height) const; - virtual inline bool isEnabled() const { return false; } + virtual bool isEnabled() const { return false; } }; diff --git a/src/FbTk/TypeAhead.hh b/src/FbTk/TypeAhead.hh index 3b7c077..838a454 100644 --- a/src/FbTk/TypeAhead.hh +++ b/src/FbTk/TypeAhead.hh @@ -32,7 +32,7 @@ template class TypeAhead { #if 0 -a class template can't be split into separate interface + implementation files, an interface summary is given here: +// a class template can't be split into separate interface + implementation files, an interface summary is given here: public: void init(Items const &items); diff --git a/src/ToolbarItem.hh b/src/ToolbarItem.hh index 5e1ed25..5f8797d 100644 --- a/src/ToolbarItem.hh +++ b/src/ToolbarItem.hh @@ -32,7 +32,7 @@ class ToolbarItem { public: /// size type in the toolbar - enum Type { + enum Type { FIXED, ///< the size can not be changed RELATIVE, ///< the size can be changed SQUARE ///< the size is fixed relative to the parent, and in both dimensions @@ -54,7 +54,7 @@ public: // some items might be there, but effectively empty, so shouldn't appear virtual bool active() { return true; } - // Tools should NOT listen to theme changes - they'll get notified by + // Tools should NOT listen to theme changes - they'll get notified by // the toolbar instead. Otherwise there are ordering problems. virtual void renderTheme(unsigned char alpha) = 0; @@ -69,7 +69,7 @@ public: void setType(Type type) { m_type = type; } Type type() const { return m_type; } - inline FbTk::Orientation orientation() const { return m_orientation; } + FbTk::Orientation orientation() const { return m_orientation; } virtual void setOrientation(FbTk::Orientation orient) { m_orientation = orient; } class ToolbarItemSubject : public FbTk::Subject {}; -- cgit v0.11.2