Running astyle.

src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp

@@ -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);
 	}

src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.cpp

@@ -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);
 		}
 	}

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 setLastFilterStateCountry( bool country ) {
-	void setLastFilterStateAlpha( bool alpha ) { lastFilterStateAlpha = alpha;}
+		lastFilterStateCountry = country;
+	}
+	void setLastFilterStateAlpha( bool alpha ) {
+		lastFilterStateAlpha = alpha;
+	}
 
 protected:
 	bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;

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);