Skip to content

Commit 71d3173

Browse files
yup-botyup-bot
committed
Code formatting
1 parent e48aac5 commit 71d3173

File tree

2 files changed

+85
-88
lines changed

2 files changed

+85
-88
lines changed

‎modules/yup_python/bindings/yup_YupEvents_bindings.cpp‎

Lines changed: 80 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131

3232
// =================================================================================================
3333

34-
namespace yup {
34+
namespace yup
35+
{
3536

3637
#if YUP_MAC
3738
extern void initialiseNSApplication();
@@ -41,7 +42,8 @@ extern void initialiseNSApplication();
4142

4243
// =================================================================================================
4344

44-
namespace yup::Bindings {
45+
namespace yup::Bindings
46+
{
4547

4648
using namespace yup;
4749

@@ -65,8 +67,7 @@ void registerYupEventsBindings (py::module_& m)
6567

6668
classActionListener
6769
.def (py::init<>())
68-
.def ("actionListenerCallback", &ActionListener::actionListenerCallback)
69-
;
70+
.def ("actionListenerCallback", &ActionListener::actionListenerCallback);
7071

7172
// ============================================================================================ yup::ActionBroadcaster
7273

@@ -77,8 +78,7 @@ void registerYupEventsBindings (py::module_& m)
7778
.def ("addActionListener", &ActionBroadcaster::addActionListener)
7879
.def ("removeActionListener", &ActionBroadcaster::removeActionListener)
7980
.def ("removeAllActionListeners", &ActionBroadcaster::removeAllActionListeners)
80-
.def ("sendActionMessage", &ActionBroadcaster::sendActionMessage)
81-
;
81+
.def ("sendActionMessage", &ActionBroadcaster::sendActionMessage);
8282

8383
// ============================================================================================ yup::AsyncUpdater
8484

@@ -90,8 +90,7 @@ void registerYupEventsBindings (py::module_& m)
9090
.def ("triggerAsyncUpdate", &AsyncUpdater::triggerAsyncUpdate)
9191
.def ("cancelPendingUpdate", &AsyncUpdater::cancelPendingUpdate)
9292
.def ("handleUpdateNowIfNeeded", &AsyncUpdater::handleUpdateNowIfNeeded)
93-
.def ("isUpdatePending", &AsyncUpdater::isUpdatePending)
94-
;
93+
.def ("isUpdatePending", &AsyncUpdater::isUpdatePending);
9594

9695
// ============================================================================================ yup::LockingAsyncUpdater
9796

@@ -102,17 +101,15 @@ void registerYupEventsBindings (py::module_& m)
102101
.def ("triggerAsyncUpdate", &LockingAsyncUpdater::triggerAsyncUpdate)
103102
.def ("cancelPendingUpdate", &LockingAsyncUpdater::cancelPendingUpdate)
104103
.def ("handleUpdateNowIfNeeded", &LockingAsyncUpdater::handleUpdateNowIfNeeded)
105-
.def ("isUpdatePending", &LockingAsyncUpdater::isUpdatePending)
106-
;
104+
.def ("isUpdatePending", &LockingAsyncUpdater::isUpdatePending);
107105

108106
// ============================================================================================ yup::AsyncUpdater
109107

110108
py::class_<ChangeListener, PyChangeListener> classChangeListener (m, "ChangeListener");
111109

112110
classChangeListener
113111
.def (py::init<>())
114-
.def ("changeListenerCallback", &ChangeListener::changeListenerCallback)
115-
;
112+
.def ("changeListenerCallback", &ChangeListener::changeListenerCallback);
116113

117114
py::class_<ChangeBroadcaster> classChangeBroadcaster (m, "ChangeBroadcaster");
118115

@@ -123,8 +120,7 @@ void registerYupEventsBindings (py::module_& m)
123120
.def ("removeAllChangeListeners", &ChangeBroadcaster::removeAllChangeListeners)
124121
.def ("sendChangeMessage", &ChangeBroadcaster::sendChangeMessage)
125122
.def ("sendSynchronousChangeMessage", &ChangeBroadcaster::sendSynchronousChangeMessage)
126-
.def ("dispatchPendingMessages", &ChangeBroadcaster::dispatchPendingMessages)
127-
;
123+
.def ("dispatchPendingMessages", &ChangeBroadcaster::dispatchPendingMessages);
128124

129125
// ============================================================================================ yup::MessageManager
130126

@@ -137,16 +133,17 @@ void registerYupEventsBindings (py::module_& m)
137133
classMessageManagerMessageBase
138134
.def (py::init<>())
139135
.def ("messageCallback", &MessageManager::MessageBase::messageCallback)
140-
.def ("post", [](py::object self) { return self.release().cast<MessageManager::MessageBase*>()->post(); })
141-
;
136+
.def ("post", [] (py::object self)
137+
{
138+
return self.release().cast<MessageManager::MessageBase*>()->post();
139+
});
142140

143141
classMessageManagerInnerLock
144142
.def (py::init<>())
145143
.def ("enter", &MessageManager::Lock::enter)
146144
.def ("tryEnter", &MessageManager::Lock::tryEnter)
147145
.def ("exit", &MessageManager::Lock::exit)
148-
.def ("abort", &MessageManager::Lock::abort)
149-
;
146+
.def ("abort", &MessageManager::Lock::abort);
150147

151148
classMessageManager
152149
.def_static ("getInstance", &MessageManager::getInstance, py::return_value_policy::reference)
@@ -159,57 +156,56 @@ void registerYupEventsBindings (py::module_& m)
159156
.def ("runDispatchLoopUntil", &MessageManager::runDispatchLoopUntil)
160157
#endif
161158
.def_static ("callAsync", &MessageManager::callAsync)
162-
.def ("callFunctionOnMessageThread", [](MessageManager& self, py::function func) -> py::object
163-
{
164-
void* result = nullptr;
159+
.def ("callFunctionOnMessageThread", [] (MessageManager& self, py::function func) -> py::object
160+
{
161+
void* result = nullptr;
165162

166-
if (func.is_none())
167-
py::pybind11_fail ("Invalid specified function to \"MessageManager::callFunctionOnMessageThread\"");
163+
if (func.is_none())
164+
py::pybind11_fail ("Invalid specified function to \"MessageManager::callFunctionOnMessageThread\"");
168165

169-
{
170-
py::gil_scoped_release release;
166+
{
167+
py::gil_scoped_release release;
171168

172-
result = self.callFunctionOnMessageThread (+[](void* data) -> void*
173-
{
174-
py::gil_scoped_acquire acquire;
169+
result = self.callFunctionOnMessageThread (+[] (void* data) -> void*
170+
{
171+
py::gil_scoped_acquire acquire;
175172

176-
auto func = *reinterpret_cast<py::function*> (data);
173+
auto func = *reinterpret_cast<py::function*> (data);
177174

178-
return func().ptr();
179-
}, std::addressof (func));
180-
}
175+
return func().ptr();
176+
},
177+
std::addressof (func));
178+
}
181179

182-
if (result == nullptr)
183-
return py::none();
180+
if (result == nullptr)
181+
return py::none();
184182

185-
return py::reinterpret_borrow<py::object> (reinterpret_cast<PyObject*> (result));
186-
})
187-
.def ("isThisTheMessageThread", &MessageManager::isThisTheMessageThread)
183+
return py::reinterpret_borrow<py::object> (reinterpret_cast<PyObject*> (result));
184+
}).def ("isThisTheMessageThread", &MessageManager::isThisTheMessageThread)
188185
.def ("setCurrentThreadAsMessageThread", &MessageManager::setCurrentThreadAsMessageThread)
189-
.def ("getCurrentMessageThread", [](const MessageManager& self) { return PyThreadID (self.getCurrentMessageThread()); })
190-
.def ("currentThreadHasLockedMessageManager", &MessageManager::currentThreadHasLockedMessageManager)
186+
.def ("getCurrentMessageThread", [] (const MessageManager& self)
187+
{
188+
return PyThreadID (self.getCurrentMessageThread());
189+
}).def ("currentThreadHasLockedMessageManager", &MessageManager::currentThreadHasLockedMessageManager)
191190
.def_static ("existsAndIsLockedByCurrentThread", &MessageManager::existsAndIsLockedByCurrentThread)
192191
.def_static ("existsAndIsCurrentThread", &MessageManager::existsAndIsCurrentThread)
193192
.def_static ("broadcastMessage", &MessageManager::broadcastMessage)
194193
.def ("registerBroadcastListener", &MessageManager::registerBroadcastListener)
195194
.def ("deregisterBroadcastListener", &MessageManager::deregisterBroadcastListener)
196-
.def ("deliverBroadcastMessage", &MessageManager::deliverBroadcastMessage)
197-
;
195+
.def ("deliverBroadcastMessage", &MessageManager::deliverBroadcastMessage);
198196

199197
// ============================================================================================ yup::Message
200198

201199
py::class_<Message, MessageManager::MessageBase, PyMessageBase<Message>> classMessage (m, "Message");
202200

203201
classMessage
204-
.def (py::init<>())
205-
;
202+
.def (py::init<>());
206203

207204
py::class_<CallbackMessage, MessageManager::MessageBase, PyCallbackMessage<>> classCallbackMessage (classMessageManager, "CallbackMessage");
208205

209206
classCallbackMessage
210207
.def (py::init<>())
211-
.def ("messageCallback", &CallbackMessage::messageCallback)
212-
;
208+
.def ("messageCallback", &CallbackMessage::messageCallback);
213209

214210
// ============================================================================================ yup::Message
215211

@@ -218,14 +214,14 @@ void registerYupEventsBindings (py::module_& m)
218214
classMessageListener
219215
.def (py::init<>())
220216
.def ("handleMessage", &MessageListener::handleMessage)
221-
.def ("postMessage", [](MessageListener& self, py::object message)
222-
{
223-
if (message.is_none() || ! py::isinstance<Message> (message))
224-
py::pybind11_fail ("Invalid specified message type in \"MessageListener::postMessage\"");
217+
.def ("postMessage", [] (MessageListener& self, py::object message)
218+
{
219+
if (message.is_none() || ! py::isinstance<Message> (message))
220+
py::pybind11_fail ("Invalid specified message type in \"MessageListener::postMessage\"");
225221

226-
return self.postMessage (message.release().cast<Message*>());
227-
}, "message"_a)
228-
;
222+
return self.postMessage (message.release().cast<Message*>());
223+
},
224+
"message"_a);
229225

230226
// ============================================================================================ yup::MessageManagerLock
231227

@@ -234,31 +230,30 @@ void registerYupEventsBindings (py::module_& m)
234230
classMessageManagerLock
235231
.def (py::init<Thread*>(), "threadToCheckForExitSignal"_a = nullptr)
236232
.def (py::init<ThreadPoolJob*>())
237-
.def ("__enter__", [](PyMessageManagerLock& self)
238-
{
239-
if (self.thread != nullptr)
240-
self.state.emplace<MessageManagerLock> (self.thread);
233+
.def ("__enter__", [] (PyMessageManagerLock& self)
234+
{
235+
if (self.thread != nullptr)
236+
self.state.emplace<MessageManagerLock> (self.thread);
241237

242-
else if (self.threadPoolJob != nullptr)
243-
self.state.emplace<MessageManagerLock> (self.threadPoolJob);
238+
else if (self.threadPoolJob != nullptr)
239+
self.state.emplace<MessageManagerLock> (self.threadPoolJob);
244240

245-
else
246-
py::pybind11_fail ("Invalid constructed \"MessageManagerLock\", either \"Thread\" or \"ThreadPoolJob\" must be provided");
241+
else
242+
py::pybind11_fail ("Invalid constructed \"MessageManagerLock\", either \"Thread\" or \"ThreadPoolJob\" must be provided");
247243

248-
return std::addressof (std::as_const (self));
249-
}, py::return_value_policy::reference)
250-
.def ("__exit__", [](PyMessageManagerLock& self, const std::optional<py::type>&, const std::optional<py::object>&, const std::optional<py::object>&)
251-
{
252-
self.state.emplace<std::monostate>();
253-
})
254-
.def ("lockWasGained", [](const PyMessageManagerLock& self)
255-
{
256-
if (auto lock = std::get_if<MessageManagerLock> (std::addressof (self.state)))
257-
return lock->lockWasGained();
244+
return std::addressof (std::as_const (self));
245+
},
246+
py::return_value_policy::reference)
247+
.def ("__exit__", [] (PyMessageManagerLock& self, const std::optional<py::type>&, const std::optional<py::object>&, const std::optional<py::object>&)
248+
{
249+
self.state.emplace<std::monostate>();
250+
}).def ("lockWasGained", [] (const PyMessageManagerLock& self)
251+
{
252+
if (auto lock = std::get_if<MessageManagerLock> (std::addressof (self.state)))
253+
return lock->lockWasGained();
258254

259-
return false;
260-
})
261-
;
255+
return false;
256+
});
262257

263258
// ============================================================================================ yup::Timer
264259

@@ -273,8 +268,7 @@ void registerYupEventsBindings (py::module_& m)
273268
.def ("isTimerRunning", &Timer::isTimerRunning)
274269
.def ("getTimerInterval", &Timer::getTimerInterval)
275270
.def_static ("callAfterDelay", &Timer::callAfterDelay)
276-
.def_static ("callPendingTimersSynchronously", &Timer::callPendingTimersSynchronously)
277-
;
271+
.def_static ("callPendingTimersSynchronously", &Timer::callPendingTimersSynchronously);
278272

279273
// ============================================================================================ yup::MultiTimer
280274

@@ -286,29 +280,31 @@ void registerYupEventsBindings (py::module_& m)
286280
.def ("startTimer", &MultiTimer::startTimer)
287281
.def ("stopTimer", &MultiTimer::stopTimer)
288282
.def ("isTimerRunning", &MultiTimer::isTimerRunning)
289-
.def ("getTimerInterval", &MultiTimer::getTimerInterval)
290-
;
283+
.def ("getTimerInterval", &MultiTimer::getTimerInterval);
291284

292285
// ============================================================================================ initialiseYup_GUI
293286

294287
#if ! YUP_PYTHON_EMBEDDED_INTERPRETER
295288
static std::atomic_int numScopedInitInstances = 0;
296289

297-
if (numScopedInitInstances.fetch_add(1) == 0)
290+
if (numScopedInitInstances.fetch_add (1) == 0)
298291
{
299292
initialiseYup_GUI();
300293

301-
YUPApplicationBase::createInstance = +[]() -> YUPApplicationBase* { return nullptr; };
294+
YUPApplicationBase::createInstance = +[]() -> YUPApplicationBase*
295+
{
296+
return nullptr;
297+
};
302298

303299
#if YUP_MAC
304300
initialiseNSApplication();
305301
#endif
306302
}
307303

308304
#if 1
309-
py::cpp_function cleanupCallback ([](py::handle weakref)
305+
py::cpp_function cleanupCallback ([] (py::handle weakref)
310306
{
311-
if (numScopedInitInstances.fetch_sub(1) == 1)
307+
if (numScopedInitInstances.fetch_sub (1) == 1)
312308
shutdownYup_GUI();
313309

314310
weakref.dec_ref();
@@ -318,14 +314,14 @@ void registerYupEventsBindings (py::module_& m)
318314

319315
#else
320316
auto atexit = py::module_::import ("atexit");
321-
atexit.attr ("register") (py::cpp_function([]
317+
atexit.attr ("register") (py::cpp_function ([]
322318
{
323-
if (numScopedInitInstances.fetch_sub(1) == 1)
319+
if (numScopedInitInstances.fetch_sub (1) == 1)
324320
shutdownYup_GUI();
325321
}));
326322
327323
#endif
328324
#endif
329325
}
330326

331-
} // namespace popsicle::Bindings
327+
} // namespace yup::Bindings

‎modules/yup_python/bindings/yup_YupEvents_bindings.h‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,18 @@
2121

2222
#pragma once
2323

24-
#if !YUP_MODULE_AVAILABLE_yup_events
25-
#error This binding file requires adding the yup_events module in the project
24+
#if ! YUP_MODULE_AVAILABLE_yup_events
25+
#error This binding file requires adding the yup_events module in the project
2626
#else
27-
#include <yup_events/yup_events.h>
27+
#include <yup_events/yup_events.h>
2828
#endif
2929

3030
#include "../utilities/yup_PyBind11Includes.h"
3131

3232
#include <variant>
3333

34-
namespace yup::Bindings {
34+
namespace yup::Bindings
35+
{
3536

3637
// =================================================================================================
3738

0 commit comments

Comments
 (0)