Git commit d936a63f8269499db1a8fac74174a57128434d78 by Jos=C3=A9 Manuel San=
tamar=C3=ADa Lema.
Committed on 08/04/2016 at 12:10.
Pushed by joselema into branch 'master'.

Reorder includes, update copyright holders.

M  +35   -41   src/backends/recipedb.cpp
M  +18   -16   src/backends/recipedb.h

http://commits.kde.org/krecipes/d936a63f8269499db1a8fac74174a57128434d78

diff --git a/src/backends/recipedb.cpp b/src/backends/recipedb.cpp
index affbffc..d36bfcd 100644
--- a/src/backends/recipedb.cpp
+++ b/src/backends/recipedb.cpp
@@ -1,62 +1,56 @@
 /*************************************************************************=
**
-*   Copyright =C2=A9 2003 Unai Garro <ugarro@gmail.com>                   =
     *
-*   Copyright =C2=A9 2003 Cyril Bosselut <bosselut@b1project.com>         =
     *
-*   Copyright =C2=A9 2003-2006 Jason Kivlighn <jkivlighn@gmail.com>       =
     *
-*   Copyright =C2=A9 2009 Jos=C3=A9 Manuel Santamar=C3=ADa Lema <panfaust@=
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 2003 Unai Garro <ugarro@gmail.com>                   =
      *
+*   Copyright =C2=A9 2003 Cyril Bosselut <bosselut@b1project.com>         =
      *
+*   Copyright =C2=A9 2003-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.                                   =
 *
+**************************************************************************=
**/
 =

 #include "recipedb.h"
 =

-#include <kapplication.h>
-#include <kconfiggroup.h>
-#include <kdebug.h>
-#include <kstandarddirs.h>
-#include <kprogressdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kaboutdata.h>
+#include "PostgreSQL/psqlrecipedb.h"
+#include "MySQL/mysqlrecipedb.h"
+#include "SQLite/literecipedb.h"
+#include "searchparameters.h"
+#include "usda_property_data.h"
+#include "usda_ingredient_data.h"
+#include "usda_unit_data.h"
+#include "krecipesdbadaptor.h"
+#include "importers/kreimporter.h"
+#include "datablocks/categorytree.h"
+#include "datablocks/ingredientpropertylist.h"
+#include "datablocks/weight.h"
+
+#include <KApplication>
+#include <KConfigGroup>
+#include <KStandardDirs>
+#include <KProgressDialog>
+#include <KGlobal>
+#include <KLocale>
+#include <KAboutData>
 #include <KProcess>
+#include <KFilterDev>
+#include <KMessageBox>
+#include <kdebug.h>
+
 #include <QEventLoop>
 #include <QTimer>
-#include <kfilterdev.h>
-#include <kmessagebox.h>
-
 #include <QFile>
 #include <QList>
 #include <QStringList>
 #include <KStandardDirs>
-//Added by qt3to4:
 #include <Q3ValueList>
 #include <QTextStream>
 =

 #include <map>
 =

-#include "importers/kreimporter.h"
-
-#include "PostgreSQL/psqlrecipedb.h"
-
-#include "MySQL/mysqlrecipedb.h"
-
-#include "SQLite/literecipedb.h"
-
-#include "datablocks/categorytree.h"
-#include "datablocks/ingredientpropertylist.h"
-#include "datablocks/weight.h"
-
-#include "searchparameters.h"
-
-#include "usda_property_data.h"
-#include "usda_ingredient_data.h"
-#include "usda_unit_data.h"
-#include "krecipesdbadaptor.h"
-
 #define DB_FILENAME "krecipes.krecdb"
 =

+
 struct ingredient_nutrient_data
 {
 	int usda_id;
diff --git a/src/backends/recipedb.h b/src/backends/recipedb.h
index ffc8262..5f41d61 100644
--- a/src/backends/recipedb.h
+++ b/src/backends/recipedb.h
@@ -1,33 +1,35 @@
 /*************************************************************************=
**
-*   Copyright =C2=A9 2003 Unai Garro <ugarro@gmail.com>                   =
     *
-*   Copyright =C2=A9 2003 Cyril Bosselut <bosselut@b1project.com>         =
     *
-*   Copyright =C2=A9 2003-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 2003 Unai Garro <ugarro@gmail.com>                   =
      *
+*   Copyright =C2=A9 2003 Cyril Bosselut <bosselut@b1project.com>         =
      *
+*   Copyright =C2=A9 2003-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 RECIPEDB_H
 #define RECIPEDB_H
 =

-#include <limits.h> /* needed for INT_MAX */
+#include "datablocks/recipe.h"
+#include "datablocks/recipelist.h"
+#include "datablocks/elementlist.h"
+#include "datablocks/ingredientpropertylist.h"
+#include "datablocks/unitratiolist.h"
+#include "datablocks/unit.h"
 =

 #include <QObject>
 #include <QString>
 #include <QList>
 #include <QMultiHash>
 =

+#include <limits.h> /* needed for INT_MAX */
+
 class QEventLoop;
 class QTimer;
 =

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

 #define DEFAULT_DB_NAME "Krecipes"
 =