Imported Upstream version 16.3.2

[platform/upstream/libzypp.git] / zypp / ZYppCallbacks.h

diff --git a/zypp/ZYppCallbacks.h b/zypp/ZYppCallbacks.h
index aeae8df..657fd58 100644 (file)
--- a/zypp/ZYppCallbacks.h
+++ b/zypp/ZYppCallbacks.h
@@ -157,23 +157,6 @@ namespace zypp
       virtual void finishDeltaApply()
       {}
 
-      /** \deprecated Unused since 2008 */
-      virtual ZYPP_DEPRECATED void startPatchDownload( const Pathname & /*filename*/, const ByteCount & /*downloadsize*/ )
-      {}
-
-      /** \deprecated Unused since 2008 */
-      virtual ZYPP_DEPRECATED bool progressPatchDownload( int /*value*/ )
-      { return true; }
-
-      /** \deprecated Unused since 2008 */
-      virtual ZYPP_DEPRECATED void problemPatchDownload( const std::string &/*description*/ )
-      {}
-
-      /** \deprecated Unused since 2008 */
-      virtual ZYPP_DEPRECATED void finishPatchDownload()
-      {}
-
-
       // return false if the download should be aborted right now
       virtual bool progress(int /*value*/, Resolvable::constPtr /*resolvable_ptr*/)
       { return true; }
@@ -188,7 +171,7 @@ namespace zypp
       /** Detail information about the result of a performed pkgGpgCheck.
        *
        * Userdata sent:
-       * \param "ResObject"    ResObject::constPtr of the downloaded package (Package or SrcPackage)
+       * \param "Package"      Package::constPtr of the package
        * \param "Localpath"    Pathname to downloaded package on disk
        * \param "CheckPackageResult"   RpmDb::CheckPackageResult of signature check
        * \param "CheckPackageDetail"   RpmDb::CheckPackageDetail logmessages of rpm signature check
@@ -196,9 +179,6 @@ namespace zypp
        *  Userdata accepted:
        * \param "Action"       DownloadResolvableReport::Action user advice how to behave on error (ABORT).
        *                        If you set just an empty value here, a default probelm report will be triggered.
-       *
-       * Legacy data:
-       * \param "Package"      Replaced by \c "ResObject" in 16.10.0. Package::constPtr of the package (\c nullptr in case of a SrcPackage)
        */
       virtual void pkgGpgCheck( const UserData & userData_r = UserData() )
       {}
@@ -806,10 +786,10 @@ namespace zypp
   {
   public:
     /** message type (use like 'enum class \ref MsgType') */
-    struct _MsgTypeDef {
+    struct EMsgTypeDef {
       enum Enum { debug, info, warning, error, important, data };
     };
-    typedef base::EnumClass<_MsgTypeDef> MsgType;      ///< 'enum class MsgType'
+    typedef base::EnumClass<EMsgTypeDef> MsgType;      ///< 'enum class MsgType'
 
     /** typsafe map of userdata */
     typedef callback::UserData UserData;
@@ -826,27 +806,27 @@ namespace zypp
     static callback::SendReport<JobReport> & instance();       // impl in ZYppImpl.cc
 
     /** send debug message text */
-    static bool debug( const MessageString & msg_r, const UserData & userData_r = UserData() )
+    static bool debug( const std::string & msg_r, const UserData & userData_r = UserData() )
     { return instance()->message( MsgType::debug, msg_r, userData_r ); }
 
     /** send message text */
-    static bool info( const MessageString & msg_r, const UserData & userData_r = UserData() )
+    static bool info( const std::string & msg_r, const UserData & userData_r = UserData() )
     { return instance()->message( MsgType::info, msg_r, userData_r ); }
 
     /** send warning text */
-    static bool warning( const MessageString & msg_r, const UserData & userData_r = UserData() )
+    static bool warning( const std::string & msg_r, const UserData & userData_r = UserData() )
     { return instance()->message( MsgType::warning, msg_r, userData_r ); }
 
     /** send error text */
-    static bool error( const MessageString & msg_r, const UserData & userData_r = UserData() )
+    static bool error( const std::string & msg_r, const UserData & userData_r = UserData() )
     { return instance()->message( MsgType::error, msg_r, userData_r ); }
 
     /** send important message text */
-    static bool important( const MessageString & msg_r, const UserData & userData_r = UserData() )
+    static bool important( const std::string & msg_r, const UserData & userData_r = UserData() )
     { return instance()->message( MsgType::important, msg_r, userData_r ); }
 
     /** send data message */
-    static bool data( const MessageString & msg_r, const UserData & userData_r = UserData() )
+    static bool data( const std::string & msg_r, const UserData & userData_r = UserData() )
     { return instance()->message( MsgType::data, msg_r, userData_r ); }
     //@}
   };