diff options
author | Mathias Gumz <akira@fluxbox.org> | 2016-09-11 09:21:00 (GMT) |
---|---|---|
committer | Mathias Gumz <akira@fluxbox.org> | 2016-09-11 09:21:00 (GMT) |
commit | 52c9f6257d86e2882434497acf3d8243394fdb8f (patch) | |
tree | b1055875fa29fb9e88f09a2362267539d003c173 /src | |
parent | 5fc00dee32de8d31b7220c338810e86043eb87ae (diff) | |
download | fluxbox-52c9f6257d86e2882434497acf3d8243394fdb8f.zip fluxbox-52c9f6257d86e2882434497acf3d8243394fdb8f.tar.bz2 |
std::auto_ptr to std::unique_ptr
Diffstat (limited to 'src')
-rw-r--r-- | src/CommandDialog.cc | 5 | ||||
-rw-r--r-- | src/main.cc | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/CommandDialog.cc b/src/CommandDialog.cc index e777390..b8cd838 100644 --- a/src/CommandDialog.cc +++ b/src/CommandDialog.cc | |||
@@ -35,7 +35,6 @@ | |||
35 | 35 | ||
36 | using std::string; | 36 | using std::string; |
37 | using std::vector; | 37 | using std::vector; |
38 | using std::auto_ptr; | ||
39 | using std::less; | 38 | using std::less; |
40 | using std::out_of_range; | 39 | using std::out_of_range; |
41 | 40 | ||
@@ -45,9 +44,9 @@ CommandDialog::CommandDialog(BScreen &screen, const string &title, | |||
45 | m_precommand(precommand) { } | 44 | m_precommand(precommand) { } |
46 | 45 | ||
47 | void CommandDialog::exec(const std::string &text){ | 46 | void CommandDialog::exec(const std::string &text){ |
48 | 47 | ||
49 | // create Command<void> from line | 48 | // create Command<void> from line |
50 | auto_ptr<FbTk::Command<void> > cmd(FbTk::CommandParser<void>::instance().parse(m_precommand + text)); | 49 | std::unique_ptr<FbTk::Command<void> > cmd(FbTk::CommandParser<void>::instance().parse(m_precommand + text)); |
51 | if (cmd.get()) | 50 | if (cmd.get()) |
52 | cmd->execute(); | 51 | cmd->execute(); |
53 | // post execute | 52 | // post execute |
diff --git a/src/main.cc b/src/main.cc index 3cc728d..574020a 100644 --- a/src/main.cc +++ b/src/main.cc | |||
@@ -59,7 +59,6 @@ using std::string; | |||
59 | using std::ostream; | 59 | using std::ostream; |
60 | using std::ofstream; | 60 | using std::ofstream; |
61 | using std::streambuf; | 61 | using std::streambuf; |
62 | using std::auto_ptr; | ||
63 | using std::out_of_range; | 62 | using std::out_of_range; |
64 | using std::runtime_error; | 63 | using std::runtime_error; |
65 | using std::bad_cast; | 64 | using std::bad_cast; |
@@ -68,7 +67,7 @@ using std::exception; | |||
68 | 67 | ||
69 | namespace { | 68 | namespace { |
70 | 69 | ||
71 | auto_ptr<Fluxbox> fluxbox; | 70 | std::unique_ptr<Fluxbox> fluxbox; |
72 | 71 | ||
73 | void handleSignal(int signum) { | 72 | void handleSignal(int signum) { |
74 | 73 | ||