From 295610fbf9f5d5542cf6725ed632c6f8ffd9e3a7 Mon Sep 17 00:00:00 2001 From: lotodore Date: Sat, 3 Mar 2012 14:24:00 +0000 Subject: [PATCH] Running astyle. --- src/gui/qt/chattools/chattools.cpp | 14 +++++++------- src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp | 5 ++--- .../mynicklistsortfilterproxymodel.cpp | 5 ++--- .../mynicklistsortfilterproxymodel.h | 8 ++++++-- src/gui/qt/gametable/log/guilog.h | 4 +++- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/gui/qt/chattools/chattools.cpp b/src/gui/qt/chattools/chattools.cpp index 56f87252..78eec464 100644 --- a/src/gui/qt/chattools/chattools.cpp +++ b/src/gui/qt/chattools/chattools.cpp @@ -69,7 +69,7 @@ void ChatTools::receiveMessage(QString playerName, QString message, bool pm) if(myTextBrowser) { message = message.replace("<","<"); - message = message.replace(">",">"); + message = message.replace(">",">"); //doing the links message = message.replace(QRegExp("((?:https?)://\\S+)"), "\\1"); @@ -103,8 +103,8 @@ void ChatTools::receiveMessage(QString playerName, QString message, bool pm) case INGAME_CHAT: { message = message.replace("getChatLogTextColor()+"; text-decoration: underline;\" href"); tempMsg = QString("getChatTextNickNotifyColor()+";\">"+message+""); - } - break; + } + break; default: tempMsg = message; } @@ -119,8 +119,8 @@ void ChatTools::receiveMessage(QString playerName, QString message, bool pm) case INGAME_CHAT: { message = message.replace("getChatTextNickNotifyColor()+"; text-decoration: underline;\" href"); tempMsg = QString("getChatLogTextColor()+";\">"+message+""); - } - break; + } + break; default: tempMsg = message; } @@ -135,8 +135,8 @@ void ChatTools::receiveMessage(QString playerName, QString message, bool pm) case INGAME_CHAT: { message = message.replace("getChatTextNickNotifyColor()+"; text-decoration: underline;\" href"); tempMsg = QString("getChatLogTextColor()+";\">"+message+""); - } - break; + } + break; default: tempMsg = message; } diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index df7bfb2f..a6fa4180 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -32,7 +32,7 @@ using namespace std; gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c) -: QDialog(parent), myW(NULL), myStartWindow(parent), myConfig(c), currentGameName(""), myPlayerId(0), isGameAdministrator(false), inGame(false), guestMode(false), blinkingButtonAnimationState(true), myChat(NULL), keyUpCounter(0), infoMsgToShowId(0), currentInvitationGameId(0), inviteDialogIsCurrentlyShown(false), autoStartTimerCounter(0), lastNickListFilterState(0) + : QDialog(parent), myW(NULL), myStartWindow(parent), myConfig(c), currentGameName(""), myPlayerId(0), isGameAdministrator(false), inGame(false), guestMode(false), blinkingButtonAnimationState(true), myChat(NULL), keyUpCounter(0), infoMsgToShowId(0), currentInvitationGameId(0), inviteDialogIsCurrentlyShown(false), autoStartTimerCounter(0), lastNickListFilterState(0) { #ifdef __APPLE__ @@ -1498,8 +1498,7 @@ void gameLobbyDialogImpl::changeNickListFilter(int state) if(lastNickListFilterState == 0) { myNickListSortFilterProxyModel->setLastFilterStateCountry(false); myNickListSortFilterProxyModel->setLastFilterStateAlpha(true); - } - else if(lastNickListFilterState == 1) { + } else if(lastNickListFilterState == 1) { myNickListSortFilterProxyModel->setLastFilterStateCountry(true); myNickListSortFilterProxyModel->setLastFilterStateAlpha(false); } diff --git a/src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.cpp b/src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.cpp index 189b3118..02efe093 100644 --- a/src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.cpp +++ b/src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.cpp @@ -20,7 +20,7 @@ #include MyNickListSortFilterProxyModel::MyNickListSortFilterProxyModel(QObject *parent) -: QSortFilterProxyModel(parent), filterState(0), lastFilterStateCountry(false), lastFilterStateAlpha(true) + : QSortFilterProxyModel(parent), filterState(0), lastFilterStateCountry(false), lastFilterStateAlpha(true) { } @@ -67,8 +67,7 @@ bool MyNickListSortFilterProxyModel::lessThan(const QModelIndex &left, const QMo QString leftCountryAndName(sourceModel()->data(left, 33).toString().toUpper()+sourceModel()->data(left, Qt::DisplayRole).toString().toLower()); QString rightCountryAndName(sourceModel()->data(right, 33).toString().toUpper()+sourceModel()->data(right, Qt::DisplayRole).toString().toLower()); return leftCountryAndName < rightCountryAndName; - } - else if(lastFilterStateAlpha) { + } else if(lastFilterStateAlpha) { return QSortFilterProxyModel::lessThan(left, right); } } diff --git a/src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.h b/src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.h index 3184d6e7..6aab904f 100644 --- a/src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.h +++ b/src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.h @@ -28,8 +28,12 @@ public: MyNickListSortFilterProxyModel(QObject *parent = 0); void setFilterState(int state); - void setLastFilterStateCountry( bool country ) { lastFilterStateCountry = country;} - void setLastFilterStateAlpha( bool alpha ) { lastFilterStateAlpha = alpha;} + void setLastFilterStateCountry( bool country ) { + lastFilterStateCountry = country; + } + void setLastFilterStateAlpha( bool alpha ) { + lastFilterStateAlpha = alpha; + } protected: bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const; diff --git a/src/gui/qt/gametable/log/guilog.h b/src/gui/qt/gametable/log/guilog.h index a8a55061..0099ef04 100644 --- a/src/gui/qt/gametable/log/guilog.h +++ b/src/gui/qt/gametable/log/guilog.h @@ -78,7 +78,9 @@ public: void setMySqliteLogFileName(std::string theValue) { mySqliteLogFileName = theValue; } - std::string getMySqliteLogFileName() { return mySqliteLogFileName; } + std::string getMySqliteLogFileName() { + return mySqliteLogFileName; + } signals: void signalLogPlayerActionMsg(QString playerName, int action, int setValue);