fix QConnectionDict const correctness

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp
index 1226e6f..75720bc 100644 (file)
--- a/src/sql/kernel/qsqldatabase.cpp
+++ b/src/sql/kernel/qsqldatabase.cpp
@@ -89,13 +89,13 @@ public:
         QReadLocker locker(&lock);
         return contains(key);
     }
-    inline QStringList keys_ts() const
+    inline QStringList keys_ts()
     {
         QReadLocker locker(&lock);
         return keys();
     }
 
-    mutable QReadWriteLock lock;
+    QReadWriteLock lock;
 };
 Q_GLOBAL_STATIC(QConnectionDict, dbDict)
 
@@ -238,7 +238,7 @@ void QSqlDatabasePrivate::addDatabase(const QSqlDatabase &db, const QString &nam
 */
 QSqlDatabase QSqlDatabasePrivate::database(const QString& name, bool open)
 {
-    const QConnectionDict *dict = dbDict();
+    QConnectionDict *dict = dbDict();
     Q_ASSERT(dict);
 
     dict->lock.lockForRead();

diff --git a/src/sql/kernel/qsqlfield.h b/src/sql/kernel/qsqlfield.h
index a72dfd4..824e97d 100644 (file)
--- a/src/sql/kernel/qsqlfield.h
+++ b/src/sql/kernel/qsqlfield.h
@@ -89,7 +89,6 @@ public:
     bool isGenerated() const;
     bool isValid() const;
 
-
 private:
     void detach();
     QVariant val;