it does not make much sense to check for a serie of permissions at the same time, so just check one permission at a time

svn path=/trunk/playground/graphics/okular/; revision=641341

core/document.cpp

@@ -1165,14 +1165,14 @@ KUrl Document::currentDocument() const
     return d->m_url;
 }
 
-bool Document::isAllowed( Permissions flags ) const
+bool Document::isAllowed( Permission action ) const
 {
 #if !OKULAR_FORCE_DRM
     if ( KAuthorized::authorize( "skip_drm" ) && !Okular::Settings::obeyDRM() )
         return true;
 #endif
 
-    return d->m_generator ? d->m_generator->isAllowed( flags ) : false;
+    return d->m_generator ? d->m_generator->isAllowed( action ) : false;
 }
 
 bool Document::supportsSearching() const

core/document.h

@@ -180,11 +180,10 @@ class OKULAR_EXPORT Document : public QObject
         KUrl currentDocument() const;
 
         /**
-         * Returns whether the given @p actions are allowed
+         * Returns whether the given @p action is allowed in the document.
-         * in the document.
+         * @see @ref Permission
-         * @see @ref Permissions
          */
-        bool isAllowed( Permissions actions ) const;
+        bool isAllowed( Permission action ) const;
 
         /**
          * Returns whether the document supports searching.

core/generator.cpp

@@ -223,7 +223,7 @@ Generator::PageSizeMetric Generator::pagesSizeMetric() const
     return None;
 }
 
-bool Generator::isAllowed( Permissions ) const
+bool Generator::isAllowed( Permission ) const
 {
     return true;
 }

core/generator.h

@@ -286,10 +286,10 @@ class OKULAR_EXPORT Generator : public QObject
         virtual PageSizeMetric pagesSizeMetric() const;
 
         /**
-         * This method returns whether given action (@ref Permission) is
+         * This method returns whether given @p action (@ref Permission) is
          * allowed in this document.
          */
-        virtual bool isAllowed( Permissions action ) const;
+        virtual bool isAllowed( Permission action ) const;
 
         /**
          * This method is called when the orientation has been changed by the user.

generators/poppler/generator_pdf.cpp

@@ -591,13 +591,25 @@ const QList<Okular::EmbeddedFile*> *PDFGenerator::embeddedFiles() const
     return &docEmbeddedFiles;
 }
 
-bool PDFGenerator::isAllowed( Okular::Permissions permissions ) const
+bool PDFGenerator::isAllowed( Okular::Permission permission ) const
 {
     bool b = true;
-    if (permissions & Okular::AllowModify) b = b && pdfdoc->okToChange();
+    switch ( permission )
-    if (permissions & Okular::AllowCopy) b = b && pdfdoc->okToCopy();
+    {
-    if (permissions & Okular::AllowPrint) b = b && pdfdoc->okToPrint();
+        case Okular::AllowModify:
-    if (permissions & Okular::AllowNotes) b = b && pdfdoc->okToAddNotes();
+            b = pdfdoc->okToChange();
+            break;
+        case Okular::AllowCopy:
+            b = pdfdoc->okToCopy();
+            break;
+        case Okular::AllowPrint:
+            b = pdfdoc->okToPrint();
+            break;
+        case Okular::AllowNotes:
+            b = pdfdoc->okToAddNotes();
+            break;
+        default: ;
+    }
     return b;
 }
 

generators/poppler/generator_pdf.h

@@ -63,7 +63,7 @@ class PDFGenerator : public Okular::Generator, public Okular::ConfigInterface
         PageSizeMetric pagesSizeMetric() const { return Points; }
 
         // [INHERITED] document information
-        bool isAllowed( Okular::Permissions permissions ) const;
+        bool isAllowed( Okular::Permission permission ) const;
 
         // [INHERITED] perform actions on document / pages
         bool canGeneratePixmap() const;