Merge remote-tracking branch 'origin/master'

src/game_defs.h

@@ -103,6 +103,19 @@ enum PlayerActionLog {
 	LOG_ACTION_JOIN			// has joined the game
 };
 
+enum LogUploadErrorCode {
+	ERROR_NO_FILE = 1,
+	ERROR_OPEN_DB = 2,
+	ERROR_MAX_NUM_TOTAL = 3,
+	ERROR_MAX_NUM_IP = 4,
+	ERROR_FILE_SIZE = 5,
+	ERROR_FILE_EXT = 6,
+	ERROR_FILE_HEAD = 7,
+	ERROR_ID = 8,
+	ERROR_FILE_MOVE = 9,
+	ERROR_INSERT_DB = 10
+};
+
 enum DenyKickPlayerReason {
 	KICK_DENIED_INVALID_STATE = 0,
 	KICK_DENIED_TOO_FEW_PLAYERS,

src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp

@@ -97,9 +97,9 @@ void changeCompleteBlindsDialogImpl::sortBlindsList()
 
 bool changeCompleteBlindsDialogImpl::eventFilter(QObject *obj, QEvent *event)
 {
+#ifdef ANDROID
 	QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
 
-#ifdef ANDROID
 	//androi changes for return key behavior (hopefully useless from necessitas beta2)
 	if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) {
 		if(spinBox_afterThisAlwaysRaiseValue->hasFocus()) {

src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp

@@ -113,9 +113,9 @@ void changeContentDialogImpl::saveContent()
 
 bool changeContentDialogImpl::eventFilter(QObject *obj, QEvent *event)
 {
+#ifdef ANDROID
 	QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
 
-#ifdef ANDROID
 	//androi changes for return key behavior (hopefully useless from necessitas beta2)
 	if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) {
 		if(lineEdit->hasFocus()) {

src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp

@@ -235,9 +235,9 @@ void createInternetGameDialogImpl::gameTypeChanged()
 
 bool createInternetGameDialogImpl::eventFilter(QObject *obj, QEvent *event)
 {
+#ifdef ANDROID
 	QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
 
-#ifdef ANDROID
 	//androi changes for return key behavior (hopefully useless from necessitas beta2)
 	if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) {
 		if(spinBox_startCash->hasFocus()) {

src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp

@@ -132,9 +132,9 @@ void createNetworkGameDialogImpl::callChangeBlindsDialog(bool show)
 
 bool createNetworkGameDialogImpl::eventFilter(QObject *obj, QEvent *event)
 {
+#ifdef ANDROID
 	QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
 
-#ifdef ANDROID
 	//androi changes for return key behavior (hopefully useless from necessitas beta2)
 	if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) {
 		if(spinBox_startCash ->hasFocus()) {

src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp

@@ -152,9 +152,9 @@ void internetGameLoginDialogImpl::okButtonCheck()
 
 bool internetGameLoginDialogImpl::eventFilter(QObject *obj, QEvent *event)
 {
+#ifdef ANDROID
 	QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
 
-#ifdef ANDROID
 	//androi changes for return key behavior (hopefully useless from necessitas beta2)
 	if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) {
 		if(lineEdit_username->hasFocus()) {

src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp

@@ -84,9 +84,9 @@ void newGameDialogImpl::callChangeBlindsDialog(bool show)
 
 bool newGameDialogImpl::eventFilter(QObject *obj, QEvent *event)
 {
+#ifdef ANDROID
 	QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
 
-#ifdef ANDROID
 	//androi changes for return key behavior (hopefully useless from necessitas beta2)
 	if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) {
 		if(spinBox_gameSpeed->hasFocus()) {