[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: Re: [kde-runtime/nepomuk/PortToNepomukCore] /: Port to Nepomuk2
From: Sebastian Trüg <trueg () kde ! org>
Date: 2012-05-29 19:33:56
Message-ID: 4FC524A4.7040408 () kde ! org
[Download RAW message or body]
why do you need to port anything? You just need to remove it all, right?
On 05/23/2012 06:28 PM, Vishesh Handa wrote:
> Git commit 74726c0e050b8104591ae8544fe8f9bd07baed93 by Vishesh Handa.
> Committed on 23/05/2012 at 18:24.
> Pushed by vhanda into branch 'nepomuk/PortToNepomukCore'.
>
> Port to Nepomuk2
>
> This does not compile and I'm stuck. I can't seem to figure out what is
> wrong. Someone help me
>
> CCMAIL: trueg@kde.org
>
> M +6 -14 CMakeLists.txt
> M +3 -0 nepomuk/CMakeLists.txt
> M +1 -1 nepomuk/common/CMakeLists.txt
> M +2 -2 nepomuk/common/fileexcludefilters.cpp
> M +1 -1 nepomuk/common/fileexcludefilters.h
> M +1 -1 nepomuk/common/nepomuktools.h
> M +18 -18 nepomuk/common/removablemediacache.cpp
> M +4 -4 nepomuk/common/removablemediacache.h
> M +4 -4 nepomuk/controller/CMakeLists.txt
> M +1 -1 nepomuk/controller/main.cpp
> M +8 -8 nepomuk/controller/systray.cpp
> M +1 -1 nepomuk/controller/systray.h
> D +0 -19 nepomuk/interfaces/CMakeLists.txt
> D +0 -23 nepomuk/interfaces/org.kde.NepomukServer.xml
> D +0 -7 nepomuk/interfaces/org.kde.nepomuk.BackupSync.xml
> D +0 -124 nepomuk/interfaces/org.kde.nepomuk.DataManagement.xml
> D +0 -46 nepomuk/interfaces/org.kde.nepomuk.FileIndexer.xml
> D +0 -9 nepomuk/interfaces/org.kde.nepomuk.FileWatch.xml
> D +0 -22 nepomuk/interfaces/org.kde.nepomuk.OntologyManager.xml
> D +0 -30 nepomuk/interfaces/org.kde.nepomuk.Query.xml
> D +0 -20 nepomuk/interfaces/org.kde.nepomuk.QueryService.xml
> D +0 -14 nepomuk/interfaces/org.kde.nepomuk.ResourceWatcher.xml
> D +0 -65 nepomuk/interfaces/org.kde.nepomuk.ResourceWatcherConnection.xml
> D +0 -19 nepomuk/interfaces/org.kde.nepomuk.ServiceControl.xml
> D +0 -39 nepomuk/interfaces/org.kde.nepomuk.ServiceManager.xml
> D +0 -9 nepomuk/interfaces/org.kde.nepomuk.Storage.xml
> D +0 -10 nepomuk/interfaces/org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml
> D +0 -9 nepomuk/interfaces/org.kde.nepomuk.services.nepomukbackupsync.syncmanager.xml
> M +6 -6 nepomuk/kcm/CMakeLists.txt
> C +2 -2 nepomuk/kcm/fileexcludefilters.cpp [from: \
> nepomuk/common/fileexcludefilters.cpp - 096% similarity] C +1 -1 \
> nepomuk/kcm/fileexcludefilters.h [from: nepomuk/common/fileexcludefilters.h - 098% \
> similarity] M +9 -9 nepomuk/kcm/indexfolderselectiondialog.cpp
> M +1 -1 nepomuk/kcm/indexfolderselectiondialog.h
> M +32 -32 nepomuk/kcm/nepomukserverkcm.cpp
> M +3 -3 nepomuk/kcm/nepomukserverkcm.h
> M +13 -13 nepomuk/kcm/statuswidget.cpp
> M +1 -1 nepomuk/kcm/statuswidget.h
> M +4 -4 nepomuk/kioslaves/common/nepomuksearchurltools.h
> M +45 -45 nepomuk/kioslaves/common/resourcestat.cpp
> M +9 -9 nepomuk/kioslaves/common/resourcestat.h
> M +15 -15 nepomuk/kioslaves/common/standardqueries.h
> M +12 -12 nepomuk/kioslaves/common/timelinetools.cpp
> M +2 -2 nepomuk/kioslaves/common/timelinetools.h
> M +2 -3 nepomuk/kioslaves/nepomuk/CMakeLists.txt
> M +36 -36 nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp
> M +2 -2 nepomuk/kioslaves/nepomuk/kio_nepomuk.h
> M +35 -35 nepomuk/kioslaves/nepomuk/resourcepagegenerator.cpp
> M +8 -8 nepomuk/kioslaves/nepomuk/resourcepagegenerator.h
> M +3 -4 nepomuk/kioslaves/search/CMakeLists.txt
> M +17 -17 nepomuk/kioslaves/search/kdedmodule/CMakeLists.txt
> M +11 -11 nepomuk/kioslaves/search/kdedmodule/dbusoperators_p.h
> M +12 -12 nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.cpp
> M +1 -1 nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.h
> M +18 -18 nepomuk/kioslaves/search/kdedmodule/searchurllistener.cpp
> M +4 -4 nepomuk/kioslaves/search/kdedmodule/searchurllistener.h
> M +43 -43 nepomuk/kioslaves/search/kio_nepomuksearch.cpp
> M +1 -1 nepomuk/kioslaves/search/kio_nepomuksearch.h
> M +16 -16 nepomuk/kioslaves/search/queryutils.h
> M +29 -29 nepomuk/kioslaves/search/searchfolder.cpp
> M +6 -6 nepomuk/kioslaves/search/searchfolder.h
> M +4 -4 nepomuk/kioslaves/search/userqueries.h
> M +3 -4 nepomuk/kioslaves/timeline/CMakeLists.txt
> M +24 -24 nepomuk/kioslaves/timeline/kio_timeline.cpp
> M +1 -1 nepomuk/kioslaves/timeline/kio_timeline.h
> D +0 -14 nepomuk/ontologies/CMakeLists.txt
> D +0 -5 nepomuk/ontologies/README
> D +0 -8 nepomuk/ontologies/kext.ontology.in
> D +0 -91 nepomuk/ontologies/kext.trig
> D +0 -8 nepomuk/ontologies/kuvo.ontology.in
> D +0 -93 nepomuk/ontologies/kuvo.trig
> D +0 -8 nepomuk/ontologies/nrio.ontology.in
> D +0 -327 nepomuk/ontologies/nrio.trig
>
> http://commits.kde.org/kde-runtime/74726c0e050b8104591ae8544fe8f9bd07baed93
>
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 2b22d6b..a97508e 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -32,15 +32,9 @@ macro_log_feature(KDEPIMLIBS_FOUND "KdepimLibs" "KDE PIM \
> Libraries" "kdepimlibs" find_package(KDeclarative REQUIRED)
> macro_log_feature(KDeclarative_FOUND "libkdeclarative" "KDE Declarative (QML) \
> support from kdelibs" "http://www.kde.org" TRUE "" "Required by ksmserver.")
> -set(SOPRANO_MIN_VERSION "2.6.50")
> -set(SDO_MIN_VERSION "0.8.52")
> -macro_optional_find_package(SharedDesktopOntologies ${SDO_MIN_VERSION})
> -macro_optional_find_package(Nepomuk)
> -macro_log_feature(SHAREDDESKTOPONTOLOGIES_FOUND "Shared desktop ontologies" \
> "Desktop ontologies" "http://oscaf.sourceforge.net" FALSE ${SDO_MIN_VERSION} \
> "Ontologies necessary for the Nepomuk semantic desktop.")
> -macro_log_feature(Nepomuk_FOUND "Nepomuk" "Nepomuk Libraries" "kdelibs" FALSE "" \
> "Required to build Nepomuk.")
> -macro_log_feature(SOPRANO_PLUGIN_VIRTUOSOBACKEND_FOUND "Soprano Virtuoso Backend" \
> "Virtuoso storage backend for Soprano" "http://soprano.sourceforge.net" FALSE "" \
> "The Soprano Virtuoso backend is required to run the Nepomuk semantic desktop \
> system.")
> -macro_log_feature(SOPRANO_PLUGIN_RAPTORPARSER_FOUND "Soprano Raptor Parser" "RDF \
> parser plugin for Soprano" "http://soprano.sourceforge.net" FALSE "" "The Soprano \
> raptor parser plugin is required to build the Nepomuk semantic \
> desktop system.")
> -macro_log_feature(SOPRANO_PLUGIN_REDLANDBACKEND_FOUND "Soprano Redland Backend" \
> "Redland storage backend for Soprano" "http://soprano.sourceforge.net" FALSE "" \
> "The Soprano redland backend is required to build the Nepomuk semantic desktop \
> system.") +macro_optional_find_package(NepomukCore)
> +find_package(NepomukCore REQUIRED)
> +macro_log_feature(NepomukCore_FOUND "Nepomuk Core" "Nepomuk Core Libraries" \
> "kde:nepomuk-core" FALSE "" "Required to build Nepomuk.")
> macro_optional_find_package(SLP)
> macro_log_feature( SLP_FOUND
> @@ -69,8 +63,6 @@ include_directories (${CMAKE_SOURCE_DIR} \
> ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCL # Build infrastructure
> add_subdirectory(cmake)
>
> -add_definitions(-DDISABLE_NEPOMUK_LEGACY)
> -
> # Background processes
> add_subdirectory(kpasswdserver)
> add_subdirectory(kdontchangethehostname)
> @@ -90,9 +82,9 @@ if ( UNIX )
> add_subdirectory(solid-networkstatus)
> endif ( UNIX )
>
> -if(SHAREDDESKTOPONTOLOGIES_FOUND AND Nepomuk_FOUND AND \
> STRIGI_STRIGIQTDBUSCLIENT_LIBRARY AND SOPRANO_PLUGIN_REDLANDBACKEND_FOUND AND \
> SOPRANO_PLUGIN_VIRTUOSOBACKEND_FOUND AND \
> SOPRANO_PLUGIN_RAPTORPARSER_FOUND)
> - macro_optional_add_subdirectory(nepomuk)
> -endif(SHAREDDESKTOPONTOLOGIES_FOUND AND Nepomuk_FOUND AND \
> STRIGI_STRIGIQTDBUSCLIENT_LIBRARY AND SOPRANO_PLUGIN_REDLANDBACKEND_FOUND AND \
> SOPRANO_PLUGIN_VIRTUOSOBACKEND_FOUND AND SOPRANO_PLUGIN_RAPTORPARSER_FOUND) \
> +if(NepomukCore_FOUND) + macro_optional_add_subdirectory(nepomuk)
> +endif(NepomukCore_FOUND)
>
> # Plugins/components required for basic utility
> if ( NOT WINCE )
> diff --git a/nepomuk/CMakeLists.txt b/nepomuk/CMakeLists.txt
> index aa0841e..760040a 100644
> --- a/nepomuk/CMakeLists.txt
> +++ b/nepomuk/CMakeLists.txt
> @@ -3,6 +3,9 @@ project(nepomuk)
> # disable deprecated libnepomuk stuff for less compiler warnings
> add_definitions(-DDISABLE_NEPOMUK_LEGACY=1)
>
> +find_package(Soprano REQUIRED)
> +include(SopranoAddOntology)
> +
> include_directories(
> ${SOPRANO_INCLUDE_DIR}
> ${STRIGI_INCLUDE_DIR}
> diff --git a/nepomuk/common/CMakeLists.txt b/nepomuk/common/CMakeLists.txt
> index 57892fc..bd98562 100644
> --- a/nepomuk/common/CMakeLists.txt
> +++ b/nepomuk/common/CMakeLists.txt
> @@ -12,7 +12,7 @@ target_link_libraries(nepomukcommon
> ${QT_QTCORE_LIBRARY}
> ${KDE4_KDECORE_LIBRARY}
> ${KDE4_SOLID_LIBRARY}
> - ${NEPOMUK_LIBRARIES}
> + ${NEPOMUK_CORE_LIBRARIES}
> )
>
> install(TARGETS nepomukcommon EXPORT ${INSTALL_TARGETS_DEFAULT_ARGS})
> diff --git a/nepomuk/common/fileexcludefilters.cpp \
> b/nepomuk/common/fileexcludefilters.cpp index be3bd71..846e4bd 100644
> --- a/nepomuk/common/fileexcludefilters.cpp
> +++ b/nepomuk/common/fileexcludefilters.cpp
> @@ -100,7 +100,7 @@ namespace {
> }
>
>
> -QStringList Nepomuk::defaultExcludeFilterList()
> +QStringList Nepomuk2::defaultExcludeFilterList()
> {
> QStringList l;
> for ( int i = 0; s_defaultFileExcludeFilters[i]; ++i )
> @@ -110,7 +110,7 @@ QStringList Nepomuk::defaultExcludeFilterList()
> return l;
> }
>
> -int Nepomuk::defaultExcludeFilterListVersion()
> +int Nepomuk2::defaultExcludeFilterListVersion()
> {
> return qMax(s_defaultFileExcludeFiltersVersion, \
> s_defaultFolderExcludeFiltersVersion); }
> diff --git a/nepomuk/common/fileexcludefilters.h \
> b/nepomuk/common/fileexcludefilters.h index 311c0fe..0f438f7 100644
> --- a/nepomuk/common/fileexcludefilters.h
> +++ b/nepomuk/common/fileexcludefilters.h
> @@ -23,7 +23,7 @@
>
> #include "nepomukcommon_export.h"
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
> /**
> * \return A list of default exclude filters to be used
> * in the filewatch service to ignore temporary files
> diff --git a/nepomuk/common/nepomuktools.h b/nepomuk/common/nepomuktools.h
> index 64817d5..853f2ff 100644
> --- a/nepomuk/common/nepomuktools.h
> +++ b/nepomuk/common/nepomuktools.h
> @@ -26,7 +26,7 @@
> #include <QtCore/QStringList>
> #include <Soprano/Node>
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
> const int MAX_SPLIT_LIST_ITEMS = 20;
>
> /**
> diff --git a/nepomuk/common/removablemediacache.cpp \
> b/nepomuk/common/removablemediacache.cpp index f7932f4..437c133 100644
> --- a/nepomuk/common/removablemediacache.cpp
> +++ b/nepomuk/common/removablemediacache.cpp
> @@ -64,7 +64,7 @@ namespace {
> }
>
>
> -Nepomuk::RemovableMediaCache::RemovableMediaCache(QObject *parent)
> +Nepomuk2::RemovableMediaCache::RemovableMediaCache(QObject *parent)
> > QObject(parent)
> {
> initCacheEntries();
> @@ -76,12 +76,12 @@ Nepomuk::RemovableMediaCache::RemovableMediaCache(QObject \
> *parent) }
>
>
> -Nepomuk::RemovableMediaCache::~RemovableMediaCache()
> +Nepomuk2::RemovableMediaCache::~RemovableMediaCache()
> {
> }
>
>
> -void Nepomuk::RemovableMediaCache::initCacheEntries()
> +void Nepomuk2::RemovableMediaCache::initCacheEntries()
> {
> QList<Solid::Device> devices
> = Solid::Device::listFromQuery(QLatin1String("StorageVolume.usage=='FileSystem'"))
> @@ -97,7 +97,7 @@ void Nepomuk::RemovableMediaCache::initCacheEntries()
> }
> }
>
> -QList<const Nepomuk::RemovableMediaCache::Entry *> \
> Nepomuk::RemovableMediaCache::allMedia() const +QList<const \
> Nepomuk2::RemovableMediaCache::Entry *> Nepomuk2::RemovableMediaCache::allMedia() \
> const {
> QList<const Entry*> media;
> for(QHash<QString, Entry>::const_iterator it = m_metadataCache.begin(); it != \
> m_metadataCache.end(); ++it) @@ -105,7 +105,7 @@ QList<const \
> Nepomuk::RemovableMediaCache::Entry *> Nepomuk::RemovableMediaCache: return media;
> }
>
> -Nepomuk::RemovableMediaCache::Entry* \
> Nepomuk::RemovableMediaCache::createCacheEntry( const Solid::Device& dev ) \
> +Nepomuk2::RemovableMediaCache::Entry* \
> Nepomuk2::RemovableMediaCache::createCacheEntry( const Solid::Device& dev ) {
> QMutexLocker lock(&m_entryCacheMutex);
>
> @@ -132,7 +132,7 @@ Nepomuk::RemovableMediaCache::Entry* \
> Nepomuk::RemovableMediaCache::createCacheEn }
>
>
> -const Nepomuk::RemovableMediaCache::Entry* \
> Nepomuk::RemovableMediaCache::findEntryByFilePath( const QString& path ) const \
> +const Nepomuk2::RemovableMediaCache::Entry* \
> Nepomuk2::RemovableMediaCache::findEntryByFilePath( const QString& path ) const {
> QMutexLocker lock(&m_entryCacheMutex);
>
> @@ -150,7 +150,7 @@ const Nepomuk::RemovableMediaCache::Entry* \
> Nepomuk::RemovableMediaCache::findEnt }
>
>
> -const Nepomuk::RemovableMediaCache::Entry* \
> Nepomuk::RemovableMediaCache::findEntryByUrl(const KUrl &url) const +const \
> Nepomuk2::RemovableMediaCache::Entry* \
> Nepomuk2::RemovableMediaCache::findEntryByUrl(const KUrl &url) const {
> QMutexLocker lock(&m_entryCacheMutex);
>
> @@ -167,7 +167,7 @@ const Nepomuk::RemovableMediaCache::Entry* \
> Nepomuk::RemovableMediaCache::findEnt }
>
>
> -QList<const Nepomuk::RemovableMediaCache::Entry*> \
> Nepomuk::RemovableMediaCache::findEntriesByMountPath(const QString &path) const \
> +QList<const Nepomuk2::RemovableMediaCache::Entry*> \
> Nepomuk2::RemovableMediaCache::findEntriesByMountPath(const QString &path) const {
> QList<const Entry*> entries;
> for( QHash<QString, Entry>::const_iterator it = m_metadataCache.constBegin();
> @@ -182,13 +182,13 @@ QList<const Nepomuk::RemovableMediaCache::Entry*> \
> Nepomuk::RemovableMediaCache:: }
>
>
> -bool Nepomuk::RemovableMediaCache::hasRemovableSchema(const KUrl &url) const
> +bool Nepomuk2::RemovableMediaCache::hasRemovableSchema(const KUrl &url) const
> {
> return m_usedSchemas.contains(url.scheme());
> }
>
>
> -void Nepomuk::RemovableMediaCache::slotSolidDeviceAdded( const QString& udi )
> +void Nepomuk2::RemovableMediaCache::slotSolidDeviceAdded( const QString& udi )
> {
> kDebug() << udi;
>
> @@ -198,7 +198,7 @@ void Nepomuk::RemovableMediaCache::slotSolidDeviceAdded( const \
> QString& udi ) }
>
>
> -void Nepomuk::RemovableMediaCache::slotSolidDeviceRemoved( const QString& udi )
> +void Nepomuk2::RemovableMediaCache::slotSolidDeviceRemoved( const QString& udi )
> {
> kDebug() << udi;
> if ( m_metadataCache.contains( udi ) ) {
> @@ -208,7 +208,7 @@ void Nepomuk::RemovableMediaCache::slotSolidDeviceRemoved( \
> const QString& udi ) }
>
>
> -void Nepomuk::RemovableMediaCache::slotAccessibilityChanged( bool accessible, \
> const QString& udi ) +void Nepomuk2::RemovableMediaCache::slotAccessibilityChanged( \
> bool accessible, const QString& udi ) {
> kDebug() << accessible << udi;
>
> @@ -224,12 +224,12 @@ void Nepomuk::RemovableMediaCache::slotAccessibilityChanged( \
> bool accessible, co }
>
>
> -Nepomuk::RemovableMediaCache::Entry::Entry()
> +Nepomuk2::RemovableMediaCache::Entry::Entry()
> {
> }
>
>
> -Nepomuk::RemovableMediaCache::Entry::Entry(const Solid::Device& device)
> +Nepomuk2::RemovableMediaCache::Entry::Entry(const Solid::Device& device)
> > m_device(device)
> {
> if(device.is<Solid::StorageVolume>()) {
> @@ -256,7 +256,7 @@ Nepomuk::RemovableMediaCache::Entry::Entry(const Solid::Device& \
> device) }
> }
>
> -KUrl Nepomuk::RemovableMediaCache::Entry::constructRelativeUrl( const QString& \
> path ) const +KUrl Nepomuk2::RemovableMediaCache::Entry::constructRelativeUrl( \
> const QString& path ) const {
> if(const Solid::StorageAccess* sa = m_device.as<Solid::StorageAccess>()) {
> if(sa->isAccessible()) {
> @@ -270,7 +270,7 @@ KUrl Nepomuk::RemovableMediaCache::Entry::constructRelativeUrl( \
> const QString& p }
>
>
> -KUrl Nepomuk::RemovableMediaCache::Entry::constructLocalFileUrl( const KUrl& \
> filexUrl ) const +KUrl Nepomuk2::RemovableMediaCache::Entry::constructLocalFileUrl( \
> const KUrl& filexUrl ) const {
> if(const Solid::StorageAccess* sa = m_device.as<Solid::StorageAccess>()) {
> if(sa->isAccessible()) {
> @@ -285,7 +285,7 @@ KUrl \
> Nepomuk::RemovableMediaCache::Entry::constructLocalFileUrl( const KUrl& fil return \
> QString(); }
>
> -QString Nepomuk::RemovableMediaCache::Entry::mountPath() const
> +QString Nepomuk2::RemovableMediaCache::Entry::mountPath() const
> {
> if(const Solid::StorageAccess* sa = m_device.as<Solid::StorageAccess>()) {
> return sa->filePath();
> @@ -295,7 +295,7 @@ QString Nepomuk::RemovableMediaCache::Entry::mountPath() const
> }
> }
>
> -bool Nepomuk::RemovableMediaCache::Entry::isMounted() const
> +bool Nepomuk2::RemovableMediaCache::Entry::isMounted() const
> {
> if(const Solid::StorageAccess* sa = m_device.as<Solid::StorageAccess>()) {
> return sa->isAccessible();
> diff --git a/nepomuk/common/removablemediacache.h \
> b/nepomuk/common/removablemediacache.h index 740628b..4da7ab5 100644
> --- a/nepomuk/common/removablemediacache.h
> +++ b/nepomuk/common/removablemediacache.h
> @@ -33,7 +33,7 @@
> #include <KUrl>
>
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
>
> /**
> * The removable media cache provides access to all removable
> @@ -93,8 +93,8 @@ public:
> bool hasRemovableSchema(const KUrl& url) const;
>
> signals:
> - void deviceAdded(const Nepomuk::RemovableMediaCache::Entry* entry);
> - void deviceMounted(const Nepomuk::RemovableMediaCache::Entry* entry);
> + void deviceAdded(const Nepomuk2::RemovableMediaCache::Entry* entry);
> + void deviceMounted(const Nepomuk2::RemovableMediaCache::Entry* entry);
>
> private slots:
> void slotSolidDeviceAdded(const QString &udi);
> @@ -117,6 +117,6 @@ private:
> mutable QMutex m_entryCacheMutex;
> };
>
> -} // namespace Nepomuk
> +} // namespace Nepomuk2
>
> #endif // NEPOMUK_REMOVABLEMEDIACACHE_H
> diff --git a/nepomuk/controller/CMakeLists.txt b/nepomuk/controller/CMakeLists.txt
> index d3f1376..5739e8a 100644
> --- a/nepomuk/controller/CMakeLists.txt
> +++ b/nepomuk/controller/CMakeLists.txt
> @@ -4,7 +4,7 @@ include_directories(
> ${QT_INCLUDES}
> ${KDE4_INCLUDES}
> ${SOPRANO_INCLUDE_DIR}
> - ${NEPOMUK_INCLUDE_DIR}
> + ${NEPOMUK_CORE_INCLUDE_DIR}
> ${CMAKE_CURRENT_BUILD_DIR}
> ${CMAKE_CURRENT_SOURCE_DIR}/../kcm
> )
> @@ -15,8 +15,8 @@ set(controller_SRCS
> ../kcm/statuswidget.cpp
> )
>
> -qt4_add_dbus_interface(controller_SRCS \
> ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.kde.nepomuk.FileIndexer.xml \
> fileindexerinterface)
> -qt4_add_dbus_interface(controller_SRCS \
> ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/org.kde.nepomuk.ServiceControl.xml \
> servicecontrol) +qt4_add_dbus_interface(controller_SRCS \
> ${NEPOMUK_CORE_DBUS_INTERFACE_DIR}/org.kde.nepomuk.FileIndexer.xml \
> fileindexerinterface) +qt4_add_dbus_interface(controller_SRCS \
> ${NEPOMUK_CORE_DBUS_INTERFACE_DIR}/org.kde.nepomuk.ServiceControl.xml \
> servicecontrol)
> kde4_add_ui_files(controller_SRCS ../kcm/statuswidget.ui)
>
> @@ -26,7 +26,7 @@ target_link_libraries(nepomukcontroller
> ${KDE4_KDEUI_LIBS}
> ${KDE4_KIO_LIBS}
> ${KDE4_SOLID_LIBS}
> - ${NEPOMUK_LIBRARIES}
> + ${NEPOMUK_CORE_LIBRARIES}
> ${SOPRANO_LIBRARIES}
> )
>
> diff --git a/nepomuk/controller/main.cpp b/nepomuk/controller/main.cpp
> index ddd9327..0c7c4d1 100644
> --- a/nepomuk/controller/main.cpp
> +++ b/nepomuk/controller/main.cpp
> @@ -47,7 +47,7 @@ int main( int argc, char *argv[] )
> KUniqueApplication app;
> app.setQuitOnLastWindowClosed(false);
> KGlobal::locale()->insertCatalog( QLatin1String( "kcm_nepomuk" ));
> - (void)new Nepomuk::SystemTray(0);
> + (void)new Nepomuk2::SystemTray(0);
> return app.exec();
> }
> }
> diff --git a/nepomuk/controller/systray.cpp b/nepomuk/controller/systray.cpp
> index 5025e45..95300d2 100644
> --- a/nepomuk/controller/systray.cpp
> +++ b/nepomuk/controller/systray.cpp
> @@ -35,7 +35,7 @@
> #include <QDesktopWidget>
>
>
> -Nepomuk::SystemTray::SystemTray( QObject* parent )
> +Nepomuk2::SystemTray::SystemTray( QObject* parent )
> > KStatusNotifierItem( parent ),
> m_service( 0 ),
> m_suspendedManually( false ),
> @@ -93,12 +93,12 @@ Nepomuk::SystemTray::SystemTray( QObject* parent )
> }
>
>
> -Nepomuk::SystemTray::~SystemTray()
> +Nepomuk2::SystemTray::~SystemTray()
> {
> }
>
>
> -void Nepomuk::SystemTray::slotUpdateFileIndexerStatus()
> +void Nepomuk2::SystemTray::slotUpdateFileIndexerStatus()
> {
> ItemStatus newStatus = status();
>
> @@ -140,7 +140,7 @@ void Nepomuk::SystemTray::slotUpdateFileIndexerStatus()
> }
>
>
> -void Nepomuk::SystemTray::slotConfigure()
> +void Nepomuk2::SystemTray::slotConfigure()
> {
> QStringList args;
> args << "kcm_nepomuk";
> @@ -148,7 +148,7 @@ void Nepomuk::SystemTray::slotConfigure()
> }
>
>
> -void Nepomuk::SystemTray::slotSuspend( bool suspended )
> +void Nepomuk2::SystemTray::slotSuspend( bool suspended )
> {
> m_suspendedManually = suspended;
> if( suspended )
> @@ -182,10 +182,10 @@ static QRect screenRect( QWidget *widget, int screen )
> return desktop->geometry();
> }
>
> -void Nepomuk::SystemTray::slotActivateRequested()
> +void Nepomuk2::SystemTray::slotActivateRequested()
> {
> if(!m_statusWidget)
> - m_statusWidget = new Nepomuk::StatusWidget();
> + m_statusWidget = new Nepomuk2::StatusWidget();
>
> if(!m_statusWidget->isVisible()) {
> m_statusWidget->show();
> @@ -199,7 +199,7 @@ void Nepomuk::SystemTray::slotActivateRequested()
> }
> }
>
> -void Nepomuk::SystemTray::slotActiveStatusTimeout()
> +void Nepomuk2::SystemTray::slotActiveStatusTimeout()
> {
> setStatus(Active);
> }
> diff --git a/nepomuk/controller/systray.h b/nepomuk/controller/systray.h
> index 0cbdc9a..fc4f658 100644
> --- a/nepomuk/controller/systray.h
> +++ b/nepomuk/controller/systray.h
> @@ -26,7 +26,7 @@
>
> class KToggleAction;
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
>
> class FileIndexer;
> class StatusWidget;
> diff --git a/nepomuk/interfaces/CMakeLists.txt b/nepomuk/interfaces/CMakeLists.txt
> deleted file mode 100644
> index d863301..0000000
> --- a/nepomuk/interfaces/CMakeLists.txt
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -project(nepomuk_interfaces)
> -
> -install(FILES
> - org.kde.NepomukServer.xml
> - org.kde.nepomuk.ServiceControl.xml
> - org.kde.nepomuk.ServiceManager.xml
> - org.kde.nepomuk.FileIndexer.xml
> - org.kde.nepomuk.OntologyManager.xml
> - org.kde.nepomuk.Storage.xml
> - org.kde.nepomuk.QueryService.xml
> - org.kde.nepomuk.Query.xml
> - org.kde.nepomuk.BackupSync.xml
> - org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml
> - org.kde.nepomuk.services.nepomukbackupsync.syncmanager.xml
> - org.kde.nepomuk.DataManagement.xml
> - org.kde.nepomuk.ResourceWatcher.xml
> - org.kde.nepomuk.ResourceWatcherConnection.xml
> - DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
> - )
> diff --git a/nepomuk/interfaces/org.kde.NepomukServer.xml \
> b/nepomuk/interfaces/org.kde.NepomukServer.xml deleted file mode 100644
> index 001c52b..0000000
> --- a/nepomuk/interfaces/org.kde.NepomukServer.xml
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
> - "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
> -<node>
> - <interface name="org.kde.NepomukServer">
> - <method name="enableFileIndexer">
> - <arg name="enabled" type="b" direction="in" />
> - </method>
> - <method name="enableNepomuk">
> - <arg name="enabled" type="b" direction="in" />
> - </method>
> - <method name="isFileIndexerEnabled">
> - <arg name="enabled" type="b" direction="out" />
> - </method>
> - <method name="isNepomukEnabled">
> - <arg name="enabled" type="b" direction="out" />
> - </method>
> - <method name="defaultRepository">
> - <arg name="repositoryName" type="s" direction="out" />
> - </method>
> - <method name="reconfigure" />
> - <method name="quit" />
> - </interface>
> -</node>
> diff --git a/nepomuk/interfaces/org.kde.nepomuk.BackupSync.xml \
> b/nepomuk/interfaces/org.kde.nepomuk.BackupSync.xml deleted file mode 100644
> index 79f10fa..0000000
> --- a/nepomuk/interfaces/org.kde.nepomuk.BackupSync.xml
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" \
> "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
> -<node>
> - <interface name="org.kde.nepomuk.services.nepomukbackupsync.BackupSyncService">
>
> - <method name="test">
> - </method>
> - </interface>
> -</node>
> diff --git a/nepomuk/interfaces/org.kde.nepomuk.DataManagement.xml \
> b/nepomuk/interfaces/org.kde.nepomuk.DataManagement.xml deleted file mode 100644
> index 19162cf..0000000
> --- a/nepomuk/interfaces/org.kde.nepomuk.DataManagement.xml
> +++ /dev/null
> @@ -1,124 +0,0 @@
> -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
> -"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
> -<node>
> - <interface name="org.kde.nepomuk.DataManagement">
> - <method name="addProperty">
> - <arg name="resources" type="as" direction="in"/>
> - <arg name="property" type="s" direction="in"/>
> - <arg name="values" type="av" direction="in"/>
> - <arg name="app" type="s" direction="in"/>
> - </method>
> - <method name="setProperty">
> - <arg name="resources" type="as" direction="in"/>
> - <arg name="property" type="s" direction="in"/>
> - <arg name="values" type="av" direction="in"/>
> - <arg name="app" type="s" direction="in"/>
> - </method>
> - <method name="removeProperty">
> - <arg name="resources" type="as" direction="in"/>
> - <arg name="property" type="s" direction="in"/>
> - <arg name="values" type="av" direction="in"/>
> - <arg name="app" type="s" direction="in"/>
> - </method>
> - <method name="removeProperties">
> - <arg name="resources" type="as" direction="in"/>
> - <arg name="properties" type="as" direction="in"/>
> - <arg name="app" type="s" direction="in"/>
> - </method>
> - <method name="createResource">
> - <arg type="s" direction="out"/>
> - <arg name="types" type="as" direction="in"/>
> - <arg name="label" type="s" direction="in"/>
> - <arg name="description" type="s" direction="in"/>
> - <arg name="app" type="s" direction="in"/>
> - </method>
> - <method name="removeResources">
> - <arg name="resources" type="as" direction="in"/>
> - <arg name="flags" type="i" direction="in"/>
> - <arg name="app" type="s" direction="in"/>
> - </method>
> - <method name="removeDataByApplication">
> - <arg name="resources" type="as" direction="in"/>
> - <arg name="flags" type="i" direction="in"/>
> - <arg name="app" type="s" direction="in"/>
> - </method>
> - <method name="removeDataByApplication">
> - <arg name="flags" type="i" direction="in"/>
> - <arg name="app" type="s" direction="in"/>
> - </method>
> - <method name="storeResources">
> - <arg name="resources" type="a(sa{sv})" direction="in"/>
> - <annotation name="com.trolltech.QtDBus.QtTypeName.In0" \
> value="QList<Nepomuk::SimpleResource>"/>
> - <arg name="identificationMode" type="i" direction="in"/>
> - <arg name="flags" type="i" direction="in"/>
> - <arg name="additionalMetadata" type="a{sv}" direction="in"/>
> - <annotation name="com.trolltech.QtDBus.QtTypeName.In3" \
> value="Nepomuk::PropertyHash"/>
> - <arg name="app" type="s" direction="in"/>
> - <arg type="a{ss}" direction="out"/>
> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" \
> value="QHash<QString, QString>"/>
> - </method>
> - <method name="importResources">
> - <arg name="url" type="s" direction="in"/>
> - <arg name="serialization" type="s" direction="in"/>
> - <arg name="identificationMode" type="i" direction="in"/>
> - <arg name="flags" type="i" direction="in"/>
> - <arg name="additionalMetadata" type="a{sv}" direction="in"/>
> - <annotation name="com.trolltech.QtDBus.QtTypeName.In4" \
> value="Nepomuk::PropertyHash"/>
> - <arg name="app" type="s" direction="in"/>
> - </method>
> - <method name="importResources">
> - <arg name="url" type="s" direction="in"/>
> - <arg name="serialization" type="s" direction="in"/>
> - <arg name="identificationMode" type="i" direction="in"/>
> - <arg name="flags" type="i" direction="in"/>
> - <arg name="app" type="s" direction="in"/>
> - </method>
> - <method name="mergeResources">
> - <arg name="resource1" type="s" direction="in"/>
> - <arg name="resource2" type="s" direction="in"/>
> - <arg name="app" type="s" direction="in"/>
> - </method>
> - <method name="describeResources">
> - <arg name="resources" type="as" direction="in"/>
> - <arg name="flags" type="i" direction="in"/>
> - <arg name="targetGroups" type="as" direction="in"/>
> - <arg type="a(sa{sv})" direction="out"/>
> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" \
> value="QList<Nepomuk::SimpleResource>"/>
> - </method>
> - <method name="setProperty">
> - <arg name="resource" type="s" direction="in"/>
> - <arg name="property" type="s" direction="in"/>
> - <arg name="value" type="v" direction="in"/>
> - <arg name="app" type="s" direction="in"/>
> - </method>
> - <method name="addProperty">
> - <arg name="resource" type="s" direction="in"/>
> - <arg name="property" type="s" direction="in"/>
> - <arg name="value" type="v" direction="in"/>
> - <arg name="app" type="s" direction="in"/>
> - </method>
> - <method name="removeProperty">
> - <arg name="resource" type="s" direction="in"/>
> - <arg name="property" type="s" direction="in"/>
> - <arg name="value" type="v" direction="in"/>
> - <arg name="app" type="s" direction="in"/>
> - </method>
> - <method name="removeProperties">
> - <arg name="resource" type="s" direction="in"/>
> - <arg name="property" type="s" direction="in"/>
> - <arg name="app" type="s" direction="in"/>
> - </method>
> - <method name="createResource">
> - <arg type="s" direction="out"/>
> - <arg name="type" type="s" direction="in"/>
> - <arg name="label" type="s" direction="in"/>
> - <arg name="description" type="s" direction="in"/>
> - <arg name="app" type="s" direction="in"/>
> - </method>
> - <method name="removeResources">
> - <arg name="resource" type="s" direction="in"/>
> - <arg name="flags" type="i" direction="in"/>
> - <arg name="app" type="s" direction="in"/>
> - </method>
> - </interface>
> -</node>
> diff --git a/nepomuk/interfaces/org.kde.nepomuk.FileIndexer.xml \
> b/nepomuk/interfaces/org.kde.nepomuk.FileIndexer.xml deleted file mode 100644
> index 05cf427..0000000
> --- a/nepomuk/interfaces/org.kde.nepomuk.FileIndexer.xml
> +++ /dev/null
> @@ -1,46 +0,0 @@
> -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
> - "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
> -<node>
> - <interface name="org.kde.nepomuk.FileIndexer">
> - <method name="isIndexing">
> - <arg type="b" direction="out" />
> - </method>
> - <method name="isSuspended">
> - <arg type="b" direction="out" />
> - </method>
> - <method name="currentFolder">
> - <arg type="s" direction="out" />
> - </method>
> - <method name="currentFile">
> - <arg type="s" direction="out" />
> - </method>
> - <method name="suspend" />
> - <method name="resume" />
> - <method name="updateFolder">
> - <arg name="path" type="s" direction="in" />
> - <arg name="recursive" type="b" direction="in" />
> - <arg name="forced" type="b" direction="in" />
> - </method>
> - <method name="updateAllFolders">
> - <arg name="forced" type="b" direction="in" />
> - </method>
> - <method name="indexFolder">
> - <arg name="path" type="s" direction="in" />
> - <arg name="recursive" type="b" direction="in" />
> - <arg name="forced" type="b" direction="in" />
> - </method>
> - <method name="indexFile">
> - <arg name="path" type="s" direction="in" />
> - <arg name="forced" type="b" direction="in" />
> - </method>
> - <method name="userStatusString">
> - <arg type="s" direction="out" />
> - </method>
> - <signal name="statusChanged" />
> - <signal name="indexingStarted" />
> - <signal name="indexingStopped" />
> - <signal name="indexingFolder">
> - <arg name="path" type="s" />
> - </method>
> - </interface>
> -</node>
> diff --git a/nepomuk/interfaces/org.kde.nepomuk.FileWatch.xml \
> b/nepomuk/interfaces/org.kde.nepomuk.FileWatch.xml deleted file mode 100644
> index e2784a2..0000000
> --- a/nepomuk/interfaces/org.kde.nepomuk.FileWatch.xml
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
> - "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
> -<node>
> - <interface name="org.kde.nepomuk.FileWatch">
> - <method name="watchFolder">
> - <arg name="path" type="s" direction="in"/>
> - </method>
> - </interface>
> -</node>
> diff --git a/nepomuk/interfaces/org.kde.nepomuk.OntologyManager.xml \
> b/nepomuk/interfaces/org.kde.nepomuk.OntologyManager.xml deleted file mode 100644
> index 8977b79..0000000
> --- a/nepomuk/interfaces/org.kde.nepomuk.OntologyManager.xml
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
> - "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
> -<node>
> - <interface name="org.kde.nepomuk.OntologyManager">
> - <method name="findOntologyContext">
> - <arg name="uri" type="s" direction="in" />
> - <arg type="s" direction="out" />
> - </method>
> - <method name="importOntology">
> - <arg name="uri" type="s" direction="in" />
> - </method>
> - <method name="updateLocalOntologies" />
> - <method name="updateAllLocalOntologies" />
> - <signal name="ontologyUpdated">
> - <arg name="uri" type="s" />
> - </signal>
> - <signal name="ontologyUpdateFailed">
> - <arg name="uri" type="s" />
> - <arg name="errorString" type="s" />
> - </signal>
> - </interface>
> -</node>
> diff --git a/nepomuk/interfaces/org.kde.nepomuk.Query.xml \
> b/nepomuk/interfaces/org.kde.nepomuk.Query.xml deleted file mode 100644
> index 0e444e7..0000000
> --- a/nepomuk/interfaces/org.kde.nepomuk.Query.xml
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
> - "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
> -<node>
> - <interface name="org.kde.nepomuk.Query">
> - <method name="list" />
> - <method name="listen" />
> - <method name="close" />
> - <method name="isListingFinished">
> - <arg type="b" direction="out" />
> - </method>
> - <method name="queryString">
> - <arg type="s" direction="out" />
> - </method>
> - <signal name="newEntries">
> - <arg name="entries" type="a(sda{s(isss)})" />
> - <annotation name="com.trolltech.QtDBus.QtTypeName.In0" \
> value="QList<Nepomuk::Query::Result>" />
> - </signal>
> - <signal name="entriesRemoved">
> - <arg name="entries" type="as" />
> - </signal>
> - <signal name="entriesRemoved">
> - <arg name="entries" type="a(sda{s(isss)}s)" />
> - <annotation name="com.trolltech.QtDBus.QtTypeName.In0" \
> value="QList<Nepomuk::Query::Result>" />
> - </signal>
> - <signal name="resultCount">
> - <arg name="count" type="i" />
> - </signal>
> - <signal name="finishedListing" />
> - </interface>
> -</node>
> diff --git a/nepomuk/interfaces/org.kde.nepomuk.QueryService.xml \
> b/nepomuk/interfaces/org.kde.nepomuk.QueryService.xml deleted file mode 100644
> index 52d8e8f..0000000
> --- a/nepomuk/interfaces/org.kde.nepomuk.QueryService.xml
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
> - "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
> -<node>
> - <interface name="org.kde.nepomuk.QueryService">
> - <method name="query">
> - <arg name="encodedQuery" type="s" direction="in" />
> - <arg name="queryobject" type="o" direction="out" />
> - </method>
> - <method name="desktopQuery">
> - <arg name="query" type="s" direction="in" />
> - <arg name="queryobject" type="o" direction="out" />
> - </method>
> - <method name="sparqlQuery">
> - <arg name="query" type="s" direction="in" />
> - <arg name="requestProps" type="a{ss}" direction="in" />
> - <annotation name="com.trolltech.QtDBus.QtTypeName.In1" \
> value="QHash<QString, QString>"/>
> - <arg name="queryobject" type="o" direction="out" />
> - </method>
> - </interface>
> -</node>
> diff --git a/nepomuk/interfaces/org.kde.nepomuk.ResourceWatcher.xml \
> b/nepomuk/interfaces/org.kde.nepomuk.ResourceWatcher.xml deleted file mode 100644
> index 7f41444..0000000
> --- a/nepomuk/interfaces/org.kde.nepomuk.ResourceWatcher.xml
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" \
> "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
> -<node>
> - <interface name="org.kde.nepomuk.ResourceWatcher">
> - <method name="stopWatcher">
> - <arg name="objectName" type="s" direction="in"/>
> - </method>
> - <method name="watch">
> - <arg name="resources" type="as" direction="in"/>
> - <arg name="properties" type="as" direction="in"/>
> - <arg name="types" type="as" direction="in"/>
> - <arg name="queryobject" type="o" direction="out" />
> - </method>
> - </interface>
> -</node>
> diff --git a/nepomuk/interfaces/org.kde.nepomuk.ResourceWatcherConnection.xml \
> b/nepomuk/interfaces/org.kde.nepomuk.ResourceWatcherConnection.xml deleted file \
> mode 100644 index 7848343..0000000
> --- a/nepomuk/interfaces/org.kde.nepomuk.ResourceWatcherConnection.xml
> +++ /dev/null
> @@ -1,65 +0,0 @@
> -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" \
> "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
> -<node>
> - <interface name="org.kde.nepomuk.ResourceWatcherConnection">
> - <signal name="resourceCreated">
> - <arg name="uri" type="s" direction="out"/>
> - <arg name="types" type="as" direction="out"/>
> - </signal>
> - <signal name="resourceRemoved">
> - <arg name="uri" type="s" direction="out"/>
> - <arg name="types" type="as" direction="out"/>
> - </signal>
> - <signal name="resourceTypesAdded">
> - <arg name="resUri" type="s" direction="out"/>
> - <arg name="types" type="as" direction="out"/>
> - </signal>
> - <signal name="resourceTypesRemoved">
> - <arg name="resUri" type="s" direction="out"/>
> - <arg name="types" type="as" direction="out"/>
> - </signal>
> - <signal name="propertyAdded">
> - <arg name="resource" type="s" direction="out"/>
> - <arg name="property" type="s" direction="out"/>
> - <arg name="values" type="av" direction="out"/>
> - </signal>
> - <signal name="propertyRemoved">
> - <arg name="resource" type="s" direction="out"/>
> - <arg name="property" type="s" direction="out"/>
> - <arg name="values" type="av" direction="out"/>
> - </signal>
> - <signal name="propertyChanged">
> - <arg name="resource" type="s" direction="out"/>
> - <arg name="property" type="s" direction="out"/>
> - <arg name="addedValues" type="av" direction="out"/>
> - <arg name="removedValues" type="av" direction="out"/>
> - </signal>
> - <method name="setResources">
> - <arg name="resources" type="as" direction="in"/>
> - </method>
> - <method name="addResource">
> - <arg name="resource" type="s" direction="in"/>
> - </method>
> - <method name="removeResource">
> - <arg name="resource" type="s" direction="in"/>
> - </method>
> - <method name="setProperties">
> - <arg name="properties" type="as" direction="in"/>
> - </method>
> - <method name="addProperty">
> - <arg name="property" type="s" direction="in"/>
> - </method>
> - <method name="removeProperty">
> - <arg name="property" type="s" direction="in"/>
> - </method>
> - <method name="setTypes">
> - <arg name="types" type="as" direction="in"/>
> - </method>
> - <method name="addType">
> - <arg name="type" type="s" direction="in"/>
> - </method>
> - <method name="removeType">
> - <arg name="type" type="s" direction="in"/>
> - </method>
> - <method name="close" />
> - </interface>
> -</node>
> diff --git a/nepomuk/interfaces/org.kde.nepomuk.ServiceControl.xml \
> b/nepomuk/interfaces/org.kde.nepomuk.ServiceControl.xml deleted file mode 100644
> index ff606af..0000000
> --- a/nepomuk/interfaces/org.kde.nepomuk.ServiceControl.xml
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
> - "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
> -<node>
> - <interface name="org.kde.nepomuk.ServiceControl">
> - <method name="shutdown" />
> - <method name="isInitialized">
> - <arg name="state" type="b" direction="out" />
> - </method>
> - <signal name="serviceInitialized">
> - <arg name="success" type="b" direction="out" />
> - </signal>
> - <method name="description">
> - <arg type="s" direction="out"/>
> - </method>
> - <method name="name">
> - <arg type="s" direction="out"/>
> - </method>
> - </interface>
> -</node>
> diff --git a/nepomuk/interfaces/org.kde.nepomuk.ServiceManager.xml \
> b/nepomuk/interfaces/org.kde.nepomuk.ServiceManager.xml deleted file mode 100644
> index 6e81297..0000000
> --- a/nepomuk/interfaces/org.kde.nepomuk.ServiceManager.xml
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
> - "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
> -<node>
> - <interface name="org.kde.nepomuk.ServiceManager">
> - <method name="startService">
> - <arg name="name" type="s" direction="in" />
> - <arg name="result" type="b" direction="out" />
> - </method>
> - <method name="stopService">
> - <arg name="name" type="s" direction="in" />
> - <arg name="result" type="b" direction="out" />
> - </method>
> - <method name="runningServices">
> - <arg name="services" type="as" direction="out" />
> - </method>
> - <method name="availableServices">
> - <arg name="services" type="as" direction="out" />
> - </method>
> - <method name="isServiceAutostarted">
> - <arg name="service" type="s" direction="in" />
> - <arg name="autostart" type="b" direction="out" />
> - </method>
> - <method name="setServiceAutostarted">
> - <arg name="service" type="s" direction="in" />
> - <arg name="autostart" type="b" direction="in" />
> - </method>
> - <method name="isServiceInitialized">
> - <arg name="name" type="s" direction="in" />
> - <arg name="result" type="b" direction="out" />
> - </method>
> - <method name="isServiceRunning">
> - <arg name="name" type="s" direction="in" />
> - <arg name="result" type="b" direction="out" />
> - </method>
> - <signal name="serviceInitialized">
> - <arg name="name" type="s" direction="out" />
> - </signal>
> - </interface>
> -</node>
> diff --git a/nepomuk/interfaces/org.kde.nepomuk.Storage.xml \
> b/nepomuk/interfaces/org.kde.nepomuk.Storage.xml deleted file mode 100644
> index fac0c27..0000000
> --- a/nepomuk/interfaces/org.kde.nepomuk.Storage.xml
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
> - "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
> -<node>
> - <interface name="org.kde.nepomuk.Storage">
> - <method name="usedSopranoBackend">
> - <arg name="backendName" type="s" direction="out" />
> - </method>
> - </interface>
> -</node>
> diff --git a/nepomuk/interfaces/org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml \
> b/nepomuk/interfaces/org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml \
> deleted file mode 100644 index 85b2d12..0000000
> --- a/nepomuk/interfaces/org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml
>
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" \
> "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
> -<node>
> - <interface name="org.kde.nepomuk.services.nepomukbackupsync.BackupManager">
> - <method name="backup">
> - <arg name="url" type="s" direction="in"/>
> - </method>
> - <signal name="backupDone">
> - </signal>
> - </interface>
> -</node>
> diff --git a/nepomuk/interfaces/org.kde.nepomuk.services.nepomukbackupsync.syncmanager.xml \
> b/nepomuk/interfaces/org.kde.nepomuk.services.nepomukbackupsync.syncmanager.xml \
> deleted file mode 100644 index f8a87f2..0000000
> --- a/nepomuk/interfaces/org.kde.nepomuk.services.nepomukbackupsync.syncmanager.xml
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" \
> "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
> -<node>
> - <interface name="org.kde.nepomuk.services.nepomukbackupsync.SyncManager">
> - <method name="createSyncFile">
> - <arg name="url" type="s" direction="in"/>
> - <arg name="startTime" type="s" direction="in"/>
> - </method>
> - </interface>
> -</node>
> diff --git a/nepomuk/kcm/CMakeLists.txt b/nepomuk/kcm/CMakeLists.txt
> index 3b12813..c00f246 100644
> --- a/nepomuk/kcm/CMakeLists.txt
> +++ b/nepomuk/kcm/CMakeLists.txt
> @@ -5,19 +5,20 @@ project(kcm_nepomuk)
> include_directories(
> ${SOPRANO_INCLUDE_DIR}
> ${CMAKE_SOURCE_DIR}
> - ${NEPOMUK_INCLUDE_DIR}
> + ${NEPOMUK_CORE_INCLUDE_DIR}
> )
>
> set(kcmnepomuk_SRCS
> nepomukserverkcm.cpp
> + fileexcludefilters.cpp
> folderselectionmodel.cpp
> indexfolderselectiondialog.cpp
> statuswidget.cpp
> )
>
> -qt4_add_dbus_interface(kcmnepomuk_SRCS ../interfaces/org.kde.NepomukServer.xml \
> nepomukserverinterface)
> -qt4_add_dbus_interface(kcmnepomuk_SRCS \
> ../interfaces/org.kde.nepomuk.ServiceControl.xml servicecontrol)
> -qt4_add_dbus_interface(kcmnepomuk_SRCS \
> ../interfaces/org.kde.nepomuk.FileIndexer.xml fileindexerinterface) \
> +qt4_add_dbus_interface(kcmnepomuk_SRCS \
> ${NEPOMUK_CORE_DBUS_INTERFACES_DIR}/org.kde.NepomukServer.xml \
> nepomukserverinterface) +qt4_add_dbus_interface(kcmnepomuk_SRCS \
> ${NEPOMUK_CORE_DBUS_INTERFACES_DIR}/org.kde.nepomuk.ServiceControl.xml \
> servicecontrol) +qt4_add_dbus_interface(kcmnepomuk_SRCS \
> ${NEPOMUK_CORE_DBUS_INTERFACES_DIR}/org.kde.nepomuk.FileIndexer.xml \
> fileindexerinterface)
> kde4_add_ui_files(kcmnepomuk_SRCS
> nepomukconfigwidget.ui
> @@ -30,8 +31,7 @@ target_link_libraries(kcm_nepomuk
> nepomukcommon
> ${KDE4_KDEUI_LIBS}
> ${KDE4_KIO_LIBS}
> - ${NEPOMUK_LIBRARIES}
> - ${NEPOMUK_QUERY_LIBRARIES}
> + ${NEPOMUK_CORE_LIBRARIES}
> ${SOPRANO_LIBRARIES}
> )
> # -----------------------------
> diff --git a/nepomuk/common/fileexcludefilters.cpp \
> b/nepomuk/kcm/fileexcludefilters.cpp similarity index 96%
> copy from nepomuk/common/fileexcludefilters.cpp
> copy to nepomuk/kcm/fileexcludefilters.cpp
> index be3bd71..846e4bd 100644
> --- a/nepomuk/common/fileexcludefilters.cpp
> +++ b/nepomuk/kcm/fileexcludefilters.cpp
> @@ -100,7 +100,7 @@ namespace {
> }
>
>
> -QStringList Nepomuk::defaultExcludeFilterList()
> +QStringList Nepomuk2::defaultExcludeFilterList()
> {
> QStringList l;
> for ( int i = 0; s_defaultFileExcludeFilters[i]; ++i )
> @@ -110,7 +110,7 @@ QStringList Nepomuk::defaultExcludeFilterList()
> return l;
> }
>
> -int Nepomuk::defaultExcludeFilterListVersion()
> +int Nepomuk2::defaultExcludeFilterListVersion()
> {
> return qMax(s_defaultFileExcludeFiltersVersion, \
> s_defaultFolderExcludeFiltersVersion); }
> diff --git a/nepomuk/common/fileexcludefilters.h b/nepomuk/kcm/fileexcludefilters.h
> similarity index 98%
> copy from nepomuk/common/fileexcludefilters.h
> copy to nepomuk/kcm/fileexcludefilters.h
> index 311c0fe..0f438f7 100644
> --- a/nepomuk/common/fileexcludefilters.h
> +++ b/nepomuk/kcm/fileexcludefilters.h
> @@ -23,7 +23,7 @@
>
> #include "nepomukcommon_export.h"
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
> /**
> * \return A list of default exclude filters to be used
> * in the filewatch service to ignore temporary files
> diff --git a/nepomuk/kcm/indexfolderselectiondialog.cpp \
> b/nepomuk/kcm/indexfolderselectiondialog.cpp index e227649..59cfa14 100644
> --- a/nepomuk/kcm/indexfolderselectiondialog.cpp
> +++ b/nepomuk/kcm/indexfolderselectiondialog.cpp
> @@ -56,7 +56,7 @@ namespace {
> }
>
>
> -Nepomuk::IndexFolderSelectionDialog::IndexFolderSelectionDialog( QWidget* parent )
> +Nepomuk2::IndexFolderSelectionDialog::IndexFolderSelectionDialog( QWidget* parent \
> ) : KDialog( parent )
> {
> setupUi( mainWidget() );
> @@ -78,12 +78,12 @@ \
> Nepomuk::IndexFolderSelectionDialog::IndexFolderSelectionDialog( QWidget* parent }
>
>
> -Nepomuk::IndexFolderSelectionDialog::~IndexFolderSelectionDialog()
> +Nepomuk2::IndexFolderSelectionDialog::~IndexFolderSelectionDialog()
> {
> }
>
>
> -void Nepomuk::IndexFolderSelectionDialog::setFolders( const QStringList& \
> includeDirs, const QStringList& exclude ) +void \
> Nepomuk2::IndexFolderSelectionDialog::setFolders( const QStringList& includeDirs, \
> const QStringList& exclude ) {
> m_folderModel->setFolders( includeDirs, exclude );
>
> @@ -105,19 +105,19 @@ void Nepomuk::IndexFolderSelectionDialog::setFolders( const \
> QStringList& include }
>
>
> -void Nepomuk::IndexFolderSelectionDialog::setExcludeFilters( const QStringList& \
> filters ) +void Nepomuk2::IndexFolderSelectionDialog::setExcludeFilters( const \
> QStringList& filters ) {
> m_editExcludeFilters->setItems( filters );
> }
>
>
> -void Nepomuk::IndexFolderSelectionDialog::setIndexHiddenFolders( bool enable )
> +void Nepomuk2::IndexFolderSelectionDialog::setIndexHiddenFolders( bool enable )
> {
> m_checkShowHiddenFolders->setChecked( enable );
> }
>
>
> -QStringList Nepomuk::IndexFolderSelectionDialog::includeFolders() const
> +QStringList Nepomuk2::IndexFolderSelectionDialog::includeFolders() const
> {
> if ( !indexHiddenFolders() ) {
> return removeHiddenFolders( m_folderModel->includeFolders() );
> @@ -128,7 +128,7 @@ QStringList \
> Nepomuk::IndexFolderSelectionDialog::includeFolders() const }
>
>
> -QStringList Nepomuk::IndexFolderSelectionDialog::excludeFolders() const
> +QStringList Nepomuk2::IndexFolderSelectionDialog::excludeFolders() const
> {
> if ( !indexHiddenFolders() ) {
> return removeHiddenFolders( m_folderModel->excludeFolders() );
> @@ -139,13 +139,13 @@ QStringList \
> Nepomuk::IndexFolderSelectionDialog::excludeFolders() const }
>
>
> -QStringList Nepomuk::IndexFolderSelectionDialog::excludeFilters() const
> +QStringList Nepomuk2::IndexFolderSelectionDialog::excludeFilters() const
> {
> return m_editExcludeFilters->items();
> }
>
>
> -bool Nepomuk::IndexFolderSelectionDialog::indexHiddenFolders() const
> +bool Nepomuk2::IndexFolderSelectionDialog::indexHiddenFolders() const
> {
> return m_checkShowHiddenFolders->isChecked();
> }
> diff --git a/nepomuk/kcm/indexfolderselectiondialog.h \
> b/nepomuk/kcm/indexfolderselectiondialog.h index f87d65a..c8431d9 100644
> --- a/nepomuk/kcm/indexfolderselectiondialog.h
> +++ b/nepomuk/kcm/indexfolderselectiondialog.h
> @@ -24,7 +24,7 @@
>
> class FolderSelectionModel;
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
> class IndexFolderSelectionDialog : public KDialog, public \
> Ui_IndexFolderSelectionWidget {
> Q_OBJECT
> diff --git a/nepomuk/kcm/nepomukserverkcm.cpp b/nepomuk/kcm/nepomukserverkcm.cpp
> index 01f92fe..f29b331 100644
> --- a/nepomuk/kcm/nepomukserverkcm.cpp
> +++ b/nepomuk/kcm/nepomukserverkcm.cpp
> @@ -36,8 +36,8 @@
> #include <KCalendarSystem>
> #include <KDirWatch>
>
> -#include <Nepomuk/Query/QueryParser>
> -#include <Nepomuk/Query/FileQuery>
> +#include <Nepomuk2/Query/QueryParser>
> +#include <Nepomuk2/Query/FileQuery>
>
> #include <QRadioButton>
> #include <QInputDialog>
> @@ -49,7 +49,7 @@
> #include <Soprano/Backend>
>
>
> -K_PLUGIN_FACTORY( NepomukConfigModuleFactory, \
> registerPlugin<Nepomuk::ServerConfigModule>(); ) +K_PLUGIN_FACTORY( \
> NepomukConfigModuleFactory, registerPlugin<Nepomuk2::ServerConfigModule>(); ) \
> K_EXPORT_PLUGIN( NepomukConfigModuleFactory("kcm_nepomuk", "kcm_nepomuk") )
>
> @@ -130,7 +130,7 @@ namespace {
> }
>
>
> -Nepomuk::ServerConfigModule::ServerConfigModule( QWidget* parent, const \
> QVariantList& args ) +Nepomuk2::ServerConfigModule::ServerConfigModule( QWidget* \
> parent, const QVariantList& args ) : KCModule( \
> NepomukConfigModuleFactory::componentData(), parent, args ), m_serverInterface( 0 \
> ), m_fileIndexerInterface( 0 ),
> @@ -234,14 +234,14 @@ Nepomuk::ServerConfigModule::ServerConfigModule( QWidget* \
> parent, const QVariant }
>
>
> -Nepomuk::ServerConfigModule::~ServerConfigModule()
> +Nepomuk2::ServerConfigModule::~ServerConfigModule()
> {
> delete m_fileIndexerInterface;
> delete m_serverInterface;
> }
>
>
> -void Nepomuk::ServerConfigModule::load()
> +void Nepomuk2::ServerConfigModule::load()
> {
> if ( !m_nepomukAvailable )
> return;
> @@ -261,7 +261,7 @@ void Nepomuk::ServerConfigModule::load()
> m_indexFolderSelectionDialog->setIndexHiddenFolders( fileIndexerConfig.group( \
> "General" ).readEntry( "index hidden folders", false ) ); \
> m_indexFolderSelectionDialog->setFolders( fileIndexerConfig.group( "General" \
> ).readPathEntry( "folders", defaultFolders() ), fileIndexerConfig.group( "General" \
> ).readPathEntry( "exclude folders", QStringList() ) );
> - m_indexFolderSelectionDialog->setExcludeFilters( fileIndexerConfig.group( \
> "General" ).readEntry( "exclude filters", Nepomuk::defaultExcludeFilterList() ) ); \
> + m_indexFolderSelectionDialog->setExcludeFilters( fileIndexerConfig.group( \
> "General" ).readEntry( "exclude filters", Nepomuk2::defaultExcludeFilterList() ) ); \
> const bool indexNewlyMounted = fileIndexerConfig.group( "RemovableMedia" \
> ).readEntry( "index newly mounted", false ); const bool askIndividually = \
> fileIndexerConfig.group( "RemovableMedia" ).readEntry( "ask user", false ); @@ \
> -289,7 +289,7 @@ void Nepomuk::ServerConfigModule::load() buttonForQuery( \
> Query::Query::fromString( kio_nepomuksearchGeneral.readEntry(
> "Root query",
> - Nepomuk::lastModifiedFilesQuery().toString() ) ) \
> )->setChecked( true ); + \
> Nepomuk2::lastModifiedFilesQuery().toString() ) ) )->setChecked( true );
>
>
> @@ -316,7 +316,7 @@ void Nepomuk::ServerConfigModule::load()
> }
>
>
> -void Nepomuk::ServerConfigModule::save()
> +void Nepomuk2::ServerConfigModule::save()
> {
> if ( !m_nepomukAvailable )
> return;
> @@ -390,7 +390,7 @@ void Nepomuk::ServerConfigModule::save()
> }
>
>
> -void Nepomuk::ServerConfigModule::defaults()
> +void Nepomuk2::ServerConfigModule::defaults()
> {
> if ( !m_nepomukAvailable )
> return;
> @@ -399,7 +399,7 @@ void Nepomuk::ServerConfigModule::defaults()
> m_checkEnableNepomuk->setChecked( true );
> m_checkEnableEmailIndexer->setChecked( true );
> m_indexFolderSelectionDialog->setIndexHiddenFolders( false );
> - m_indexFolderSelectionDialog->setExcludeFilters( \
> Nepomuk::defaultExcludeFilterList() ); + \
> m_indexFolderSelectionDialog->setExcludeFilters( \
> Nepomuk2::defaultExcludeFilterList() ); m_indexFolderSelectionDialog->setFolders( \
> defaultFolders(), QStringList() ); m_spinMaxResults->setValue( 10 );
> m_checkRootQueryLastModified->setChecked( true );
> @@ -408,7 +408,7 @@ void Nepomuk::ServerConfigModule::defaults()
> }
>
>
> -void Nepomuk::ServerConfigModule::updateNepomukServerStatus()
> +void Nepomuk2::ServerConfigModule::updateNepomukServerStatus()
> {
> if ( m_serverInterface &&
> m_serverInterface->isNepomukEnabled() ) {
> @@ -420,7 +420,7 @@ void Nepomuk::ServerConfigModule::updateNepomukServerStatus()
> }
>
>
> -void Nepomuk::ServerConfigModule::setFileIndexerStatusText( const QString& text, \
> bool elide ) +void Nepomuk2::ServerConfigModule::setFileIndexerStatusText( const \
> QString& text, bool elide ) {
> m_labelFileIndexerStatus->setWordWrap( !elide );
> m_labelFileIndexerStatus->setTextElideMode( elide ? Qt::ElideMiddle : Qt::ElideNone \
> ); @@ -428,7 +428,7 @@ void Nepomuk::ServerConfigModule::setFileIndexerStatusText( \
> const QString& text, }
>
>
> -void Nepomuk::ServerConfigModule::updateFileIndexerStatus()
> +void Nepomuk2::ServerConfigModule::updateFileIndexerStatus()
> {
> if ( QDBusConnection::sessionBus().interface()->isServiceRegistered( \
> "org.kde.nepomuk.services.nepomukfileindexer" ) ) { if ( \
> org::kde::nepomuk::ServiceControl( "org.kde.nepomuk.services.nepomukfileindexer", \
> "/servicecontrol", @@ -456,7 +456,7 @@ void \
> Nepomuk::ServerConfigModule::updateFileIndexerStatus() }
>
>
> -void Nepomuk::ServerConfigModule::updateBackupStatus()
> +void Nepomuk2::ServerConfigModule::updateBackupStatus()
> {
> const QString backupUrl = KStandardDirs::locateLocal( "data", \
> "nepomuk/backupsync/backups/" ); QDir dir( backupUrl );
> @@ -475,7 +475,7 @@ void Nepomuk::ServerConfigModule::updateBackupStatus()
> }
>
>
> -void Nepomuk::ServerConfigModule::recreateInterfaces()
> +void Nepomuk2::ServerConfigModule::recreateInterfaces()
> {
> delete m_fileIndexerInterface;
> delete m_serverInterface;
> @@ -488,7 +488,7 @@ void Nepomuk::ServerConfigModule::recreateInterfaces()
> }
>
>
> -void Nepomuk::ServerConfigModule::slotCustomQueryButtonClicked()
> +void Nepomuk2::ServerConfigModule::slotCustomQueryButtonClicked()
> {
> // this is a temp solution until we have a proper query builder
> QString queryString = QInputDialog::getText( this,
> @@ -504,14 +504,14 @@ void \
> Nepomuk::ServerConfigModule::slotCustomQueryButtonClicked() }
>
>
> -void Nepomuk::ServerConfigModule::slotStatusDetailsClicked()
> +void Nepomuk2::ServerConfigModule::slotStatusDetailsClicked()
> {
> StatusWidget statusDialog( this );
> statusDialog.exec();
> }
>
>
> -void Nepomuk::ServerConfigModule::slotEditIndexFolders()
> +void Nepomuk2::ServerConfigModule::slotEditIndexFolders()
> {
> const QStringList oldIncludeFolders = \
> m_indexFolderSelectionDialog->includeFolders(); const QStringList oldExcludeFolders \
> = m_indexFolderSelectionDialog->excludeFolders(); @@ -532,7 +532,7 @@ void \
> Nepomuk::ServerConfigModule::slotEditIndexFolders() }
>
>
> -void Nepomuk::ServerConfigModule::slotCustomQueryToggled( bool on )
> +void Nepomuk2::ServerConfigModule::slotCustomQueryToggled( bool on )
> {
> if ( on && m_customQuery.isEmpty() ) {
> slotCustomQueryButtonClicked();
> @@ -540,36 +540,36 @@ void Nepomuk::ServerConfigModule::slotCustomQueryToggled( \
> bool on ) }
>
>
> -QRadioButton* Nepomuk::ServerConfigModule::buttonForQuery( const Query::Query& \
> query ) const +QRadioButton* Nepomuk2::ServerConfigModule::buttonForQuery( const \
> Query::Query& query ) const {
> - if ( query == Nepomuk::neverOpenedFilesQuery() )
> + if ( query == Nepomuk2::neverOpenedFilesQuery() )
> return m_checkRootQueryNeverOpened;
> - else if ( query == Nepomuk::lastModifiedFilesQuery() )
> + else if ( query == Nepomuk2::lastModifiedFilesQuery() )
> return m_checkRootQueryLastModified;
> - else if ( query == Nepomuk::mostImportantFilesQuery() )
> + else if ( query == Nepomuk2::mostImportantFilesQuery() )
> return m_checkRootQueryFancy;
> else
> return m_checkRootQueryCustom;
> }
>
>
> -Nepomuk::Query::Query Nepomuk::ServerConfigModule::queryForButton( \
> QAbstractButton* button ) const +Nepomuk2::Query::Query \
> Nepomuk2::ServerConfigModule::queryForButton( QAbstractButton* button ) const {
> if ( button == m_checkRootQueryNeverOpened )
> - return Nepomuk::neverOpenedFilesQuery();
> + return Nepomuk2::neverOpenedFilesQuery();
> else if ( button == m_checkRootQueryLastModified )
> - return Nepomuk::lastModifiedFilesQuery();
> + return Nepomuk2::lastModifiedFilesQuery();
> else if ( button == m_checkRootQueryFancy )
> - return Nepomuk::mostImportantFilesQuery();
> + return Nepomuk2::mostImportantFilesQuery();
> else {
> // force to always only query for files
> - Nepomuk::Query::FileQuery query = Query::QueryParser::parseQuery( \
> m_customQuery ); + Nepomuk2::Query::FileQuery query = \
> Query::QueryParser::parseQuery( m_customQuery ); query.setFileMode( \
> Query::FileQuery::QueryFiles ); return query;
> }
> }
>
> -void Nepomuk::ServerConfigModule::slotBackupFrequencyChanged()
> +void Nepomuk2::ServerConfigModule::slotBackupFrequencyChanged()
> {
> m_comboBackupDay->setShown(m_comboBackupFrequency->currentIndex() >= WeeklyBackup);
> m_comboBackupDay->setDisabled(m_comboBackupFrequency->currentIndex() == \
> DisableAutomaticBackups); @@ -577,12 +577,12 @@ void \
> Nepomuk::ServerConfigModule::slotBackupFrequencyChanged() \
> m_spinBackupMax->setDisabled(m_comboBackupFrequency->currentIndex() == \
> DisableAutomaticBackups); }
>
> -void Nepomuk::ServerConfigModule::slotManualBackup()
> +void Nepomuk2::ServerConfigModule::slotManualBackup()
> {
> KProcess::execute( "nepomukbackup", QStringList() << "--backup" );
> }
>
> -void Nepomuk::ServerConfigModule::slotRestoreBackup()
> +void Nepomuk2::ServerConfigModule::slotRestoreBackup()
> {
> KProcess::execute( "nepomukbackup", QStringList() << "--restore" );
> }
> diff --git a/nepomuk/kcm/nepomukserverkcm.h b/nepomuk/kcm/nepomukserverkcm.h
> index f428cd6..827525b 100644
> --- a/nepomuk/kcm/nepomukserverkcm.h
> +++ b/nepomuk/kcm/nepomukserverkcm.h
> @@ -24,12 +24,12 @@
> #include "nepomukserverinterface.h"
> #include "fileindexerinterface.h"
>
> -#include <Nepomuk/Query/Query>
> +#include <Nepomuk2/Query/Query>
>
> class QRadioButton;
> class QAbstractButton;
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
>
> class IndexFolderSelectionDialog;
> class StatusWidget;
> @@ -64,7 +64,7 @@ namespace Nepomuk {
> void setFileIndexerStatusText( const QString& text, bool elide );
>
> QRadioButton* buttonForQuery( const Query::Query& query ) const;
> - Nepomuk::Query::Query queryForButton( QAbstractButton* button ) const;
> + Nepomuk2::Query::Query queryForButton( QAbstractButton* button ) const;
>
> bool m_nepomukAvailable;
>
> diff --git a/nepomuk/kcm/statuswidget.cpp b/nepomuk/kcm/statuswidget.cpp
> index a9ece31..88b224f 100644
> --- a/nepomuk/kcm/statuswidget.cpp
> +++ b/nepomuk/kcm/statuswidget.cpp
> @@ -24,8 +24,8 @@
> #include <KIO/NetAccess>
> #include <kio/directorysizejob.h>
>
> -#include <Nepomuk/ResourceManager>
> -#include <Nepomuk/Vocabulary/NFO>
> +#include <Nepomuk2/ResourceManager>
> +#include <Nepomuk2/Vocabulary/NFO>
>
> #include <Soprano/Model>
> #include <Soprano/QueryResultIterator>
> @@ -38,7 +38,7 @@
> #include <QtDBus/QDBusConnectionInterface>
> #include <QtDBus/QDBusServiceWatcher>
>
> -Nepomuk::StatusWidget::StatusWidget( QWidget* parent )
> +Nepomuk2::StatusWidget::StatusWidget( QWidget* parent )
> > KDialog( parent ),
> m_connected( false ),
> m_updateRunning( false ),
> @@ -90,12 +90,12 @@ Nepomuk::StatusWidget::StatusWidget( QWidget* parent )
> updateSuspendResumeButtonText( m_fileIndexerService->isSuspended() );
> }
>
> -Nepomuk::StatusWidget::~StatusWidget()
> +Nepomuk2::StatusWidget::~StatusWidget()
> {
> }
>
>
> -void Nepomuk::StatusWidget::slotUpdateStoreStatus()
> +void Nepomuk2::StatusWidget::slotUpdateStoreStatus()
> {
> if ( !m_updateRunning && !m_updateTimer.isActive() ) {
> m_updateRunning = true;
> @@ -105,7 +105,7 @@ void Nepomuk::StatusWidget::slotUpdateStoreStatus()
> Soprano::Util::AsyncQuery* query
> = Soprano::Util::AsyncQuery::executeQuery( \
> ResourceManager::instance()->mainModel(), QString::fromLatin1( "select \
> count(distinct ?r) where { ?r a %1 . }" )
> - .arg( Soprano::Node::resourceToN3( \
> Nepomuk::Vocabulary::NFO::FileDataObject() ) ), + .arg( \
> Soprano::Node::resourceToN3( Nepomuk2::Vocabulary::NFO::FileDataObject() ) ), \
> Soprano::Query::QueryLanguageSparql ); connect( query, SIGNAL( \
> nextReady(Soprano::Util::AsyncQuery*) ), this, SLOT( \
> slotFileCountFinished(Soprano::Util::AsyncQuery*) ) ); }
> @@ -114,7 +114,7 @@ void Nepomuk::StatusWidget::slotUpdateStoreStatus()
> }
> }
>
> -void Nepomuk::StatusWidget::slotFileCountFinished( Soprano::Util::AsyncQuery* \
> query ) +void Nepomuk2::StatusWidget::slotFileCountFinished( \
> Soprano::Util::AsyncQuery* query ) {
> m_labelFileCount->setText( i18np( "1 file in index", "%1 files in index", \
> query->binding( 0 ).literal().toInt() ) ); query->deleteLater();
> @@ -125,7 +125,7 @@ void Nepomuk::StatusWidget::slotFileCountFinished( \
> Soprano::Util::AsyncQuery* qu }
>
>
> -void Nepomuk::StatusWidget::slotUpdateTimeout()
> +void Nepomuk2::StatusWidget::slotUpdateTimeout()
> {
> if ( m_updateRequested ) {
> m_updateRequested = false;
> @@ -133,7 +133,7 @@ void Nepomuk::StatusWidget::slotUpdateTimeout()
> }
> }
>
> -void Nepomuk::StatusWidget::slotUpdateStatus()
> +void Nepomuk2::StatusWidget::slotUpdateStatus()
> {
> const bool fileIndexerInitialized =
> QDBusConnection::sessionBus().interface()->isServiceRegistered(m_fileIndexerService->service()) \
> && @@ -153,7 +153,7 @@ void Nepomuk::StatusWidget::slotUpdateStatus()
> updateSuspendResumeButtonText( m_fileIndexerService->isSuspended() );
> }
>
> -void Nepomuk::StatusWidget::slotSuspendResume()
> +void Nepomuk2::StatusWidget::slotSuspendResume()
> {
> if ( m_fileIndexerService->isSuspended()) {
> m_fileIndexerService->resume();
> @@ -165,7 +165,7 @@ void Nepomuk::StatusWidget::slotSuspendResume()
> }
> }
>
> -void Nepomuk::StatusWidget::updateSuspendResumeButtonText(bool suspended)
> +void Nepomuk2::StatusWidget::updateSuspendResumeButtonText(bool suspended)
> {
> if (!suspended) {
> m_suspendResumeButton->setText( i18nc("Suspends the Nepomuk file indexing \
> service.","Suspend File Indexing") ); @@ -175,7 +175,7 @@ void \
> Nepomuk::StatusWidget::updateSuspendResumeButtonText(bool suspended) }
> }
>
> -void Nepomuk::StatusWidget::showEvent( QShowEvent* event )
> +void Nepomuk2::StatusWidget::showEvent( QShowEvent* event )
> {
> if ( !m_connected ) {
> connect( ResourceManager::instance()->mainModel(), SIGNAL( statementsAdded() ),
> @@ -192,7 +192,7 @@ void Nepomuk::StatusWidget::showEvent( QShowEvent* event )
> }
>
>
> -void Nepomuk::StatusWidget::hideEvent( QHideEvent* event )
> +void Nepomuk2::StatusWidget::hideEvent( QHideEvent* event )
> {
> if ( m_connected ) {
> ResourceManager::instance()->mainModel()->disconnect( this );
> diff --git a/nepomuk/kcm/statuswidget.h b/nepomuk/kcm/statuswidget.h
> index b7af01e..ab951f3 100644
> --- a/nepomuk/kcm/statuswidget.h
> +++ b/nepomuk/kcm/statuswidget.h
> @@ -37,7 +37,7 @@ class AsyncQuery;
> }
> }
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
>
>
> class StatusWidget : public KDialog, public Ui::StatusWidget
> diff --git a/nepomuk/kioslaves/common/nepomuksearchurltools.h \
> b/nepomuk/kioslaves/common/nepomuksearchurltools.h index 54abd27..deccc34 100644
> --- a/nepomuk/kioslaves/common/nepomuksearchurltools.h
> +++ b/nepomuk/kioslaves/common/nepomuksearchurltools.h
> @@ -22,14 +22,14 @@
>
> #include <QtCore/QString>
>
> -#include <nepomuk/query.h>
> -#include <nepomuk/queryparser.h>
> +#include <nepomuk2/query.h>
> +#include <nepomuk2/queryparser.h>
>
> #include <kurl.h>
>
> -#include <Nepomuk/Vocabulary/NIE>
> +#include <Nepomuk2/Vocabulary/NIE>
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
> /**
> * Encode the resource URI into the UDS_NAME to make it unique.
> * It is important that we do not use the % for percent-encoding. Otherwise \
> KUrl::url will
> diff --git a/nepomuk/kioslaves/common/resourcestat.cpp \
> b/nepomuk/kioslaves/common/resourcestat.cpp index 5aeefc6..a259ba5 100644
> --- a/nepomuk/kioslaves/common/resourcestat.cpp
> +++ b/nepomuk/kioslaves/common/resourcestat.cpp
> @@ -31,16 +31,16 @@
> #include <kio/udsentry.h>
> #include <KDebug>
>
> -#include <Nepomuk/Thing>
> -#include <Nepomuk/Variant>
> -#include <Nepomuk/Types/Class>
> -#include <Nepomuk/ResourceManager>
> -#include <Nepomuk/Query/Query>
> -#include <Nepomuk/Query/ComparisonTerm>
> -#include <Nepomuk/Query/ResourceTerm>
> -#include <Nepomuk/Vocabulary/NFO>
> -#include <Nepomuk/Vocabulary/NIE>
> -#include <Nepomuk/Vocabulary/PIMO>
> +#include <Nepomuk2/Thing>
> +#include <Nepomuk2/Variant>
> +#include <Nepomuk2/Types/Class>
> +#include <Nepomuk2/ResourceManager>
> +#include <Nepomuk2/Query/Query>
> +#include <Nepomuk2/Query/ComparisonTerm>
> +#include <Nepomuk2/Query/ResourceTerm>
> +#include <Nepomuk2/Vocabulary/NFO>
> +#include <Nepomuk2/Vocabulary/NIE>
> +#include <Nepomuk2/Vocabulary/PIMO>
>
> #include <Soprano/Vocabulary/RDF>
> #include <Soprano/Vocabulary/NAO>
> @@ -53,7 +53,7 @@
> #include <Solid/StorageAccess>
>
>
> -KUrl Nepomuk::stripQuery( const KUrl& url )
> +KUrl Nepomuk2::stripQuery( const KUrl& url )
> {
> KUrl newUrl( url );
> newUrl.setEncodedQuery( QByteArray() );
> @@ -61,7 +61,7 @@ KUrl Nepomuk::stripQuery( const KUrl& url )
> }
>
>
> -Nepomuk::Resource Nepomuk::splitNepomukUrl( const KUrl& url, QString* filename )
> +Nepomuk2::Resource Nepomuk2::splitNepomukUrl( const KUrl& url, QString* filename )
> {
> //
> // let's try to extract the resource from the url in case we listed a tag or
> @@ -88,10 +88,10 @@ Nepomuk::Resource Nepomuk::splitNepomukUrl( const KUrl& url, \
> QString* filename ) }
>
>
> -bool Nepomuk::isRemovableMediaFile( const Nepomuk::Resource& res )
> +bool Nepomuk2::isRemovableMediaFile( const Nepomuk2::Resource& res )
> {
> - if ( res.hasProperty( Nepomuk::Vocabulary::NIE::url() ) ) {
> - KUrl url = res.property( Nepomuk::Vocabulary::NIE::url() ).toUrl();
> + if ( res.hasProperty( Nepomuk2::Vocabulary::NIE::url() ) ) {
> + KUrl url = res.property( Nepomuk2::Vocabulary::NIE::url() ).toUrl();
> return ( url.protocol() == QLatin1String( "filex" ) );
> }
> else {
> @@ -100,7 +100,7 @@ bool Nepomuk::isRemovableMediaFile( const Nepomuk::Resource& \
> res ) }
>
>
> -Solid::StorageAccess* Nepomuk::storageFromUUID( const QString& uuid )
> +Solid::StorageAccess* Nepomuk2::storageFromUUID( const QString& uuid )
> {
> QString solidQuery = QString::fromLatin1( "[ StorageVolume.usage=='FileSystem' AND \
> StorageVolume.uuid=='%1' ]" ).arg( uuid.toLower() ); QList<Solid::Device> devices = \
> Solid::Device::listFromQuery( solidQuery ); @@ -112,7 +112,7 @@ \
> Solid::StorageAccess* Nepomuk::storageFromUUID( const QString& uuid ) }
>
>
> -bool Nepomuk::mountAndWait( Solid::StorageAccess* storage )
> +bool Nepomuk2::mountAndWait( Solid::StorageAccess* storage )
> {
> kDebug() << storage;
> QEventLoop loop;
> @@ -131,12 +131,12 @@ bool Nepomuk::mountAndWait( Solid::StorageAccess* storage )
> }
>
>
> -KUrl Nepomuk::determineFilesystemPath( const Nepomuk::Resource& fsRes )
> +KUrl Nepomuk2::determineFilesystemPath( const Nepomuk2::Resource& fsRes )
> {
> QString uuidQuery = QString::fromLatin1( "select ?uuid where { %1 %2 ?uuid . }" )
> .arg( Soprano::Node::resourceToN3( fsRes.resourceUri() ),
> Soprano::Node::resourceToN3( Soprano::Vocabulary::NAO::identifier() ) );
> - Soprano::QueryResultIterator it = \
> Nepomuk::ResourceManager::instance()->mainModel()->executeQuery( uuidQuery, \
> Soprano::Query::QueryLanguageSparql ); + Soprano::QueryResultIterator it = \
> Nepomuk2::ResourceManager::instance()->mainModel()->executeQuery( uuidQuery, \
> Soprano::Query::QueryLanguageSparql ); if ( it.next() ) {
> Solid::StorageAccess* storage = storageFromUUID( it["uuid"].toString() );
> it.close();
> @@ -150,10 +150,10 @@ KUrl Nepomuk::determineFilesystemPath( const \
> Nepomuk::Resource& fsRes ) }
>
>
> -QString Nepomuk::getFileSystemLabelForRemovableMediaFileUrl( const \
> Nepomuk::Resource& res ) +QString \
> Nepomuk2::getFileSystemLabelForRemovableMediaFileUrl( const Nepomuk2::Resource& res \
> ) {
> QList<Soprano::Node> labelNodes
> - = Nepomuk::ResourceManager::instance()->mainModel()->executeQuery( \
> QString::fromLatin1( "select ?label where { " + = \
> Nepomuk2::ResourceManager::instance()->mainModel()->executeQuery( \
> QString::fromLatin1( "select ?label where { " "%1 nie:isPartOf ?fs . "
> "?fs a nfo:Filesystem . "
> "?fs nao:prefLabel ?label . "
> @@ -164,17 +164,17 @@ QString Nepomuk::getFileSystemLabelForRemovableMediaFileUrl( \
> const Nepomuk::Reso if ( !labelNodes.isEmpty() )
> return labelNodes.first().toString();
> else
> - return res.property( Nepomuk::Vocabulary::NIE::url() ).toUrl().host(); // \
> Solid UUID + return res.property( Nepomuk2::Vocabulary::NIE::url() \
> ).toUrl().host(); // Solid UUID }
>
>
> -KUrl Nepomuk::convertRemovableMediaFileUrl( const KUrl& url, bool \
> evenMountIfNecessary ) +KUrl Nepomuk2::convertRemovableMediaFileUrl( const KUrl& \
> url, bool evenMountIfNecessary ) {
> - Solid::StorageAccess* storage = Nepomuk::storageFromUUID( url.host() );
> + Solid::StorageAccess* storage = Nepomuk2::storageFromUUID( url.host() );
> kDebug() << url << storage;
> if ( storage &&
> ( storage->isAccessible() ||
> - ( evenMountIfNecessary && Nepomuk::mountAndWait( storage ) ) ) ) {
> + ( evenMountIfNecessary && Nepomuk2::mountAndWait( storage ) ) ) ) {
> kDebug() << "converted:" << KUrl( storage->filePath() + QLatin1String( "/" ) + \
> url.path() ); return QString( storage->filePath() + QLatin1String( "/" ) + \
> url.path() ); }
> @@ -184,7 +184,7 @@ KUrl Nepomuk::convertRemovableMediaFileUrl( const KUrl& url, \
> bool evenMountIfNec }
>
>
> -void Nepomuk::addGenericNepomukResourceData( const Nepomuk::Resource& res, \
> KIO::UDSEntry& uds, bool includeMimeType ) +void \
> Nepomuk2::addGenericNepomukResourceData( const Nepomuk2::Resource& res, \
> KIO::UDSEntry& uds, bool includeMimeType ) {
> //
> // Add some random values
> @@ -216,7 +216,7 @@ void Nepomuk::addGenericNepomukResourceData( const \
> Nepomuk::Resource& res, KIO::
> if ( includeMimeType ) {
> // Use nice display types like "Person", "Project" and so on
> - Nepomuk::Types::Class type( res.resourceType() );
> + Nepomuk2::Types::Class type( res.resourceType() );
> if (!type.label().isEmpty())
> uds.insert( KIO::UDSEntry::UDS_DISPLAY_TYPE, type.label() );
>
> @@ -235,7 +235,7 @@ void Nepomuk::addGenericNepomukResourceData( const \
> Nepomuk::Resource& res, KIO:: }
>
>
> -KIO::UDSEntry Nepomuk::statNepomukResource( const Nepomuk::Resource& res, bool \
> doNotForward ) +KIO::UDSEntry Nepomuk2::statNepomukResource( const \
> Nepomuk2::Resource& res, bool doNotForward ) {
> //
> // We do not have a local file
> @@ -289,7 +289,7 @@ KIO::UDSEntry Nepomuk::statNepomukResource( const \
> Nepomuk::Resource& res, bool d addGenericNepomukResourceData( res, uds, \
> !uds.contains( KIO::UDSEntry::UDS_MIME_TYPE ) );
> if ( !doNotForward ) {
> - KUrl reUrl = Nepomuk::redirectionUrl( res );
> + KUrl reUrl = Nepomuk2::redirectionUrl( res );
> if ( !reUrl.isEmpty() ) {
> uds.insert( KIO::UDSEntry::UDS_MIME_TYPE, QLatin1String( "inode/directory" ) );
> uds.insert( KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR );
> @@ -300,25 +300,25 @@ KIO::UDSEntry Nepomuk::statNepomukResource( const \
> Nepomuk::Resource& res, bool d }
>
>
> -bool Nepomuk::willBeRedirected( const Nepomuk::Resource& res )
> +bool Nepomuk2::willBeRedirected( const Nepomuk2::Resource& res )
> {
> // here the same canditions as in redirectionUrl need to be listed
> - return( res.hasType( Nepomuk::Vocabulary::NFO::Folder() ) ||
> + return( res.hasType( Nepomuk2::Vocabulary::NFO::Folder() ) ||
> res.hasType( Soprano::Vocabulary::NAO::Tag() ) ||
> - res.hasType( Nepomuk::Vocabulary::NFO::Filesystem() ) ||
> - !res.hasType( Nepomuk::Vocabulary::NFO::FileDataObject() ) );
> + res.hasType( Nepomuk2::Vocabulary::NFO::Filesystem() ) ||
> + !res.hasType( Nepomuk2::Vocabulary::NFO::FileDataObject() ) );
> }
>
>
> -KUrl Nepomuk::redirectionUrl( const Nepomuk::Resource& res )
> +KUrl Nepomuk2::redirectionUrl( const Nepomuk2::Resource& res )
> {
> // list folders by forwarding to the actual folder on disk
> - if ( res.hasType( Nepomuk::Vocabulary::NFO::Folder() ) ) {
> - return res.property( Nepomuk::Vocabulary::NIE::url() ).toUrl();
> + if ( res.hasType( Nepomuk2::Vocabulary::NFO::Folder() ) ) {
> + return res.property( Nepomuk2::Vocabulary::NIE::url() ).toUrl();
> }
>
> // list filesystems by forwarding to the mounted path on disk (in case the fs is \
> mounted)
> - else if ( res.hasType( Nepomuk::Vocabulary::NFO::Filesystem() ) ) {
> + else if ( res.hasType( Nepomuk2::Vocabulary::NFO::Filesystem() ) ) {
> KUrl fsUrl = determineFilesystemPath( res );
> if ( fsUrl.isValid() ) {
> return fsUrl;
> @@ -335,7 +335,7 @@ KUrl Nepomuk::redirectionUrl( const Nepomuk::Resource& res )
>
> // list everything else besides files by querying things related to the resource in \
> some way // this works for music albums or artists but it would also work for tags
> - else if ( !res.hasType( Nepomuk::Vocabulary::NFO::FileDataObject() ) ) {
> + else if ( !res.hasType( Nepomuk2::Vocabulary::NFO::FileDataObject() ) ) {
> Query::ComparisonTerm term( QUrl(), Query::ResourceTerm( res ), \
> Query::ComparisonTerm::Equal ); KUrl url = Query::Query( term ).toSearchUrl( \
> res.genericLabel() ); url.addQueryItem( QLatin1String( "resource" ), KUrl( \
> res.resourceUri() ).url() ); @@ -352,10 +352,10 @@ namespace {
> /**
> * Check if the resource represents a local file with an existing nie:url property.
> */
> - bool isLocalFile( const Nepomuk::Resource& res )
> + bool isLocalFile( const Nepomuk2::Resource& res )
> {
> - if ( res.hasProperty( Nepomuk::Vocabulary::NIE::url() ) ) {
> - KUrl url = res.property( Nepomuk::Vocabulary::NIE::url() ).toUrl();
> + if ( res.hasProperty( Nepomuk2::Vocabulary::NIE::url() ) ) {
> + KUrl url = res.property( Nepomuk2::Vocabulary::NIE::url() ).toUrl();
> return ( !url.isEmpty() &&
> QFile::exists( url.toLocalFile() ) );
> }
> @@ -365,10 +365,10 @@ namespace {
> }
> }
>
> -KUrl Nepomuk::nepomukToFileUrl( const KUrl& url, bool evenMountIfNecessary )
> +KUrl Nepomuk2::nepomukToFileUrl( const KUrl& url, bool evenMountIfNecessary )
> {
> QString filename;
> - Nepomuk::Resource res = splitNepomukUrl( url, &filename );
> + Nepomuk2::Resource res = splitNepomukUrl( url, &filename );
>
> if ( !res.exists() )
> return KUrl();
> @@ -378,7 +378,7 @@ KUrl Nepomuk::nepomukToFileUrl( const KUrl& url, bool \
> evenMountIfNecessary ) //
> // let's see if it is a pimo thing which refers to a file
> //
> - if ( res.hasType( Nepomuk::Vocabulary::PIMO::Thing() ) ) {
> + if ( res.hasType( Nepomuk2::Vocabulary::PIMO::Thing() ) ) {
> if ( !res.pimoThing().groundingOccurrences().isEmpty() ) {
> res = res.pimoThing().groundingOccurrences().first();
> }
> @@ -388,7 +388,7 @@ KUrl Nepomuk::nepomukToFileUrl( const KUrl& url, bool \
> evenMountIfNecessary ) newURL = res.property( Vocabulary::NIE::url() ).toUrl();
> }
> else if ( isRemovableMediaFile( res ) ) {
> - const KUrl removableMediaUrl = res.property( \
> Nepomuk::Vocabulary::NIE::url() ).toUrl(); + const KUrl removableMediaUrl = \
> res.property( Nepomuk2::Vocabulary::NIE::url() ).toUrl(); newURL = \
> convertRemovableMediaFileUrl( removableMediaUrl, evenMountIfNecessary ); }
>
> diff --git a/nepomuk/kioslaves/common/resourcestat.h \
> b/nepomuk/kioslaves/common/resourcestat.h index 6f6126b..a8d80a9 100644
> --- a/nepomuk/kioslaves/common/resourcestat.h
> +++ b/nepomuk/kioslaves/common/resourcestat.h
> @@ -30,7 +30,7 @@ namespace Solid {
> class StorageAccess;
> }
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
>
> class Resource;
>
> @@ -43,13 +43,13 @@ namespace Nepomuk {
> * Split the filename part off a nepomuk:/ URI. This is used in many methods for \
> identifying
> * entries listed from tags and filesystems.
> */
> - Nepomuk::Resource splitNepomukUrl( const KUrl& url, QString* filename = 0 );
> + Nepomuk2::Resource splitNepomukUrl( const KUrl& url, QString* filename = 0 );
>
> /**
> * Check if the resource represents a file on a removable media using a filex:/
> * URL.
> */
> - bool isRemovableMediaFile( const Nepomuk::Resource& res );
> + bool isRemovableMediaFile( const Nepomuk2::Resource& res );
>
> /**
> * Create a Solid storage access interface from the volume UUID.
> @@ -65,12 +65,12 @@ namespace Nepomuk {
> /**
> * Get the mount path of a nfo:Filesystem resource as created by the removable \
> storage service.
> */
> - KUrl determineFilesystemPath( const Nepomuk::Resource& fsRes );
> + KUrl determineFilesystemPath( const Nepomuk2::Resource& fsRes );
>
> /**
> * Determine the label for a filesystem \p res is stored on.
> */
> - QString getFileSystemLabelForRemovableMediaFileUrl( const Nepomuk::Resource& \
> res ); + QString getFileSystemLabelForRemovableMediaFileUrl( const \
> Nepomuk2::Resource& res );
> /**
> * Convert a filex:/ URL into its actual local file URL.
> @@ -82,24 +82,24 @@ namespace Nepomuk {
> */
> KUrl convertRemovableMediaFileUrl( const KUrl& url, bool evenMountIfNecessary = \
> false );
> - void addGenericNepomukResourceData( const Nepomuk::Resource& res, \
> KIO::UDSEntry& uds, bool includeMimeType = true ); + void \
> addGenericNepomukResourceData( const Nepomuk2::Resource& res, KIO::UDSEntry& uds, \
> bool includeMimeType = true );
> /**
> * Stat a Nepomuk resource. Might start a local event loop
> */
> - KIO::UDSEntry statNepomukResource( const Nepomuk::Resource& res, bool \
> doNotForward = false ); + KIO::UDSEntry statNepomukResource( const \
> Nepomuk2::Resource& res, bool doNotForward = false );
> /**
> * \return \p true for all resources that will get a valid redirection url in
> * redirectionUrl().
> */
> - bool willBeRedirected( const Nepomuk::Resource& res );
> + bool willBeRedirected( const Nepomuk2::Resource& res );
>
> /**
> * Create a redirection query URL for resources such as tags or filesystems.
> * For other resources an empty KUrl is returned.
> */
> - KUrl redirectionUrl( const Nepomuk::Resource& res );
> + KUrl redirectionUrl( const Nepomuk2::Resource& res );
>
> /**
> * Convert a nepomuk:/ URL to a file:/ URL if possible.
> diff --git a/nepomuk/kioslaves/common/standardqueries.h \
> b/nepomuk/kioslaves/common/standardqueries.h index bd33ee2..a6fa173 100644
> --- a/nepomuk/kioslaves/common/standardqueries.h
> +++ b/nepomuk/kioslaves/common/standardqueries.h
> @@ -20,27 +20,27 @@
> #ifndef _NEPOMUK_STANDARD_QUERIES_H_
> #define _NEPOMUK_STANDARD_QUERIES_H_
>
> -#include <Nepomuk/Query/FileQuery>
> -#include <Nepomuk/Query/ComparisonTerm>
> -#include <Nepomuk/Query/AndTerm>
> -#include <Nepomuk/Query/OrTerm>
> -#include <Nepomuk/Query/LiteralTerm>
> -#include <Nepomuk/Query/NegationTerm>
> -#include <Nepomuk/Query/ResourceTerm>
> +#include <Nepomuk2/Query/FileQuery>
> +#include <Nepomuk2/Query/ComparisonTerm>
> +#include <Nepomuk2/Query/AndTerm>
> +#include <Nepomuk2/Query/OrTerm>
> +#include <Nepomuk2/Query/LiteralTerm>
> +#include <Nepomuk2/Query/NegationTerm>
> +#include <Nepomuk2/Query/ResourceTerm>
>
> #include <Soprano/Vocabulary/NAO>
> #include <Soprano/Vocabulary/RDF>
>
> -#include <Nepomuk/Vocabulary/NIE>
> -#include <Nepomuk/Vocabulary/NFO>
> -#include <Nepomuk/Vocabulary/NUAO>
> +#include <Nepomuk2/Vocabulary/NIE>
> +#include <Nepomuk2/Vocabulary/NFO>
> +#include <Nepomuk2/Vocabulary/NUAO>
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
> /**
> * Creates a query that returns all files sorted by descending modification date.
> */
> inline Query::Query lastModifiedFilesQuery() {
> - Query::ComparisonTerm lastModifiedTerm( \
> Nepomuk::Vocabulary::NIE::lastModified(), Query::Term() ); + \
> Query::ComparisonTerm lastModifiedTerm( Nepomuk2::Vocabulary::NIE::lastModified(), \
> Query::Term() ); lastModifiedTerm.setSortWeight( 1, Qt::DescendingOrder );
> Query::FileQuery lastModifiedQuery( lastModifiedTerm );
> lastModifiedQuery.setFileMode( Query::FileQuery::QueryFiles );
> @@ -69,12 +69,12 @@ namespace Nepomuk {
> // 2. no property at all
> Query::OrTerm usageCntTerm(
> Query::ComparisonTerm(
> - Nepomuk::Vocabulary::NUAO::usageCount(),
> + Nepomuk2::Vocabulary::NUAO::usageCount(),
> Query::LiteralTerm( 0 ),
> Query::ComparisonTerm::Equal ),
> Query::NegationTerm::negateTerm(
> Query::ComparisonTerm(
> - Nepomuk::Vocabulary::NUAO::usageCount(),
> + Nepomuk2::Vocabulary::NUAO::usageCount(),
> Query::Term() ) ) );
>
> // Before we had the data management service there was no usage count
> @@ -83,7 +83,7 @@ namespace Nepomuk {
> // However, by default we only show the top 10 results. Thus, in the
> // worst case this query will return the same as lastModifiedFilesQuery().
> Query::ComparisonTerm modDateTerm(
> - Nepomuk::Vocabulary::NIE::lastModified(),
> + Nepomuk2::Vocabulary::NIE::lastModified(),
> Query::Term() );
> modDateTerm.setSortWeight( 1, Qt::DescendingOrder );
>
> diff --git a/nepomuk/kioslaves/common/timelinetools.cpp \
> b/nepomuk/kioslaves/common/timelinetools.cpp index f65bbd5..22cd561 100644
> --- a/nepomuk/kioslaves/common/timelinetools.cpp
> +++ b/nepomuk/kioslaves/common/timelinetools.cpp
> @@ -24,16 +24,16 @@
> #include <Soprano/Node>
> #include <Soprano/Vocabulary/XMLSchema>
>
> -#include <Nepomuk/Vocabulary/NFO>
> -#include <Nepomuk/Vocabulary/NIE>
> -#include <Nepomuk/Vocabulary/NUAO>
> +#include <Nepomuk2/Vocabulary/NFO>
> +#include <Nepomuk2/Vocabulary/NIE>
> +#include <Nepomuk2/Vocabulary/NUAO>
>
> -#include <Nepomuk/Query/FileQuery>
> -#include <Nepomuk/Query/AndTerm>
> -#include <Nepomuk/Query/OrTerm>
> -#include <Nepomuk/Query/ComparisonTerm>
> -#include <Nepomuk/Query/LiteralTerm>
> -#include <Nepomuk/Query/StandardQuery>
> +#include <Nepomuk2/Query/FileQuery>
> +#include <Nepomuk2/Query/AndTerm>
> +#include <Nepomuk2/Query/OrTerm>
> +#include <Nepomuk2/Query/ComparisonTerm>
> +#include <Nepomuk2/Query/LiteralTerm>
> +#include <Nepomuk2/Query/StandardQuery>
>
> #include <KUrl>
> #include <KCalendarSystem>
> @@ -85,7 +85,7 @@ namespace {
> }
>
>
> -Nepomuk::TimelineFolderType Nepomuk::parseTimelineUrl( const KUrl& url, QDate* \
> date, QString* filename ) +Nepomuk2::TimelineFolderType Nepomuk2::parseTimelineUrl( \
> const KUrl& url, QDate* date, QString* filename ) {
> kDebug() << url;
>
> @@ -149,9 +149,9 @@ Nepomuk::TimelineFolderType Nepomuk::parseTimelineUrl( const \
> KUrl& url, QDate* d }
>
>
> -Nepomuk::Query::Query Nepomuk::buildTimelineQuery( const QDate& from, const QDate& \
> to ) +Nepomuk2::Query::Query Nepomuk2::buildTimelineQuery( const QDate& from, const \
> QDate& to ) {
> - Nepomuk::Query::FileQuery query = Nepomuk::Query::dateRangeQuery( from, \
> to.isValid() ? to : from ); + Nepomuk2::Query::FileQuery query = \
> Nepomuk2::Query::dateRangeQuery( from, to.isValid() ? to : from ); \
> query.setFileMode( Query::FileQuery::QueryFiles ); return query;
> }
> diff --git a/nepomuk/kioslaves/common/timelinetools.h \
> b/nepomuk/kioslaves/common/timelinetools.h index f1b53ed..51a956a 100644
> --- a/nepomuk/kioslaves/common/timelinetools.h
> +++ b/nepomuk/kioslaves/common/timelinetools.h
> @@ -25,9 +25,9 @@ class QString;
>
> #include <QtCore/QDate>
>
> -#include <Nepomuk/Query/Query>
> +#include <Nepomuk2/Query/Query>
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
> /**
> * The hierarchy in timeline:/ looks as follows:
> *
> diff --git a/nepomuk/kioslaves/nepomuk/CMakeLists.txt \
> b/nepomuk/kioslaves/nepomuk/CMakeLists.txt index de856ac..318390b 100644
> --- a/nepomuk/kioslaves/nepomuk/CMakeLists.txt
> +++ b/nepomuk/kioslaves/nepomuk/CMakeLists.txt
> @@ -1,6 +1,7 @@
> include_directories(
> ${KDE4_INCLUDES}
> ${CMAKE_CURRENT_BINARY_DIR}
> + ${NEPOMUK_CORE_INCLUDE_DIR}
> ${nepomuk_kio_slaves_SOURCE_DIR}/common
> )
>
> @@ -15,9 +16,7 @@ target_link_libraries(kio_nepomuk
> nepomukcommon
> ${KDE4_KIO_LIBS}
> ${KDE4_SOLID_LIBS}
> - ${NEPOMUK_LIBRARIES}
> - ${NEPOMUK_QUERY_LIBRARIES}
> - ${NEPOMUK_UTILS_LIBRARIES}
> + ${NEPOMUK_CORE_LIBRARIES}
> ${SOPRANO_LIBRARIES})
>
> install(TARGETS kio_nepomuk DESTINATION ${PLUGIN_INSTALL_DIR})
> diff --git a/nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp \
> b/nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp index 262dfe4..ae613b4 100644
> --- a/nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp
> +++ b/nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp
> @@ -37,17 +37,17 @@
> #include <KMessageBox>
> #include <KMimeType>
>
> -#include <nepomuk/thing.h>
> -#include <nepomuk/resourcemanager.h>
> -#include <nepomuk/variant.h>
> -#include <nepomuk/class.h>
> -#include <nepomuk/property.h>
> -#include <Nepomuk/Query/Query>
> -#include <Nepomuk/Query/ComparisonTerm>
> -#include <Nepomuk/Query/ResourceTerm>
> -#include <Nepomuk/Vocabulary/NFO>
> -#include <Nepomuk/Vocabulary/NIE>
> -#include <Nepomuk/Vocabulary/PIMO>
> +#include <nepomuk2/thing.h>
> +#include <nepomuk2/resourcemanager.h>
> +#include <nepomuk2/variant.h>
> +#include <nepomuk2/class.h>
> +#include <nepomuk2/property.h>
> +#include <Nepomuk2/Query/Query>
> +#include <Nepomuk2/Query/ComparisonTerm>
> +#include <Nepomuk2/Query/ResourceTerm>
> +#include <Nepomuk2/Vocabulary/NFO>
> +#include <Nepomuk2/Vocabulary/NIE>
> +#include <Nepomuk2/Vocabulary/PIMO>
>
> #include <Soprano/Vocabulary/RDF>
> #include <Soprano/Vocabulary/NAO>
> @@ -66,19 +66,19 @@ namespace {
> }
> }
>
> -Nepomuk::NepomukProtocol::NepomukProtocol( const QByteArray& poolSocket, const \
> QByteArray& appSocket ) +Nepomuk2::NepomukProtocol::NepomukProtocol( const \
> QByteArray& poolSocket, const QByteArray& appSocket ) : KIO::ForwardingSlaveBase( \
> "nepomuk", poolSocket, appSocket ) {
> ResourceManager::instance()->init();
> }
>
>
> -Nepomuk::NepomukProtocol::~NepomukProtocol()
> +Nepomuk2::NepomukProtocol::~NepomukProtocol()
> {
> }
>
>
> -void Nepomuk::NepomukProtocol::listDir( const KUrl& url )
> +void Nepomuk2::NepomukProtocol::listDir( const KUrl& url )
> {
> if ( !ensureNepomukRunning() )
> return;
> @@ -89,8 +89,8 @@ void Nepomuk::NepomukProtocol::listDir( const KUrl& url )
> // anything.
> // See README for details
> //
> - Nepomuk::Resource res = Nepomuk::splitNepomukUrl( url );
> - KUrl reUrl = Nepomuk::redirectionUrl( res );
> + Nepomuk2::Resource res = Nepomuk2::splitNepomukUrl( url );
> + KUrl reUrl = Nepomuk2::redirectionUrl( res );
> if ( !reUrl.isEmpty() ) {
> redirection( reUrl );
> finished();
> @@ -101,7 +101,7 @@ void Nepomuk::NepomukProtocol::listDir( const KUrl& url )
> }
>
>
> -void Nepomuk::NepomukProtocol::get( const KUrl& url )
> +void Nepomuk2::NepomukProtocol::get( const KUrl& url )
> {
> if ( !ensureNepomukRunning() )
> return;
> @@ -111,13 +111,13 @@ void Nepomuk::NepomukProtocol::get( const KUrl& url )
> m_currentOperation = Get;
> const bool noFollow = noFollowSet( url );
>
> - Nepomuk::Resource res = splitNepomukUrl( url );
> - if ( !noFollow && Nepomuk::isRemovableMediaFile( res ) ) {
> + Nepomuk2::Resource res = splitNepomukUrl( url );
> + if ( !noFollow && Nepomuk2::isRemovableMediaFile( res ) ) {
> error( KIO::ERR_SLAVE_DEFINED,
> i18nc( "@info", "Please insert the removable medium <resource>%1</resource> to \
> access this file.", getFileSystemLabelForRemovableMediaFileUrl( res ) ) );
> }
> - else if ( !noFollow && !Nepomuk::nepomukToFileUrl( url ).isEmpty() ) {
> + else if ( !noFollow && !Nepomuk2::nepomukToFileUrl( url ).isEmpty() ) {
> ForwardingSlaveBase::get( url );
> }
> else {
> @@ -150,7 +150,7 @@ void Nepomuk::NepomukProtocol::get( const KUrl& url )
> }
>
>
> -void Nepomuk::NepomukProtocol::put( const KUrl& url, int permissions, \
> KIO::JobFlags flags ) +void Nepomuk2::NepomukProtocol::put( const KUrl& url, int \
> permissions, KIO::JobFlags flags ) {
> if ( !ensureNepomukRunning() )
> return;
> @@ -162,7 +162,7 @@ void Nepomuk::NepomukProtocol::put( const KUrl& url, int \
> permissions, KIO::JobFl }
>
>
> -void Nepomuk::NepomukProtocol::stat( const KUrl& url )
> +void Nepomuk2::NepomukProtocol::stat( const KUrl& url )
> {
> if ( !ensureNepomukRunning() )
> return;
> @@ -171,17 +171,17 @@ void Nepomuk::NepomukProtocol::stat( const KUrl& url )
>
> m_currentOperation = Stat;
> const bool noFollow = noFollowSet( url );
> - if ( !noFollow && !Nepomuk::nepomukToFileUrl( url ).isEmpty() ) {
> + if ( !noFollow && !Nepomuk2::nepomukToFileUrl( url ).isEmpty() ) {
> ForwardingSlaveBase::stat( url );
> }
> else {
> - Nepomuk::Resource res = splitNepomukUrl( url );
> + Nepomuk2::Resource res = splitNepomukUrl( url );
>
> if ( !res.exists() ) {
> error( KIO::ERR_DOES_NOT_EXIST, QLatin1String("stat: ") + \
> stripQuery(url).prettyUrl() ); }
> else {
> - KIO::UDSEntry uds = Nepomuk::statNepomukResource( res, noFollow );
> + KIO::UDSEntry uds = Nepomuk2::statNepomukResource( res, noFollow );
> statEntry( uds );
> finished();
> }
> @@ -189,7 +189,7 @@ void Nepomuk::NepomukProtocol::stat( const KUrl& url )
> }
>
>
> -void Nepomuk::NepomukProtocol::mimetype( const KUrl& url )
> +void Nepomuk2::NepomukProtocol::mimetype( const KUrl& url )
> {
> if ( !ensureNepomukRunning() )
> return;
> @@ -204,15 +204,15 @@ void Nepomuk::NepomukProtocol::mimetype( const KUrl& url )
> }
>
> QString filename;
> - Nepomuk::Resource res = Nepomuk::splitNepomukUrl( url, &filename );
> + Nepomuk2::Resource res = Nepomuk2::splitNepomukUrl( url, &filename );
> if ( filename.isEmpty() &&
> - Nepomuk::willBeRedirected( res ) ) {
> + Nepomuk2::willBeRedirected( res ) ) {
> kDebug() << res.resourceUri() << "is tag or file system -> mimetype \
> inode/directory"; mimeType( QLatin1String( "inode/directory" ) );
> finished();
> }
> else {
> - if ( !Nepomuk::nepomukToFileUrl( url ).isEmpty() ) {
> + if ( !Nepomuk2::nepomukToFileUrl( url ).isEmpty() ) {
> ForwardingSlaveBase::mimetype( url );
> }
> else {
> @@ -235,7 +235,7 @@ void Nepomuk::NepomukProtocol::mimetype( const KUrl& url )
> }
>
>
> -void Nepomuk::NepomukProtocol::del(const KUrl& url, bool isFile)
> +void Nepomuk2::NepomukProtocol::del(const KUrl& url, bool isFile)
> {
> if ( !ensureNepomukRunning() )
> return;
> @@ -247,7 +247,7 @@ void Nepomuk::NepomukProtocol::del(const KUrl& url, bool \
> isFile) ForwardingSlaveBase::del( url, isFile );
> }
> else {
> - Nepomuk::Resource res( url );
> + Nepomuk2::Resource res( url );
> if ( !res.exists() ) {
> error( KIO::ERR_DOES_NOT_EXIST, url.prettyUrl() );
> }
> @@ -259,19 +259,19 @@ void Nepomuk::NepomukProtocol::del(const KUrl& url, bool \
> isFile) }
>
>
> -bool Nepomuk::NepomukProtocol::rewriteUrl( const KUrl& url, KUrl& newURL )
> +bool Nepomuk2::NepomukProtocol::rewriteUrl( const KUrl& url, KUrl& newURL )
> {
> if ( noFollowSet( url ) )
> return false;
>
> - newURL = Nepomuk::nepomukToFileUrl( url, m_currentOperation == Get );
> + newURL = Nepomuk2::nepomukToFileUrl( url, m_currentOperation == Get );
> return newURL.isValid();
> }
>
>
> -bool Nepomuk::NepomukProtocol::ensureNepomukRunning()
> +bool Nepomuk2::NepomukProtocol::ensureNepomukRunning()
> {
> - if ( Nepomuk::ResourceManager::instance()->init() ) {
> + if ( Nepomuk2::ResourceManager::instance()->init() ) {
> error( KIO::ERR_SLAVE_DEFINED, i18n( "The desktop search service is not activated. \
> Unable to answer queries without it." ) ); return false;
> }
> @@ -295,7 +295,7 @@ extern "C"
> exit(-1);
> }
>
> - Nepomuk::NepomukProtocol slave(argv[2], argv[3]);
> + Nepomuk2::NepomukProtocol slave(argv[2], argv[3]);
> slave.dispatchLoop();
>
> return 0;
> diff --git a/nepomuk/kioslaves/nepomuk/kio_nepomuk.h \
> b/nepomuk/kioslaves/nepomuk/kio_nepomuk.h index 1299f30..e4ed2b0 100644
> --- a/nepomuk/kioslaves/nepomuk/kio_nepomuk.h
> +++ b/nepomuk/kioslaves/nepomuk/kio_nepomuk.h
> @@ -23,9 +23,9 @@
>
> #include <kio/forwardingslavebase.h>
>
> -#include <Nepomuk/Resource>
> +#include <Nepomuk2/Resource>
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
> class NepomukProtocol : public KIO::ForwardingSlaveBase
> {
> public:
> diff --git a/nepomuk/kioslaves/nepomuk/resourcepagegenerator.cpp \
> b/nepomuk/kioslaves/nepomuk/resourcepagegenerator.cpp index da85d88..59c826c 100644
> --- a/nepomuk/kioslaves/nepomuk/resourcepagegenerator.cpp
> +++ b/nepomuk/kioslaves/nepomuk/resourcepagegenerator.cpp
> @@ -31,14 +31,14 @@
> #include <kdeversion.h>
> #include <KUrl>
>
> -#include <nepomuk/file.h>
> -#include <nepomuk/resourcemanager.h>
> -#include <nepomuk/variant.h>
> -#include <nepomuk/class.h>
> -#include <nepomuk/property.h>
> -#include <Nepomuk/Vocabulary/NIE>
> -#include <Nepomuk/Vocabulary/NFO>
> -#include <nepomuk/utils.h>
> +#include <nepomuk2/file.h>
> +#include <nepomuk2/resourcemanager.h>
> +#include <nepomuk2/variant.h>
> +#include <nepomuk2/class.h>
> +#include <nepomuk2/property.h>
> +#include <Nepomuk2/Vocabulary/NIE>
> +#include <Nepomuk2/Vocabulary/NFO>
> +#include <nepomuk2/utils.h>
>
> #include <Soprano/Model>
> #include <Soprano/Node>
> @@ -48,7 +48,7 @@
> #include <Soprano/Vocabulary/NAO>
>
>
> -using namespace Nepomuk::Vocabulary;
> +using namespace Nepomuk2::Vocabulary;
>
> namespace {
> const char* s_noFollow = "noFollow";
> @@ -56,7 +56,7 @@ namespace {
> const char* s_showNonUserVisibible = "showNonUserVisible";
> const char* s_true = "true";
>
> - KUrl configureUrl( const KUrl& url, Nepomuk::ResourcePageGenerator::Flags \
> flags ) { + KUrl configureUrl( const KUrl& url, \
> Nepomuk2::ResourcePageGenerator::Flags flags ) { KUrl newUrl( url );
>
> newUrl.removeEncodedQueryItem( s_noFollow );
> @@ -65,12 +65,12 @@ namespace {
> }
>
> newUrl.removeEncodedQueryItem( s_showUri );
> - if ( flags & Nepomuk::ResourcePageGenerator::ShowUris ) {
> + if ( flags & Nepomuk2::ResourcePageGenerator::ShowUris ) {
> newUrl.addEncodedQueryItem( s_showUri, s_true );
> }
>
> newUrl.removeEncodedQueryItem( s_showNonUserVisibible );
> - if ( flags & Nepomuk::ResourcePageGenerator::ShowNonUserVisible ) {
> + if ( flags & Nepomuk2::ResourcePageGenerator::ShowNonUserVisible ) {
> newUrl.addEncodedQueryItem( s_showNonUserVisibible, s_true );
> }
>
> @@ -79,18 +79,18 @@ namespace {
> }
>
>
> -Nepomuk::ResourcePageGenerator::ResourcePageGenerator( const Nepomuk::Resource& \
> res ) +Nepomuk2::ResourcePageGenerator::ResourcePageGenerator( const \
> Nepomuk2::Resource& res ) : m_resource( res )
> {
> }
>
>
> -Nepomuk::ResourcePageGenerator::~ResourcePageGenerator()
> +Nepomuk2::ResourcePageGenerator::~ResourcePageGenerator()
> {
> }
>
>
> -void Nepomuk::ResourcePageGenerator::setFlagsFromUrl( const KUrl& url )
> +void Nepomuk2::ResourcePageGenerator::setFlagsFromUrl( const KUrl& url )
> {
> m_flags = NoFlags;
> if ( url.encodedQueryItemValue( s_showUri ) == s_true )
> @@ -100,14 +100,14 @@ void Nepomuk::ResourcePageGenerator::setFlagsFromUrl( const \
> KUrl& url ) }
>
>
> -KUrl Nepomuk::ResourcePageGenerator::url() const
> +KUrl Nepomuk2::ResourcePageGenerator::url() const
> {
> return configureUrl( m_resource.resourceUri(), m_flags );
> }
>
>
> // TODO: create an html template rather than having it hardcoded here
> -QByteArray Nepomuk::ResourcePageGenerator::generatePage() const
> +QByteArray Nepomuk2::ResourcePageGenerator::generatePage() const
> {
> bool exists = m_resource.exists();
>
> @@ -198,11 +198,11 @@ QByteArray Nepomuk::ResourcePageGenerator::generatePage() \
> const os << "<h1>" << label << "</h1>"
> << "Type: " << ( exists ? typesToHtml( m_resource.types() ) : i18n( "Resource does \
> not exist" ) );
> - if(m_resource.isFile() && \
> m_resource.hasType(Nepomuk::Vocabulary::NFO::Image())) { + \
> if(m_resource.isFile() && m_resource.hasType(Nepomuk2::Vocabulary::NFO::Image())) { \
> os << "<img src=\"" << m_resource.resourceUri().toString() << "\" />"; }
> - else if(m_resource.hasProperty(Nepomuk::Vocabulary::NFO::depiction())) {
> - os << "<img src=\"" << \
> m_resource.property(Nepomuk::Vocabulary::NFO::depiction()).toUrlList().first().toString() \
> << "\" />"; + else \
> if(m_resource.hasProperty(Nepomuk2::Vocabulary::NFO::depiction())) { + os << \
> "<img src=\"" << m_resource.property(Nepomuk2::Vocabulary::NFO::depiction()).toUrlList().first().toString() \
> << "\" />"; }
>
> os << "<h2>" << i18n("Relations:") << "</h2><div id=\"relations\"><table>";
> @@ -211,7 +211,7 @@ QByteArray Nepomuk::ResourcePageGenerator::generatePage() const
> Soprano::StatementIterator it = \
> ResourceManager::instance()->mainModel()->listStatements( m_resource.resourceUri(), \
> Soprano::Node(), Soprano::Node() ); while ( it.next() ) {
> Soprano::Statement s = it.current();
> - Nepomuk::Types::Property p( s.predicate().uri() );
> + Nepomuk2::Types::Property p( s.predicate().uri() );
> if ( p != Soprano::Vocabulary::RDF::type() &&
> ((m_flags & ShowNonUserVisible) || p.userVisible())) {
> os << "<tr><td align=right><i>" << entityLabel( p ) << "</i></td><td \
> width=16px></td><td>"; @@ -226,7 +226,7 @@ QByteArray \
> Nepomuk::ResourcePageGenerator::generatePage() const //
> KUrl uri = s.object().uri();
> QString label = uri.fileName();
> - if ( s.predicate() != Nepomuk::Vocabulary::NIE::url() ) {
> + if ( s.predicate() != Nepomuk2::Vocabulary::NIE::url() ) {
> Resource resource( uri );
> uri = resource.resourceUri();
> label = QString::fromLatin1( "%1 (%2)" )
> @@ -248,7 +248,7 @@ QByteArray Nepomuk::ResourcePageGenerator::generatePage() const
> while ( itb.next() ) {
> Soprano::Statement s = itb.current();
> Resource resource( s.subject().uri() );
> - Nepomuk::Types::Property p( s.predicate().uri() );
> + Nepomuk2::Types::Property p( s.predicate().uri() );
> if((m_flags & ShowNonUserVisible) || p.userVisible()) {
> os << "<td align=right>"
> << QString( "<a href=\"%1\">%2</a> (%3)" )
> @@ -274,7 +274,7 @@ QByteArray Nepomuk::ResourcePageGenerator::generatePage() const
> }
>
>
> -QString Nepomuk::ResourcePageGenerator::resourceLabel( const Resource& res ) const
> +QString Nepomuk2::ResourcePageGenerator::resourceLabel( const Resource& res ) \
> const {
> if ( m_flags & ShowUris )
> return KUrl( res.resourceUri() ).prettyUrl();
> @@ -283,7 +283,7 @@ QString Nepomuk::ResourcePageGenerator::resourceLabel( const \
> Resource& res ) con }
>
>
> -QString Nepomuk::ResourcePageGenerator::entityLabel( const Nepomuk::Types::Entity& \
> e ) const +QString Nepomuk2::ResourcePageGenerator::entityLabel( const \
> Nepomuk2::Types::Entity& e ) const {
> if ( m_flags & ShowUris )
> return KUrl( e.uri() ).prettyUrl();
> @@ -292,17 +292,17 @@ QString Nepomuk::ResourcePageGenerator::entityLabel( const \
> Nepomuk::Types::Entit }
>
>
> -QString Nepomuk::ResourcePageGenerator::typesToHtml( const QList<QUrl>& types ) \
> const +QString Nepomuk2::ResourcePageGenerator::typesToHtml( const QList<QUrl>& \
> types ) const {
> - QList<Nepomuk::Types::Class> typeClasses;
> + QList<Nepomuk2::Types::Class> typeClasses;
> foreach( const QUrl& type, types ) {
> - typeClasses << Nepomuk::Types::Class( type );
> + typeClasses << Nepomuk2::Types::Class( type );
> }
>
> // remove all types that are supertypes of others in the list
> - QList<Nepomuk::Types::Class> normalizedTypes;
> + QList<Nepomuk2::Types::Class> normalizedTypes;
> for ( int i = 0; i < typeClasses.count(); ++i ) {
> - Nepomuk::Types::Class& type = typeClasses[i];
> + Nepomuk2::Types::Class& type = typeClasses[i];
> bool use = true;
> for ( int j = 0; j < typeClasses.count(); ++j ) {
> if ( type != typeClasses[j] &&
> @@ -329,13 +329,13 @@ QString Nepomuk::ResourcePageGenerator::typesToHtml( const \
> QList<QUrl>& types ) }
>
>
> -QString Nepomuk::ResourcePageGenerator::encodeUrl( const QUrl& url ) const
> +QString Nepomuk2::ResourcePageGenerator::encodeUrl( const QUrl& url ) const
> {
> return QString::fromAscii( configureUrl( url, m_flags ).toEncoded() );
> }
>
>
> -QString Nepomuk::ResourcePageGenerator::createConfigureBoxHtml() const
> +QString Nepomuk2::ResourcePageGenerator::createConfigureBoxHtml() const
> {
> QString html
> = QString::fromLatin1( "<div style=\"position:fixed; right:10px; top:10px; \
> text-align:right;\"><a href=\"%1\">%2</a><br/><a href=\"%3\">%4</a></div>" ) @@ \
> -347,12 +347,12 @@ QString Nepomuk::ResourcePageGenerator::createConfigureBoxHtml() \
> const return html;
> }
>
> -QString Nepomuk::ResourcePageGenerator::formatLiteral(const \
> Nepomuk::Types::Property &p, const Soprano::LiteralValue &value) const +QString \
> Nepomuk2::ResourcePageGenerator::formatLiteral(const Nepomuk2::Types::Property &p, \
> const Soprano::LiteralValue &value) const {
> - return Nepomuk::Utils::formatPropertyValue(p, \
> Nepomuk::Variant(value.variant())); + return \
> Nepomuk2::Utils::formatPropertyValue(p, Nepomuk2::Variant(value.variant())); }
>
> -QString Nepomuk::ResourcePageGenerator::formatResource(const \
> Nepomuk::Types::Property &p, const QUrl &uri_) const +QString \
> Nepomuk2::ResourcePageGenerator::formatResource(const Nepomuk2::Types::Property &p, \
> const QUrl &uri_) const {
> //
> // nie:url is a special case for which we should never use Resource
> diff --git a/nepomuk/kioslaves/nepomuk/resourcepagegenerator.h \
> b/nepomuk/kioslaves/nepomuk/resourcepagegenerator.h index 68e5c44..63f67e8 100644
> --- a/nepomuk/kioslaves/nepomuk/resourcepagegenerator.h
> +++ b/nepomuk/kioslaves/nepomuk/resourcepagegenerator.h
> @@ -21,14 +21,14 @@
> #ifndef _RESOURCE_PAGE_GENERATOR_H_
> #define _RESOURCE_PAGE_GENERATOR_H_
>
> -#include <Nepomuk/Resource>
> +#include <Nepomuk2/Resource>
>
> #include <QtCore/QList>
> #include <KUrl>
>
> class QByteArray;
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
> namespace Types {
> class Entity;
> }
> @@ -36,7 +36,7 @@ namespace Nepomuk {
> class ResourcePageGenerator
> {
> public:
> - ResourcePageGenerator( const Nepomuk::Resource& res );
> + ResourcePageGenerator( const Nepomuk2::Resource& res );
> ~ResourcePageGenerator();
>
> enum Flag {
> @@ -61,18 +61,18 @@ namespace Nepomuk {
>
> private:
> QString resourceLabel( const Resource& res ) const;
> - QString entityLabel( const Nepomuk::Types::Entity& e ) const;
> + QString entityLabel( const Nepomuk2::Types::Entity& e ) const;
> QString typesToHtml( const QList<QUrl>& types ) const;
> QString encodeUrl( const QUrl& u ) const;
> QString createConfigureBoxHtml() const;
> - QString formatLiteral(const Nepomuk::Types::Property& prop, const \
> Soprano::LiteralValue &value) const;
> - QString formatResource(const Nepomuk::Types::Property& p, const QUrl \
> &uri_) const; + QString formatLiteral(const Nepomuk2::Types::Property& prop, \
> const Soprano::LiteralValue &value) const; + QString formatResource(const \
> Nepomuk2::Types::Property& p, const QUrl &uri_) const;
> - Nepomuk::Resource m_resource;
> + Nepomuk2::Resource m_resource;
> Flags m_flags;
> };
> }
>
> -Q_DECLARE_OPERATORS_FOR_FLAGS( Nepomuk::ResourcePageGenerator::Flags )
> +Q_DECLARE_OPERATORS_FOR_FLAGS( Nepomuk2::ResourcePageGenerator::Flags )
>
> #endif
> diff --git a/nepomuk/kioslaves/search/CMakeLists.txt \
> b/nepomuk/kioslaves/search/CMakeLists.txt index dd12acf..cc231e5 100644
> --- a/nepomuk/kioslaves/search/CMakeLists.txt
> +++ b/nepomuk/kioslaves/search/CMakeLists.txt
> @@ -9,7 +9,7 @@ include_directories(
> ${KDE4_INCLUDES}
> ${KDE4_KIO_INCLUDES}
> ${SOPRANO_INCLUDE_DIR}
> - ${NEPOMUK_INCLUDE_DIR}
> + ${NEPOMUK_CORE_INCLUDE_DIR}
> ${CMAKE_CURRENT_BINARY_DIR}
> ${nepomuk_kio_slaves_SOURCE_DIR}/common
> )
> @@ -22,7 +22,7 @@ set(kio_nepomuksearch_PART_SRCS
> ../common/resourcestat.cpp
> )
>
> -soprano_add_ontology(kio_nepomuksearch_PART_SRCS \
> ${nepomuk_ontologies_SOURCE_DIR}/kext.trig "KExt" "Nepomuk::Vocabulary" "trig") \
> +soprano_add_ontology(kio_nepomuksearch_PART_SRCS \
> ${NEPOMUK_CORE_ONTOLOGY_DIR}/kde/kext.trig "KExt" "Nepomuk2::Vocabulary" "trig")
> kde4_add_plugin(kio_nepomuksearch
> ${kio_nepomuksearch_PART_SRCS})
> @@ -31,8 +31,7 @@ target_link_libraries(kio_nepomuksearch
> nepomukcommon
> ${KDE4_KIO_LIBS}
> ${KDE4_SOLID_LIBS}
> - ${NEPOMUK_LIBRARIES}
> - ${NEPOMUK_QUERY_LIBRARIES}
> + ${NEPOMUK_CORE_LIBRARIES}
> ${SOPRANO_LIBRARIES}
> )
>
> diff --git a/nepomuk/kioslaves/search/kdedmodule/CMakeLists.txt \
> b/nepomuk/kioslaves/search/kdedmodule/CMakeLists.txt index 807dc0c..1c241be 100644
> --- a/nepomuk/kioslaves/search/kdedmodule/CMakeLists.txt
> +++ b/nepomuk/kioslaves/search/kdedmodule/CMakeLists.txt
> @@ -1,7 +1,7 @@
> include_directories(
> ${QT_INCLUDES}
> ${KDE4_INCLUDES}
> - ${NEPOMUK_INCLUDE_DIR}
> + ${NEPOMUK_CORE_INCLUDE_DIR}
> ${nepomuk_kio_slaves_SOURCE_DIR}/common
> )
>
> @@ -14,30 +14,30 @@ set(nepomuksearchmodule_SRCS
> ../../common/timelinetools.cpp
> )
>
> -soprano_add_ontology(nepomuksearchmodule_SRCS \
> ${nepomuk_ontologies_SOURCE_DIR}/kext.trig "KExt" "Nepomuk::Vocabulary" "trig") \
> +soprano_add_ontology(nepomuksearchmodule_SRCS \
> ${NEPOMUK_CORE_ONTOLOGY_DIR}/kde/kext.trig "KExt" "Nepomuk2::Vocabulary" "trig")
> -set_source_files_properties(
> - ${nepomuk_kio_slaves_SOURCE_DIR}/../interfaces/org.kde.nepomuk.Query.xml
> - PROPERTIES INCLUDE "nepomuk/result.h")
> -set_source_files_properties(
> - ${nepomuk_kio_slaves_SOURCE_DIR}/../interfaces/org.kde.nepomuk.QueryService.xml
> - PROPERTIES INCLUDE "dbusoperators_p.h")
> +#set_source_files_properties(
> +# ${NEPOMUK_CORE_DBUS_INTERFACE_DIR}/org.kde.nepomuk.Query.xml
> +# PROPERTIES INCLUDE "nepomuk2/result.h")
>
> -qt4_add_dbus_interface(nepomuksearchmodule_SRCS
> - ${nepomuk_kio_slaves_SOURCE_DIR}/../interfaces/org.kde.nepomuk.QueryService.xml
> - queryserviceinterface)
> -qt4_add_dbus_interface(nepomuksearchmodule_SRCS
> - ${nepomuk_kio_slaves_SOURCE_DIR}/../interfaces/org.kde.nepomuk.Query.xml
> - queryinterface)
> +#set_source_files_properties(
> +# ${NEPOMUK_CORE_DBUS_INTERFACE_DIR}/org.kde.nepomuk.QueryService.xml
> +# PROPERTIES INCLUDE "dbusoperators_p.h")
> +
> +#qt4_add_dbus_interface(nepomuksearchmodule_SRCS
> +# ${NEPOMUK_CORE_DBUS_INTERFACE_DIR}/org.kde.nepomuk.QueryService.xml
> +# queryserviceinterface)
> +#qt4_add_dbus_interface(nepomuksearchmodule_SRCS
> +# ${NEPOMUK_CORE_DBUS_INTERFACE_DIR}/org.kde.nepomuk.Query.xml
> +# queryinterface)
>
> kde4_add_plugin(kded_nepomuksearchmodule ${nepomuksearchmodule_SRCS})
>
> -target_link_libraries(kded_nepomuksearchmodule
> +target_link_libraries(kded_nepomuksearchmodule
> nepomukcommon
> ${KDE4_KDECORE_LIBS}
> ${KDE4_KIO_LIBS}
> - ${NEPOMUK_LIBRARIES}
> - ${NEPOMUK_QUERY_LIBRARIES}
> + ${NEPOMUK_CORE_LIBRARIES}
> ${SOPRANO_LIBRARIES}
> )
>
> diff --git a/nepomuk/kioslaves/search/kdedmodule/dbusoperators_p.h \
> b/nepomuk/kioslaves/search/kdedmodule/dbusoperators_p.h index 62f19e9..ea06487 \
> 100644
> --- a/nepomuk/kioslaves/search/kdedmodule/dbusoperators_p.h
> +++ b/nepomuk/kioslaves/search/kdedmodule/dbusoperators_p.h
> @@ -23,18 +23,18 @@
>
> #include <QtDBus/QDBusArgument>
>
> -#include <nepomuk/result.h>
> -#include <nepomuk/query.h>
> -#include <nepomuk/term.h>
> -#include <nepomuk/nepomukquery_export.h>
> +#include <nepomuk2/result.h>
> +#include <nepomuk2/query.h>
> +#include <nepomuk2/term.h>
> +#include <nepomuk2/nepomuk_export.h>
>
> -Q_DECLARE_METATYPE(Nepomuk::Query::Result)
> +Q_DECLARE_METATYPE(Nepomuk2::Query::Result)
> Q_DECLARE_METATYPE(Soprano::Node)
> -Q_DECLARE_METATYPE(QList<Nepomuk::Query::Result>)
> +Q_DECLARE_METATYPE(QList<Nepomuk2::Query::Result>)
> typedef QHash<QString, QString> RequestPropertyMapDBus;
> Q_DECLARE_METATYPE( RequestPropertyMapDBus )
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
> namespace Query {
> /**
> * Register the DBus types necessary for communication with the Nepomuk
> @@ -46,10 +46,10 @@ namespace Nepomuk {
> }
>
> // We export the non-public operators so that we do not need duplicated code in \
> kdebase
> -NEPOMUKQUERY_EXPORT QDBusArgument& operator<<( QDBusArgument& arg, const \
> Soprano::Node& );
> -NEPOMUKQUERY_EXPORT const QDBusArgument& operator>>( const QDBusArgument& arg, \
> Soprano::Node& ); +NEPOMUK_EXPORT QDBusArgument& operator<<( QDBusArgument& arg, \
> const Soprano::Node& ); +NEPOMUK_EXPORT const QDBusArgument& operator>>( const \
> QDBusArgument& arg, Soprano::Node& );
> -NEPOMUKQUERY_EXPORT QDBusArgument& operator<<( QDBusArgument& arg, const \
> Nepomuk::Query::Result& );
> -NEPOMUKQUERY_EXPORT const QDBusArgument& operator>>( const QDBusArgument& arg, \
> Nepomuk::Query::Result& ); +NEPOMUK_EXPORT QDBusArgument& operator<<( \
> QDBusArgument& arg, const Nepomuk2::Query::Result& ); +NEPOMUK_EXPORT const \
> QDBusArgument& operator>>( const QDBusArgument& arg, Nepomuk2::Query::Result& );
> #endif
> diff --git a/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.cpp \
> b/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.cpp index \
> 56764fc..a319f84 100644
> --- a/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.cpp
> +++ b/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.cpp
> @@ -25,7 +25,7 @@
> #include <QtDBus/QDBusConnection>
> #include <QtDBus/QDBusServiceWatcher>
>
> -#include <Nepomuk/Vocabulary/NIE>
> +#include <Nepomuk2/Vocabulary/NIE>
>
> #include <kdebug.h>
> #include <kdirnotify.h>
> @@ -50,12 +50,12 @@ namespace {
> }
>
>
> -Nepomuk::SearchModule::SearchModule( QObject* parent, const QList<QVariant>& )
> +Nepomuk2::SearchModule::SearchModule( QObject* parent, const QList<QVariant>& )
> > KDEDModule( parent )
> {
> kDebug();
>
> - Nepomuk::Query::registerDBusTypes();
> + Nepomuk2::Query::registerDBusTypes();
>
> //
> // connect to serviceOwnerChanged to catch crashed clients that never unregistered
> @@ -86,13 +86,13 @@ Nepomuk::SearchModule::SearchModule( QObject* parent, const \
> QList<QVariant>& ) }
>
>
> -Nepomuk::SearchModule::~SearchModule()
> +Nepomuk2::SearchModule::~SearchModule()
> {
> kDebug();
> }
>
>
> -void Nepomuk::SearchModule::registerSearchUrl( const QString& urlString )
> +void Nepomuk2::SearchModule::registerSearchUrl( const QString& urlString )
> {
> const KUrl url( urlString );
> KUrl queryUrl;
> @@ -102,8 +102,8 @@ void Nepomuk::SearchModule::registerSearchUrl( const QString& \
> urlString ) }
> else if ( isTimelineUrl( url ) ) {
> QDate date;
> - if ( Nepomuk::parseTimelineUrl( url, &date ) == Nepomuk::DayFolder )
> - queryUrl = Nepomuk::buildTimelineQuery( date ).toSearchUrl();
> + if ( Nepomuk2::parseTimelineUrl( url, &date ) == Nepomuk2::DayFolder )
> + queryUrl = Nepomuk2::buildTimelineQuery( date ).toSearchUrl();
> }
>
> if ( queryUrl.isValid() ) {
> @@ -126,7 +126,7 @@ void Nepomuk::SearchModule::registerSearchUrl( const QString& \
> urlString ) }
>
>
> -void Nepomuk::SearchModule::unregisterSearchUrl( const QString& urlString )
> +void Nepomuk2::SearchModule::unregisterSearchUrl( const QString& urlString )
> {
> const KUrl url( urlString );
> if ( isNepomukSearchOrTimelineUrl( url ) ) {
> @@ -141,13 +141,13 @@ void Nepomuk::SearchModule::unregisterSearchUrl( const \
> QString& urlString ) }
>
>
> -QStringList Nepomuk::SearchModule::watchedSearchUrls()
> +QStringList Nepomuk2::SearchModule::watchedSearchUrls()
> {
> return KUrl::List( m_queryHash.keys() ).toStringList();
> }
>
>
> -void Nepomuk::SearchModule::slotServiceUnregistered( const QString& serviceName )
> +void Nepomuk2::SearchModule::slotServiceUnregistered( const QString& serviceName )
> {
> QHash<QString, KUrl>::iterator it = m_dbusServiceUrlHash.find( serviceName );
> while ( it != m_dbusServiceUrlHash.end() ) {
> @@ -159,7 +159,7 @@ void Nepomuk::SearchModule::slotServiceUnregistered( const \
> QString& serviceName }
>
>
> -void Nepomuk::SearchModule::unrefUrl( const KUrl& url )
> +void Nepomuk2::SearchModule::unrefUrl( const KUrl& url )
> {
> QHash<KUrl, SearchUrlListener*>::iterator it = m_queryHash.find( url );
> if ( it != m_queryHash.end() ) {
> @@ -174,7 +174,7 @@ void Nepomuk::SearchModule::unrefUrl( const KUrl& url )
> #include <kpluginloader.h>
>
> K_PLUGIN_FACTORY(NepomukSearchModuleFactory,
> - registerPlugin<Nepomuk::SearchModule>();
> + registerPlugin<Nepomuk2::SearchModule>();
> )
> K_EXPORT_PLUGIN(NepomukSearchModuleFactory("nepomuksearchmodule"))
>
> diff --git a/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.h \
> b/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.h index 97f005d..a19b23c \
> 100644
> --- a/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.h
> +++ b/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.h
> @@ -28,7 +28,7 @@
>
> class QDBusServiceWatcher;
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
>
> class SearchUrlListener;
>
> diff --git a/nepomuk/kioslaves/search/kdedmodule/searchurllistener.cpp \
> b/nepomuk/kioslaves/search/kdedmodule/searchurllistener.cpp index 2333e38..c260485 \
> 100644
> --- a/nepomuk/kioslaves/search/kdedmodule/searchurllistener.cpp
> +++ b/nepomuk/kioslaves/search/kdedmodule/searchurllistener.cpp
> @@ -25,9 +25,9 @@
>
> #include <kdirnotify.h>
> #include <kdebug.h>
> -#include <nepomuk/result.h>
> -#include <nepomuk/query.h>
> -#include <nepomuk/resource.h>
> +#include <Nepomuk2/Result/Result>
> +#include <Nepomuk2/Query/Query>
> +#include <Nepomuk2/Resource>
>
> #include <QtCore/QHash>
> #include <QtDBus/QDBusConnection>
> @@ -37,7 +37,7 @@
> #include <Soprano/BindingSet>
>
>
> -Nepomuk::SearchUrlListener::SearchUrlListener( const KUrl& queryUrl, const KUrl& \
> notifyUrl ) +Nepomuk2::SearchUrlListener::SearchUrlListener( const KUrl& queryUrl, \
> const KUrl& notifyUrl ) : QObject( 0 ),
> m_ref( 0 ),
> m_queryUrl( queryUrl ),
> @@ -67,7 +67,7 @@ Nepomuk::SearchUrlListener::SearchUrlListener( const KUrl& \
> queryUrl, const KUrl& }
>
>
> -Nepomuk::SearchUrlListener::~SearchUrlListener()
> +Nepomuk2::SearchUrlListener::~SearchUrlListener()
> {
> kDebug() << m_queryUrl;
>
> @@ -77,35 +77,35 @@ Nepomuk::SearchUrlListener::~SearchUrlListener()
> }
>
>
> -int Nepomuk::SearchUrlListener::ref()
> +int Nepomuk2::SearchUrlListener::ref()
> {
> return ++m_ref;
> }
>
>
> -int Nepomuk::SearchUrlListener::unref()
> +int Nepomuk2::SearchUrlListener::unref()
> {
> return --m_ref;
> }
>
>
> -void Nepomuk::SearchUrlListener::slotNewEntries( const \
> QList<Nepomuk::Query::Result>& ) +void Nepomuk2::SearchUrlListener::slotNewEntries( \
> const QList<Nepomuk2::Query::Result>& ) {
> org::kde::KDirNotify::emitFilesAdded( m_notifyUrl.url() );
> }
>
>
> -void Nepomuk::SearchUrlListener::slotEntriesRemoved( const \
> QList<Nepomuk::Query::Result>& entries ) +void \
> Nepomuk2::SearchUrlListener::slotEntriesRemoved( const \
> QList<Nepomuk2::Query::Result>& entries ) {
> QStringList urls;
> foreach( const Query::Result& result, entries ) {
> // make sure we use the exact same name used in searchfolder.cpp
> KUrl url( result.resource().resourceUri() );
> - if( result.requestProperties().contains(Nepomuk::Vocabulary::NIE::url()) )
> - url = result[Nepomuk::Vocabulary::NIE::url()].uri();
> + if( result.requestProperties().contains(Nepomuk2::Vocabulary::NIE::url()) \
> ) + url = result[Nepomuk2::Vocabulary::NIE::url()].uri();
>
> KUrl resultUrl( m_notifyUrl );
> - resultUrl.addPath( Nepomuk::resourceUriToUdsName( url ) );
> + resultUrl.addPath( Nepomuk2::resourceUriToUdsName( url ) );
> urls << resultUrl.url();
> }
> kDebug() << urls;
> @@ -113,7 +113,7 @@ void Nepomuk::SearchUrlListener::slotEntriesRemoved( const \
> QList<Nepomuk::Query: }
>
>
> -void Nepomuk::SearchUrlListener::slotQueryServiceInitialized( bool success )
> +void Nepomuk2::SearchUrlListener::slotQueryServiceInitialized( bool success )
> {
> kDebug() << m_queryUrl << success;
>
> @@ -127,7 +127,7 @@ void Nepomuk::SearchUrlListener::slotQueryServiceInitialized( \
> bool success ) }
>
>
> -void Nepomuk::SearchUrlListener::createInterface()
> +void Nepomuk2::SearchUrlListener::createInterface()
> {
> kDebug() << m_queryUrl;
>
> @@ -156,10 +156,10 @@ void Nepomuk::SearchUrlListener::createInterface()
> m_queryInterface = new org::kde::nepomuk::Query( queryService,
> r.value().path(),
> QDBusConnection::sessionBus() );
> - connect( m_queryInterface, SIGNAL( newEntries( \
> QList<Nepomuk::Query::Result> ) ),
> - this, SLOT( slotNewEntries( QList<Nepomuk::Query::Result> ) ) );
> - connect( m_queryInterface, SIGNAL( entriesRemoved( \
> QList<Nepomuk::Query::Result> ) ),
> - this, SLOT( slotEntriesRemoved( QList<Nepomuk::Query::Result> ) ) \
> ); + connect( m_queryInterface, SIGNAL( newEntries( \
> QList<Nepomuk2::Query::Result> ) ), + this, SLOT( slotNewEntries( \
> QList<Nepomuk2::Query::Result> ) ) ); + connect( m_queryInterface, SIGNAL( \
> entriesRemoved( QList<Nepomuk2::Query::Result> ) ), + this, SLOT( \
> slotEntriesRemoved( QList<Nepomuk2::Query::Result> ) ) ); \
> m_queryInterface->listen(); }
> }
> diff --git a/nepomuk/kioslaves/search/kdedmodule/searchurllistener.h \
> b/nepomuk/kioslaves/search/kdedmodule/searchurllistener.h index ba2d3bc..8d9aa29 \
> 100644
> --- a/nepomuk/kioslaves/search/kdedmodule/searchurllistener.h
> +++ b/nepomuk/kioslaves/search/kdedmodule/searchurllistener.h
> @@ -25,12 +25,12 @@
> #include <QtDBus/QDBusObjectPath>
>
> #include <kurl.h>
> -#include <nepomuk/result.h>
> +#include <nepomuk2/result.h>
>
> #include "queryinterface.h"
>
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
> class SearchUrlListener : public QObject
> {
> Q_OBJECT
> @@ -46,8 +46,8 @@ namespace Nepomuk {
> KUrl notificationUrl() const { return m_notifyUrl; }
>
> private Q_SLOTS:
> - void slotNewEntries( const QList<Nepomuk::Query::Result>& entries );
> - void slotEntriesRemoved( const QList<Nepomuk::Query::Result>& entries );
> + void slotNewEntries( const QList<Nepomuk2::Query::Result>& entries );
> + void slotEntriesRemoved( const QList<Nepomuk2::Query::Result>& entries );
> void slotQueryServiceInitialized( bool success );
>
> private:
> diff --git a/nepomuk/kioslaves/search/kio_nepomuksearch.cpp \
> b/nepomuk/kioslaves/search/kio_nepomuksearch.cpp index e26dd84..38894be 100644
> --- a/nepomuk/kioslaves/search/kio_nepomuksearch.cpp
> +++ b/nepomuk/kioslaves/search/kio_nepomuksearch.cpp
> @@ -37,24 +37,24 @@
> #include <KStandardDirs>
> #include <KFileItem>
>
> -#include <Nepomuk/Thing>
> -#include <Nepomuk/ResourceManager>
> -#include <Nepomuk/Variant>
> -#include <Nepomuk/Query/QueryServiceClient>
> -#include <Nepomuk/Query/ComparisonTerm>
> -#include <Nepomuk/Query/ResourceTypeTerm>
> -#include <Nepomuk/Query/AndTerm>
> -#include <Nepomuk/Query/NegationTerm>
> -#include <Nepomuk/Query/Query>
> +#include <Nepomuk2/Thing>
> +#include <Nepomuk2/ResourceManager>
> +#include <Nepomuk2/Variant>
> +#include <Nepomuk2/Query/QueryServiceClient>
> +#include <Nepomuk2/Query/ComparisonTerm>
> +#include <Nepomuk2/Query/ResourceTypeTerm>
> +#include <Nepomuk2/Query/AndTerm>
> +#include <Nepomuk2/Query/NegationTerm>
> +#include <Nepomuk2/Query/Query>
>
> #include <Soprano/Vocabulary/RDF>
> #include <Soprano/Vocabulary/RDFS>
> #include <Soprano/Vocabulary/NRL>
> #include <Soprano/Vocabulary/NAO>
> #include <Soprano/Vocabulary/XMLSchema>
> -#include <Nepomuk/Vocabulary/NFO>
> -#include <Nepomuk/Vocabulary/NIE>
> -#include <Nepomuk/Vocabulary/PIMO>
> +#include <Nepomuk2/Vocabulary/NFO>
> +#include <Nepomuk2/Vocabulary/NIE>
> +#include <Nepomuk2/Vocabulary/PIMO>
>
> #include <sys/types.h>
> #include <unistd.h>
> @@ -69,12 +69,12 @@ namespace {
> uds.insert( KIO::UDSEntry::UDS_MIME_TYPE, QString::fromLatin1( "inode/directory" ) \
> ); uds.insert( KIO::UDSEntry::UDS_ICON_OVERLAY_NAMES, QLatin1String( "nepomuk" ) );
> uds.insert( KIO::UDSEntry::UDS_DISPLAY_TYPE, i18n( "Query folder" ) );
> - uds.insert( KIO::UDSEntry::UDS_NAME, \
> Nepomuk::Query::Query::titleFromQueryUrl( url ) );
> - uds.insert( KIO::UDSEntry::UDS_DISPLAY_NAME, \
> Nepomuk::Query::Query::titleFromQueryUrl( url ) ); + uds.insert( \
> KIO::UDSEntry::UDS_NAME, Nepomuk2::Query::Query::titleFromQueryUrl( url ) ); + \
> uds.insert( KIO::UDSEntry::UDS_DISPLAY_NAME, \
> Nepomuk2::Query::Query::titleFromQueryUrl( url ) ); if ( url.hasQueryItem( \
> QLatin1String( "resource" ) ) ) {
> - Nepomuk::addGenericNepomukResourceData( Nepomuk::Resource( KUrl( \
> url.queryItemValue( QLatin1String( "resource" ) ) ) ), uds ); + \
> Nepomuk2::addGenericNepomukResourceData( Nepomuk2::Resource( KUrl( \
> url.queryItemValue( QLatin1String( "resource" ) ) ) ), uds ); }
> - Nepomuk::Query::Query query = Nepomuk::Query::Query::fromQueryUrl( url );
> + Nepomuk2::Query::Query query = Nepomuk2::Query::Query::fromQueryUrl( url \
> ); if ( query.isValid() )
> uds.insert( KIO::UDSEntry::UDS_NEPOMUK_QUERY, query.toString() );
> return uds;
> @@ -102,23 +102,23 @@ namespace {
> }
>
> KUrl convertLegacyQueryUrl( const KUrl& url ) {
> - KUrl newUrl(QLatin1String("nepomuksearch:/") + \
> Nepomuk::Query::Query::titleFromQueryUrl(url));
> - Nepomuk::Query::Query query = Nepomuk::Query::Query::fromQueryUrl(url);
> + KUrl newUrl(QLatin1String("nepomuksearch:/") + \
> Nepomuk2::Query::Query::titleFromQueryUrl(url)); + Nepomuk2::Query::Query \
> query = Nepomuk2::Query::Query::fromQueryUrl(url); if(query.isValid())
> newUrl.addQueryItem(QLatin1String("encodedquery"), query.toString());
> else
> - newUrl.addQueryItem(QLatin1String("sparql"), \
> Nepomuk::Query::Query::sparqlFromQueryUrl(url)); + \
> newUrl.addQueryItem(QLatin1String("sparql"), \
> Nepomuk2::Query::Query::sparqlFromQueryUrl(url)); return newUrl;
> }
>
> - Nepomuk::Query::Query rootQuery() {
> + Nepomuk2::Query::Query rootQuery() {
> KConfig config( "kio_nepomuksearchrc" );
> QString queryStr = config.group( "General" ).readEntry( "Root query", QString() );
> - Nepomuk::Query::Query query;
> + Nepomuk2::Query::Query query;
> if ( queryStr.isEmpty() )
> - query = Nepomuk::lastModifiedFilesQuery();
> + query = Nepomuk2::lastModifiedFilesQuery();
> else
> - query = Nepomuk::Query::Query::fromString( queryStr );
> + query = Nepomuk2::Query::Query::fromString( queryStr );
> query.setLimit( config.group( "General" ).readEntry( "Root query limit", 10 ) );
> return query;
> }
> @@ -126,26 +126,26 @@ namespace {
> }
>
>
> -Nepomuk::SearchProtocol::SearchProtocol( const QByteArray& poolSocket, const \
> QByteArray& appSocket ) +Nepomuk2::SearchProtocol::SearchProtocol( const \
> QByteArray& poolSocket, const QByteArray& appSocket ) : KIO::ForwardingSlaveBase( \
> "nepomuksearch", poolSocket, appSocket ) {
> }
>
>
> -Nepomuk::SearchProtocol::~SearchProtocol()
> +Nepomuk2::SearchProtocol::~SearchProtocol()
> {
> }
>
>
> -bool Nepomuk::SearchProtocol::ensureNepomukRunning( bool emitError )
> +bool Nepomuk2::SearchProtocol::ensureNepomukRunning( bool emitError )
> {
> - if ( Nepomuk::ResourceManager::instance()->init() ) {
> + if ( Nepomuk2::ResourceManager::instance()->init() ) {
> kDebug() << "Failed to init Nepomuk";
> if ( emitError )
> error( KIO::ERR_SLAVE_DEFINED, i18n( "The desktop search service is not activated. \
> Unable to answer queries without it." ) ); return false;
> }
> - else if ( !Nepomuk::Query::QueryServiceClient::serviceAvailable() ) {
> + else if ( !Nepomuk2::Query::QueryServiceClient::serviceAvailable() ) {
> kDebug() << "Nepomuk Query service is not running.";
> if ( emitError )
> error( KIO::ERR_SLAVE_DEFINED, i18n( "The desktop search query service is not \
> running. Unable to answer queries without it." ) ); @@ -157,7 +157,7 @@ bool \
> Nepomuk::SearchProtocol::ensureNepomukRunning( bool emitError ) }
>
>
> -void Nepomuk::SearchProtocol::listDir( const KUrl& url )
> +void Nepomuk2::SearchProtocol::listDir( const KUrl& url )
> {
> kDebug() << url;
>
> @@ -197,7 +197,7 @@ void Nepomuk::SearchProtocol::listDir( const KUrl& url )
> }
>
>
> -void Nepomuk::SearchProtocol::get( const KUrl& url )
> +void Nepomuk2::SearchProtocol::get( const KUrl& url )
> {
> kDebug() << url;
>
> @@ -208,7 +208,7 @@ void Nepomuk::SearchProtocol::get( const KUrl& url )
> }
>
>
> -void Nepomuk::SearchProtocol::put( const KUrl& url, int permissions, KIO::JobFlags \
> flags ) +void Nepomuk2::SearchProtocol::put( const KUrl& url, int permissions, \
> KIO::JobFlags flags ) {
> kDebug() << url << permissions << flags;
>
> @@ -220,7 +220,7 @@ void Nepomuk::SearchProtocol::put( const KUrl& url, int \
> permissions, KIO::JobFla }
>
>
> -void Nepomuk::SearchProtocol::mimetype( const KUrl& url )
> +void Nepomuk2::SearchProtocol::mimetype( const KUrl& url )
> {
> kDebug() << url;
>
> @@ -246,7 +246,7 @@ void Nepomuk::SearchProtocol::mimetype( const KUrl& url )
> }
>
>
> -void Nepomuk::SearchProtocol::stat( const KUrl& url )
> +void Nepomuk2::SearchProtocol::stat( const KUrl& url )
> {
> kDebug() << url;
>
> @@ -283,22 +283,22 @@ void Nepomuk::SearchProtocol::stat( const KUrl& url )
> }
>
>
> -void Nepomuk::SearchProtocol::del(const KUrl& url, bool isFile)
> +void Nepomuk2::SearchProtocol::del(const KUrl& url, bool isFile)
> {
> ForwardingSlaveBase::del( url, isFile );
> }
>
>
> -bool Nepomuk::SearchProtocol::rewriteUrl( const KUrl& url, KUrl& newURL )
> +bool Nepomuk2::SearchProtocol::rewriteUrl( const KUrl& url, KUrl& newURL )
> {
> // we do it the speedy but slightly umpf way: decode the encoded URI from the \
> filename
> - newURL = Nepomuk::udsNameToResourceUri( url.fileName() );
> + newURL = Nepomuk2::udsNameToResourceUri( url.fileName() );
> kDebug() << "URL:" << url << "NEW URL:" << newURL << newURL.protocol() << \
> newURL.path() << newURL.fileName(); return !newURL.isEmpty();
> }
>
>
> -void Nepomuk::SearchProtocol::prepareUDSEntry( KIO::UDSEntry& uds, bool listing ) \
> const +void Nepomuk2::SearchProtocol::prepareUDSEntry( KIO::UDSEntry& uds, bool \
> listing ) const {
> // do nothing - we do everything in SearchFolder::statResult
> Q_UNUSED(uds);
> @@ -306,7 +306,7 @@ void Nepomuk::SearchProtocol::prepareUDSEntry( KIO::UDSEntry& \
> uds, bool listing }
>
>
> -void Nepomuk::SearchProtocol::listRoot()
> +void Nepomuk2::SearchProtocol::listRoot()
> {
> kDebug();
>
> @@ -323,13 +323,13 @@ void Nepomuk::SearchProtocol::listRoot()
> }
>
>
> -Nepomuk::SearchFolder* Nepomuk::SearchProtocol::getQueryFolder( const KUrl& url )
> +Nepomuk2::SearchFolder* Nepomuk2::SearchProtocol::getQueryFolder( const KUrl& url \
> ) {
> return new SearchFolder( url, this );
> }
>
>
> -void Nepomuk::SearchProtocol::updateQueryUrlHistory( const KUrl& url )
> +void Nepomuk2::SearchProtocol::updateQueryUrlHistory( const KUrl& url )
> {
> //
> // if the url is already in the history update its timestamp
> @@ -387,7 +387,7 @@ extern "C"
>
> kDebug(7102) << "Starting nepomuksearch slave " << getpid();
>
> - Nepomuk::SearchProtocol slave( argv[2], argv[3] );
> + Nepomuk2::SearchProtocol slave( argv[2], argv[3] );
> slave.dispatchLoop();
>
> kDebug(7102) << "Nepomuksearch slave Done";
> @@ -398,7 +398,7 @@ extern "C"
>
>
> #if 0
> -void Nepomuk::SearchProtocol::listUserQueries()
> +void Nepomuk2::SearchProtocol::listUserQueries()
> {
> UserQueryUrlList userQueries;
> Q_FOREACH( const KUrl& url, userQueries ) {
> @@ -407,7 +407,7 @@ void Nepomuk::SearchProtocol::listUserQueries()
> listEntry( uds, false );
> }
> }
> -void Nepomuk::SearchProtocol::listLastQueries()
> +void Nepomuk2::SearchProtocol::listLastQueries()
> {
> KSharedConfigPtr cfg = KSharedConfig::openConfig( "kio_nepomuksearchrc" );
> KConfigGroup grp = cfg->group( "Last Queries" );
> diff --git a/nepomuk/kioslaves/search/kio_nepomuksearch.h \
> b/nepomuk/kioslaves/search/kio_nepomuksearch.h index 9f4c4ba..e68ff29 100644
> --- a/nepomuk/kioslaves/search/kio_nepomuksearch.h
> +++ b/nepomuk/kioslaves/search/kio_nepomuksearch.h
> @@ -25,7 +25,7 @@
>
> #include <QtCore/QQueue>
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
> namespace Search {
> class Query;
> }
> diff --git a/nepomuk/kioslaves/search/queryutils.h \
> b/nepomuk/kioslaves/search/queryutils.h index 3b5b707..056e01b 100644
> --- a/nepomuk/kioslaves/search/queryutils.h
> +++ b/nepomuk/kioslaves/search/queryutils.h
> @@ -27,15 +27,15 @@
> #include <KUrl>
> #include <KDebug>
>
> -#include <Nepomuk/Query/Query>
> -#include <Nepomuk/Query/OptionalTerm>
> -#include <Nepomuk/Query/ComparisonTerm>
> -#include <Nepomuk/Query/AndTerm>
> -#include <Nepomuk/Vocabulary/NIE>
> -#include <Nepomuk/Vocabulary/NFO>
> +#include <Nepomuk2/Query/Query>
> +#include <Nepomuk2/Query/OptionalTerm>
> +#include <Nepomuk2/Query/ComparisonTerm>
> +#include <Nepomuk2/Query/AndTerm>
> +#include <Nepomuk2/Vocabulary/NIE>
> +#include <Nepomuk2/Vocabulary/NFO>
>
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
> namespace Query {
> /**
> * KIO specific query handling shared by the KIO slave and the kded search module
> @@ -43,31 +43,31 @@ namespace Nepomuk {
> bool parseQueryUrl( const KUrl& url, Query& query, QString& sparqlQuery )
> {
> // parse URL (this may fail in which case we fall back to pure SPARQL below)
> - query = Nepomuk::Query::Query::fromQueryUrl( url );
> + query = Nepomuk2::Query::Query::fromQueryUrl( url );
>
> // request properties to easily create UDSEntry instances
> QList<Query::RequestProperty> reqProperties;
> // local URL
> - reqProperties << Query::RequestProperty( \
> Nepomuk::Vocabulary::NIE::url(), !query.isFileQuery() ); + reqProperties \
> << Query::RequestProperty( Nepomuk2::Vocabulary::NIE::url(), !query.isFileQuery() \
> ); #ifdef Q_OS_UNIX
> if( query.isFileQuery() ) {
> // file size
> - ComparisonTerm contentSizeTerm( \
> Nepomuk::Vocabulary::NIE::contentSize(), Term() ); + ComparisonTerm \
> contentSizeTerm( Nepomuk2::Vocabulary::NIE::contentSize(), Term() ); \
> contentSizeTerm.setVariableName( QLatin1String("size") ); // mimetype
> - ComparisonTerm mimetypeTerm( Nepomuk::Vocabulary::NIE::mimeType(), \
> Term() ); + ComparisonTerm mimetypeTerm( \
> Nepomuk2::Vocabulary::NIE::mimeType(), Term() ); mimetypeTerm.setVariableName( \
> QLatin1String("mime") ); // mtime
> - ComparisonTerm mtimeTerm( \
> Nepomuk::Vocabulary::NIE::lastModified(), Term() ); + ComparisonTerm \
> mtimeTerm( Nepomuk2::Vocabulary::NIE::lastModified(), Term() ); \
> mtimeTerm.setVariableName( QLatin1String("mtime") ); // mode
> - ComparisonTerm modeTerm( \
> Nepomuk::Vocabulary::KExt::unixFileMode(), Term() ); + \
> ComparisonTerm modeTerm( Nepomuk2::Vocabulary::KExt::unixFileMode(), Term() ); \
> modeTerm.setVariableName( QLatin1String("mode") ); // user
> - ComparisonTerm userTerm( \
> Nepomuk::Vocabulary::KExt::unixFileOwner(), Term() ); + \
> ComparisonTerm userTerm( Nepomuk2::Vocabulary::KExt::unixFileOwner(), Term() ); \
> userTerm.setVariableName( QLatin1String("user") ); // group
> - ComparisonTerm groupTerm( \
> Nepomuk::Vocabulary::KExt::unixFileGroup(), Term() ); + \
> ComparisonTerm groupTerm( Nepomuk2::Vocabulary::KExt::unixFileGroup(), Term() ); \
> groupTerm.setVariableName( QLatin1String("group") );
> // instead of separate request properties we use one optional and term. That way
> @@ -90,7 +90,7 @@ namespace Nepomuk {
> }
> else {
> // the URL contains pure sparql.
> - sparqlQuery = Nepomuk::Query::Query::sparqlFromQueryUrl( url );
> + sparqlQuery = Nepomuk2::Query::Query::sparqlFromQueryUrl( url );
> kDebug() << "Extracted SPARL query" << sparqlQuery;
> }
>
> diff --git a/nepomuk/kioslaves/search/searchfolder.cpp \
> b/nepomuk/kioslaves/search/searchfolder.cpp index 8a51c42..8088c46 100644
> --- a/nepomuk/kioslaves/search/searchfolder.cpp
> +++ b/nepomuk/kioslaves/search/searchfolder.cpp
> @@ -27,16 +27,16 @@
> #include <Soprano/Vocabulary/NAO>
> #include <Soprano/Node> // for qHash( QUrl )
>
> -#include <Nepomuk/Variant>
> -#include <Nepomuk/Thing>
> -#include <Nepomuk/Types/Class>
> -#include <Nepomuk/Query/Query>
> -#include <Nepomuk/Query/QueryParser>
> -#include <Nepomuk/Query/ResourceTypeTerm>
> -#include <Nepomuk/Query/QueryServiceClient>
> -#include <Nepomuk/Vocabulary/NFO>
> -#include <Nepomuk/Vocabulary/NIE>
> -#include <Nepomuk/Vocabulary/PIMO>
> +#include <Nepomuk2/Variant>
> +#include <Nepomuk2/Thing>
> +#include <Nepomuk2/Types/Class>
> +#include <Nepomuk2/Query/Query>
> +#include <Nepomuk2/Query/QueryParser>
> +#include <Nepomuk2/Query/ResourceTypeTerm>
> +#include <Nepomuk2/Query/QueryServiceClient>
> +#include <Nepomuk2/Vocabulary/NFO>
> +#include <Nepomuk2/Vocabulary/NIE>
> +#include <Nepomuk2/Vocabulary/PIMO>
>
> #include <QtCore/QMutexLocker>
> #include <QTextDocument>
> @@ -51,7 +51,7 @@
> #include <KConfigGroup>
>
>
> -Nepomuk::SearchFolder::SearchFolder( const KUrl& url, KIO::SlaveBase* slave )
> +Nepomuk2::SearchFolder::SearchFolder( const KUrl& url, KIO::SlaveBase* slave )
> > QThread(),
> m_url( url ),
> m_initialListingFinished( false ),
> @@ -66,7 +66,7 @@ Nepomuk::SearchFolder::SearchFolder( const KUrl& url, \
> KIO::SlaveBase* slave ) }
>
>
> -Nepomuk::SearchFolder::~SearchFolder()
> +Nepomuk2::SearchFolder::~SearchFolder()
> {
> kDebug() << m_url << QThread::currentThread();
>
> @@ -76,18 +76,18 @@ Nepomuk::SearchFolder::~SearchFolder()
> }
>
>
> -void Nepomuk::SearchFolder::run()
> +void Nepomuk2::SearchFolder::run()
> {
> kDebug() << m_url << QThread::currentThread();
>
> - m_client = new Nepomuk::Query::QueryServiceClient();
> + m_client = new Nepomuk2::Query::QueryServiceClient();
>
> // results signals are connected directly to update the results cache \
> m_resultsQueue // and the entries cache m_entries, as well as emitting KDirNotify \
> signals // a queued connection is not possible since we have no event loop after \
> the // initial listing which means that queued signals would never get delivered
> - connect( m_client, SIGNAL( newEntries( const QList<Nepomuk::Query::Result>& ) \
> ),
> - this, SLOT( slotNewEntries( const QList<Nepomuk::Query::Result>& ) ),
> + connect( m_client, SIGNAL( newEntries( const QList<Nepomuk2::Query::Result>& ) \
> ), + this, SLOT( slotNewEntries( const QList<Nepomuk2::Query::Result>& \
> ) ), Qt::DirectConnection );
> connect( m_client, SIGNAL( resultCount(int) ),
> this, SLOT( slotResultCount(int) ),
> @@ -110,7 +110,7 @@ void Nepomuk::SearchFolder::run()
> }
>
>
> -void Nepomuk::SearchFolder::list()
> +void Nepomuk2::SearchFolder::list()
> {
> kDebug() << m_url << QThread::currentThread();
>
> @@ -129,7 +129,7 @@ void Nepomuk::SearchFolder::list()
>
>
> // always called in search thread
> -void Nepomuk::SearchFolder::slotNewEntries( const QList<Nepomuk::Query::Result>& \
> results ) +void Nepomuk2::SearchFolder::slotNewEntries( const \
> QList<Nepomuk2::Query::Result>& results ) {
> // kDebug() << m_url;
>
> @@ -143,7 +143,7 @@ void Nepomuk::SearchFolder::slotNewEntries( const \
> QList<Nepomuk::Query::Result>& }
>
>
> -void Nepomuk::SearchFolder::slotResultCount( int count )
> +void Nepomuk2::SearchFolder::slotResultCount( int count )
> {
> if ( !m_initialListingFinished ) {
> QMutexLocker lock( &m_slaveMutex );
> @@ -153,7 +153,7 @@ void Nepomuk::SearchFolder::slotResultCount( int count )
>
>
> // always called in search thread
> -void Nepomuk::SearchFolder::slotFinishedListing()
> +void Nepomuk2::SearchFolder::slotFinishedListing()
> {
> kDebug() << m_url;
> QMutexLocker lock( &m_resultMutex );
> @@ -163,7 +163,7 @@ void Nepomuk::SearchFolder::slotFinishedListing()
>
>
> // always called in main thread
> -void Nepomuk::SearchFolder::statResults()
> +void Nepomuk2::SearchFolder::statResults()
> {
> while ( 1 ) {
> m_resultMutex.lock();
> @@ -204,9 +204,9 @@ namespace {
> }
> }
>
> - Nepomuk::Resource res( url );
> + Nepomuk2::Resource res( url );
> if ( res.exists() ) {
> - uds = Nepomuk::statNepomukResource( res );
> + uds = Nepomuk2::statNepomukResource( res );
> return true;
> }
>
> @@ -217,13 +217,13 @@ namespace {
>
>
> // always called in main thread
> -// This method tries to avoid loading the Nepomuk::Resource as long as possible by \
> only using the +// This method tries to avoid loading the Nepomuk2::Resource as \
> long as possible by only using the // request property nie:url in the Result for \
> local files.
> -KIO::UDSEntry Nepomuk::SearchFolder::statResult( const Query::Result& result )
> +KIO::UDSEntry Nepomuk2::SearchFolder::statResult( const Query::Result& result )
> {
> Resource res( result.resource() );
> const KUrl uri( res.resourceUri() );
> - KUrl nieUrl( result[Nepomuk::Vocabulary::NIE::url()].uri() );
> + KUrl nieUrl( result[Nepomuk2::Vocabulary::NIE::url()].uri() );
>
> // the additional bindings that we only have on unix systems
> // Either all are bound or none of them.
> @@ -263,7 +263,7 @@ KIO::UDSEntry Nepomuk::SearchFolder::statResult( const \
> Query::Result& result )
> // check if we have a pimo thing relating to a file
> if ( nieUrl.isEmpty() )
> - nieUrl = Nepomuk::nepomukToFileUrl( uri );
> + nieUrl = Nepomuk2::nepomukToFileUrl( uri );
>
> // try to stat the file
> if ( statFile( uri, nieUrl, uds ) ) {
> @@ -280,10 +280,10 @@ KIO::UDSEntry Nepomuk::SearchFolder::statResult( const \
> Query::Result& result ) // make sure we do not use these ugly names for display
> if ( !uds.contains( KIO::UDSEntry::UDS_DISPLAY_NAME ) ) {
> if ( nieUrl.isEmpty() &&
> - res.hasType( Nepomuk::Vocabulary::PIMO::Thing() ) ) {
> + res.hasType( Nepomuk2::Vocabulary::PIMO::Thing() ) ) {
> if ( !res.pimoThing().groundingOccurrences().isEmpty() ) {
> res = res.pimoThing().groundingOccurrences().first();
> - nieUrl = \
> res.property(Nepomuk::Vocabulary::NIE::url()).toUrl(); + \
> nieUrl = res.property(Nepomuk2::Vocabulary::NIE::url()).toUrl(); }
> }
>
> diff --git a/nepomuk/kioslaves/search/searchfolder.h \
> b/nepomuk/kioslaves/search/searchfolder.h index 83dfe6b..c0839b5 100644
> --- a/nepomuk/kioslaves/search/searchfolder.h
> +++ b/nepomuk/kioslaves/search/searchfolder.h
> @@ -27,17 +27,17 @@
> #include <QtCore/QMutex>
> #include <QtCore/QWaitCondition>
>
> -#include <Nepomuk/Query/Term>
> -#include <Nepomuk/Query/Result>
> -#include <Nepomuk/Query/Query>
> +#include <Nepomuk2/Query/Term>
> +#include <Nepomuk2/Query/Result>
> +#include <Nepomuk2/Query/Query>
>
> #include <kio/udsentry.h>
> #include <kio/slavebase.h>
> -#include <Nepomuk/Resource>
> +#include <Nepomuk2/Resource>
> #include <KUrl>
>
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
> namespace Query {
> class QueryServiceClient;
> }
> @@ -80,7 +80,7 @@ namespace Nepomuk {
>
> private Q_SLOTS:
> /// connected to the QueryServiceClient in the search thread
> - void slotNewEntries( const QList<Nepomuk::Query::Result>& );
> + void slotNewEntries( const QList<Nepomuk2::Query::Result>& );
>
> /// connected to the QueryServiceClient in the search thread
> void slotResultCount( int );
> diff --git a/nepomuk/kioslaves/search/userqueries.h \
> b/nepomuk/kioslaves/search/userqueries.h index f1d48fb..5430f22 100644
> --- a/nepomuk/kioslaves/search/userqueries.h
> +++ b/nepomuk/kioslaves/search/userqueries.h
> @@ -30,20 +30,20 @@
> #include <QtCore/QStringList>
>
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
> /// convert a normal query URL which can be listed to a URL which is used as \
> location for user queries inline KUrl queryUrlToUserQueryUrl( const KUrl& url )
> {
> // the query URL is NOT the URL under which the query is listed!
> KUrl queryListUrl;
> queryListUrl.setProtocol( QLatin1String( "nepomuksearch" ) );
> - queryListUrl.setFileName( Nepomuk::resourceUriToUdsName( url ) );
> + queryListUrl.setFileName( Nepomuk2::resourceUriToUdsName( url ) );
> return queryListUrl;
> }
>
> inline KUrl queryUrlFromUserQueryUrl( const KUrl& url )
> {
> - return Nepomuk::udsNameToResourceUri( url.fileName() );
> + return Nepomuk2::udsNameToResourceUri( url.fileName() );
> }
>
> class UserQueryUrlList : public KUrl::List
> @@ -114,7 +114,7 @@ namespace Nepomuk {
> QStringList oldUserQueryUrls;
> QList<KUrl>::iterator it = findQueryUrl( url );
> while ( it != end() ) {
> - oldUserQueryUrls << Nepomuk::queryUrlToUserQueryUrl( *it ).url();
> + oldUserQueryUrls << Nepomuk2::queryUrlToUserQueryUrl( *it ).url();
> erase( it );
> it = findQueryUrl( url );
> }
> diff --git a/nepomuk/kioslaves/timeline/CMakeLists.txt \
> b/nepomuk/kioslaves/timeline/CMakeLists.txt index 6ba43d1..903f13f 100644
> --- a/nepomuk/kioslaves/timeline/CMakeLists.txt
> +++ b/nepomuk/kioslaves/timeline/CMakeLists.txt
> @@ -4,7 +4,7 @@ include_directories(
> ${QT_INCLUDES}
> ${KDE4_INCLUDES}
> ${KDE4_KIO_INCLUDES}
> - ${NEPOMUK_INCLUDE_DIR}
> + ${NEPOMUK_CORE_INCLUDE_DIR}
> ${CMAKE_CURRENT_BINARY_DIR}
> ${nepomuk_kio_slaves_SOURCE_DIR}/common
> )
> @@ -15,15 +15,14 @@ set(kio_timeline_PART_SRCS
> kio_timeline.cpp
> ../common/timelinetools.cpp)
>
> -qt4_add_dbus_interface(kio_timeline_PART_SRCS \
> ../../interfaces/org.kde.nepomuk.ServiceControl.xml nepomukservicecontrolinterface) \
> +qt4_add_dbus_interface(kio_timeline_PART_SRCS \
> ${NEPOMUK_CORE_DBUS_INTERFACES_DIR}/org.kde.nepomuk.ServiceControl.xml \
> nepomukservicecontrolinterface)
> kde4_add_plugin(kio_timeline ${kio_timeline_PART_SRCS})
>
> target_link_libraries(kio_timeline
> nepomukcommon
> ${KDE4_KIO_LIBS}
> - ${NEPOMUK_LIBRARIES}
> - ${NEPOMUK_QUERY_LIBRARIES}
> + ${NEPOMUK_CORE_LIBRARIES}
> ${SOPRANO_LIBRARIES}
> )
>
> diff --git a/nepomuk/kioslaves/timeline/kio_timeline.cpp \
> b/nepomuk/kioslaves/timeline/kio_timeline.cpp index 24eb424..7ddca1f 100644
> --- a/nepomuk/kioslaves/timeline/kio_timeline.cpp
> +++ b/nepomuk/kioslaves/timeline/kio_timeline.cpp
> @@ -22,10 +22,10 @@
> #include "nepomukservicecontrolinterface.h"
> #include "timelinetools.h"
>
> -#include <Nepomuk/ResourceManager>
> -#include <Nepomuk/Vocabulary/NFO>
> -#include <Nepomuk/Vocabulary/NIE>
> -#include <Nepomuk/Vocabulary/NUAO>
> +#include <Nepomuk2/ResourceManager>
> +#include <Nepomuk2/Vocabulary/NFO>
> +#include <Nepomuk2/Vocabulary/NIE>
> +#include <Nepomuk2/Vocabulary/NUAO>
>
> #include <KUrl>
> #include <kio/global.h>
> @@ -92,33 +92,33 @@ namespace {
> KIO::UDSEntry uds = createFolderUDSEntry( date.toString("yyyy-MM-dd"),
> KGlobal::locale()->formatDate( date, KLocale::FancyLongDate ),
> date );
> - uds.insert( KIO::UDSEntry::UDS_NEPOMUK_QUERY, Nepomuk::buildTimelineQuery( \
> date ).toString() ); + uds.insert( KIO::UDSEntry::UDS_NEPOMUK_QUERY, \
> Nepomuk2::buildTimelineQuery( date ).toString() ); return uds;
> }
>
> bool filesInDateRange( const QDate& from, const QDate& to = QDate() )
> {
> - return Nepomuk::ResourceManager::instance()->mainModel()->executeQuery(
> - Nepomuk::buildTimelineQuery( from, to \
> ).toSparqlQuery(Nepomuk::Query::Query::CreateAskQuery), + return \
> Nepomuk2::ResourceManager::instance()->mainModel()->executeQuery( + \
> Nepomuk2::buildTimelineQuery( from, to \
> ).toSparqlQuery(Nepomuk2::Query::Query::CreateAskQuery), \
> Soprano::Query::QueryLanguageSparql ).boolValue(); }
> }
>
>
> -Nepomuk::TimelineProtocol::TimelineProtocol( const QByteArray& poolSocket, const \
> QByteArray& appSocket ) +Nepomuk2::TimelineProtocol::TimelineProtocol( const \
> QByteArray& poolSocket, const QByteArray& appSocket ) : KIO::ForwardingSlaveBase( \
> "timeline", poolSocket, appSocket ) {
> kDebug();
> }
>
>
> -Nepomuk::TimelineProtocol::~TimelineProtocol()
> +Nepomuk2::TimelineProtocol::~TimelineProtocol()
> {
> kDebug();
> }
>
>
> -void Nepomuk::TimelineProtocol::listDir( const KUrl& url )
> +void Nepomuk2::TimelineProtocol::listDir( const KUrl& url )
> {
> // without a running file indexer timeline is not at all reliable
> if ( !QDBusConnection::sessionBus().interface()->isServiceRegistered( \
> "org.kde.nepomuk.services.nepomukfileindexer" ) || @@ -162,14 +162,14 @@ void \
> Nepomuk::TimelineProtocol::listDir( const KUrl& url ) }
>
>
> -void Nepomuk::TimelineProtocol::mkdir( const KUrl &url, int permissions )
> +void Nepomuk2::TimelineProtocol::mkdir( const KUrl &url, int permissions )
> {
> Q_UNUSED(permissions);
> error( ERR_UNSUPPORTED_ACTION, url.prettyUrl() );
> }
>
>
> -void Nepomuk::TimelineProtocol::get( const KUrl& url )
> +void Nepomuk2::TimelineProtocol::get( const KUrl& url )
> {
> kDebug() << url;
>
> @@ -182,7 +182,7 @@ void Nepomuk::TimelineProtocol::get( const KUrl& url )
> }
>
>
> -void Nepomuk::TimelineProtocol::put( const KUrl& url, int permissions, \
> KIO::JobFlags flags ) +void Nepomuk2::TimelineProtocol::put( const KUrl& url, int \
> permissions, KIO::JobFlags flags ) {
> kDebug() << url;
>
> @@ -195,7 +195,7 @@ void Nepomuk::TimelineProtocol::put( const KUrl& url, int \
> permissions, KIO::JobF }
>
>
> -void Nepomuk::TimelineProtocol::copy( const KUrl& src, const KUrl& dest, int \
> permissions, KIO::JobFlags flags ) +void Nepomuk2::TimelineProtocol::copy( const \
> KUrl& src, const KUrl& dest, int permissions, KIO::JobFlags flags ) {
> Q_UNUSED(src);
> Q_UNUSED(dest);
> @@ -206,7 +206,7 @@ void Nepomuk::TimelineProtocol::copy( const KUrl& src, const \
> KUrl& dest, int per }
>
>
> -void Nepomuk::TimelineProtocol::rename( const KUrl& src, const KUrl& dest, \
> KIO::JobFlags flags ) +void Nepomuk2::TimelineProtocol::rename( const KUrl& src, \
> const KUrl& dest, KIO::JobFlags flags ) {
> Q_UNUSED(src);
> Q_UNUSED(dest);
> @@ -216,21 +216,21 @@ void Nepomuk::TimelineProtocol::rename( const KUrl& src, \
> const KUrl& dest, KIO:: }
>
>
> -void Nepomuk::TimelineProtocol::del( const KUrl& url, bool isfile )
> +void Nepomuk2::TimelineProtocol::del( const KUrl& url, bool isfile )
> {
> kDebug() << url;
> ForwardingSlaveBase::del( url, isfile );
> }
>
>
> -void Nepomuk::TimelineProtocol::mimetype( const KUrl& url )
> +void Nepomuk2::TimelineProtocol::mimetype( const KUrl& url )
> {
> kDebug() << url;
> ForwardingSlaveBase::mimetype( url );
> }
>
>
> -void Nepomuk::TimelineProtocol::stat( const KUrl& url )
> +void Nepomuk2::TimelineProtocol::stat( const KUrl& url )
> {
> switch( parseTimelineUrl( url, &m_date, &m_filename ) ) {
> case RootFolder: {
> @@ -272,7 +272,7 @@ void Nepomuk::TimelineProtocol::stat( const KUrl& url )
>
>
> // only used for the queries
> -bool Nepomuk::TimelineProtocol::rewriteUrl( const KUrl& url, KUrl& newURL )
> +bool Nepomuk2::TimelineProtocol::rewriteUrl( const KUrl& url, KUrl& newURL )
> {
> if ( parseTimelineUrl( url, &m_date, &m_filename ) == DayFolder ) {
> newURL = buildTimelineQuery( m_date ).toSearchUrl();
> @@ -286,7 +286,7 @@ bool Nepomuk::TimelineProtocol::rewriteUrl( const KUrl& url, \
> KUrl& newURL ) }
>
>
> -void Nepomuk::TimelineProtocol::prepareUDSEntry( KIO::UDSEntry& entry,
> +void Nepomuk2::TimelineProtocol::prepareUDSEntry( KIO::UDSEntry& entry,
> bool listing ) const
> {
> kDebug() << entry.stringValue( KIO::UDSEntry::UDS_NEPOMUK_URI) << \
> entry.stringValue( KIO::UDSEntry::UDS_MIME_TYPE) << listing; @@ -294,7 +294,7 @@ \
> void Nepomuk::TimelineProtocol::prepareUDSEntry( KIO::UDSEntry& entry, }
>
>
> -void Nepomuk::TimelineProtocol::listDays( int month, int year )
> +void Nepomuk2::TimelineProtocol::listDays( int month, int year )
> {
> kDebug() << month << year;
> const int days = KGlobal::locale()->calendar()->daysInMonth( QDate( year, month, 1 \
> ) ); @@ -308,7 +308,7 @@ void Nepomuk::TimelineProtocol::listDays( int month, int \
> year ) }
>
>
> -void Nepomuk::TimelineProtocol::listThisYearsMonths()
> +void Nepomuk2::TimelineProtocol::listThisYearsMonths()
> {
> kDebug();
> int currentMonth = QDate::currentDate().month();
> @@ -322,7 +322,7 @@ void Nepomuk::TimelineProtocol::listThisYearsMonths()
> }
>
>
> -void Nepomuk::TimelineProtocol::listPreviousYears()
> +void Nepomuk2::TimelineProtocol::listPreviousYears()
> {
> kDebug();
> // TODO: list years before this year that have files, but first get the smallest \
> date @@ -345,7 +345,7 @@ extern "C"
> exit(-1);
> }
>
> - Nepomuk::TimelineProtocol slave(argv[2], argv[3]);
> + Nepomuk2::TimelineProtocol slave(argv[2], argv[3]);
> slave.dispatchLoop();
>
> kDebug(7102) << "Timeline slave Done";
> diff --git a/nepomuk/kioslaves/timeline/kio_timeline.h \
> b/nepomuk/kioslaves/timeline/kio_timeline.h index c31d6ee..d20005c 100644
> --- a/nepomuk/kioslaves/timeline/kio_timeline.h
> +++ b/nepomuk/kioslaves/timeline/kio_timeline.h
> @@ -25,7 +25,7 @@
>
> #include <QtCore/QDate>
>
> -namespace Nepomuk {
> +namespace Nepomuk2 {
> class TimelineProtocol : public KIO::ForwardingSlaveBase
> {
> Q_OBJECT
> diff --git a/nepomuk/ontologies/CMakeLists.txt b/nepomuk/ontologies/CMakeLists.txt
> deleted file mode 100644
> index 7a7a590..0000000
> --- a/nepomuk/ontologies/CMakeLists.txt
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -project(nepomuk_ontologies)
> -
> -configure_file(kuvo.ontology.in ${CMAKE_CURRENT_BINARY_DIR}/kuvo.ontology)
> -configure_file(nrio.ontology.in ${CMAKE_CURRENT_BINARY_DIR}/nrio.ontology)
> -configure_file(kext.ontology.in ${CMAKE_CURRENT_BINARY_DIR}/kext.ontology)
> -
> -install(FILES
> - kuvo.trig
> - ${CMAKE_CURRENT_BINARY_DIR}/kuvo.ontology
> - nrio.trig
> - ${CMAKE_CURRENT_BINARY_DIR}/nrio.ontology
> - kext.trig
> - ${CMAKE_CURRENT_BINARY_DIR}/kext.ontology
> -DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ontology/kde)
> diff --git a/nepomuk/ontologies/README b/nepomuk/ontologies/README
> deleted file mode 100644
> index 567dae8..0000000
> --- a/nepomuk/ontologies/README
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -This folder contains ontologies that build upon the ones
> -from shared-desktop-ontologies and contain KDE-specific
> -extensions that can not be or are hard to generalize.
> -
> -Sebastian Trueg <trueg@kde.org> 2010-08-18
> diff --git a/nepomuk/ontologies/kext.ontology.in \
> b/nepomuk/ontologies/kext.ontology.in deleted file mode 100644
> index a9ada44..0000000
> --- a/nepomuk/ontologies/kext.ontology.in
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -[Ontology]
> -Version=1.0
> -Name=KDE Extensions Ontology
> -Comment=The KDE Extensions Ontology contains extensions to the \
> shared-desktop-ontologies that are not generic enough.
> -Namespace=http://nepomuk.kde.org/ontologies/2010/11/29/kext#
> -Path=${CMAKE_INSTALL_PREFIX}/share/ontology/kde/kext.trig
> -MimeType=application/x-trig
> -Type=Data
> diff --git a/nepomuk/ontologies/kext.trig b/nepomuk/ontologies/kext.trig
> deleted file mode 100644
> index b7c1773..0000000
> --- a/nepomuk/ontologies/kext.trig
> +++ /dev/null
> @@ -1,91 +0,0 @@
> -#
> -# Copyright (c) 2010-2011 Sebastian Trueg <trueg@kde.org>
> -# All rights reserved, licensed under either CC-BY or BSD.
> -#
> -# You are free:
> -# * to Share - to copy, distribute and transmit the work
> -# * to Remix - to adapt the work
> -# Under the following conditions:
> -# * Attribution - You must attribute the work in the manner specified by the \
> author
> -# or licensor (but not in any way that suggests that they endorse you or your \
> use
> -# of the work).
> -#
> -# Redistribution and use in source and binary forms, with or without modification,
> -# are permitted provided that the following conditions are met:
> -# * Redistributions of source code must retain the above copyright notice, this
> -# list of conditions and the following disclaimer.
> -# * Redistributions in binary form must reproduce the above copyright notice, \
> this
> -# list of conditions and the following disclaimer in the documentation and/or
> -# other materials provided with the distribution.
> -# * Neither the names of the authors nor the names of contributors may
> -# be used to endorse or promote products derived from this ontology without
> -# specific prior written permission.
> -#
> -# THIS ONTOLOGY IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
> -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
> -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
> -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
> -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
> -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
> -# THIS ONTOLOGY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> -#
> -
> -@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
> -@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
> -@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
> -@prefix nie: <http://www.semanticdesktop.org/ontologies/2007/01/19/nie#> .
> -@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
> -@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
> -@prefix kext: <http://nepomuk.kde.org/ontologies/2010/11/29/kext#> .
> -@prefix nfo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#> .
> -
> -kext: {
> - kext:unixFileMode
> - a rdf:Property ;
> - rdfs:label "Unix file mode" ;
> - rdfs:comment "The file mode value as seen on unix file systems." ;
> - rdfs:domain nfo:FileDataObject ;
> - rdfs:range xsd:integer ;
> - nrl:maxCardinality 1 ;
> - nao:userVisible false .
> -
> - kext:unixFileOwner
> - a rdf:Property ;
> - rdfs:label "Unix file owner" ;
> - rdfs:comment "The owner of the file as seen on unix file systems. This \
> is intended as the low-level counterpart to nfo:owner." ;
> - rdfs:domain nfo:FileDataObject ;
> - rdfs:range xsd:string ;
> - nrl:maxCardinality 1 ;
> - nao:userVisible false .
> -
> - kext:unixFileGroup
> - a rdf:Property ;
> - rdfs:label "Unix file group" ;
> - rdfs:comment "The group of the file as seen on unix file systems." ;
> - rdfs:domain nfo:FileDataObject ;
> - rdfs:range xsd:string ;
> - nrl:maxCardinality 1 ;
> - nao:userVisible false .
> -}
> -
> -<http://nepomuk.kde.org/ontologies/2010/11/29/kext/metadata> {
> - <http://nepomuk.kde.org/ontologies/2010/11/29/kext/metadata>
> - a nrl:GraphMetadata ;
> - nrl:coreGraphMetadataFor kext: .
> -
> -
> - kext:
> - a nrl:Ontology , nrl:DocumentGraph ;
> - nao:prefLabel "KDE Extensions Ontology" ;
> - nao:hasDefaultNamespace \
> "http://nepomuk.kde.org/ontologies/2010/11/29/kext#" ;
> - nao:hasDefaultNamespaceAbbreviation "kext" ;
> - nao:lastModified "2012-03-09T13:04:43Z" ;
> - nao:serializationLanguage "TriG" ;
> - nao:status "Unstable" ;
> - nrl:updatable "0" ;
> - nao:version "2" .
> -}
> -
> diff --git a/nepomuk/ontologies/kuvo.ontology.in \
> b/nepomuk/ontologies/kuvo.ontology.in deleted file mode 100644
> index f50d5e8..0000000
> --- a/nepomuk/ontologies/kuvo.ontology.in
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -[Ontology]
> -Version=1.0
> -Name=KDE User Visibility Ontology
> -Comment=The KDE User Visibility Ontology does not define any new classes or \
> properties. It simply defines nao:userVisible on existing classes \
> and properties.
> -Namespace=http://nepomuk.kde.org/ontologies/2010/08/18/kuvo#
> -Path=${CMAKE_INSTALL_PREFIX}/share/ontology/kde/kuvo.trig
> -MimeType=application/x-trig
> -Type=Data
> diff --git a/nepomuk/ontologies/kuvo.trig b/nepomuk/ontologies/kuvo.trig
> deleted file mode 100644
> index 11ac9f4..0000000
> --- a/nepomuk/ontologies/kuvo.trig
> +++ /dev/null
> @@ -1,93 +0,0 @@
> -#
> -# Copyright (c) 2010 Sebastian Trueg <trueg@kde.org>
> -# All rights reserved, licensed under either CC-BY or BSD.
> -#
> -# You are free:
> -# * to Share - to copy, distribute and transmit the work
> -# * to Remix - to adapt the work
> -# Under the following conditions:
> -# * Attribution - You must attribute the work in the manner specified by the \
> author
> -# or licensor (but not in any way that suggests that they endorse you or your \
> use
> -# of the work).
> -#
> -# Redistribution and use in source and binary forms, with or without modification, \
>
> -# are permitted provided that the following conditions are met:
> -# * Redistributions of source code must retain the above copyright notice, this
> -# list of conditions and the following disclaimer.
> -# * Redistributions in binary form must reproduce the above copyright notice, \
> this
> -# list of conditions and the following disclaimer in the documentation and/or
> -# other materials provided with the distribution.
> -# * Neither the names of the authors nor the names of contributors may
> -# be used to endorse or promote products derived from this ontology without
> -# specific prior written permission.
> -#
> -# THIS ONTOLOGY IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
> -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
> -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
> -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
> -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
> -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
> -# THIS ONTOLOGY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> -#
> -
> -@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
> -@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
> -@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
> -@prefix nie: <http://www.semanticdesktop.org/ontologies/2007/01/19/nie#> .
> -@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
> -@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
> -@prefix kuvo: <http://nepomuk.kde.org/ontologies/2010/08/18/kuvo#> .
> -@prefix nuao: <http://www.semanticdesktop.org/ontologies/2010/01/25/nuao#> .
> -@prefix nfo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#> .
> -
> -kuvo: {
> - # Setting a baseline calms down the algorithm that creates all the entries.
> - rdfs:Resource
> - nao:userVisible true .
> -
> - nao:userVisible
> - nao:userVisible false .
> -
> - nao:hasSubResource
> - nao:userVisible false .
> -
> - nuao:Event
> - nao:userVisible false .
> -
> - nao:score
> - nao:userVisible false .
> -
> - nie:hasPart
> - nao:userVisible false .
> -
> - nrl:Graph
> - nao:userVisible false .
> -
> - rdf:Property
> - nao:userVisible false .
> -
> - rdfs:Class
> - nao:userVisible false .
> -}
> -
> -<http://nepomuk.kde.org/ontologies/2010/08/18/kuvo/metadata> {
> - <http://nepomuk.kde.org/ontologies/2010/08/18/kuvo/metadata>
> - a nrl:GraphMetadata ;
> - nrl:coreGraphMetadataFor kuvo: .
> -
> -
> - kuvo:
> - a nrl:Ontology , nrl:DocumentGraph ;
> - nao:prefLabel "KDE User Visibility Ontology" ;
> - nao:hasDefaultNamespace \
> "http://nepomuk.kde.org/ontologies/2010/08/18/kuvo#" ;
> - nao:hasDefaultNamespaceAbbreviation "kuvo" ;
> - nao:lastModified "2010-11-29T12:31:43Z" ;
> - nao:serializationLanguage "TriG" ;
> - nao:status "Unstable" ;
> - nrl:updatable "0" ;
> - nao:version "2" .
> -}
> -
> diff --git a/nepomuk/ontologies/nrio.ontology.in \
> b/nepomuk/ontologies/nrio.ontology.in deleted file mode 100644
> index 814383f..0000000
> --- a/nepomuk/ontologies/nrio.ontology.in
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -[Ontology]
> -Version=1.0
> -Name=Nepomuk Resource Identification Ontology
> -Comment=Required for backup and sync.
> -Namespace=http://nepomuk.kde.org/ontologies/2010/11/11/nrio#
> -Path=${CMAKE_INSTALL_PREFIX}/share/ontology/kde/nrio.trig
> -MimeType=application/x-trig
> -Type=Data
> diff --git a/nepomuk/ontologies/nrio.trig b/nepomuk/ontologies/nrio.trig
> deleted file mode 100644
> index 15ad04f..0000000
> --- a/nepomuk/ontologies/nrio.trig
> +++ /dev/null
> @@ -1,327 +0,0 @@
> -#
> -# Copyright (c) 2010 Vishesh Handa <handa.vish@gmail.com>
> -# All rights reserved, licensed under either CC-BY or BSD.
> -#
> -# You are free:
> -# * to Share - to copy, distribute and transmit the work
> -# * to Remix - to adapt the work
> -# Under the following conditions:
> -# * Attribution - You must attribute the work in the manner specified by the \
> author
> -# or licensor (but not in any way that suggests that they endorse you or your \
> use
> -# of the work).
> -#
> -# Redistribution and use in source and binary forms, with or without modification,
> -# are permitted provided that the following conditions are met:
> -# * Redistributions of source code must retain the above copyright notice, this
> -# list of conditions and the following disclaimer.
> -# * Redistributions in binary form must reproduce the above copyright notice, \
> this
> -# list of conditions and the following disclaimer in the documentation and/or
> -# other materials provided with the distribution.
> -# * Neither the names of the authors nor the names of contributors may
> -# be used to endorse or promote products derived from this ontology without
> -# specific prior written permission.
> -#
> -# THIS ONTOLOGY IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
> -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
> -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
> -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
> -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
> -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
> -# THIS ONTOLOGY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> -#
> -
> -@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
> -@prefix nfo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#> .
> -@prefix nie: <http://www.semanticdesktop.org/ontologies/2007/01/19/nie#> .
> -@prefix ncal: <http://www.semanticdesktop.org/ontologies/2007/04/02/ncal#> .
> -@prefix nco: <http://www.semanticdesktop.org/ontologies/2007/03/22/nco#> .
> -@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
> -@prefix pimo: <http://www.semanticdesktop.org/ontologies/2007/11/01/pimo#> .
> -@prefix nmo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#> .
> -@prefix nmm: <http://www.semanticdesktop.org/ontologies/2009/02/19/nmm#> .
> -@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
> -@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
> -@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
> -
> -@prefix nrio: <http://nepomuk.kde.org/ontologies/2010/11/11/nrio#> .
> -
> -nrio: {
> - nao:created
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nao:creator
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nao:description
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nao:identifier
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nao:iconName
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nao:lastModified
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nao:personalIdentifier
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nao:pluralPrefLabel
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nao:prefLabel
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nao:prefSymbol
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nao:rating
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nao:score
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> -
> - nco:birthdate
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nco:contactUID
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nco:fullname
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nco:gender
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> -
> - nie:byteSize
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nie:comment
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nie:contentCreated
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nie:contentLastModified
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nie:contentSize
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nie:created
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nie:description
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nie:identifier
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nie:informationElementDate
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nie:lastModified
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nie:lastRefreshed
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nie:mimeType
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nie:subject
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nie:title
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nie:url
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> -
> - nfo:aspectRatio
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:averageBitrate
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:bitDepth
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:bitsPerSample
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:channels
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:characterCount
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:colorDepth
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:commentCharacterCount
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:compressionType
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:count
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:deletionDate
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:duration
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:encoding
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:encryptionStatus
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:fileCreated
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:fileLastAccessed
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:fileLastModified
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:fileName
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> -
> - nfo:fileSize
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:fileUrl
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> -
> - nfo:filesystemType
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> -
> - nfo:frameCount
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:frameRate
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:freeSpace
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> -
> - nfo:frontChannels
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> -
> - nfo:hashAlgorithm
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:hashValue
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:height
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:horizontalResolution
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:interlaceMode
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:isPasswordProtected
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:lfeChannels
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:lineCount
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:occupiedSpace
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> -
> - nfo:pageCount
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> -
> - nfo:permissions
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:programmingLanguage
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:rate
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:rearChannels
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:sampleCount
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:sampleRate
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:sideChannels
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:streamPosition
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> -
> - nfo:totalSpace
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:uncompressedSize
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:uuid
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:verticalResolution
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:width
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - nfo:wordCount
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> -
> - rdfs:comment
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> - rdfs:label
> - nrl:maxCardinality "1"^^xsd:integer .
> -
> -}
> -
> -<http://nepomuk.kde.org/ontologies/2010/11/11/nrio/metadata> {
> -
> - nrio: a nrl:Ontology ;
> - nao:hasDefaultNamespace "http://nepomuk.kde.org/ontologies/2010/11/11/nrio#" ;
> - nao:hasDefaultNamespaceAbbreviation "nrio" ;
> -
> - nao:serializationLanguage "TriG" ;
> - nao:lastModified "2012-01-06T16:08:58Z" ;
> - nao:status "Unstable" ;
> - nao:updatable "0 " ;
> - nao:version "Revision-1" .
> -
> - <http://nepomuk.kde.org/ontologies/2010/11/11/nrio/metadata>
> - a nrl:GraphMetadata ;
> - nrl:coreGraphMetadataFor nrio: .
> -}
>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic