Navigation

Changeset 19858

Timestamp:

03/09/07 10:08:03 (2 years ago)

Author:

patrick

Message:

Clear mDevTable and mProxyTable after the objects contained therein are
deleted.

Files:

r19729	r19858
84	84	void InputManager::shutdown()
85	85	{
86		for (tDevTableType::iterator a = mDevTable.begin(); a != mDevTable.end(); ++a) // Stop all devices
	86	typedef tDevTableType::iterator dev_iter_t;
	87
	88	// Stop and delete all devices.
	89	for ( dev_iter_t a = mDevTable.begin(); a != mDevTable.end(); ++a )
87	90	{
88	91	if ((*a).second != NULL)
…	…
93	96	}
94	97
	98	mDevTable.clear();
	99
95	100	// Delete all the proxies
96		for ( std::map<std::string, Proxy*>::iterator j = mProxyTable.begin();
97		j != mProxyTable.end();
98		++j )
	101	typedef std::map<std::string, Proxy*>::iterator proxy_iter_t;
	102	for ( proxy_iter_t j = mProxyTable.begin(); j != mProxyTable.end(); ++j )
99	103	{
100	104	delete (*j).second;
101	105	}
	106
	107	mProxyTable.clear();
102	108	}
103	109

r19729	r19858
72	72	InputManager();
73	73
	74	/**
	75	* Shuts down this Input Manager instance (if it has not already been
	76	* shut down).
	77	*
	78	* @see shutdown()
	79	*/
74	80	virtual ~InputManager();
75	81
…	…
127	133
128	134	/**
129		* Shutdown all devices and proxies.
	135	* Shuts down all devices and proxies.
	136	*
	137	* @post \c mDevTable is empty. \c mProxyTable is empty.
130	138	*
131	139	* @since 1.1.20
132	140	*/
133	141	void shutdown();
	142
134	143	private:
135	144	/**