diff --git a/src/IncrementalSearchBar.cpp b/src/IncrementalSearchBar.cpp
index da4f88cae15f518c51bc2802dd90562d8a7f31aa..a3a9576e99f0a881983641cdac8baee2befedf6e 100644
--- a/src/IncrementalSearchBar.cpp
+++ b/src/IncrementalSearchBar.cpp
@@ -267,7 +267,7 @@ void IncrementalSearchBar::focusLineEdit()
 
 const QBitArray IncrementalSearchBar::optionsChecked()
 {
-    QBitArray options(4, 0);
+    QBitArray options(4, false);
 
     if (_caseSensitive->isChecked()) options.setBit(MatchCase);
     if (_regExpression->isChecked()) options.setBit(RegExp);
diff --git a/src/Screen.cpp b/src/Screen.cpp
index b3d513fecdddf63a340f2b59f53b0ac6ec69b06b..e7e820ee45ed68fec5022e2414154b149c2bbbfd 100644
--- a/src/Screen.cpp
+++ b/src/Screen.cpp
@@ -241,7 +241,7 @@ void Screen::insertLines(int n)
 
 void Screen::setMode(int m)
 {
-    _currentModes[m] = true;
+    _currentModes[m] = 1;
     switch (m) {
     case MODE_Origin :
         _cuX = 0;
@@ -252,7 +252,7 @@ void Screen::setMode(int m)
 
 void Screen::resetMode(int m)
 {
-    _currentModes[m] = false;
+    _currentModes[m] = 0;
     switch (m) {
     case MODE_Origin :
         _cuX = 0;
@@ -273,7 +273,7 @@ void Screen::restoreMode(int m)
 
 bool Screen::getMode(int m) const
 {
-    return _currentModes[m];
+    return _currentModes[m] != 0;
 }
 
 void Screen::saveCursor()
@@ -511,8 +511,8 @@ void Screen::reset()
     scrollUp(0, _cuY);
     _cuY = 0;
 
-    _currentModes[MODE_Origin] = false;
-    _savedModes[MODE_Origin] = false;
+    _currentModes[MODE_Origin] = 0;
+    _savedModes[MODE_Origin] = 0;
 
     setMode(MODE_Wrap);
     saveMode(MODE_Wrap);      // wrap at end of margin
diff --git a/src/Vt102Emulation.h b/src/Vt102Emulation.h
index 6008ced3fc2573496ca4113ccd8ba706a6551574..784bc348e889b0984df30f4f97c3e5e9d6c39a30 100644
--- a/src/Vt102Emulation.h
+++ b/src/Vt102Emulation.h
@@ -171,7 +171,7 @@ private:
     public:
         // Initializes all modes to false
         TerminalState() {
-            memset(&mode, false, MODE_total * sizeof(bool));
+            memset(&mode, 0, MODE_total * sizeof(bool));
         }
 
         bool mode[MODE_total];