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
a26d4078
Commit
a26d4078
authored
Oct 14, 2014
by
Gavin Bisesi
Browse files
Revert "Find cards by prefix"
parent
ca60a469
Changes
2
Show whitespace changes
Inline
Side-by-side
cockatrice/src/carddatabase.cpp
View file @
a26d4078
...
...
@@ -770,30 +770,11 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml, bool tokens)
}
}
CardInfo
*
CardNameMap
::
findByPrefix
(
const
std
::
string
&
prefix
)
{
int
count
=
0
;
CardInfo
*
found
;
for
(
CardNameMap
::
iterator
it
=
this
->
begin
();
it
!=
this
->
end
();
++
it
)
{
if
(
std
::
mismatch
(
prefix
.
begin
(),
prefix
.
end
(),
it
.
key
().
toStdString
().
begin
()).
first
==
prefix
.
end
())
{
count
++
;
found
=
it
.
value
();
}
}
return
(
count
==
1
?
found
:
NULL
);
}
CardInfo
*
CardDatabase
::
getCardFromMap
(
CardNameMap
&
cardMap
,
const
QString
&
cardName
,
bool
createIfNotFound
)
{
CardInfo
*
foundCard
;
if
(
cardName
.
isEmpty
())
return
noCard
;
else
if
(
cardMap
.
contains
(
cardName
))
return
cardMap
.
value
(
cardName
);
else
if
((
foundCard
=
cardMap
.
findByPrefix
(
cardName
.
toStdString
())))
return
foundCard
;
else
if
(
createIfNotFound
)
{
CardInfo
*
newCard
=
new
CardInfo
(
this
,
cardName
,
true
);
newCard
->
addToSet
(
getSet
(
"TK"
));
...
...
cockatrice/src/carddatabase.h
View file @
a26d4078
...
...
@@ -180,13 +180,7 @@ signals:
enum
LoadStatus
{
Ok
,
VersionTooOld
,
Invalid
,
NotLoaded
,
FileError
,
NoCards
};
class
CardNameMap
:
public
QHash
<
QString
,
CardInfo
*>
{
public:
CardInfo
*
findByPrefix
(
const
std
::
string
&
prefix
);
};
typedef
QHash
<
QString
,
CardInfo
*>
CardNameMap
;
typedef
QHash
<
QString
,
CardSet
*>
SetNameMap
;
class
CardDatabase
:
public
QObject
{
...
...
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