summaryrefslogtreecommitdiffhomepage
path: root/logic
diff options
context:
space:
mode:
Diffstat (limited to 'logic')
-rw-r--r--logic/pipeline.cpp2
-rw-r--r--logic/win32-shortcuts.cpp2
-rw-r--r--logic/win32-shortcuts.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/logic/pipeline.cpp b/logic/pipeline.cpp
index bf264315..c8cdc72d 100644
--- a/logic/pipeline.cpp
+++ b/logic/pipeline.cpp
@@ -248,7 +248,7 @@ static cc_forceinline bool nan_check_(const x& datum, const y& next, const xs&..
static cc_noinline
void emit_nan_check_msg(const char* text, const char* fun, int line)
{
- once_only(
+ eval_once(
qDebug() << "nan check failed"
<< "for:" << text
<< "function:" << fun
diff --git a/logic/win32-shortcuts.cpp b/logic/win32-shortcuts.cpp
index 170d16fe..11764807 100644
--- a/logic/win32-shortcuts.cpp
+++ b/logic/win32-shortcuts.cpp
@@ -119,7 +119,7 @@ static const win_key windows_key_sequences[] {
{ DIK_PAUSE, Qt::Key_Pause},
{ DIK_NUMLOCK, Qt::Key_NumLock},
{ DIK_CAPSLOCK, Qt::Key_CapsLock},
-#define mod(x, y) static_cast<Qt::Key>((x) | (y))
+#define mod(x, y) Qt::Key(int(x) | int((y)))
{ DIK_NUMPAD0, mod(Qt::Key_0, Qt::KeypadModifier)},
{ DIK_NUMPAD0, mod(Qt::Key_0, Qt::KeypadModifier)},
{ DIK_NUMPAD1, mod(Qt::Key_1, Qt::KeypadModifier)},
diff --git a/logic/win32-shortcuts.h b/logic/win32-shortcuts.h
index 8cd6bdc9..437d251a 100644
--- a/logic/win32-shortcuts.h
+++ b/logic/win32-shortcuts.h
@@ -10,7 +10,7 @@
struct OTR_LOGIC_EXPORT win_key
{
- win_key(int win, Qt::Key qt) : win(win), qt(qt) {}
+ //win_key(int win, Qt::Key qt) : win(win), qt(qt) {}
int win;
Qt::Key qt;
static bool from_qt(QKeySequence qt_, int& dik, Qt::KeyboardModifiers &mods);