From kde-commits  Fri Apr 08 12:47:47 2016
From: =?utf-8?q?Jos=C3=A9_Manuel_Santamar=C3=ADa_Lema?= <panfaust () gmail ! com>
Date: Fri, 08 Apr 2016 12:47:47 +0000
To: kde-commits
Subject: [krecipes] src/backends: Clean up includes, update copyright holders.
Message-Id: <E1aoVpD-0005cJ-1M () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=146011967702229

Git commit 4c88c8ea6252a5153929fa4ea11926f3d6c216ab by Jos=C3=A9 Manuel San=
tamar=C3=ADa Lema.
Committed on 08/04/2016 at 11:39.
Pushed by joselema into branch 'master'.

Clean up includes, update copyright holders.

M  +13   -14   src/backends/qsqlrecipedb.cpp
M  +18   -17   src/backends/qsqlrecipedb.h

http://commits.kde.org/krecipes/4c88c8ea6252a5153929fa4ea11926f3d6c216ab

diff --git a/src/backends/qsqlrecipedb.cpp b/src/backends/qsqlrecipedb.cpp
index f2f3fe7..50e781a 100644
--- a/src/backends/qsqlrecipedb.cpp
+++ b/src/backends/qsqlrecipedb.cpp
@@ -11,31 +11,30 @@
 **************************************************************************=
**/
 =

 #include "qsqlrecipedb.h"
-#include <QSqlQuery>
-#include <QSqlField>
-#include <QSqlError>
-#include <QByteArray>
-#include <QImageWriter>
-#include <QPixmap>
-#include <QStandardItemModel>
+
 #include "datablocks/categorytree.h"
 #include "datablocks/rating.h"
 #include "datablocks/weight.h"
 #include "models/kreallingredientsmodels.h"
 #include "models/kresinglecolumnproxymodel.h"
-
 #include "propertycalculator.h"
 =

+#include <KLocale>
+#include <KMessageBox>
+#include <KCodecs>
+#include <kdebug.h>
+
+#include <QSqlQuery>
+#include <QSqlField>
+#include <QSqlError>
+#include <QByteArray>
+#include <QImageWriter>
+#include <QPixmap>
+#include <QStandardItemModel>
 #include <QBuffer>
 #include <QTextCodec>
-
 #include <QThread>
 =

-#include <kdebug.h>
-#include <kstandarddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kcodecs.h>
 =

 int QSqlRecipeDB::m_refCount =3D 0;
 =

diff --git a/src/backends/qsqlrecipedb.h b/src/backends/qsqlrecipedb.h
index 2319bb2..da8013d 100644
--- a/src/backends/qsqlrecipedb.h
+++ b/src/backends/qsqlrecipedb.h
@@ -1,32 +1,33 @@
 /*************************************************************************=
**
-*   Copyright =C2=A9 2004 Unai Garro <ugarro@gmail.com>                   =
     *
-*   Copyright =C2=A9 2004 Cyril Bosselut <bosselut@b1project.com>         =
     *
-*   Copyright =C2=A9 2004, 2006 Jason Kivlighn <jkivlighn@gmail.com>      =
     *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-**************************************************************************=
*/
+*   Copyright =C2=A9 2004 Unai Garro <ugarro@gmail.com>                   =
      *
+*   Copyright =C2=A9 2004 Cyril Bosselut <bosselut@b1project.com>         =
      *
+*   Copyright =C2=A9 2004, 2006 Jason Kivlighn <jkivlighn@gmail.com>      =
      *
+*   Copyright =C2=A9 2009-2016 Jos=C3=A9 Manuel Santamar=C3=ADa Lema <panf=
aust@gmail.com> *
+*                                                                         =
 *
+*   This program is free software; you can redistribute it and/or modify  =
 *
+*   it under the terms of the GNU General Public License as published by  =
 *
+*   the Free Software Foundation; either version 2 of the License, or     =
 *
+*   (at your option) any later version.                                   =
 *
+**************************************************************************=
**/
 =

 =

 #ifndef QSQLRECIPEDB_H
 #define QSQLRECIPEDB_H
 =

-#include "backends/recipedb.h"
-
-#include <qglobal.h>
-#include <qsqldatabase.h>
-#include <QString>
-#include <QPixmap>
-#include <QSqlQuery>
-#include <QSqlDriver>
+#include "recipedb.h"
 =

 #include "datablocks/recipe.h"
 #include "datablocks/elementlist.h"
 #include "datablocks/ingredientpropertylist.h"
 #include "datablocks/unitratiolist.h"
 =

+#include <QString>
+#include <QPixmap>
+#include <QSqlDriver>
+
+class QSqlDatabase;
+class QSqlQuery;
+
 //macro with the debug output for SQL queries
 #define KRECIPES_SQL_DEBUG_OUTPUT kDebug()
 //macro to test that 'query' was executed succesfully, in