From: Jiri Srain Date: Tue, 6 Dec 2005 13:16:05 +0000 (+0000) Subject: moved << operator into namespace X-Git-Tag: BASE-SuSE-SLE-10-SP2-Branch~3607 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fec368b0cb72c24853a125ab02222f8b7684a1b8;p=platform%2Fupstream%2Flibzypp.git moved << operator into namespace --- diff --git a/zypp/parser/yum/YUMParserData.cc b/zypp/parser/yum/YUMParserData.cc index 4012805..d0c2990 100644 --- a/zypp/parser/yum/YUMParserData.cc +++ b/zypp/parser/yum/YUMParserData.cc @@ -145,7 +145,7 @@ namespace zypp { ++iter) { if (iter != aList.begin()) out << endl; - ::operator<<(out,*iter); + operator<<(out,*iter); } return out; } @@ -171,392 +171,390 @@ namespace zypp { return res; } + ostream& operator<<(ostream &out, const YUMDependency& data) + { + if (! data.kind.empty()) + out << "[" << data.kind << "] "; + out << data.name << " " << data.flags << " "; + if (! data.epoch.empty()) + out << data.epoch << "-"; + out << data.ver << "-" << data.rel ; + if (! data.pre.empty() && data.pre != "0") + out << " (pre=" << data.pre << ")"; + return out; + } + + ostream& operator<<(ostream &out, const YUMDirSize& data) + { + out << data.path + << ": " << data.sizeKByte << " kByte, " + << data.fileCount << " files"; + return out; + } + + ostream& operator<<(ostream &out, const FileData& data) + { + out << data.name; + if (! data.type.empty()) { + out << ": " << data.type; + } + return out; + } + + ostream& operator<<(ostream &out, const MultiLang& data) + { + if (!data.language.empty()) + out << "[" << data.language << "] "; + out << data.text; + return out; + } + + ostream& operator<<(ostream &out, const MetaPkg& data) + { + out << "type: " << data.type + << ", name: " << data.name; + return out; + } + + ostream& operator<<(ostream &out, const PackageReq& data) + { + out << "[" << data.type << "] " + << data.name + << " " << data.epoch + << "-" << data.ver + << "-" << data.rel; + return out; + } + + ostream& operator<<(ostream &out, const ChangelogEntry& data) + { + out << data.date + << " - " << data.author << endl + << data.entry; + return out; + } + + ostream& operator<<(ostream &out, const YUMRepomdData& data) + { + out << "Repomd Data: " << endl + << " type: '" << data.type << "'" << endl + << " location: '" << data.location << "'" < data) + { + out << "Atom data" << endl; + switch (data->atomType()) + { + case YUMPatchAtom::Package: + out << " atom type: " << "package" << endl + << *zypp::dynamic_pointer_cast(data); + break; + case YUMPatchAtom::Message: + out << " atom type: " << "message" << endl + << *zypp::dynamic_pointer_cast(data); + break; + case YUMPatchAtom::Script: + out << " atom type: " << "script" << endl + << *zypp::dynamic_pointer_cast(data); + break; + default: + out << "Unknown atom type" << endl; + } + return out; + } + + std::ostream& operator<<(std::ostream& out, const YUMPatchMessage& data) + { + out << "Message Data: " << endl + << " name: " << data.name << endl + << " type: " << data.type << endl + << " epoch: " << data.epoch << endl + << " version: " << data.ver << endl + << " release: " << data.rel << endl + << " provides: " << data.provides << endl + << " conflicts: " << data.conflicts << endl + << " obsoletes: " << data.obsoletes << endl + << " freshen: " << data.freshen << endl + << " requires: " << data.requires << endl + << " text: " << data.text << endl; + return out; + } + + std::ostream& operator<<(std::ostream& out, const YUMPatchScript& data) + { + out << "Script Data: " << endl + << " name: " << data.name << endl + << " epoch: " << data.epoch << endl + << " version: " << data.ver << endl + << " release: " << data.rel << endl + << " provides: " << data.provides << endl + << " conflicts: " << data.conflicts << endl + << " obsoletes: " << data.obsoletes << endl + << " freshen: " << data.freshen << endl + << " requires: " << data.requires << endl + << " do script: " << data.do_script << endl + << " undo script: " << data.undo_script << endl; + return out; + } + + std::ostream& operator<<(std::ostream& out, const YUMPatchPackage& data) + { + out << "Package Data: " << endl + << " name: '" << data.name << "'" << endl + << " type: '" << data.type << "'" << endl + << " arch: '" << data.arch << "'" << endl + << " ver: '" << data.ver << "'" << endl + << " checksumType: '" << data.checksumType << "'" << endl + << " checksumPkgid: '" << data.checksumPkgid << "'" << endl + << " checksum: '" << data.checksum << "'" << endl + << " summary: '" << data.summary << "'" << endl + << " description: '" << data.description << "'" << endl + << " packager: '" << data.packager << "'" << endl + << " url: '" << data.url << "'" << endl + << " timeFile: '" << data.timeFile << "'" << endl + << " timeBuild: '" << data.timeBuild << "'" << endl + << " sizePackage: '" << data.sizePackage << "'" << endl + << " sizeInstalled: '" << data.sizeInstalled << "'" << endl + << " sizeArchive: '" << data.sizeArchive << "'" << endl + << " location: '" << data.location << "'" << endl + << " license: '" << data.license << "'" << endl + << " vendor: '" << data.vendor << "'" << endl + << " group: '" << data.group << "'" << endl + << " buildhost: '" << data.buildhost << "'" << endl + << " sourcerpm: '" << data.sourcerpm << "'" << endl + << " headerStart: '" << data.headerStart << "'" << endl + << " headerEnd: '" << data.headerEnd << "'" << endl + << " provides:" << endl + << data.provides << endl + << " conflicts:" << endl + << data.conflicts << endl + << " obsoletes:" << endl + << data.obsoletes << endl + << " requires:" << endl + << data.requires << endl + << " files:" << endl + << data.files << endl + << " authors: " << join(data.authors,", ") << endl + << " keywords: " << join(data.keywords,", ") << endl + << " media: " << data.media << endl + << " dirsizes: " << endl + << data.dirSizes << endl + << " freshen: " << endl + << data.freshen << endl + << " install-only: '" << data.installOnly << "'" << endl + << " files:" << endl + << data.files << endl + << " Changelog:" << endl + << data.changelog << endl + << data.plainRpms + << data.patchRpms + << data.deltaRpms; + return out; + } + + std::ostream& operator<<(std::ostream& out, const YUMBaseVersion& data) + { + out << " Base version:" << endl + << " epoch: " << data.epoch << endl + << " version: " << data.ver << endl + << " release: " << data.rel << endl + << " MD5: " << data.md5sum << endl + << " build time: " << data.buildtime << endl + << " source info: " << data.source_info << endl; + return out; + } + + std::ostream& operator<<(std::ostream& out, const PlainRpm& data) + { + out << " Plain RPM:" << endl + << " arch: " << data.arch << endl + << " filename: " << data.filename << endl + << " download size: " << data.downloadsize << endl + << " MD5: " << data.md5sum << endl + << " build time: " << data.buildtime << endl; + return out; + } + + std::ostream& operator<<(std::ostream& out, const PatchRpm& data) + { + out << " Patch RPM:" << endl + << " arch: " << data.arch << endl + << " filename: " << data.filename << endl + << " download size: " << data.downloadsize << endl + << " MD5: " << data.md5sum << endl + << " build time: " << data.buildtime << endl + << data.baseVersions; + return out; + } + + std::ostream& operator<<(std::ostream& out, const DeltaRpm& data) + { + out << " Delta RPM:" << endl + << " arch: " << data.arch << endl + << " filename: " << data.filename << endl + << " download size: " << data.downloadsize << endl + << " MD5: " << data.md5sum << endl + << " build time: " << data.buildtime << endl + << data.baseVersion << endl; + return out; + } + } // namespace yum } // namespace parser } // namespace zypp - -using namespace zypp::parser::yum; - -ostream& operator<<(ostream &out, const YUMDependency& data) -{ - if (! data.kind.empty()) - out << "[" << data.kind << "] "; - out << data.name << " " << data.flags << " "; - if (! data.epoch.empty()) - out << data.epoch << "-"; - out << data.ver << "-" << data.rel ; - if (! data.pre.empty() && data.pre != "0") - out << " (pre=" << data.pre << ")"; - return out; -} - -ostream& operator<<(ostream &out, const YUMDirSize& data) -{ - out << data.path - << ": " << data.sizeKByte << " kByte, " - << data.fileCount << " files"; - return out; -} - -ostream& operator<<(ostream &out, const FileData& data) -{ - out << data.name; - if (! data.type.empty()) { - out << ": " << data.type; - } - return out; -} - -ostream& operator<<(ostream &out, const MultiLang& data) -{ - if (!data.language.empty()) - out << "[" << data.language << "] "; - out << data.text; - return out; -} - -ostream& operator<<(ostream &out, const MetaPkg& data) -{ - out << "type: " << data.type - << ", name: " << data.name; - return out; -} - -ostream& operator<<(ostream &out, const PackageReq& data) -{ - out << "[" << data.type << "] " - << data.name - << " " << data.epoch - << "-" << data.ver - << "-" << data.rel; - return out; -} - -ostream& operator<<(ostream &out, const ChangelogEntry& data) -{ - out << data.date - << " - " << data.author << endl - << data.entry; - return out; -} - -ostream& operator<<(ostream &out, const YUMRepomdData& data) -{ - out << "Repomd Data: " << endl - << " type: '" << data.type << "'" << endl - << " location: '" << data.location << "'" < data) -{ - out << "Atom data" << endl; - switch (data->atomType()) - { - case YUMPatchAtom::Package: - out << " atom type: " << "package" << endl - << *zypp::dynamic_pointer_cast(data); - break; - case YUMPatchAtom::Message: - out << " atom type: " << "message" << endl - << *zypp::dynamic_pointer_cast(data); - break; - case YUMPatchAtom::Script: - out << " atom type: " << "script" << endl - << *zypp::dynamic_pointer_cast(data); - break; - default: - out << "Unknown atom type" << endl; - } - return out; -} - -std::ostream& operator<<(std::ostream& out, const YUMPatchMessage& data) -{ - out << "Message Data: " << endl - << " name: " << data.name << endl - << " type: " << data.type << endl - << " epoch: " << data.epoch << endl - << " version: " << data.ver << endl - << " release: " << data.rel << endl - << " provides: " << data.provides << endl - << " conflicts: " << data.conflicts << endl - << " obsoletes: " << data.obsoletes << endl - << " freshen: " << data.freshen << endl - << " requires: " << data.requires << endl - << " text: " << data.text << endl; - return out; -} - -std::ostream& operator<<(std::ostream& out, const YUMPatchScript& data) -{ - out << "Script Data: " << endl - << " name: " << data.name << endl - << " epoch: " << data.epoch << endl - << " version: " << data.ver << endl - << " release: " << data.rel << endl - << " provides: " << data.provides << endl - << " conflicts: " << data.conflicts << endl - << " obsoletes: " << data.obsoletes << endl - << " freshen: " << data.freshen << endl - << " requires: " << data.requires << endl - << " do script: " << data.do_script << endl - << " undo script: " << data.undo_script << endl; - return out; -} - -std::ostream& operator<<(std::ostream& out, const YUMPatchPackage& data) -{ - out << "Package Data: " << endl - << " name: '" << data.name << "'" << endl - << " type: '" << data.type << "'" << endl - << " arch: '" << data.arch << "'" << endl - << " ver: '" << data.ver << "'" << endl - << " checksumType: '" << data.checksumType << "'" << endl - << " checksumPkgid: '" << data.checksumPkgid << "'" << endl - << " checksum: '" << data.checksum << "'" << endl - << " summary: '" << data.summary << "'" << endl - << " description: '" << data.description << "'" << endl - << " packager: '" << data.packager << "'" << endl - << " url: '" << data.url << "'" << endl - << " timeFile: '" << data.timeFile << "'" << endl - << " timeBuild: '" << data.timeBuild << "'" << endl - << " sizePackage: '" << data.sizePackage << "'" << endl - << " sizeInstalled: '" << data.sizeInstalled << "'" << endl - << " sizeArchive: '" << data.sizeArchive << "'" << endl - << " location: '" << data.location << "'" << endl - << " license: '" << data.license << "'" << endl - << " vendor: '" << data.vendor << "'" << endl - << " group: '" << data.group << "'" << endl - << " buildhost: '" << data.buildhost << "'" << endl - << " sourcerpm: '" << data.sourcerpm << "'" << endl - << " headerStart: '" << data.headerStart << "'" << endl - << " headerEnd: '" << data.headerEnd << "'" << endl - << " provides:" << endl - << data.provides << endl - << " conflicts:" << endl - << data.conflicts << endl - << " obsoletes:" << endl - << data.obsoletes << endl - << " requires:" << endl - << data.requires << endl - << " files:" << endl - << data.files << endl - << " authors: " << join(data.authors,", ") << endl - << " keywords: " << join(data.keywords,", ") << endl - << " media: " << data.media << endl - << " dirsizes: " << endl - << data.dirSizes << endl - << " freshen: " << endl - << data.freshen << endl - << " install-only: '" << data.installOnly << "'" << endl - << " files:" << endl - << data.files << endl - << " Changelog:" << endl - << data.changelog << endl - << data.plainRpms - << data.patchRpms - << data.deltaRpms; - return out; -} - -std::ostream& operator<<(std::ostream& out, const YUMBaseVersion& data) -{ - out << " Base version:" << endl - << " epoch: " << data.epoch << endl - << " version: " << data.ver << endl - << " release: " << data.rel << endl - << " MD5: " << data.md5sum << endl - << " build time: " << data.buildtime << endl - << " source info: " << data.source_info << endl; - return out; -} - -std::ostream& operator<<(std::ostream& out, const PlainRpm& data) -{ - out << " Plain RPM:" << endl - << " arch: " << data.arch << endl - << " filename: " << data.filename << endl - << " download size: " << data.downloadsize << endl - << " MD5: " << data.md5sum << endl - << " build time: " << data.buildtime << endl; - return out; -} - -std::ostream& operator<<(std::ostream& out, const PatchRpm& data) -{ - out << " Patch RPM:" << endl - << " arch: " << data.arch << endl - << " filename: " << data.filename << endl - << " download size: " << data.downloadsize << endl - << " MD5: " << data.md5sum << endl - << " build time: " << data.buildtime << endl - << data.baseVersions; - return out; -} - -std::ostream& operator<<(std::ostream& out, const DeltaRpm& data) -{ - out << " Delta RPM:" << endl - << " arch: " << data.arch << endl - << " filename: " << data.filename << endl - << " download size: " << data.downloadsize << endl - << " MD5: " << data.md5sum << endl - << " build time: " << data.buildtime << endl - << data.baseVersion << endl; - return out; -} diff --git a/zypp/parser/yum/YUMParserData.h b/zypp/parser/yum/YUMParserData.h index 47413ef..707a37e 100644 --- a/zypp/parser/yum/YUMParserData.h +++ b/zypp/parser/yum/YUMParserData.h @@ -419,38 +419,37 @@ namespace zypp { std::list description; }; + /* Easy output */ + std::ostream& operator<<(std::ostream &out, const YUMDependency& data); + std::ostream& operator<<(std::ostream &out, const YUMDirSize& data); + std::ostream& operator<<(std::ostream &out, const YUMRepomdData& data); + std::ostream& operator<<(std::ostream &out, const FileData& data); + std::ostream& operator<<(std::ostream &out, const MultiLang& data); + std::ostream& operator<<(std::ostream &out, const MetaPkg& data); + std::ostream& operator<<(std::ostream &out, const PackageReq& data); + std::ostream& operator<<(std::ostream &out, const ChangelogEntry& data); + std::ostream& operator<<(std::ostream &out, const YUMRepomdData& data); + std::ostream& operator<<(std::ostream &out, const YUMPrimaryData& data); + std::ostream& operator<<(std::ostream &out, const YUMGroupData& data); + std::ostream& operator<<(std::ostream &out, const YUMFileListData& data); + std::ostream& operator<<(std::ostream& out, const YUMOtherData& data); + std::ostream& operator<<(std::ostream& out, const YUMPatchData& data); + std::ostream& operator<<(std::ostream& out, const YUMPatchesData& data); + std::ostream& operator<<(std::ostream& out, const YUMProductData& data); + std::ostream& operator<<(std::ostream& out, const zypp::shared_ptr data); + std::ostream& operator<<(std::ostream& out, const YUMPatchMessage& data); + std::ostream& operator<<(std::ostream& out, const YUMPatchScript& data); + std::ostream& operator<<(std::ostream& out, const YUMPatchPackage& data); + std::ostream& operator<<(std::ostream& out, const YUMBaseVersion& data); + std::ostream& operator<<(std::ostream& out, const PlainRpm& data); + std::ostream& operator<<(std::ostream& out, const PatchRpm& data); + std::ostream& operator<<(std::ostream& out, const DeltaRpm& data); } // namespace yum } // namespace parser } // namespace zypp - /* Easy output */ - -std::ostream& operator<<(std::ostream &out, const zypp::parser::yum::YUMDependency& data); -std::ostream& operator<<(std::ostream &out, const zypp::parser::yum::YUMDirSize& data); -std::ostream& operator<<(std::ostream &out, const zypp::parser::yum::YUMRepomdData& data); -std::ostream& operator<<(std::ostream &out, const zypp::parser::yum::FileData& data); -std::ostream& operator<<(std::ostream &out, const zypp::parser::yum::MultiLang& data); -std::ostream& operator<<(std::ostream &out, const zypp::parser::yum::MetaPkg& data); -std::ostream& operator<<(std::ostream &out, const zypp::parser::yum::PackageReq& data); -std::ostream& operator<<(std::ostream &out, const zypp::parser::yum::ChangelogEntry& data); -std::ostream& operator<<(std::ostream &out, const zypp::parser::yum::YUMRepomdData& data); -std::ostream& operator<<(std::ostream &out, const zypp::parser::yum::YUMPrimaryData& data); -std::ostream& operator<<(std::ostream &out, const zypp::parser::yum::YUMGroupData& data); -std::ostream& operator<<(std::ostream &out, const zypp::parser::yum::YUMFileListData& data); -std::ostream& operator<<(std::ostream& out, const zypp::parser::yum::YUMOtherData& data); -std::ostream& operator<<(std::ostream& out, const zypp::parser::yum::YUMPatchData& data); -std::ostream& operator<<(std::ostream& out, const zypp::parser::yum::YUMPatchesData& data); -std::ostream& operator<<(std::ostream& out, const zypp::parser::yum::YUMProductData& data); -std::ostream& operator<<(std::ostream& out, const zypp::shared_ptr data); -std::ostream& operator<<(std::ostream& out, const zypp::parser::yum::YUMPatchMessage& data); -std::ostream& operator<<(std::ostream& out, const zypp::parser::yum::YUMPatchScript& data); -std::ostream& operator<<(std::ostream& out, const zypp::parser::yum::YUMPatchPackage& data); -std::ostream& operator<<(std::ostream& out, const zypp::parser::yum::YUMBaseVersion& data); -std::ostream& operator<<(std::ostream& out, const zypp::parser::yum::PlainRpm& data); -std::ostream& operator<<(std::ostream& out, const zypp::parser::yum::PatchRpm& data); -std::ostream& operator<<(std::ostream& out, const zypp::parser::yum::DeltaRpm& data);