--- a/SqliteDBLink.cpp	Fri Sep 14 21:10:03 2012 +0200
+++ b/SqliteDBLink.cpp	Fri Sep 14 22:50:45 2012 +0200
@@ -15,10 +15,13 @@
   db = QSqlDatabase::addDatabase("QSQLITE", "SqliteDBLink");
   db.setDatabaseName(dbPath);
   if (!db.open())
-    throw IOException(QString("Unable to open SQLite database with path '%1'").arg(dbPath));
+    throw
+      IOException(QString("Unable to open SQLite database with path '%1'")
+		  .arg(dbPath));
   QSqlQuery query(db);
   if (!query.exec(QString("SELECT * FROM files;"))) {
-    query.exec("CREATE TABLE files(path VARCHAR PRIMARY KEY ASC, size INTEGER, mtime TEXT, checksum TEXT);");
+    query.exec("CREATE TABLE files(path VARCHAR PRIMARY KEY ASC,"
+	       " size INTEGER, mtime TEXT, checksum TEXT);");
   }
   if (!query.exec(QString("SELECT * FROM files;"))) {
     throw SQLException("No database");
@@ -42,7 +45,8 @@
   return query.last();
 }
 
-FileDBLink::DBStatus SqliteDBLink::existsWithMtime(const QString& path, const QDateTime& mtime)
+FileDBLink::DBStatus SqliteDBLink::existsWithMtime(const QString& path,
+						   const QDateTime& mtime)
 {
   QSqlQuery query(db);
   query.prepare("SELECT mtime FROM files WHERE path = :path;");
@@ -60,7 +64,8 @@
   return NONE;
 }
 
-void SqliteDBLink::addFile(const QString& path, qint64 size, const QDateTime& dtime, const QByteArray& hash)
+void SqliteDBLink::addFile(const QString& path, qint64 size,
+			   const QDateTime& dtime, const QByteArray& hash)
 {
   addFile(DBInfo(path, size, dtime, hash));
 }
@@ -82,7 +87,9 @@
   return true;
 }
 
-void SqliteDBLink::updateFile(const QString& path, qint64 size, const QDateTime& dtime, const QByteArray& hash)
+void SqliteDBLink::updateFile(const QString& path,
+			      qint64 size, const QDateTime& dtime,
+			      const QByteArray& hash)
 {
   updateFile(DBInfo(path, size, dtime, hash));
 }
@@ -90,7 +97,9 @@
 void SqliteDBLink::updateFile(const DBInfo& dbinfo)
 {
   QSqlQuery query(db);
-  query.prepare("UPDATE files SET size=:size, mtime=:mtime, checksum=:checksum WHERE path=:path");
+  query.prepare("UPDATE files "
+		"SET size=:size, mtime=:mtime, checksum=:checksum "
+		"WHERE path=:path");
   query.bindValue(":path", dbinfo.path());
   query.bindValue(":size", dbinfo.size());
   query.bindValue(":mtime", dbinfo.mtime());
@@ -113,16 +122,17 @@
   abort();
   QStringList list;
   /*
-  foreach(QSharedPointer<DBInfo> info, entries) {
+  foreach(dbinf_ptr_t info, entries) {
     list << info->serialize();
   }
   */
   return list;
 }
 
-const QList<QSharedPointer<FileDBLink::DBInfo> > SqliteDBLink::values(const QString& prefix) const
+const QList<FileDBLink::dbinf_ptr_t >
+SqliteDBLink::values(const QString& prefix) const
 {
-  QList<QSharedPointer<FileDBLink::DBInfo> > values;
+  QList<FileDBLink::dbinf_ptr_t > values;
 
   QSqlQuery query(db);
 
@@ -148,8 +158,9 @@
     QDateTime mtime = query.value(dateIndex).toDateTime();
     QByteArray checksum = query.value(checksumIndex).toByteArray();
 
-    values << QSharedPointer<FileDBLink::DBInfo>(new FileDBLink::DBInfo(path, size, mtime, checksum));
-    //qDebug() << path << size << mtime << checksum.toHex();
+    values <<
+      FileDBLink::dbinf_ptr_t(new FileDBLink::DBInfo(path,
+						     size, mtime, checksum));
   }
 
   return values;
@@ -166,10 +177,11 @@
 }
 
 
-void SqliteDBLink::keepOnlyFromPrefix(const QString& prefix, const QStringList& files)
+void SqliteDBLink::keepOnlyFromPrefix(const QString& prefix,
+				      const QStringList& files)
 {
   QStringList list;
-  foreach(QSharedPointer<DBInfo> info, values(prefix)) {
+  foreach(dbinf_ptr_t info, values(prefix)) {
     if (!files.contains(info->path())) {
       list << info->path();
     }