Changeset af9f24b for src

Timestamp:

07/14/21 21:28:39 (12 months ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master

Children:

ce60f42

Parents:

28acdbe

git-author:

Philipp Spitzer <philipp@…> (07/14/21 21:06:31)

git-committer:

Philipp Spitzer <philipp@…> (07/14/21 21:28:39)

Message:

Replace QHash with QMultiHash to avoid a deprecation warning.

Location:

src

Files:

• gui/searchtabcontainer.cpp (modified) (1 diff)
• sql/sqlengine.cpp (modified) (1 diff)
• sql/sqlengine.h (modified) (1 diff)

src/gui/searchtabcontainer.cpp

@@ -61 +61 @@
     if (!sqlEngine) return;
 
-    QHash<QString,QString> columns;
+    QMultiHash<QString,QString> columns;
 
     SearchHead *searchHeader = static_cast<SearchHead*>(header);
     if( searchHeader->searchTitle->isChecked() )
-        columns.insertMulti("EVENT", "title");
+        columns.insert("EVENT", "title");
     if( searchHeader->searchAbstract->isChecked() )
-        columns.insertMulti("EVENT", "abstract");
+        columns.insert("EVENT", "abstract");
     if( searchHeader->searchTag->isChecked() )
-        columns.insertMulti("EVENT", "tag");
+        columns.insert("EVENT", "tag");
     if( searchHeader->searchSpeaker->isChecked() )
-        columns["PERSON"] = "name";
+        columns.insert("PERSON", "name");
     if( searchHeader->searchRoom->isChecked() )
-        columns["ROOM"] = "name";
+        columns.insert("ROOM", "name");
 
     QString keyword = searchHeader->searchEdit->text();

src/sql/sqlengine.cpp

@@ -327 +327 @@
 
 
-bool SqlEngine::searchEvent(int aConferenceId, const QHash<QString,QString> &aColumns, const QString &aKeyword) {
+bool SqlEngine::searchEvent(int aConferenceId, const QMultiHash<QString,QString> &aColumns, const QString &aKeyword) {
     if (aColumns.empty()) return false;
 

src/sql/sqlengine.h

@@ -72 +72 @@
 
         /// search Events for .... returns true if success
-        bool searchEvent(int conferenceId, const QHash<QString,QString> &columns, const QString &keyword);
+        bool searchEvent(int conferenceId, const QMultiHash<QString,QString> &columns, const QString &keyword);
     private:
         static QString login(const QString &aDatabaseType, const QString &aDatabaseName);