Coding style fixes.

src/core/DatabaseIcons.cpp

@@ -15,9 +15,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config-keepassx.h"
 #include "DatabaseIcons.h"
 
+#include "config-keepassx.h"
+
 DatabaseIcons* DatabaseIcons::m_instance(0);
 
 QIcon DatabaseIcons::icon(int index)

src/core/Entry.cpp

@@ -17,10 +17,10 @@
 
 #include "Entry.h"
 
-#include "Database.h"
+#include "core/Database.h"
-#include "DatabaseIcons.h"
+#include "core/DatabaseIcons.h"
-#include "Group.h"
+#include "core/Group.h"
-#include "Metadata.h"
+#include "core/Metadata.h"
 
 const QStringList Entry::m_defaultAttibutes(QStringList() << "Title" << "URL" << "UserName" << "Password" << "Notes");
 

src/core/Entry.h

@@ -24,8 +24,8 @@
 #include <QtGui/QColor>
 #include <QtGui/QIcon>
 
-#include "TimeInfo.h"
+#include "core/TimeInfo.h"
-#include "Uuid.h"
+#include "core/Uuid.h"
 
 class Database;
 class Group;

src/core/Group.cpp

@@ -20,8 +20,8 @@
 
 #include "Group.h"
 
-#include "DatabaseIcons.h"
+#include "core/DatabaseIcons.h"
-#include "Metadata.h"
+#include "core/Metadata.h"
 
 Group::Group()
 {

src/core/Group.h

@@ -20,10 +20,10 @@
 
 #include <QtGui/QIcon>
 
-#include "Database.h"
+#include "core/Database.h"
-#include "Entry.h"
+#include "core/Entry.h"
-#include "TimeInfo.h"
+#include "core/TimeInfo.h"
-#include "Uuid.h"
+#include "core/Uuid.h"
 
 class Group : public QObject
 {

src/core/Metadata.cpp

@@ -17,7 +17,7 @@
 
 #include "Metadata.h"
 
-#include "Database.h"
+#include "core/Database.h"
 
 Metadata::Metadata(Database* parent)
     : QObject(parent)

src/core/Metadata.h

@@ -18,12 +18,12 @@
 #ifndef KEEPASSX_METADATA_H
 #define KEEPASSX_METADATA_H
 
-#include "Uuid.h"
-
 #include <QtCore/QDateTime>
 #include <QtCore/QHash>
 #include <QtGui/QIcon>
 
+#include "core/Uuid.h"
+
 class Database;
 class Group;
 

src/crypto/CryptoHash.cpp

@@ -17,7 +17,7 @@
 
 #include "CryptoHash.h"
 
-#include "gcrypt.h"
+#include <gcrypt.h>
 
 class CryptoHashPrivate
 {

src/crypto/SymmetricCipher.cpp

@@ -17,8 +17,8 @@
 
 #include "SymmetricCipher.h"
 
-#include "SymmetricCipherGcrypt.h"
+#include "crypto/SymmetricCipherGcrypt.h"
-#include "SymmetricCipherSalsa20.h"
+#include "crypto/SymmetricCipherSalsa20.h"
 
 SymmetricCipher::SymmetricCipher(SymmetricCipher::Algorithm algo, SymmetricCipher::Mode mode,
                                  SymmetricCipher::Direction direction, const QByteArray& key, const QByteArray& iv)

src/crypto/SymmetricCipherBackend.h

@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_SYMMETRICCIPHERBACKEND_H
 #define KEEPASSX_SYMMETRICCIPHERBACKEND_H
 
-#include "SymmetricCipher.h"
+#include "crypto/SymmetricCipher.h"
 
 class SymmetricCipherBackend
 {

src/crypto/SymmetricCipherGcrypt.h

@@ -18,10 +18,10 @@
 #ifndef KEEPASSX_SYMMETRICCIPHERGCRYPT_H
 #define KEEPASSX_SYMMETRICCIPHERGCRYPT_H
 
-#include "SymmetricCipherBackend.h"
-
 #include <gcrypt.h>
 
+#include "crypto/SymmetricCipherBackend.h"
+
 class SymmetricCipherGcrypt : public SymmetricCipherBackend
 {
 public:

src/crypto/SymmetricCipherSalsa20.h

@@ -18,8 +18,8 @@
 #ifndef KEEPASSX_SYMMETRICCIPHERSALSA20_H
 #define KEEPASSX_SYMMETRICCIPHERSALSA20_H
 
-#include "SymmetricCipherBackend.h"
+#include "crypto/SymmetricCipherBackend.h"
-#include "salsa20/ecrypt-sync.h"
+#include "crypto/salsa20/ecrypt-sync.h"
 
 class SymmetricCipherSalsa20 : public SymmetricCipherBackend
 {

src/format/KeePass2RandomStream.cpp

@@ -17,8 +17,8 @@
 
 #include "KeePass2RandomStream.h"
 
-#include "format/KeePass2.h"
 #include "crypto/CryptoHash.h"
+#include "format/KeePass2.h"
 
 KeePass2RandomStream::KeePass2RandomStream(QByteArray key)
     : m_cipher(SymmetricCipher::Salsa20, SymmetricCipher::Stream, SymmetricCipher::Encrypt,

src/gui/DatabaseWidget.cpp

@@ -20,9 +20,9 @@
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QSplitter>
 
-#include "EditEntryWidget.h"
+#include "gui/EditEntryWidget.h"
-#include "EntryView.h"
+#include "gui/EntryView.h"
-#include "GroupView.h"
+#include "gui/GroupView.h"
 
 DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
     : QStackedWidget(parent)

src/gui/EntryView.cpp

@@ -17,7 +17,7 @@
 
 #include "EntryView.h"
 
-#include "EntryModel.h"
+#include "gui/EntryModel.h"
 
 EntryView::EntryView(QWidget* parent)
     : QTreeView(parent)

src/gui/MainWindow.cpp

@@ -17,9 +17,9 @@
 
 #include "MainWindow.h"
 
-#include "DatabaseWidget.h"
 #include "core/Database.h"
 #include "core/Metadata.h"
+#include "gui/DatabaseWidget.h"
 
 MainWindow::MainWindow()
 {

src/keys/CompositeKey.h

@@ -20,7 +20,7 @@
 
 #include <QtCore/QList>
 
-#include "Key.h"
+#include "keys/Key.h"
 
 class CompositeKey : public Key
 {

src/keys/PasswordKey.h

@@ -20,7 +20,7 @@
 
 #include <QtCore/QString>
 
-#include "Key.h"
+#include "keys/Key.h"
 
 class PasswordKey : public Key
 {

src/streams/HashedBlockStream.h

@@ -20,7 +20,7 @@
 
 #include <QtCore/QSysInfo>
 
-#include "LayeredStream.h"
+#include "streams/LayeredStream.h"
 
 class HashedBlockStream : public LayeredStream
 {

src/streams/SymmetricCipherStream.h

@@ -20,8 +20,8 @@
 
 #include <QtCore/QByteArray>
 
-#include "LayeredStream.h"
 #include "crypto/SymmetricCipher.h"
+#include "streams/LayeredStream.h"
 
 class SymmetricCipherStream : public LayeredStream
 {

utils/kdbx-extract.cpp

@@ -16,6 +16,7 @@
  */
 
 #include <stdio.h>
+
 #include <QtCore/QCoreApplication>
 #include <QtCore/QFile>
 #include <QtCore/QStringList>