April 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r5334 - /branches/SuSE-Linux-10_2-Branch/updater-kde/updater/MainWindow.cpp
by tgoettlicher＠svn.opensuse.org 11 Apr '07

11 Apr '07

Author: tgoettlicher Date: Wed Apr 11 14:27:26 2007 New Revision: 5334 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5334&view=rev Log: fix unfortune default column width (#262332) Modified: branches/SuSE-Linux-10_2-Branch/updater-kde/updater/MainWindow.cpp Modified: branches/SuSE-Linux-10_2-Branch/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/update… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/updater-kde/updater/MainWindow.cpp (original) +++ branches/SuSE-Linux-10_2-Branch/updater-kde/updater/MainWindow.cpp Wed Apr 11 14:27:26 2007 @@ -173,13 +173,11 @@ header->setDescription(i18n("Available Updates: The following are software upgrades and patches to add features and fix bugs. ")); - updateList->addColumn(i18n("Name"), 300); - updateList->setColumnWidthMode(COLUMN_NAME, QListView::Manual); + updateList->addColumn(i18n("Name")); + updateList->setColumnWidthMode(COLUMN_NAME, QListView::Maximum); updateList->addColumn(i18n("Type")); updateList->addColumn(i18n("New Version")); - updateList->addColumn(i18n("Catalog"), 10000); //cover the rest of the window - updateList->setHScrollBarMode(QListView::AlwaysOff); - + updateList->addColumn(i18n("Catalog")); /* Hidden Columns, we use these to store data about the packages/patches */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r5333 - in /trunk/libzypp/devel/devel.ma: CMakeLists.txt Xml.cc
by mlandres＠svn.opensuse.org 11 Apr '07

11 Apr '07

Author: mlandres Date: Wed Apr 11 13:02:08 2007 New Revision: 5333 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5333&view=rev Log: (empty) Modified: trunk/libzypp/devel/devel.ma/CMakeLists.txt trunk/libzypp/devel/devel.ma/Xml.cc Modified: trunk/libzypp/devel/devel.ma/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/CMakeList… ============================================================================== --- trunk/libzypp/devel/devel.ma/CMakeLists.txt (original) +++ trunk/libzypp/devel/devel.ma/CMakeLists.txt Wed Apr 11 13:02:08 2007 @@ -29,7 +29,7 @@ ## ############################################################ -FOREACH( loop_var ScanSource Iorder Parse ) +FOREACH( loop_var ScanSource Iorder Parse Xml ) ADD_EXECUTABLE( ${loop_var} ${loop_var}.cc ) Modified: trunk/libzypp/devel/devel.ma/Xml.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Xml.cc?re… ============================================================================== --- trunk/libzypp/devel/devel.ma/Xml.cc (original) +++ trunk/libzypp/devel/devel.ma/Xml.cc Wed Apr 11 13:02:08 2007 @@ -90,12 +90,10 @@ && reader_r->name() == "version" ) { MIL << *reader_r << endl; - DBG << reader_r->getAttribute( "rel" ) << endl; - ERR << *reader_r << endl; - DBG << reader_r->getAttribute( "ver" ) << endl; - ERR << *reader_r << endl; - DBG << reader_r->getAttribute( "epoch" ) << endl; - ERR << *reader_r << endl; +#define _show(x) DBG << #x << " = " << reader_r->getAttribute( #x ) << endl + _show( rel ); + _show( ver ); + _show( epoch ); WAR << Edition( reader_r->getAttribute( "ver" ).asString(), reader_r->getAttribute( "rel" ).asString(), reader_r->getAttribute( "epoch" ).asString() ) << endl; @@ -172,10 +170,23 @@ { Measure m( "Parse" ); xml::Reader reader( repodata ); - if ( 0 ) - reader.foreachNode( dumpNode ); - else - reader.foreachNodeOrAttribute( dumpNode ); + + switch ( 3 ) + { + case 1: + reader.foreachNode( dumpNode ); + break; + case 2: + reader.foreachNodeOrAttribute( dumpNode ); + break; + case 3: + reader.foreachNode( dumpEd ); + break; + + default: + WAR << "NOP" << endl; + break; + } } INT << "===[END]============================================" << endl << endl; @@ -256,4 +267,4 @@ 2: ELEMENT <description> [noattr] 3: TEXT <#text> [noattr] {Fam is a file alteration monitoring service. This means that you can -*/ \ No newline at end of file +*/ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r5332 - /trunk/libzypp/devel/devel.ma/Xml.cc
by mlandres＠svn.opensuse.org 11 Apr '07

11 Apr '07

Author: mlandres Date: Wed Apr 11 12:49:16 2007 New Revision: 5332 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5332&view=rev Log: (empty) Modified: trunk/libzypp/devel/devel.ma/Xml.cc Modified: trunk/libzypp/devel/devel.ma/Xml.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Xml.cc?re… ============================================================================== --- trunk/libzypp/devel/devel.ma/Xml.cc (original) +++ trunk/libzypp/devel/devel.ma/Xml.cc Wed Apr 11 12:49:16 2007 @@ -39,39 +39,16 @@ /////////////////////////////////////////////////////////////////// template<class _Cl> - void ti( const _Cl & c ) - { - SEC << __PRETTY_FUNCTION__ << endl; - } - -/////////////////////////////////////////////////////////////////// - -bool nopNode( xml::Reader & reader_r ) + void ti( const _Cl & c ) { - return true; + SEC << __PRETTY_FUNCTION__ << endl; } /////////////////////////////////////////////////////////////////// -bool accNode( xml::Reader & reader_r ) +bool dump( xml::Reader & reader_r ) { - int i; - xml::XmlString s; -#define X(m) reader_r->m() - i=X(readState); - i=X(lineNumber); - i=X(columnNumber); - i=X(depth); - i=X(nodeType); - s=X(name); - s=X(prefix); - s=X(localName); - i=X(hasAttributes); - i=X(attributeCount); - i=X(hasValue); - s=X(value); -#undef X - return true; + MIL << *reader_r << endl; } /////////////////////////////////////////////////////////////////// @@ -79,20 +56,28 @@ bool dumpNode( xml::Reader & reader_r ) { switch ( reader_r->nodeType() ) - { + { + case XML_READER_TYPE_ELEMENT: + MIL << *reader_r << endl; + for ( int i = 0; i < reader_r->attributeCount(); ++i ) + { + MIL << " attr no " <getAttributeNo( i ) << "'" << endl; + } + break; + case XML_READER_TYPE_ATTRIBUTE: + WAR << *reader_r << endl; + break; + case XML_READER_TYPE_TEXT: case XML_READER_TYPE_CDATA: - DBG << *reader_r << endl; - break; - case XML_READER_TYPE_ELEMENT: + DBG << *reader_r << endl; + break; - MIL << *reader_r << endl; - break; default: - //WAR << *reader_r << endl; - break; - } + //ERR << *reader_r << endl; + break; + } return true; } @@ -180,7 +165,6 @@ else { repodata = "/Local/FACTORY/repodata"; - //repodata = "/Local/PATCHES/repodata"; repodata /= "primary.xml"; } @@ -188,11 +172,88 @@ { Measure m( "Parse" ); xml::Reader reader( repodata ); - //reader.foreachNodeOrAttribute( accNode ); - reader.foreachNodeOrAttribute( accNode ); + if ( 0 ) + reader.foreachNode( dumpNode ); + else + reader.foreachNodeOrAttribute( dumpNode ); } INT << "===[END]============================================" << endl << endl; return 0; } +/* +<?xml version="1.0" encoding="UTF-8"?> +<metadata xmlns="http://linux.duke.edu/metadata/common" xmlns:rpm="http://linux.duke.edu/metadata/rpm" packages="23230"> +<package type="rpm"> +<name>fam-devel</name> +<arch>ppc</arch> +<version epoch="0" ver="2.6.10" rel="141"/> +<checksum type="sha" pkgid="YES">59d6a65cdadd911fe8ceee87740a54305b2ab053</checksum> +<summary>Include Files and Libraries Mandatory for Development</summary> +<description>Fam is a file alteration monitoring service. This means that you can + +foreachNode( dumpNode ) +======================= +START MEASURE(Parse) +0:ELEMENT <metadata> [attr 3] + attr no 0 'http://linux.duke.edu/metadata/common' + attr no 1 'http://linux.duke.edu/metadata/rpm' + attr no 2 '23230' +1: ELEMENT <package> [attr 1] + attr no 0 'rpm' +2: ELEMENT <name> [noattr] +3: TEXT <#text> [noattr] {fam-devel} +2: ELEMENT <arch> [noattr] +3: TEXT <#text> [noattr] {ppc} +2: ELEMENT <version> [attr 3|empty] + attr no 0 '0' + attr no 1 '2.6.10' + attr no 2 '141' +2: ELEMENT <checksum> [attr 2] + attr no 0 'sha' + attr no 1 'YES' +3: TEXT <#text> [noattr] {59d6a65cdadd911fe8ceee87740a54305b2ab053} +2: ELEMENT <summary> [noattr] +3: TEXT <#text> [noattr] {Include Files and Libraries Mandatory for Development} +2: ELEMENT <description> [noattr] +3: TEXT <#text> [noattr] {Fam is a file alteration monitoring service. This means that you can + +foreachNodeOrAttribute( dumpNode ) +================================== +START MEASURE(Parse) +0:ELEMENT <metadata> [attr 3] + attr no 0 'http://linux.duke.edu/metadata/common' + attr no 1 'http://linux.duke.edu/metadata/rpm' + attr no 2 '23230' +1: ATTRIBUTE <xmlns> [noattr] {http://linux.duke.edu/metadata/common} +1: ATTRIBUTE <xmlns:rpm> [noattr] {http://linux.duke.edu/metadata/rpm} +1: ATTRIBUTE <packages> [noattr] {23230} +1: ELEMENT <package> [attr 1] + attr no 0 'rpm' +2: ATTRIBUTE <type> [noattr] {rpm} +2: ELEMENT <name> [noattr] +3: TEXT <#text> [noattr] {fam-devel} +2: ELEMENT <arch> [noattr] +3: TEXT <#text> [noattr] {ppc} +2: ELEMENT <version> [attr 3|empty] + attr no 0 '0' + attr no 1 '2.6.10' + attr no 2 '141' +3: ATTRIBUTE <epoch> [noattr] {0} +3: ATTRIBUTE <ver> [noattr] {2.6.10} +3: ATTRIBUTE <rel> [noattr] {141} +2: ELEMENT <checksum> [attr 2] + attr no 0 'sha' + attr no 1 'YES' +3: ATTRIBUTE <type> [noattr] {sha} +3: ATTRIBUTE <pkgid> [noattr] {YES} +3: TEXT <#text> [noattr] {59d6a65cdadd911fe8ceee87740a54305b2ab053} +3: ATTRIBUTE <type> [noattr] {sha} +3: ATTRIBUTE <pkgid> [noattr] {YES} +2: ELEMENT <summary> [noattr] +3: TEXT <#text> [noattr] {Include Files and Libraries Mandatory for Development} +2: ELEMENT <description> [noattr] +3: TEXT <#text> [noattr] {Fam is a file alteration monitoring service. This means that you can + +*/ \ No newline at end of file -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] [zypp-svn] r5331 - /branches/SuSE-Linux-10_2-Branch/updater-kde/package/opensuse-updater.changes
by tgoettlicher＠svn.opensuse.org 11 Apr '07

11 Apr '07

Author: tgoettlicher Date: Wed Apr 11 11:29:32 2007 New Revision: 5331 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5331&view=rev Log: changes Modified: branches/SuSE-Linux-10_2-Branch/updater-kde/package/opensuse-updater.changes Modified: branches/SuSE-Linux-10_2-Branch/updater-kde/package/opensuse-updater.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/update… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/updater-kde/package/opensuse-updater.changes (original) +++ branches/SuSE-Linux-10_2-Branch/updater-kde/package/opensuse-updater.changes Wed Apr 11 11:29:32 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 11 11:28:40 CEST 2007 - tgoettlicher(a)suse.de + +- fix text cut off (#220870) +- r5330 + +------------------------------------------------------------------- Tue Apr 10 16:22:48 CEST 2007 - tgoettlicher(a)suse.de - fix warning message on STDOUT (224548) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] [zypp-svn] r5330 - /branches/SuSE-Linux-10_2-Branch/updater-kde/updater/HeaderWidget.cpp
by tgoettlicher＠svn.opensuse.org 11 Apr '07

11 Apr '07

Author: tgoettlicher Date: Wed Apr 11 11:28:01 2007 New Revision: 5330 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5330&view=rev Log: fix text cut off (#220870) Modified: branches/SuSE-Linux-10_2-Branch/updater-kde/updater/HeaderWidget.cpp Modified: branches/SuSE-Linux-10_2-Branch/updater-kde/updater/HeaderWidget.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/update… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/updater-kde/updater/HeaderWidget.cpp (original) +++ branches/SuSE-Linux-10_2-Branch/updater-kde/updater/HeaderWidget.cpp Wed Apr 11 11:28:01 2007 @@ -34,8 +34,8 @@ pic->setOptimization(QPixmap::BestOptim); suseLogo->setPixmap(*pic); - layout->addWidget(suseLogo, false, Qt::AlignLeft); - layout->addWidget(text, false, Qt::AlignRight); + layout->addWidget(suseLogo); + layout->addWidget(text); layout->insertSpacing(1, 30); text->setText("Default "); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-svn] r5329 - /trunk/libzypp/zypp/PackageKeyword.h
by mlandres＠svn.opensuse.org 10 Apr '07

10 Apr '07

Author: mlandres Date: Tue Apr 10 23:38:29 2007 New Revision: 5329 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5329&view=rev Log: (empty) Modified: trunk/libzypp/zypp/PackageKeyword.h Modified: trunk/libzypp/zypp/PackageKeyword.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PackageKeyword.h?re… ============================================================================== --- trunk/libzypp/zypp/PackageKeyword.h (original) +++ trunk/libzypp/zypp/PackageKeyword.h Tue Apr 10 23:38:29 2007 @@ -25,11 +25,11 @@ /** Package keywords. */ struct PackageKeyword : public base::UniqueString<PackageKeyword> { - KeyWord() + PackageKeyword() {} - KeyWord( const std::string & name_r ) - :base::UniqueString<KeyWord>( name_r ) + PackageKeyword( const std::string & name_r ) + : base::UniqueString<PackageKeyword>( name_r ) {} }; /////////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-svn] r5328 - in /trunk/libzypp/zypp: CMakeLists.txt PackageKeyword.h base/UniqueString.h
by mlandres＠svn.opensuse.org 10 Apr '07

10 Apr '07

Author: mlandres Date: Tue Apr 10 23:22:07 2007 New Revision: 5328 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5328&view=rev Log: Added class PackageKeyword Added: trunk/libzypp/zypp/PackageKeyword.h Modified: trunk/libzypp/zypp/CMakeLists.txt trunk/libzypp/zypp/base/UniqueString.h Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=… ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Tue Apr 10 23:22:07 2007 @@ -128,6 +128,7 @@ NeedAType.h OnMediaLocation.h Package.h + PackageKeyword.h Patch.h PathInfo.h Pathname.h Added: trunk/libzypp/zypp/PackageKeyword.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PackageKeyword.h?re… ============================================================================== --- trunk/libzypp/zypp/PackageKeyword.h (added) +++ trunk/libzypp/zypp/PackageKeyword.h Tue Apr 10 23:22:07 2007 @@ -0,0 +1,40 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/PackageKeyword.h + * +*/ +#ifndef ZYPP_PACKAGEKEYWORD_H +#define ZYPP_PACKAGEKEYWORD_H + +#include "zypp/base/UniqueString.h" + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : PackageKeyword + // + /** Package keywords. */ + struct PackageKeyword : public base::UniqueString<PackageKeyword> + { + KeyWord() + {} + + KeyWord( const std::string & name_r ) + :base::UniqueString<KeyWord>( name_r ) + {} + }; + /////////////////////////////////////////////////////////////////// + + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// +#endif // ZYPP_PACKAGEKEYWORD_H Modified: trunk/libzypp/zypp/base/UniqueString.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/UniqueString.h… ============================================================================== --- trunk/libzypp/zypp/base/UniqueString.h (original) +++ trunk/libzypp/zypp/base/UniqueString.h Tue Apr 10 23:22:07 2007 @@ -30,18 +30,60 @@ // /** Immutable strings with unique representation in memory. * - * Uses CRTP to provide the unifying hash and define operators. - * All operatoins are string based. + * Each UniqueString provides a <tt>const std::string</tt>. + * This string is stored in a unifying hash, that way equal + * UniqueStrings share their string representation in memory. + * + * At the same time the unifying hash contains all the string + * values created so far. Static methods are provided to query + * the hash contents. + * + * Uses CRTP to provide the unifying hash. + * + * \code + * struct KeyWord : public base::UniqueString<KeyWord> + * { + * KeyWord() + * {} + * KeyWord( const std::string & name_r ) + * :base::UniqueString<KeyWord>( name_r ) + * {} + * }; + * + * int main( int argc, char * argv[] ) + * { + * KeyWord(); + * KeyWord( "a" ); + * KeyWord( "b" ); + * KeyWord( "c" ); + * KeyWord( "a" ); + * KeyWord( "c" ); + * + * DBG << "Known KeyWords: " << KeyWord::allSize() << endl; + * for ( KeyWord::const_iterator it = KeyWord::allBegin(); it != KeyWord::allEnd(); ++it ) + * { + * DBG << *it << endl; + * } + * + * return 0; + * } + * \endcode + * \code + * Known KeyWords: 3 + * a + * b + * c + * \endcode */ template<class _Derived> class UniqueString { protected: - /** Default ctor */ + /** Default ctor provides an empty string. */ UniqueString() {} - /** Ctor taking a name to store unified. */ + /** Ctor taking a name to store. */ UniqueString( const std::string & name_r ) { if ( !name_r.empty() ) @@ -113,90 +155,90 @@ }; /////////////////////////////////////////////////////////////////// - // operator == + /** \relates UniqueString operator == */ template<class _Derived> inline bool operator==( const UniqueString<_Derived> & lhs, const UniqueString<_Derived> & rhs ) { return ( lhs.str() == rhs.str() ); } - + /** \relates UniqueString operator == */ template<class _Derived> inline bool operator==( const UniqueString<_Derived> & lhs, const std::string & rhs ) { return ( lhs.str() == rhs ); } - + /** \relates UniqueString operator == */ template<class _Derived> inline bool operator==( const std::string & lhs, const UniqueString<_Derived> & rhs ) { return ( lhs == rhs.str() ); } - // operator != + /** \relates UniqueString operator != */ template<class _Derived> inline bool operator!=( const UniqueString<_Derived> & lhs, const UniqueString<_Derived> & rhs ) { return ( lhs.str() != rhs.str() ); } - + /** \relates UniqueString operator != */ template<class _Derived> inline bool operator!=( const UniqueString<_Derived> & lhs, const std::string & rhs ) { return ( lhs.str() != rhs ); } - + /** \relates UniqueString operator != */ template<class _Derived> inline bool operator!=( const std::string & lhs, const UniqueString<_Derived> & rhs ) { return ( lhs != rhs.str() ); } - // operator < + /** \relates UniqueString operator < */ template<class _Derived> inline bool operator<( const UniqueString<_Derived> & lhs, const UniqueString<_Derived> & rhs ) { return ( lhs.str() < rhs.str() ); } - + /** \relates UniqueString operator < */ template<class _Derived> inline bool operator<( const UniqueString<_Derived> & lhs, const std::string & rhs ) { return ( lhs.str() < rhs ); } - + /** \relates UniqueString operator < */ template<class _Derived> inline bool operator<( const std::string & lhs, const UniqueString<_Derived> & rhs ) { return ( lhs < rhs.str() ); } - // operator > + /** \relates UniqueString operator > */ template<class _Derived> inline bool operator>( const UniqueString<_Derived> & lhs, const UniqueString<_Derived> & rhs ) { return ( lhs.str() > rhs.str() ); } - + /** \relates UniqueString operator > */ template<class _Derived> inline bool operator>( const UniqueString<_Derived> & lhs, const std::string & rhs ) { return ( lhs.str() > rhs ); } - + /** \relates UniqueString operator > */ template<class _Derived> inline bool operator>( const std::string & lhs, const UniqueString<_Derived> & rhs ) { return ( lhs > rhs.str() ); } - // operator <= + /** \relates UniqueString operator <= */ template<class _Derived> inline bool operator<=( const UniqueString<_Derived> & lhs, const UniqueString<_Derived> & rhs ) { return ( lhs.str() <= rhs.str() ); } - + /** \relates UniqueString operator <= */ template<class _Derived> inline bool operator<=( const UniqueString<_Derived> & lhs, const std::string & rhs ) { return ( lhs.str() <= rhs ); } - + /** \relates UniqueString operator <= */ template<class _Derived> inline bool operator<=( const std::string & lhs, const UniqueString<_Derived> & rhs ) { return ( lhs <= rhs.str() ); } - // operator != + /** \relates UniqueString operator >= */ template<class _Derived> inline bool operator>=( const UniqueString<_Derived> & lhs, const UniqueString<_Derived> & rhs ) { return ( lhs.str() >= rhs.str() ); } - + /** \relates UniqueString operator >= */ template<class _Derived> inline bool operator>=( const UniqueString<_Derived> & lhs, const std::string & rhs ) { return ( lhs.str() >= rhs ); } - + /** \relates UniqueString operator >= */ template<class _Derived> inline bool operator>=( const std::string & lhs, const UniqueString<_Derived> & rhs ) { return ( lhs >= rhs.str() ); } - /** \relates UniqueString Stream output */ + /** \relates UniqueString Stream output */ template<class _Derived> inline std::ostream & operator<<( std::ostream & str, const UniqueString<_Derived> & obj ) { return str << obj.str(); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-svn] r5327 - /trunk/libzypp/zypp/base/Logger.h
by mlandres＠svn.opensuse.org 10 Apr '07

10 Apr '07

Author: mlandres Date: Tue Apr 10 20:00:59 2007 New Revision: 5327 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5327&view=rev Log: work around __FILE__ being defined as absolute path Modified: trunk/libzypp/zypp/base/Logger.h Modified: trunk/libzypp/zypp/base/Logger.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/Logger.h?rev=5… ============================================================================== --- trunk/libzypp/zypp/base/Logger.h (original) +++ trunk/libzypp/zypp/base/Logger.h Tue Apr 10 20:00:59 2007 @@ -59,9 +59,11 @@ #define _INT(GROUP) ZYPP_BASE_LOGGER_LOG( GROUP, zypp::base::logger::E_INT ) #define _USR(GROUP) ZYPP_BASE_LOGGER_LOG( GROUP, zypp::base::logger::E_USR ) +#define _BASEFILE ( *__FILE__ == '/' ? strrchr( __FILE__, '/' ) + 1 : __FILE__ ) + /** Actual call to @ref getStream. */ #define ZYPP_BASE_LOGGER_LOG(GROUP,LEVEL) \ - zypp::base::logger::getStream( GROUP, LEVEL, __FILE__, __FUNCTION__, __LINE__ ) + zypp::base::logger::getStream( GROUP, LEVEL, _BASEFILE, __FUNCTION__, __LINE__ ) /*@}*/ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-svn] r5326 - /branches/SuSE-Linux-10_2-Branch/updater-kde/package/opensuse-updater.changes
by tgoettlicher＠svn.opensuse.org 10 Apr '07

10 Apr '07

Author: tgoettlicher Date: Tue Apr 10 16:23:48 2007 New Revision: 5326 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5326&view=rev Log: changes Modified: branches/SuSE-Linux-10_2-Branch/updater-kde/package/opensuse-updater.changes Modified: branches/SuSE-Linux-10_2-Branch/updater-kde/package/opensuse-updater.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/update… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/updater-kde/package/opensuse-updater.changes (original) +++ branches/SuSE-Linux-10_2-Branch/updater-kde/package/opensuse-updater.changes Tue Apr 10 16:23:48 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 10 16:22:48 CEST 2007 - tgoettlicher(a)suse.de + +- fix warning message on STDOUT (224548) +- r5325 + +------------------------------------------------------------------- Tue Apr 10 13:19:08 CEST 2007 - tgoettlicher(a)suse.de - fix Software strings / Window names (#221236) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-svn] r5325 - in /branches/SuSE-Linux-10_2-Branch/updater-kde/updater: MainWindow.cpp MainWindow.h
by tgoettlicher＠svn.opensuse.org 10 Apr '07

10 Apr '07

Author: tgoettlicher Date: Tue Apr 10 16:22:29 2007 New Revision: 5325 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5325&view=rev Log: fix warning message on STDOUT (#224548) Modified: branches/SuSE-Linux-10_2-Branch/updater-kde/updater/MainWindow.cpp branches/SuSE-Linux-10_2-Branch/updater-kde/updater/MainWindow.h Modified: branches/SuSE-Linux-10_2-Branch/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/update… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/updater-kde/updater/MainWindow.cpp (original) +++ branches/SuSE-Linux-10_2-Branch/updater-kde/updater/MainWindow.cpp Tue Apr 10 16:22:29 2007 @@ -107,23 +107,28 @@ //Build GUI, setup system tray and hide GUI initially. void MainWindow::initGUI() { + centralWidget = new QWidget( this ); + setCentralWidget( centralWidget ); + + + KIconLoader *loader = KGlobal::iconLoader(); setIcon(loader->loadIcon(ICON_NAME, KIcon::Small)); - - mainBox = new QVBoxLayout(this); - header = new HeaderWidget(this); - updateList = new QListView(this); - packageDescription = new KTextEdit(this); - - configureButton = new KPushButton(i18n("Add/Remove Update Sources..."), this); - cancelButton = new KPushButton(KStdGuiItem::cancel(), this); - installButton = new KPushButton(KStdGuiItem::ok(), this); + + mainBox = new QVBoxLayout(centralWidget); + header = new HeaderWidget(centralWidget); + updateList = new QListView(centralWidget); + packageDescription = new KTextEdit(centralWidget); + + configureButton = new KPushButton(i18n("Add/Remove Update Sources..."), centralWidget); + cancelButton = new KPushButton(KStdGuiItem::cancel(), centralWidget); + installButton = new KPushButton(KStdGuiItem::ok(), centralWidget); installButton->setText(i18n("Install")); if ( _caps.canSelectIndividualUpdates ) { - selectAllButton = new KPushButton(i18n("Select All"), this); - clearSelectionButton = new KPushButton(i18n("Clear Selection"), this); + selectAllButton = new KPushButton(i18n("Select All"), centralWidget); + clearSelectionButton = new KPushButton(i18n("Clear Selection"), centralWidget); } else { Modified: branches/SuSE-Linux-10_2-Branch/updater-kde/updater/MainWindow.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/update… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/updater-kde/updater/MainWindow.h (original) +++ branches/SuSE-Linux-10_2-Branch/updater-kde/updater/MainWindow.h Tue Apr 10 16:22:29 2007 @@ -239,6 +239,9 @@ OSUpdaterPopup *popup; UpdaterCapabilities _caps; + + QWidget *centralWidget; + }; #endif -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0