From c18985732b09da5f09189e91a145cb33e656688d Mon Sep 17 00:00:00 2001 From: markt <markt> Date: Sat, 1 Jul 2006 03:32:53 +0000 Subject: more dead functions --- src/Container.hh | 2 -- src/FbTk/ImageControl.hh | 2 ++ src/FbTk/Menu.hh | 2 +- src/FbTk/RefCount.hh | 2 ++ src/FbTk/TextButton.cc | 2 ++ src/FbTk/TextButton.hh | 4 ++++ src/Toolbar.hh | 1 - src/Window.hh | 2 -- src/fluxbox.hh | 2 ++ 9 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/Container.hh b/src/Container.hh index fc770fc..cfaf1ea 100644 --- a/src/Container.hh +++ b/src/Container.hh @@ -96,8 +96,6 @@ public: inline const Item& selected() const { return m_selected; } inline Item selected() { return m_selected; } unsigned int maxWidthPerClient() const; - unsigned int maxTotalSize() const { return m_max_total_size; } - inline unsigned int maxHeightPerClient() const { return (empty() ? height() : height()/size()); } inline bool updateLock() const { return m_update_lock; } void for_each(std::mem_fun_t<void, FbTk::FbWindow> function); diff --git a/src/FbTk/ImageControl.hh b/src/FbTk/ImageControl.hh index a0f1cc7..fbf05e8 100644 --- a/src/FbTk/ImageControl.hh +++ b/src/FbTk/ImageControl.hh @@ -48,7 +48,9 @@ public: virtual ~ImageControl(); inline bool doDither() const { return m_dither; } +#ifdef NOT_USED inline int bitsPerPixel() const { return bits_per_pixel; } +#endif inline int depth() const { return m_screen_depth; } inline int colorsPerChannel() const { return m_colors_per_channel; } inline int screenNumber() const { return m_screen_num; } diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh index 4490eb8..f8a7db8 100644 --- a/src/FbTk/Menu.hh +++ b/src/FbTk/Menu.hh @@ -131,7 +131,6 @@ public: virtual void clearWindow(); #ifdef NOT_USED void setActiveIndex(int index) { m_active_index = index; } -#endif /*@}*/ /** @@ -139,6 +138,7 @@ public: */ //@{ inline int activeIndex() const { return m_active_index; } +#endif inline bool isTorn() const { return m_torn; } inline bool isVisible() const { return m_visible; } inline int screenNumber() const { return menu.window.screenNumber(); } diff --git a/src/FbTk/RefCount.hh b/src/FbTk/RefCount.hh index 96d64d8..ba2a697 100644 --- a/src/FbTk/RefCount.hh +++ b/src/FbTk/RefCount.hh @@ -38,8 +38,10 @@ public: Pointer *operator * () const { return get(); } Pointer *operator -> () const { return get(); } Pointer *get() const { return m_data; } +#ifdef NOT_USED /// @return number of referenses unsigned int usedBy() const { return (m_refcount != 0 ? *m_refcount : 0); } +#endif private: /// increase referense count void incRefCount(); diff --git a/src/FbTk/TextButton.cc b/src/FbTk/TextButton.cc index 948f847..9aee7f2 100644 --- a/src/FbTk/TextButton.cc +++ b/src/FbTk/TextButton.cc @@ -139,10 +139,12 @@ unsigned int TextButton::textWidth() const { return font().textWidth(text().data(), text().size()); } +#ifdef NOT_USED unsigned int TextButton::textHeight() const { return font().height(); } +#endif void TextButton::renderForeground(FbWindow &win, FbDrawable &drawable) { // (win should always be *this, no need to check) diff --git a/src/FbTk/TextButton.hh b/src/FbTk/TextButton.hh index 26a2469..7684b29 100644 --- a/src/FbTk/TextButton.hh +++ b/src/FbTk/TextButton.hh @@ -71,10 +71,14 @@ public: inline FbTk::Font &font() const { return *m_font; } inline FbTk::Orientation orientation() const { return m_orientation; } unsigned int textWidth() const; +#ifdef NOT_USED unsigned int textHeight() const; +#endif int bevel() const { return m_bevel; } +#ifdef NOT_USED unsigned int leftPadding() const { return m_left_padding; } unsigned int rightPadding() const { return m_right_padding; } +#endif void renderForeground(FbWindow &win, FbDrawable &drawable); diff --git a/src/Toolbar.hh b/src/Toolbar.hh index 70e32d8..04b06e6 100644 --- a/src/Toolbar.hh +++ b/src/Toolbar.hh @@ -120,7 +120,6 @@ public: inline const BScreen &screen() const { return m_screen; } inline unsigned int width() const { return frame.window.width(); } inline unsigned int height() const { return frame.window.height(); } - inline unsigned int exposedHeight() const { return doAutoHide() ? frame.bevel_w : frame.height; } inline int x() const { return isHidden() ? frame.x_hidden : frame.x; } inline int y() const { return isHidden() ? frame.y_hidden : frame.y; } inline Placement placement() const { return *m_rc_placement; } diff --git a/src/Window.hh b/src/Window.hh index 8ac3918..ac44606 100644 --- a/src/Window.hh +++ b/src/Window.hh @@ -308,8 +308,6 @@ public: */ //@{ - // @return NormalState | IconicState | WithdrawnState - unsigned int getWmState() const { return m_current_state; } // whether this window can be tabbed with other windows, // and others tabbed with it inline void setTabable(bool tabable) { functions.tabable = tabable; } diff --git a/src/fluxbox.hh b/src/fluxbox.hh index 0eacc8d..667b4a9 100644 --- a/src/fluxbox.hh +++ b/src/fluxbox.hh @@ -128,7 +128,9 @@ public: int colorsPerChannel() const { return *m_rc_colors_per_channel; } int getNumberOfLayers() const { return *m_rc_numlayers; } int getTabsPadding() const { return *m_rc_tabs_padding; } +#ifdef NOT_USED int getFocusedTabMinWidth() const { return *m_rc_focused_tab_min_width; } +#endif // class to store layer numbers (special Resource type) // we have a special resource type because we need to be able to name certain layers -- cgit v0.11.2