aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
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/Screen.hh
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/Screen.hh')
-rw-r--r--src/Screen.hh24
1 files changed, 12 insertions, 12 deletions
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;