aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/FbCommands.hh4
-rw-r--r--src/FbMenu.hh2
-rw-r--r--src/FbTk/FbWindow.hh2
-rw-r--r--src/FbTk/KeyUtil.cc2
-rw-r--r--src/FbTk/KeyUtil.hh2
-rw-r--r--src/FbTk/Menu.cc1
-rw-r--r--src/FbTk/Menu.hh4
-rw-r--r--src/FbTk/MenuItem.hh4
-rw-r--r--src/FbTk/ThemeItems.cc4
-rw-r--r--src/FocusableList.cc2
-rw-r--r--src/FocusableList.hh4
-rw-r--r--src/GenericTool.hh2
-rw-r--r--src/HeadArea.hh2
-rw-r--r--src/IconbarTool.hh2
-rw-r--r--src/Remember.hh2
-rw-r--r--src/Screen.cc4
-rw-r--r--src/Screen.hh24
-rw-r--r--src/ScreenPlacement.cc1
-rw-r--r--src/ScreenPlacement.hh4
-rw-r--r--src/Slit.cc2
-rw-r--r--src/Slit.hh6
-rw-r--r--src/SystemTray.hh2
-rw-r--r--src/ToolFactory.hh6
-rw-r--r--src/Toolbar.hh2
-rw-r--r--src/fluxbox.hh4
-rw-r--r--src/tests/texturetest.cc2
26 files changed, 45 insertions, 51 deletions
diff --git a/src/FbCommands.hh b/src/FbCommands.hh
index d9639ad..4470bb3 100644
--- a/src/FbCommands.hh
+++ b/src/FbCommands.hh
@@ -127,7 +127,7 @@ private:
127 const int m_option; 127 const int m_option;
128 const ClientPattern m_pat; 128 const ClientPattern m_pat;
129 std::list<FluxboxWindow *> m_list; 129 std::list<FluxboxWindow *> m_list;
130 std::auto_ptr<ClientMenu> m_menu; 130 std::unique_ptr<ClientMenu> m_menu;
131}; 131};
132 132
133class ShowCustomMenuCmd: public FbTk::Command<void> { 133class ShowCustomMenuCmd: public FbTk::Command<void> {
@@ -137,7 +137,7 @@ public:
137 void reload(); 137 void reload();
138private: 138private:
139 std::string custom_menu_file; 139 std::string custom_menu_file;
140 std::auto_ptr<FbMenu> m_menu; 140 std::unique_ptr<FbMenu> m_menu;
141}; 141};
142 142
143class ShowRootMenuCmd: public FbTk::Command<void> { 143class ShowRootMenuCmd: public FbTk::Command<void> {
diff --git a/src/FbMenu.hh b/src/FbMenu.hh
index 193149f..bb23130 100644
--- a/src/FbMenu.hh
+++ b/src/FbMenu.hh
@@ -56,7 +56,7 @@ public:
56 56
57private: 57private:
58 FbTk::LayerItem m_layeritem; 58 FbTk::LayerItem m_layeritem;
59 std::auto_ptr<FbTk::AutoReloadHelper> m_reloader; 59 std::unique_ptr<FbTk::AutoReloadHelper> m_reloader;
60}; 60};
61 61
62#endif // FBMENU_HH 62#endif // FBMENU_HH
diff --git a/src/FbTk/FbWindow.hh b/src/FbTk/FbWindow.hh
index 5501d88..f1bbb19 100644
--- a/src/FbTk/FbWindow.hh
+++ b/src/FbTk/FbWindow.hh
@@ -241,7 +241,7 @@ private:
241 unsigned long m_border_color; ///< border color 241 unsigned long m_border_color; ///< border color
242 unsigned int m_depth; ///< bit depth 242 unsigned int m_depth; ///< bit depth
243 bool m_destroy; ///< wheter the x window was created before 243 bool m_destroy; ///< wheter the x window was created before
244 std::auto_ptr<FbTk::Transparent> m_transparent; 244 std::unique_ptr<FbTk::Transparent> m_transparent;
245 bool m_lastbg_color_set; 245 bool m_lastbg_color_set;
246 unsigned long m_lastbg_color; 246 unsigned long m_lastbg_color;
247 Pixmap m_lastbg_pm; 247 Pixmap m_lastbg_pm;
diff --git a/src/FbTk/KeyUtil.cc b/src/FbTk/KeyUtil.cc
index 46a712a..73f2ea0 100644
--- a/src/FbTk/KeyUtil.cc
+++ b/src/FbTk/KeyUtil.cc
@@ -60,7 +60,7 @@ const struct t_modlist modlist[] = {
60 60
61namespace FbTk { 61namespace FbTk {
62 62
63std::auto_ptr<KeyUtil> KeyUtil::s_keyutil; 63std::unique_ptr<KeyUtil> KeyUtil::s_keyutil;
64 64
65KeyUtil &KeyUtil::instance() { 65KeyUtil &KeyUtil::instance() {
66 if (s_keyutil.get() == 0) 66 if (s_keyutil.get() == 0)
diff --git a/src/FbTk/KeyUtil.hh b/src/FbTk/KeyUtil.hh
index c900763..5698fb4 100644
--- a/src/FbTk/KeyUtil.hh
+++ b/src/FbTk/KeyUtil.hh
@@ -93,7 +93,7 @@ private:
93 93
94 XModifierKeymap *m_modmap; 94 XModifierKeymap *m_modmap;
95 int m_numlock, m_scrolllock; 95 int m_numlock, m_scrolllock;
96 static std::auto_ptr<KeyUtil> s_keyutil; 96 static std::unique_ptr<KeyUtil> s_keyutil;
97}; 97};
98 98
99} // end namespace FbTk 99} // end namespace FbTk
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 34cc6ae..6b2db3a 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -95,7 +95,6 @@ Menu::Menu(FbTk::ThemeProxy<MenuTheme> &tm, ImageControl &imgctrl):
95 m_active_index(-1), 95 m_active_index(-1),
96 m_theme(tm), 96 m_theme(tm),
97 m_image_ctrl(imgctrl), 97 m_image_ctrl(imgctrl),
98 m_shape(0),
99 m_alignment(ALIGNDONTCARE) { 98 m_alignment(ALIGNDONTCARE) {
100 99
101 Display* disp = FbTk::App::instance()->display(); 100 Display* disp = FbTk::App::instance()->display();
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 8bb5fdd..231b622 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -189,7 +189,7 @@ private:
189 Menu *m_parent; 189 Menu *m_parent;
190 190
191 std::vector<MenuItem*> m_items; 191 std::vector<MenuItem*> m_items;
192 std::auto_ptr<MenuSearch> m_search; 192 std::unique_ptr<MenuSearch> m_search;
193 193
194 struct State { 194 struct State {
195 bool moving; 195 bool moving;
@@ -239,7 +239,7 @@ private:
239 239
240 FbTk::ThemeProxy<MenuTheme>& m_theme; 240 FbTk::ThemeProxy<MenuTheme>& m_theme;
241 ImageControl& m_image_ctrl; 241 ImageControl& m_image_ctrl;
242 std::auto_ptr<FbTk::Shape> m_shape; // the corners 242 std::unique_ptr<FbTk::Shape> m_shape; // the corners
243 Pixmap m_hilite_pixmap; 243 Pixmap m_hilite_pixmap;
244 Alignment m_alignment; 244 Alignment m_alignment;
245 245
diff --git a/src/FbTk/MenuItem.hh b/src/FbTk/MenuItem.hh
index 4bbfcf3..6189955 100644
--- a/src/FbTk/MenuItem.hh
+++ b/src/FbTk/MenuItem.hh
@@ -155,10 +155,10 @@ private:
155 bool m_close_on_click, m_toggle_item; 155 bool m_close_on_click, m_toggle_item;
156 156
157 struct Icon { 157 struct Icon {
158 std::auto_ptr<PixmapWithMask> pixmap; 158 std::unique_ptr<PixmapWithMask> pixmap;
159 std::string filename; 159 std::string filename;
160 }; 160 };
161 std::auto_ptr<Icon> m_icon; 161 std::unique_ptr<Icon> m_icon;
162}; 162};
163 163
164} // end namespace FbTk 164} // end namespace FbTk
diff --git a/src/FbTk/ThemeItems.cc b/src/FbTk/ThemeItems.cc
index b1f9a60..a54cabb 100644
--- a/src/FbTk/ThemeItems.cc
+++ b/src/FbTk/ThemeItems.cc
@@ -205,7 +205,7 @@ void ThemeItem<Texture>::load(const string *o_name, const string *o_altname) {
205 return; 205 return;
206 } 206 }
207 207
208 std::auto_ptr<PixmapWithMask> pm(Image::load(pixmap_name, m_tm.screenNum())); 208 std::unique_ptr<PixmapWithMask> pm(Image::load(pixmap_name, m_tm.screenNum()));
209 209
210 if (pm.get() == 0) { 210 if (pm.get() == 0) {
211 if (ThemeManager::instance().verbose()) { 211 if (ThemeManager::instance().verbose()) {
@@ -255,7 +255,7 @@ setFromString(const char *str) {
255 StringUtil::removeFirstWhitespace(filename); 255 StringUtil::removeFirstWhitespace(filename);
256 StringUtil::removeTrailingWhitespace(filename); 256 StringUtil::removeTrailingWhitespace(filename);
257 257
258 std::auto_ptr<PixmapWithMask> pm(Image::load(filename, m_tm.screenNum())); 258 std::unique_ptr<PixmapWithMask> pm(Image::load(filename, m_tm.screenNum()));
259 if (pm.get() == 0) 259 if (pm.get() == 0)
260 setDefaultValue(); 260 setDefaultValue();
261 else { 261 else {
diff --git a/src/FocusableList.cc b/src/FocusableList.cc
index 3689283..da4f6b4 100644
--- a/src/FocusableList.cc
+++ b/src/FocusableList.cc
@@ -74,7 +74,7 @@ const FocusableList *FocusableList::getListFromOptions(BScreen &scr, int opts) {
74} 74}
75 75
76FocusableList::FocusableList(BScreen &scr, const string & pat): 76FocusableList::FocusableList(BScreen &scr, const string & pat):
77 m_pat(0), m_parent(0), m_screen(scr) { 77 m_parent(0), m_screen(scr) {
78 78
79 int options = 0; 79 int options = 0;
80 string pattern; 80 string pattern;
diff --git a/src/FocusableList.hh b/src/FocusableList.hh
index 88bba44..bd70108 100644
--- a/src/FocusableList.hh
+++ b/src/FocusableList.hh
@@ -48,7 +48,7 @@ public:
48 STATIC_ORDER = 0x02 ///< use creation order instead of focused order 48 STATIC_ORDER = 0x02 ///< use creation order instead of focused order
49 }; 49 };
50 50
51 FocusableList(BScreen &scr): m_pat(0), m_parent(0), m_screen(scr) { } 51 FocusableList(BScreen &scr): m_parent(0), m_screen(scr) { }
52 FocusableList(BScreen &scr, const std::string & pat); 52 FocusableList(BScreen &scr, const std::string & pat);
53 FocusableList(BScreen &scr, const FocusableList &parent, 53 FocusableList(BScreen &scr, const FocusableList &parent,
54 const std::string & pat); 54 const std::string & pat);
@@ -102,7 +102,7 @@ private:
102 void windowUpdated(FluxboxWindow &fbwin); 102 void windowUpdated(FluxboxWindow &fbwin);
103 103
104 104
105 std::auto_ptr<ClientPattern> m_pat; 105 std::unique_ptr<ClientPattern> m_pat;
106 const FocusableList *m_parent; 106 const FocusableList *m_parent;
107 BScreen &m_screen; 107 BScreen &m_screen;
108 std::list<Focusable *> m_list; 108 std::list<Focusable *> m_list;
diff --git a/src/GenericTool.hh b/src/GenericTool.hh
index 72ff462..a4307aa 100644
--- a/src/GenericTool.hh
+++ b/src/GenericTool.hh
@@ -65,7 +65,7 @@ protected:
65private: 65private:
66 void themeReconfigured(); 66 void themeReconfigured();
67 67
68 std::auto_ptr<FbTk::FbWindow> m_window; 68 std::unique_ptr<FbTk::FbWindow> m_window;
69 FbTk::ThemeProxy<ToolTheme> &m_theme; 69 FbTk::ThemeProxy<ToolTheme> &m_theme;
70 FbTk::SignalTracker m_tracker; 70 FbTk::SignalTracker m_tracker;
71}; 71};
diff --git a/src/HeadArea.hh b/src/HeadArea.hh
index b0c33a6..823eba5 100644
--- a/src/HeadArea.hh
+++ b/src/HeadArea.hh
@@ -40,7 +40,7 @@ public:
40 } 40 }
41 41
42private: 42private:
43 std::auto_ptr<Strut> m_available_workspace_area; 43 std::unique_ptr<Strut> m_available_workspace_area;
44 std::list<Strut*> m_strutlist; 44 std::list<Strut*> m_strutlist;
45}; 45};
46 46
diff --git a/src/IconbarTool.hh b/src/IconbarTool.hh
index 1680f5c..21c8078 100644
--- a/src/IconbarTool.hh
+++ b/src/IconbarTool.hh
@@ -108,7 +108,7 @@ private:
108 108
109 FbTk::SignalTracker m_tracker; 109 FbTk::SignalTracker m_tracker;
110 110
111 std::auto_ptr<FocusableList> m_winlist; 111 std::unique_ptr<FocusableList> m_winlist;
112 IconMap m_icons; 112 IconMap m_icons;
113 std::string m_mode; 113 std::string m_mode;
114 FbTk::Resource<std::string> m_rc_mode; 114 FbTk::Resource<std::string> m_rc_mode;
diff --git a/src/Remember.hh b/src/Remember.hh
index 880fbe1..eb54821 100644
--- a/src/Remember.hh
+++ b/src/Remember.hh
@@ -155,7 +155,7 @@ public:
155 155
156private: 156private:
157 157
158 std::auto_ptr<Patterns> m_pats; 158 std::unique_ptr<Patterns> m_pats;
159 Clients m_clients; 159 Clients m_clients;
160 160
161 Startups m_startups; 161 Startups m_startups;
diff --git a/src/Screen.cc b/src/Screen.cc
index 277952b..53b772e 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -193,7 +193,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
193 unsigned int opts) : 193 unsigned int opts) :
194 m_layermanager(num_layers), 194 m_layermanager(num_layers),
195 root_colormap_installed(false), 195 root_colormap_installed(false),
196 m_image_control(0),
197 m_current_workspace(0), 196 m_current_workspace(0),
198 m_focused_windowtheme(new FbWinFrameTheme(scrn, ".focus", ".Focus")), 197 m_focused_windowtheme(new FbWinFrameTheme(scrn, ".focus", ".Focus")),
199 m_unfocused_windowtheme(new FbWinFrameTheme(scrn, ".unfocus", ".Unfocus")), 198 m_unfocused_windowtheme(new FbWinFrameTheme(scrn, ".unfocus", ".Unfocus")),
@@ -215,7 +214,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
215 m_altname(altscreenname), 214 m_altname(altscreenname),
216 m_focus_control(new FocusControl(*this)), 215 m_focus_control(new FocusControl(*this)),
217 m_placement_strategy(new ScreenPlacement(*this)), 216 m_placement_strategy(new ScreenPlacement(*this)),
218 m_cycle_opts(0),
219 m_opts(opts) { 217 m_opts(opts) {
220 218
221 219
@@ -643,7 +641,7 @@ void BScreen::propertyNotify(Atom atom) {
643 &ret_bytes_after, (unsigned char **)&str); 641 &ret_bytes_after, (unsigned char **)&str);
644 } 642 }
645 643
646 static std::auto_ptr<FbTk::Command<void> > cmd(0); 644 static std::unique_ptr<FbTk::Command<void> > cmd;
647 cmd.reset(FbTk::CommandParser<void>::instance().parse(str, false)); 645 cmd.reset(FbTk::CommandParser<void>::instance().parse(str, false));
648 if (cmd.get()) { 646 if (cmd.get()) {
649 cmd->execute(); 647 cmd->execute();
diff --git a/src/Screen.hh b/src/Screen.hh
index f418d0c..30228ee 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -492,31 +492,31 @@ private:
492 492
493 bool root_colormap_installed; 493 bool root_colormap_installed;
494 494
495 std::auto_ptr<FbTk::ImageControl> m_image_control; 495 std::unique_ptr<FbTk::ImageControl> m_image_control;
496 std::auto_ptr<FbMenu> m_configmenu, m_rootmenu, m_workspacemenu, m_windowmenu; 496 std::unique_ptr<FbMenu> m_configmenu, m_rootmenu, m_workspacemenu, m_windowmenu;
497 497
498 Icons m_icon_list; 498 Icons m_icon_list;
499 499
500 std::auto_ptr<Slit> m_slit; 500 std::unique_ptr<Slit> m_slit;
501 std::auto_ptr<Toolbar> m_toolbar; 501 std::unique_ptr<Toolbar> m_toolbar;
502 std::auto_ptr<ToolButtonMap> m_toolButtonMap; 502 std::unique_ptr<ToolButtonMap> m_toolButtonMap;
503 503
504 Workspace *m_current_workspace; 504 Workspace *m_current_workspace;
505 505
506 WorkspaceNames m_workspace_names; 506 WorkspaceNames m_workspace_names;
507 Workspaces m_workspaces_list; 507 Workspaces m_workspaces_list;
508 508
509 std::auto_ptr<FbWinFrameTheme> m_focused_windowtheme, 509 std::unique_ptr<FbWinFrameTheme> m_focused_windowtheme,
510 m_unfocused_windowtheme; 510 m_unfocused_windowtheme;
511 std::auto_ptr<WinButtonTheme> m_focused_winbutton_theme, 511 std::unique_ptr<WinButtonTheme> m_focused_winbutton_theme,
512 m_unfocused_winbutton_theme, m_pressed_winbutton_theme; 512 m_unfocused_winbutton_theme, m_pressed_winbutton_theme;
513 std::auto_ptr<FbTk::MenuTheme> m_menutheme; 513 std::unique_ptr<FbTk::MenuTheme> m_menutheme;
514 std::auto_ptr<RootTheme> m_root_theme; 514 std::unique_ptr<RootTheme> m_root_theme;
515 515
516 FbRootWindow m_root_window; 516 FbRootWindow m_root_window;
517 std::auto_ptr<OSDWindow> m_geom_window; 517 std::unique_ptr<OSDWindow> m_geom_window;
518 std::auto_ptr<OSDWindow> m_pos_window; 518 std::unique_ptr<OSDWindow> m_pos_window;
519 std::auto_ptr<TooltipWindow> m_tooltip_window; 519 std::unique_ptr<TooltipWindow> m_tooltip_window;
520 FbTk::FbWindow m_dummy_window; 520 FbTk::FbWindow m_dummy_window;
521 521
522 ScreenResource resource; 522 ScreenResource resource;
diff --git a/src/ScreenPlacement.cc b/src/ScreenPlacement.cc
index 29c8b5f..79149a0 100644
--- a/src/ScreenPlacement.cc
+++ b/src/ScreenPlacement.cc
@@ -53,7 +53,6 @@ ScreenPlacement::ScreenPlacement(BScreen &screen):
53 screen.name()+".windowPlacement", 53 screen.name()+".windowPlacement",
54 screen.altName()+".WindowPlacement"), 54 screen.altName()+".WindowPlacement"),
55 m_old_policy(ROWSMARTPLACEMENT), 55 m_old_policy(ROWSMARTPLACEMENT),
56 m_strategy(0),
57 m_screen(screen) 56 m_screen(screen)
58{ 57{
59} 58}
diff --git a/src/ScreenPlacement.hh b/src/ScreenPlacement.hh
index 05db90d..ceec2d2 100644
--- a/src/ScreenPlacement.hh
+++ b/src/ScreenPlacement.hh
@@ -80,8 +80,8 @@ private:
80 FbTk::Resource<ColumnDirection> m_col_direction; ///< column direction resource 80 FbTk::Resource<ColumnDirection> m_col_direction; ///< column direction resource
81 FbTk::Resource<PlacementPolicy> m_placement_policy; ///< placement policy resource 81 FbTk::Resource<PlacementPolicy> m_placement_policy; ///< placement policy resource
82 PlacementPolicy m_old_policy; ///< holds old policy, used to determine if resources has changed 82 PlacementPolicy m_old_policy; ///< holds old policy, used to determine if resources has changed
83 std::auto_ptr<PlacementStrategy> m_strategy; ///< main strategy 83 std::unique_ptr<PlacementStrategy> m_strategy; ///< main strategy
84 std::auto_ptr<PlacementStrategy> m_fallback_strategy; ///< a fallback strategy if the main strategy fails 84 std::unique_ptr<PlacementStrategy> m_fallback_strategy; ///< a fallback strategy if the main strategy fails
85 BScreen& m_screen; 85 BScreen& m_screen;
86}; 86};
87 87
diff --git a/src/Slit.cc b/src/Slit.cc
index 7eb7dea..37c3b1f 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -225,8 +225,6 @@ Slit::Slit(BScreen &scr, FbTk::Layer &layer, const char *filename)
225 m_kwm2_dockwindow(XInternAtom(FbTk::App::instance()->display(), 225 m_kwm2_dockwindow(XInternAtom(FbTk::App::instance()->display(),
226 "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", False)), //KDE v2.x 226 "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", False)), //KDE v2.x
227 227
228 m_layeritem(0),
229
230 m_slit_theme(new SlitTheme(scr.rootWindow().screenNumber())), 228 m_slit_theme(new SlitTheme(scr.rootWindow().screenNumber())),
231 m_strut(0), 229 m_strut(0),
232 // resources 230 // resources
diff --git a/src/Slit.hh b/src/Slit.hh
index d882309..a5fdeb9 100644
--- a/src/Slit.hh
+++ b/src/Slit.hh
@@ -152,7 +152,7 @@ private:
152 FbTk::Timer m_timer; 152 FbTk::Timer m_timer;
153 153
154 SlitClients m_client_list; 154 SlitClients m_client_list;
155 std::auto_ptr<LayerMenu> m_layermenu; 155 std::unique_ptr<LayerMenu> m_layermenu;
156 FbMenu m_clientlist_menu, m_slitmenu; 156 FbMenu m_clientlist_menu, m_slitmenu;
157#ifdef XINERAMA 157#ifdef XINERAMA
158 XineramaHeadMenu<Slit> *m_xineramaheadmenu; 158 XineramaHeadMenu<Slit> *m_xineramaheadmenu;
@@ -178,8 +178,8 @@ private:
178 // for KDE 178 // for KDE
179 Atom m_kwm1_dockwindow, m_kwm2_dockwindow; 179 Atom m_kwm1_dockwindow, m_kwm2_dockwindow;
180 180
181 std::auto_ptr<FbTk::LayerItem> m_layeritem; 181 std::unique_ptr<FbTk::LayerItem> m_layeritem;
182 std::auto_ptr<SlitTheme> m_slit_theme; 182 std::unique_ptr<SlitTheme> m_slit_theme;
183 static unsigned int s_eventmask; 183 static unsigned int s_eventmask;
184 Strut *m_strut; 184 Strut *m_strut;
185 185
diff --git a/src/SystemTray.hh b/src/SystemTray.hh
index 470f9b9..16e703e 100644
--- a/src/SystemTray.hh
+++ b/src/SystemTray.hh
@@ -106,7 +106,7 @@ private:
106 BScreen& m_screen; 106 BScreen& m_screen;
107 Pixmap m_pixmap; 107 Pixmap m_pixmap;
108 108
109 std::auto_ptr<AtomHandler> m_handler; 109 std::unique_ptr<AtomHandler> m_handler;
110 110
111 ClientList m_clients; 111 ClientList m_clients;
112 size_t m_num_visible_clients; 112 size_t m_num_visible_clients;
diff --git a/src/ToolFactory.hh b/src/ToolFactory.hh
index 7550f48..e9490c5 100644
--- a/src/ToolFactory.hh
+++ b/src/ToolFactory.hh
@@ -52,9 +52,9 @@ public:
52private: 52private:
53 BScreen &m_screen; 53 BScreen &m_screen;
54 ToolTheme m_clock_theme; 54 ToolTheme m_clock_theme;
55 std::auto_ptr<ToolTheme> m_button_theme; 55 std::unique_ptr<ToolTheme> m_button_theme;
56 std::auto_ptr<ToolTheme> m_workspace_theme; 56 std::unique_ptr<ToolTheme> m_workspace_theme;
57 std::auto_ptr<ToolTheme> m_systray_theme; 57 std::unique_ptr<ToolTheme> m_systray_theme;
58 IconbarTheme m_iconbar_theme, m_focused_iconbar_theme, 58 IconbarTheme m_iconbar_theme, m_focused_iconbar_theme,
59 m_unfocused_iconbar_theme; 59 m_unfocused_iconbar_theme;
60}; 60};
diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index 919b22f..6521136 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -197,7 +197,7 @@ private:
197 FbTk::Resource<Placement> m_rc_placement; 197 FbTk::Resource<Placement> m_rc_placement;
198 FbTk::Resource<int> m_rc_height; 198 FbTk::Resource<int> m_rc_height;
199 FbTk::Resource<std::string> m_rc_tools; 199 FbTk::Resource<std::string> m_rc_tools;
200 std::auto_ptr<FbTk::Shape> m_shape; 200 std::unique_ptr<FbTk::Shape> m_shape;
201 typedef std::list<std::string> StringList; 201 typedef std::list<std::string> StringList;
202 StringList m_tools; 202 StringList m_tools;
203 203
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 86c3103..42739fb 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -229,7 +229,7 @@ private:
229 229
230 //--- Resources 230 //--- Resources
231 231
232 std::auto_ptr<FbAtoms> m_fbatoms; 232 std::unique_ptr<FbAtoms> m_fbatoms;
233 FbTk::ResourceManager m_resourcemanager; 233 FbTk::ResourceManager m_resourcemanager;
234 FbTk::ResourceManager& m_screen_rm; 234 FbTk::ResourceManager& m_screen_rm;
235 235
@@ -260,7 +260,7 @@ private:
260 } m_config; 260 } m_config;
261 261
262 262
263 std::auto_ptr<Keys> m_key; 263 std::unique_ptr<Keys> m_key;
264 AtomHandlerContainer m_atomhandler; 264 AtomHandlerContainer m_atomhandler;
265 AttentionNoticeHandler m_attention_handler; 265 AttentionNoticeHandler m_attention_handler;
266 266
diff --git a/src/tests/texturetest.cc b/src/tests/texturetest.cc
index 3736493..86654bd 100644
--- a/src/tests/texturetest.cc
+++ b/src/tests/texturetest.cc
@@ -83,7 +83,7 @@ private:
83 unsigned int next_y = 5; 83 unsigned int next_y = 5;
84 84
85 TestTheme tm(screenNumber()); 85 TestTheme tm(screenNumber());
86 std::auto_ptr<ThemeItem<Texture> > text; 86 std::unique_ptr<ThemeItem<Texture> > text;
87 char value[18]; 87 char value[18];
88 for (int i=0; i<m_num; ++i) { 88 for (int i=0; i<m_num; ++i) {
89 sprintf(value, "%d", i); 89 sprintf(value, "%d", i);