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

List:       kde-commits
Subject:    KDE/kdelibs/nepomuk/core
From:       Dirk Mueller <mueller () kde ! org>
Date:       2010-08-16 21:43:59
Message-ID: 20100816214359.C3901AC855 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1164490 by mueller:

- revert  change of constructor from Resource to File
- fix assignment operator properly


 M  +3 -2      file.cpp  
 M  +2 -2      file.h  
 M  +1 -1      resource.cpp  


--- trunk/KDE/kdelibs/nepomuk/core/file.cpp #1164489:1164490
@@ -30,8 +30,8 @@
 }
 
 
-Nepomuk::File::File( const File& other )
-    : Resource( other.url() )
+Nepomuk::File::File( const Resource& other )
+    : Resource( other )
 {
 }
 
@@ -43,6 +43,7 @@
 
 Nepomuk::File& Nepomuk::File::operator=( const KUrl& url )
 {
+    this->Resource::operator=(url);
     return (*this);
 }
 
--- trunk/KDE/kdelibs/nepomuk/core/file.h #1164489:1164490
@@ -51,9 +51,9 @@
         File( const KUrl& url = KUrl(), ResourceManager* manager = 0 );
 
         /**
-         * Copy constructor.
+         * Construct from a Resource
          */
-        File( const File& other );
+        File( const Resource& other );
 
         /**
          * Desctructor
--- trunk/KDE/kdelibs/nepomuk/core/resource.cpp #1164489:1164490
@@ -882,7 +882,7 @@
 
 Nepomuk::File Nepomuk::Resource::toFile() const
 {
-    return File( resourceUri() );
+    return File( *this );
 }
 
 
[prev in list] [next in list] [prev in thread] [next in thread]