manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added 'inline' to the newly added qt event translator helpers

This commit is contained in:
Paolo Cignoni 2013-12-13 09:29:13 +00:00
parent fc047dbe3f
commit 999d442dda
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wrap/qt/trackball.h
View File

@ -19,12 +19,6 @@
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) *
* for more details. * * for more details. *
* * * *
****************************************************************************/
/****************************************************************************
History
$Log: trackball.h,v $
****************************************************************************/ ****************************************************************************/
#ifndef QT_TRACKBALL_H #ifndef QT_TRACKBALL_H
@ -34,7 +28,7 @@ $Log: trackball.h,v $
/// into the expected framebuffer coordinates (e.g.in opengl pixels) /// into the expected framebuffer coordinates (e.g.in opengl pixels)
/// This is necessary because trackball works in the viewport coord systems. /// This is necessary because trackball works in the viewport coord systems.
float QT2VCG_X( QWidget *qw, QMouseEvent *e) inline float QT2VCG_X( QWidget *qw, QMouseEvent *e)
{ {
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
return e->x ()*qw->devicePixelRatio() ; return e->x ()*qw->devicePixelRatio() ;
@ -48,7 +42,7 @@ float QT2VCG_X( QWidget *qw, QMouseEvent *e)
/// into the expected framebuffer coordinates (e.g.in opengl pixels) /// into the expected framebuffer coordinates (e.g.in opengl pixels)
/// This is necessary because trackball works in the viewport coord systems. /// This is necessary because trackball works in the viewport coord systems.
float QT2VCG_Y( QWidget *qw, QMouseEvent *e) inline float QT2VCG_Y( QWidget *qw, QMouseEvent *e)
{ {
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
return (qw->height () - e->y ())*qw->devicePixelRatio() ; return (qw->height () - e->y ())*qw->devicePixelRatio() ;
@ -58,7 +52,7 @@ float QT2VCG_Y( QWidget *qw, QMouseEvent *e)
} }
/// Takes a QT MouseButton, some QT KeyboardModifiers and returns the equivalent Trackball::Button /// Takes a QT MouseButton, some QT KeyboardModifiers and returns the equivalent Trackball::Button
vcg::Trackball::Button QT2VCG (Qt::MouseButton qtbt, Qt::KeyboardModifiers modifiers) inline vcg::Trackball::Button QT2VCG (Qt::MouseButton qtbt, Qt::KeyboardModifiers modifiers)
{ {
int vcgbt = vcg::Trackball::BUTTON_NONE; int vcgbt = vcg::Trackball::BUTTON_NONE;