std::auto_ptr to std::unique_ptr
This commit is contained in:
parent
5fc00dee32
commit
52c9f6257d
2 changed files with 3 additions and 5 deletions
|
@ -35,7 +35,6 @@
|
||||||
|
|
||||||
using std::string;
|
using std::string;
|
||||||
using std::vector;
|
using std::vector;
|
||||||
using std::auto_ptr;
|
|
||||||
using std::less;
|
using std::less;
|
||||||
using std::out_of_range;
|
using std::out_of_range;
|
||||||
|
|
||||||
|
@ -45,9 +44,9 @@ CommandDialog::CommandDialog(BScreen &screen, const string &title,
|
||||||
m_precommand(precommand) { }
|
m_precommand(precommand) { }
|
||||||
|
|
||||||
void CommandDialog::exec(const std::string &text){
|
void CommandDialog::exec(const std::string &text){
|
||||||
|
|
||||||
// create Command<void> from line
|
// create Command<void> from line
|
||||||
auto_ptr<FbTk::Command<void> > cmd(FbTk::CommandParser<void>::instance().parse(m_precommand + text));
|
std::unique_ptr<FbTk::Command<void> > cmd(FbTk::CommandParser<void>::instance().parse(m_precommand + text));
|
||||||
if (cmd.get())
|
if (cmd.get())
|
||||||
cmd->execute();
|
cmd->execute();
|
||||||
// post execute
|
// post execute
|
||||||
|
|
|
@ -59,7 +59,6 @@ using std::string;
|
||||||
using std::ostream;
|
using std::ostream;
|
||||||
using std::ofstream;
|
using std::ofstream;
|
||||||
using std::streambuf;
|
using std::streambuf;
|
||||||
using std::auto_ptr;
|
|
||||||
using std::out_of_range;
|
using std::out_of_range;
|
||||||
using std::runtime_error;
|
using std::runtime_error;
|
||||||
using std::bad_cast;
|
using std::bad_cast;
|
||||||
|
@ -68,7 +67,7 @@ using std::exception;
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
auto_ptr<Fluxbox> fluxbox;
|
std::unique_ptr<Fluxbox> fluxbox;
|
||||||
|
|
||||||
void handleSignal(int signum) {
|
void handleSignal(int signum) {
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue