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:
     unsigned long m_border_color; ///< border color
     unsigned int m_depth; ///< bit depth
     bool m_destroy; ///< wheter the x window was created before
-    std::auto_ptr<FbTk::Transparent> m_transparent;
+    std::unique_ptr<FbTk::Transparent> m_transparent;
     bool m_lastbg_color_set;
     unsigned long m_lastbg_color;
     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[] = {
 
 namespace FbTk {
 
-std::auto_ptr<KeyUtil> KeyUtil::s_keyutil;
+std::unique_ptr<KeyUtil> KeyUtil::s_keyutil;
 
 KeyUtil &KeyUtil::instance() {
     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:
 
     XModifierKeymap *m_modmap;
     int m_numlock, m_scrolllock;
-    static std::auto_ptr<KeyUtil> s_keyutil;
+    static std::unique_ptr<KeyUtil> s_keyutil;
 };
 
 } // 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):
     m_active_index(-1),
     m_theme(tm),
     m_image_ctrl(imgctrl),
-    m_shape(0),
     m_alignment(ALIGNDONTCARE) {
 
     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:
     Menu *m_parent;
 
     std::vector<MenuItem*>    m_items;
-    std::auto_ptr<MenuSearch> m_search;
+    std::unique_ptr<MenuSearch> m_search;
 
     struct State {
         bool moving;
@@ -239,7 +239,7 @@ private:
 
     FbTk::ThemeProxy<MenuTheme>& m_theme;
     ImageControl& m_image_ctrl;
-    std::auto_ptr<FbTk::Shape> m_shape; // the corners
+    std::unique_ptr<FbTk::Shape> m_shape; // the corners
     Pixmap      m_hilite_pixmap;
     Alignment   m_alignment;
 
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:
     bool m_close_on_click, m_toggle_item;
 
     struct Icon {
-        std::auto_ptr<PixmapWithMask> pixmap;
+        std::unique_ptr<PixmapWithMask> pixmap;
         std::string filename;
     };
-    std::auto_ptr<Icon> m_icon;
+    std::unique_ptr<Icon> m_icon;
 };
 
 } // 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) {
         return;
     }
 
-    std::auto_ptr<PixmapWithMask> pm(Image::load(pixmap_name, m_tm.screenNum()));
+    std::unique_ptr<PixmapWithMask> pm(Image::load(pixmap_name, m_tm.screenNum()));
 
     if (pm.get() == 0) {
         if (ThemeManager::instance().verbose()) {
@@ -255,7 +255,7 @@ setFromString(const char *str) {
         StringUtil::removeFirstWhitespace(filename);
         StringUtil::removeTrailingWhitespace(filename);
 
-        std::auto_ptr<PixmapWithMask> pm(Image::load(filename, m_tm.screenNum()));
+        std::unique_ptr<PixmapWithMask> pm(Image::load(filename, m_tm.screenNum()));
         if (pm.get() == 0)
             setDefaultValue();
         else {