Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API change of AIFilePicker.

Browse Source 
Call AIFilePicker::create() instead of new AIFilePicker.
Renamed deleteMe() to kill() and bs_deleted to bs_killed.
Only default to auto destruct when created with create(true),
otherwise kill() has to be called explicitely.
This commit is contained in:
Aleric Inglewood
2011-05-18 03:52:15 +02:00
parent 4eb87268bd
commit e1fb1fa6b7
23 changed files with 63 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/statemachine/aistatemachine.h
View File

@@ -169,7 +169,7 @@ class AIStateMachine {
bs_run,
bs_abort,
bs_finish,
bs_deleted
bs_killed
};
public:
@@ -178,7 +178,7 @@ class AIStateMachine {
//! Integral value equal to the state with the lowest value.
static state_type const min_state = bs_initialize;
//! Integral value one more than the state with the highest value.
static state_type const max_state = bs_deleted + 1;
static state_type const max_state = bs_killed + 1;
private:
base_state_type mState; //!< State of the base class.
@@ -214,8 +214,8 @@ class AIStateMachine {
AIStateMachine(void) : mState(bs_initialize), mIdle(true), mAborted(true), mSleep(0), mParent(NULL), mCallback(NULL) { updateSettings(); }
protected:
//! The user should call 'deleteMe()', not delete a AIStateMachine (derived) directly.
virtual ~AIStateMachine() { llassert(mState == bs_deleted); }
//! The user should call 'kill()', not delete a AIStateMachine (derived) directly.
virtual ~AIStateMachine() { llassert(mState == bs_killed); }
public:
//! Halt the state machine until cont() is called.
@@ -286,8 +286,8 @@ class AIStateMachine {
//! Refine state while in the bs_run state. May only be called while in the bs_run state.
void set_state(state_type run_state);
//! Change state to 'bs_deleted'. May only be called while in the bs_finish state.
void deleteMe(void);
//! Change state to 'bs_killed'. May only be called while in the bs_finish state.
void kill(void);
//---------------------------------------
// Other.