[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kexi/webforms
From:       Lorenzo Villani <lvillani () binaryhelix ! net>
Date:       2008-11-08 21:39:29
Message-ID: 1226180369.159469.30180.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 881732 by villani:

And now, make it compile

 M  +1 -1      main.cpp  
 M  +11 -10    model/DataProvider.cpp  
 M  +5 -15     model/DataProvider.h  


--- trunk/koffice/kexi/webforms/main.cpp #881731:881732
@@ -69,7 +69,7 @@
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
 
     if (args->isSet("file")) {
-        if (!KexiWebForms::Model::initDatabase(args->getOption("file"))) {
+        if (!KexiWebForms::Model::DataProvider::instance()->initDatabase(args->getOption("file"))) {
             kError() << "Something went wrong while initializing database...";
             return 1;
         }
--- trunk/koffice/kexi/webforms/model/DataProvider.cpp #881731:881732
@@ -1,3 +1,4 @@
+
 /* This file is part of the KDE project
 
    (C) Copyright 2008 by Lorenzo Villani <lvillani@binaryhelix.net>
@@ -26,20 +27,20 @@
 
 #include <main/startup/KexiStartup.h>
 
-#include <kexidb/drivermanager.h>
 #include <kexidb/driver.h>
 #include <kexidb/connection.h>
+#include <kexidb/drivermanager.h>
 
 namespace KexiWebForms {
 namespace Model {
 
 KexiDB::Connection* gConnection;
+DataProvider* DataProvider::m_instance = 0;
 
-
-DataProvider::DataProvider() {
+DataProvider* DataProvider::instance() {
     if (!m_instance)
-        m_istance = new DataProvider();
-    return m_istance;
+        m_instance = new DataProvider();
+    return m_instance;
 }
 
 KexiDB::Connection* DataProvider::connection() {
@@ -66,17 +67,17 @@
         } else {
             kDebug() << "This should be a file-based database... now loading it";
 
-            m_driver = manager.driver(driverName);
-            if (!driver || manager.error()) {
+            m_driver = m_manager.driver(driverName);
+            if (!m_driver || m_manager.error()) {
                 m_manager.debugError();
                 status = false;
             } else status = true;
 
             m_connData->setFileName(fileName);
 
-            m_connection = m_driver->createConnection(*connData);
+            m_connection = m_driver->createConnection(*m_connData);
 
-            if (!m_connection || driver->error()) {
+            if (!m_connection || m_driver->error()) {
                 m_driver->debugError();
                 status = false;
             } else status = true;
@@ -86,7 +87,7 @@
                 status = false;
             } else status = true;
 
-            if (!gConnection->useDatabase(fileName)) {
+            if (!m_connection->useDatabase(fileName)) {
                 kError() << m_connection->errorMsg();
                 status = false;
             } else {
--- trunk/koffice/kexi/webforms/model/DataProvider.h #881731:881732
@@ -21,7 +21,9 @@
 #ifndef KEXIWEBFORMS_DATAPROVIDER_H
 #define KEXIWEBFORMS_DATAPROVIDER_H
 
+#include <kexidb/driver.h>
 #include <kexidb/connection.h>
+#include <kexidb/drivermanager.h>
 
 class QString;
 
@@ -51,9 +53,9 @@
     bool reopenDatabase();
     KexiDB::Connection* connection();
 protected:
-    DataProvider();
+    DataProvider() {};
 private:
-    DataProvider* m_instance;
+    static DataProvider* m_instance;
     KexiDB::Driver* m_driver;
     KexiDB::Connection* m_connection;
     KexiDB::DriverManager m_manager;
@@ -61,20 +63,8 @@
 
     QString m_dbName;
     bool m_initialized;
-}
+};
 
-/*!
- * Essentially, initialize the KexiDB::Connection object
- *
- * @param const QString& Path to a KexiDB file, connection file
- * shortcut file
- *
- * @return boolean false when error occurs, true if everything went well
- */
-bool initDatabase(const QString& fileName);
-
-bool reopenDatabase();
-
 }
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]