From d64e130aa333837a8fda0f1bba51f2867ca520f7 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 1 Mar 2014 13:55:20 +0100
Subject: [PATCH] warning: type qualifiers ignored on function return type
 [-Wignored-qualifiers]

Reported-By: gcc -Wignored-qualifiers
Git-Dch: Ignore
---
 apt-pkg/aptconfiguration.cc             | 4 ++--
 apt-pkg/aptconfiguration.h              | 4 ++--
 apt-pkg/pkgcache.h                      | 4 ++--
 apt-pkg/tagfile.cc                      | 2 +-
 apt-pkg/tagfile.h                       | 2 +-
 test/interactive-helper/aptwebserver.cc | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index 3948854c6..4c609c603 100644
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -270,7 +270,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
 }
 									/*}}}*/
 // checkLanguage - are we interested in the given Language?		/*{{{*/
-bool const Configuration::checkLanguage(std::string Lang, bool const All) {
+bool Configuration::checkLanguage(std::string Lang, bool const All) {
 	// the empty Language is always interesting as it is the original
 	if (Lang.empty() == true)
 		return true;
@@ -390,7 +390,7 @@ std::vector<std::string> const Configuration::getArchitectures(bool const &Cache
 }
 									/*}}}*/
 // checkArchitecture - are we interested in the given Architecture?	/*{{{*/
-bool const Configuration::checkArchitecture(std::string const &Arch) {
+bool Configuration::checkArchitecture(std::string const &Arch) {
 	if (Arch == "all")
 		return true;
 	std::vector<std::string> const archs = getArchitectures(true);
diff --git a/apt-pkg/aptconfiguration.h b/apt-pkg/aptconfiguration.h
index 026493c6d..dfed194ae 100644
--- a/apt-pkg/aptconfiguration.h
+++ b/apt-pkg/aptconfiguration.h
@@ -73,7 +73,7 @@ public:									/*{{{*/
 	 *  \param All defines if we check against all codes or only against used codes
 	 *  \return true if we are interested, false otherwise
 	 */
-	bool static const checkLanguage(std::string Lang, bool const All = false);
+	bool static checkLanguage(std::string Lang, bool const All = false);
 
 	/** \brief Returns a vector of Architectures we support
 	 *
@@ -89,7 +89,7 @@ public:									/*{{{*/
 	 *  \param Arch we want to check
 	 *  \return true if we are interested, false otherwise
 	 */
-	bool static const checkArchitecture(std::string const &Arch);
+	bool static checkArchitecture(std::string const &Arch);
 
 	/** \brief Representation of supported compressors */
 	struct Compressor {
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 9a88246a1..b3a714511 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -201,7 +201,7 @@ class pkgCache								/*{{{*/
    inline PkgFileIterator FileEnd();
 
    inline bool MultiArchCache() const { return MultiArchEnabled; }
-   inline char const * const NativeArch() const;
+   inline char const * NativeArch();
 
    // Make me a function
    pkgVersioningSystem *VS;
@@ -661,7 +661,7 @@ struct pkgCache::StringItem
 									/*}}}*/
 
 
-inline char const * const pkgCache::NativeArch() const
+inline char const * pkgCache::NativeArch()
 	{ return StrP + HeaderP->Architecture; }
 
 #include <apt-pkg/cacheiterators.h>
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 832a40d1e..e1459c80e 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -471,7 +471,7 @@ bool pkgTagSection::FindFlag(const char *Tag,unsigned long &Flags,
       return true;
    return FindFlag(Flags, Flag, Start, Stop);
 }
-bool const pkgTagSection::FindFlag(unsigned long &Flags, unsigned long Flag,
+bool pkgTagSection::FindFlag(unsigned long &Flags, unsigned long Flag,
 					char const* Start, char const* Stop)
 {
    switch (StringToBool(string(Start, Stop)))
diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 518d3dbcd..2f600d397 100644
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -65,7 +65,7 @@ class pkgTagSection
    unsigned long long FindULL(const char *Tag, unsigned long long const &Default = 0) const;
    bool FindFlag(const char *Tag,unsigned long &Flags,
 		 unsigned long Flag) const;
-   bool static const FindFlag(unsigned long &Flags, unsigned long Flag,
+   bool static FindFlag(unsigned long &Flags, unsigned long Flag,
 				const char* Start, const char* Stop);
    bool Scan(const char *Start,unsigned long MaxLength);
    inline unsigned long size() const {return Stop - Section;};
diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index 7ed984fa9..fb9f7d34e 100644
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -23,7 +23,7 @@
 #include <dirent.h>
 #include <signal.h>
 
-static char const * const httpcodeToStr(int const httpcode)		/*{{{*/
+static char const * httpcodeToStr(int const httpcode)		/*{{{*/
 {
    switch (httpcode)
    {
-- 
2.45.2