Skip to content

Commit 6cad130

Browse files
committed
Correct identified issues
1 parent ab2352d commit 6cad130

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

src/core/EntrySearcher.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ QList<QSharedPointer<EntrySearcher::SearchTerm> > EntrySearcher::parseSearchTerm
121121
auto results = m_termParser.globalMatch(searchString);
122122
while (results.hasNext()) {
123123
auto result = results.next();
124-
QSharedPointer<SearchTerm> term(new SearchTerm());
124+
auto term = QSharedPointer<SearchTerm>::create();
125125

126126
// Quoted string group
127127
term->word = result.captured(3);

src/core/EntrySearcher.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class EntrySearcher
3939
private:
4040
bool searchEntryImpl(const QString& searchString, Entry* entry);
4141

42-
enum Field {
42+
enum class Field {
4343
Undefined,
4444
Title,
4545
Username,

src/core/Tools.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,6 @@ QRegularExpression convertToRegex(const QString& string, bool useWildcards, bool
357357
// Wildcard support (*, ?, |)
358358
if (useWildcards) {
359359
pattern.replace(regexEscape, "\\\\1");
360-
pattern.replace("**", "*");
361360
pattern.replace("*", ".*");
362361
pattern.replace("?", ".");
363362
}

tests/TestEntrySearcher.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -144,31 +144,31 @@ void TestEntrySearcher::testSearchTermParser()
144144

145145
QCOMPARE(terms.length(), 5);
146146

147-
QCOMPARE(terms[0]->field, EntrySearcher::Undefined);
147+
QCOMPARE(terms[0]->field, EntrySearcher::Field::Undefined);
148148
QCOMPARE(terms[0]->word, QString("test"));
149149
QCOMPARE(terms[0]->exclude, true);
150150

151-
QCOMPARE(terms[1]->field, EntrySearcher::Undefined);
151+
QCOMPARE(terms[1]->field, EntrySearcher::Field::Undefined);
152152
QCOMPARE(terms[1]->word, QString("quoted \\\"string\\\""));
153153
QCOMPARE(terms[1]->exclude, false);
154154

155-
QCOMPARE(terms[2]->field, EntrySearcher::Username);
155+
QCOMPARE(terms[2]->field, EntrySearcher::Field::Username);
156156
QCOMPARE(terms[2]->word, QString("user"));
157157

158-
QCOMPARE(terms[3]->field, EntrySearcher::Password);
158+
QCOMPARE(terms[3]->field, EntrySearcher::Field::Password);
159159
QCOMPARE(terms[3]->word, QString("test me"));
160160

161-
QCOMPARE(terms[4]->field, EntrySearcher::Undefined);
161+
QCOMPARE(terms[4]->field, EntrySearcher::Field::Undefined);
162162
QCOMPARE(terms[4]->word, QString("noquote"));
163163

164164
// Test wildcard and regex search terms
165165
terms = m_entrySearcher.parseSearchTerms("+url:*.google.com *user:\\d+\\w{2}");
166166

167167
QCOMPARE(terms.length(), 2);
168168

169-
QCOMPARE(terms[0]->field, EntrySearcher::Url);
169+
QCOMPARE(terms[0]->field, EntrySearcher::Field::Url);
170170
QCOMPARE(terms[0]->regex.pattern(), QString("^.*\\.google\\.com$"));
171171

172-
QCOMPARE(terms[1]->field, EntrySearcher::Username);
172+
QCOMPARE(terms[1]->field, EntrySearcher::Field::Username);
173173
QCOMPARE(terms[1]->regex.pattern(), QString("\\d+\\w{2}"));
174174
}

0 commit comments

Comments
 (0)