Mercurial > hg > orthanc-stone

comparison Applications/Generic/GuiAdapter.cpp @ 1298:8a0a62189f46

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 16:31:30 +0100
parents 7def6ab2929f
children 257f2c9a02ac
comparison
equal deleted inserted replaced
1296:86400fa16091 1298:8a0a62189f46
32 32
33 #if ORTHANC_ENABLE_THREADS == 1 33 #if ORTHANC_ENABLE_THREADS == 1
34 # include "../../Framework/Messages/LockingEmitter.h" 34 # include "../../Framework/Messages/LockingEmitter.h"
35 #endif 35 #endif
36 36
37 #include <Core/Compatibility.h>
38
37 namespace OrthancStone 39 namespace OrthancStone
38 { 40 {
39 std::ostream& operator<<( 41 std::ostream& operator<<(
40 std::ostream& os, const GuiAdapterKeyboardEvent& event) 42 std::ostream& os, const GuiAdapterKeyboardEvent& event)
41 { 43 {
193 double time, void* userData) 195 double time, void* userData)
194 { 196 {
195 // userData is OnMouseWheelFuncAdapterPayload 197 // userData is OnMouseWheelFuncAdapterPayload
196 FuncAdapterPayload<GenericFunc>* payload = 198 FuncAdapterPayload<GenericFunc>* payload =
197 reinterpret_cast<FuncAdapterPayload<GenericFunc>*>(userData); 199 reinterpret_cast<FuncAdapterPayload<GenericFunc>*>(userData);
198 //std::auto_ptr< FuncAdapterPayload<GenericFunc> > deleter(payload); 200 //std::unique_ptr< FuncAdapterPayload<GenericFunc> > deleter(payload);
199 bool ret = (*(payload->callback))(time, payload->userData); 201 bool ret = (*(payload->callback))(time, payload->userData);
200 return static_cast<EM_BOOL>(ret); 202 return static_cast<EM_BOOL>(ret);
201 } 203 }
202 204
203 // resize: (const char* target, void* userData, EM_BOOL useCapture, em_ui_callback_func callback) 205 // resize: (const char* target, void* userData, EM_BOOL useCapture, em_ui_callback_func callback)
212 { 214 {
213 // TODO: write RemoveCallback with an int id that gets returned from 215 // TODO: write RemoveCallback with an int id that gets returned from
214 // here 216 // here
215 FuncAdapterPayload<GenericFunc>* payload = 217 FuncAdapterPayload<GenericFunc>* payload =
216 new FuncAdapterPayload<GenericFunc>(); 218 new FuncAdapterPayload<GenericFunc>();
217 std::auto_ptr<FuncAdapterPayload<GenericFunc> > payloadP(payload); 219 std::unique_ptr<FuncAdapterPayload<GenericFunc> > payloadP(payload);
218 payload->canvasId = canvasId; 220 payload->canvasId = canvasId;
219 payload->callback = func; 221 payload->callback = func;
220 payload->userData = userData; 222 payload->userData = userData;
221 void* userDataRaw = reinterpret_cast<void*>(payload); 223 void* userDataRaw = reinterpret_cast<void*>(payload);
222 // LOG(INFO) << "SetCallback -- userDataRaw: " << userDataRaw << 224 // LOG(INFO) << "SetCallback -- userDataRaw: " << userDataRaw <<
237 typename EmscriptenSetCallbackFunc> 239 typename EmscriptenSetCallbackFunc>
238 static void SetCallback2( 240 static void SetCallback2(
239 EmscriptenSetCallbackFunc emFunc, 241 EmscriptenSetCallbackFunc emFunc,
240 std::string canvasId, void* userData, bool capture, GenericFunc func) 242 std::string canvasId, void* userData, bool capture, GenericFunc func)
241 { 243 {
242 std::auto_ptr<FuncAdapterPayload<GenericFunc> > payload( 244 std::unique_ptr<FuncAdapterPayload<GenericFunc> > payload(
243 new FuncAdapterPayload<GenericFunc>() 245 new FuncAdapterPayload<GenericFunc>()
244 ); 246 );
245 payload->canvasId = canvasId; 247 payload->canvasId = canvasId;
246 payload->callback = func; 248 payload->callback = func;
247 payload->userData = userData; 249 payload->userData = userData;
260 static void SetAnimationFrameCallback( 262 static void SetAnimationFrameCallback(
261 EmscriptenSetCallbackFunc emFunc, 263 EmscriptenSetCallbackFunc emFunc,
262 void* userData, GenericFunc func) 264 void* userData, GenericFunc func)
263 { 265 {
264 // LOG(ERROR) << "SetAnimationFrameCallback !!!!!! (RequestAnimationFrame)"; 266 // LOG(ERROR) << "SetAnimationFrameCallback !!!!!! (RequestAnimationFrame)";
265 std::auto_ptr<FuncAdapterPayload<GenericFunc> > payload( 267 std::unique_ptr<FuncAdapterPayload<GenericFunc> > payload(
266 new FuncAdapterPayload<GenericFunc>() 268 new FuncAdapterPayload<GenericFunc>()
267 ); 269 );
268 payload->canvasId = "UNDEFINED"; 270 payload->canvasId = "UNDEFINED";
269 payload->callback = func; 271 payload->callback = func;
270 payload->userData = userData; 272 payload->userData = userData;