kget: check during runtime for SQLite

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

kget/CMakeLists.txt

@@ -9,12 +9,6 @@ include(CheckTypeSize)
 
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
 
-macro_optional_find_package(Sqlite)
-set_package_properties(Sqlite PROPERTIES
-    DESCRIPTION "SQLite is a Binary-Database"
-    PURPOSE "Needed for the SQLite-Backend of the KGet-History and the Kopete-Statistic-Plugin"
-)
-
 macro_optional_find_package(QGpgme)
 set_package_properties(QGpgme PROPERTIES
     DESCRIPTION "The QGpgME library"
@@ -84,13 +78,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-if(SQLITE_FOUND)
-    add_definitions(-DHAVE_SQLITE)
-endif(SQLITE_FOUND)
-
-
-remove_definitions(-DQT_NO_HTTP)
-
 # kgetcore
 
 set(kgetcore_SRCS
@@ -140,16 +127,16 @@ qt4_add_dbus_adaptor(kgetcore_SRCS dbus/org.kde.kget.verifier.xml dbus/dbusverif
 
 add_library(kgetcore SHARED ${kgetcore_SRCS})
 
-target_link_libraries(kgetcore ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS})
+target_link_libraries(kgetcore
+    ${KDE4_KIO_LIBS}
+    ${KDE4_SOLID_LIBS}
+    ${QT_QTSQL_LIBRARY}
+)
 
 if (KDE4WORKSPACE_FOUND)
     target_link_libraries(kgetcore ${KDE4WORKSPACE_KWORKSPACE_LIBS})
 endif (KDE4WORKSPACE_FOUND)
 
-if (SQLITE_FOUND)
-  target_link_libraries(kgetcore ${QT_QTSQL_LIBRARY})
-endif (SQLITE_FOUND)
-
 if (QGPGME_FOUND)
     target_link_libraries(kgetcore ${QGPGME_LIBRARIES})
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")

kget/conf/preferencesdialog.cpp

@@ -20,6 +20,8 @@
 #include "pluginselector.h"
 #include "verificationpreferences.h"
 
+#include <QSqlDatabase>
+
 #include <klocale.h>
 #include <ktabwidget.h>
 
@@ -49,9 +51,9 @@ PreferencesDialog::PreferencesDialog(QWidget * parent, KConfigSkeleton * skeleto
 
     // history backend entries
     dlgAdv.kcfg_HistoryBackend->addItem(i18n("Xml"), QVariant(TransferHistoryStore::Xml));
-#ifdef HAVE_SQLITE
-    dlgAdv.kcfg_HistoryBackend->addItem(i18n("Sqlite"), QVariant(TransferHistoryStore::SQLite));
-#endif
+    if (QSqlDatabase::isDriverAvailable("QSQLITE")) {
+        dlgAdv.kcfg_HistoryBackend->addItem(i18n("Sqlite"), QVariant(TransferHistoryStore::SQLite));
+    }
 
 #ifdef HAVE_KWORKSPACE
     dlgAdv.kcfg_AfterFinishAction->addItem(i18n("Turn Off Computer"), QVariant(KGet::Shutdown));

kget/core/transferhistorystore.cpp

@@ -10,6 +10,7 @@
 */
 #include "core/transferhistorystore.h"
 #include "core/transferhistorystore_xml_p.h"
+#include "core/transferhistorystore_sqlite_p.h"
 #include "core/transfer.h"
 #include "settings.h"
 
@@ -19,15 +20,10 @@
 #include <QList>
 #include <QThread>
 #include <QTimer>
-
-#ifdef HAVE_SQLITE
-    #include "core/transferhistorystore_sqlite_p.h"
-    #include <QSqlDatabase>
-    #include <QSqlError>
-    #include <QSqlQuery>
-    #include <QSqlRecord>
-#endif
-
+#include <QSqlDatabase>
+#include <QSqlError>
+#include <QSqlQuery>
+#include <QSqlRecord>
 
 #include <KDebug>
 #include <kio/global.h>
@@ -142,10 +138,8 @@ TransferHistoryStore *TransferHistoryStore::getStore()
     switch(Settings::historyBackend())
     {
         case TransferHistoryStore::SQLite:
-#ifdef HAVE_SQLITE
             return new SQLiteStore(KStandardDirs::locateLocal("appdata", "transferhistory.db"));
             break;
-#endif
         case TransferHistoryStore::Xml:
         default:
             return new XmlStore(KStandardDirs::locateLocal("appdata", "transferhistory.kgt"));
@@ -387,7 +381,6 @@ void XmlStore::slotDeleteElement()
     emit loadFinished();
 }
 
-#ifdef HAVE_SQLITE
 SQLiteStore::SQLiteStore(const QString &database) : TransferHistoryStore(),
     m_dbName(database),
     m_sql()
@@ -521,11 +514,7 @@ void SQLiteStore::createTables()
         kDebug(5001) << query.lastError().text();
     }
 }
-#endif
-
 
 #include "moc_transferhistorystore.cpp"
 #include "moc_transferhistorystore_xml_p.cpp"
-#ifdef HAVE_SQLITE
-    #include "moc_transferhistorystore_sqlite_p.cpp"
-#endif
+#include "moc_transferhistorystore_sqlite_p.cpp"