Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
86bbf75d
Commit
86bbf75d
authored
Jan 22, 2015
by
Matt Lowe
Browse files
refactorings #2
+ removed static from enum + removed condition check for user level
parent
8ac58259
Changes
1
Show whitespace changes
Inline
Side-by-side
cockatrice/src/gamesmodel.cpp
View file @
86bbf75d
...
@@ -8,8 +8,7 @@
...
@@ -8,8 +8,7 @@
#include
<QSettings>
#include
<QSettings>
#include
<QCryptographicHash>
#include
<QCryptographicHash>
static
const
enum
{
ROOM
,
CREATED
,
DESCRIPTION
,
CREATOR
,
GAME_TYPE
,
RESTRICTIONS
,
PLAYERS
,
SPECTATORS
};
const
enum
GameListColumn
{
ROOM
,
CREATED
,
DESCRIPTION
,
CREATOR
,
GAME_TYPE
,
RESTRICTIONS
,
PLAYERS
,
SPECTATORS
};
static
const
enum
{
UNREGISTERED
,
REGISTERED
};
namespace
{
namespace
{
const
unsigned
SECS_PER_MIN
=
60
;
const
unsigned
SECS_PER_MIN
=
60
;
...
@@ -115,16 +114,10 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
...
@@ -115,16 +114,10 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
case
SORT_ROLE
:
case
SORT_ROLE
:
case
Qt
::
DisplayRole
:
case
Qt
::
DisplayRole
:
return
QString
::
fromStdString
(
g
.
creator_info
().
name
());
return
QString
::
fromStdString
(
g
.
creator_info
().
name
());
case
Qt
::
DecorationRole
:
case
Qt
::
DecorationRole
:
{
switch
(
g
.
creator_info
().
user_level
())
{
case
UNREGISTERED
:
case
REGISTERED
:{
QPixmap
avatarPixmap
=
UserLevelPixmapGenerator
::
generatePixmap
(
13
,
(
UserLevelFlags
)
g
.
creator_info
().
user_level
());
QPixmap
avatarPixmap
=
UserLevelPixmapGenerator
::
generatePixmap
(
13
,
(
UserLevelFlags
)
g
.
creator_info
().
user_level
());
return
QIcon
(
avatarPixmap
);
return
QIcon
(
avatarPixmap
);
}
}
default:
break
;
}
default:
default:
return
QVariant
();
return
QVariant
();
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment