From 9cf9d7c2fee3faa6cbe7f1e5c21818d35bfaa4b0 Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Tue, 13 Sep 2011 09:47:09 +0200 Subject: [PATCH] Fix libzypp includes to use '<>' --- src/Command.cc | 4 ++-- src/Config.cc | 10 +++++----- src/Config.h | 2 +- src/PackageArgs.cc | 2 +- src/PackageArgs.h | 2 +- src/RequestFeedback.cc | 4 ++-- src/SolverRequester.cc | 16 ++++++++-------- src/SolverRequester.h | 6 +++--- src/Summary.cc | 12 ++++++------ src/Summary.h | 10 +++++----- src/Table.cc | 2 +- src/Zypper.cc | 18 +++++++++--------- src/Zypper.h | 18 +++++++++--------- src/callbacks/keyring.h | 10 +++++----- src/callbacks/locks.h | 6 +++--- src/callbacks/media.cc | 2 +- src/callbacks/media.h | 8 ++++---- src/callbacks/repo.h | 8 ++++---- src/callbacks/rpm.h | 8 ++++---- src/info.cc | 15 ++++++++------- src/info.h | 6 +++--- src/locks.cc | 6 +++--- src/main.cc | 4 ++-- src/misc.cc | 18 +++++++++--------- src/misc.h | 8 ++++---- src/output/Out.h | 6 +++--- src/output/OutNormal.cc | 6 +++--- src/output/OutXML.cc | 4 ++-- src/repos.cc | 22 +++++++++++----------- src/repos.h | 8 ++++---- src/search.cc | 18 +++++++++--------- src/search.h | 2 +- src/solve-commit.cc | 16 ++++++++-------- src/update.cc | 10 +++++----- src/update.h | 2 +- src/utils/Augeas.cc | 4 ++-- src/utils/Augeas.h | 4 ++-- src/utils/colors.cc | 2 +- src/utils/getopt.cc | 2 +- src/utils/messages.cc | 2 +- src/utils/misc.cc | 24 ++++++++++++------------ src/utils/misc.h | 10 +++++----- src/utils/pager.cc | 10 +++++----- src/utils/prompt.cc | 4 ++-- src/utils/richtext.cc | 4 ++-- src/zypp-refresh.cc | 24 ++++++++++++------------ 46 files changed, 195 insertions(+), 194 deletions(-) diff --git a/src/Command.cc b/src/Command.cc index b91b9c0..dfb37e3 100644 --- a/src/Command.cc +++ b/src/Command.cc @@ -7,8 +7,8 @@ #include -#include "zypp/base/Exception.h" -#include "zypp/base/String.h" +#include +#include #include "main.h" #include "Command.h" diff --git a/src/Config.cc b/src/Config.cc index 046fe9e..536a220 100644 --- a/src/Config.cc +++ b/src/Config.cc @@ -12,11 +12,11 @@ extern "C" #include } -#include "zypp/base/Logger.h" -#include "zypp/base/Measure.h" -#include "zypp/base/String.h" -#include "zypp/base/Exception.h" -#include "zypp/ZConfig.h" +#include +#include +#include +#include +#include #include "utils/Augeas.h" #include "Config.h" diff --git a/src/Config.h b/src/Config.h index 32b417f..17fa1df 100644 --- a/src/Config.h +++ b/src/Config.h @@ -11,7 +11,7 @@ #include #include -#include "zypp/Url.h" +#include #include "Command.h" #include "utils/colors.h" diff --git a/src/PackageArgs.cc b/src/PackageArgs.cc index f763ee1..c7e630e 100644 --- a/src/PackageArgs.cc +++ b/src/PackageArgs.cc @@ -10,7 +10,7 @@ */ #include -#include "zypp/base/Logger.h" +#include #include "PackageArgs.h" #include "Zypper.h" diff --git a/src/PackageArgs.h b/src/PackageArgs.h index 3f9ddcb..0aace92 100644 --- a/src/PackageArgs.h +++ b/src/PackageArgs.h @@ -18,7 +18,7 @@ #include #include -#include "zypp/Capability.h" +#include class Zypper; diff --git a/src/RequestFeedback.cc b/src/RequestFeedback.cc index d38a5e4..2022697 100644 --- a/src/RequestFeedback.cc +++ b/src/RequestFeedback.cc @@ -9,8 +9,8 @@ * */ -#include "zypp/base/LogTools.h" -#include "zypp/ui/Selectable.h" +#include +#include #include "Zypper.h" #include "misc.h" diff --git a/src/SolverRequester.cc b/src/SolverRequester.cc index a5de91c..1ff8c1d 100644 --- a/src/SolverRequester.cc +++ b/src/SolverRequester.cc @@ -10,16 +10,16 @@ * */ -#include "zypp/ZYppFactory.h" -#include "zypp/base/LogTools.h" +#include +#include -#include "zypp/PoolQuery.h" -#include "zypp/PoolItemBest.h" +#include +#include -#include "zypp/Capability.h" -#include "zypp/Resolver.h" -#include "zypp/Patch.h" -#include "zypp/ui/Selectable.h" +#include +#include +#include +#include #include "misc.h" diff --git a/src/SolverRequester.h b/src/SolverRequester.h index 6d8475d..cae76a3 100644 --- a/src/SolverRequester.h +++ b/src/SolverRequester.h @@ -15,9 +15,9 @@ #include -#include "zypp/ZConfig.h" -#include "zypp/Date.h" -#include "zypp/PoolItem.h" +#include +#include +#include #include "Command.h" #include "PackageArgs.h" diff --git a/src/Summary.cc b/src/Summary.cc index 8386099..d790c3f 100644 --- a/src/Summary.cc +++ b/src/Summary.cc @@ -10,12 +10,12 @@ #include #include -#include "zypp/base/Logger.h" -#include "zypp/base/Measure.h" -#include "zypp/ResPool.h" -#include "zypp/Patch.h" -#include "zypp/Package.h" -#include "zypp/ui/Selectable.h" +#include +#include +#include +#include +#include +#include #include "main.h" #include "utils/text.h" diff --git a/src/Summary.h b/src/Summary.h index 80ee6af..fbb91a3 100644 --- a/src/Summary.h +++ b/src/Summary.h @@ -12,11 +12,11 @@ #include #include -#include "zypp/base/PtrTypes.h" -#include "zypp/ByteCount.h" -#include "zypp/base/DefaultIntegral.h" -#include "zypp/ResObject.h" -#include "zypp/ResPool.h" +#include +#include +#include +#include +#include class Summary : private zypp::base::NonCopyable diff --git a/src/Table.cc b/src/Table.cc index 1cd87ae..0f39156 100644 --- a/src/Table.cc +++ b/src/Table.cc @@ -2,7 +2,7 @@ #include #include -#include "zypp/base/Logger.h" +#include #include "utils/console.h" #include "utils/text.h" diff --git a/src/Zypper.cc b/src/Zypper.cc index cd63f3e..259ccff 100644 --- a/src/Zypper.cc +++ b/src/Zypper.cc @@ -22,18 +22,18 @@ #include #include -#include "zypp/ZYppFactory.h" -#include "zypp/zypp_detail/ZYppReadOnlyHack.h" +#include +#include -#include "zypp/base/Logger.h" -#include "zypp/base/Algorithm.h" -#include "zypp/base/UserRequestException.h" +#include +#include +#include -#include "zypp/sat/SolvAttr.h" -#include "zypp/PoolQuery.h" -#include "zypp/Locks.h" +#include +#include +#include -#include "zypp/target/rpm/RpmHeader.h" // for install <.rpmURI> +#include // for install <.rpmURI> #include "main.h" #include "Zypper.h" diff --git a/src/Zypper.h b/src/Zypper.h index 96cb63f..d3e70f3 100644 --- a/src/Zypper.h +++ b/src/Zypper.h @@ -11,15 +11,15 @@ #include #include -#include "zypp/base/Exception.h" -#include "zypp/base/NonCopyable.h" -#include "zypp/base/PtrTypes.h" -#include "zypp/TriBool.h" - -#include "zypp/RepoInfo.h" -#include "zypp/RepoManager.h" // for RepoManagerOptions -#include "zypp/SrcPackage.h" -#include "zypp/TmpPath.h" +#include +#include +#include +#include + +#include +#include // for RepoManagerOptions +#include +#include #include "Config.h" #include "Command.h" diff --git a/src/callbacks/keyring.h b/src/callbacks/keyring.h index 824cf77..2fd1df5 100644 --- a/src/callbacks/keyring.h +++ b/src/callbacks/keyring.h @@ -12,11 +12,11 @@ #include #include -#include "zypp/base/Logger.h" -#include "zypp/ZYppCallbacks.h" -#include "zypp/Pathname.h" -#include "zypp/KeyRing.h" -#include "zypp/Digest.h" +#include +#include +#include +#include +#include #include "utils/prompt.h" diff --git a/src/callbacks/locks.h b/src/callbacks/locks.h index 4748ba8..df2c209 100644 --- a/src/callbacks/locks.h +++ b/src/callbacks/locks.h @@ -10,9 +10,9 @@ #include -#include "zypp/base/Logger.h" -#include "zypp/ZYppCallbacks.h" -#include "zypp/PoolQuery.h" +#include +#include +#include #include "utils/prompt.h" diff --git a/src/callbacks/media.cc b/src/callbacks/media.cc index fe2ab85..182b45d 100644 --- a/src/callbacks/media.cc +++ b/src/callbacks/media.cc @@ -16,7 +16,7 @@ #include "utils/prompt.h" #include "utils/misc.h" // for is_changeable_media -#include "zypp/media/MediaManager.h" +#include using namespace zypp; using namespace std; diff --git a/src/callbacks/media.h b/src/callbacks/media.h index 860dbf3..6e4e115 100644 --- a/src/callbacks/media.h +++ b/src/callbacks/media.h @@ -11,10 +11,10 @@ #include #include -#include "zypp/ZYppCallbacks.h" -#include "zypp/base/Logger.h" -#include "zypp/Pathname.h" -#include "zypp/Url.h" +#include +#include +#include +#include #include "Zypper.h" diff --git a/src/callbacks/repo.h b/src/callbacks/repo.h index 79147be..c88b0f1 100644 --- a/src/callbacks/repo.h +++ b/src/callbacks/repo.h @@ -11,10 +11,10 @@ #include #include -#include "zypp/base/Logger.h" -#include "zypp/ZYppCallbacks.h" -#include "zypp/Pathname.h" -#include "zypp/Url.h" +#include +#include +#include +#include #include "Zypper.h" #include "utils/prompt.h" diff --git a/src/callbacks/rpm.h b/src/callbacks/rpm.h index 6bb9119..1966607 100644 --- a/src/callbacks/rpm.h +++ b/src/callbacks/rpm.h @@ -14,10 +14,10 @@ #include -#include "zypp/base/Logger.h" -#include "zypp/ZYppCallbacks.h" -#include "zypp/Package.h" -#include "zypp/Patch.h" +#include +#include +#include +#include #include "Zypper.h" #include "output/prompt.h" diff --git a/src/info.cc b/src/info.cc index f0c017e..e1c8d31 100644 --- a/src/info.cc +++ b/src/info.cc @@ -9,13 +9,14 @@ #include -#include "zypp/ZYpp.h" -#include "zypp/base/Algorithm.h" -#include "zypp/Package.h" -#include "zypp/Patch.h" -#include "zypp/Pattern.h" -#include "zypp/Product.h" -#include "zypp/PoolQuery.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "Zypper.h" #include "main.h" diff --git a/src/info.h b/src/info.h index de8253e..a475a21 100644 --- a/src/info.h +++ b/src/info.h @@ -8,9 +8,9 @@ #ifndef ZYPPERINFO_H_ #define ZYPPERINFO_H_ -#include "zypp/PoolItem.h" -#include "zypp/ResKind.h" -#include "zypp/ui/Selectable.h" +#include +#include +#include #include "Zypper.h" diff --git a/src/locks.cc b/src/locks.cc index 9388ba2..d5a6517 100644 --- a/src/locks.cc +++ b/src/locks.cc @@ -1,9 +1,9 @@ #include #include -#include "zypp/base/String.h" -#include "zypp/base/Logger.h" -#include "zypp/Locks.h" +#include +#include +#include #include "output/Out.h" #include "main.h" diff --git a/src/main.cc b/src/main.cc index 81dd5f9..74fea05 100644 --- a/src/main.cc +++ b/src/main.cc @@ -2,8 +2,8 @@ #include //#include -#include "zypp/base/LogTools.h" -#include "zypp/base/LogControl.h" +#include +#include #include "main.h" #include "Zypper.h" diff --git a/src/misc.cc b/src/misc.cc index 6af8c37..15fca12 100644 --- a/src/misc.cc +++ b/src/misc.cc @@ -9,19 +9,19 @@ #include #include -#include "zypp/ZYppFactory.h" -#include "zypp/base/Logger.h" +#include +#include -#include "zypp/SrcPackage.h" -#include "zypp/Package.h" -#include "zypp/Capabilities.h" -#include "zypp/ui/Selectable.h" +#include +#include +#include +#include -#include "zypp/RepoInfo.h" +#include -#include "zypp/PoolQuery.h" -#include "zypp/PoolItemBest.h" +#include +#include #include "Zypper.h" #include "main.h" diff --git a/src/misc.h b/src/misc.h index 203fcee..d6b471d 100644 --- a/src/misc.h +++ b/src/misc.h @@ -11,10 +11,10 @@ #include #include -#include "zypp/PoolQuery.h" -#include "zypp/ResKind.h" -#include "zypp/RepoInfo.h" -#include "zypp/Capability.h" +#include +#include +#include +#include class Zypper; diff --git a/src/output/Out.h b/src/output/Out.h index 98c4b76..860bec5 100644 --- a/src/output/Out.h +++ b/src/output/Out.h @@ -3,9 +3,9 @@ #include -#include "zypp/base/NonCopyable.h" -#include "zypp/base/Exception.h" -#include "zypp/Url.h" +#include +#include +#include #include "utils/prompt.h" diff --git a/src/output/OutNormal.cc b/src/output/OutNormal.cc index 67b900b..ec8fda8 100644 --- a/src/output/OutNormal.cc +++ b/src/output/OutNormal.cc @@ -11,9 +11,9 @@ #include -#include "zypp/Pathname.h" -#include "zypp/ByteCount.h" // for download progress reporting -#include "zypp/base/String.h" // for toUpper() +#include +#include // for download progress reporting +#include // for toUpper() #include "main.h" #include "utils/colors.h" diff --git a/src/output/OutXML.cc b/src/output/OutXML.cc index 7a7f825..c1782b6 100644 --- a/src/output/OutXML.cc +++ b/src/output/OutXML.cc @@ -2,8 +2,8 @@ #include #include -#include "zypp/base/String.h" -#include "zypp/base/String.h" +#include +#include #include "OutXML.h" #include "utils/misc.h" diff --git a/src/repos.cc b/src/repos.cc index b85d54f..c13c9fd 100644 --- a/src/repos.cc +++ b/src/repos.cc @@ -13,17 +13,17 @@ #include #include -#include "zypp/ZYpp.h" -#include "zypp/base/Logger.h" -#include "zypp/base/IOStream.h" -#include "zypp/base/String.h" -#include "zypp/base/Flags.h" - -#include "zypp/RepoManager.h" -#include "zypp/repo/RepoException.h" -#include "zypp/parser/ParseException.h" -#include "zypp/media/MediaException.h" -#include "zypp/media/MediaAccess.h" +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include #include "output/Out.h" #include "main.h" diff --git a/src/repos.h b/src/repos.h index be5de6c..5b5943a 100644 --- a/src/repos.h +++ b/src/repos.h @@ -10,10 +10,10 @@ #include -#include "zypp/TriBool.h" -#include "zypp/Url.h" -#include "zypp/RepoInfo.h" -#include "zypp/ServiceInfo.h" +#include +#include +#include +#include #include "Zypper.h" diff --git a/src/search.cc b/src/search.cc index f97208c..ef9d6ef 100644 --- a/src/search.cc +++ b/src/search.cc @@ -1,16 +1,16 @@ #include -#include "zypp/ZYpp.h" // for zypp::ResPool::instance() +#include // for zypp::ResPool::instance() -#include "zypp/base/Logger.h" -#include "zypp/base/Algorithm.h" -#include "zypp/Patch.h" -#include "zypp/Pattern.h" -#include "zypp/Product.h" -#include "zypp/sat/Solvable.h" +#include +#include +#include +#include +#include +#include -#include "zypp/PoolItem.h" -#include "zypp/ResPoolProxy.h" +#include +#include #include "main.h" #include "utils/misc.h" // for kind_to_string_localized and string_patch_status diff --git a/src/search.h b/src/search.h index 8ae38f4..9fcb413 100644 --- a/src/search.h +++ b/src/search.h @@ -8,7 +8,7 @@ #ifndef ZYPPERSEARCH_H_ #define ZYPPERSEARCH_H_ -#include "zypp/TriBool.h" +#include #include "Zypper.h" #include "Table.h" diff --git a/src/solve-commit.cc b/src/solve-commit.cc index 066844c..5ec4b1b 100755 --- a/src/solve-commit.cc +++ b/src/solve-commit.cc @@ -9,14 +9,14 @@ #include #include -#include "zypp/ZYppFactory.h" -#include "zypp/base/Logger.h" -#include "zypp/FileChecker.h" -#include "zypp/base/InputStream.h" -#include "zypp/base/IOStream.h" - -#include "zypp/media/MediaException.h" -#include "zypp/misc/CheckAccessDeleted.h" +#include +#include +#include +#include +#include + +#include +#include #include "misc.h" // confirm_licenses #include "repos.h" // get_repo - used in dist_upgrade diff --git a/src/update.cc b/src/update.cc index ff160ed..ec1abbd 100755 --- a/src/update.cc +++ b/src/update.cc @@ -2,12 +2,12 @@ #include #include -#include "zypp/base/Logger.h" -#include "zypp/ZYppFactory.h" -#include "zypp/base/Algorithm.h" -#include "zypp/PoolQuery.h" +#include +#include +#include +#include -#include "zypp/Patch.h" +#include #include "SolverRequester.h" #include "Table.h" diff --git a/src/update.h b/src/update.h index 49051c4..41bcf84 100755 --- a/src/update.h +++ b/src/update.h @@ -1,4 +1,4 @@ -#include "zypp/PoolItem.h" +#include #include "Zypper.h" diff --git a/src/utils/Augeas.cc b/src/utils/Augeas.cc index 49f1c30..57b9d43 100644 --- a/src/utils/Augeas.cc +++ b/src/utils/Augeas.cc @@ -7,8 +7,8 @@ #include #include -#include "zypp/base/Logger.h" -#include "zypp/Pathname.h" +#include +#include #include "Zypper.h" #include "utils/Augeas.h" diff --git a/src/utils/Augeas.h b/src/utils/Augeas.h index 458f986..61451b2 100644 --- a/src/utils/Augeas.h +++ b/src/utils/Augeas.h @@ -15,8 +15,8 @@ extern "C" #include } -#include "zypp/base/NonCopyable.h" -#include "zypp/TriBool.h" +#include +#include /** * Zypper's wrapper around Augeas. diff --git a/src/utils/colors.cc b/src/utils/colors.cc index 02d1c51..b1ead85 100644 --- a/src/utils/colors.cc +++ b/src/utils/colors.cc @@ -10,7 +10,7 @@ #include #include -#include "zypp/base/Logger.h" +#include #include "Zypper.h" diff --git a/src/utils/getopt.cc b/src/utils/getopt.cc index 33f0cef..912aa9c 100644 --- a/src/utils/getopt.cc +++ b/src/utils/getopt.cc @@ -1,7 +1,7 @@ #include "getopt.h" #include "main.h" #include -#include "zypp/base/String.h" +#include #include "Zypper.h" using namespace std; diff --git a/src/utils/messages.cc b/src/utils/messages.cc index 4d88579..2c31370 100644 --- a/src/utils/messages.cc +++ b/src/utils/messages.cc @@ -6,7 +6,7 @@ \*---------------------------------------------------------------------------*/ #include -#include "zypp/base/String.h" +#include #include "Zypper.h" #include "messages.h" diff --git a/src/utils/misc.cc b/src/utils/misc.cc index 08e87d8..ed15e17 100644 --- a/src/utils/misc.cc +++ b/src/utils/misc.cc @@ -9,18 +9,18 @@ #include #include // for getcwd() -#include "zypp/base/Logger.h" -#include "zypp/base/String.h" -#include "zypp/base/Easy.h" -#include "zypp/base/Regex.h" -#include "zypp/media/MediaManager.h" -#include "zypp/parser/xml/XmlEscape.h" -#include "zypp/misc/CheckAccessDeleted.h" -#include "zypp/ExternalProgram.h" - -#include "zypp/PoolItem.h" -#include "zypp/Product.h" -#include "zypp/Pattern.h" +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include #include "main.h" #include "Zypper.h" diff --git a/src/utils/misc.h b/src/utils/misc.h index 81a3b94..af5ed1c 100644 --- a/src/utils/misc.h +++ b/src/utils/misc.h @@ -12,12 +12,12 @@ #include #include -#include "zypp/Url.h" -#include "zypp/Pathname.h" +#include +#include -#include "zypp/ResKind.h" -#include "zypp/RepoInfo.h" -#include "zypp/ZYppCommitPolicy.h" +#include +#include +#include class Zypper; diff --git a/src/utils/pager.cc b/src/utils/pager.cc index 929a524..be11e9a 100755 --- a/src/utils/pager.cc +++ b/src/utils/pager.cc @@ -12,11 +12,11 @@ #include //for wait() #include -#include "zypp/base/Logger.h" -#include "zypp/base/String.h" -#include "zypp/TmpPath.h" -#include "zypp/Pathname.h" -#include "zypp/PathInfo.h" +#include +#include +#include +#include +#include #include "../main.h" #include "Zypper.h" diff --git a/src/utils/prompt.cc b/src/utils/prompt.cc index 3fd06c7..db5cada 100644 --- a/src/utils/prompt.cc +++ b/src/utils/prompt.cc @@ -17,8 +17,8 @@ #include -#include "zypp/base/Logger.h" -#include "zypp/base/String.h" +#include +#include #include "Zypper.h" #include "utils/colors.h" diff --git a/src/utils/richtext.cc b/src/utils/richtext.cc index 0a26110..f4c9f61 100644 --- a/src/utils/richtext.cc +++ b/src/utils/richtext.cc @@ -3,8 +3,8 @@ #include #include -#include "zypp/base/Logger.h" -#include "zypp/base/String.h" +#include +#include using namespace std; diff --git a/src/zypp-refresh.cc b/src/zypp-refresh.cc index 7f47be1..b622b95 100644 --- a/src/zypp-refresh.cc +++ b/src/zypp-refresh.cc @@ -11,18 +11,18 @@ #include -#include "zypp/ZYppFactory.h" -#include "zypp/base/LogControl.h" -#include "zypp/base/Logger.h" -#include "zypp/base/String.h" - -#include "zypp/ZYppCallbacks.h" -#include "zypp/Pathname.h" -#include "zypp/KeyRing.h" -#include "zypp/Digest.h" - -#include "zypp/RepoManager.h" -#include "zypp/PathInfo.h" +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include #undef ZYPP_BASE_LOGGER_LOGGROUP #define ZYPP_BASE_LOGGER_LOGGROUP "zypp-refresh" -- 2.7.4