Changeset 3a8dc71

Timestamp:

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

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

336fa33

Parents:

05afe5f

Message:

SqlEngine? made STATIC

Location:

src

Files:

• app/main.cpp (modified) (1 diff)
• gui/importschedulewidget.cpp (modified) (5 diffs)
• gui/importschedulewidget.h (modified) (3 diffs)
• gui/mainwindow.cpp (modified) (3 diffs)
• gui/mainwindow.h (modified) (3 diffs)
• sql/schedulexmlparser.cpp (modified) (6 diffs)
• sql/schedulexmlparser.h (modified) (2 diffs)
• sql/sqlengine.h (modified) (1 diff)

src/app/main.cpp

@@ -16 +16 @@
     QApplication::setWindowIcon(QIcon(":/icons/fosdem.png"));
 
-    SqlEngine::initialize(); // creates DB connection
+    SqlEngine::initialize(); // creates "SQLITE" DB connection
 
     QWidget *window;

src/gui/importschedulewidget.cpp

@@ -2 +2 @@
 
 #include <schedulexmlparser.h>
-#include <sqlengine.h>
 
 #include <QDir>
@@ -11 +10 @@
 ImportScheduleWidget::ImportScheduleWidget(QWidget *aParent)
     : QWidget(aParent)
-    , mSqlEngine(NULL)
 {
     setupUi(this);
@@ -32 +30 @@
 }
 
-void ImportScheduleWidget::setSqlEngine(SqlEngine *aSqlEngine)
-{
-    Q_ASSERT(aSqlEngine != NULL);
-
-    mSqlEngine = aSqlEngine;
-}
-
 void ImportScheduleWidget::parsingSchedule(const QString &aTitle)
 {
@@ -51 +42 @@
 void ImportScheduleWidget::browseSchedule()
 {
-    Q_ASSERT(mSqlEngine != NULL);
-
     QString scheduleFileName = QFileDialog::getOpenFileName(this, tr("Select Conference Schedule"), QDir::homePath(), tr("Schedule Files (*.xml)"));
     if(QFile::exists(scheduleFileName))
@@ -66 +55 @@
         browse->hide();
         progressBar->show();
-        int confId = mXmlParser->parseData(data,mSqlEngine);
+        int confId = mXmlParser->parseData(data);
 
         progressBar->hide();

src/gui/importschedulewidget.h

@@ -6 +6 @@
 
 class ScheduleXmlParser;
-class SqlEngine;
 
 class ImportScheduleWidget : public QWidget, Ui::ImportScheduleWidget
@@ -12 +11 @@
     Q_OBJECT
     public:
-        ImportScheduleWidget(QWidget *aParent = NULL); // don't forget to use setSqlEngine()
+        ImportScheduleWidget(QWidget *aParent = NULL);
         ~ImportScheduleWidget();
-        void setSqlEngine(SqlEngine *aSqlEngine);
     private slots:
         void browseSchedule();
@@ -23 +21 @@
     private:
         ScheduleXmlParser *mXmlParser;
-        SqlEngine *mSqlEngine; // uses it
 };
 

src/gui/mainwindow.cpp

@@ -27 +27 @@
 {
     setupUi(this);
-
-    // create "SQLITE" DB instance/connection
-    // opens DB connection (needed for EventModel)
-    mSqlEngine = new SqlEngine(this);
-    //mSqlEngine->initialize();
-    importScheduleWidget->setSqlEngine(mSqlEngine);
 
     // Sanity check for existence of any Conference in the DB
@@ -127 +121 @@
 }
 
-MainWindow::~MainWindow()
-{
-    if(mSqlEngine)
-    {
-        delete mSqlEngine;
-        mSqlEngine = NULL;
-    }
-}
-
 void MainWindow::scheduleImported(int aConfId)
 {
@@ -204 +189 @@
     QString keyword = searchEdit->text().replace( QString("%"), QString("\\%") );
     qDebug() << "\nKeyword to search: " << keyword;
-    mSqlEngine->searchEvent( AppSettings::confId(), columns, keyword );
+    SqlEngine::searchEvent( AppSettings::confId(), columns, keyword );
 
     QDate aStartDate = Conference::getById(AppSettings::confId()).start();

src/gui/mainwindow.h

@@ -5 +5 @@
 
 #include <ui_mainwindow.h>
-
-class SqlEngine;
 
 class MainWindow : public QMainWindow, private Ui::MainWindow
@@ -15 +13 @@
     // Event dialog for given Event ID
     MainWindow(int aEventId = 0, QWidget *aParent = NULL);
-    ~MainWindow();
+    ~MainWindow() {}
 private slots:
     void scheduleImported(int aConfId);
@@ -24 +22 @@
     void conferenceMapClicked();
     void eventHasChanged(int aEventId);
-private:
-    SqlEngine *mSqlEngine;
 };
 

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);
 };