Merge remote-tracking branch 'origin/master'

This commit is contained in:
doitux
2012-12-22 19:08:35 +01:00
9 changed files with 36 additions and 21 deletions
@@ -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()) {
@@ -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()) {
@@ -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()) {
@@ -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()) {
@@ -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()) {
@@ -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()) {