[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdecore
From:       Pascal Létourneau <pascal.letourneau () kdemail ! net>
Date:       2006-08-31 15:37:31
Message-ID: 1157038651.198084.5731.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 579251 by pletourn:

Assert on KUrl::directory(false)


 M  +1 -0      kurl.cpp  
 M  +3 -3      kurl.h  


--- trunk/KDE/kdelibs/kdecore/kurl.cpp #579250:579251
@@ -1019,6 +1019,7 @@
 
 QString KUrl::directory( const DirectoryOptions& options ) const
 {
+  Q_ASSERT( options != 0 ); //Disallow options == false
   QString result = path(); //m_strPath_encoded.isEmpty() ? m_strPath : m_strPath_encoded;
   if ( !(options & ObeyTrailingSlash) )
     result = trailingSlash( RemoveTrailingSlash, result );
--- trunk/KDE/kdelibs/kdecore/kurl.h #579250:579251
@@ -627,7 +627,7 @@
      * If the flag is set, then everything behind the last '/'is considered to be the filename.
      * So "hallo/torben" will be the path and the filename will be empty.
      */
-    ObeyTrailingSlash = 0x01,
+    ObeyTrailingSlash = 0x02,
     /**
      * tells whether the returned result should end with '/' or not.
      * If the flag is set, '/' is added to the end of the path
@@ -636,11 +636,11 @@
      *
      * This option should only be used in directory(), it has no effect in fileName()
      */
-    AppendTrailingSlash = 0x02,
+    AppendTrailingSlash = 0x04,
     /**
      * Opposite of ObeyTailingSlash  (default)
      */
-    IgnoreTrailingSlash = 0x00
+    IgnoreTrailingSlash = 0x01
 
   };
   Q_DECLARE_FLAGS(DirectoryOptions,DirectoryOption)
[prev in list] [next in list] [prev in thread] [next in thread]