From 63f9a1637f0b48d4ebc41c99db727826d6199e0d Mon Sep 17 00:00:00 2001 From: Mathias Gumz Date: Sat, 3 Jan 2015 21:42:24 +0100 Subject: [PATCH] Clean unused variables --- src/FbTk/EventManager.hh | 3 +-- src/FbTk/Font.hh | 1 - src/FbTk/ImageControl.hh | 1 - src/FbTk/Menu.hh | 3 --- src/RootTheme.cc | 1 - src/RootTheme.hh | 1 - util/fbrun/FbRun.hh | 1 - 7 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/FbTk/EventManager.hh b/src/FbTk/EventManager.hh index 6c9d4194..067c923e 100644 --- a/src/FbTk/EventManager.hh +++ b/src/FbTk/EventManager.hh @@ -58,14 +58,13 @@ public: void unregisterEventHandler(Window win); private: - EventManager(): m_grabbing_keyboard(0) { } + EventManager() { } ~EventManager(); void dispatch(Window win, XEvent &event, bool parent = false); typedef std::map EventHandlerMap; EventHandlerMap m_eventhandlers; EventHandlerMap m_parent; - EventHandler *m_grabbing_keyboard; }; } //end namespace FbTk diff --git a/src/FbTk/Font.hh b/src/FbTk/Font.hh index 8a0f05d8..dfbdcd00 100644 --- a/src/FbTk/Font.hh +++ b/src/FbTk/Font.hh @@ -115,7 +115,6 @@ private: FbTk::FontImp* m_fontimp; ///< font implementation std::string m_fontstr; ///< font name - int m_angle; ///< rotation angle bool m_shadow; ///< shadow text Color m_shadow_color; ///< shadow color int m_shadow_offx; ///< offset y for shadow diff --git a/src/FbTk/ImageControl.hh b/src/FbTk/ImageControl.hh index 747525b4..39589f82 100644 --- a/src/FbTk/ImageControl.hh +++ b/src/FbTk/ImageControl.hh @@ -82,7 +82,6 @@ private: Pixmap searchCache(unsigned int width, unsigned int height, const Texture &text, Orientation orient) const; void createColorTable(); - bool m_dither; Timer m_timer; Colormap m_colormap; diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh index bd830b42..5e1d98c7 100644 --- a/src/FbTk/Menu.hh +++ b/src/FbTk/Menu.hh @@ -235,8 +235,6 @@ private: int m_x_move; int m_y_move; - int m_grab_x; - int m_grab_y; // the menuitems are rendered in a grid with // 'm_columns' (a minimum of 'm_min_columns') and @@ -252,7 +250,6 @@ private: // the corners std::auto_ptr m_shape; - Drawable m_root_pm; static Menu *shown; ///< used for determining if there's a menu open at all static Menu *s_focused; ///< holds current input focused menu, so one can determine if a menu is focused bool m_need_update; diff --git a/src/RootTheme.cc b/src/RootTheme.cc index a2aa4a8b..46fe3038 100644 --- a/src/RootTheme.cc +++ b/src/RootTheme.cc @@ -152,7 +152,6 @@ RootTheme::RootTheme(FbTk::ImageControl &image_control): FbTk::Theme(image_control.screenNumber()), m_background(new BackgroundItem(*this, "background", "Background")), m_opgc(RootWindow(FbTk::App::instance()->display(), image_control.screenNumber())), - m_image_ctrl(image_control), m_first(true) { Display *disp = FbTk::App::instance()->display(); diff --git a/src/RootTheme.hh b/src/RootTheme.hh index f39c2643..f9b053de 100644 --- a/src/RootTheme.hh +++ b/src/RootTheme.hh @@ -56,7 +56,6 @@ public: private: BackgroundItem *m_background;///< background image/texture FbTk::GContext m_opgc; - FbTk::ImageControl &m_image_ctrl; ///< image control for rendering background texture bool m_first; }; diff --git a/util/fbrun/FbRun.hh b/util/fbrun/FbRun.hh index 6ddbad0f..5d678b04 100644 --- a/util/fbrun/FbRun.hh +++ b/util/fbrun/FbRun.hh @@ -39,7 +39,6 @@ class FbRun: public FbTk::TextBox { public: FbRun(int x = 0, int y = 0, size_t width = 200); ~FbRun(); - void handleEvent(XEvent * const ev); void setTitle(const std::string &title); void resize(unsigned int width, unsigned int height); void setPrint(bool print) { m_print = print; }