From 1bac11348f1256775539c98e66ecb1b69c9c7882 Mon Sep 17 00:00:00 2001
From: Peinthor Rene <peinthor@gmail.com>
Date: Thu, 19 Sep 2013 22:55:35 +0200
Subject: [PATCH] include cleanup

---
 src/CreateIndexDialog.cpp   |  1 +
 src/CreateIndexDialog.h     |  1 +
 src/DbStructureModel.cpp    |  1 +
 src/DbStructureModel.h      |  1 +
 src/EditDialog.cpp          |  7 ++++---
 src/EditDialog.h            |  1 +
 src/EditTableDialog.cpp     |  6 +++---
 src/EditTableDialog.h       |  1 +
 src/ExportCsvDialog.cpp     |  9 +++++----
 src/ExportCsvDialog.h       |  1 +
 src/ExtendedTableWidget.cpp |  5 +++--
 src/FilterTableHeader.cpp   |  1 +
 src/ImportCsvDialog.cpp     |  4 +++-
 src/ImportCsvDialog.h       |  1 +
 src/MainWindow.cpp          | 26 ++++++++++++++------------
 src/MainWindow.h            |  5 +++--
 src/PreferencesDialog.cpp   |  3 ++-
 src/PreferencesDialog.h     |  1 +
 src/SqlExecutionArea.cpp    |  1 +
 src/SqlExecutionArea.h      |  4 +++-
 src/VacuumDialog.cpp        |  1 +
 src/main.cpp                |  1 +
 src/sqlitedb.cpp            |  1 +
 src/sqlitedb.h              |  3 +--
 src/sqlitetablemodel.cpp    |  2 ++
 25 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/src/CreateIndexDialog.cpp b/src/CreateIndexDialog.cpp
index bc119204..259a67ed 100644
--- a/src/CreateIndexDialog.cpp
+++ b/src/CreateIndexDialog.cpp
@@ -1,6 +1,7 @@
 #include "CreateIndexDialog.h"
 #include "ui_CreateIndexDialog.h"
 #include "sqlitedb.h"
+
 #include <QMessageBox>
 #include <QPushButton>
 
diff --git a/src/CreateIndexDialog.h b/src/CreateIndexDialog.h
index 6bad3d4f..56412c92 100644
--- a/src/CreateIndexDialog.h
+++ b/src/CreateIndexDialog.h
@@ -2,6 +2,7 @@
 #define __CREATEINDEXDIALOG_H__
 
 #include <QDialog>
+
 class DBBrowserDB;
 
 namespace Ui {
diff --git a/src/DbStructureModel.cpp b/src/DbStructureModel.cpp
index 7d7acd7a..5cfd4978 100644
--- a/src/DbStructureModel.cpp
+++ b/src/DbStructureModel.cpp
@@ -1,6 +1,7 @@
 #include "DbStructureModel.h"
 #include "sqlitedb.h"
 #include "sqlitetablemodel.h"
+
 #include <QTreeWidgetItem>
 #include <QMimeData>
 #include <QMessageBox>
diff --git a/src/DbStructureModel.h b/src/DbStructureModel.h
index 4703b43d..72ab5468 100644
--- a/src/DbStructureModel.h
+++ b/src/DbStructureModel.h
@@ -2,6 +2,7 @@
 #define __DBSTRUCTUREMODEL_H__
 
 #include <QAbstractItemModel>
+
 class DBBrowserDB;
 class QTreeWidgetItem;
 
diff --git a/src/EditDialog.cpp b/src/EditDialog.cpp
index 732f3f07..2c22d482 100644
--- a/src/EditDialog.cpp
+++ b/src/EditDialog.cpp
@@ -1,11 +1,12 @@
 #include "EditDialog.h"
 #include "ui_EditDialog.h"
+#include "sqlitedb.h"
+#include "PreferencesDialog.h"
+#include "src/qhexedit.h"
+
 #include <QFileDialog>
 #include <QKeySequence>
 #include <QShortcut>
-#include "sqlitedb.h"
-#include <src/qhexedit.h>
-#include "PreferencesDialog.h"
 
 EditDialog::EditDialog(QWidget* parent)
     : QDialog(parent),
diff --git a/src/EditDialog.h b/src/EditDialog.h
index 7dd7bfa8..0ee58802 100644
--- a/src/EditDialog.h
+++ b/src/EditDialog.h
@@ -2,6 +2,7 @@
 #define __EDITDIALOG_H__
 
 #include <QDialog>
+
 class QHexEdit;
 
 namespace Ui {
diff --git a/src/EditTableDialog.cpp b/src/EditTableDialog.cpp
index 6142f6bc..6b6bedbc 100644
--- a/src/EditTableDialog.cpp
+++ b/src/EditTableDialog.cpp
@@ -1,14 +1,14 @@
 #include "EditTableDialog.h"
 #include "ui_EditTableDialog.h"
 #include "SQLiteSyntaxHighlighter.h"
+#include "sqlitetablemodel.h"
+#include "sqlitedb.h"
+
 #include <QMessageBox>
 #include <QPushButton>
 #include <QComboBox>
 #include <QDateTime>
 
-#include "sqlitetablemodel.h"
-#include "sqlitedb.h"
-
 EditTableDialog::EditTableDialog(DBBrowserDB* db, const QString& tableName, QWidget* parent)
     : QDialog(parent),
       ui(new Ui::EditTableDialog),
diff --git a/src/EditTableDialog.h b/src/EditTableDialog.h
index 0d7f2c52..7ed74a7f 100644
--- a/src/EditTableDialog.h
+++ b/src/EditTableDialog.h
@@ -4,6 +4,7 @@
 #include "sqlitetypes.h"
 
 #include <QDialog>
+
 class DBBrowserDB;
 class SQLiteSyntaxHighlighter;
 class QTreeWidgetItem;
diff --git a/src/ExportCsvDialog.cpp b/src/ExportCsvDialog.cpp
index d2d722cb..c4926ead 100644
--- a/src/ExportCsvDialog.cpp
+++ b/src/ExportCsvDialog.cpp
@@ -1,13 +1,14 @@
-#include <QFile>
-#include <QTextStream>
-#include <QMessageBox>
-#include <QFileDialog>
 #include "ExportCsvDialog.h"
 #include "ui_ExportCsvDialog.h"
 #include "sqlitedb.h"
 #include "PreferencesDialog.h"
 #include "sqlitetablemodel.h"
 
+#include <QFile>
+#include <QTextStream>
+#include <QMessageBox>
+#include <QFileDialog>
+
 ExportCsvDialog::ExportCsvDialog(DBBrowserDB* db, QWidget* parent, const QString& query)
     : QDialog(parent),
       ui(new Ui::ExportCsvDialog),
diff --git a/src/ExportCsvDialog.h b/src/ExportCsvDialog.h
index a1e46625..32a45f86 100644
--- a/src/ExportCsvDialog.h
+++ b/src/ExportCsvDialog.h
@@ -2,6 +2,7 @@
 #define __EXPORTCSVDIALOG_H__
 
 #include <QDialog>
+
 class DBBrowserDB;
 
 namespace Ui {
diff --git a/src/ExtendedTableWidget.cpp b/src/ExtendedTableWidget.cpp
index 7a44357e..64583534 100644
--- a/src/ExtendedTableWidget.cpp
+++ b/src/ExtendedTableWidget.cpp
@@ -1,9 +1,10 @@
+#include "ExtendedTableWidget.h"
+#include "sqlitetablemodel.h"
+
 #include <QApplication>
 #include <QClipboard>
 #include <QKeySequence>
 #include <QKeyEvent>
-#include "ExtendedTableWidget.h"
-#include "sqlitetablemodel.h"
 #include <QScrollBar>
 #include <QHeaderView>
 
diff --git a/src/FilterTableHeader.cpp b/src/FilterTableHeader.cpp
index 926396dc..e32a6060 100644
--- a/src/FilterTableHeader.cpp
+++ b/src/FilterTableHeader.cpp
@@ -1,4 +1,5 @@
 #include "FilterTableHeader.h"
+
 #include <QLineEdit>
 #include <QTableView>
 #include <QScrollBar>
diff --git a/src/ImportCsvDialog.cpp b/src/ImportCsvDialog.cpp
index c4e50ea6..c4ce03fd 100644
--- a/src/ImportCsvDialog.cpp
+++ b/src/ImportCsvDialog.cpp
@@ -1,10 +1,12 @@
 #include "ImportCsvDialog.h"
 #include "ui_ImportCsvDialog.h"
+#include "sqlitedb.h"
+
 #include <QMessageBox>
 #include <QProgressDialog>
 #include <QPushButton>
 #include <QDateTime>
-#include "sqlitedb.h"
+#include <sqlite3.h>
 
 ImportCsvDialog::ImportCsvDialog(const QString& filename, DBBrowserDB* db, QWidget* parent)
     : QDialog(parent),
diff --git a/src/ImportCsvDialog.h b/src/ImportCsvDialog.h
index 3e8f66a9..149b5778 100644
--- a/src/ImportCsvDialog.h
+++ b/src/ImportCsvDialog.h
@@ -2,6 +2,7 @@
 #define __IMPORTCSVDIALOG_H__
 
 #include <QDialog>
+
 class DBBrowserDB;
 
 namespace Ui {
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index e756066b..7efef6b7 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -1,17 +1,5 @@
 #include "MainWindow.h"
 #include "ui_MainWindow.h"
-#include <QFileDialog>
-#include <QFile>
-#include <QApplication>
-#include <QTextStream>
-#include <QWhatsThis>
-#include <QMessageBox>
-#include <QUrl>
-#include <QStandardItemModel>
-#include <QDragEnterEvent>
-#include <QScrollBar>
-#include <QSortFilterProxyModel>
-#include <QElapsedTimer>
 
 #include "CreateIndexDialog.h"
 #include "AboutDialog.h"
@@ -28,6 +16,20 @@
 #include "VacuumDialog.h"
 #include "DbStructureModel.h"
 
+#include <QFileDialog>
+#include <QFile>
+#include <QApplication>
+#include <QTextStream>
+#include <QWhatsThis>
+#include <QMessageBox>
+#include <QUrl>
+#include <QStandardItemModel>
+#include <QDragEnterEvent>
+#include <QScrollBar>
+#include <QSortFilterProxyModel>
+#include <QElapsedTimer>
+#include <sqlite3.h>
+
 MainWindow::MainWindow(QWidget* parent)
     : QMainWindow(parent),
       ui(new Ui::MainWindow),
diff --git a/src/MainWindow.h b/src/MainWindow.h
index f4c7da74..4763e604 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -1,11 +1,12 @@
 #ifndef MAINFORM_H
 #define MAINFORM_H
 
-#include <QMainWindow>
-#include <QStandardItemModel>
 #include "sqltextedit.h"
 #include "sqlitedb.h"
 
+#include <QMainWindow>
+#include <QStandardItemModel>
+
 class QDragEnterEvent;
 class EditDialog;
 class SQLiteSyntaxHighlighter;
diff --git a/src/PreferencesDialog.cpp b/src/PreferencesDialog.cpp
index b7b8441f..77a049c1 100644
--- a/src/PreferencesDialog.cpp
+++ b/src/PreferencesDialog.cpp
@@ -1,10 +1,11 @@
 #include "PreferencesDialog.h"
 #include "ui_PreferencesDialog.h"
+#include "sqlitedb.h"
+
 #include <QDir>
 #include <QSettings>
 #include <QFileDialog>
 #include <QColorDialog>
-#include "sqlitedb.h"
 
 QHash<QString, QVariant> PreferencesDialog::m_hCache;
 
diff --git a/src/PreferencesDialog.h b/src/PreferencesDialog.h
index 4fd2e1ca..d5e649c7 100644
--- a/src/PreferencesDialog.h
+++ b/src/PreferencesDialog.h
@@ -4,6 +4,7 @@
 #include <QDialog>
 #include <QVariant>
 #include <QHash>
+
 class QTreeWidgetItem;
 
 namespace Ui {
diff --git a/src/SqlExecutionArea.cpp b/src/SqlExecutionArea.cpp
index b49aa9cd..04eb0d5a 100644
--- a/src/SqlExecutionArea.cpp
+++ b/src/SqlExecutionArea.cpp
@@ -7,6 +7,7 @@
 #include "sqlitedb.h"
 #include "PreferencesDialog.h"
 #include "ExportCsvDialog.h"
+
 #include <QMenu>
 #include <QInputDialog>
 #include <QMessageBox>
diff --git a/src/SqlExecutionArea.h b/src/SqlExecutionArea.h
index 6e920857..79c263eb 100644
--- a/src/SqlExecutionArea.h
+++ b/src/SqlExecutionArea.h
@@ -1,8 +1,10 @@
 #ifndef __SQLEXECUTIONAREA_H__
 #define __SQLEXECUTIONAREA_H__
 
-#include <QWidget>
 #include "sqltextedit.h"
+
+#include <QWidget>
+
 class SQLiteSyntaxHighlighter;
 class SqliteTableModel;
 class DBBrowserDB;
diff --git a/src/VacuumDialog.cpp b/src/VacuumDialog.cpp
index c00aa930..1252750b 100644
--- a/src/VacuumDialog.cpp
+++ b/src/VacuumDialog.cpp
@@ -1,6 +1,7 @@
 #include "VacuumDialog.h"
 #include "ui_VacuumDialog.h"
 #include "sqlitedb.h"
+
 #include <QTreeWidgetItem>
 
 VacuumDialog::VacuumDialog(DBBrowserDB* _db, QWidget* parent) :
diff --git a/src/main.cpp b/src/main.cpp
index 08ad4a98..731d3417 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,4 +1,5 @@
 #include "MainWindow.h"
+
 #include <QApplication>
 #include <QTextCodec>
 #include <QTranslator>
diff --git a/src/sqlitedb.cpp b/src/sqlitedb.cpp
index f1387c29..5c9c264c 100644
--- a/src/sqlitedb.cpp
+++ b/src/sqlitedb.cpp
@@ -9,6 +9,7 @@
 #include <QTextStream>
 #include <QSettings>
 #include <QDebug>
+#include <sqlite3.h>
 
 bool DBBrowserDB::isOpen ( ) const
 {
diff --git a/src/sqlitedb.h b/src/sqlitedb.h
index 2a6e0f33..ea76c660 100644
--- a/src/sqlitedb.h
+++ b/src/sqlitedb.h
@@ -4,11 +4,10 @@
 #include "sqlitetypes.h"
 
 #include <QStringList>
-#include <QMap>
 #include <QMultiMap>
-#include <sqlite3.h>
 
 class MainWindow;
+class sqlite3;
 
 enum
 {
diff --git a/src/sqlitetablemodel.cpp b/src/sqlitetablemodel.cpp
index e4e431c5..44d983d4 100644
--- a/src/sqlitetablemodel.cpp
+++ b/src/sqlitetablemodel.cpp
@@ -1,8 +1,10 @@
 #include "sqlitetablemodel.h"
 #include "sqlitedb.h"
+
 #include <QDebug>
 #include <QMessageBox>
 #include <QApplication>
+#include <sqlite3.h>
 
 SqliteTableModel::SqliteTableModel(QObject* parent, DBBrowserDB* db, size_t chunkSize)
     : QAbstractTableModel(parent)