Mercurial > hg > orthanc-stone

comparison Applications/Generic/GuiAdapter.cpp @ 1299:c38c89684d83 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replacing std::auto_ptr by std::unique_ptr
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 02 Mar 2020 17:21:24 +0100
parents 6ab03e429f06
children 257f2c9a02ac
comparison
equal deleted inserted replaced
1297:6ab03e429f06 1299:c38c89684d83
193 double time, void* userData) 193 double time, void* userData)
194 { 194 {
195 // userData is OnMouseWheelFuncAdapterPayload 195 // userData is OnMouseWheelFuncAdapterPayload
196 FuncAdapterPayload<GenericFunc>* payload = 196 FuncAdapterPayload<GenericFunc>* payload =
197 reinterpret_cast<FuncAdapterPayload<GenericFunc>*>(userData); 197 reinterpret_cast<FuncAdapterPayload<GenericFunc>*>(userData);
198 //std::auto_ptr< FuncAdapterPayload<GenericFunc> > deleter(payload); 198 //std::unique_ptr< FuncAdapterPayload<GenericFunc> > deleter(payload);
199 bool ret = (*(payload->callback))(time, payload->userData); 199 bool ret = (*(payload->callback))(time, payload->userData);
200 return static_cast<EM_BOOL>(ret); 200 return static_cast<EM_BOOL>(ret);
201 } 201 }
202 202
203 // resize: (const char* target, void* userData, EM_BOOL useCapture, em_ui_callback_func callback) 203 // resize: (const char* target, void* userData, EM_BOOL useCapture, em_ui_callback_func callback)
212 { 212 {
213 // TODO: write RemoveCallback with an int id that gets returned from 213 // TODO: write RemoveCallback with an int id that gets returned from
214 // here 214 // here
215 FuncAdapterPayload<GenericFunc>* payload = 215 FuncAdapterPayload<GenericFunc>* payload =
216 new FuncAdapterPayload<GenericFunc>(); 216 new FuncAdapterPayload<GenericFunc>();
217 std::auto_ptr<FuncAdapterPayload<GenericFunc> > payloadP(payload); 217 std::unique_ptr<FuncAdapterPayload<GenericFunc> > payloadP(payload);
218 payload->canvasId = canvasId; 218 payload->canvasId = canvasId;
219 payload->callback = func; 219 payload->callback = func;
220 payload->userData = userData; 220 payload->userData = userData;
221 void* userDataRaw = reinterpret_cast<void*>(payload); 221 void* userDataRaw = reinterpret_cast<void*>(payload);
222 // LOG(INFO) << "SetCallback -- userDataRaw: " << userDataRaw << 222 // LOG(INFO) << "SetCallback -- userDataRaw: " << userDataRaw <<
237 typename EmscriptenSetCallbackFunc> 237 typename EmscriptenSetCallbackFunc>
238 static void SetCallback2( 238 static void SetCallback2(
239 EmscriptenSetCallbackFunc emFunc, 239 EmscriptenSetCallbackFunc emFunc,
240 std::string canvasId, void* userData, bool capture, GenericFunc func) 240 std::string canvasId, void* userData, bool capture, GenericFunc func)
241 { 241 {
242 std::auto_ptr<FuncAdapterPayload<GenericFunc> > payload( 242 std::unique_ptr<FuncAdapterPayload<GenericFunc> > payload(
243 new FuncAdapterPayload<GenericFunc>() 243 new FuncAdapterPayload<GenericFunc>()
244 ); 244 );
245 payload->canvasId = canvasId; 245 payload->canvasId = canvasId;
246 payload->callback = func; 246 payload->callback = func;
247 payload->userData = userData; 247 payload->userData = userData;
260 static void SetAnimationFrameCallback( 260 static void SetAnimationFrameCallback(
261 EmscriptenSetCallbackFunc emFunc, 261 EmscriptenSetCallbackFunc emFunc,
262 void* userData, GenericFunc func) 262 void* userData, GenericFunc func)
263 { 263 {
264 // LOG(ERROR) << "SetAnimationFrameCallback !!!!!! (RequestAnimationFrame)"; 264 // LOG(ERROR) << "SetAnimationFrameCallback !!!!!! (RequestAnimationFrame)";
265 std::auto_ptr<FuncAdapterPayload<GenericFunc> > payload( 265 std::unique_ptr<FuncAdapterPayload<GenericFunc> > payload(
266 new FuncAdapterPayload<GenericFunc>() 266 new FuncAdapterPayload<GenericFunc>()
267 ); 267 );
268 payload->canvasId = "UNDEFINED"; 268 payload->canvasId = "UNDEFINED";
269 payload->callback = func; 269 payload->callback = func;
270 payload->userData = userData; 270 payload->userData = userData;