Correct identified issues

keepassxreboot · Oct 9, 2018 · 3b993ef · 3b993ef
1 parent 7553c54
commit 3b993ef
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/src/core/EntrySearcher.cpp b/src/core/EntrySearcher.cpp
@@ -121,7 +121,7 @@ QList<QSharedPointer<EntrySearcher::SearchTerm> > EntrySearcher::parseSearchTerm
     auto results = m_termParser.globalMatch(searchString);
     while (results.hasNext()) {
         auto result = results.next();
-        QSharedPointer<SearchTerm> term(new SearchTerm());
+        auto term = QSharedPointer<SearchTerm>::create();
 
         // Quoted string group
         term->word = result.captured(3);

diff --git a/src/core/EntrySearcher.h b/src/core/EntrySearcher.h
@@ -39,7 +39,7 @@ class EntrySearcher
 private:
     bool searchEntryImpl(const QString& searchString, Entry* entry);
 
-    enum Field {
+    enum class Field {
         Undefined,
         Title,
         Username,

diff --git a/src/core/Tools.cpp b/src/core/Tools.cpp
@@ -357,7 +357,6 @@ QRegularExpression convertToRegex(const QString& string, bool useWildcards, bool
     // Wildcard support (*, ?, |)
     if (useWildcards) {
         pattern.replace(regexEscape, "\\\\1");
-        pattern.replace("**", "*");
         pattern.replace("*", ".*");
         pattern.replace("?", ".");
     }

diff --git a/tests/TestEntrySearcher.cpp b/tests/TestEntrySearcher.cpp
@@ -144,31 +144,31 @@ void TestEntrySearcher::testSearchTermParser()
 
     QCOMPARE(terms.length(), 5);
 
-    QCOMPARE(terms[0]->field, EntrySearcher::Undefined);
+    QCOMPARE(terms[0]->field, EntrySearcher::Field::Undefined);
     QCOMPARE(terms[0]->word, QString("test"));
     QCOMPARE(terms[0]->exclude, true);
 
-    QCOMPARE(terms[1]->field, EntrySearcher::Undefined);
+    QCOMPARE(terms[1]->field, EntrySearcher::Field::Undefined);
     QCOMPARE(terms[1]->word, QString("quoted \\\"string\\\""));
     QCOMPARE(terms[1]->exclude, false);
 
-    QCOMPARE(terms[2]->field, EntrySearcher::Username);
+    QCOMPARE(terms[2]->field, EntrySearcher::Field::Username);
     QCOMPARE(terms[2]->word, QString("user"));
 
-    QCOMPARE(terms[3]->field, EntrySearcher::Password);
+    QCOMPARE(terms[3]->field, EntrySearcher::Field::Password);
     QCOMPARE(terms[3]->word, QString("test me"));
 
-    QCOMPARE(terms[4]->field, EntrySearcher::Undefined);
+    QCOMPARE(terms[4]->field, EntrySearcher::Field::Undefined);
     QCOMPARE(terms[4]->word, QString("noquote"));
 
     // Test wildcard and regex search terms
     terms = m_entrySearcher.parseSearchTerms("+url:*.google.com *user:\\d+\\w{2}");
 
     QCOMPARE(terms.length(), 2);
 
-    QCOMPARE(terms[0]->field, EntrySearcher::Url);
+    QCOMPARE(terms[0]->field, EntrySearcher::Field::Url);
     QCOMPARE(terms[0]->regex.pattern(), QString("^.*\\.google\\.com$"));
 
-    QCOMPARE(terms[1]->field, EntrySearcher::Username);
+    QCOMPARE(terms[1]->field, EntrySearcher::Field::Username);
     QCOMPARE(terms[1]->regex.pattern(), QString("\\d+\\w{2}"));
 }