--- a/FileDBLink.cpp	Fri Sep 14 21:10:03 2012 +0200
+++ b/FileDBLink.cpp	Fri Sep 14 22:50:45 2012 +0200
@@ -28,10 +28,12 @@
 
 void FileDBLink::addFile(const QFileInfo& fileinfo)
 {
-  addFile(fileinfo.absoluteFilePath(), fileinfo.size(), fileinfo.lastModified());
+  addFile(fileinfo.absoluteFilePath(), fileinfo.size(),
+	  fileinfo.lastModified());
 }
 
-QByteArray FileDBLink::computeHash(const QString& path, QCryptographicHash::Algorithm algorithm)
+QByteArray FileDBLink::computeHash(const QString& path,
+				   QCryptographicHash::Algorithm algorithm)
 {
   const static uint buffersize = 32768;
   QCryptographicHash hash(algorithm);
@@ -55,54 +57,59 @@
 }
 
 
-void FileDBLink::addFile(const QString& path, qint64 size, const QDateTime& lastModified)
+void FileDBLink::addFile(const QString& path, qint64 size,
+			 const QDateTime& lastModified)
 {
   addFile(path, size, lastModified, computeHash(path));
 }
 
 void FileDBLink::updateFile(const QFileInfo& fileinfo)
 {
-  updateFile(fileinfo.absoluteFilePath(), fileinfo.size(), fileinfo.lastModified());
+  updateFile(fileinfo.absoluteFilePath(), fileinfo.size(),
+	     fileinfo.lastModified());
 }
 
-void FileDBLink::updateFile(const QString& path, qint64 size, const QDateTime& lastModified)
+void FileDBLink::updateFile(const QString& path, qint64 size,
+			    const QDateTime& lastModified)
 {
   updateFile(path, size, lastModified, computeHash(path));
 }
 
-const QList<QSharedPointer<FileDBLink::DBInfo> > FileDBLink::sortOn(const QString& prefix, SORTORDER order, bool extended)
+const QList<FileDBLink::dbinf_ptr_t >
+FileDBLink::sortOn(const QString& prefix, SORTORDER order, bool extended)
 {
-  QList<QSharedPointer<DBInfo> > list = (extended) ? computedValues(prefix) : values(prefix);
+  QList<dbinf_ptr_t > list =
+    (extended) ? computedValues(prefix) : values(prefix);
 
   switch (order) {
   case PATH:
     {
-      QList<QSharedPointer<FileDBLink::DBInfo> > oList;
-      foreach(QSharedPointer<DBInfo> info, list) {
+      QList<FileDBLink::dbinf_ptr_t > oList;
+      foreach(dbinf_ptr_t info, list) {
 	oList.push_back(info);
       }
       return oList;
     }
   case SIZE:
     {
-      QMultiMap<quint64, QSharedPointer<DBInfo> > oList;
-      foreach(QSharedPointer<DBInfo> info, list) {
+      QMultiMap<quint64, dbinf_ptr_t > oList;
+      foreach(dbinf_ptr_t info, list) {
 	oList.insert(info->size(), info);
       }
       return oList.values();
     }
   case MTIME:
     {
-      QMultiMap<QDateTime, QSharedPointer<DBInfo> > oList;
-      foreach(QSharedPointer<DBInfo> info, list) {
+      QMultiMap<QDateTime, dbinf_ptr_t > oList;
+      foreach(dbinf_ptr_t info, list) {
 	oList.insert(info->mtime(), info);
       }
       return oList.values();
     }
   case CHECKSUM:
     {
-      QMultiMap<QByteArray, QSharedPointer<DBInfo> > oList;
-      foreach(QSharedPointer<DBInfo> info, list) {
+      QMultiMap<QByteArray, dbinf_ptr_t > oList;
+      foreach(dbinf_ptr_t info, list) {
 	oList.insert(info->checksum(), info);
       }
       return oList.values();
@@ -110,8 +117,8 @@
   case EDIT:
     {
       assert(extended);
-      QMultiMap<int, QSharedPointer<DBInfo> > oList;
-      foreach(QSharedPointer<DBInfo> info, list) {
+      QMultiMap<int, dbinf_ptr_t > oList;
+      foreach(dbinf_ptr_t info, list) {
 	QSharedPointer<ExtendedDBInfo> ptr;
 	ptr = info.dynamicCast<ExtendedDBInfo>();
 	oList.insert(ptr->editDistance(), info);
@@ -123,13 +130,14 @@
   abort();
 }
 
-QSharedPointer<FileDBLink::DBInfo> FileDBLink::computedValue(const QSharedPointer<DBInfo>& info,
-							     const QList<QSharedPointer<DBInfo> >& entries)
+FileDBLink::dbinf_ptr_t
+FileDBLink::computedValue(const dbinf_ptr_t& info,
+			  const QList<dbinf_ptr_t >& entries)
 {
   QString p1 = info->name();
   int minDist = 100000;
   QString other;
-  for (QList<QSharedPointer<DBInfo> >::const_iterator it2 = entries.begin();
+  for (QList<dbinf_ptr_t >::const_iterator it2 = entries.begin();
        it2 != entries.end(); ++it2) {
     if (info == *it2)
       continue;
@@ -140,20 +148,25 @@
       other = (*it2)->path();
     }
   }
-  return QSharedPointer<DBInfo>(new ExtendedDBInfo(*info, other, minDist));
+  return dbinf_ptr_t(new ExtendedDBInfo(*info, other, minDist));
 }
 
-const QList<QSharedPointer<FileDBLink::DBInfo> > FileDBLink::computedValues(const QString& prefix) const
+const QList<FileDBLink::dbinf_ptr_t>
+FileDBLink::computedValues(const QString& prefix) const
 {
-  QList<QSharedPointer<DBInfo> > list;
-  QList<QSharedPointer<DBInfo> > entries = values(prefix);
+  QList<dbinf_ptr_t > list;
+  QList<dbinf_ptr_t > entries = values(prefix);
 
 #if 1
-  list = QtConcurrent::blockingMapped(entries, boost::bind( &FileDBLink::computedValue, _1, entries));
+  list =
+    QtConcurrent::blockingMapped(entries,
+				 boost::bind( &FileDBLink::computedValue,
+					      _1,
+					      entries));
 #else
-  for (QList<QSharedPointer<DBInfo> >::const_iterator it1 = entries.begin();
+  for (QList<dbinf_ptr_t >::const_iterator it1 = entries.begin();
        it1 != entries.end(); ++it1) {
-    QSharedPointer<DBInfo> ext = computedValue(*it1, entries);
+    dbinf_ptr_t ext = computedValue(*it1, entries);
     list.push_back(ext);
   }
 #endif