Replace QHash with QMultiHash to avoid a deprecation warning.

diff --git a/src/gui/searchtabcontainer.cpp b/src/gui/searchtabcontainer.cpp
index 8b59153ec348274f381e1b63b70985ee41ce99c9..af2f8d38e192ef59b34d6e1cce0f6e0e26009d5a 100644 (file)
--- a/src/gui/searchtabcontainer.cpp
+++ b/src/gui/searchtabcontainer.cpp
@@ -60,19 +60,19 @@ void SearchTabContainer::showSearchDialog(bool show) {
 void SearchTabContainer::searchButtonClicked() {
     if (!sqlEngine) return;
 
 void SearchTabContainer::searchButtonClicked() {
     if (!sqlEngine) return;
 

-    QHash<QString,QString> columns;
+    QMultiHash<QString,QString> columns;

 
     SearchHead *searchHeader = static_cast<SearchHead*>(header);
     if( searchHeader->searchTitle->isChecked() )
 
     SearchHead *searchHeader = static_cast<SearchHead*>(header);
     if( searchHeader->searchTitle->isChecked() )

-        columns.insertMulti("EVENT", "title");
+        columns.insert("EVENT", "title");

     if( searchHeader->searchAbstract->isChecked() )
     if( searchHeader->searchAbstract->isChecked() )

-        columns.insertMulti("EVENT", "abstract");
+        columns.insert("EVENT", "abstract");

     if( searchHeader->searchTag->isChecked() )
     if( searchHeader->searchTag->isChecked() )

-        columns.insertMulti("EVENT", "tag");
+        columns.insert("EVENT", "tag");

     if( searchHeader->searchSpeaker->isChecked() )
     if( searchHeader->searchSpeaker->isChecked() )

-        columns["PERSON"] = "name";
+        columns.insert("PERSON", "name");

     if( searchHeader->searchRoom->isChecked() )
     if( searchHeader->searchRoom->isChecked() )

-        columns["ROOM"] = "name";
+        columns.insert("ROOM", "name");

 
     QString keyword = searchHeader->searchEdit->text();
 
 
     QString keyword = searchHeader->searchEdit->text();
 

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index c156476772f95c56c5ed7ecf11047d4e9e8dcd77..a3cf22ad3df23a5fa022dcdf15988b6a9fc8477e 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -326,7 +326,7 @@ void SqlEngine::addLinkToDB(QHash<QString,QString> &aLink) {
 }
 
 
 }
 
 

-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;
 
     // DROP
     if (aColumns.empty()) return false;
 
     // DROP

diff --git a/src/sql/sqlengine.h b/src/sql/sqlengine.h
index 71c7777d762b747d1a9b951d6c6281c1fc0a6bf3..0a0c2778f6efe680595f89e8eb46bef61ddfc44f 100644 (file)
--- a/src/sql/sqlengine.h
+++ b/src/sql/sqlengine.h
@@ -71,7 +71,7 @@ class SqlEngine : public QObject {
         bool rollbackTransaction();
 
         /// search Events for .... returns true if success
         bool rollbackTransaction();
 
         /// 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);
         /// emits a possible error message as signal. Does nothing if there was not last error
     private:
         static QString login(const QString &aDatabaseType, const QString &aDatabaseName);
         /// emits a possible error message as signal. Does nothing if there was not last error