From 08455f2408d198b8b78764cf554c7d4f7b6d824b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Thu, 15 May 2003 15:38:05 +0000 Subject: [PATCH] vector -> vector git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6968 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/controllers/ChangeLog | 5 +++++ src/frontends/controllers/ControlForks.C | 12 +++++------- src/frontends/controllers/ControlForks.h | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index f5ebd271b4..ef5663c04e 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,8 @@ + +2003-05-13 André Pönitz + + * ControlForks.[Ch]: use vector instead of strings + 2003-05-14 Rob Lahaye * ControlErrorList.C (clearParams): replace string::clear by diff --git a/src/frontends/controllers/ControlForks.C b/src/frontends/controllers/ControlForks.C index de37e59152..10052155eb 100644 --- a/src/frontends/controllers/ControlForks.C +++ b/src/frontends/controllers/ControlForks.C @@ -31,21 +31,19 @@ ControlForks::ControlForks(LyXView & lv, Dialogs & d) vector const ControlForks::getPIDs() const { - ForkedcallsController const & fcc = ForkedcallsController::get(); - return fcc.getPIDs(); + return ForkedcallsController::get().getPIDs(); } string const ControlForks::getCommand(pid_t pid) const { - ForkedcallsController const & fcc = ForkedcallsController::get(); - return fcc.getCommand(pid); + return ForkedcallsController::get().getCommand(pid); } void ControlForks::kill(pid_t pid) { - pids_.push_back(tostr(pid)); + pids_.push_back(pid); } @@ -60,9 +58,9 @@ void ControlForks::apply() if (pids_.empty()) return; - for (vector::const_iterator it = pids_.begin(); + for (vector::const_iterator it = pids_.begin(); it != pids_.end(); ++it) { - lyxfunc().dispatch(FuncRequest(LFUN_FORKS_KILL, *it)); + lyxfunc().dispatch(FuncRequest(LFUN_FORKS_KILL, tostr(*it))); } pids_.clear(); diff --git a/src/frontends/controllers/ControlForks.h b/src/frontends/controllers/ControlForks.h index bcc8c2dedd..9624ccd6fb 100644 --- a/src/frontends/controllers/ControlForks.h +++ b/src/frontends/controllers/ControlForks.h @@ -44,7 +44,7 @@ private: /// Connection to the ForkedcallsController signal boost::signals::connection childrenChanged_; /// The list of PIDs to kill - std::vector pids_; + std::vector pids_; }; #endif // CONTROLFORKS_H -- 2.39.5