diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-09-19 19:14:19 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-09-19 19:14:19 +0200 |
| commit | 472ff00ef2e48383805d281c6364ec27839e3f4d (patch) | |
| tree | 6f81e83690167fc78f3bbd3dcf03cf83cdcc60f6 /apt-pkg/contrib | |
| parent | 8f3ba4e8708cb72be19dacc2af4f601ee5fea292 (diff) | |
use forward declaration in headers if possible instead of includes
Diffstat (limited to 'apt-pkg/contrib')
| -rw-r--r-- | apt-pkg/contrib/cmndline.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/contrib/cmndline.h | 4 | ||||
| -rw-r--r-- | apt-pkg/contrib/mmap.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/contrib/mmap.h | 3 | ||||
| -rw-r--r-- | apt-pkg/contrib/netrc.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/contrib/netrc.h | 4 |
6 files changed, 10 insertions, 5 deletions
diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc index 34e90da20..997f26bc7 100644 --- a/apt-pkg/contrib/cmndline.cc +++ b/apt-pkg/contrib/cmndline.cc @@ -13,6 +13,7 @@ // Include files /*{{{*/ #include<config.h> +#include <apt-pkg/configuration.h> #include <apt-pkg/cmndline.h> #include <apt-pkg/error.h> #include <apt-pkg/strutl.h> diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h index 7c0c71aa7..b201d9855 100644 --- a/apt-pkg/contrib/cmndline.h +++ b/apt-pkg/contrib/cmndline.h @@ -44,9 +44,7 @@ #ifndef PKGLIB_CMNDLINE_H #define PKGLIB_CMNDLINE_H - - -#include <apt-pkg/configuration.h> +class Configuration; class CommandLine { diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index a110a7019..f76169a92 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -21,6 +21,7 @@ #include <apt-pkg/mmap.h> #include <apt-pkg/error.h> +#include <apt-pkg/fileutl.h> #include <sys/mman.h> #include <sys/stat.h> diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index 387e9a170..2ed4a95f8 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -27,7 +27,8 @@ #include <string> -#include <apt-pkg/fileutl.h> + +class FileFd; /* This should be a 32 bit type, larger tyes use too much ram and smaller types are too small. Where ever possible 'unsigned long' should be used diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc index 9aa1376dc..cb7d36088 100644 --- a/apt-pkg/contrib/netrc.cc +++ b/apt-pkg/contrib/netrc.cc @@ -14,7 +14,9 @@ #include <config.h> #include <apt-pkg/configuration.h> +#include <apt-pkg/strutl.h> #include <apt-pkg/fileutl.h> + #include <iostream> #include <stdio.h> #include <stdlib.h> diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h index 86afa43d1..7b94eba88 100644 --- a/apt-pkg/contrib/netrc.h +++ b/apt-pkg/contrib/netrc.h @@ -14,11 +14,13 @@ #ifndef NETRC_H #define NETRC_H -#include <apt-pkg/strutl.h> +#include <string> #define DOT_CHAR "." #define DIR_CHAR "/" +class URI; + // Assume: password[0]=0, host[0] != 0. // If login[0] = 0, search for login and password within a machine section // in the netrc. |