Added QT_NO_KEYWORDS definition to avoid conflicts between boost and qt macros

This commit is contained in:
matlabbe
2018-06-15 12:17:11 -04:00
parent c6d893bc98
commit dfcd7ae1a8
44 changed files with 153 additions and 152 deletions

View File

@@ -2908,7 +2908,7 @@ void CloudViewer::keyPressEvent(QKeyEvent * event)
update();
emit configChanged();
Q_EMIT configChanged();
}
else
{
@@ -2966,7 +2966,7 @@ void CloudViewer::mouseMoveEvent(QMouseEvent * event)
}
this->update();
emit configChanged();
Q_EMIT configChanged();
}
void CloudViewer::wheelEvent(QWheelEvent * event)
@@ -2978,7 +2978,7 @@ void CloudViewer::wheelEvent(QWheelEvent * event)
_visualizer->getCameras(cameras);
_lastCameraPose = cv::Vec3d(cameras.front().pos);
}
emit configChanged();
Q_EMIT configChanged();
}
void CloudViewer::contextMenuEvent(QContextMenuEvent * event)
@@ -2987,7 +2987,7 @@ void CloudViewer::contextMenuEvent(QContextMenuEvent * event)
if(a)
{
handleAction(a);
emit configChanged();
Q_EMIT configChanged();
}
}