[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 9:21:58
Message-ID: 20100816092158.2FAF0AC854 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1164224 by mueller:

I think a copy constructor should actually copy the
same object, not its base class. also fix assignment
operator


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


--- trunk/KDE/kdelibs/nepomuk/core/file.cpp #1164223:1164224
@@ -30,8 +30,8 @@
 }
 
 
-Nepomuk::File::File( const Resource& other )
-    : Resource( other )
+Nepomuk::File::File( const File& other )
+    : Resource( other.url() )
 {
 }
 
@@ -43,6 +43,7 @@
 
 Nepomuk::File& Nepomuk::File::operator=( const KUrl& url )
 {
+    return (*this);
 }
 
 
--- trunk/KDE/kdelibs/nepomuk/core/file.h #1164223:1164224
@@ -53,7 +53,7 @@
         /**
          * Copy constructor.
          */
-        File( const Resource& other );
+        File( const File& other );
 
         /**
          * Desctructor
--- trunk/KDE/kdelibs/nepomuk/core/resource.cpp #1164223:1164224
@@ -882,7 +882,7 @@
 
 Nepomuk::File Nepomuk::Resource::toFile() const
 {
-    return File( *this );
+    return File( resourceUri() );
 }
 
 
[prev in list] [next in list] [prev in thread] [next in thread]