Include header cleanup.

2012-05-20 23:08:23 +02:00
parent d8d288fca2
commit 5297722ede
14 changed files with 12 additions and 15 deletions
--- a/src/core/EntryAttachments.h
+++ b/src/core/EntryAttachments.h
@@ -19,7 +19,7 @@
 #define KEEPASSX_ENTRYATTACHMENTS_H

 #include <QtCore/QMap>
-#include <QtCore/QSet>
+#include <QtCore/QObject>

 class EntryAttachments : public QObject
 {
--- a/src/format/KeePass2Writer.cpp
+++ b/src/format/KeePass2Writer.cpp
@@ -18,6 +18,7 @@
 #include "KeePass2Writer.h"

 #include <QtCore/QFile>
+#include <QtCore/QIODevice>

 #include "core/Database.h"
 #include "core/Endian.h"
--- a/src/format/KeePass2Writer.h
+++ b/src/format/KeePass2Writer.h
@@ -18,12 +18,11 @@
 #ifndef KEEPASSX_KEEPASS2WRITER_H
 #define KEEPASSX_KEEPASS2WRITER_H

-#include <QtCore/QIODevice>
-
 #include "format/KeePass2.h"
 #include "keys/CompositeKey.h"

 class Database;
+class QIODevice;

 class KeePass2Writer
 {
--- a/src/format/KeePass2XmlReader.h
+++ b/src/format/KeePass2XmlReader.h
@@ -27,7 +27,6 @@

 #include "core/TimeInfo.h"
 #include "core/Uuid.h"
-#include "crypto/SymmetricCipher.h"

 class Database;
 class Entry;
--- a/src/format/KeePass2XmlWriter.h
+++ b/src/format/KeePass2XmlWriter.h
@@ -29,7 +29,6 @@
 #include "core/TimeInfo.h"
 #include "core/Uuid.h"

-class Group;
 class KeePass2RandomStream;
 class Metadata;

--- a/src/gui/DatabaseOpenDialog.h
+++ b/src/gui/DatabaseOpenDialog.h
@@ -21,8 +21,6 @@
 #include <QtCore/QScopedPointer>
 #include <QtGui/QDialog>

-#include "keys/CompositeKey.h"
-
 class Database;
 class QFile;

--- a/src/gui/DatabaseTabWidget.h
+++ b/src/gui/DatabaseTabWidget.h
@@ -19,7 +19,6 @@
 #define KEEPASSX_DATABASETABWIDGET_H

 #include <QtCore/QHash>
-#include <QtCore/QObject>
 #include <QtGui/QTabWidget>

 #include "format/KeePass2Writer.h"
@@ -28,7 +27,6 @@
 class DatabaseWidget;
 class DatabaseOpenDialog;
 class QFile;
-class QTabWidget;

 struct DatabaseManagerStruct
 {
--- a/src/gui/DatabaseWidget.h
+++ b/src/gui/DatabaseWidget.h
@@ -18,6 +18,7 @@
 #ifndef KEEPASSX_DATABASEWIDGET_H
 #define KEEPASSX_DATABASEWIDGET_H

+#include <QtCore/QScopedPointer>
 #include <QtGui/QStackedWidget>

 class ChangeMasterKeyWidget;
--- a/src/gui/DialogyWidget.h
+++ b/src/gui/DialogyWidget.h
@@ -18,8 +18,8 @@
 #ifndef KEEPASSX_DIALOGYWIDGET_H
 #define KEEPASSX_DIALOGYWIDGET_H

-#include <QtGui/QWidget>
 #include <QtGui/QDialogButtonBox>
+#include <QtGui/QWidget>

 class DialogyWidget : public QWidget
 {
--- a/src/gui/EditWidget.h
+++ b/src/gui/EditWidget.h
@@ -19,10 +19,11 @@
 #define KEEPASSX_EDITWIDGET_H

 #include <QtCore/QScopedPointer>
-#include <QtGui/QLabel>

 #include "gui/DialogyWidget.h"

+class QLabel;
+
 namespace Ui {
    class EditWidget;
 }
--- a/src/gui/EditWidgetIcons.h
+++ b/src/gui/EditWidgetIcons.h
@@ -20,9 +20,9 @@

 #include <QtGui/QWidget>

-#include "core/Database.h"
-#include "core/Entry.h"
+#include "core/Uuid.h"

+class Database;
 class DefaultIconModel;
 class CustomIconModel;

--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -27,6 +27,7 @@
 #include <QtGui/QStackedLayout>
 #include <QtGui/QMessageBox>

+#include "core/Database.h"
 #include "core/Entry.h"
 #include "core/Metadata.h"
 #include "core/Tools.h"
--- a/src/gui/entry/EditEntryWidget.h
+++ b/src/gui/entry/EditEntryWidget.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_EDITENTRYWIDGET_H
 #define KEEPASSX_EDITENTRYWIDGET_H

-#include <QtCore/QAbstractItemModel>
+#include <QtCore/QModelIndex>
 #include <QtCore/QScopedPointer>

 #include "gui/EditWidget.h"
--- a/src/gui/group/EditGroupWidget.h
+++ b/src/gui/group/EditGroupWidget.h
@@ -20,8 +20,8 @@

 #include <QtCore/QScopedPointer>

-#include "gui/EditWidget.h"
 #include "core/Group.h"
+#include "gui/EditWidget.h"

 class EditWidgetIcons;