# HG changeset patch
# User Tom Fredrik Blenning Klaussen <bfg@blenning.no>
# Date 1347017553 -7200
# Node ID f711ddb56ae7e4de85e5dbd54f7eaa01ace9c67d
# Parent  f23fa42238dcd2a2cde383771c90e5a9430e0df8
Sort up includes.

diff -r f23fa42238dc -r f711ddb56ae7 Apps/DeDupe.cpp
--- a/Apps/DeDupe.cpp	Fri Sep 07 13:14:55 2012 +0200
+++ b/Apps/DeDupe.cpp	Fri Sep 07 13:32:33 2012 +0200
@@ -1,4 +1,5 @@
 #include "DataController.hpp"
+
 #include "Exception/Exception.hpp"
 
 #include <QtGui/QApplication>
diff -r f23fa42238dc -r f711ddb56ae7 Apps/updateDeDupe.cpp
--- a/Apps/updateDeDupe.cpp	Fri Sep 07 13:14:55 2012 +0200
+++ b/Apps/updateDeDupe.cpp	Fri Sep 07 13:32:33 2012 +0200
@@ -1,4 +1,5 @@
 #include "DataController.hpp"
+
 #include "Exception/Exception.hpp"
 
 #include <QtGui/QApplication>
diff -r f23fa42238dc -r f711ddb56ae7 BitDecoder.hpp
--- a/BitDecoder.hpp	Fri Sep 07 13:14:55 2012 +0200
+++ b/BitDecoder.hpp	Fri Sep 07 13:32:33 2012 +0200
@@ -2,8 +2,8 @@
 #define BITDECODER_HPP
 
 #include <QtCore/QBitArray>
+#include <QtCore/QMap>
 #include <QtCore/QString>
-#include <QtCore/QMap>
 
 class BitDecoder {
   BitDecoder* low;
diff -r f23fa42238dc -r f711ddb56ae7 ConfigurationProcessing.cpp
--- a/ConfigurationProcessing.cpp	Fri Sep 07 13:14:55 2012 +0200
+++ b/ConfigurationProcessing.cpp	Fri Sep 07 13:32:33 2012 +0200
@@ -1,8 +1,9 @@
 #include "ConfigurationProcessing.hpp"
 
+#include <QtCore/QDir>
+#include <QtCore/QRegExp>
+
 #include <QtGui/QDesktopServices>
-#include <QtCore/QRegExp>
-#include <QtCore/QDir>
 
 QString processSetupVariables(const QString& inString)
 {
diff -r f23fa42238dc -r f711ddb56ae7 DBCache.hpp
--- a/DBCache.hpp	Fri Sep 07 13:14:55 2012 +0200
+++ b/DBCache.hpp	Fri Sep 07 13:32:33 2012 +0200
@@ -1,23 +1,23 @@
 #ifndef DBCACHE_HPP
 #define DBCACHE_HPP
 
-#include <QtSql/QSqlDatabase>
-#include <QtSql/QSqlQuery>
-#include <QtSql/QSqlError>
-#include <QtSql/QSqlRecord>
+#include "OrderedPair.hpp"
+#include "ThreadSafeLookup.hpp"
+#include "UniqueString.hpp"
 
+#include "Exception/IOException.hpp"
+#include "Exception/SQLException.hpp"
 
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
-#include "OrderedPair.hpp"
+
+#include <QtSql/QSqlDatabase>
+#include <QtSql/QSqlError>
+#include <QtSql/QSqlQuery>
+#include <QtSql/QSqlRecord>
 
 #include <boost/optional.hpp>
 
-#include "ThreadSafeLookup.hpp"
-#include "UniqueString.hpp"
-#include "Exception/SQLException.hpp"
-#include "Exception/IOException.hpp"
-
 template<typename T>
 struct SQLGenerator
 {
diff -r f23fa42238dc -r f711ddb56ae7 DataController.cpp
--- a/DataController.cpp	Fri Sep 07 13:14:55 2012 +0200
+++ b/DataController.cpp	Fri Sep 07 13:32:33 2012 +0200
@@ -1,14 +1,15 @@
+#include "DataController.hpp"
+
 #include "CompileTimeConstants.h"
-#include "DataController.hpp"
+#include "ConfigurationProcessing.hpp"
 #include "EditDistance.hpp"
 #include "MemoryDBLink.hpp"
+#include "SqliteDBLink.hpp"
+
 #include "Exception/PermissionException.hpp"
-#include "SqliteDBLink.hpp"
-#include "ConfigurationProcessing.hpp"
 
 #include <QtCore/QCryptographicHash>
 #include <QtCore/QDateTime>
-
 #include <QtCore/QDir>
 #include <QtCore/QTimer>
 #include <QtCore/QUrl>
diff -r f23fa42238dc -r f711ddb56ae7 EditDistance.cpp
--- a/EditDistance.cpp	Fri Sep 07 13:14:55 2012 +0200
+++ b/EditDistance.cpp	Fri Sep 07 13:32:33 2012 +0200
@@ -1,4 +1,5 @@
 #include "EditDistance.hpp"
+
 #include "CompileTimeConstants.h"
 #include "ConfigurationProcessing.hpp"
 
diff -r f23fa42238dc -r f711ddb56ae7 EditDistance.hpp
--- a/EditDistance.hpp	Fri Sep 07 13:14:55 2012 +0200
+++ b/EditDistance.hpp	Fri Sep 07 13:32:33 2012 +0200
@@ -1,15 +1,14 @@
 #ifndef EDITDISTANCE_HPP
 #define EDITDISTANCE_HPP
 
+#include "DBCache.hpp"
 #include "OrderedPair.hpp"
-#include "DBCache.hpp"
+#include "ThreadSafeLookup.hpp"
 #include "UniqueString.hpp"
 
-#include <QtCore/QString>
+#include <QtCore/QHash>
 #include <QtCore/QMap>
-#include <QtCore/QHash>
-
-#include "ThreadSafeLookup.hpp"
+#include <QtCore/QString>
 
 class EditDistance {
 protected:
diff -r f23fa42238dc -r f711ddb56ae7 Exception/SQLException.cpp
--- a/Exception/SQLException.cpp	Fri Sep 07 13:14:55 2012 +0200
+++ b/Exception/SQLException.cpp	Fri Sep 07 13:32:33 2012 +0200
@@ -1,7 +1,7 @@
 #include "SQLException.hpp"
 
+#include <QtSql/QSqlError>
 #include <QtSql/QSqlQuery>
-#include <QtSql/QSqlError>
 
 SQLException::SQLException(const QString& errorMsg) : Exception(errorMsg)
 {
diff -r f23fa42238dc -r f711ddb56ae7 FileDBLink.cpp
--- a/FileDBLink.cpp	Fri Sep 07 13:14:55 2012 +0200
+++ b/FileDBLink.cpp	Fri Sep 07 13:32:33 2012 +0200
@@ -1,17 +1,18 @@
+#include "FileDBLink.hpp"
+
 #include "EditDistance.hpp"
-#include "FileDBLink.hpp"
+
 #include "Exception/PermissionException.hpp"
 
-
 #include <QtCore/QtConcurrentMap>
 
-#include <boost/bind.hpp>
-
 #include <algorithm>
 #include <cassert>
 #include <functional>
 #include <iostream>
 
+#include <boost/bind.hpp>
+
 void FileDBLink::updateIfModified(const QString& path)
 {
   QFileInfo fileinfo(path);
diff -r f23fa42238dc -r f711ddb56ae7 HuffmanSet.cpp
--- a/HuffmanSet.cpp	Fri Sep 07 13:14:55 2012 +0200
+++ b/HuffmanSet.cpp	Fri Sep 07 13:32:33 2012 +0200
@@ -1,6 +1,7 @@
 #include "HuffmanString.hpp"
+
+#include "Exception/InvalidDataException.hpp"
 #include "Exception/NoSuchValueException.hpp"
-#include "Exception/InvalidDataException.hpp"
 
 #include <QtCore/QHash>
 
diff -r f23fa42238dc -r f711ddb56ae7 HuffmanSet.hpp
--- a/HuffmanSet.hpp	Fri Sep 07 13:14:55 2012 +0200
+++ b/HuffmanSet.hpp	Fri Sep 07 13:32:33 2012 +0200
@@ -1,12 +1,12 @@
 #ifndef HUFFMANSET_HPP
 #define HUFFMANSET_HPP
 
+#include "BitDecoder.hpp"
+
+#include <QtCore/QBitArray>
 #include <QtCore/QMap>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
-#include <QtCore/QBitArray>
-
-#include "BitDecoder.hpp"
 
 class HuffmanSet {
 public:
diff -r f23fa42238dc -r f711ddb56ae7 HuffmanString.hpp
--- a/HuffmanString.hpp	Fri Sep 07 13:14:55 2012 +0200
+++ b/HuffmanString.hpp	Fri Sep 07 13:32:33 2012 +0200
@@ -1,8 +1,9 @@
 #ifndef HUFFMANSTRING_HPP
 #define HUFFMANSTRING_HPP
 
+#include "HuffmanSet.hpp"
+
 #include <QtCore/QString>
-#include "HuffmanSet.hpp"
 
 class HuffmanString {
   static HuffmanSet* set;
diff -r f23fa42238dc -r f711ddb56ae7 RBTree.hpp
--- a/RBTree.hpp	Fri Sep 07 13:14:55 2012 +0200
+++ b/RBTree.hpp	Fri Sep 07 13:32:33 2012 +0200
@@ -1,11 +1,11 @@
 #ifndef RBTREE_HPP
 #define RBTREE_HPP
 
-#include <boost/optional.hpp>
-#include <cmath>
 #include "Exception/ValueExistsException.hpp"
 
+#include <boost/optional.hpp>
 
+#include <cmath>
 
 #define CONSISTENCY_CHECKING 1
 
diff -r f23fa42238dc -r f711ddb56ae7 TestFramework.cpp
--- a/TestFramework.cpp	Fri Sep 07 13:14:55 2012 +0200
+++ b/TestFramework.cpp	Fri Sep 07 13:32:33 2012 +0200
@@ -1,5 +1,5 @@
+#include <QtCore/QDateTime>
 #include <QtCore/QString>
-#include <QtCore/QDateTime>
 
 std::ostream& operator<<(std::ostream& out, const QString& rhs)
 {