remove unused code

diff --git a/src/gui/importschedulewidget.cpp b/src/gui/importschedulewidget.cpp
index 1ab7c7b99f7d27bff5443c6958857ebe01816507..a63d93ff061934608ff4f4d22d4ef1b5df1dba0d 100644 (file)
--- a/src/gui/importschedulewidget.cpp
+++ b/src/gui/importschedulewidget.cpp
@@ -47,7 +47,6 @@ ImportScheduleWidget::ImportScheduleWidget(QWidget *aParent)
     progressBar->hide();
 
     cancel->hide();
-    importAction->hide();
     connect(online, SIGNAL(clicked()), SLOT(downloadSchedule()));
 
     mNetworkAccessManager = new QNetworkAccessManager(this);

diff --git a/src/gui/importschedulewidget.ui b/src/gui/importschedulewidget.ui
index fd87edf874709264e0967fbfdf47efa75c1c43f1..7f504313604cc2853a10543a427bdfd8289e1874 100644 (file)
--- a/src/gui/importschedulewidget.ui
+++ b/src/gui/importschedulewidget.ui
@@ -35,32 +35,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QGroupBox" name="importAction">
-       <property name="title">
-        <string/>
-       </property>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QRadioButton" name="update">
-          <property name="text">
-           <string>Update</string>
-          </property>
-          <property name="checked">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QRadioButton" name="replace">
-          <property name="text">
-           <string>Replace</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
      <item>
       <widget class="QPushButton" name="online">
        <property name="text">

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index f7bf772ff4a8ebc4776381ca33133a465ca26196..99049dfe0235f1998db09e52c5e225bc11ac299b 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -50,15 +50,6 @@ QString SqlEngine::login(const QString &aDatabaseType, const QString &aDatabaseN
     bool result = false;
     if(!QFile::exists(aDatabaseName)) // the DB (tables) doesn't exists, and so we have to create one
     {
-        /*
-        // creating empty DB + tables
-        // ??? what is the best way of creating new empty DB ???
-        // we can either:
-        //  - create new DB + tables by issuing corresponding queries (used solution)
-        //  - create new DB from resource, which contains empty DB with tables
-        result = createTables(database);
-        */
-
         // copy conference Db from resource, instead of creating
         // empty tables and then parsing the schedule
         QFile dbFile(aDatabaseName);
@@ -277,94 +268,6 @@ void SqlEngine::addLinkToDB(QHash<QString,QString> &aLink)
     }
 }
 
-bool SqlEngine::createTables(QSqlDatabase &aDatabase)
-{
-    bool result = aDatabase.open();
-
-    if (aDatabase.isValid() && aDatabase.isOpen())
-    {
-        QSqlQuery query(aDatabase);
-
-        query.exec("CREATE TABLE CONFERENCE ( "
-            "id INTEGER PRIMARY KEY  AUTOINCREMENT  NOT NULL, "
-            "title VARCHAR UNIQUE NOT NULL, "
-            "subtitle VARCHAR, "
-            "venue VARCHAR, "
-            "city VARCHAR NOT NULL, "
-            "start INTEGER NOT NULL, "
-            "end INTEGER NOT NULL, "
-            "days INTEGER, "
-            "day_change INTEGER, "
-            "timeslot_duration INTEGER, "
-            "active INTEGER DEFAULT 0);");
-
-        query.exec("CREATE TABLE TRACK ( "
-            "id INTEGER  PRIMARY KEY AUTOINCREMENT  NOT NULL, "
-            "name VARCHAR UNIQUE NOT NULL );");
-
-        query.exec("CREATE TABLE ROOM ( "
-            "id INTEGER PRIMARY KEY  AUTOINCREMENT  NOT NULL, "
-            "name VARCHAR UNIQUE NOT NULL, "
-            "picture VARCHAR NOT NULL);");
-
-        query.exec("CREATE TABLE PERSON ( "
-            "id INTEGER PRIMARY KEY  NOT NULL, "
-            "name VARCHAR UNIQUE NOT NULL);");
-
-        query.exec("CREATE TABLE EVENT ( "
-            "xid_conference INTEGER  NOT NULL, "
-            "id INTEGER NOT NULL, "
-            "start INTEGER NOT NULL, "
-            "duration INTEGER NOT NULL, "
-            "xid_track INTEGER NOT NULL REFERENCES TRACK(id), "
-            "type VARCHAR, "
-            "language VARCHAR, "
-            "tag VARCHAR,title VARCHAR NOT NULL, "
-            "subtitle VARCHAR, "
-            "abstract VARCHAR, "
-            "description VARCHAR, "
-            "favourite INTEGER DEFAULT 0, "
-            "alarm INTEGER DEFAULT 0, "
-            "PRIMARY KEY (xid_conference,id), "
-            "FOREIGN KEY(xid_conference) REFERENCES CONFERENCE(id), "
-            "FOREIGN KEY(xid_track) REFERENCES TRACK(id));");
-
-        query.exec("CREATE TABLE EVENT_PERSON ( "
-            "xid_conference INTEGER NOT NULL, "
-            "xid_event INTEGER NOT NULL, "
-            "xid_person INTEGER NOT NULL, "
-            "UNIQUE ( xid_conference, xid_event, xid_person ) ON CONFLICT REPLACE, "
-            "FOREIGN KEY(xid_conference) REFERENCES CONFERENCE(id), "
-            "FOREIGN KEY(xid_event) REFERENCES EVENT(id), "
-            "FOREIGN KEY(xid_person) REFERENCES PERSON(id));");
-
-        query.exec("CREATE TABLE EVENT_ROOM ( "
-            "xid_conference INTEGER NOT NULL, "
-            "xid_event INTEGER NOT NULL, "
-            "xid_room INTEGER NOT NULL, "
-            "UNIQUE ( xid_conference, xid_event, xid_room ) ON CONFLICT REPLACE, "
-            "FOREIGN KEY(xid_conference) REFERENCES CONFERENCE(id), "
-            "FOREIGN KEY(xid_event) REFERENCES EVENT(id), "
-            "FOREIGN KEY(xid_room) REFERENCES ROOM(id));");
-
-        query.exec("CREATE TABLE LINK ( "
-            "id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "
-            "xid_conference INTEGER NOT NULL, "
-            "xid_event INTEGER NOT NULL, "
-            "name VARCHAR, "
-            "url VARCHAR NOT NULL, "
-            "UNIQUE ( xid_conference, xid_event, url ) ON CONFLICT REPLACE, "
-            "FOREIGN KEY(xid_conference) REFERENCES CONFERENCE(id), "
-            "FOREIGN KEY(xid_event) REFERENCES EVENT(id));");
-    }
-    else
-    {
-        //LOG_WARNING("Database is not opened");
-    }
-
-    return result;
-}
-
 int SqlEngine::searchEvent(int aConferenceId, const QHash<QString,QString> &aColumns, const QString &aKeyword)
 {
     QSqlDatabase db = QSqlDatabase::database();

diff --git a/src/sql/sqlengine.h b/src/sql/sqlengine.h
index b6fb2885af73d7f4e25f32cc8e6c7d8831c75f55..b17556812bdc5200cd30f1baf1c7bb64d9020029 100644 (file)
--- a/src/sql/sqlengine.h
+++ b/src/sql/sqlengine.h
@@ -44,7 +44,6 @@ class SqlEngine : public QObject
         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);
         static bool execQuery(QSqlDatabase &aDatabase, const QString &aQuery);
 };