From f6777222f82f6279c104138216b0e5e50d8caa67 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sun, 29 Nov 2015 16:57:58 +0100
Subject: drop some needlessly public declarations in libapt-private

Git-Dch: Ignore
---
 apt-private/private-cacheset.h | 6 +++---
 apt-private/private-cmndline.h | 3 ---
 apt-private/private-download.h | 6 +++---
 apt-private/private-install.h  | 4 ++--
 apt-private/private-output.h   | 2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'apt-private')

diff --git a/apt-private/private-cacheset.h b/apt-private/private-cacheset.h
index 4cbc4efa1..0f7430fa0 100644
--- a/apt-private/private-cacheset.h
+++ b/apt-private/private-cacheset.h
@@ -15,7 +15,7 @@
 
 class OpProgress;
 
-struct APT_PUBLIC VersionSortDescriptionLocality			/*{{{*/
+struct VersionSortDescriptionLocality					/*{{{*/
 {
    bool operator () (const pkgCache::VerIterator &v_lhs,
 	 const pkgCache::VerIterator &v_rhs)
@@ -65,7 +65,7 @@ bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile,
 
 
 // CacheSetHelper saving virtual packages				/*{{{*/
-class APT_PUBLIC CacheSetHelperVirtuals: public APT::CacheSetHelper {
+class CacheSetHelperVirtuals: public APT::CacheSetHelper {
 public:
    APT::PackageSet virtualPkgs;
 
@@ -78,7 +78,7 @@ public:
 									/*}}}*/
 
 // CacheSetHelperAPTGet - responsible for message telling from the CacheSets/*{{{*/
-class APT_PUBLIC CacheSetHelperAPTGet : public APT::CacheSetHelper {
+class CacheSetHelperAPTGet : public APT::CacheSetHelper {
 	/** \brief stream message should be printed to */
 	std::ostream &out;
 	/** \brief were things like Task or RegEx used to select packages? */
diff --git a/apt-private/private-cmndline.h b/apt-private/private-cmndline.h
index 05690964d..6235ef9f5 100644
--- a/apt-private/private-cmndline.h
+++ b/apt-private/private-cmndline.h
@@ -22,15 +22,12 @@ enum class APT_CMD {
    APT_MARK,
    APT_SORTPKG,
 };
-
-APT_PUBLIC bool ShowHelp(CommandLine &CmdL) APT_WEAK;
 struct aptDispatchWithHelp
 {
    const char *Match;
    bool (*Handler)(CommandLine &);
    const char *Help;
 };
-APT_PUBLIC std::vector<aptDispatchWithHelp> GetCommands() APT_WEAK;
 
 APT_PUBLIC std::vector<CommandLine::Dispatch> ParseCommandLine(CommandLine &CmdL, APT_CMD const Binary,
       Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char * argv[],
diff --git a/apt-private/private-download.h b/apt-private/private-download.h
index 587165166..d829e8b24 100644
--- a/apt-private/private-download.h
+++ b/apt-private/private-download.h
@@ -10,15 +10,15 @@
 #include <vector>
 
 // Check if all files in the fetcher are authenticated
-APT_PUBLIC bool CheckAuth(pkgAcquire& Fetcher, bool const PromptUser);
+bool CheckAuth(pkgAcquire& Fetcher, bool const PromptUser);
 
 // show a authentication warning prompt and return true if the system
 // should continue
-APT_PUBLIC bool AuthPrompt(std::vector<std::string> const &UntrustedList, bool const PromptUser);
+bool AuthPrompt(std::vector<std::string> const &UntrustedList, bool const PromptUser);
 
 APT_PUBLIC bool AcquireRun(pkgAcquire &Fetcher, int const PulseInterval, bool * const Failure, bool * const TransientNetworkFailure);
 
-APT_PUBLIC bool CheckFreeSpaceBeforeDownload(std::string const &Dir, unsigned long long FetchBytes);
+bool CheckFreeSpaceBeforeDownload(std::string const &Dir, unsigned long long FetchBytes);
 
 class APT_PUBLIC aptAcquireWithTextStatus : public pkgAcquire
 {
diff --git a/apt-private/private-install.h b/apt-private/private-install.h
index 551787c38..7a8cd5513 100644
--- a/apt-private/private-install.h
+++ b/apt-private/private-install.h
@@ -28,7 +28,7 @@ APT_PUBLIC bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
 
 
 // TryToInstall - Mark a package for installation			/*{{{*/
-struct APT_PUBLIC TryToInstall {
+struct TryToInstall {
    pkgCacheFile* Cache;
    pkgProblemResolver* Fix;
    bool FixBroken;
@@ -44,7 +44,7 @@ struct APT_PUBLIC TryToInstall {
 };
 									/*}}}*/
 // TryToRemove - Mark a package for removal				/*{{{*/
-struct APT_PUBLIC TryToRemove {
+struct TryToRemove {
    pkgCacheFile* Cache;
    pkgProblemResolver* Fix;
    bool PurgePkgs;
diff --git a/apt-private/private-output.h b/apt-private/private-output.h
index 4930fd981..8e4b50ed1 100644
--- a/apt-private/private-output.h
+++ b/apt-private/private-output.h
@@ -34,7 +34,7 @@ void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records,
 APT_PUBLIC void ShowBroken(std::ostream &out, CacheFile &Cache, bool const Now);
 APT_PUBLIC void ShowBroken(std::ostream &out, pkgCacheFile &Cache, bool const Now);
 
-template<class Container, class PredicateC, class DisplayP, class DisplayV> APT_PUBLIC bool ShowList(std::ostream &out, std::string const &Title,
+template<class Container, class PredicateC, class DisplayP, class DisplayV> bool ShowList(std::ostream &out, std::string const &Title,
       Container const &cont,
       PredicateC Predicate,
       DisplayP PkgDisplay,
-- 
cgit v1.2.3