Mailinglist Archive: yast-commit (747 mails)

[jkupec@xxxxxxxxxxxxxxxx]

Author: jkupec
Date: Wed Jul 11 18:08:43 2007
New Revision: 39331

URL: http://svn.opensuse.org/viewcvs/yast?rev=39331&view=rev
Log:
forgot about this c++ feature...

Modified:
    branches/REFACTORING-10_3/pkg-bindings/src/PkgModuleFunctions.h
    branches/REFACTORING-10_3/pkg-bindings/src/Source.cc

Modified: branches/REFACTORING-10_3/pkg-bindings/src/PkgModuleFunctions.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/REFACTORING-10_3/pkg-bindings/src/PkgModuleFunctions.h?rev=39331&r1=39330&r2=39331&view=diff
==============================================================================
--- branches/REFACTORING-10_3/pkg-bindings/src/PkgModuleFunctions.h (original)
+++ branches/REFACTORING-10_3/pkg-bindings/src/PkgModuleFunctions.h Wed Jul 11 18:08:43 2007
@@ -77,7 +77,7 @@
     ~YRepo();
 
     const zypp::RepoInfo & repoInfo() const { return _repo; }
-    zypp::RepoInfo repoInfoNonConst() { return _repo; }
+    zypp::RepoInfo & repoInfo() { return _repo; }
     const std::string & origRepoAlias() const { return _repo_orig_alias; }
     zypp::MediaSetAccess_Ptr & mediaAccess();
 

Modified: branches/REFACTORING-10_3/pkg-bindings/src/Source.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/REFACTORING-10_3/pkg-bindings/src/Source.cc?rev=39331&r1=39330&r2=39331&view=diff
==============================================================================
--- branches/REFACTORING-10_3/pkg-bindings/src/Source.cc (original)
+++ branches/REFACTORING-10_3/pkg-bindings/src/Source.cc Wed Jul 11 18:08:43 2007
@@ -562,7 +562,7 @@
        for (std::vector<YRepo>::iterator it = repos.begin();
            it != repos.end(); ++it)
        {
-            it->repoInfoNonConst().setEnabled(false);
+            it->repoInfo().setEnabled(false);
        }
        // TODO FIXME remove all resolvables??
     }
@@ -1011,15 +1011,15 @@
                 baseUrls.insert(*i);
             
             // reset url list and store the new one there
-            repo.repoInfoNonConst().setBaseUrl(zypp::Url(u->value()));
+            repo.repoInfo().setBaseUrl(zypp::Url(u->value()));
 
             // add the rest of base urls
             for (std::set<zypp::Url>::const_iterator i = baseUrls.begin();
                     i != baseUrls.end(); ++i)
-                repo.repoInfoNonConst().addBaseUrl(*i);
+                repo.repoInfo().addBaseUrl(*i);
         }
         else
-            repo.repoInfoNonConst().setBaseUrl(zypp::Url(u->value()));
+            repo.repoInfo().setBaseUrl(zypp::Url(u->value()));
     }
     catch (const zypp::Exception & excpt)
     {
@@ -1506,7 +1506,7 @@
            std::vector<zypp::RepoInfo>::size_type id = createManagedSource(url, it->_dir, base, type);
 
            YRepo &src = logFindRepository(id);
-           src.repoInfoNonConst().setEnabled(true);
+           src.repoInfo().setEnabled(true);
        
            zypp::RepoManager repomanager = CreateRepoManager();
 
@@ -1542,7 +1542,7 @@
        ret = createManagedSource(url, pn, base, type);
 
        YRepo &src = logFindRepository(ret);
-       src.repoInfoNonConst().setEnabled(true);
+       src.repoInfo().setEnabled(true);
 
        zypp::RepoManager repomanager = CreateRepoManager();
        // update Repository
@@ -1600,7 +1600,7 @@
 
     try
     {
-       src.repoInfoNonConst().setEnabled(enable);
+       src.repoInfo().setEnabled(enable);
 
        // FIXME load (remove) resolvables only when they are missing (present)
        zypp::RepoManager repomanager = CreateRepoManager();
@@ -1649,7 +1649,7 @@
        return YCPBoolean(false);
     }
 
-    src.repoInfoNonConst().setAutorefresh(e->value());
+    src.repoInfo().setAutorefresh(e->value());
 
 
     return YCPBoolean( true );
@@ -1867,18 +1867,18 @@
            ycpwarning("Pkg::SourceEditSet() does not refresh the pool (src: %d, state: %s)", id, enable ? "disabled -> enabled" : "enabled -> disabled");
        }
 
-       src.repoInfoNonConst().setEnabled(enable);
+       src.repoInfo().setEnabled(enable);
     }
 
     if( !descr->value(YCPString("autorefresh")).isNull() && descr->value(YCPString("autorefresh"))->isBoolean ())
     {
-       src.repoInfoNonConst().setAutorefresh( descr->value(YCPString("autorefresh"))->asBoolean()->value() );
+       src.repoInfo().setAutorefresh( descr->value(YCPString("autorefresh"))->asBoolean()->value() );
     }
 
     if( !descr->value(YCPString("alias")).isNull() && descr->value(YCPString("alias"))->isString())
     {
        // rename the source
-       src.repoInfoNonConst().setAlias(descr->value(YCPString("alias"))->asString()->value());
+       src.repoInfo().setAlias(descr->value(YCPString("alias"))->asString()->value());
     }
 
 #warning SourceEditSet ordering not implemented yet

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx