aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2006-07-04 01:01:44 (GMT)
committermarkt <markt>2006-07-04 01:01:44 (GMT)
commit6cd9ad46cc0d9660a4e582ee5e61a97c68782f1d (patch)
treef30cca1196f74c05940c890c5f487af9a6e9850e
parent12e80f3faf33240a09086198ef9ade997b089dd5 (diff)
downloadfluxbox_pavel-6cd9ad46cc0d9660a4e582ee5e61a97c68782f1d.zip
fluxbox_pavel-6cd9ad46cc0d9660a4e582ee5e61a97c68782f1d.tar.bz2
some dead resources and the functions that go with them
-rw-r--r--src/IconbarTheme.hh2
-rw-r--r--src/Screen.cc1
-rw-r--r--src/Screen.hh3
-rw-r--r--src/fluxbox.cc2
-rw-r--r--src/fluxbox.hh6
5 files changed, 2 insertions, 12 deletions
diff --git a/src/IconbarTheme.hh b/src/IconbarTheme.hh
index 1a7308a..62fa2ef 100644
--- a/src/IconbarTheme.hh
+++ b/src/IconbarTheme.hh
@@ -39,8 +39,6 @@ public:
39 void reconfigTheme(); 39 void reconfigTheme();
40 bool fallback(FbTk::ThemeItem_base &item); 40 bool fallback(FbTk::ThemeItem_base &item);
41 41
42 void setAntialias(bool antialias);
43
44 TextTheme &focusedText() { return m_focused_text; } 42 TextTheme &focusedText() { return m_focused_text; }
45 TextTheme &unfocusedText() { return m_unfocused_text; } 43 TextTheme &unfocusedText() { return m_unfocused_text; }
46 44
diff --git a/src/Screen.cc b/src/Screen.cc
index 384ae86..47599bc 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -254,7 +254,6 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm,
254 desktop_wheeling(rm, true, scrname+".desktopwheeling", altscrname+".DesktopWheeling"), 254 desktop_wheeling(rm, true, scrname+".desktopwheeling", altscrname+".DesktopWheeling"),
255 reverse_wheeling(rm, false, scrname+".reversewheeling", altscrname+".ReverseWheeling"), 255 reverse_wheeling(rm, false, scrname+".reversewheeling", altscrname+".ReverseWheeling"),
256 show_window_pos(rm, true, scrname+".showwindowposition", altscrname+".ShowWindowPosition"), 256 show_window_pos(rm, true, scrname+".showwindowposition", altscrname+".ShowWindowPosition"),
257 antialias(rm, false, scrname+".antialias", altscrname+".Antialias"),
258 auto_raise(rm, false, scrname+".autoRaise", altscrname+".AutoRaise"), 257 auto_raise(rm, false, scrname+".autoRaise", altscrname+".AutoRaise"),
259 click_raises(rm, true, scrname+".clickRaises", altscrname+".ClickRaises"), 258 click_raises(rm, true, scrname+".clickRaises", altscrname+".ClickRaises"),
260 decorate_transient(rm, false, scrname+".decorateTransient", altscrname+".DecorateTransient"), 259 decorate_transient(rm, false, scrname+".decorateTransient", altscrname+".DecorateTransient"),
diff --git a/src/Screen.hh b/src/Screen.hh
index 46f50da..0a96df2 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -118,7 +118,6 @@ public:
118 bool doOpaqueMove() const { return *resource.opaque_move; } 118 bool doOpaqueMove() const { return *resource.opaque_move; }
119 bool doFullMax() const { return *resource.full_max; } 119 bool doFullMax() const { return *resource.full_max; }
120 bool doShowWindowPos() const { return *resource.show_window_pos; } 120 bool doShowWindowPos() const { return *resource.show_window_pos; }
121 bool antialias() const { return *resource.antialias; }
122 bool decorateTransient() const { return *resource.decorate_transient; } 121 bool decorateTransient() const { return *resource.decorate_transient; }
123 const std::string &windowMenuFilename() const { return *resource.windowmenufile; } 122 const std::string &windowMenuFilename() const { return *resource.windowmenufile; }
124 FbTk::ImageControl &imageControl() { return *m_image_control.get(); } 123 FbTk::ImageControl &imageControl() { return *m_image_control.get(); }
@@ -436,7 +435,7 @@ private:
436 FbTk::Resource<bool> image_dither, opaque_move, full_max, 435 FbTk::Resource<bool> image_dither, opaque_move, full_max,
437 workspace_warping, 436 workspace_warping,
438 desktop_wheeling, reverse_wheeling, show_window_pos, 437 desktop_wheeling, reverse_wheeling, show_window_pos,
439 antialias, auto_raise, click_raises, decorate_transient; 438 auto_raise, click_raises, decorate_transient;
440 FbTk::Resource<std::string> rootcommand; 439 FbTk::Resource<std::string> rootcommand;
441 FbTk::Resource<ResizeModel> resize_model; 440 FbTk::Resource<ResizeModel> resize_model;
442 FbTk::Resource<FbWinFrame::TabPlacement> tab_placement; 441 FbTk::Resource<FbWinFrame::TabPlacement> tab_placement;
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 4e4187a..737eda2 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -202,8 +202,6 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
202 m_rc_numlayers(m_resourcemanager, 13, "session.numLayers", "Session.NumLayers"), 202 m_rc_numlayers(m_resourcemanager, 13, "session.numLayers", "Session.NumLayers"),
203 m_rc_double_click_interval(m_resourcemanager, 250, "session.doubleClickInterval", "Session.DoubleClickInterval"), 203 m_rc_double_click_interval(m_resourcemanager, 250, "session.doubleClickInterval", "Session.DoubleClickInterval"),
204 m_rc_tabs_padding(m_resourcemanager, 0, "session.tabPadding", "Session.TabPadding"), 204 m_rc_tabs_padding(m_resourcemanager, 0, "session.tabPadding", "Session.TabPadding"),
205 m_rc_focused_tab_min_width(m_resourcemanager, 0, "session.focusTabMinWidth",
206 "Session.FocusTabMinWidth"),
207 m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "session.styleFile", "Session.StyleFile"), 205 m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "session.styleFile", "Session.StyleFile"),
208 m_rc_styleoverlayfile(m_resourcemanager, "~/.fluxbox/overlay", "session.styleOverlay", "Session.StyleOverlay"), 206 m_rc_styleoverlayfile(m_resourcemanager, "~/.fluxbox/overlay", "session.styleOverlay", "Session.StyleOverlay"),
209 m_rc_menufile(m_resourcemanager, DEFAULTMENU, "session.menuFile", "Session.MenuFile"), 207 m_rc_menufile(m_resourcemanager, DEFAULTMENU, "session.menuFile", "Session.MenuFile"),
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 667b4a9..57fa803 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -128,9 +128,6 @@ public:
128 int colorsPerChannel() const { return *m_rc_colors_per_channel; } 128 int colorsPerChannel() const { return *m_rc_colors_per_channel; }
129 int getNumberOfLayers() const { return *m_rc_numlayers; } 129 int getNumberOfLayers() const { return *m_rc_numlayers; }
130 int getTabsPadding() const { return *m_rc_tabs_padding; } 130 int getTabsPadding() const { return *m_rc_tabs_padding; }
131#ifdef NOT_USED
132 int getFocusedTabMinWidth() const { return *m_rc_focused_tab_min_width; }
133#endif
134 131
135 // class to store layer numbers (special Resource type) 132 // class to store layer numbers (special Resource type)
136 // we have a special resource type because we need to be able to name certain layers 133 // we have a special resource type because we need to be able to name certain layers
@@ -246,8 +243,7 @@ private:
246 FbTk::Resource<bool> m_rc_pseudotrans; 243 FbTk::Resource<bool> m_rc_pseudotrans;
247 FbTk::Resource<int> m_rc_colors_per_channel, m_rc_numlayers, 244 FbTk::Resource<int> m_rc_colors_per_channel, m_rc_numlayers,
248 m_rc_double_click_interval, 245 m_rc_double_click_interval,
249 m_rc_tabs_padding, 246 m_rc_tabs_padding;
250 m_rc_focused_tab_min_width;
251 FbTk::Resource<std::string> m_rc_stylefile, 247 FbTk::Resource<std::string> m_rc_stylefile,
252 m_rc_styleoverlayfile, 248 m_rc_styleoverlayfile,
253 m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile, 249 m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile,