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

List:       kde-commits
Subject:    KDE/kdelibs
From:       David Faure <faure () kde ! org>
Date:       2006-08-31 20:58:48
Message-ID: 1157057928.157399.31695.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 579337 by dfaure:

Move url property to ReadOnlyPart where it belongs, and make it a KUrl to avoid \
KUrl->QString implicit conversion


 M  +1 -2      khtml/khtml_part.h  
 M  +3 -2      kparts/part.h  


--- trunk/KDE/kdelibs/khtml/khtml_part.h #579336:579337
@@ -231,7 +231,6 @@
   Q_PROPERTY( QString encoding READ encoding WRITE setEncoding )
   Q_PROPERTY( QString lastModified READ lastModified )
   Q_PROPERTY( bool metaRefreshEnabled READ metaRefreshEnabled WRITE \
                setMetaRefreshEnabled )
-  Q_PROPERTY( QString url READ url )
 
 public:
   enum GUIProfile { DefaultGUI, BrowserViewGUI /* ... */ };
@@ -489,7 +488,7 @@
    */
   enum CaretDisplayPolicy {
       CaretVisible, /**< caret is displayed */
-      CaretInvisible, /**<  caret is not displayed */ 
+      CaretInvisible, /**<  caret is not displayed */
       CaretBlink /**< caret toggles between visible and invisible */
   };
 
--- trunk/KDE/kdelibs/kparts/part.h #579336:579337
@@ -356,6 +356,7 @@
 {
   Q_OBJECT
   friend class ReadWritePart;
+  Q_PROPERTY( KUrl url READ url )
 public:
   /**
    * Constructor
@@ -400,9 +401,9 @@
 
 public:
   /**
-   *  Returns the currently in part used URL.
+   *  Returns the URL currently opened in this part.
    *
-   *  @return The current used URL.
+   *  @return The current URL.
    */
   KUrl url() const { return m_url; }
 


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