Changeset 84b9c07 for src

Timestamp:

01/18/10 12:46:43 (12 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

6ae1026

Parents:

8f25cb1

Message:

used 'MAEMO' define to create 'non-virtual' 'VIRUAL_EVENT' table
instead of 'virtual' one, only for 'MAEMO'
Linux stays untouched - creates real 'virtual' table for FTS support

Location:

src

Files:

• gui/mainwindow.ui (modified) (2 diffs)
• sql/sql.pro (modified) (1 diff)
• sql/sqlengine.cpp (modified) (2 diffs)

src/gui/mainwindow.ui

@@ -18 +18 @@
      <widget class="QTabWidget" name="tabWidget" >
       <property name="currentIndex" >
-       <number>1</number>
+       <number>0</number>
       </property>
       <widget class="QWidget" name="dayViewTab" >
@@ -96 +96 @@
     <addaction name="actionAboutApplication" />
    </widget>
+   <addaction name="menuAbout" />
    <addaction name="menuFile" />
-   <addaction name="menuAbout" />
   </widget>
   <widget class="QStatusBar" name="statusbar" />

src/sql/sql.pro

@@ +1 @@
+include(../global.pri)
 TEMPLATE = lib
 TARGET = sql

src/sql/sqlengine.cpp

@@ -234 +234 @@
             FOREIGN KEY(xid_activity) REFERENCES ACTIVITY(id))");
 
-        // TBD Virtual tables compatibility (waiting for Marek). Temporary non virtual VIRTUAL_TABLE below: To be deleted
-/*        query.exec("CREATE VIRTUAL TABLE VIRTUAL_EVENT using fts3 ( \
-            xid_conference INTEGER  NOT NULL, \
-            id INTEGER NOT NULL , \
-            tag VARCHAR,title VARCHAR NOT NULL , \
-            subtitle VARCHAR, \
-            abstract VARCHAR, \
-            description VARCHAR, \
-            PRIMARY KEY (xid_conference,id))");
-*/
+#ifdef MAEMO
+        // TBD: MAEMO Virtual tables compatibility (waiting for Marek).
+        // MAEMO sqlite Qt driver doesn't provide FTS support by default - use the following HACK
+        qDebug() << "MAEMO: Creating 'general', not 'virtual' table 'VIRTUAL_EVENT'";
         query.exec("CREATE TABLE VIRTUAL_EVENT ( \
             xid_conference INTEGER  NOT NULL, \
@@ -252 +246 @@
             description VARCHAR, \
             PRIMARY KEY (xid_conference,id))");
+#else
+        query.exec("CREATE VIRTUAL TABLE VIRTUAL_EVENT using fts3 ( \
+            xid_conference INTEGER  NOT NULL, \
+            id INTEGER NOT NULL , \
+            tag VARCHAR,title VARCHAR NOT NULL , \
+            subtitle VARCHAR, \
+            abstract VARCHAR, \
+            description VARCHAR, \
+            PRIMARY KEY (xid_conference,id))");
+#endif
 
         query.exec("CREATE TABLE EVENT_PERSON ( \