# HG changeset patch
# User Tom Fredrik Blenning Klaussen <bfg@blenning.no>
# Date 1345654087 -7200
# Node ID b5943e4bf6763959635d303ee018a9a8af4cc45b
# Parent  d7b384b4a834a2c5a5bca6bfd87c0dcc273cea56
Fix up header includes.
Introduce outer catch.
Fix coding style.
Remove spurious debug output.

diff -r d7b384b4a834 -r b5943e4bf676 DataController.cpp
--- a/DataController.cpp	Wed Aug 22 18:18:20 2012 +0200
+++ b/DataController.cpp	Wed Aug 22 18:48:07 2012 +0200
@@ -1,35 +1,31 @@
 #include "CompileTimeConstants.h"
-
 #include "DataController.hpp"
-
+#include "EditDistance.hpp"
 #include "MemoryDBLink.hpp"
+#include "PermissionException.hpp"
 #include "SqliteDBLink.hpp"
 
-#include "PermissionException.hpp"
-#include "DataController.hpp"
-
-#include <QtGui/QApplication>
+#include <QtCore/QCryptographicHash>
+#include <QtCore/QDateTime>
+#include <QtCore/QDebug>
 #include <QtCore/QDir>
+#include <QtCore/QTimer>
 #include <QtCore/QUrl>
 
-#include <QtCore/QDebug>
-#include <QtCore/QTimer>
-#include <QtCore/QCryptographicHash>
-#include <QtCore/QDateTime>
-
+#include <QtGui/QApplication>
+#include <QtGui/QDesktopServices>
+#include <QtGui/QDoubleSpinBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
 #include <QtGui/QMainWindow>
+#include <QtGui/QMenuBar>
 #include <QtGui/QMessageBox>
-#include <QtGui/QDesktopServices>
+#include <QtGui/QProgressBar>
+#include <QtGui/QToolBar>
 #include <QtGui/QTreeWidget>
-#include <QtGui/QHeaderView>
-#include <QtGui/QMenuBar>
-#include <QtGui/QToolBar>
-#include <QtGui/QDoubleSpinBox>
-#include <QtGui/QLabel>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QProgressBar>
 
-#include "EditDistance.hpp"
+#include <iostream>
 #include <memory>
 
 void DataController::findFiles(const QDir& dir, QStringList& list)
@@ -39,10 +35,7 @@
     findFiles(QDir(filename), list);
   }
 
-  qDebug() << dir.entryList(QDir::Files | QDir::NoSymLinks);
-
   foreach(QString filename, dir.entryList(QDir::Files | QDir::NoSymLinks)) {
-    qDebug() << filename;
     list << dir.absoluteFilePath(filename);
   }
 }
@@ -387,8 +380,6 @@
   setup(QString(), QString(), showGUI);
 }
 
-#include <iostream>
-
 void DataController::progressUpdate(int p)
 {
   QString str;
diff -r d7b384b4a834 -r b5943e4bf676 DataController.hpp
--- a/DataController.hpp	Wed Aug 22 18:18:20 2012 +0200
+++ b/DataController.hpp	Wed Aug 22 18:48:07 2012 +0200
@@ -1,20 +1,19 @@
 #ifndef DATACONTROLLER_HPP
 #define DATACONTROLLER_HPP
 
-#include <QtCore/QObject>
-#include <QtCore/QDir>
-
 #include "FileDBLink.hpp"
 
+#include <QtCore/QDir>
+#include <QtCore/QObject>
+
+class QAction;
 class QMainWindow;
+class QMenu;
+class QPoint;
+class QSpinBox;
+class QTimer;
 class QTreeWidget;
 class QTreeWidgetItem;
-class QAction;
-class QSpinBox;
-class QTimer;
-class QPoint;
-class QTreeWidgetItem;
-class QMenu;
 
 class DataController : QObject {
 private:
@@ -35,7 +34,6 @@
   void buildDB(const QDir& dir);
 
 public slots:
-  //void cellClicked(int row, int column);
   void cellDoubleClicked(int row, int column);
   bool toggleShowFullPath();
   void setShowFullPath(bool);
diff -r d7b384b4a834 -r b5943e4bf676 DeDupe.cpp
--- a/DeDupe.cpp	Wed Aug 22 18:18:20 2012 +0200
+++ b/DeDupe.cpp	Wed Aug 22 18:48:07 2012 +0200
@@ -1,14 +1,24 @@
 #include "DataController.hpp"
+#include "Exception.hpp"
 
 #include <QtGui/QApplication>
 
+#include <iostream>
+
 int main(int argc, char *argv[]) {
 
-  QApplication app(argc, argv);
+  try {
+    QApplication app(argc, argv);
+
+    DataController dc(true);
 
-  DataController dc(true);
+    return app.exec();
+  }
+  catch (Exception& e) {
+    std::cerr << "Unrecoverable error" << e.toString().toStdString();
+    exit(1);
+  }
 
-  return app.exec();
 }
 
 
diff -r d7b384b4a834 -r b5943e4bf676 EditDistance.cpp
--- a/EditDistance.cpp	Wed Aug 22 18:18:20 2012 +0200
+++ b/EditDistance.cpp	Wed Aug 22 18:48:07 2012 +0200
@@ -23,8 +23,8 @@
 
 int EditDistance::Compute(QString a, QString b, bool remove) {
   if (remove) {
-    a=removeDiacritics(a);
-    b=removeDiacritics(b);
+    a = removeDiacritics(a);
+    b = removeDiacritics(b);
   }
 
   OrderedPair<QString> lup(a, b);
diff -r d7b384b4a834 -r b5943e4bf676 Exception.hpp
--- a/Exception.hpp	Wed Aug 22 18:18:20 2012 +0200
+++ b/Exception.hpp	Wed Aug 22 18:48:07 2012 +0200
@@ -6,7 +6,9 @@
 class Exception {
 
 public:
-  virtual QString toString() const
+  typedef QString string_t;
+
+  virtual const string_t& toString() const
   {
     return errorMsg_;
   }
@@ -17,14 +19,14 @@
 
 
 protected:
-  Exception(const QString& errorMsg) : errorMsg_(errorMsg) {}
+  Exception(const string_t& errorMsg) : errorMsg_(errorMsg) {}
   virtual ~Exception() {}
 
-  void setErrorMsg(QString& errorMsg);
-  const QString& errorMsg(QString& errorMsg);
+  void setErrorMsg(string_t& errorMsg);
+  const string_t& errorMsg(string_t& errorMsg);
 
 private:
-  QString errorMsg_;
+  string_t errorMsg_;
 };
 
 #endif //EXCEPTION_HPP
diff -r d7b384b4a834 -r b5943e4bf676 FileDBLink.cpp
--- a/FileDBLink.cpp	Wed Aug 22 18:18:20 2012 +0200
+++ b/FileDBLink.cpp	Wed Aug 22 18:48:07 2012 +0200
@@ -1,19 +1,17 @@
+#include "EditDistance.hpp"
 #include "FileDBLink.hpp"
+#include "PermissionException.hpp"
 
 #include <QtCore/QDebug>
 #include <QtCore/QtConcurrentMap>
 
-#include "PermissionException.hpp"
-#include "EditDistance.hpp"
-
-#include <cassert>
+#include <boost/bind.hpp>
 
+#include <algorithm> 
+#include <cassert>
 #include <functional> 
-#include <algorithm> 
 #include <iostream>
 
-#include <boost/bind.hpp>
-
 void FileDBLink::updateIfModified(const QString& path)
 {
   QFileInfo fileinfo(path);
@@ -46,7 +44,7 @@
   }
   else {
     QString errorMsg = path + ": " + file.errorString();
-    qDebug()<<file.error();
+
     switch (file.error()) {
     case QFile::PermissionsError:
       throw PermissionException(errorMsg);
@@ -73,7 +71,7 @@
   }
   else {
     QString errorMsg = path + ": " + file.errorString();
-    qDebug()<<file.error();
+
     switch (file.error()) {
     case QFile::PermissionsError:
       throw PermissionException(errorMsg);
diff -r d7b384b4a834 -r b5943e4bf676 FileDBLink.hpp
--- a/FileDBLink.hpp	Wed Aug 22 18:18:20 2012 +0200
+++ b/FileDBLink.hpp	Wed Aug 22 18:48:07 2012 +0200
@@ -1,8 +1,8 @@
 #ifndef FILEDBLINK
 #define FILEDBLINK
 
+#include <QtCore/QCryptographicHash>
 #include <QtCore/QDateTime>
-#include <QtCore/QCryptographicHash>
 #include <QtCore/QFileInfo>
 
 class FileDBLink {
diff -r d7b384b4a834 -r b5943e4bf676 IOException.hpp
--- a/IOException.hpp	Wed Aug 22 18:18:20 2012 +0200
+++ b/IOException.hpp	Wed Aug 22 18:48:07 2012 +0200
@@ -5,7 +5,7 @@
 
 class IOException : public Exception {
 public:
-  IOException(const QString& errMsg);
+  IOException(const string_t& errMsg);
 };
 
 #endif //IOEXCEPTION_HPP
diff -r d7b384b4a834 -r b5943e4bf676 MemoryDBLink.hpp
--- a/MemoryDBLink.hpp	Wed Aug 22 18:18:20 2012 +0200
+++ b/MemoryDBLink.hpp	Wed Aug 22 18:48:07 2012 +0200
@@ -1,5 +1,6 @@
 #ifndef MEMORYDBLINK_HPP
 #define MEMORYDBLINK_HPP
+
 #include "FileDBLink.hpp"
 
 #include <QtCore/QMap>
diff -r d7b384b4a834 -r b5943e4bf676 OrderedPair.hpp
--- a/OrderedPair.hpp	Wed Aug 22 18:18:20 2012 +0200
+++ b/OrderedPair.hpp	Wed Aug 22 18:48:07 2012 +0200
@@ -7,7 +7,7 @@
 class OrderedPair : public QPair<S, S>
 {
 public:
-  OrderedPair(const S& a, const S&b) : QPair<S, S>(a<b?a:b, a<b?b:a)
+  OrderedPair(const S& a, const S& b) : QPair<S, S>(a < b ? a : b, a < b ? b : a)
   {
   }
 };
diff -r d7b384b4a834 -r b5943e4bf676 PermissionException.hpp
--- a/PermissionException.hpp	Wed Aug 22 18:18:20 2012 +0200
+++ b/PermissionException.hpp	Wed Aug 22 18:48:07 2012 +0200
@@ -5,7 +5,7 @@
 
 class PermissionException : public IOException {
 public:
-  PermissionException(const QString& errorMsg) : IOException(errorMsg) {}
+  PermissionException(const string_t& errorMsg) : IOException(errorMsg) {}
 
 };
 
diff -r d7b384b4a834 -r b5943e4bf676 SqliteDBLink.cpp
--- a/SqliteDBLink.cpp	Wed Aug 22 18:18:20 2012 +0200
+++ b/SqliteDBLink.cpp	Wed Aug 22 18:48:07 2012 +0200
@@ -1,10 +1,5 @@
 #include "SqliteDBLink.hpp"
 
-
-#include <sqlite3.h>
-
-#include <cassert>
-
 #include <QtCore/QStringList>
 #include <QtCore/QDebug>
 
@@ -12,6 +7,8 @@
 #include <QtSql/QSqlError>
 #include <QtSql/QSqlRecord>
 
+#include <cassert>
+
 SqliteDBLink::SqliteDBLink(const QString& dbPath)
 {
   db = QSqlDatabase::addDatabase("QSQLITE");
diff -r d7b384b4a834 -r b5943e4bf676 TestSqliteDBLink.cpp
--- a/TestSqliteDBLink.cpp	Wed Aug 22 18:18:20 2012 +0200
+++ b/TestSqliteDBLink.cpp	Wed Aug 22 18:48:07 2012 +0200
@@ -1,7 +1,6 @@
 #include "SqliteDBLink.hpp"
 #include "TestFramework.hpp"
 
-#include <QtCore/QDebug>
 #include <QtCore/QTemporaryFile>
 
 BOOST_AUTO_TEST_CASE( TestSave )
diff -r d7b384b4a834 -r b5943e4bf676 ThreadSafeLookup.hpp
--- a/ThreadSafeLookup.hpp	Wed Aug 22 18:18:20 2012 +0200
+++ b/ThreadSafeLookup.hpp	Wed Aug 22 18:48:07 2012 +0200
@@ -2,7 +2,6 @@
 #define THREADSAFELOOKUP_HPP
 
 #include <QtCore/QMap>
-
 #include <QtCore/QMutex>
 
 #include <boost/optional.hpp>
diff -r d7b384b4a834 -r b5943e4bf676 updateDeDupe.cpp
--- a/updateDeDupe.cpp	Wed Aug 22 18:18:20 2012 +0200
+++ b/updateDeDupe.cpp	Wed Aug 22 18:48:07 2012 +0200
@@ -1,10 +1,20 @@
 #include "DataController.hpp"
+#include "Exception.hpp"
 
 #include <QtGui/QApplication>
 
+#include <iostream>
+
 int main(int argc, char *argv[]) {
 
-  DataController dc(false);
+  try {
+    DataController dc(false);
+  }
+  catch (Exception& e) {
+    std::cerr << "Unrecoverable error" << e.toString().toStdString();
+    exit(1);
+  }
+
 }