From 838e87b8253aec8831269a397315fe4f8a1a88ce Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 19 Sep 2012 00:31:08 +0200 Subject: [PATCH] sql: Include own headers first cpp files should include their own headers first (but below config.h) Change-Id: I225bc0f09988167ae7f938f7f21a77d05a3d191b Reviewed-by: Caroline Chao Reviewed-by: Mark Brand --- src/sql/drivers/tds/qsql_tds.cpp | 4 ++-- src/sql/kernel/qsqlresult.cpp | 3 ++- src/sql/models/qsqlquerymodel.cpp | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp index f383847..74f4d92 100644 --- a/src/sql/drivers/tds/qsql_tds.cpp +++ b/src/sql/drivers/tds/qsql_tds.cpp @@ -39,6 +39,8 @@ ** ****************************************************************************/ +#include "qsql_tds.h" + #include #ifdef Q_OS_WIN32 // We assume that MS SQL Server is used. Set Q_USE_SYBASE to force Sybase. // Conflicting declarations of LPCBYTE in sqlfront.h and winscard.h @@ -48,8 +50,6 @@ #define Q_USE_SYBASE #endif -#include "qsql_tds.h" - #include #include #include diff --git a/src/sql/kernel/qsqlresult.cpp b/src/sql/kernel/qsqlresult.cpp index 50a76e4..6a8f6ab 100644 --- a/src/sql/kernel/qsqlresult.cpp +++ b/src/sql/kernel/qsqlresult.cpp @@ -39,13 +39,14 @@ ** ****************************************************************************/ +#include "qsqlresult.h" + #include "qvariant.h" #include "qhash.h" #include "qregexp.h" #include "qsqlerror.h" #include "qsqlfield.h" #include "qsqlrecord.h" -#include "qsqlresult.h" #include "qvector.h" #include "qsqldriver.h" #include "qpointer.h" diff --git a/src/sql/models/qsqlquerymodel.cpp b/src/sql/models/qsqlquerymodel.cpp index 9d0447c..86627c6 100644 --- a/src/sql/models/qsqlquerymodel.cpp +++ b/src/sql/models/qsqlquerymodel.cpp @@ -40,13 +40,12 @@ ****************************************************************************/ #include "qsqlquerymodel.h" +#include "qsqlquerymodel_p.h" #include #include #include -#include "qsqlquerymodel_p.h" - QT_BEGIN_NAMESPACE #define QSQL_PREFETCH 255 -- 2.7.4