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

List:       kde-commits
Subject:    KDE/kdelibs/kio/kio
From:       Kevin Ottens <ervin () kde ! org>
Date:       2010-11-04 8:50:25
Message-ID: 20101104085025.D7B24AC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1192901 by ervin:

Remove deprecated symbols from the build (if KDE_NO_DEPRECATED is defined). And, port \
the rest away from deprecated API.

 M  +3 -1      kfilemetainfoitem.cpp  
 M  +2 -0      kfilemetainfoitem.h  
 M  +3 -2      kfilemetainfoitem_p.h  


--- trunk/KDE/kdelibs/kio/kio/kfilemetainfoitem.cpp #1192900:1192901
@@ -31,7 +31,7 @@
 KFileMetaInfoItem::KFileMetaInfoItem(const QString& pp,
                                      const QVariant& v, KFileWritePlugin* w, bool e)
     : d(new KFileMetaInfoItemPrivate()) {
-    d->pp = pp;
+    d->pp = QUrl(pp);
     d->value = v;
     d->writer = w;
     d->embedded = e;
@@ -86,10 +86,12 @@
     // ########## TODO implement (vandenoever)
     return false;
 }
+#ifndef KDE_NO_DEPRECATED
 const PredicateProperties&
 KFileMetaInfoItem::properties() const {
     return d->pp;
 }
+#endif
 bool
 KFileMetaInfoItem::isEditable() const {
     return d->writer != 0;
--- trunk/KDE/kdelibs/kio/kio/kfilemetainfoitem.h #1192900:1192901
@@ -89,7 +89,9 @@
      *
      * @deprecated
      **/
+#ifndef KDE_NO_DEPRECATED
     KDE_DEPRECATED const PredicateProperties& properties() const;
+#endif
     /**
      * Localized name of the predicate.
      **/
--- trunk/KDE/kdelibs/kio/kio/kfilemetainfoitem_p.h #1192900:1192901
@@ -22,8 +22,9 @@
 #define KFILEMETAINFOITEM_P_H
 
 #include "kurl.h"
-#include "predicateproperties.h"
 
+#include <nepomuk/types/property.h>
+
 #include <QtCore/QHash>
 #include <QtCore/QSharedData>
 
@@ -32,7 +33,7 @@
 class KFileMetaInfoItemPrivate : public QSharedData {
 public:
     KFileMetaInfoItemPrivate() : writer(0) {}
-    PredicateProperties pp;
+    Nepomuk::Types::Property pp;
     KUrl propertyUri;
     QVariant value;
     KFileWritePlugin* writer;


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