rename enum to something more readable

diff --git a/zypp/MediaSetAccess.cc b/zypp/MediaSetAccess.cc
index 7bce993..93b559d 100644 (file)
--- a/zypp/MediaSetAccess.cc
+++ b/zypp/MediaSetAccess.cc
@@ -188,7 +188,7 @@ IMPL_PTR_TYPE(MediaSetAccess);
     ProvideFileOperation op;
     resource.setLocation(file, media_nr);
     try {
-        provide(boost::ref(op), resource, NON_INTERACTIVE);
+        provide(boost::ref(op), resource, PROVIDE_NON_INTERACTIVE);
     }
     catch ( const Exception &e )
     {
@@ -203,7 +203,7 @@ IMPL_PTR_TYPE(MediaSetAccess);
     ProvideFileExistenceOperation op;
     OnMediaLocation resource;
     resource.setLocation(file, media_nr);
-    provide( boost::ref(op), resource, NONE);
+    provide( boost::ref(op), resource, PROVIDE_DEFAULT);
     return op.result;
   }
 
@@ -279,7 +279,7 @@ IMPL_PTR_TYPE(MediaSetAccess);
 
           // non interactive only bother the user if wrong medium is in the drive
           // otherwise propagate the error
-          if ( ( options & NON_INTERACTIVE ) && reason != media::MediaChangeReport::WRONG)
+          if ( ( options & PROVIDE_NON_INTERACTIVE ) && reason != media::MediaChangeReport::WRONG)
           {
               ZYPP_RETHROW(excp);
           }

diff --git a/zypp/MediaSetAccess.h b/zypp/MediaSetAccess.h
index d912a60..24d5b5d 100644 (file)
--- a/zypp/MediaSetAccess.h
+++ b/zypp/MediaSetAccess.h
@@ -113,8 +113,8 @@ namespace zypp
         /**
          * The user is not asked anything, and the error
          * exception is just propagated */
-        NONE = 0x0,
-        NON_INTERACTIVE = 0x1
+        PROVIDE_DEFAULT = 0x0,
+        PROVIDE_NON_INTERACTIVE = 0x1
       };
       ZYPP_DECLARE_FLAGS(ProvideFileOptions,ProvideFileOption);
 
@@ -142,7 +142,7 @@ namespace zypp
        *
        * \see zypp::media::MediaManager::provideFile()
        */
-      Pathname provideFile( const OnMediaLocation & resource, ProvideFileOptions options = NONE );
+      Pathname provideFile( const OnMediaLocation & resource, ProvideFileOptions options = PROVIDE_DEFAULT );
 
       /**
        * Provides \a file from media \a media_nr.
@@ -164,7 +164,7 @@ namespace zypp
        *         with the next one, if possible.
        * \see zypp::media::MediaManager::provideFile()
        */
-      Pathname provideFile(const Pathname & file, unsigned media_nr = 1, ProvideFileOptions options = NONE );
+      Pathname provideFile(const Pathname & file, unsigned media_nr = 1, ProvideFileOptions options = PROVIDE_DEFAULT );
 
       /**
        * \deprecated
@@ -218,7 +218,7 @@ namespace zypp
        * \see zypp::media::MediaManager::provideDir()
        * \see zypp::media::MediaManager::provideDirTree()
        */
-      Pathname provideDir(const Pathname & dir, bool recursive, unsigned media_nr = 1, ProvideFileOptions options = NONE );
+      Pathname provideDir(const Pathname & dir, bool recursive, unsigned media_nr = 1, ProvideFileOptions options = PROVIDE_DEFAULT );
 
       /**
        * Checks if a file exists on the specified media, with user callbacks.