sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Running astyle.

Browse Source
This commit is contained in:
lotodore
2012-12-21 01:01:01 +01:00
parent 7503b1754e
commit d3cd97c666
63 changed files with 4437 additions and 4448 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+1547 -1547
View File
File diff suppressed because it is too large Load Diff
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h
+2 -2
View File
@@ -164,8 +164,8 @@ private:
CountryStringMap countryStringMap;
QString myAppDataPath;
MyMessageBox *waitStartGameMsgBox;
MyMessageBox *waitRejoinStartGameMsgBox;
MyMessageBox *waitStartGameMsgBox;
MyMessageBox *waitRejoinStartGameMsgBox;
myMessageDialogImpl *inviteOnlyInfoMsgBox;
QTimer *waitStartGameMsgBoxTimer;
QTimer *blinkingButtonAnimationTimer;
src/gui/qt/gamelobbydialog/mygamelistsortfilterproxymodel.cpp
+23 -23
View File
@@ -20,40 +20,40 @@
#include <QtCore>
MyGameListSortFilterProxyModel::MyGameListSortFilterProxyModel(QObject *parent)
: QSortFilterProxyModel(parent)
: QSortFilterProxyModel(parent)
{
}
bool MyGameListSortFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
{
QModelIndex index0 = sourceModel()->index(sourceRow, 0, sourceParent);
QModelIndex index1 = sourceModel()->index(sourceRow, 1, sourceParent);
QModelIndex index2 = sourceModel()->index(sourceRow, 2, sourceParent);
QModelIndex index3 = sourceModel()->index(sourceRow, 3, sourceParent);
QModelIndex index4 = sourceModel()->index(sourceRow, 4, sourceParent);
QModelIndex index5 = sourceModel()->index(sourceRow, 5, sourceParent);
QModelIndex index0 = sourceModel()->index(sourceRow, 0, sourceParent);
QModelIndex index1 = sourceModel()->index(sourceRow, 1, sourceParent);
QModelIndex index2 = sourceModel()->index(sourceRow, 2, sourceParent);
QModelIndex index3 = sourceModel()->index(sourceRow, 3, sourceParent);
QModelIndex index4 = sourceModel()->index(sourceRow, 4, sourceParent);
QModelIndex index5 = sourceModel()->index(sourceRow, 5, sourceParent);
return ((sourceModel()->data(index1, 16).toString().contains(column1RegExp)
&& sourceModel()->data(index2, 16).toString().contains(column2RegExp)
&& sourceModel()->data(index3, 16).toString().contains(column3RegExp)
&& sourceModel()->data(index4, 16).toString().contains(column4RegExp)
&& sourceModel()->data(index5, 16).toString().contains(column5RegExp)) || sourceModel()->data(index0, 16) == "MeInThisGame");
return ((sourceModel()->data(index1, 16).toString().contains(column1RegExp)
&& sourceModel()->data(index2, 16).toString().contains(column2RegExp)
&& sourceModel()->data(index3, 16).toString().contains(column3RegExp)
&& sourceModel()->data(index4, 16).toString().contains(column4RegExp)
&& sourceModel()->data(index5, 16).toString().contains(column5RegExp)) || sourceModel()->data(index0, 16) == "MeInThisGame");
}
bool MyGameListSortFilterProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
{
switch(sortColumn()) {
switch(sortColumn()) {
case 5: {
return sourceModel()->data(left, 16).toString() < sourceModel()->data(right, 16).toString();
}
break;
default: {
return QSortFilterProxyModel::lessThan(left, right);
}
break;
}
case 5: {
return sourceModel()->data(left, 16).toString() < sourceModel()->data(right, 16).toString();
}
break;
default: {
return QSortFilterProxyModel::lessThan(left, right);
}
break;
}
return false;
return false;
}
src/gui/qt/gamelobbydialog/mygamelistsortfilterproxymodel.h
+5 -5
View File
@@ -38,20 +38,20 @@ public:
void setColumn4RegExp(QRegExp column4) {
column4RegExp = column4;
}
void setColumn5RegExp(QRegExp column5) {
column5RegExp = column5;
}
void setColumn5RegExp(QRegExp column5) {
column5RegExp = column5;
}
protected:
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
bool lessThan(const QModelIndex &left, const QModelIndex &right) const;
bool lessThan(const QModelIndex &left, const QModelIndex &right) const;
private:
QRegExp column1RegExp;
QRegExp column2RegExp;
QRegExp column3RegExp;
QRegExp column4RegExp;
QRegExp column5RegExp;
QRegExp column5RegExp;
};