Changeset 3a8dc71 in confclerk_git for src/sql

Timestamp:

01/26/10 20:30:45 (13 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

336fa33

Parents:

05afe5f

Message:

SqlEngine? made STATIC

Location:

src/sql

Files:

• schedulexmlparser.cpp (modified) (6 diffs)
• schedulexmlparser.h (modified) (2 diffs)
• sqlengine.h (modified) (1 diff)

src/sql/schedulexmlparser.cpp

@@ -13 +13 @@
 }
 
-int ScheduleXmlParser::parseData(const QByteArray &aData, SqlEngine *aDBEngine)
+int ScheduleXmlParser::parseData(const QByteArray &aData)
 {
-    Q_ASSERT(NULL != aDBEngine);
-
     QDomDocument document;
     document.setContent (aData, false);
@@ -39 +37 @@
             conference["day_change"] = conferenceElement.firstChildElement("day_change").text(); // time
             conference["timeslot_duration"] = conferenceElement.firstChildElement("timeslot_duration").text(); // time
-            aDBEngine->addConferenceToDB(conference);
+            SqlEngine::addConferenceToDB(conference);
             confId = conference["id"].toInt();
             emit(parsingSchedule(conference["title"]));
@@ -78 +76 @@
                         room["conference_id"] = QString::number(confId,10);
                         room["picture"] = "NOT DEFINED YET"; // TODO: implement some mapping to assign correct picture to specified room_name
-                        aDBEngine->addRoomToDB(room);
+                        SqlEngine::addRoomToDB(room);
 
                         // process event's nodes
@@ -96 +94 @@
                         event["abstract"] = eventElement.firstChildElement("abstract").text(); // string
                         event["description"] = eventElement.firstChildElement("description").text(); // string
-                        aDBEngine->addEventToDB(event);
+                        SqlEngine::addEventToDB(event);
                         // process persons' nodes
                         QList<QString> persons;
@@ -108 +106 @@
                             person["conference_id"] = QString::number(confId, 10);
                             //qDebug() << "adding Person: " << person["name"];
-                            aDBEngine->addPersonToDB(person);
+                            SqlEngine::addPersonToDB(person);
                         }
                         // process links' nodes
@@ -119 +117 @@
                             link["event_id"] = eventElement.attribute("id");
                             link["conference_id"] = QString::number(confId, 10);
-                            aDBEngine->addLinkToDB(link);
+                            SqlEngine::addLinkToDB(link);
                         }
                         // emit signal to inform the user about the current status (how many events are parsed so far - expressed in %)

src/sql/schedulexmlparser.h

@@ -3 +3 @@
 
 #include <QObject>
-
-class SqlEngine;
 
 class ScheduleXmlParser : public QObject
@@ -13 +11 @@
 
     public slots:
-        int parseData(const QByteArray &aData, SqlEngine *aDBEngine); // returns 'confId' of parsed conference schedule
+        int parseData(const QByteArray &aData); // returns 'confId' of parsed conference schedule
 
     signals:

src/sql/sqlengine.h

@@ -14 +14 @@
         ~SqlEngine();
         static void initialize();
-        void addConferenceToDB(QHash<QString,QString> &aConference);
-        void addEventToDB(QHash<QString,QString> &aEvent);
-        void addPersonToDB(QHash<QString,QString> &aPerson);
-        void addLinkToDB(QHash<QString,QString> &aLink);
-        void addRoomToDB(QHash<QString,QString> &aRoom);
+        static void addConferenceToDB(QHash<QString,QString> &aConference);
+        static void addEventToDB(QHash<QString,QString> &aEvent);
+        static void addPersonToDB(QHash<QString,QString> &aPerson);
+        static void addLinkToDB(QHash<QString,QString> &aLink);
+        static void addRoomToDB(QHash<QString,QString> &aRoom);
 
         // search Events for ....
-        int searchEvent(int conferenceId, const QHash<QString,QString> &columns, const QString &keyword);
+        static int searchEvent(int conferenceId, const QHash<QString,QString> &columns, const QString &keyword);
     private:
         static QString login(const QString &aDatabaseType, const QString &aDatabaseName);
         static bool createTables(QSqlDatabase &aDatabase);
-        bool execQuery(QSqlDatabase &aDatabase, const QString &aQuery);
+        static bool execQuery(QSqlDatabase &aDatabase, const QString &aQuery);
 };