Mercurial > octave
diff libgui/graphics/Object.h @ 33599:7f18c537e101
maint: Update Qt macros to avoid name collisions
It is a known problem with Qt that terms like "signals", "slots", and "emit"
can conflict with other libraries using those identifiers. So far, Octave
has not had that problem, but to allow for potential future use of third-party
libraries, especially the C++17 STL's parallelization functions, these terms
are being updated to their Qt-specific collision-safe versions.
Discussion: https://octave.discourse.group/t/updating-qt-macro-names-to-avoid-name-collisions/5627
and discussions linked therein.
This patch makes the following changes through the part of the Octave codebase
using Qt:
* signals --> Q_SIGNALS
* slots --> Q_SLOTS
* emit --> Q_EMIT
The above changes were guided and verified by passing "-DQT_NO_KEYWORDS"
to CXXFLAGS when building Octave.
author | Arun Giridhar <arungiridhar@gmail.com> |
---|---|
date | Fri, 17 May 2024 19:49:10 -0400 |
parents | 2e484f9f1f18 |
children |
line wrap: on
line diff
--- a/libgui/graphics/Object.h Sat May 18 10:41:40 2024 -0400 +++ b/libgui/graphics/Object.h Fri May 17 19:49:10 2024 -0400 @@ -86,7 +86,7 @@ virtual void do_connections (const QObject *receiver, const QObject *emitter = nullptr); -signals: +Q_SIGNALS: void interpreter_event (const octave::fcn_callback& fcn); void interpreter_event (const octave::meth_callback& meth); @@ -106,7 +106,7 @@ const octave_value& value, bool notify_toolkit, bool redraw_figure); -public slots: +public Q_SLOTS: void slotUpdate (int pId); void slotFinalize (); void slotRedraw ();