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

List:       kde-commits
Subject:    [kactivities/ivan/libkactivities-stats] src: We are using 'database' instead of 'db' in all places n
From:       Ivan Čukić <ivan.cukic () kde ! org>
Date:       2015-01-31 18:02:48
Message-ID: E1YHcNc-0001XY-BO () scm ! kde ! org
[Download RAW message or body]

Git commit 5260c69e64c961d172dc1ca832ee1870ec3c233c by Ivan Čukić.
Committed on 31/01/2015 at 18:02.
Pushed by ivan into branch 'ivan/libkactivities-stats'.

We are using 'database' instead of 'db' in all places now

M  +1    -1    src/common/database/Database.cpp
M  +1    -1    src/common/database/Database.h
M  +4    -4    src/lib/stats/resultset.cpp

http://commits.kde.org/kactivities/5260c69e64c961d172dc1ca832ee1870ec3c233c

diff --git a/src/common/database/Database.cpp b/src/common/database/Database.cpp
index 1d8437e..7564462 100644
--- a/src/common/database/Database.cpp
+++ b/src/common/database/Database.cpp
@@ -93,7 +93,7 @@ Database::Ptr Database::instance(Source source, OpenMode openMode)
 
     auto databaseConnectionName =
             "kactivities_db_resources_"
-                // Adding the thread number to the db name
+                // Adding the thread number to the database name
                 + QString::number((quintptr)info.thread)
                 // And whether it is read-only or read-write
                 + (info.openMode == ReadOnly ? "_readonly" : "_readwrite");
diff --git a/src/common/database/Database.h b/src/common/database/Database.h
index 1fc9cc9..3974662 100644
--- a/src/common/database/Database.h
+++ b/src/common/database/Database.h
@@ -46,7 +46,7 @@ public:
     QSqlQuery execQuery(const QString &query, bool ignoreErrors = false) const;
     QSqlQuery createQuery() const;
 
-    QSqlDatabase &db() const;
+    QSqlDatabase &database() const;
 
     // For debugging purposes only
     QString lastQuery() const;
diff --git a/src/lib/stats/resultset.cpp b/src/lib/stats/resultset.cpp
index 87fc0bd..fd86b64 100644
--- a/src/lib/stats/resultset.cpp
+++ b/src/lib/stats/resultset.cpp
@@ -48,7 +48,7 @@ using namespace Terms;
 
 class ResultSet::Private {
 public:
-    Common::Database::Ptr db;
+    Common::Database::Ptr database;
     QSqlQuery query;
     Query queryDefinition;
 
@@ -63,7 +63,7 @@ public:
 
         auto selection = queryDefinition.selection();
 
-        query = db->execQuery(
+        query = database->execQuery(
                 selection == LinkedResources ? linkedResourcesQuery()
               : selection == UsedResources   ? usedResourcesQuery()
               : selection == AllResources    ? allResourcesQuery()
@@ -268,8 +268,8 @@ ResultSet::ResultSet(Query query)
 {
     using namespace Common;
 
-    d->db = Database::instance(Database::ResourcesDatabase, Database::ReadOnly);
-    Q_ASSERT_X(d->db, "ResultSet constructor", "Database is NULL");
+    d->database = Database::instance(Database::ResourcesDatabase, Database::ReadOnly);
+    Q_ASSERT_X(d->database, "ResultSet constructor", "Database is NULL");
 
     d->queryDefinition = query;
 
[prev in list] [next in list] [prev in thread] [next in thread]