From 88c7e729c4d35bd6c9f7748e5e19967782d434ae Mon Sep 17 00:00:00 2001
From: Gergely Mincsovics <gergely.mincsovics@yuda.nu>
Date: Sun, 27 Dec 2020 17:40:58 +0100
Subject: [PATCH] re: review - fix spaces and rename Absolute2

---
 src/axis.cpp      | 2 +-
 src/axis.h        | 6 +++---
 src/axis_edit.cpp | 4 ++--
 src/event.cpp     | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/axis.cpp b/src/axis.cpp
index 171445f..2751246 100644
--- a/src/axis.cpp
+++ b/src/axis.cpp
@@ -125,7 +125,7 @@ bool Axis::read( QTextStream &stream ) {
             absolute = false;
 	}
         else if (*it == "absolute") {
-	    interpretation = Absolute2; // to avoid name collision with a #define Absolute
+            interpretation = AbsolutePos;
             gradient = true;
             absolute = true;
 	}
diff --git a/src/axis.h b/src/axis.h
index f187bab..b10b822 100644
--- a/src/axis.h
+++ b/src/axis.h
@@ -22,7 +22,7 @@ class Axis : public QObject {
     Q_OBJECT
 
     //each axis can create a key press or move the mouse in one of four directions.
-    enum Interpretation { ZeroOne, Gradient, Absolute, Absolute2 = Absolute };
+    enum Interpretation { ZeroOne, Gradient, AbsolutePos };
     enum Mode {Keyboard, MousePosVert, MouseNegVert, MousePosHor, MouseNegHor};
     enum TransferCurve {Linear, Quadratic, Cubic, QuadraticExtreme,
                         PowerFunction};
@@ -77,9 +77,9 @@ class Axis : public QObject {
 		float inverseRange;
  
  		//actual axis settings:
-                Interpretation interpretation;
+ 		Interpretation interpretation;
  		bool gradient;
-                bool absolute;
+ 		bool absolute;
  		int maxSpeed; //0..MAXMOUSESPEED
 		unsigned int transferCurve;
 		float sensitivity;
diff --git a/src/axis_edit.cpp b/src/axis_edit.cpp
index 4dafe2a..816447a 100644
--- a/src/axis_edit.cpp
+++ b/src/axis_edit.cpp
@@ -26,7 +26,7 @@ AxisEdit::AxisEdit( Axis* ax )
     chkGradient = new QComboBox(this);
     chkGradient->insertItem((int) Axis::ZeroOne, tr("Use 0 or max always"), Qt::DisplayRole);
     chkGradient->insertItem((int) Axis::Gradient, tr("Relative movement (previously gradient)"), Qt::DisplayRole);
-    chkGradient->insertItem((int) Axis::Absolute, tr("Absolute movement (direct position)"), Qt::DisplayRole);
+    chkGradient->insertItem((int) Axis::AbsolutePos, tr("Absolute movement (direct position)"), Qt::DisplayRole);
     chkGradient->setCurrentIndex( axis->interpretation );
     connect(chkGradient, SIGNAL(activated(int)), this, SLOT( gradientChanged( int )));
     v2->addWidget(chkGradient);
@@ -179,7 +179,7 @@ void AxisEdit::throttleChanged( int index ) {
 void AxisEdit::accept() {
     axis->interpretation = (Axis::Interpretation)chkGradient->currentIndex(); 
     axis->gradient = axis->interpretation != Axis::ZeroOne;
-    axis->absolute = axis->interpretation == Axis::Absolute;
+    axis->absolute = axis->interpretation == Axis::AbsolutePos;
     axis->maxSpeed = spinSpeed->value();
     axis->transferCurve = (Axis::TransferCurve)cmbTransferCurve->currentIndex();
     axis->sensitivity = spinSensitivity->value();
diff --git a/src/event.cpp b/src/event.cpp
index 5be7f22..08d3a37 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -18,9 +18,9 @@ void sendevent(const FakeEvent &e) {
         if (e.move.x) rememberX = e.move.x;
         if (e.move.y) rememberY = e.move.y;
         const int scaledX100 = rememberX * (XWidthOfScreen(screen)/2) / 100;
-	const int scaledY100 = rememberY * (XHeightOfScreen(screen)/2) / 100;
-	XTestFakeMotionEvent(display, DefaultScreen(display),
-                             XWidthOfScreen(screen)/2 + scaledX100, 
+        const int scaledY100 = rememberY * (XHeightOfScreen(screen)/2) / 100;
+        XTestFakeMotionEvent(display, DefaultScreen(display),
+                             XWidthOfScreen(screen)/2 + scaledX100,
                              XHeightOfScreen(screen)/2 + scaledY100, 0);
         break;
       }