aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk
diff options
context:
space:
mode:
Diffstat (limited to 'src/FbTk')
-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
7 files changed, 9 insertions, 10 deletions
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 {