From ea54214002c09eeb4dd498d97a564471ec9993c5 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 13 Sep 2011 10:09:00 +0200
Subject: reorder includes: add <config.h> if needed and include it at first

---
 apt-pkg/edsp.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'apt-pkg/edsp.cc')

diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index 4d2230613..44f7dbfd6 100644
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -5,6 +5,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/edsp.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
@@ -12,10 +14,10 @@
 #include <apt-pkg/policy.h>
 #include <apt-pkg/tagfile.h>
 
-#include <apti18n.h>
 #include <limits>
-
 #include <stdio.h>
+
+#include <apti18n.h>
 									/*}}}*/
 
 // we could use pkgCache::DepType and ::Priority, but these would be localized strings…
-- 
cgit v1.2.3


From 472ff00ef2e48383805d281c6364ec27839e3f4d Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 19 Sep 2011 19:14:19 +0200
Subject: use forward declaration in headers if possible instead of includes

---
 apt-pkg/edsp.cc | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'apt-pkg/edsp.cc')

diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index 44f7dbfd6..137398100 100644
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -9,17 +9,24 @@
 
 #include <apt-pkg/edsp.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/cacheset.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/version.h>
 #include <apt-pkg/policy.h>
 #include <apt-pkg/tagfile.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/progress.h>
 
 #include <limits>
 #include <stdio.h>
 
+#include <string>
+
 #include <apti18n.h>
 									/*}}}*/
 
+using std::string;
+
 // we could use pkgCache::DepType and ::Priority, but these would be localized strings…
 const char * const EDSP::PrioMap[] = {0, "important", "required", "standard",
 				      "optional", "extra"};
-- 
cgit v1.2.3