cleanup unused code

diff --git a/zypp/RepoManager.cc b/zypp/RepoManager.cc
index 780117e523b46c3def7b7320b2fb3c270c14d6ce..94037840874867d702c6037e5f12e67889e03255 100644 (file)
--- a/zypp/RepoManager.cc
+++ b/zypp/RepoManager.cc
@@ -848,38 +848,10 @@ namespace zypp
         ZYPP_THROW(RepoUnknownTypeException("Unhandled repository type"));
       break;
     }
-#if 0
-    switch ( repokind.toEnum() )
-    {
-      case RepoType::RPMMD_e :
-      if (0)
-      {
-        CombinedProgressData subprogrcv( progress, 100);
-        parser::yum::RepoParser parser(id, store, parser::yum::RepoParserOpts(), subprogrcv);
-        parser.parse(rawpath);
-          // no error
-      }
-      break;
-      case RepoType::YAST2_e :
-      if (0)
-      {
-        CombinedProgressData subprogrcv( progress, 100);
-        parser::susetags::RepoParser parser(id, store, subprogrcv);
-        parser.parse(rawpath);
-        // no error
-      }
-      break;
-
-      default:
-        ZYPP_THROW(RepoUnknownTypeException());
-    }
-#endif
     // update timestamp and checksum
-    //store.updateRepositoryStatus(id, raw_metadata_status);
     setCacheStatus(info, raw_metadata_status);
     MIL << "Commit cache.." << endl;
-    //store.commit();
-    //progress.toMax();
+    progress.toMax();
   }
 
   ////////////////////////////////////////////////////////////////////////////

diff --git a/zypp/data/ResolvableData.cc b/zypp/data/ResolvableData.cc
index b5600060a265591b3fbc1654688fc5c7a29a2b25..e0c2d825aa2a8bffdc3b5e7a6630a5ebf6c5f10b 100644 (file)
--- a/zypp/data/ResolvableData.cc
+++ b/zypp/data/ResolvableData.cc
@@ -19,9 +19,6 @@ namespace data
 
 IMPL_PTR_TYPE(Resolvable);
 IMPL_PTR_TYPE(ResObject);
-IMPL_PTR_TYPE(Script);
-IMPL_PTR_TYPE(Message);
-IMPL_PTR_TYPE(Atom);
 IMPL_PTR_TYPE(Patch);
 IMPL_PTR_TYPE(Pattern);
 IMPL_PTR_TYPE(Product);
@@ -30,8 +27,6 @@ IMPL_PTR_TYPE(Package);
 IMPL_PTR_TYPE(SrcPackage);
 
 IMPL_PTR_TYPE(DeltaRpm);
-IMPL_PTR_TYPE(PatchRpm);
-IMPL_PTR_TYPE(PackageAtom);
 IMPL_PTR_TYPE(BaseVersion);
 
 

diff --git a/zypp/data/ResolvableData.h b/zypp/data/ResolvableData.h
index d7f52af57f55f8299064df364e41fffdac1ffa65..0c3b957384f302989183c2ed6dcf61ac5422fda6 100644 (file)
--- a/zypp/data/ResolvableData.h
+++ b/zypp/data/ResolvableData.h
@@ -118,55 +118,6 @@ namespace data
 
   ///////////////////////////////////////////////////////////////////
 
-  DEFINE_PTR_TYPE(Atom);
-
-  /* Data Object for Atom resolvable. */
-  class Atom : public ResObject
-  {
-    public:
-      Atom()
-      {};
-  };
-
-  ///////////////////////////////////////////////////////////////////
-
-  DEFINE_PTR_TYPE(Script);
-
-  /* Data Object for Script resolvable. */
-  class Script : public ResObject
-  {
-    public:
-      Script()
-      {};
-
-      /** Inlined doScript. */
-      std::string doScript;
-      /** Location of doScript on the repositories media. */
-      OnMediaLocation doScriptLocation;
-
-      /** Inlined undoScript. */
-      std::string undoScript;
-      /** Location of undoScript on the repositories media. */
-      OnMediaLocation undoScriptLocation;
-  };
-
-  ///////////////////////////////////////////////////////////////////
-
-  DEFINE_PTR_TYPE(Message);
-
-  /* Data Object for Message resolvable. */
-  class Message : public ResObject
-  {
-    public:
-      Message()
-      {};
-
-      /** Inlined Text. */
-      TranslatedText text;
-  };
-
-  ///////////////////////////////////////////////////////////////////
-
   DEFINE_PTR_TYPE(Patch);
 
   /* Data Object for Patch resolvable. */
@@ -374,13 +325,6 @@ namespace data
       virtual std::ostream & dumpOn( std::ostream & str ) const;
   };
 
-  DEFINE_PTR_TYPE(PatchRpm);
-  /** Patch RPM data object */
-  struct PatchRpm : RpmBase
-  {
-    std::set<BaseVersion_Ptr> baseVersions;
-  };
-
   DEFINE_PTR_TYPE(DeltaRpm);
   /** Delta RPM data object */
   struct DeltaRpm : RpmBase
@@ -395,19 +339,6 @@ namespace data
     DeltaBaseVersion baseVersion;
   };
 
-  DEFINE_PTR_TYPE(PackageAtom);
-  /**
-   * Data Object for YUM package atom.
-   *
-   * \see zypp/parser/yum/schema/patch.rng
-   */
-  struct PackageAtom : public Package
-  {
-    std::set<PatchRpm_Ptr> patchRpms;
-    std::set<DeltaRpm_Ptr> deltaRpms;
-    // TODO support mulitple licenses (licenseToConfirm)
-  };
-
   // --- ----------END--YUM-package-atom-metadata-----------------------------
 
   ///////////////////////////////////////////////////////////////////

diff --git a/zypp/data/ResolvableDataConsumer.h b/zypp/data/ResolvableDataConsumer.h
index e9ba36b3b4cbab638d93528cc932c765a3275bfd..70427d0d50531ecc98e243a1a10f07f545bfbc3a 100644 (file)
--- a/zypp/data/ResolvableDataConsumer.h
+++ b/zypp/data/ResolvableDataConsumer.h
@@ -33,17 +33,14 @@ namespace data
     virtual data::RecordId consumeSourcePackage( const data::SrcPackage_Ptr & ) = 0;
     virtual data::RecordId consumeProduct      ( const data::Product_Ptr & ) = 0;
     virtual data::RecordId consumePatch        ( const data::Patch_Ptr & ) = 0;
-    virtual data::RecordId consumePackageAtom  ( const data::PackageAtom_Ptr & ) = 0;
-    virtual data::RecordId consumeMessage      ( const data::Message_Ptr & ) = 0;
-    virtual data::RecordId consumeScript       ( const data::Script_Ptr & ) = 0;
     virtual data::RecordId consumePattern      ( const data::Pattern_Ptr & ) = 0;
 
     virtual data::RecordId consumeChangelog    ( const data::RecordId & resolvable_id, const Changelog & ) = 0;
     virtual data::RecordId consumeFilelist     ( const data::RecordId & resolvable_id, const data::Filenames & ) = 0;
     virtual void consumeDiskUsage              ( const data::RecordId &resolvable_id, const DiskUsage &disk ) = 0;
-    
+
     virtual void updatePackageLang( const data::RecordId & resolvable_id, const data::Packagebase_Ptr & data_r ) = 0;
-    
+
   };
 
 } // namespace parser