[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs/nepomuk
From: Kevin Ottens <ervin () kde ! org>
Date: 2010-11-04 8:11:53
Message-ID: 20101104081153.14C31AC89E () svn ! kde ! org
[Download RAW message or body]
SVN commit 1192868 by ervin:
Remove deprecated symbols from the build (if KDE_NO_DEPRECATED is defined).
M +16 -0 core/resource.cpp
M +16 -0 core/resource.h
M +8 -0 core/resourcemanager.cpp
M +8 -0 core/resourcemanager.h
M +4 -1 types/class.cpp
M +2 -1 types/class_p.h
M +2 -1 types/entity_p.h
M +4 -1 types/literal.cpp
M +2 -1 types/literal_p.h
M +4 -1 types/ontology.cpp
M +2 -1 types/ontology_p.h
M +2 -1 types/property_p.h
M +4 -0 ui/tagwidget.cpp
M +4 -0 ui/tagwidget.h
--- trunk/KDE/kdelibs/nepomuk/core/resource.cpp #1192867:1192868
@@ -85,12 +85,14 @@
}
+#ifndef KDE_NO_DEPRECATED
Nepomuk::Resource::Resource( const QString& uri, const QString& type )
{
m_data = ResourceManager::instance()->d->data( uri, type );
if ( m_data )
m_data->ref( this );
}
+#endif
Nepomuk::Resource::Resource( const QUrl& uri, const QUrl& type )
@@ -154,10 +156,12 @@
}
+#ifndef KDE_NO_DEPRECATED
QString Nepomuk::Resource::uri() const
{
return resourceUri().toString();
}
+#endif
QUrl Nepomuk::Resource::resourceUri() const
@@ -172,10 +176,12 @@
}
+#ifndef KDE_NO_DEPRECATED
QString Nepomuk::Resource::type() const
{
return resourceType().toString();
}
+#endif
QUrl Nepomuk::Resource::resourceType() const
@@ -227,6 +233,7 @@
}
+#ifndef KDE_NO_DEPRECATED
QHash<QString, Nepomuk::Variant> Nepomuk::Resource::allProperties() const
{
QHash<QString, Nepomuk::Variant> pl;
@@ -238,6 +245,7 @@
}
return pl;
}
+#endif
bool Nepomuk::Resource::hasProperty( const QUrl& uri ) const
@@ -254,16 +262,20 @@
}
+#ifndef KDE_NO_DEPRECATED
bool Nepomuk::Resource::hasProperty( const QString& uri ) const
{
return hasProperty( QUrl( uri ) );
}
+#endif
+#ifndef KDE_NO_DEPRECATED
Nepomuk::Variant Nepomuk::Resource::property( const QString& uri ) const
{
return property( QUrl( uri ) );
}
+#endif
Nepomuk::Variant Nepomuk::Resource::property( const QUrl& uri ) const
@@ -273,10 +285,12 @@
}
+#ifndef KDE_NO_DEPRECATED
void Nepomuk::Resource::setProperty( const QString& uri, const Nepomuk::Variant& \
value ) {
setProperty( QUrl( uri ), value );
}
+#endif
void Nepomuk::Resource::addProperty( const QUrl& uri, const Variant& value )
@@ -294,10 +308,12 @@
}
+#ifndef KDE_NO_DEPRECATED
void Nepomuk::Resource::removeProperty( const QString& uri )
{
removeProperty( QUrl( uri ) );
}
+#endif
void Nepomuk::Resource::removeProperty( const QUrl& uri )
--- trunk/KDE/kdelibs/nepomuk/core/resource.h #1192867:1192868
@@ -166,7 +166,9 @@
/**
* \deprecated use Resource( const QString&, const QUrl& )
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED Resource( const QString& pathOrIdentifier, const QString& \
type ); +#endif
/**
* Creates a new Resource object.
@@ -238,7 +240,9 @@
*
* \deprecated use resourceUri() instead
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED QString uri() const;
+#endif
/**
* The URI of the resource, uniquely identifying it. This URI in most
@@ -269,7 +273,9 @@
*
* \deprecated use resourceType instead
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED QString type() const;
+#endif
/**
* The main type of the resource. Nepomuk tries hard to make this
@@ -323,7 +329,9 @@
/**
* \deprecated Use properties()
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED QHash<QString, Variant> allProperties() const;
+#endif
/**
* \return A list of all defined properties
@@ -350,7 +358,9 @@
/**
* \deprecated use hasProperty( const QUrl& ) const
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED bool hasProperty( const QString& uri ) const;
+#endif
/**
* Retrieve the value of property \a uri. If the property is not defined for
@@ -363,7 +373,9 @@
/**
* \deprecated use property( const QUrl& ) const
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED Variant property( const QString& uri ) const;
+#endif
/**
* Set a property of the resource.
@@ -386,7 +398,9 @@
/**
* \deprecated use setProperty( const QUrl& )
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED void setProperty( const QString& uri, const Variant& value );
+#endif
/**
* Remove property \a uri from this resource object.
@@ -408,7 +422,9 @@
/**
* \deprecated use removeProperty( const QUrl& )
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED void removeProperty( const QString& uri );
+#endif
/**
* Remove this resource completely.
--- trunk/KDE/kdelibs/nepomuk/core/resourcemanager.cpp #1192867:1192868
@@ -339,10 +339,12 @@
}
+#ifndef KDE_NO_DEPRECATED
Nepomuk::Resource Nepomuk::ResourceManager::createResourceFromUri( const QString& \
uri ) {
return Resource( uri, QUrl() );
}
+#endif
void Nepomuk::ResourceManager::removeResource( const QString& uri )
{
@@ -357,10 +359,12 @@
}
+#ifndef KDE_NO_DEPRECATED
QList<Nepomuk::Resource> Nepomuk::ResourceManager::allResourcesOfType( const \
QString& type ) {
return allResourcesOfType( QUrl(type) );
}
+#endif
QList<Nepomuk::Resource> Nepomuk::ResourceManager::allResourcesOfType( const QUrl& \
type ) @@ -412,10 +416,12 @@
}
+#ifndef KDE_NO_DEPRECATED
QList<Nepomuk::Resource> Nepomuk::ResourceManager::allResourcesWithProperty( const \
QString& uri, const Variant& v ) {
return allResourcesWithProperty( QUrl(uri), v );
}
+#endif
QList<Nepomuk::Resource> Nepomuk::ResourceManager::allResourcesWithProperty( const \
QUrl& uri, const Variant& v ) @@ -454,10 +460,12 @@
}
+#ifndef KDE_NO_DEPRECATED
QString Nepomuk::ResourceManager::generateUniqueUri()
{
return generateUniqueUri( QString() ).toString();
}
+#endif
QUrl Nepomuk::ResourceManager::generateUniqueUri( const QString& name )
--- trunk/KDE/kdelibs/nepomuk/core/resourcemanager.h #1192867:1192868
@@ -110,7 +110,9 @@
* \return The Resource representing the data at \a uri or an invalid \
Resource object if the local
* NEPOMUK RDF store does not contain an object with URI \a uri.
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED Resource createResourceFromUri( const QString& uri );
+#endif
/**
* Remove the resource denoted by \a uri completely.
@@ -146,7 +148,9 @@
/**
* \deprecated Use allResourcesOfType( const QString& type )
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED QList<Resource> allResourcesOfType( const QString& type );
+#endif
/**
* Retrieve a list of all resources that have property \a uri defined with a \
value of \a v. @@ -168,7 +172,9 @@
/**
* \deprecated Use allResourcesWithProperty( const QString& type )
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED QList<Resource> allResourcesWithProperty( const QString& uri, \
const Variant& v ); +#endif
/**
* %ResourceManager caches resource locally so subsequent access is faster.
@@ -184,7 +190,9 @@
* Generates a unique URI that is not used in the store yet. This method ca \
be used to
* generate URIs for virtual types such as Tag.
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED QString generateUniqueUri();
+#endif
/**
* Generates a unique URI that is not used in the store yet. This method can \
be used to
--- trunk/KDE/kdelibs/nepomuk/types/class.cpp #1192867:1192868
@@ -517,7 +517,7 @@
-
+#ifndef DISABLE_NEPOMUK_LEGACY
// Start of code for deprecated Class
// ----------------------------------
@@ -660,3 +660,6 @@
return 0;
}
}
+
+#endif DISABLE_NEPOMUK_LEGACY
+
--- trunk/KDE/kdelibs/nepomuk/types/class_p.h #1192867:1192868
@@ -65,7 +65,7 @@
}
}
-
+#ifndef DISABLE_NEPOMUK_LEGACY
namespace Nepomuk {
class Property;
@@ -80,5 +80,6 @@
QList<const Nepomuk::Class*> children;
};
}
+#endif
#endif
--- trunk/KDE/kdelibs/nepomuk/types/entity_p.h #1192867:1192868
@@ -71,7 +71,7 @@
}
-
+#ifndef DISABLE_NEPOMUK_LEGACY
class Nepomuk::Entity::Private : public QSharedData
{
public:
@@ -87,5 +87,6 @@
QHash<QString, QString> l10nLabels;
QHash<QString, QString> l10nComments;
};
+#endif
#endif
--- trunk/KDE/kdelibs/nepomuk/types/literal.cpp #1192867:1192868
@@ -127,8 +127,8 @@
}
+#ifndef DISABLE_NEPOMUK_LEGACY
-
Nepomuk::Literal::Literal()
{
d = new Private();
@@ -179,3 +179,6 @@
{
return d->dataType;
}
+
+#endif // DISABLE_NEPOMUK_LEGACY
+
--- trunk/KDE/kdelibs/nepomuk/types/literal_p.h #1192867:1192868
@@ -37,7 +37,7 @@
QVariant::Type dataType;
};
-
+#ifndef DISABLE_NEPOMUK_LEGACY
class Nepomuk::Literal::Private : public QSharedData
{
public:
@@ -48,5 +48,6 @@
QUrl dataTypeUri;
QVariant::Type dataType;
};
+#endif
#endif
--- trunk/KDE/kdelibs/nepomuk/types/ontology.cpp #1192867:1192868
@@ -224,7 +224,7 @@
}
-
+#ifndef DISABLE_NEPOMUK_LEGACY
// Start of code for deprecated Ontology
// -------------------------------------
#include "global.h"
@@ -358,3 +358,6 @@
// load the ontology in the cache
return OntologyManager::instance()->getOntology( uri );
}
+
+#endif // DISABLE_NEPOMUK_LEGACY
+
--- trunk/KDE/kdelibs/nepomuk/types/ontology_p.h #1192867:1192868
@@ -57,7 +57,7 @@
}
}
-
+#ifndef DISABLE_NEPOMUK_LEGACY
#include "ontology.h"
namespace Nepomuk {
@@ -72,5 +72,6 @@
QHash<QUrl, const Property*> properties;
};
}
+#endif
#endif
--- trunk/KDE/kdelibs/nepomuk/types/property_p.h #1192867:1192868
@@ -58,7 +58,7 @@
}
-
+#ifndef DISABLE_NEPOMUK_LEGACY
namespace Nepomuk {
class Class;
@@ -90,5 +90,6 @@
int cardinality;
};
}
+#endif
#endif
--- trunk/KDE/kdelibs/nepomuk/ui/tagwidget.cpp #1192867:1192868
@@ -274,10 +274,12 @@
}
+#ifndef KDE_NO_DEPRECATED
QList<Nepomuk::Tag> Nepomuk::TagWidget::assignedTags() const
{
return selectedTags();
}
+#endif
QList<Nepomuk::Tag> Nepomuk::TagWidget::selectedTags() const
@@ -334,10 +336,12 @@
}
+#ifndef KDE_NO_DEPRECATED
void Nepomuk::TagWidget::setAssignedTags( const QList<Tag>& tags )
{
setSelectedTags( tags );
}
+#endif
void Nepomuk::TagWidget::setSelectedTags( const QList<Nepomuk::Tag>& tags )
--- trunk/KDE/kdelibs/nepomuk/ui/tagwidget.h #1192867:1192868
@@ -75,7 +75,9 @@
/**
* \deprecated use selectedTags() instead
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED QList<Tag> assignedTags() const;
+#endif
/**
* The list of selected tags.
@@ -182,7 +184,9 @@
/**
* \deprecated use setSelectedTags() instead
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED void setAssignedTags( const QList<Nepomuk::Tag>& tags );
+#endif
/**
* Set the list of selected tags. In case resources have been
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic