3 files changed, 6 insertions, 18 deletions
diff --git a/kmousetool/kmousetool/Xmd_kmousetool.h b/kmousetool/kmousetool/Xmd_kmousetool.h
index 2a35eb8..7e22fd1 100644
--- a/kmousetool/kmousetool/Xmd_kmousetool.h
+++ b/kmousetool/kmousetool/Xmd_kmousetool.h
@@ -146,18 +146,6 @@ typedef unsigned char  CARD8;
 typedef CARD32		BITS32;
 typedef CARD16		BITS16;
 
-#ifndef __EMX__
-typedef CARD8		BYTE;
-typedef CARD8           BOOL;
-#else /* __EMX__ */
-/*
- * This is bad style, but the central include file <os2.h> declares them
- * as well
- */
-#define BYTE		CARD8
-#define BOOL		CARD8
-#endif /* __EMX__ */
-
 /*
  * definitions for sign-extending bitfields on 64-bit architectures
  */
diff --git a/kmousetool/kmousetool/kmousetool.cpp b/kmousetool/kmousetool/kmousetool.cpp
index 728ffaf..a165860 100644
--- a/kmousetool/kmousetool/kmousetool.cpp
+++ b/kmousetool/kmousetool/kmousetool.cpp
@@ -85,10 +85,10 @@ Display *display;
 
 void KMouseTool::init_vars()
 {
-	continue_timer = 1;
+	continue_timer = true;
 	tick_count = 0;
 	max_ticks = dwell_time+1;
-	mouse_is_down = FALSE;
+	mouse_is_down = false;
 
 	loadOptions();
 
@@ -202,13 +202,13 @@ void KMouseTool::normalClick()
 	if (smart_drag_on) {
 		if (!mouse_is_down) {
 			LeftDn();
-			mouse_is_down = TRUE;
+			mouse_is_down = true;
 			tick_count = 0;
 			playTickSound();
 		}
 		else if (mouse_is_down) {
 			LeftUp();
-			mouse_is_down = FALSE;
+			mouse_is_down = false;
 			tick_count = max_ticks;
 		}
 	}
diff --git a/kmousetool/kmousetool/kmousetool.h b/kmousetool/kmousetool/kmousetool.h
index 303520f..16f7ca3 100644
--- a/kmousetool/kmousetool/kmousetool.h
+++ b/kmousetool/kmousetool/kmousetool.h
@@ -61,8 +61,8 @@ private:
 	MTStroke stroke;
 
 	// boolean flags to keep track of program states
-	int mouse_is_down;
-	int continue_timer;
+	bool mouse_is_down;
+	bool continue_timer;
 	int tick_count;
 	int dwell_time;
 	int drag_time;