Merge dev-common and various fixes to achieve compilation

- merged changes from dev-common
- fixed many compilation errors (CBrain, UI, ...)
- temporarily commented out some problematic code (e.g. input bindings)
- (partially) fixed #include styling
- everything compiles except for CRobotMain, CMainDialog and CStudio

1 files changed, 4 insertions, 1 deletions

diff --git a/src/ui/key.cpp b/src/ui/key.cpp
index 89473a8..77c17b0 100644
--- a/src/ui/key.cpp
+++ b/src/ui/key.cpp
@@ -20,6 +20,8 @@
 
 #include <ui/key.h>
 
+#include <string.h>
+
 namespace Ui {
 
 void GetKeyName(char *name, int key)
@@ -116,6 +118,7 @@ bool CKey::TestKey(int key)
 {
     if ( key == KEY(PAUSE) || key == KEY(PRINT) )  return true;  // blocked key
 
+    /* TODO: input bindings
     for (int i = 0; i < 20; i++) {
         for (int j = 0; j < 2; j++) {
             if (key == m_app->GetKey(i, j) )  // key used?
@@ -126,7 +129,7 @@ bool CKey::TestKey(int key)
             m_app->SetKey(i, 0, m_app->GetKey(i, 1));  // shift
             m_app->SetKey(i, 1, 0);
         }
-    }
+    }*/
 
     return false;  // not used
 }