Author: lslezak Date: Wed Jan 2 16:47:44 2008 New Revision: 43255 URL: http://svn.opensuse.org/viewcvs/yast?rev=43255&view=rev Log: - moved implementation details from Callbacks.YCP.h to Callbacks.YCP.cc Modified: trunk/pkg-bindings/src/Callbacks.YCP.cc trunk/pkg-bindings/src/Callbacks.YCP.h trunk/pkg-bindings/src/PkgModuleFunctions.h Modified: trunk/pkg-bindings/src/Callbacks.YCP.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.YCP.cc?rev=43255&r1=43254&r2=43255&view=diff ============================================================================== --- trunk/pkg-bindings/src/Callbacks.YCP.cc (original) +++ trunk/pkg-bindings/src/Callbacks.YCP.cc Wed Jan 2 16:47:44 2008 @@ -22,6 +22,115 @@ #include "Callbacks.YCP.h" +#include +#include + + /** + * Returns the enum name without the leading "CB_" + * (e.g. "StartProvide" for CB_StartProvide). Should + * be in sync with @ref CBid. + **/ + string PkgModuleFunctions::CallbackHandler::YCPCallbacks::cbName( CBid id_r ) { + switch ( id_r ) { +#define ENUM_OUT(N) case CB_##N: return #N + ENUM_OUT( StartRebuildDb ); + ENUM_OUT( ProgressRebuildDb ); + ENUM_OUT( NotifyRebuildDb ); + ENUM_OUT( StopRebuildDb ); + ENUM_OUT( StartConvertDb ); + ENUM_OUT( ProgressConvertDb ); + ENUM_OUT( NotifyConvertDb ); + ENUM_OUT( StopConvertDb ); + ENUM_OUT( StartScanDb ); + ENUM_OUT( ProgressScanDb ); + ENUM_OUT( ErrorScanDb ); + ENUM_OUT( DoneScanDb ); + + ENUM_OUT( StartProvide ); + ENUM_OUT( ProgressProvide ); + ENUM_OUT( DoneProvide ); + ENUM_OUT( StartPackage ); + ENUM_OUT( ProgressPackage ); + ENUM_OUT( DonePackage ); + ENUM_OUT( StartDownload ); + ENUM_OUT( ProgressDownload ); + ENUM_OUT( DoneDownload ); + ENUM_OUT( InitDownload ); + ENUM_OUT( DestDownload ); + + ENUM_OUT( ScriptStart ); + ENUM_OUT( ScriptProgress ); + ENUM_OUT( ScriptProblem ); + ENUM_OUT( ScriptFinish ); + ENUM_OUT( Message ); + + ENUM_OUT( Authentication ); + + ENUM_OUT( SourceCreateStart ); + ENUM_OUT( SourceCreateProgress ); + ENUM_OUT( SourceCreateError ); + ENUM_OUT( SourceCreateEnd ); + ENUM_OUT( SourceCreateInit ); + ENUM_OUT( SourceCreateDestroy ); + + ENUM_OUT( SourceProbeStart ); + ENUM_OUT( SourceProbeFailed ); + ENUM_OUT( SourceProbeSucceeded ); + ENUM_OUT( SourceProbeEnd ); + ENUM_OUT( SourceProbeProgress ); + ENUM_OUT( SourceProbeError ); + + ENUM_OUT( SourceReportStart ); + ENUM_OUT( SourceReportProgress ); + ENUM_OUT( SourceReportError ); + ENUM_OUT( SourceReportEnd ); + ENUM_OUT( SourceReportInit ); + ENUM_OUT( SourceReportDestroy ); + + ENUM_OUT( ProgressStart ); + ENUM_OUT( ProgressProgress ); + ENUM_OUT( ProgressDone ); + + ENUM_OUT( StartSourceRefresh ); + ENUM_OUT( ErrorSourceRefresh ); + ENUM_OUT( DoneSourceRefresh ); + ENUM_OUT( ProgressSourceRefresh ); + ENUM_OUT( StartDeltaDownload ); + ENUM_OUT( ProgressDeltaDownload ); + ENUM_OUT( ProblemDeltaDownload ); + ENUM_OUT( StartDeltaApply ); + ENUM_OUT( ProgressDeltaApply ); + ENUM_OUT( ProblemDeltaApply ); + ENUM_OUT( StartPatchDownload ); + ENUM_OUT( ProgressPatchDownload ); + ENUM_OUT( ProblemPatchDownload ); + ENUM_OUT( FinishDeltaDownload ); + ENUM_OUT( FinishDeltaApply ); + ENUM_OUT( FinishPatchDownload ); + ENUM_OUT( MediaChange ); + ENUM_OUT( SourceChange ); + ENUM_OUT( ResolvableReport ); + ENUM_OUT( ImportGpgKey ); + ENUM_OUT( AcceptNonTrustedGpgKey ); + ENUM_OUT( AcceptUnknownGpgKey ); + ENUM_OUT( AcceptUnsignedFile ); + ENUM_OUT( AcceptVerificationFailed ); + ENUM_OUT( AcceptFileWithoutChecksum ); + ENUM_OUT( TrustedKeyAdded ); + ENUM_OUT( TrustedKeyRemoved ); + ENUM_OUT( AcceptWrongDigest ); + ENUM_OUT( AcceptUnknownDigest ); + + ENUM_OUT( ProcessStart ); + ENUM_OUT( ProcessNextStage ); + ENUM_OUT( ProcessProgress ); + ENUM_OUT( ProcessFinished ); +#undef ENUM_OUT + // no default! let compiler warn missing values + } + return stringutil::form( "CBid(%d)", id_r ); + } + void PkgModuleFunctions::CallbackHandler::YCPCallbacks::popCallback( CBid id_r ) { _cbdata_t::iterator tmp1 = _cbdata.find(id_r); if (tmp1 != _cbdata.end() && !tmp1->second.empty()) Modified: trunk/pkg-bindings/src/Callbacks.YCP.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.YCP.h?rev=43255&r1=43254&r2=43255&view=diff ============================================================================== --- trunk/pkg-bindings/src/Callbacks.YCP.h (original) +++ trunk/pkg-bindings/src/Callbacks.YCP.h Wed Jan 2 16:47:44 2008 @@ -28,8 +28,6 @@ //#include //#include -#include -#include #include #include @@ -116,107 +114,7 @@ * (e.g. "StartProvide" for CB_StartProvide). Should * be in sync with @ref CBid. **/ - static string cbName( CBid id_r ) { - switch ( id_r ) { -#define ENUM_OUT(N) case CB_##N: return #N - ENUM_OUT( StartRebuildDb ); - ENUM_OUT( ProgressRebuildDb ); - ENUM_OUT( NotifyRebuildDb ); - ENUM_OUT( StopRebuildDb ); - ENUM_OUT( StartConvertDb ); - ENUM_OUT( ProgressConvertDb ); - ENUM_OUT( NotifyConvertDb ); - ENUM_OUT( StopConvertDb ); - ENUM_OUT( StartScanDb ); - ENUM_OUT( ProgressScanDb ); - ENUM_OUT( ErrorScanDb ); - ENUM_OUT( DoneScanDb ); - - ENUM_OUT( StartProvide ); - ENUM_OUT( ProgressProvide ); - ENUM_OUT( DoneProvide ); - ENUM_OUT( StartPackage ); - ENUM_OUT( ProgressPackage ); - ENUM_OUT( DonePackage ); - ENUM_OUT( StartDownload ); - ENUM_OUT( ProgressDownload ); - ENUM_OUT( DoneDownload ); - ENUM_OUT( InitDownload ); - ENUM_OUT( DestDownload ); - - ENUM_OUT( ScriptStart ); - ENUM_OUT( ScriptProgress ); - ENUM_OUT( ScriptProblem ); - ENUM_OUT( ScriptFinish ); - ENUM_OUT( Message ); - - ENUM_OUT( Authentication ); - - ENUM_OUT( SourceCreateStart ); - ENUM_OUT( SourceCreateProgress ); - ENUM_OUT( SourceCreateError ); - ENUM_OUT( SourceCreateEnd ); - ENUM_OUT( SourceCreateInit ); - ENUM_OUT( SourceCreateDestroy ); - - ENUM_OUT( SourceProbeStart ); - ENUM_OUT( SourceProbeFailed ); - ENUM_OUT( SourceProbeSucceeded ); - ENUM_OUT( SourceProbeEnd ); - ENUM_OUT( SourceProbeProgress ); - ENUM_OUT( SourceProbeError ); - - ENUM_OUT( SourceReportStart ); - ENUM_OUT( SourceReportProgress ); - ENUM_OUT( SourceReportError ); - ENUM_OUT( SourceReportEnd ); - ENUM_OUT( SourceReportInit ); - ENUM_OUT( SourceReportDestroy ); - - ENUM_OUT( ProgressStart ); - ENUM_OUT( ProgressProgress ); - ENUM_OUT( ProgressDone ); - - ENUM_OUT( StartSourceRefresh ); - ENUM_OUT( ErrorSourceRefresh ); - ENUM_OUT( DoneSourceRefresh ); - ENUM_OUT( ProgressSourceRefresh ); - ENUM_OUT( StartDeltaDownload ); - ENUM_OUT( ProgressDeltaDownload ); - ENUM_OUT( ProblemDeltaDownload ); - ENUM_OUT( StartDeltaApply ); - ENUM_OUT( ProgressDeltaApply ); - ENUM_OUT( ProblemDeltaApply ); - ENUM_OUT( StartPatchDownload ); - ENUM_OUT( ProgressPatchDownload ); - ENUM_OUT( ProblemPatchDownload ); - ENUM_OUT( FinishDeltaDownload ); - ENUM_OUT( FinishDeltaApply ); - ENUM_OUT( FinishPatchDownload ); - ENUM_OUT( MediaChange ); - ENUM_OUT( SourceChange ); - ENUM_OUT( ResolvableReport ); - ENUM_OUT( ImportGpgKey ); - ENUM_OUT( AcceptNonTrustedGpgKey ); - ENUM_OUT( AcceptUnknownGpgKey ); - ENUM_OUT( AcceptUnsignedFile ); - ENUM_OUT( AcceptVerificationFailed ); - ENUM_OUT( AcceptFileWithoutChecksum ); - ENUM_OUT( TrustedKeyAdded ); - ENUM_OUT( TrustedKeyRemoved ); - ENUM_OUT( AcceptWrongDigest ); - ENUM_OUT( AcceptUnknownDigest ); - - ENUM_OUT( ProcessStart ); - ENUM_OUT( ProcessNextStage ); - ENUM_OUT( ProcessProgress ); - ENUM_OUT( ProcessFinished ); -#undef ENUM_OUT - // no default! let compiler warn missing values - } - return stringutil::form( "CBid(%d)", id_r ); - } - + static string cbName( CBid id_r ); private: struct CBdata Modified: trunk/pkg-bindings/src/PkgModuleFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgModuleFunctions.h?rev=43255&r1=43254&r2=43255&view=diff ============================================================================== --- trunk/pkg-bindings/src/PkgModuleFunctions.h (original) +++ trunk/pkg-bindings/src/PkgModuleFunctions.h Wed Jan 2 16:47:44 2008 @@ -41,10 +41,14 @@ #include -class zypp::Pathname; -class zypp::Url; -class zypp::Arch; -class zypp::RepoInfo; +namespace zypp +{ + class Pathname; + class Url; + class Arch; + class RepoInfo; + class Locale; +} #include #include -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org