aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/ThemeItems.cc
diff options
context:
space:
mode:
authorMathias Gumz <akira@fluxbox.org>2016-08-27 08:05:34 (GMT)
committerMathias Gumz <akira@fluxbox.org>2016-08-28 17:49:30 (GMT)
commitbb013f5c75120df0f86a7a17cbae61bdca2618f4 (patch)
tree9d734ef939aa962976e7ee1eca57d75ce1720b71 /src/FbTk/ThemeItems.cc
parent1e235e3f01733e3282a76e6be8862206d1504bdf (diff)
downloadfluxbox-bb013f5c75120df0f86a7a17cbae61bdca2618f4.zip
fluxbox-bb013f5c75120df0f86a7a17cbae61bdca2618f4.tar.bz2
fix compiler warning about std::auto_ptr
fluxbox uses std::unique_ptr<> where it previously used std::auto_ptr<>. C++0X was approved in 2011. among other things, it deprecates std::auto_ptr. 5 years is long enough for compilers to catch up the standard.
Diffstat (limited to 'src/FbTk/ThemeItems.cc')
-rw-r--r--src/FbTk/ThemeItems.cc4
1 files changed, 2 insertions, 2 deletions
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 {