include cleanup

src/CreateIndexDialog.cpp

@@ -1,6 +1,7 @@
 #include "CreateIndexDialog.h"
 #include "ui_CreateIndexDialog.h"
 #include "sqlitedb.h"
+
 #include <QMessageBox>
 #include <QPushButton>
 

src/CreateIndexDialog.h

@@ -2,6 +2,7 @@
 #define __CREATEINDEXDIALOG_H__
 
 #include <QDialog>
+
 class DBBrowserDB;
 
 namespace Ui {

src/DbStructureModel.cpp

@@ -1,6 +1,7 @@
 #include "DbStructureModel.h"
 #include "sqlitedb.h"
 #include "sqlitetablemodel.h"
+
 #include <QTreeWidgetItem>
 #include <QMimeData>
 #include <QMessageBox>

src/DbStructureModel.h

@@ -2,6 +2,7 @@
 #define __DBSTRUCTUREMODEL_H__
 
 #include <QAbstractItemModel>
+
 class DBBrowserDB;
 class QTreeWidgetItem;
 

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),

src/EditDialog.h

@@ -2,6 +2,7 @@
 #define __EDITDIALOG_H__
 
 #include <QDialog>
+
 class QHexEdit;
 
 namespace Ui {

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),

src/EditTableDialog.h

@@ -4,6 +4,7 @@
 #include "sqlitetypes.h"
 
 #include <QDialog>
+
 class DBBrowserDB;
 class SQLiteSyntaxHighlighter;
 class QTreeWidgetItem;

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),

src/ExportCsvDialog.h

@@ -2,6 +2,7 @@
 #define __EXPORTCSVDIALOG_H__
 
 #include <QDialog>
+
 class DBBrowserDB;
 
 namespace Ui {

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>
 

src/FilterTableHeader.cpp

@@ -1,4 +1,5 @@
 #include "FilterTableHeader.h"
+
 #include <QLineEdit>
 #include <QTableView>
 #include <QScrollBar>

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),

src/ImportCsvDialog.h

@@ -2,6 +2,7 @@
 #define __IMPORTCSVDIALOG_H__
 
 #include <QDialog>
+
 class DBBrowserDB;
 
 namespace Ui {

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),

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;

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;
 

src/PreferencesDialog.h

@@ -4,6 +4,7 @@
 #include <QDialog>
 #include <QVariant>
 #include <QHash>
+
 class QTreeWidgetItem;
 
 namespace Ui {

src/SqlExecutionArea.cpp

@@ -7,6 +7,7 @@
 #include "sqlitedb.h"
 #include "PreferencesDialog.h"
 #include "ExportCsvDialog.h"
+
 #include <QMenu>
 #include <QInputDialog>
 #include <QMessageBox>

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;

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) :

src/main.cpp

@@ -1,4 +1,5 @@
 #include "MainWindow.h"
+
 #include <QApplication>
 #include <QTextCodec>
 #include <QTranslator>

src/sqlitedb.cpp

@@ -9,6 +9,7 @@
 #include <QTextStream>
 #include <QSettings>
 #include <QDebug>
+#include <sqlite3.h>
 
 bool DBBrowserDB::isOpen ( ) const
 {

src/sqlitedb.h

@@ -4,11 +4,10 @@
 #include "sqlitetypes.h"
 
 #include <QStringList>
-#include <QMap>
 #include <QMultiMap>
-#include <sqlite3.h>
 
 class MainWindow;
+class sqlite3;
 
 enum
 {

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)