[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: Vishesh Handa <handa.vish () gmail ! com>
Date: 2012-05-29 19:50:11
Message-ID: CAOPTMKCHfC7Rg5dqjsFN5tX8SuMBhgAL0rGYYVXinL7+bEf-Ug () mail ! gmail ! com
[Download RAW message or body]
On Wed, May 30, 2012 at 1:03 AM, Sebastian Trüg <trueg@kde.org
wrote:
> why do you need to port anything? You just need to remove it all, right?
>
Well. The packagers and release team were not comfortable with 3 new
repositories.
So it was decided to just release nepomuk-core, and nepomuk-kde-kio,
nepomuk-kde-kcm remain in kde-runtime/nepomuk. Hence the port.
> >
> > -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: .
> > -}
> >
>
[Attachment #3 (text/html)]
<br><br><div class="gmail_quote">On Wed, May 30, 2012 at 1:03 AM, Sebastian Trüg \
<span dir="ltr"><<a href="mailto:trueg@kde.org" \
target="_blank">trueg@kde.org</a><br></span> wrote:<br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"> why do you need to port anything? You just need to remove it \
all, right?<br></blockquote><div><br>Well. The packagers and release team were not \
comfortable with 3 new repositories. <br><br>So it was decided to just release \
nepomuk-core, and nepomuk-kde-kio, nepomuk-kde-kcm remain in kde-runtime/nepomuk. \
Hence the port.<br> <br></div><div> </div><blockquote class="gmail_quote" \
style="margin:0pt 0pt 0pt 0.8ex;border-left:1px solid \
rgb(204,204,204);padding-left:1ex"> ><br>
> -namespace Nepomuk {<br>
> +namespace Nepomuk2 {<br>
> /**<br>
> * \return A list of default exclude filters to be used<br>
> * in the filewatch service to ignore temporary files<br>
> diff --git a/nepomuk/kcm/indexfolderselectiondialog.cpp \
b/nepomuk/kcm/indexfolderselectiondialog.cpp<br> > index e227649..59cfa14 \
100644<br> > --- a/nepomuk/kcm/indexfolderselectiondialog.cpp<br>
> +++ b/nepomuk/kcm/indexfolderselectiondialog.cpp<br>
> @@ -56,7 +56,7 @@ namespace {<br>
> }<br>
><br>
><br>
> -Nepomuk::IndexFolderSelectionDialog::IndexFolderSelectionDialog( QWidget* \
parent )<br> > +Nepomuk2::IndexFolderSelectionDialog::IndexFolderSelectionDialog( \
QWidget* parent )<br> > : KDialog( parent )<br>
> {<br>
> setupUi( mainWidget() );<br>
> @@ -78,12 +78,12 @@ \
Nepomuk::IndexFolderSelectionDialog::IndexFolderSelectionDialog( QWidget* parent<br> \
> }<br> ><br>
><br>
> -Nepomuk::IndexFolderSelectionDialog::~IndexFolderSelectionDialog()<br>
> +Nepomuk2::IndexFolderSelectionDialog::~IndexFolderSelectionDialog()<br>
> {<br>
> }<br>
><br>
><br>
> -void Nepomuk::IndexFolderSelectionDialog::setFolders( const QStringList& \
includeDirs, const QStringList& exclude )<br> > +void \
Nepomuk2::IndexFolderSelectionDialog::setFolders( const QStringList& includeDirs, \
const QStringList& exclude )<br> > {<br>
> m_folderModel->setFolders( includeDirs, exclude );<br>
><br>
> @@ -105,19 +105,19 @@ void Nepomuk::IndexFolderSelectionDialog::setFolders( \
const QStringList& include<br> > }<br>
><br>
><br>
> -void Nepomuk::IndexFolderSelectionDialog::setExcludeFilters( const \
QStringList& filters )<br> > +void \
Nepomuk2::IndexFolderSelectionDialog::setExcludeFilters( const QStringList& \
filters )<br> > {<br>
> m_editExcludeFilters->setItems( filters );<br>
> }<br>
><br>
><br>
> -void Nepomuk::IndexFolderSelectionDialog::setIndexHiddenFolders( bool enable \
)<br> > +void Nepomuk2::IndexFolderSelectionDialog::setIndexHiddenFolders( bool \
enable )<br> > {<br>
> m_checkShowHiddenFolders->setChecked( enable );<br>
> }<br>
><br>
><br>
> -QStringList Nepomuk::IndexFolderSelectionDialog::includeFolders() const<br>
> +QStringList Nepomuk2::IndexFolderSelectionDialog::includeFolders() const<br>
> {<br>
> if ( !indexHiddenFolders() ) {<br>
> return removeHiddenFolders( m_folderModel->includeFolders() );<br>
> @@ -128,7 +128,7 @@ QStringList \
Nepomuk::IndexFolderSelectionDialog::includeFolders() const<br> > }<br>
><br>
><br>
> -QStringList Nepomuk::IndexFolderSelectionDialog::excludeFolders() const<br>
> +QStringList Nepomuk2::IndexFolderSelectionDialog::excludeFolders() const<br>
> {<br>
> if ( !indexHiddenFolders() ) {<br>
> return removeHiddenFolders( m_folderModel->excludeFolders() );<br>
> @@ -139,13 +139,13 @@ QStringList \
Nepomuk::IndexFolderSelectionDialog::excludeFolders() const<br> > }<br>
><br>
><br>
> -QStringList Nepomuk::IndexFolderSelectionDialog::excludeFilters() const<br>
> +QStringList Nepomuk2::IndexFolderSelectionDialog::excludeFilters() const<br>
> {<br>
> return m_editExcludeFilters->items();<br>
> }<br>
><br>
><br>
> -bool Nepomuk::IndexFolderSelectionDialog::indexHiddenFolders() const<br>
> +bool Nepomuk2::IndexFolderSelectionDialog::indexHiddenFolders() const<br>
> {<br>
> return m_checkShowHiddenFolders->isChecked();<br>
> }<br>
> diff --git a/nepomuk/kcm/indexfolderselectiondialog.h \
b/nepomuk/kcm/indexfolderselectiondialog.h<br> > index f87d65a..c8431d9 100644<br>
> --- a/nepomuk/kcm/indexfolderselectiondialog.h<br>
> +++ b/nepomuk/kcm/indexfolderselectiondialog.h<br>
> @@ -24,7 +24,7 @@<br>
><br>
> class FolderSelectionModel;<br>
><br>
> -namespace Nepomuk {<br>
> +namespace Nepomuk2 {<br>
> class IndexFolderSelectionDialog : public KDialog, public \
Ui_IndexFolderSelectionWidget<br> > {<br>
> Q_OBJECT<br>
> diff --git a/nepomuk/kcm/nepomukserverkcm.cpp \
b/nepomuk/kcm/nepomukserverkcm.cpp<br> > index 01f92fe..f29b331 100644<br>
> --- a/nepomuk/kcm/nepomukserverkcm.cpp<br>
> +++ b/nepomuk/kcm/nepomukserverkcm.cpp<br>
> @@ -36,8 +36,8 @@<br>
> #include <KCalendarSystem><br>
> #include <KDirWatch><br>
><br>
> -#include <Nepomuk/Query/QueryParser><br>
> -#include <Nepomuk/Query/FileQuery><br>
> +#include <Nepomuk2/Query/QueryParser><br>
> +#include <Nepomuk2/Query/FileQuery><br>
><br>
> #include <QRadioButton><br>
> #include <QInputDialog><br>
> @@ -49,7 +49,7 @@<br>
> #include <Soprano/Backend><br>
><br>
><br>
> -K_PLUGIN_FACTORY( NepomukConfigModuleFactory, \
registerPlugin<Nepomuk::ServerConfigModule>(); )<br> > +K_PLUGIN_FACTORY( \
NepomukConfigModuleFactory, registerPlugin<Nepomuk2::ServerConfigModule>(); \
)<br> > K_EXPORT_PLUGIN( NepomukConfigModuleFactory("kcm_nepomuk", \
"kcm_nepomuk") )<br> ><br>
><br>
> @@ -130,7 +130,7 @@ namespace {<br>
> }<br>
><br>
><br>
> -Nepomuk::ServerConfigModule::ServerConfigModule( QWidget* parent, const \
QVariantList& args )<br> > +Nepomuk2::ServerConfigModule::ServerConfigModule( \
QWidget* parent, const QVariantList& args )<br> > : KCModule( \
NepomukConfigModuleFactory::componentData(), parent, args ),<br> > \
m_serverInterface( 0 ),<br> > m_fileIndexerInterface( 0 ),<br>
> @@ -234,14 +234,14 @@ Nepomuk::ServerConfigModule::ServerConfigModule( QWidget* \
parent, const QVariant<br> > }<br>
><br>
><br>
> -Nepomuk::ServerConfigModule::~ServerConfigModule()<br>
> +Nepomuk2::ServerConfigModule::~ServerConfigModule()<br>
> {<br>
> delete m_fileIndexerInterface;<br>
> delete m_serverInterface;<br>
> }<br>
><br>
><br>
> -void Nepomuk::ServerConfigModule::load()<br>
> +void Nepomuk2::ServerConfigModule::load()<br>
> {<br>
> if ( !m_nepomukAvailable )<br>
> return;<br>
> @@ -261,7 +261,7 @@ void Nepomuk::ServerConfigModule::load()<br>
> m_indexFolderSelectionDialog->setIndexHiddenFolders( \
fileIndexerConfig.group( "General" ).readEntry( "index hidden \
folders", false ) );<br> > m_indexFolderSelectionDialog->setFolders( \
fileIndexerConfig.group( "General" ).readPathEntry( "folders", \
defaultFolders() ),<br> > \
fileIndexerConfig.group( "General" ).readPathEntry( "exclude \
folders", QStringList() ) );<br> > - \
m_indexFolderSelectionDialog->setExcludeFilters( fileIndexerConfig.group( \
"General" ).readEntry( "exclude filters", \
Nepomuk::defaultExcludeFilterList() ) );<br> > + \
m_indexFolderSelectionDialog->setExcludeFilters( fileIndexerConfig.group( \
"General" ).readEntry( "exclude filters", \
Nepomuk2::defaultExcludeFilterList() ) );<br> ><br>
> const bool indexNewlyMounted = fileIndexerConfig.group( \
"RemovableMedia" ).readEntry( "index newly mounted", false );<br> \
> const bool askIndividually = fileIndexerConfig.group( \
"RemovableMedia" ).readEntry( "ask user", false );<br> > @@ \
-289,7 +289,7 @@ void Nepomuk::ServerConfigModule::load()<br> > \
buttonForQuery( Query::Query::fromString(<br> > \
kio_nepomuksearchGeneral.readEntry(<br> > "Root \
query",<br> > - \
Nepomuk::lastModifiedFilesQuery().toString() ) ) )->setChecked( true );<br> > + \
Nepomuk2::lastModifiedFilesQuery().toString() ) ) )->setChecked( true );<br> \
><br> ><br>
><br>
> @@ -316,7 +316,7 @@ void Nepomuk::ServerConfigModule::load()<br>
> }<br>
><br>
><br>
> -void Nepomuk::ServerConfigModule::save()<br>
> +void Nepomuk2::ServerConfigModule::save()<br>
> {<br>
> if ( !m_nepomukAvailable )<br>
> return;<br>
> @@ -390,7 +390,7 @@ void Nepomuk::ServerConfigModule::save()<br>
> }<br>
><br>
><br>
> -void Nepomuk::ServerConfigModule::defaults()<br>
> +void Nepomuk2::ServerConfigModule::defaults()<br>
> {<br>
> if ( !m_nepomukAvailable )<br>
> return;<br>
> @@ -399,7 +399,7 @@ void Nepomuk::ServerConfigModule::defaults()<br>
> m_checkEnableNepomuk->setChecked( true );<br>
> m_checkEnableEmailIndexer->setChecked( true );<br>
> m_indexFolderSelectionDialog->setIndexHiddenFolders( false );<br>
> - m_indexFolderSelectionDialog->setExcludeFilters( \
Nepomuk::defaultExcludeFilterList() );<br> > + \
m_indexFolderSelectionDialog->setExcludeFilters( \
Nepomuk2::defaultExcludeFilterList() );<br> > \
m_indexFolderSelectionDialog->setFolders( defaultFolders(), QStringList() );<br> \
> m_spinMaxResults->setValue( 10 );<br> > \
m_checkRootQueryLastModified->setChecked( true );<br> > @@ -408,7 +408,7 @@ \
void Nepomuk::ServerConfigModule::defaults()<br> > }<br>
><br>
><br>
> -void Nepomuk::ServerConfigModule::updateNepomukServerStatus()<br>
> +void Nepomuk2::ServerConfigModule::updateNepomukServerStatus()<br>
> {<br>
> if ( m_serverInterface &&<br>
> m_serverInterface->isNepomukEnabled() ) {<br>
> @@ -420,7 +420,7 @@ void \
Nepomuk::ServerConfigModule::updateNepomukServerStatus()<br> > }<br>
><br>
><br>
> -void Nepomuk::ServerConfigModule::setFileIndexerStatusText( const QString& \
text, bool elide )<br> > +void \
Nepomuk2::ServerConfigModule::setFileIndexerStatusText( const QString& text, bool \
elide )<br> > {<br>
> m_labelFileIndexerStatus->setWordWrap( !elide );<br>
> m_labelFileIndexerStatus->setTextElideMode( elide ? Qt::ElideMiddle : \
Qt::ElideNone );<br> > @@ -428,7 +428,7 @@ void \
Nepomuk::ServerConfigModule::setFileIndexerStatusText( const QString& text,<br> \
> }<br> ><br>
><br>
> -void Nepomuk::ServerConfigModule::updateFileIndexerStatus()<br>
> +void Nepomuk2::ServerConfigModule::updateFileIndexerStatus()<br>
> {<br>
> if ( QDBusConnection::sessionBus().interface()->isServiceRegistered( \
"org.kde.nepomuk.services.nepomukfileindexer" ) ) {<br> > if ( \
org::kde::nepomuk::ServiceControl( \
"org.kde.nepomuk.services.nepomukfileindexer", \
"/servicecontrol",<br> > @@ -456,7 +456,7 @@ void \
Nepomuk::ServerConfigModule::updateFileIndexerStatus()<br> > }<br>
><br>
><br>
> -void Nepomuk::ServerConfigModule::updateBackupStatus()<br>
> +void Nepomuk2::ServerConfigModule::updateBackupStatus()<br>
> {<br>
> const QString backupUrl = KStandardDirs::locateLocal( "data", \
"nepomuk/backupsync/backups/" );<br> > QDir dir( backupUrl );<br>
> @@ -475,7 +475,7 @@ void Nepomuk::ServerConfigModule::updateBackupStatus()<br>
> }<br>
><br>
><br>
> -void Nepomuk::ServerConfigModule::recreateInterfaces()<br>
> +void Nepomuk2::ServerConfigModule::recreateInterfaces()<br>
> {<br>
> delete m_fileIndexerInterface;<br>
> delete m_serverInterface;<br>
> @@ -488,7 +488,7 @@ void Nepomuk::ServerConfigModule::recreateInterfaces()<br>
> }<br>
><br>
><br>
> -void Nepomuk::ServerConfigModule::slotCustomQueryButtonClicked()<br>
> +void Nepomuk2::ServerConfigModule::slotCustomQueryButtonClicked()<br>
> {<br>
> // this is a temp solution until we have a proper query builder<br>
> QString queryString = QInputDialog::getText( this,<br>
> @@ -504,14 +504,14 @@ void \
Nepomuk::ServerConfigModule::slotCustomQueryButtonClicked()<br> > }<br>
><br>
><br>
> -void Nepomuk::ServerConfigModule::slotStatusDetailsClicked()<br>
> +void Nepomuk2::ServerConfigModule::slotStatusDetailsClicked()<br>
> {<br>
> StatusWidget statusDialog( this );<br>
> statusDialog.exec();<br>
> }<br>
><br>
><br>
> -void Nepomuk::ServerConfigModule::slotEditIndexFolders()<br>
> +void Nepomuk2::ServerConfigModule::slotEditIndexFolders()<br>
> {<br>
> const QStringList oldIncludeFolders = \
m_indexFolderSelectionDialog->includeFolders();<br> > const QStringList \
oldExcludeFolders = m_indexFolderSelectionDialog->excludeFolders();<br> > @@ \
-532,7 +532,7 @@ void Nepomuk::ServerConfigModule::slotEditIndexFolders()<br> > \
}<br> ><br>
><br>
> -void Nepomuk::ServerConfigModule::slotCustomQueryToggled( bool on )<br>
> +void Nepomuk2::ServerConfigModule::slotCustomQueryToggled( bool on )<br>
> {<br>
> if ( on && m_customQuery.isEmpty() ) {<br>
> slotCustomQueryButtonClicked();<br>
> @@ -540,36 +540,36 @@ void Nepomuk::ServerConfigModule::slotCustomQueryToggled( \
bool on )<br> > }<br>
><br>
><br>
> -QRadioButton* Nepomuk::ServerConfigModule::buttonForQuery( const \
Query::Query& query ) const<br> > +QRadioButton* \
Nepomuk2::ServerConfigModule::buttonForQuery( const Query::Query& query ) \
const<br> > {<br>
> - if ( query == Nepomuk::neverOpenedFilesQuery() )<br>
> + if ( query == Nepomuk2::neverOpenedFilesQuery() )<br>
> return m_checkRootQueryNeverOpened;<br>
> - else if ( query == Nepomuk::lastModifiedFilesQuery() )<br>
> + else if ( query == Nepomuk2::lastModifiedFilesQuery() )<br>
> return m_checkRootQueryLastModified;<br>
> - else if ( query == Nepomuk::mostImportantFilesQuery() )<br>
> + else if ( query == Nepomuk2::mostImportantFilesQuery() )<br>
> return m_checkRootQueryFancy;<br>
> else<br>
> return m_checkRootQueryCustom;<br>
> }<br>
><br>
><br>
> -Nepomuk::Query::Query Nepomuk::ServerConfigModule::queryForButton( \
QAbstractButton* button ) const<br> > +Nepomuk2::Query::Query \
Nepomuk2::ServerConfigModule::queryForButton( QAbstractButton* button ) const<br> \
> {<br> > if ( button == m_checkRootQueryNeverOpened )<br>
> - return Nepomuk::neverOpenedFilesQuery();<br>
> + return Nepomuk2::neverOpenedFilesQuery();<br>
> else if ( button == m_checkRootQueryLastModified )<br>
> - return Nepomuk::lastModifiedFilesQuery();<br>
> + return Nepomuk2::lastModifiedFilesQuery();<br>
> else if ( button == m_checkRootQueryFancy )<br>
> - return Nepomuk::mostImportantFilesQuery();<br>
> + return Nepomuk2::mostImportantFilesQuery();<br>
> else {<br>
> // force to always only query for files<br>
> - Nepomuk::Query::FileQuery query = Query::QueryParser::parseQuery( \
m_customQuery );<br> > + Nepomuk2::Query::FileQuery query = \
Query::QueryParser::parseQuery( m_customQuery );<br> > query.setFileMode( \
Query::FileQuery::QueryFiles );<br> > return query;<br>
> }<br>
> }<br>
><br>
> -void Nepomuk::ServerConfigModule::slotBackupFrequencyChanged()<br>
> +void Nepomuk2::ServerConfigModule::slotBackupFrequencyChanged()<br>
> {<br>
> m_comboBackupDay->setShown(m_comboBackupFrequency->currentIndex() \
>= WeeklyBackup);<br> > \
m_comboBackupDay->setDisabled(m_comboBackupFrequency->currentIndex() == \
DisableAutomaticBackups);<br> > @@ -577,12 +577,12 @@ void \
Nepomuk::ServerConfigModule::slotBackupFrequencyChanged()<br> > \
m_spinBackupMax->setDisabled(m_comboBackupFrequency->currentIndex() == \
DisableAutomaticBackups);<br> > }<br>
><br>
> -void Nepomuk::ServerConfigModule::slotManualBackup()<br>
> +void Nepomuk2::ServerConfigModule::slotManualBackup()<br>
> {<br>
> KProcess::execute( "nepomukbackup", QStringList() << \
"--backup" );<br> > }<br>
><br>
> -void Nepomuk::ServerConfigModule::slotRestoreBackup()<br>
> +void Nepomuk2::ServerConfigModule::slotRestoreBackup()<br>
> {<br>
> KProcess::execute( "nepomukbackup", QStringList() << \
"--restore" );<br> > }<br>
> diff --git a/nepomuk/kcm/nepomukserverkcm.h b/nepomuk/kcm/nepomukserverkcm.h<br>
> index f428cd6..827525b 100644<br>
> --- a/nepomuk/kcm/nepomukserverkcm.h<br>
> +++ b/nepomuk/kcm/nepomukserverkcm.h<br>
> @@ -24,12 +24,12 @@<br>
> #include "nepomukserverinterface.h"<br>
> #include "fileindexerinterface.h"<br>
><br>
> -#include <Nepomuk/Query/Query><br>
> +#include <Nepomuk2/Query/Query><br>
><br>
> class QRadioButton;<br>
> class QAbstractButton;<br>
><br>
> -namespace Nepomuk {<br>
> +namespace Nepomuk2 {<br>
><br>
> class IndexFolderSelectionDialog;<br>
> class StatusWidget;<br>
> @@ -64,7 +64,7 @@ namespace Nepomuk {<br>
> void setFileIndexerStatusText( const QString& text, bool elide \
);<br> ><br>
> QRadioButton* buttonForQuery( const Query::Query& query ) \
const;<br> > - Nepomuk::Query::Query queryForButton( QAbstractButton* \
button ) const;<br> > + Nepomuk2::Query::Query queryForButton( \
QAbstractButton* button ) const;<br> ><br>
> bool m_nepomukAvailable;<br>
><br>
> diff --git a/nepomuk/kcm/statuswidget.cpp b/nepomuk/kcm/statuswidget.cpp<br>
> index a9ece31..88b224f 100644<br>
> --- a/nepomuk/kcm/statuswidget.cpp<br>
> +++ b/nepomuk/kcm/statuswidget.cpp<br>
> @@ -24,8 +24,8 @@<br>
> #include <KIO/NetAccess><br>
> #include <kio/directorysizejob.h><br>
><br>
> -#include <Nepomuk/ResourceManager><br>
> -#include <Nepomuk/Vocabulary/NFO><br>
> +#include <Nepomuk2/ResourceManager><br>
> +#include <Nepomuk2/Vocabulary/NFO><br>
><br>
> #include <Soprano/Model><br>
> #include <Soprano/QueryResultIterator><br>
> @@ -38,7 +38,7 @@<br>
> #include <QtDBus/QDBusConnectionInterface><br>
> #include <QtDBus/QDBusServiceWatcher><br>
><br>
> -Nepomuk::StatusWidget::StatusWidget( QWidget* parent )<br>
> +Nepomuk2::StatusWidget::StatusWidget( QWidget* parent )<br>
> : KDialog( parent ),<br>
> m_connected( false ),<br>
> m_updateRunning( false ),<br>
> @@ -90,12 +90,12 @@ Nepomuk::StatusWidget::StatusWidget( QWidget* parent )<br>
> updateSuspendResumeButtonText( m_fileIndexerService->isSuspended() \
);<br> > }<br>
><br>
> -Nepomuk::StatusWidget::~StatusWidget()<br>
> +Nepomuk2::StatusWidget::~StatusWidget()<br>
> {<br>
> }<br>
><br>
><br>
> -void Nepomuk::StatusWidget::slotUpdateStoreStatus()<br>
> +void Nepomuk2::StatusWidget::slotUpdateStoreStatus()<br>
> {<br>
> if ( !m_updateRunning && !m_updateTimer.isActive() ) {<br>
> m_updateRunning = true;<br>
> @@ -105,7 +105,7 @@ void Nepomuk::StatusWidget::slotUpdateStoreStatus()<br>
> Soprano::Util::AsyncQuery* query<br>
> = Soprano::Util::AsyncQuery::executeQuery( \
ResourceManager::instance()->mainModel(),<br> > \
QString::fromLatin1( "select count(distinct ?r) where { ?r a %1 . }" )<br> \
> - .arg( Soprano::Node::resourceToN3( \
Nepomuk::Vocabulary::NFO::FileDataObject() ) ),<br> > + .arg( \
Soprano::Node::resourceToN3( Nepomuk2::Vocabulary::NFO::FileDataObject() ) ),<br> \
> Soprano::Query::QueryLanguageSparql );<br> > \
connect( query, SIGNAL( nextReady(Soprano::Util::AsyncQuery*) ), this, SLOT( \
slotFileCountFinished(Soprano::Util::AsyncQuery*) ) );<br> > }<br>
> @@ -114,7 +114,7 @@ void Nepomuk::StatusWidget::slotUpdateStoreStatus()<br>
> }<br>
> }<br>
><br>
> -void Nepomuk::StatusWidget::slotFileCountFinished( Soprano::Util::AsyncQuery* \
query )<br> > +void Nepomuk2::StatusWidget::slotFileCountFinished( \
Soprano::Util::AsyncQuery* query )<br> > {<br>
> m_labelFileCount->setText( i18np( "1 file in index", "%1 \
files in index", query->binding( 0 ).literal().toInt() ) );<br> > \
query->deleteLater();<br> > @@ -125,7 +125,7 @@ void \
Nepomuk::StatusWidget::slotFileCountFinished( Soprano::Util::AsyncQuery* qu<br> > \
}<br> ><br>
><br>
> -void Nepomuk::StatusWidget::slotUpdateTimeout()<br>
> +void Nepomuk2::StatusWidget::slotUpdateTimeout()<br>
> {<br>
> if ( m_updateRequested ) {<br>
> m_updateRequested = false;<br>
> @@ -133,7 +133,7 @@ void Nepomuk::StatusWidget::slotUpdateTimeout()<br>
> }<br>
> }<br>
><br>
> -void Nepomuk::StatusWidget::slotUpdateStatus()<br>
> +void Nepomuk2::StatusWidget::slotUpdateStatus()<br>
> {<br>
> const bool fileIndexerInitialized =<br>
> QDBusConnection::sessionBus().interface()->isServiceRegistered(m_fileIndexerService->service()) \
&&<br> > @@ -153,7 +153,7 @@ void \
Nepomuk::StatusWidget::slotUpdateStatus()<br> > \
updateSuspendResumeButtonText( m_fileIndexerService->isSuspended() );<br> > \
}<br> ><br>
> -void Nepomuk::StatusWidget::slotSuspendResume()<br>
> +void Nepomuk2::StatusWidget::slotSuspendResume()<br>
> {<br>
> if ( m_fileIndexerService->isSuspended()) {<br>
> m_fileIndexerService->resume();<br>
> @@ -165,7 +165,7 @@ void Nepomuk::StatusWidget::slotSuspendResume()<br>
> }<br>
> }<br>
><br>
> -void Nepomuk::StatusWidget::updateSuspendResumeButtonText(bool suspended)<br>
> +void Nepomuk2::StatusWidget::updateSuspendResumeButtonText(bool suspended)<br>
> {<br>
> if (!suspended) {<br>
> m_suspendResumeButton->setText( i18nc("Suspends the Nepomuk \
file indexing service.","Suspend File Indexing") );<br> > @@ -175,7 \
+175,7 @@ void Nepomuk::StatusWidget::updateSuspendResumeButtonText(bool \
suspended)<br> > }<br>
> }<br>
><br>
> -void Nepomuk::StatusWidget::showEvent( QShowEvent* event )<br>
> +void Nepomuk2::StatusWidget::showEvent( QShowEvent* event )<br>
> {<br>
> if ( !m_connected ) {<br>
> connect( ResourceManager::instance()->mainModel(), SIGNAL( \
statementsAdded() ),<br> > @@ -192,7 +192,7 @@ void \
Nepomuk::StatusWidget::showEvent( QShowEvent* event )<br> > }<br>
><br>
><br>
> -void Nepomuk::StatusWidget::hideEvent( QHideEvent* event )<br>
> +void Nepomuk2::StatusWidget::hideEvent( QHideEvent* event )<br>
> {<br>
> if ( m_connected ) {<br>
> ResourceManager::instance()->mainModel()->disconnect( this );<br>
> diff --git a/nepomuk/kcm/statuswidget.h b/nepomuk/kcm/statuswidget.h<br>
> index b7af01e..ab951f3 100644<br>
> --- a/nepomuk/kcm/statuswidget.h<br>
> +++ b/nepomuk/kcm/statuswidget.h<br>
> @@ -37,7 +37,7 @@ class AsyncQuery;<br>
> }<br>
> }<br>
><br>
> -namespace Nepomuk {<br>
> +namespace Nepomuk2 {<br>
><br>
><br>
> class StatusWidget : public KDialog, public Ui::StatusWidget<br>
> diff --git a/nepomuk/kioslaves/common/nepomuksearchurltools.h \
b/nepomuk/kioslaves/common/nepomuksearchurltools.h<br> > index 54abd27..deccc34 \
100644<br> > --- a/nepomuk/kioslaves/common/nepomuksearchurltools.h<br>
> +++ b/nepomuk/kioslaves/common/nepomuksearchurltools.h<br>
> @@ -22,14 +22,14 @@<br>
><br>
> #include <QtCore/QString><br>
><br>
> -#include <nepomuk/query.h><br>
> -#include <nepomuk/queryparser.h><br>
> +#include <nepomuk2/query.h><br>
> +#include <nepomuk2/queryparser.h><br>
><br>
> #include <kurl.h><br>
><br>
> -#include <Nepomuk/Vocabulary/NIE><br>
> +#include <Nepomuk2/Vocabulary/NIE><br>
><br>
> -namespace Nepomuk {<br>
> +namespace Nepomuk2 {<br>
> /**<br>
> * Encode the resource URI into the UDS_NAME to make it unique.<br>
> * It is important that we do not use the % for percent-encoding. Otherwise \
KUrl::url will<br> > diff --git a/nepomuk/kioslaves/common/resourcestat.cpp \
b/nepomuk/kioslaves/common/resourcestat.cpp<br> > index 5aeefc6..a259ba5 \
100644<br> > --- a/nepomuk/kioslaves/common/resourcestat.cpp<br>
> +++ b/nepomuk/kioslaves/common/resourcestat.cpp<br>
> @@ -31,16 +31,16 @@<br>
> #include <kio/udsentry.h><br>
> #include <KDebug><br>
><br>
> -#include <Nepomuk/Thing><br>
> -#include <Nepomuk/Variant><br>
> -#include <Nepomuk/Types/Class><br>
> -#include <Nepomuk/ResourceManager><br>
> -#include <Nepomuk/Query/Query><br>
> -#include <Nepomuk/Query/ComparisonTerm><br>
> -#include <Nepomuk/Query/ResourceTerm><br>
> -#include <Nepomuk/Vocabulary/NFO><br>
> -#include <Nepomuk/Vocabulary/NIE><br>
> -#include <Nepomuk/Vocabulary/PIMO><br>
> +#include <Nepomuk2/Thing><br>
> +#include <Nepomuk2/Variant><br>
> +#include <Nepomuk2/Types/Class><br>
> +#include <Nepomuk2/ResourceManager><br>
> +#include <Nepomuk2/Query/Query><br>
> +#include <Nepomuk2/Query/ComparisonTerm><br>
> +#include <Nepomuk2/Query/ResourceTerm><br>
> +#include <Nepomuk2/Vocabulary/NFO><br>
> +#include <Nepomuk2/Vocabulary/NIE><br>
> +#include <Nepomuk2/Vocabulary/PIMO><br>
><br>
> #include <Soprano/Vocabulary/RDF><br>
> #include <Soprano/Vocabulary/NAO><br>
> @@ -53,7 +53,7 @@<br>
> #include <Solid/StorageAccess><br>
><br>
><br>
> -KUrl Nepomuk::stripQuery( const KUrl& url )<br>
> +KUrl Nepomuk2::stripQuery( const KUrl& url )<br>
> {<br>
> KUrl newUrl( url );<br>
> newUrl.setEncodedQuery( QByteArray() );<br>
> @@ -61,7 +61,7 @@ KUrl Nepomuk::stripQuery( const KUrl& url )<br>
> }<br>
><br>
><br>
> -Nepomuk::Resource Nepomuk::splitNepomukUrl( const KUrl& url, QString* \
filename )<br> > +Nepomuk2::Resource Nepomuk2::splitNepomukUrl( const KUrl& \
url, QString* filename )<br> > {<br>
> //<br>
> // let's try to extract the resource from the url in case we listed a \
tag or<br> > @@ -88,10 +88,10 @@ Nepomuk::Resource Nepomuk::splitNepomukUrl( const \
KUrl& url, QString* filename )<br> > }<br>
><br>
><br>
> -bool Nepomuk::isRemovableMediaFile( const Nepomuk::Resource& res )<br>
> +bool Nepomuk2::isRemovableMediaFile( const Nepomuk2::Resource& res )<br>
> {<br>
> - if ( res.hasProperty( Nepomuk::Vocabulary::NIE::url() ) ) {<br>
> - KUrl url = res.property( Nepomuk::Vocabulary::NIE::url() ).toUrl();<br>
> + if ( res.hasProperty( Nepomuk2::Vocabulary::NIE::url() ) ) {<br>
> + KUrl url = res.property( Nepomuk2::Vocabulary::NIE::url() \
).toUrl();<br> > return ( url.protocol() == QLatin1String( \
"filex" ) );<br> > }<br>
> else {<br>
> @@ -100,7 +100,7 @@ bool Nepomuk::isRemovableMediaFile( const \
Nepomuk::Resource& res )<br> > }<br>
><br>
><br>
> -Solid::StorageAccess* Nepomuk::storageFromUUID( const QString& uuid )<br>
> +Solid::StorageAccess* Nepomuk2::storageFromUUID( const QString& uuid )<br>
> {<br>
> QString solidQuery = QString::fromLatin1( "[ \
StorageVolume.usage=='FileSystem' AND StorageVolume.uuid=='%1' \
]" ).arg( uuid.toLower() );<br> > QList<Solid::Device> devices = \
Solid::Device::listFromQuery( solidQuery );<br> > @@ -112,7 +112,7 @@ \
Solid::StorageAccess* Nepomuk::storageFromUUID( const QString& uuid )<br> > \
}<br> ><br>
><br>
> -bool Nepomuk::mountAndWait( Solid::StorageAccess* storage )<br>
> +bool Nepomuk2::mountAndWait( Solid::StorageAccess* storage )<br>
> {<br>
> kDebug() << storage;<br>
> QEventLoop loop;<br>
> @@ -131,12 +131,12 @@ bool Nepomuk::mountAndWait( Solid::StorageAccess* storage \
)<br> > }<br>
><br>
><br>
> -KUrl Nepomuk::determineFilesystemPath( const Nepomuk::Resource& fsRes )<br>
> +KUrl Nepomuk2::determineFilesystemPath( const Nepomuk2::Resource& fsRes \
)<br> > {<br>
> QString uuidQuery = QString::fromLatin1( "select ?uuid where { %1 %2 \
?uuid . }" )<br> > .arg( \
Soprano::Node::resourceToN3( fsRes.resourceUri() ),<br> > \
Soprano::Node::resourceToN3( Soprano::Vocabulary::NAO::identifier() ) );<br> > - \
Soprano::QueryResultIterator it = \
Nepomuk::ResourceManager::instance()->mainModel()->executeQuery( uuidQuery, \
Soprano::Query::QueryLanguageSparql );<br> > + Soprano::QueryResultIterator it \
= Nepomuk2::ResourceManager::instance()->mainModel()->executeQuery( uuidQuery, \
Soprano::Query::QueryLanguageSparql );<br> > if ( it.next() ) {<br>
> Solid::StorageAccess* storage = storageFromUUID( \
it["uuid"].toString() );<br> > it.close();<br>
> @@ -150,10 +150,10 @@ KUrl Nepomuk::determineFilesystemPath( const \
Nepomuk::Resource& fsRes )<br> > }<br>
><br>
><br>
> -QString Nepomuk::getFileSystemLabelForRemovableMediaFileUrl( const \
Nepomuk::Resource& res )<br> > +QString \
Nepomuk2::getFileSystemLabelForRemovableMediaFileUrl( const Nepomuk2::Resource& \
res )<br> > {<br>
> QList<Soprano::Node> labelNodes<br>
> - = Nepomuk::ResourceManager::instance()->mainModel()->executeQuery( \
QString::fromLatin1( "select ?label where { "<br> > + = \
Nepomuk2::ResourceManager::instance()->mainModel()->executeQuery( \
QString::fromLatin1( "select ?label where { "<br> > \
"%1 nie:isPartOf ?fs . "<br> > \
"?fs a nfo:Filesystem . "<br> > \
"?fs nao:prefLabel ?label . "<br> > @@ -164,17 +164,17 @@ QString \
Nepomuk::getFileSystemLabelForRemovableMediaFileUrl( const Nepomuk::Reso<br> > \
if ( !labelNodes.isEmpty() )<br> > return \
labelNodes.first().toString();<br> > else<br>
> - return res.property( Nepomuk::Vocabulary::NIE::url() ).toUrl().host(); \
// Solid UUID<br> > + return res.property( Nepomuk2::Vocabulary::NIE::url() \
).toUrl().host(); // Solid UUID<br> > }<br>
><br>
><br>
> -KUrl Nepomuk::convertRemovableMediaFileUrl( const KUrl& url, bool \
evenMountIfNecessary )<br> > +KUrl Nepomuk2::convertRemovableMediaFileUrl( const \
KUrl& url, bool evenMountIfNecessary )<br> > {<br>
> - Solid::StorageAccess* storage = Nepomuk::storageFromUUID( url.host() );<br>
> + Solid::StorageAccess* storage = Nepomuk2::storageFromUUID( url.host() \
);<br> > kDebug() << url << storage;<br>
> if ( storage &&<br>
> ( storage->isAccessible() ||<br>
> - ( evenMountIfNecessary && Nepomuk::mountAndWait( storage ) ) \
) ) {<br> > + ( evenMountIfNecessary && Nepomuk2::mountAndWait( \
storage ) ) ) ) {<br> > kDebug() << "converted:" << \
KUrl( storage->filePath() + QLatin1String( "/" ) + url.path() );<br> \
> return QString( storage->filePath() + QLatin1String( "/" ) \
+ url.path() );<br> > }<br>
> @@ -184,7 +184,7 @@ KUrl Nepomuk::convertRemovableMediaFileUrl( const KUrl& \
url, bool evenMountIfNec<br> > }<br>
><br>
><br>
> -void Nepomuk::addGenericNepomukResourceData( const Nepomuk::Resource& res, \
KIO::UDSEntry& uds, bool includeMimeType )<br> > +void \
Nepomuk2::addGenericNepomukResourceData( const Nepomuk2::Resource& res, \
KIO::UDSEntry& uds, bool includeMimeType )<br> > {<br>
> //<br>
> // Add some random values<br>
> @@ -216,7 +216,7 @@ void Nepomuk::addGenericNepomukResourceData( const \
Nepomuk::Resource& res, KIO::<br> ><br>
> if ( includeMimeType ) {<br>
> // Use nice display types like "Person", "Project" \
and so on<br> > - Nepomuk::Types::Class type( res.resourceType() );<br>
> + Nepomuk2::Types::Class type( res.resourceType() );<br>
> if (!type.label().isEmpty())<br>
> uds.insert( KIO::UDSEntry::UDS_DISPLAY_TYPE, type.label() );<br>
><br>
> @@ -235,7 +235,7 @@ void Nepomuk::addGenericNepomukResourceData( const \
Nepomuk::Resource& res, KIO::<br> > }<br>
><br>
><br>
> -KIO::UDSEntry Nepomuk::statNepomukResource( const Nepomuk::Resource& res, \
bool doNotForward )<br> > +KIO::UDSEntry Nepomuk2::statNepomukResource( const \
Nepomuk2::Resource& res, bool doNotForward )<br> > {<br>
> //<br>
> // We do not have a local file<br>
> @@ -289,7 +289,7 @@ KIO::UDSEntry Nepomuk::statNepomukResource( const \
Nepomuk::Resource& res, bool d<br> > addGenericNepomukResourceData( res, \
uds, !uds.contains( KIO::UDSEntry::UDS_MIME_TYPE ) );<br> ><br>
> if ( !doNotForward ) {<br>
> - KUrl reUrl = Nepomuk::redirectionUrl( res );<br>
> + KUrl reUrl = Nepomuk2::redirectionUrl( res );<br>
> if ( !reUrl.isEmpty() ) {<br>
> uds.insert( KIO::UDSEntry::UDS_MIME_TYPE, QLatin1String( \
"inode/directory" ) );<br> > uds.insert( \
KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR );<br> > @@ -300,25 +300,25 @@ KIO::UDSEntry \
Nepomuk::statNepomukResource( const Nepomuk::Resource& res, bool d<br> > \
}<br> ><br>
><br>
> -bool Nepomuk::willBeRedirected( const Nepomuk::Resource& res )<br>
> +bool Nepomuk2::willBeRedirected( const Nepomuk2::Resource& res )<br>
> {<br>
> // here the same canditions as in redirectionUrl need to be listed<br>
> - return( res.hasType( Nepomuk::Vocabulary::NFO::Folder() ) ||<br>
> + return( res.hasType( Nepomuk2::Vocabulary::NFO::Folder() ) ||<br>
> res.hasType( Soprano::Vocabulary::NAO::Tag() ) ||<br>
> - res.hasType( Nepomuk::Vocabulary::NFO::Filesystem() ) ||<br>
> - !res.hasType( Nepomuk::Vocabulary::NFO::FileDataObject() ) );<br>
> + res.hasType( Nepomuk2::Vocabulary::NFO::Filesystem() ) ||<br>
> + !res.hasType( Nepomuk2::Vocabulary::NFO::FileDataObject() ) );<br>
> }<br>
><br>
><br>
> -KUrl Nepomuk::redirectionUrl( const Nepomuk::Resource& res )<br>
> +KUrl Nepomuk2::redirectionUrl( const Nepomuk2::Resource& res )<br>
> {<br>
> // list folders by forwarding to the actual folder on disk<br>
> - if ( res.hasType( Nepomuk::Vocabulary::NFO::Folder() ) ) {<br>
> - return res.property( Nepomuk::Vocabulary::NIE::url() ).toUrl();<br>
> + if ( res.hasType( Nepomuk2::Vocabulary::NFO::Folder() ) ) {<br>
> + return res.property( Nepomuk2::Vocabulary::NIE::url() ).toUrl();<br>
> }<br>
><br>
> // list filesystems by forwarding to the mounted path on disk (in case the \
fs is mounted)<br> > - else if ( res.hasType( \
Nepomuk::Vocabulary::NFO::Filesystem() ) ) {<br> > + else if ( res.hasType( \
Nepomuk2::Vocabulary::NFO::Filesystem() ) ) {<br> > KUrl fsUrl = \
determineFilesystemPath( res );<br> > if ( fsUrl.isValid() ) {<br>
> return fsUrl;<br>
> @@ -335,7 +335,7 @@ KUrl Nepomuk::redirectionUrl( const Nepomuk::Resource& \
res )<br> ><br>
> // list everything else besides files by querying things related to the \
resource in some way<br> > // this works for music albums or artists but it \
would also work for tags<br> > - else if ( !res.hasType( \
Nepomuk::Vocabulary::NFO::FileDataObject() ) ) {<br> > + else if ( \
!res.hasType( Nepomuk2::Vocabulary::NFO::FileDataObject() ) ) {<br> > \
Query::ComparisonTerm term( QUrl(), Query::ResourceTerm( res ), \
Query::ComparisonTerm::Equal );<br> > KUrl url = Query::Query( term \
).toSearchUrl( res.genericLabel() );<br> > url.addQueryItem( \
QLatin1String( "resource" ), KUrl( res.resourceUri() ).url() );<br> > @@ \
-352,10 +352,10 @@ namespace {<br> > /**<br>
> * Check if the resource represents a local file with an existing nie:url \
property.<br> > */<br>
> - bool isLocalFile( const Nepomuk::Resource& res )<br>
> + bool isLocalFile( const Nepomuk2::Resource& res )<br>
> {<br>
> - if ( res.hasProperty( Nepomuk::Vocabulary::NIE::url() ) ) {<br>
> - KUrl url = res.property( Nepomuk::Vocabulary::NIE::url() \
).toUrl();<br> > + if ( res.hasProperty( Nepomuk2::Vocabulary::NIE::url() ) \
) {<br> > + KUrl url = res.property( Nepomuk2::Vocabulary::NIE::url() \
).toUrl();<br> > return ( !url.isEmpty() &&<br>
> QFile::exists( url.toLocalFile() ) );<br>
> }<br>
> @@ -365,10 +365,10 @@ namespace {<br>
> }<br>
> }<br>
><br>
> -KUrl Nepomuk::nepomukToFileUrl( const KUrl& url, bool evenMountIfNecessary \
)<br> > +KUrl Nepomuk2::nepomukToFileUrl( const KUrl& url, bool \
evenMountIfNecessary )<br> > {<br>
> QString filename;<br>
> - Nepomuk::Resource res = splitNepomukUrl( url, &filename );<br>
> + Nepomuk2::Resource res = splitNepomukUrl( url, &filename );<br>
><br>
> if ( !res.exists() )<br>
> return KUrl();<br>
> @@ -378,7 +378,7 @@ KUrl Nepomuk::nepomukToFileUrl( const KUrl& url, bool \
evenMountIfNecessary )<br> > //<br>
> // let's see if it is a pimo thing which refers to a file<br>
> //<br>
> - if ( res.hasType( Nepomuk::Vocabulary::PIMO::Thing() ) ) {<br>
> + if ( res.hasType( Nepomuk2::Vocabulary::PIMO::Thing() ) ) {<br>
> if ( !res.pimoThing().groundingOccurrences().isEmpty() ) {<br>
> res = res.pimoThing().groundingOccurrences().first();<br>
> }<br>
> @@ -388,7 +388,7 @@ KUrl Nepomuk::nepomukToFileUrl( const KUrl& url, bool \
evenMountIfNecessary )<br> > newURL = res.property( \
Vocabulary::NIE::url() ).toUrl();<br> > }<br>
> else if ( isRemovableMediaFile( res ) ) {<br>
> - const KUrl removableMediaUrl = res.property( \
Nepomuk::Vocabulary::NIE::url() ).toUrl();<br> > + const KUrl \
removableMediaUrl = res.property( Nepomuk2::Vocabulary::NIE::url() ).toUrl();<br> \
> newURL = convertRemovableMediaFileUrl( removableMediaUrl, \
evenMountIfNecessary );<br> > }<br>
><br>
> diff --git a/nepomuk/kioslaves/common/resourcestat.h \
b/nepomuk/kioslaves/common/resourcestat.h<br> > index 6f6126b..a8d80a9 100644<br>
> --- a/nepomuk/kioslaves/common/resourcestat.h<br>
> +++ b/nepomuk/kioslaves/common/resourcestat.h<br>
> @@ -30,7 +30,7 @@ namespace Solid {<br>
> class StorageAccess;<br>
> }<br>
><br>
> -namespace Nepomuk {<br>
> +namespace Nepomuk2 {<br>
><br>
> class Resource;<br>
><br>
> @@ -43,13 +43,13 @@ namespace Nepomuk {<br>
> * Split the filename part off a nepomuk:/ URI. This is used in many \
methods for identifying<br> > * entries listed from tags and \
filesystems.<br> > */<br>
> - Nepomuk::Resource splitNepomukUrl( const KUrl& url, QString* filename = \
0 );<br> > + Nepomuk2::Resource splitNepomukUrl( const KUrl& url, QString* \
filename = 0 );<br> ><br>
> /**<br>
> * Check if the resource represents a file on a removable media using a \
filex:/<br> > * URL.<br>
> */<br>
> - bool isRemovableMediaFile( const Nepomuk::Resource& res );<br>
> + bool isRemovableMediaFile( const Nepomuk2::Resource& res );<br>
><br>
> /**<br>
> * Create a Solid storage access interface from the volume UUID.<br>
> @@ -65,12 +65,12 @@ namespace Nepomuk {<br>
> /**<br>
> * Get the mount path of a nfo:Filesystem resource as created by the \
removable storage service.<br> > */<br>
> - KUrl determineFilesystemPath( const Nepomuk::Resource& fsRes );<br>
> + KUrl determineFilesystemPath( const Nepomuk2::Resource& fsRes );<br>
><br>
> /**<br>
> * Determine the label for a filesystem \p res is stored on.<br>
> */<br>
> - QString getFileSystemLabelForRemovableMediaFileUrl( const \
Nepomuk::Resource& res );<br> > + QString \
getFileSystemLabelForRemovableMediaFileUrl( const Nepomuk2::Resource& res );<br> \
><br> > /**<br>
> * Convert a filex:/ URL into its actual local file URL.<br>
> @@ -82,24 +82,24 @@ namespace Nepomuk {<br>
> */<br>
> KUrl convertRemovableMediaFileUrl( const KUrl& url, bool \
evenMountIfNecessary = false );<br> ><br>
> - void addGenericNepomukResourceData( const Nepomuk::Resource& res, \
KIO::UDSEntry& uds, bool includeMimeType = true );<br> > + void \
addGenericNepomukResourceData( const Nepomuk2::Resource& res, KIO::UDSEntry& \
uds, bool includeMimeType = true );<br> ><br>
> /**<br>
> * Stat a Nepomuk resource. Might start a local event loop<br>
> */<br>
> - KIO::UDSEntry statNepomukResource( const Nepomuk::Resource& res, bool \
doNotForward = false );<br> > + KIO::UDSEntry statNepomukResource( const \
Nepomuk2::Resource& res, bool doNotForward = false );<br> ><br>
> /**<br>
> * \return \p true for all resources that will get a valid redirection url \
in<br> > * redirectionUrl().<br>
> */<br>
> - bool willBeRedirected( const Nepomuk::Resource& res );<br>
> + bool willBeRedirected( const Nepomuk2::Resource& res );<br>
><br>
> /**<br>
> * Create a redirection query URL for resources such as tags or \
filesystems.<br> > * For other resources an empty KUrl is returned.<br>
> */<br>
> - KUrl redirectionUrl( const Nepomuk::Resource& res );<br>
> + KUrl redirectionUrl( const Nepomuk2::Resource& res );<br>
><br>
> /**<br>
> * Convert a nepomuk:/ URL to a file:/ URL if possible.<br>
> diff --git a/nepomuk/kioslaves/common/standardqueries.h \
b/nepomuk/kioslaves/common/standardqueries.h<br> > index bd33ee2..a6fa173 \
100644<br> > --- a/nepomuk/kioslaves/common/standardqueries.h<br>
> +++ b/nepomuk/kioslaves/common/standardqueries.h<br>
> @@ -20,27 +20,27 @@<br>
> #ifndef _NEPOMUK_STANDARD_QUERIES_H_<br>
> #define _NEPOMUK_STANDARD_QUERIES_H_<br>
><br>
> -#include <Nepomuk/Query/FileQuery><br>
> -#include <Nepomuk/Query/ComparisonTerm><br>
> -#include <Nepomuk/Query/AndTerm><br>
> -#include <Nepomuk/Query/OrTerm><br>
> -#include <Nepomuk/Query/LiteralTerm><br>
> -#include <Nepomuk/Query/NegationTerm><br>
> -#include <Nepomuk/Query/ResourceTerm><br>
> +#include <Nepomuk2/Query/FileQuery><br>
> +#include <Nepomuk2/Query/ComparisonTerm><br>
> +#include <Nepomuk2/Query/AndTerm><br>
> +#include <Nepomuk2/Query/OrTerm><br>
> +#include <Nepomuk2/Query/LiteralTerm><br>
> +#include <Nepomuk2/Query/NegationTerm><br>
> +#include <Nepomuk2/Query/ResourceTerm><br>
><br>
> #include <Soprano/Vocabulary/NAO><br>
> #include <Soprano/Vocabulary/RDF><br>
><br>
> -#include <Nepomuk/Vocabulary/NIE><br>
> -#include <Nepomuk/Vocabulary/NFO><br>
> -#include <Nepomuk/Vocabulary/NUAO><br>
> +#include <Nepomuk2/Vocabulary/NIE><br>
> +#include <Nepomuk2/Vocabulary/NFO><br>
> +#include <Nepomuk2/Vocabulary/NUAO><br>
><br>
> -namespace Nepomuk {<br>
> +namespace Nepomuk2 {<br>
> /**<br>
> * Creates a query that returns all files sorted by descending modification \
date.<br> > */<br>
> inline Query::Query lastModifiedFilesQuery() {<br>
> - Query::ComparisonTerm lastModifiedTerm( \
Nepomuk::Vocabulary::NIE::lastModified(), Query::Term() );<br> > + \
Query::ComparisonTerm lastModifiedTerm( Nepomuk2::Vocabulary::NIE::lastModified(), \
Query::Term() );<br> > lastModifiedTerm.setSortWeight( 1, \
Qt::DescendingOrder );<br> > Query::FileQuery lastModifiedQuery( \
lastModifiedTerm );<br> > lastModifiedQuery.setFileMode( \
Query::FileQuery::QueryFiles );<br> > @@ -69,12 +69,12 @@ namespace Nepomuk {<br>
> // 2. no property at all<br>
> Query::OrTerm usageCntTerm(<br>
> Query::ComparisonTerm(<br>
> - Nepomuk::Vocabulary::NUAO::usageCount(),<br>
> + Nepomuk2::Vocabulary::NUAO::usageCount(),<br>
> Query::LiteralTerm( 0 ),<br>
> Query::ComparisonTerm::Equal ),<br>
> Query::NegationTerm::negateTerm(<br>
> Query::ComparisonTerm(<br>
> - Nepomuk::Vocabulary::NUAO::usageCount(),<br>
> + Nepomuk2::Vocabulary::NUAO::usageCount(),<br>
> Query::Term() ) ) );<br>
><br>
> // Before we had the data management service there was no usage \
count<br> > @@ -83,7 +83,7 @@ namespace Nepomuk {<br>
> // However, by default we only show the top 10 results. Thus, in \
the<br> > // worst case this query will return the same as \
lastModifiedFilesQuery().<br> > Query::ComparisonTerm modDateTerm(<br>
> - Nepomuk::Vocabulary::NIE::lastModified(),<br>
> + Nepomuk2::Vocabulary::NIE::lastModified(),<br>
> Query::Term() );<br>
> modDateTerm.setSortWeight( 1, Qt::DescendingOrder );<br>
><br>
> diff --git a/nepomuk/kioslaves/common/timelinetools.cpp \
b/nepomuk/kioslaves/common/timelinetools.cpp<br> > index f65bbd5..22cd561 \
100644<br> > --- a/nepomuk/kioslaves/common/timelinetools.cpp<br>
> +++ b/nepomuk/kioslaves/common/timelinetools.cpp<br>
> @@ -24,16 +24,16 @@<br>
> #include <Soprano/Node><br>
> #include <Soprano/Vocabulary/XMLSchema><br>
><br>
> -#include <Nepomuk/Vocabulary/NFO><br>
> -#include <Nepomuk/Vocabulary/NIE><br>
> -#include <Nepomuk/Vocabulary/NUAO><br>
> +#include <Nepomuk2/Vocabulary/NFO><br>
> +#include <Nepomuk2/Vocabulary/NIE><br>
> +#include <Nepomuk2/Vocabulary/NUAO><br>
><br>
> -#include <Nepomuk/Query/FileQuery><br>
> -#include <Nepomuk/Query/AndTerm><br>
> -#include <Nepomuk/Query/OrTerm><br>
> -#include <Nepomuk/Query/ComparisonTerm><br>
> -#include <Nepomuk/Query/LiteralTerm><br>
> -#include <Nepomuk/Query/StandardQuery><br>
> +#include <Nepomuk2/Query/FileQuery><br>
> +#include <Nepomuk2/Query/AndTerm><br>
> +#include <Nepomuk2/Query/OrTerm><br>
> +#include <Nepomuk2/Query/ComparisonTerm><br>
> +#include <Nepomuk2/Query/LiteralTerm><br>
> +#include <Nepomuk2/Query/StandardQuery><br>
><br>
> #include <KUrl><br>
> #include <KCalendarSystem><br>
> @@ -85,7 +85,7 @@ namespace {<br>
> }<br>
><br>
><br>
> -Nepomuk::TimelineFolderType Nepomuk::parseTimelineUrl( const KUrl& url, \
QDate* date, QString* filename )<br> > +Nepomuk2::TimelineFolderType \
Nepomuk2::parseTimelineUrl( const KUrl& url, QDate* date, QString* filename )<br> \
> {<br> > kDebug() << url;<br>
><br>
> @@ -149,9 +149,9 @@ Nepomuk::TimelineFolderType Nepomuk::parseTimelineUrl( const \
KUrl& url, QDate* d<br> > }<br>
><br>
><br>
> -Nepomuk::Query::Query Nepomuk::buildTimelineQuery( const QDate& from, const \
QDate& to )<br> > +Nepomuk2::Query::Query Nepomuk2::buildTimelineQuery( const \
QDate& from, const QDate& to )<br> > {<br>
> - Nepomuk::Query::FileQuery query = Nepomuk::Query::dateRangeQuery( from, \
to.isValid() ? to : from );<br> > + Nepomuk2::Query::FileQuery query = \
Nepomuk2::Query::dateRangeQuery( from, to.isValid() ? to : from );<br> > \
query.setFileMode( Query::FileQuery::QueryFiles );<br> > return query;<br>
> }<br>
> diff --git a/nepomuk/kioslaves/common/timelinetools.h \
b/nepomuk/kioslaves/common/timelinetools.h<br> > index f1b53ed..51a956a 100644<br>
> --- a/nepomuk/kioslaves/common/timelinetools.h<br>
> +++ b/nepomuk/kioslaves/common/timelinetools.h<br>
> @@ -25,9 +25,9 @@ class QString;<br>
><br>
> #include <QtCore/QDate><br>
><br>
> -#include <Nepomuk/Query/Query><br>
> +#include <Nepomuk2/Query/Query><br>
><br>
> -namespace Nepomuk {<br>
> +namespace Nepomuk2 {<br>
> /**<br>
> * The hierarchy in timeline:/ looks as follows:<br>
> *<br>
> diff --git a/nepomuk/kioslaves/nepomuk/CMakeLists.txt \
b/nepomuk/kioslaves/nepomuk/CMakeLists.txt<br> > index de856ac..318390b 100644<br>
> --- a/nepomuk/kioslaves/nepomuk/CMakeLists.txt<br>
> +++ b/nepomuk/kioslaves/nepomuk/CMakeLists.txt<br>
> @@ -1,6 +1,7 @@<br>
> include_directories(<br>
> ${KDE4_INCLUDES}<br>
> ${CMAKE_CURRENT_BINARY_DIR}<br>
> + ${NEPOMUK_CORE_INCLUDE_DIR}<br>
> ${nepomuk_kio_slaves_SOURCE_DIR}/common<br>
> )<br>
><br>
> @@ -15,9 +16,7 @@ target_link_libraries(kio_nepomuk<br>
> nepomukcommon<br>
> ${KDE4_KIO_LIBS}<br>
> ${KDE4_SOLID_LIBS}<br>
> - ${NEPOMUK_LIBRARIES}<br>
> - ${NEPOMUK_QUERY_LIBRARIES}<br>
> - ${NEPOMUK_UTILS_LIBRARIES}<br>
> + ${NEPOMUK_CORE_LIBRARIES}<br>
> ${SOPRANO_LIBRARIES})<br>
><br>
> install(TARGETS kio_nepomuk DESTINATION ${PLUGIN_INSTALL_DIR})<br>
> diff --git a/nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp \
b/nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp<br> > index 262dfe4..ae613b4 \
100644<br> > --- a/nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp<br>
> +++ b/nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp<br>
> @@ -37,17 +37,17 @@<br>
> #include <KMessageBox><br>
> #include <KMimeType><br>
><br>
> -#include <nepomuk/thing.h><br>
> -#include <nepomuk/resourcemanager.h><br>
> -#include <nepomuk/variant.h><br>
> -#include <nepomuk/class.h><br>
> -#include <nepomuk/property.h><br>
> -#include <Nepomuk/Query/Query><br>
> -#include <Nepomuk/Query/ComparisonTerm><br>
> -#include <Nepomuk/Query/ResourceTerm><br>
> -#include <Nepomuk/Vocabulary/NFO><br>
> -#include <Nepomuk/Vocabulary/NIE><br>
> -#include <Nepomuk/Vocabulary/PIMO><br>
> +#include <nepomuk2/thing.h><br>
> +#include <nepomuk2/resourcemanager.h><br>
> +#include <nepomuk2/variant.h><br>
> +#include <nepomuk2/class.h><br>
> +#include <nepomuk2/property.h><br>
> +#include <Nepomuk2/Query/Query><br>
> +#include <Nepomuk2/Query/ComparisonTerm><br>
> +#include <Nepomuk2/Query/ResourceTerm><br>
> +#include <Nepomuk2/Vocabulary/NFO><br>
> +#include <Nepomuk2/Vocabulary/NIE><br>
> +#include <Nepomuk2/Vocabulary/PIMO><br>
><br>
> #include <Soprano/Vocabulary/RDF><br>
> #include <Soprano/Vocabulary/NAO><br>
> @@ -66,19 +66,19 @@ namespace {<br>
> }<br>
> }<br>
><br>
> -Nepomuk::NepomukProtocol::NepomukProtocol( const QByteArray& poolSocket, \
const QByteArray& appSocket )<br> > \
+Nepomuk2::NepomukProtocol::NepomukProtocol( const QByteArray& poolSocket, const \
QByteArray& appSocket )<br> > : KIO::ForwardingSlaveBase( \
"nepomuk", poolSocket, appSocket )<br> > {<br>
> ResourceManager::instance()->init();<br>
> }<br>
><br>
><br>
> -Nepomuk::NepomukProtocol::~NepomukProtocol()<br>
> +Nepomuk2::NepomukProtocol::~NepomukProtocol()<br>
> {<br>
> }<br>
><br>
><br>
> -void Nepomuk::NepomukProtocol::listDir( const KUrl& url )<br>
> +void Nepomuk2::NepomukProtocol::listDir( const KUrl& url )<br>
> {<br>
> if ( !ensureNepomukRunning() )<br>
> return;<br>
> @@ -89,8 +89,8 @@ void Nepomuk::NepomukProtocol::listDir( const KUrl& url \
)<br> > // anything.<br>
> // See README for details<br>
> //<br>
> - Nepomuk::Resource res = Nepomuk::splitNepomukUrl( url );<br>
> - KUrl reUrl = Nepomuk::redirectionUrl( res );<br>
> + Nepomuk2::Resource res = Nepomuk2::splitNepomukUrl( url );<br>
> + KUrl reUrl = Nepomuk2::redirectionUrl( res );<br>
> if ( !reUrl.isEmpty() ) {<br>
> redirection( reUrl );<br>
> finished();<br>
> @@ -101,7 +101,7 @@ void Nepomuk::NepomukProtocol::listDir( const KUrl& url \
)<br> > }<br>
><br>
><br>
> -void Nepomuk::NepomukProtocol::get( const KUrl& url )<br>
> +void Nepomuk2::NepomukProtocol::get( const KUrl& url )<br>
> {<br>
> if ( !ensureNepomukRunning() )<br>
> return;<br>
> @@ -111,13 +111,13 @@ void Nepomuk::NepomukProtocol::get( const KUrl& url \
)<br> > m_currentOperation = Get;<br>
> const bool noFollow = noFollowSet( url );<br>
><br>
> - Nepomuk::Resource res = splitNepomukUrl( url );<br>
> - if ( !noFollow && Nepomuk::isRemovableMediaFile( res ) ) {<br>
> + Nepomuk2::Resource res = splitNepomukUrl( url );<br>
> + if ( !noFollow && Nepomuk2::isRemovableMediaFile( res ) ) {<br>
> error( KIO::ERR_SLAVE_DEFINED,<br>
> i18nc( "@info", "Please insert the removable \
medium <resource>%1</resource> to access this file.",<br> > \
getFileSystemLabelForRemovableMediaFileUrl( res ) ) );<br> > }<br>
> - else if ( !noFollow && !Nepomuk::nepomukToFileUrl( url ).isEmpty() \
) {<br> > + else if ( !noFollow && !Nepomuk2::nepomukToFileUrl( url \
).isEmpty() ) {<br> > ForwardingSlaveBase::get( url );<br>
> }<br>
> else {<br>
> @@ -150,7 +150,7 @@ void Nepomuk::NepomukProtocol::get( const KUrl& url \
)<br> > }<br>
><br>
><br>
> -void Nepomuk::NepomukProtocol::put( const KUrl& url, int permissions, \
KIO::JobFlags flags )<br> > +void Nepomuk2::NepomukProtocol::put( const KUrl& \
url, int permissions, KIO::JobFlags flags )<br> > {<br>
> if ( !ensureNepomukRunning() )<br>
> return;<br>
> @@ -162,7 +162,7 @@ void Nepomuk::NepomukProtocol::put( const KUrl& url, int \
permissions, KIO::JobFl<br> > }<br>
><br>
><br>
> -void Nepomuk::NepomukProtocol::stat( const KUrl& url )<br>
> +void Nepomuk2::NepomukProtocol::stat( const KUrl& url )<br>
> {<br>
> if ( !ensureNepomukRunning() )<br>
> return;<br>
> @@ -171,17 +171,17 @@ void Nepomuk::NepomukProtocol::stat( const KUrl& url \
)<br> ><br>
> m_currentOperation = Stat;<br>
> const bool noFollow = noFollowSet( url );<br>
> - if ( !noFollow && !Nepomuk::nepomukToFileUrl( url ).isEmpty() ) \
{<br> > + if ( !noFollow && !Nepomuk2::nepomukToFileUrl( url \
).isEmpty() ) {<br> > ForwardingSlaveBase::stat( url );<br>
> }<br>
> else {<br>
> - Nepomuk::Resource res = splitNepomukUrl( url );<br>
> + Nepomuk2::Resource res = splitNepomukUrl( url );<br>
><br>
> if ( !res.exists() ) {<br>
> error( KIO::ERR_DOES_NOT_EXIST, QLatin1String("stat: ") + \
stripQuery(url).prettyUrl() );<br> > }<br>
> else {<br>
> - KIO::UDSEntry uds = Nepomuk::statNepomukResource( res, noFollow \
);<br> > + KIO::UDSEntry uds = Nepomuk2::statNepomukResource( res, \
noFollow );<br> > statEntry( uds );<br>
> finished();<br>
> }<br>
> @@ -189,7 +189,7 @@ void Nepomuk::NepomukProtocol::stat( const KUrl& url \
)<br> > }<br>
><br>
><br>
> -void Nepomuk::NepomukProtocol::mimetype( const KUrl& url )<br>
> +void Nepomuk2::NepomukProtocol::mimetype( const KUrl& url )<br>
> {<br>
> if ( !ensureNepomukRunning() )<br>
> return;<br>
> @@ -204,15 +204,15 @@ void Nepomuk::NepomukProtocol::mimetype( const KUrl& \
url )<br> > }<br>
><br>
> QString filename;<br>
> - Nepomuk::Resource res = Nepomuk::splitNepomukUrl( url, &filename );<br>
> + Nepomuk2::Resource res = Nepomuk2::splitNepomukUrl( url, &filename \
);<br> > if ( filename.isEmpty() &&<br>
> - Nepomuk::willBeRedirected( res ) ) {<br>
> + Nepomuk2::willBeRedirected( res ) ) {<br>
> kDebug() << res.resourceUri() << "is tag or file \
system -> mimetype inode/directory";<br> > mimeType( \
QLatin1String( "inode/directory" ) );<br> > finished();<br>
> }<br>
> else {<br>
> - if ( !Nepomuk::nepomukToFileUrl( url ).isEmpty() ) {<br>
> + if ( !Nepomuk2::nepomukToFileUrl( url ).isEmpty() ) {<br>
> ForwardingSlaveBase::mimetype( url );<br>
> }<br>
> else {<br>
> @@ -235,7 +235,7 @@ void Nepomuk::NepomukProtocol::mimetype( const KUrl& url \
)<br> > }<br>
><br>
><br>
> -void Nepomuk::NepomukProtocol::del(const KUrl& url, bool isFile)<br>
> +void Nepomuk2::NepomukProtocol::del(const KUrl& url, bool isFile)<br>
> {<br>
> if ( !ensureNepomukRunning() )<br>
> return;<br>
> @@ -247,7 +247,7 @@ void Nepomuk::NepomukProtocol::del(const KUrl& url, bool \
isFile)<br> > ForwardingSlaveBase::del( url, isFile );<br>
> }<br>
> else {<br>
> - Nepomuk::Resource res( url );<br>
> + Nepomuk2::Resource res( url );<br>
> if ( !res.exists() ) {<br>
> error( KIO::ERR_DOES_NOT_EXIST, url.prettyUrl() );<br>
> }<br>
> @@ -259,19 +259,19 @@ void Nepomuk::NepomukProtocol::del(const KUrl& url, \
bool isFile)<br> > }<br>
><br>
><br>
> -bool Nepomuk::NepomukProtocol::rewriteUrl( const KUrl& url, KUrl& \
newURL )<br> > +bool Nepomuk2::NepomukProtocol::rewriteUrl( const KUrl& url, \
KUrl& newURL )<br> > {<br>
> if ( noFollowSet( url ) )<br>
> return false;<br>
><br>
> - newURL = Nepomuk::nepomukToFileUrl( url, m_currentOperation == Get );<br>
> + newURL = Nepomuk2::nepomukToFileUrl( url, m_currentOperation == Get );<br>
> return newURL.isValid();<br>
> }<br>
><br>
><br>
> -bool Nepomuk::NepomukProtocol::ensureNepomukRunning()<br>
> +bool Nepomuk2::NepomukProtocol::ensureNepomukRunning()<br>
> {<br>
> - if ( Nepomuk::ResourceManager::instance()->init() ) {<br>
> + if ( Nepomuk2::ResourceManager::instance()->init() ) {<br>
> error( KIO::ERR_SLAVE_DEFINED, i18n( "The desktop search service \
is not activated. Unable to answer queries without it." ) );<br> > \
return false;<br> > }<br>
> @@ -295,7 +295,7 @@ extern "C"<br>
> exit(-1);<br>
> }<br>
><br>
> - Nepomuk::NepomukProtocol slave(argv[2], argv[3]);<br>
> + Nepomuk2::NepomukProtocol slave(argv[2], argv[3]);<br>
> slave.dispatchLoop();<br>
><br>
> return 0;<br>
> diff --git a/nepomuk/kioslaves/nepomuk/kio_nepomuk.h \
b/nepomuk/kioslaves/nepomuk/kio_nepomuk.h<br> > index 1299f30..e4ed2b0 100644<br>
> --- a/nepomuk/kioslaves/nepomuk/kio_nepomuk.h<br>
> +++ b/nepomuk/kioslaves/nepomuk/kio_nepomuk.h<br>
> @@ -23,9 +23,9 @@<br>
><br>
> #include <kio/forwardingslavebase.h><br>
><br>
> -#include <Nepomuk/Resource><br>
> +#include <Nepomuk2/Resource><br>
><br>
> -namespace Nepomuk {<br>
> +namespace Nepomuk2 {<br>
> class NepomukProtocol : public KIO::ForwardingSlaveBase<br>
> {<br>
> public:<br>
> diff --git a/nepomuk/kioslaves/nepomuk/resourcepagegenerator.cpp \
b/nepomuk/kioslaves/nepomuk/resourcepagegenerator.cpp<br> > index da85d88..59c826c \
100644<br> > --- a/nepomuk/kioslaves/nepomuk/resourcepagegenerator.cpp<br>
> +++ b/nepomuk/kioslaves/nepomuk/resourcepagegenerator.cpp<br>
> @@ -31,14 +31,14 @@<br>
> #include <kdeversion.h><br>
> #include <KUrl><br>
><br>
> -#include <nepomuk/file.h><br>
> -#include <nepomuk/resourcemanager.h><br>
> -#include <nepomuk/variant.h><br>
> -#include <nepomuk/class.h><br>
> -#include <nepomuk/property.h><br>
> -#include <Nepomuk/Vocabulary/NIE><br>
> -#include <Nepomuk/Vocabulary/NFO><br>
> -#include <nepomuk/utils.h><br>
> +#include <nepomuk2/file.h><br>
> +#include <nepomuk2/resourcemanager.h><br>
> +#include <nepomuk2/variant.h><br>
> +#include <nepomuk2/class.h><br>
> +#include <nepomuk2/property.h><br>
> +#include <Nepomuk2/Vocabulary/NIE><br>
> +#include <Nepomuk2/Vocabulary/NFO><br>
> +#include <nepomuk2/utils.h><br>
><br>
> #include <Soprano/Model><br>
> #include <Soprano/Node><br>
> @@ -48,7 +48,7 @@<br>
> #include <Soprano/Vocabulary/NAO><br>
><br>
><br>
> -using namespace Nepomuk::Vocabulary;<br>
> +using namespace Nepomuk2::Vocabulary;<br>
><br>
> namespace {<br>
> const char* s_noFollow = "noFollow";<br>
> @@ -56,7 +56,7 @@ namespace {<br>
> const char* s_showNonUserVisibible = "showNonUserVisible";<br>
> const char* s_true = "true";<br>
><br>
> - KUrl configureUrl( const KUrl& url, \
Nepomuk::ResourcePageGenerator::Flags flags ) {<br> > + KUrl configureUrl( \
const KUrl& url, Nepomuk2::ResourcePageGenerator::Flags flags ) {<br> > \
KUrl newUrl( url );<br> ><br>
> newUrl.removeEncodedQueryItem( s_noFollow );<br>
> @@ -65,12 +65,12 @@ namespace {<br>
> }<br>
><br>
> newUrl.removeEncodedQueryItem( s_showUri );<br>
> - if ( flags & Nepomuk::ResourcePageGenerator::ShowUris ) {<br>
> + if ( flags & Nepomuk2::ResourcePageGenerator::ShowUris ) {<br>
> newUrl.addEncodedQueryItem( s_showUri, s_true );<br>
> }<br>
><br>
> newUrl.removeEncodedQueryItem( s_showNonUserVisibible );<br>
> - if ( flags & Nepomuk::ResourcePageGenerator::ShowNonUserVisible ) \
{<br> > + if ( flags & \
Nepomuk2::ResourcePageGenerator::ShowNonUserVisible ) {<br> > \
newUrl.addEncodedQueryItem( s_showNonUserVisibible, s_true );<br> > }<br>
><br>
> @@ -79,18 +79,18 @@ namespace {<br>
> }<br>
><br>
><br>
> -Nepomuk::ResourcePageGenerator::ResourcePageGenerator( const \
Nepomuk::Resource& res )<br> > \
+Nepomuk2::ResourcePageGenerator::ResourcePageGenerator( const \
Nepomuk2::Resource& res )<br> > : m_resource( res )<br>
> {<br>
> }<br>
><br>
><br>
> -Nepomuk::ResourcePageGenerator::~ResourcePageGenerator()<br>
> +Nepomuk2::ResourcePageGenerator::~ResourcePageGenerator()<br>
> {<br>
> }<br>
><br>
><br>
> -void Nepomuk::ResourcePageGenerator::setFlagsFromUrl( const KUrl& url )<br>
> +void Nepomuk2::ResourcePageGenerator::setFlagsFromUrl( const KUrl& url \
)<br> > {<br>
> m_flags = NoFlags;<br>
> if ( url.encodedQueryItemValue( s_showUri ) == s_true )<br>
> @@ -100,14 +100,14 @@ void Nepomuk::ResourcePageGenerator::setFlagsFromUrl( \
const KUrl& url )<br> > }<br>
><br>
><br>
> -KUrl Nepomuk::ResourcePageGenerator::url() const<br>
> +KUrl Nepomuk2::ResourcePageGenerator::url() const<br>
> {<br>
> return configureUrl( m_resource.resourceUri(), m_flags );<br>
> }<br>
><br>
><br>
> // TODO: create an html template rather than having it hardcoded here<br>
> -QByteArray Nepomuk::ResourcePageGenerator::generatePage() const<br>
> +QByteArray Nepomuk2::ResourcePageGenerator::generatePage() const<br>
> {<br>
> bool exists = m_resource.exists();<br>
><br>
> @@ -198,11 +198,11 @@ QByteArray Nepomuk::ResourcePageGenerator::generatePage() \
const<br> > os << "<h1>" << label << \
"</h1>"<br> > << "Type: " << ( \
exists ? typesToHtml( m_resource.types() ) : i18n( "Resource does not \
exist" ) );<br> ><br>
> - if(m_resource.isFile() && \
m_resource.hasType(Nepomuk::Vocabulary::NFO::Image())) {<br> > + \
if(m_resource.isFile() && \
m_resource.hasType(Nepomuk2::Vocabulary::NFO::Image())) {<br> > os \
<< "<img src=\"" << m_resource.resourceUri().toString() \
<< "\" />";<br> > }<br>
> - else if(m_resource.hasProperty(Nepomuk::Vocabulary::NFO::depiction())) \
{<br> > - os << "<img src=\"" << \
m_resource.property(Nepomuk::Vocabulary::NFO::depiction()).toUrlList().first().toString() \
<< "\" />";<br> > + else \
if(m_resource.hasProperty(Nepomuk2::Vocabulary::NFO::depiction())) {<br> > + \
os << "<img src=\"" << \
m_resource.property(Nepomuk2::Vocabulary::NFO::depiction()).toUrlList().first().toString() \
<< "\" />";<br> > }<br>
><br>
> os << "<h2>" << i18n("Relations:") \
<< "</h2><div \
id=\"relations\"><table>";<br> > @@ -211,7 +211,7 @@ \
QByteArray Nepomuk::ResourcePageGenerator::generatePage() const<br> > \
Soprano::StatementIterator it = \
ResourceManager::instance()->mainModel()->listStatements( \
m_resource.resourceUri(), Soprano::Node(), Soprano::Node() );<br> > while ( \
it.next() ) {<br> > Soprano::Statement s = it.current();<br>
> - Nepomuk::Types::Property p( s.predicate().uri() );<br>
> + Nepomuk2::Types::Property p( s.predicate().uri() );<br>
> if ( p != Soprano::Vocabulary::RDF::type() &&<br>
> ((m_flags & ShowNonUserVisible) || p.userVisible())) {<br>
> os << "<tr><td align=right><i>" \
<< entityLabel( p ) << "</i></td><td \
width=16px></td><td>";<br> > @@ -226,7 +226,7 @@ QByteArray \
Nepomuk::ResourcePageGenerator::generatePage() const<br> > //<br>
> KUrl uri = s.object().uri();<br>
> QString label = uri.fileName();<br>
> - if ( s.predicate() != Nepomuk::Vocabulary::NIE::url() ) {<br>
> + if ( s.predicate() != Nepomuk2::Vocabulary::NIE::url() ) {<br>
> Resource resource( uri );<br>
> uri = resource.resourceUri();<br>
> label = QString::fromLatin1( "%1 (%2)" )<br>
> @@ -248,7 +248,7 @@ QByteArray Nepomuk::ResourcePageGenerator::generatePage() \
const<br> > while ( itb.next() ) {<br>
> Soprano::Statement s = itb.current();<br>
> Resource resource( s.subject().uri() );<br>
> - Nepomuk::Types::Property p( s.predicate().uri() );<br>
> + Nepomuk2::Types::Property p( s.predicate().uri() );<br>
> if((m_flags & ShowNonUserVisible) || p.userVisible()) {<br>
> os << "<td align=right>"<br>
> << QString( "<a \
href=\"%1\">%2</a> (%3)" )<br> > @@ -274,7 +274,7 @@ \
QByteArray Nepomuk::ResourcePageGenerator::generatePage() const<br> > }<br>
><br>
><br>
> -QString Nepomuk::ResourcePageGenerator::resourceLabel( const Resource& res \
) const<br> > +QString Nepomuk2::ResourcePageGenerator::resourceLabel( const \
Resource& res ) const<br> > {<br>
> if ( m_flags & ShowUris )<br>
> return KUrl( res.resourceUri() ).prettyUrl();<br>
> @@ -283,7 +283,7 @@ QString Nepomuk::ResourcePageGenerator::resourceLabel( const \
Resource& res ) con<br> > }<br>
><br>
><br>
> -QString Nepomuk::ResourcePageGenerator::entityLabel( const \
Nepomuk::Types::Entity& e ) const<br> > +QString \
Nepomuk2::ResourcePageGenerator::entityLabel( const Nepomuk2::Types::Entity& e ) \
const<br> > {<br>
> if ( m_flags & ShowUris )<br>
> return KUrl( e.uri() ).prettyUrl();<br>
> @@ -292,17 +292,17 @@ QString Nepomuk::ResourcePageGenerator::entityLabel( const \
Nepomuk::Types::Entit<br> > }<br>
><br>
><br>
> -QString Nepomuk::ResourcePageGenerator::typesToHtml( const \
QList<QUrl>& types ) const<br> > +QString \
Nepomuk2::ResourcePageGenerator::typesToHtml( const QList<QUrl>& types ) \
const<br> > {<br>
> - QList<Nepomuk::Types::Class> typeClasses;<br>
> + QList<Nepomuk2::Types::Class> typeClasses;<br>
> foreach( const QUrl& type, types ) {<br>
> - typeClasses << Nepomuk::Types::Class( type );<br>
> + typeClasses << Nepomuk2::Types::Class( type );<br>
> }<br>
><br>
> // remove all types that are supertypes of others in the list<br>
> - QList<Nepomuk::Types::Class> normalizedTypes;<br>
> + QList<Nepomuk2::Types::Class> normalizedTypes;<br>
> for ( int i = 0; i < typeClasses.count(); ++i ) {<br>
> - Nepomuk::Types::Class& type = typeClasses[i];<br>
> + Nepomuk2::Types::Class& type = typeClasses[i];<br>
> bool use = true;<br>
> for ( int j = 0; j < typeClasses.count(); ++j ) {<br>
> if ( type != typeClasses[j] &&<br>
> @@ -329,13 +329,13 @@ QString Nepomuk::ResourcePageGenerator::typesToHtml( const \
QList<QUrl>& types )<br> > }<br>
><br>
><br>
> -QString Nepomuk::ResourcePageGenerator::encodeUrl( const QUrl& url ) \
const<br> > +QString Nepomuk2::ResourcePageGenerator::encodeUrl( const QUrl& \
url ) const<br> > {<br>
> return QString::fromAscii( configureUrl( url, m_flags ).toEncoded() );<br>
> }<br>
><br>
><br>
> -QString Nepomuk::ResourcePageGenerator::createConfigureBoxHtml() const<br>
> +QString Nepomuk2::ResourcePageGenerator::createConfigureBoxHtml() const<br>
> {<br>
> QString html<br>
> = 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>" )<br>
> @@ -347,12 +347,12 @@ QString \
Nepomuk::ResourcePageGenerator::createConfigureBoxHtml() const<br> > return \
html;<br> > }<br>
><br>
> -QString Nepomuk::ResourcePageGenerator::formatLiteral(const \
Nepomuk::Types::Property &p, const Soprano::LiteralValue &value) const<br> \
> +QString Nepomuk2::ResourcePageGenerator::formatLiteral(const \
Nepomuk2::Types::Property &p, const Soprano::LiteralValue &value) const<br> \
> {<br> > - return Nepomuk::Utils::formatPropertyValue(p, \
Nepomuk::Variant(value.variant()));<br> > + return \
Nepomuk2::Utils::formatPropertyValue(p, Nepomuk2::Variant(value.variant()));<br> > \
}<br> ><br>
> -QString Nepomuk::ResourcePageGenerator::formatResource(const \
Nepomuk::Types::Property &p, const QUrl &uri_) const<br> > +QString \
Nepomuk2::ResourcePageGenerator::formatResource(const Nepomuk2::Types::Property \
&p, const QUrl &uri_) const<br> > {<br>
> //<br>
> // nie:url is a special case for which we should never use Resource<br>
> diff --git a/nepomuk/kioslaves/nepomuk/resourcepagegenerator.h \
b/nepomuk/kioslaves/nepomuk/resourcepagegenerator.h<br> > index 68e5c44..63f67e8 \
100644<br> > --- a/nepomuk/kioslaves/nepomuk/resourcepagegenerator.h<br>
> +++ b/nepomuk/kioslaves/nepomuk/resourcepagegenerator.h<br>
> @@ -21,14 +21,14 @@<br>
> #ifndef _RESOURCE_PAGE_GENERATOR_H_<br>
> #define _RESOURCE_PAGE_GENERATOR_H_<br>
><br>
> -#include <Nepomuk/Resource><br>
> +#include <Nepomuk2/Resource><br>
><br>
> #include <QtCore/QList><br>
> #include <KUrl><br>
><br>
> class QByteArray;<br>
><br>
> -namespace Nepomuk {<br>
> +namespace Nepomuk2 {<br>
> namespace Types {<br>
> class Entity;<br>
> }<br>
> @@ -36,7 +36,7 @@ namespace Nepomuk {<br>
> class ResourcePageGenerator<br>
> {<br>
> public:<br>
> - ResourcePageGenerator( const Nepomuk::Resource& res );<br>
> + ResourcePageGenerator( const Nepomuk2::Resource& res );<br>
> ~ResourcePageGenerator();<br>
><br>
> enum Flag {<br>
> @@ -61,18 +61,18 @@ namespace Nepomuk {<br>
><br>
> private:<br>
> QString resourceLabel( const Resource& res ) const;<br>
> - QString entityLabel( const Nepomuk::Types::Entity& e ) const;<br>
> + QString entityLabel( const Nepomuk2::Types::Entity& e ) const;<br>
> QString typesToHtml( const QList<QUrl>& types ) const;<br>
> QString encodeUrl( const QUrl& u ) const;<br>
> QString createConfigureBoxHtml() const;<br>
> - QString formatLiteral(const Nepomuk::Types::Property& prop, const \
Soprano::LiteralValue &value) const;<br> > - QString \
formatResource(const Nepomuk::Types::Property& p, const QUrl &uri_) \
const;<br> > + QString formatLiteral(const Nepomuk2::Types::Property& \
prop, const Soprano::LiteralValue &value) const;<br> > + QString \
formatResource(const Nepomuk2::Types::Property& p, const QUrl &uri_) \
const;<br> ><br>
> - Nepomuk::Resource m_resource;<br>
> + Nepomuk2::Resource m_resource;<br>
> Flags m_flags;<br>
> };<br>
> }<br>
><br>
> -Q_DECLARE_OPERATORS_FOR_FLAGS( Nepomuk::ResourcePageGenerator::Flags )<br>
> +Q_DECLARE_OPERATORS_FOR_FLAGS( Nepomuk2::ResourcePageGenerator::Flags )<br>
><br>
> #endif<br>
> diff --git a/nepomuk/kioslaves/search/CMakeLists.txt \
b/nepomuk/kioslaves/search/CMakeLists.txt<br> > index dd12acf..cc231e5 100644<br>
> --- a/nepomuk/kioslaves/search/CMakeLists.txt<br>
> +++ b/nepomuk/kioslaves/search/CMakeLists.txt<br>
> @@ -9,7 +9,7 @@ include_directories(<br>
> ${KDE4_INCLUDES}<br>
> ${KDE4_KIO_INCLUDES}<br>
> ${SOPRANO_INCLUDE_DIR}<br>
> - ${NEPOMUK_INCLUDE_DIR}<br>
> + ${NEPOMUK_CORE_INCLUDE_DIR}<br>
> ${CMAKE_CURRENT_BINARY_DIR}<br>
> ${nepomuk_kio_slaves_SOURCE_DIR}/common<br>
> )<br>
> @@ -22,7 +22,7 @@ set(kio_nepomuksearch_PART_SRCS<br>
> ../common/resourcestat.cpp<br>
> )<br>
><br>
> -soprano_add_ontology(kio_nepomuksearch_PART_SRCS \
${nepomuk_ontologies_SOURCE_DIR}/kext.trig "KExt" \
"Nepomuk::Vocabulary" "trig")<br> > \
+soprano_add_ontology(kio_nepomuksearch_PART_SRCS \
${NEPOMUK_CORE_ONTOLOGY_DIR}/kde/kext.trig "KExt" \
"Nepomuk2::Vocabulary" "trig")<br> ><br>
> kde4_add_plugin(kio_nepomuksearch<br>
> ${kio_nepomuksearch_PART_SRCS})<br>
> @@ -31,8 +31,7 @@ target_link_libraries(kio_nepomuksearch<br>
> nepomukcommon<br>
> ${KDE4_KIO_LIBS}<br>
> ${KDE4_SOLID_LIBS}<br>
> - ${NEPOMUK_LIBRARIES}<br>
> - ${NEPOMUK_QUERY_LIBRARIES}<br>
> + ${NEPOMUK_CORE_LIBRARIES}<br>
> ${SOPRANO_LIBRARIES}<br>
> )<br>
><br>
> diff --git a/nepomuk/kioslaves/search/kdedmodule/CMakeLists.txt \
b/nepomuk/kioslaves/search/kdedmodule/CMakeLists.txt<br> > index 807dc0c..1c241be \
100644<br> > --- a/nepomuk/kioslaves/search/kdedmodule/CMakeLists.txt<br>
> +++ b/nepomuk/kioslaves/search/kdedmodule/CMakeLists.txt<br>
> @@ -1,7 +1,7 @@<br>
> include_directories(<br>
> ${QT_INCLUDES}<br>
> ${KDE4_INCLUDES}<br>
> - ${NEPOMUK_INCLUDE_DIR}<br>
> + ${NEPOMUK_CORE_INCLUDE_DIR}<br>
> ${nepomuk_kio_slaves_SOURCE_DIR}/common<br>
> )<br>
><br>
> @@ -14,30 +14,30 @@ set(nepomuksearchmodule_SRCS<br>
> ../../common/timelinetools.cpp<br>
> )<br>
><br>
> -soprano_add_ontology(nepomuksearchmodule_SRCS \
${nepomuk_ontologies_SOURCE_DIR}/kext.trig "KExt" \
"Nepomuk::Vocabulary" "trig")<br> > \
+soprano_add_ontology(nepomuksearchmodule_SRCS \
${NEPOMUK_CORE_ONTOLOGY_DIR}/kde/kext.trig "KExt" \
"Nepomuk2::Vocabulary" "trig")<br> ><br>
> -set_source_files_properties(<br>
> - ${nepomuk_kio_slaves_SOURCE_DIR}/../interfaces/org.kde.nepomuk.Query.xml<br>
> - PROPERTIES INCLUDE "nepomuk/result.h")<br>
> -set_source_files_properties(<br>
> - ${nepomuk_kio_slaves_SOURCE_DIR}/../interfaces/org.kde.nepomuk.QueryService.xml<br>
> - PROPERTIES INCLUDE "dbusoperators_p.h")<br>
> +#set_source_files_properties(<br>
> +# ${NEPOMUK_CORE_DBUS_INTERFACE_DIR}/org.kde.nepomuk.Query.xml<br>
> +# PROPERTIES INCLUDE "nepomuk2/result.h")<br>
><br>
> -qt4_add_dbus_interface(nepomuksearchmodule_SRCS<br>
> - ${nepomuk_kio_slaves_SOURCE_DIR}/../interfaces/org.kde.nepomuk.QueryService.xml<br>
> - queryserviceinterface)<br>
> -qt4_add_dbus_interface(nepomuksearchmodule_SRCS<br>
> - ${nepomuk_kio_slaves_SOURCE_DIR}/../interfaces/org.kde.nepomuk.Query.xml<br>
> - queryinterface)<br>
> +#set_source_files_properties(<br>
> +# ${NEPOMUK_CORE_DBUS_INTERFACE_DIR}/org.kde.nepomuk.QueryService.xml<br>
> +# PROPERTIES INCLUDE "dbusoperators_p.h")<br>
> +<br>
> +#qt4_add_dbus_interface(nepomuksearchmodule_SRCS<br>
> +# ${NEPOMUK_CORE_DBUS_INTERFACE_DIR}/org.kde.nepomuk.QueryService.xml<br>
> +# queryserviceinterface)<br>
> +#qt4_add_dbus_interface(nepomuksearchmodule_SRCS<br>
> +# ${NEPOMUK_CORE_DBUS_INTERFACE_DIR}/org.kde.nepomuk.Query.xml<br>
> +# queryinterface)<br>
><br>
> kde4_add_plugin(kded_nepomuksearchmodule ${nepomuksearchmodule_SRCS})<br>
><br>
> -target_link_libraries(kded_nepomuksearchmodule<br>
> +target_link_libraries(kded_nepomuksearchmodule<br>
> nepomukcommon<br>
> ${KDE4_KDECORE_LIBS}<br>
> ${KDE4_KIO_LIBS}<br>
> - ${NEPOMUK_LIBRARIES}<br>
> - ${NEPOMUK_QUERY_LIBRARIES}<br>
> + ${NEPOMUK_CORE_LIBRARIES}<br>
> ${SOPRANO_LIBRARIES}<br>
> )<br>
><br>
> diff --git a/nepomuk/kioslaves/search/kdedmodule/dbusoperators_p.h \
b/nepomuk/kioslaves/search/kdedmodule/dbusoperators_p.h<br> > index \
62f19e9..ea06487 100644<br> > --- \
a/nepomuk/kioslaves/search/kdedmodule/dbusoperators_p.h<br> > +++ \
b/nepomuk/kioslaves/search/kdedmodule/dbusoperators_p.h<br> > @@ -23,18 +23,18 \
@@<br> ><br>
> #include <QtDBus/QDBusArgument><br>
><br>
> -#include <nepomuk/result.h><br>
> -#include <nepomuk/query.h><br>
> -#include <nepomuk/term.h><br>
> -#include <nepomuk/nepomukquery_export.h><br>
> +#include <nepomuk2/result.h><br>
> +#include <nepomuk2/query.h><br>
> +#include <nepomuk2/term.h><br>
> +#include <nepomuk2/nepomuk_export.h><br>
><br>
> -Q_DECLARE_METATYPE(Nepomuk::Query::Result)<br>
> +Q_DECLARE_METATYPE(Nepomuk2::Query::Result)<br>
> Q_DECLARE_METATYPE(Soprano::Node)<br>
> -Q_DECLARE_METATYPE(QList<Nepomuk::Query::Result>)<br>
> +Q_DECLARE_METATYPE(QList<Nepomuk2::Query::Result>)<br>
> typedef QHash<QString, QString> RequestPropertyMapDBus;<br>
> Q_DECLARE_METATYPE( RequestPropertyMapDBus )<br>
><br>
> -namespace Nepomuk {<br>
> +namespace Nepomuk2 {<br>
> namespace Query {<br>
> /**<br>
> * Register the DBus types necessary for communication with the \
Nepomuk<br> > @@ -46,10 +46,10 @@ namespace Nepomuk {<br>
> }<br>
><br>
> // We export the non-public operators so that we do not need duplicated code in \
kdebase<br> > -NEPOMUKQUERY_EXPORT QDBusArgument& operator<<( \
QDBusArgument& arg, const Soprano::Node& );<br> > -NEPOMUKQUERY_EXPORT \
const QDBusArgument& operator>>( const QDBusArgument& arg, \
Soprano::Node& );<br> > +NEPOMUK_EXPORT QDBusArgument& operator<<( \
QDBusArgument& arg, const Soprano::Node& );<br> > +NEPOMUK_EXPORT const \
QDBusArgument& operator>>( const QDBusArgument& arg, Soprano::Node& \
);<br> ><br>
> -NEPOMUKQUERY_EXPORT QDBusArgument& operator<<( QDBusArgument& \
arg, const Nepomuk::Query::Result& );<br> > -NEPOMUKQUERY_EXPORT const \
QDBusArgument& operator>>( const QDBusArgument& arg, \
Nepomuk::Query::Result& );<br> > +NEPOMUK_EXPORT QDBusArgument& \
operator<<( QDBusArgument& arg, const Nepomuk2::Query::Result& );<br> \
> +NEPOMUK_EXPORT const QDBusArgument& operator>>( const \
QDBusArgument& arg, Nepomuk2::Query::Result& );<br> ><br>
> #endif<br>
> diff --git a/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.cpp \
b/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.cpp<br> > index \
56764fc..a319f84 100644<br> > --- \
a/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.cpp<br> > +++ \
b/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.cpp<br> > @@ -25,7 +25,7 \
@@<br> > #include <QtDBus/QDBusConnection><br>
> #include <QtDBus/QDBusServiceWatcher><br>
><br>
> -#include <Nepomuk/Vocabulary/NIE><br>
> +#include <Nepomuk2/Vocabulary/NIE><br>
><br>
> #include <kdebug.h><br>
> #include <kdirnotify.h><br>
> @@ -50,12 +50,12 @@ namespace {<br>
> }<br>
><br>
><br>
> -Nepomuk::SearchModule::SearchModule( QObject* parent, const \
QList<QVariant>& )<br> > +Nepomuk2::SearchModule::SearchModule( QObject* \
parent, const QList<QVariant>& )<br> > : KDEDModule( parent )<br>
> {<br>
> kDebug();<br>
><br>
> - Nepomuk::Query::registerDBusTypes();<br>
> + Nepomuk2::Query::registerDBusTypes();<br>
><br>
> //<br>
> // connect to serviceOwnerChanged to catch crashed clients that never \
unregistered<br> > @@ -86,13 +86,13 @@ Nepomuk::SearchModule::SearchModule( \
QObject* parent, const QList<QVariant>& )<br> > }<br>
><br>
><br>
> -Nepomuk::SearchModule::~SearchModule()<br>
> +Nepomuk2::SearchModule::~SearchModule()<br>
> {<br>
> kDebug();<br>
> }<br>
><br>
><br>
> -void Nepomuk::SearchModule::registerSearchUrl( const QString& urlString \
)<br> > +void Nepomuk2::SearchModule::registerSearchUrl( const QString& \
urlString )<br> > {<br>
> const KUrl url( urlString );<br>
> KUrl queryUrl;<br>
> @@ -102,8 +102,8 @@ void Nepomuk::SearchModule::registerSearchUrl( const \
QString& urlString )<br> > }<br>
> else if ( isTimelineUrl( url ) ) {<br>
> QDate date;<br>
> - if ( Nepomuk::parseTimelineUrl( url, &date ) == Nepomuk::DayFolder \
)<br> > - queryUrl = Nepomuk::buildTimelineQuery( date \
).toSearchUrl();<br> > + if ( Nepomuk2::parseTimelineUrl( url, &date ) \
== Nepomuk2::DayFolder )<br> > + queryUrl = \
Nepomuk2::buildTimelineQuery( date ).toSearchUrl();<br> > }<br>
><br>
> if ( queryUrl.isValid() ) {<br>
> @@ -126,7 +126,7 @@ void Nepomuk::SearchModule::registerSearchUrl( const \
QString& urlString )<br> > }<br>
><br>
><br>
> -void Nepomuk::SearchModule::unregisterSearchUrl( const QString& urlString \
)<br> > +void Nepomuk2::SearchModule::unregisterSearchUrl( const QString& \
urlString )<br> > {<br>
> const KUrl url( urlString );<br>
> if ( isNepomukSearchOrTimelineUrl( url ) ) {<br>
> @@ -141,13 +141,13 @@ void Nepomuk::SearchModule::unregisterSearchUrl( const \
QString& urlString )<br> > }<br>
><br>
><br>
> -QStringList Nepomuk::SearchModule::watchedSearchUrls()<br>
> +QStringList Nepomuk2::SearchModule::watchedSearchUrls()<br>
> {<br>
> return KUrl::List( m_queryHash.keys() ).toStringList();<br>
> }<br>
><br>
><br>
> -void Nepomuk::SearchModule::slotServiceUnregistered( const QString& \
serviceName )<br> > +void Nepomuk2::SearchModule::slotServiceUnregistered( const \
QString& serviceName )<br> > {<br>
> QHash<QString, KUrl>::iterator it = m_dbusServiceUrlHash.find( \
serviceName );<br> > while ( it != m_dbusServiceUrlHash.end() ) {<br>
> @@ -159,7 +159,7 @@ void Nepomuk::SearchModule::slotServiceUnregistered( const \
QString& serviceName<br> > }<br>
><br>
><br>
> -void Nepomuk::SearchModule::unrefUrl( const KUrl& url )<br>
> +void Nepomuk2::SearchModule::unrefUrl( const KUrl& url )<br>
> {<br>
> QHash<KUrl, SearchUrlListener*>::iterator it = m_queryHash.find( url \
);<br> > if ( it != m_queryHash.end() ) {<br>
> @@ -174,7 +174,7 @@ void Nepomuk::SearchModule::unrefUrl( const KUrl& url \
)<br> > #include <kpluginloader.h><br>
><br>
> K_PLUGIN_FACTORY(NepomukSearchModuleFactory,<br>
> - registerPlugin<Nepomuk::SearchModule>();<br>
> + registerPlugin<Nepomuk2::SearchModule>();<br>
> )<br>
> K_EXPORT_PLUGIN(NepomukSearchModuleFactory("nepomuksearchmodule"))<br>
><br>
> diff --git a/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.h \
b/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.h<br> > index \
97f005d..a19b23c 100644<br> > --- \
a/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.h<br> > +++ \
b/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.h<br> > @@ -28,7 +28,7 \
@@<br> ><br>
> class QDBusServiceWatcher;<br>
><br>
> -namespace Nepomuk {<br>
> +namespace Nepomuk2 {<br>
><br>
> class SearchUrlListener;<br>
><br>
> diff --git a/nepomuk/kioslaves/search/kdedmodule/searchurllistener.cpp \
b/nepomuk/kioslaves/search/kdedmodule/searchurllistener.cpp<br> > index \
2333e38..c260485 100644<br> > --- \
a/nepomuk/kioslaves/search/kdedmodule/searchurllistener.cpp<br> > +++ \
b/nepomuk/kioslaves/search/kdedmodule/searchurllistener.cpp<br> > @@ -25,9 +25,9 \
@@<br> ><br>
> #include <kdirnotify.h><br>
> #include <kdebug.h><br>
> -#include <nepomuk/result.h><br>
> -#include <nepomuk/query.h><br>
> -#include <nepomuk/resource.h><br>
> +#include <Nepomuk2/Result/Result><br>
> +#include <Nepomuk2/Query/Query><br>
> +#include <Nepomuk2/Resource><br>
><br>
> #include <QtCore/QHash><br>
> #include <QtDBus/QDBusConnection><br>
> @@ -37,7 +37,7 @@<br>
> #include <Soprano/BindingSet><br>
><br>
><br>
> -Nepomuk::SearchUrlListener::SearchUrlListener( const KUrl& queryUrl, const \
KUrl& notifyUrl )<br> > +Nepomuk2::SearchUrlListener::SearchUrlListener( const \
KUrl& queryUrl, const KUrl& notifyUrl )<br> > : QObject( 0 ),<br>
> m_ref( 0 ),<br>
> m_queryUrl( queryUrl ),<br>
> @@ -67,7 +67,7 @@ Nepomuk::SearchUrlListener::SearchUrlListener( const KUrl& \
queryUrl, const KUrl&<br> > }<br>
><br>
><br>
> -Nepomuk::SearchUrlListener::~SearchUrlListener()<br>
> +Nepomuk2::SearchUrlListener::~SearchUrlListener()<br>
> {<br>
> kDebug() << m_queryUrl;<br>
><br>
> @@ -77,35 +77,35 @@ Nepomuk::SearchUrlListener::~SearchUrlListener()<br>
> }<br>
><br>
><br>
> -int Nepomuk::SearchUrlListener::ref()<br>
> +int Nepomuk2::SearchUrlListener::ref()<br>
> {<br>
> return ++m_ref;<br>
> }<br>
><br>
><br>
> -int Nepomuk::SearchUrlListener::unref()<br>
> +int Nepomuk2::SearchUrlListener::unref()<br>
> {<br>
> return --m_ref;<br>
> }<br>
><br>
><br>
> -void Nepomuk::SearchUrlListener::slotNewEntries( const \
QList<Nepomuk::Query::Result>& )<br> > +void \
Nepomuk2::SearchUrlListener::slotNewEntries( const \
QList<Nepomuk2::Query::Result>& )<br> > {<br>
> org::kde::KDirNotify::emitFilesAdded( m_notifyUrl.url() );<br>
> }<br>
><br>
><br>
> -void Nepomuk::SearchUrlListener::slotEntriesRemoved( const \
QList<Nepomuk::Query::Result>& entries )<br> > +void \
Nepomuk2::SearchUrlListener::slotEntriesRemoved( const \
QList<Nepomuk2::Query::Result>& entries )<br> > {<br>
> QStringList urls;<br>
> foreach( const Query::Result& result, entries ) {<br>
> // make sure we use the exact same name used in searchfolder.cpp<br>
> KUrl url( result.resource().resourceUri() );<br>
> - if( result.requestProperties().contains(Nepomuk::Vocabulary::NIE::url()) \
)<br> > - url = result[Nepomuk::Vocabulary::NIE::url()].uri();<br>
> + if( result.requestProperties().contains(Nepomuk2::Vocabulary::NIE::url()) \
)<br> > + url = result[Nepomuk2::Vocabulary::NIE::url()].uri();<br>
><br>
> KUrl resultUrl( m_notifyUrl );<br>
> - resultUrl.addPath( Nepomuk::resourceUriToUdsName( url ) );<br>
> + resultUrl.addPath( Nepomuk2::resourceUriToUdsName( url ) );<br>
> urls << resultUrl.url();<br>
> }<br>
> kDebug() << urls;<br>
> @@ -113,7 +113,7 @@ void Nepomuk::SearchUrlListener::slotEntriesRemoved( const \
QList<Nepomuk::Query:<br> > }<br>
><br>
><br>
> -void Nepomuk::SearchUrlListener::slotQueryServiceInitialized( bool success \
)<br> > +void Nepomuk2::SearchUrlListener::slotQueryServiceInitialized( bool \
success )<br> > {<br>
> kDebug() << m_queryUrl << success;<br>
><br>
> @@ -127,7 +127,7 @@ void \
Nepomuk::SearchUrlListener::slotQueryServiceInitialized( bool success )<br> > \
}<br> ><br>
><br>
> -void Nepomuk::SearchUrlListener::createInterface()<br>
> +void Nepomuk2::SearchUrlListener::createInterface()<br>
> {<br>
> kDebug() << m_queryUrl;<br>
><br>
> @@ -156,10 +156,10 @@ void Nepomuk::SearchUrlListener::createInterface()<br>
> m_queryInterface = new org::kde::nepomuk::Query( queryService,<br>
> r.value().path(),<br>
> \
QDBusConnection::sessionBus() );<br> > - connect( m_queryInterface, SIGNAL( \
newEntries( QList<Nepomuk::Query::Result> ) ),<br> > - this, \
SLOT( slotNewEntries( QList<Nepomuk::Query::Result> ) ) );<br> > - \
connect( m_queryInterface, SIGNAL( entriesRemoved( \
QList<Nepomuk::Query::Result> ) ),<br> > - this, SLOT( \
slotEntriesRemoved( QList<Nepomuk::Query::Result> ) ) );<br> > + \
connect( m_queryInterface, SIGNAL( newEntries( QList<Nepomuk2::Query::Result> ) \
),<br> > + this, SLOT( slotNewEntries( \
QList<Nepomuk2::Query::Result> ) ) );<br> > + connect( \
m_queryInterface, SIGNAL( entriesRemoved( QList<Nepomuk2::Query::Result> ) \
),<br> > + this, SLOT( slotEntriesRemoved( \
QList<Nepomuk2::Query::Result> ) ) );<br> > \
m_queryInterface->listen();<br> > }<br>
> }<br>
> diff --git a/nepomuk/kioslaves/search/kdedmodule/searchurllistener.h \
b/nepomuk/kioslaves/search/kdedmodule/searchurllistener.h<br> > index \
ba2d3bc..8d9aa29 100644<br> > --- \
a/nepomuk/kioslaves/search/kdedmodule/searchurllistener.h<br> > +++ \
b/nepomuk/kioslaves/search/kdedmodule/searchurllistener.h<br> > @@ -25,12 +25,12 \
@@<br> > #include <QtDBus/QDBusObjectPath><br>
><br>
> #include <kurl.h><br>
> -#include <nepomuk/result.h><br>
> +#include <nepomuk2/result.h><br>
><br>
> #include "queryinterface.h"<br>
><br>
><br>
> -namespace Nepomuk {<br>
> +namespace Nepomuk2 {<br>
> class SearchUrlListener : public QObject<br>
> {<br>
> Q_OBJECT<br>
> @@ -46,8 +46,8 @@ namespace Nepomuk {<br>
> KUrl notificationUrl() const { return m_notifyUrl; }<br>
><br>
> private Q_SLOTS:<br>
> - void slotNewEntries( const QList<Nepomuk::Query::Result>& \
entries );<br> > - void slotEntriesRemoved( const \
QList<Nepomuk::Query::Result>& entries );<br> > + void \
slotNewEntries( const QList<Nepomuk2::Query::Result>& entries );<br> > + \
void slotEntriesRemoved( const QList<Nepomuk2::Query::Result>& entries \
);<br> > void slotQueryServiceInitialized( bool success );<br>
><br>
> private:<br>
> diff --git a/nepomuk/kioslaves/search/kio_nepomuksearch.cpp \
b/nepomuk/kioslaves/search/kio_nepomuksearch.cpp<br> > index e26dd84..38894be \
100644<br> > --- a/nepomuk/kioslaves/search/kio_nepomuksearch.cpp<br>
> +++ b/nepomuk/kioslaves/search/kio_nepomuksearch.cpp<br>
> @@ -37,24 +37,24 @@<br>
> #include <KStandardDirs><br>
> #include <KFileItem><br>
><br>
> -#include <Nepomuk/Thing><br>
> -#include <Nepomuk/ResourceManager><br>
> -#include <Nepomuk/Variant><br>
> -#include <Nepomuk/Query/QueryServiceClient><br>
> -#include <Nepomuk/Query/ComparisonTerm><br>
> -#include <Nepomuk/Query/ResourceTypeTerm><br>
> -#include <Nepomuk/Query/AndTerm><br>
> -#include <Nepomuk/Query/NegationTerm><br>
> -#include <Nepomuk/Query/Query><br>
> +#include <Nepomuk2/Thing><br>
> +#include <Nepomuk2/ResourceManager><br>
> +#include <Nepomuk2/Variant><br>
> +#include <Nepomuk2/Query/QueryServiceClient><br>
> +#include <Nepomuk2/Query/ComparisonTerm><br>
> +#include <Nepomuk2/Query/ResourceTypeTerm><br>
> +#include <Nepomuk2/Query/AndTerm><br>
> +#include <Nepomuk2/Query/NegationTerm><br>
> +#include <Nepomuk2/Query/Query><br>
><br>
> #include <Soprano/Vocabulary/RDF><br>
> #include <Soprano/Vocabulary/RDFS><br>
> #include <Soprano/Vocabulary/NRL><br>
> #include <Soprano/Vocabulary/NAO><br>
> #include <Soprano/Vocabulary/XMLSchema><br>
> -#include <Nepomuk/Vocabulary/NFO><br>
> -#include <Nepomuk/Vocabulary/NIE><br>
> -#include <Nepomuk/Vocabulary/PIMO><br>
> +#include <Nepomuk2/Vocabulary/NFO><br>
> +#include <Nepomuk2/Vocabulary/NIE><br>
> +#include <Nepomuk2/Vocabulary/PIMO><br>
><br>
> #include <sys/types.h><br>
> #include <unistd.h><br>
> @@ -69,12 +69,12 @@ namespace {<br>
> uds.insert( KIO::UDSEntry::UDS_MIME_TYPE, QString::fromLatin1( \
"inode/directory" ) );<br> > uds.insert( \
KIO::UDSEntry::UDS_ICON_OVERLAY_NAMES, QLatin1String( "nepomuk" ) );<br> \
> uds.insert( KIO::UDSEntry::UDS_DISPLAY_TYPE, i18n( "Query \
folder" ) );<br> > - uds.insert( KIO::UDSEntry::UDS_NAME, \
Nepomuk::Query::Query::titleFromQueryUrl( url ) );<br> > - uds.insert( \
KIO::UDSEntry::UDS_DISPLAY_NAME, Nepomuk::Query::Query::titleFromQueryUrl( url ) \
);<br> > + uds.insert( KIO::UDSEntry::UDS_NAME, \
Nepomuk2::Query::Query::titleFromQueryUrl( url ) );<br> > + uds.insert( \
KIO::UDSEntry::UDS_DISPLAY_NAME, Nepomuk2::Query::Query::titleFromQueryUrl( url ) \
);<br> > if ( url.hasQueryItem( QLatin1String( "resource" ) ) ) \
{<br> > - Nepomuk::addGenericNepomukResourceData( Nepomuk::Resource( \
KUrl( url.queryItemValue( QLatin1String( "resource" ) ) ) ), uds );<br> \
> + Nepomuk2::addGenericNepomukResourceData( Nepomuk2::Resource( KUrl( \
url.queryItemValue( QLatin1String( "resource" ) ) ) ), uds );<br> > \
}<br> > - Nepomuk::Query::Query query = \
Nepomuk::Query::Query::fromQueryUrl( url );<br> > + Nepomuk2::Query::Query \
query = Nepomuk2::Query::Query::fromQueryUrl( url );<br> > if ( \
query.isValid() )<br> > uds.insert( KIO::UDSEntry::UDS_NEPOMUK_QUERY, \
query.toString() );<br> > return uds;<br>
> @@ -102,23 +102,23 @@ namespace {<br>
> }<br>
><br>
> KUrl convertLegacyQueryUrl( const KUrl& url ) {<br>
> - KUrl newUrl(QLatin1String("nepomuksearch:/") + \
Nepomuk::Query::Query::titleFromQueryUrl(url));<br> > - \
Nepomuk::Query::Query query = Nepomuk::Query::Query::fromQueryUrl(url);<br> > + \
KUrl newUrl(QLatin1String("nepomuksearch:/") + \
Nepomuk2::Query::Query::titleFromQueryUrl(url));<br> > + \
Nepomuk2::Query::Query query = Nepomuk2::Query::Query::fromQueryUrl(url);<br> > \
if(query.isValid())<br> > \
newUrl.addQueryItem(QLatin1String("encodedquery"), query.toString());<br> \
> else<br> > - \
newUrl.addQueryItem(QLatin1String("sparql"), \
Nepomuk::Query::Query::sparqlFromQueryUrl(url));<br> > + \
newUrl.addQueryItem(QLatin1String("sparql"), \
Nepomuk2::Query::Query::sparqlFromQueryUrl(url));<br> > return \
newUrl;<br> > }<br>
><br>
> - Nepomuk::Query::Query rootQuery() {<br>
> + Nepomuk2::Query::Query rootQuery() {<br>
> KConfig config( "kio_nepomuksearchrc" );<br>
> QString queryStr = config.group( "General" ).readEntry( \
"Root query", QString() );<br> > - Nepomuk::Query::Query \
query;<br> > + Nepomuk2::Query::Query query;<br>
> if ( queryStr.isEmpty() )<br>
> - query = Nepomuk::lastModifiedFilesQuery();<br>
> + query = Nepomuk2::lastModifiedFilesQuery();<br>
> else<br>
> - query = Nepomuk::Query::Query::fromString( queryStr );<br>
> + query = Nepomuk2::Query::Query::fromString( queryStr );<br>
> query.setLimit( config.group( "General" ).readEntry( \
"Root query limit", 10 ) );<br> > return query;<br>
> }<br>
> @@ -126,26 +126,26 @@ namespace {<br>
> }<br>
><br>
><br>
> -Nepomuk::SearchProtocol::SearchProtocol( const QByteArray& poolSocket, \
const QByteArray& appSocket )<br> > +Nepomuk2::SearchProtocol::SearchProtocol( \
const QByteArray& poolSocket, const QByteArray& appSocket )<br> > : \
KIO::ForwardingSlaveBase( "nepomuksearch", poolSocket, appSocket )<br> > \
{<br> > }<br>
><br>
><br>
> -Nepomuk::SearchProtocol::~SearchProtocol()<br>
> +Nepomuk2::SearchProtocol::~SearchProtocol()<br>
> {<br>
> }<br>
><br>
><br>
> -bool Nepomuk::SearchProtocol::ensureNepomukRunning( bool emitError )<br>
> +bool Nepomuk2::SearchProtocol::ensureNepomukRunning( bool emitError )<br>
> {<br>
> - if ( Nepomuk::ResourceManager::instance()->init() ) {<br>
> + if ( Nepomuk2::ResourceManager::instance()->init() ) {<br>
> kDebug() << "Failed to init Nepomuk";<br>
> if ( emitError )<br>
> error( KIO::ERR_SLAVE_DEFINED, i18n( "The desktop search \
service is not activated. Unable to answer queries without it." ) );<br> > \
return false;<br> > }<br>
> - else if ( !Nepomuk::Query::QueryServiceClient::serviceAvailable() ) {<br>
> + else if ( !Nepomuk2::Query::QueryServiceClient::serviceAvailable() ) {<br>
> kDebug() << "Nepomuk Query service is not \
running.";<br> > if ( emitError )<br>
> error( KIO::ERR_SLAVE_DEFINED, i18n( "The desktop search query \
service is not running. Unable to answer queries without it." ) );<br> > @@ \
-157,7 +157,7 @@ bool Nepomuk::SearchProtocol::ensureNepomukRunning( bool emitError \
)<br> > }<br>
><br>
><br>
> -void Nepomuk::SearchProtocol::listDir( const KUrl& url )<br>
> +void Nepomuk2::SearchProtocol::listDir( const KUrl& url )<br>
> {<br>
> kDebug() << url;<br>
><br>
> @@ -197,7 +197,7 @@ void Nepomuk::SearchProtocol::listDir( const KUrl& url \
)<br> > }<br>
><br>
><br>
> -void Nepomuk::SearchProtocol::get( const KUrl& url )<br>
> +void Nepomuk2::SearchProtocol::get( const KUrl& url )<br>
> {<br>
> kDebug() << url;<br>
><br>
> @@ -208,7 +208,7 @@ void Nepomuk::SearchProtocol::get( const KUrl& url )<br>
> }<br>
><br>
><br>
> -void Nepomuk::SearchProtocol::put( const KUrl& url, int permissions, \
KIO::JobFlags flags )<br> > +void Nepomuk2::SearchProtocol::put( const KUrl& \
url, int permissions, KIO::JobFlags flags )<br> > {<br>
> kDebug() << url << permissions << flags;<br>
><br>
> @@ -220,7 +220,7 @@ void Nepomuk::SearchProtocol::put( const KUrl& url, int \
permissions, KIO::JobFla<br> > }<br>
><br>
><br>
> -void Nepomuk::SearchProtocol::mimetype( const KUrl& url )<br>
> +void Nepomuk2::SearchProtocol::mimetype( const KUrl& url )<br>
> {<br>
> kDebug() << url;<br>
><br>
> @@ -246,7 +246,7 @@ void Nepomuk::SearchProtocol::mimetype( const KUrl& url \
)<br> > }<br>
><br>
><br>
> -void Nepomuk::SearchProtocol::stat( const KUrl& url )<br>
> +void Nepomuk2::SearchProtocol::stat( const KUrl& url )<br>
> {<br>
> kDebug() << url;<br>
><br>
> @@ -283,22 +283,22 @@ void Nepomuk::SearchProtocol::stat( const KUrl& url \
)<br> > }<br>
><br>
><br>
> -void Nepomuk::SearchProtocol::del(const KUrl& url, bool isFile)<br>
> +void Nepomuk2::SearchProtocol::del(const KUrl& url, bool isFile)<br>
> {<br>
> ForwardingSlaveBase::del( url, isFile );<br>
> }<br>
><br>
><br>
> -bool Nepomuk::SearchProtocol::rewriteUrl( const KUrl& url, KUrl& newURL \
)<br> > +bool Nepomuk2::SearchProtocol::rewriteUrl( const KUrl& url, KUrl& \
newURL )<br> > {<br>
> // we do it the speedy but slightly umpf way: decode the encoded URI from \
the filename<br> > - newURL = Nepomuk::udsNameToResourceUri( url.fileName() \
);<br> > + newURL = Nepomuk2::udsNameToResourceUri( url.fileName() );<br>
> kDebug() << "URL:" << url << "NEW \
URL:" << newURL << newURL.protocol() << newURL.path() << \
newURL.fileName();<br> > return !newURL.isEmpty();<br>
> }<br>
><br>
><br>
> -void Nepomuk::SearchProtocol::prepareUDSEntry( KIO::UDSEntry& uds, bool \
listing ) const<br> > +void Nepomuk2::SearchProtocol::prepareUDSEntry( \
KIO::UDSEntry& uds, bool listing ) const<br> > {<br>
> // do nothing - we do everything in SearchFolder::statResult<br>
> Q_UNUSED(uds);<br>
> @@ -306,7 +306,7 @@ void Nepomuk::SearchProtocol::prepareUDSEntry( \
KIO::UDSEntry& uds, bool listing<br> > }<br>
><br>
><br>
> -void Nepomuk::SearchProtocol::listRoot()<br>
> +void Nepomuk2::SearchProtocol::listRoot()<br>
> {<br>
> kDebug();<br>
><br>
> @@ -323,13 +323,13 @@ void Nepomuk::SearchProtocol::listRoot()<br>
> }<br>
><br>
><br>
> -Nepomuk::SearchFolder* Nepomuk::SearchProtocol::getQueryFolder( const KUrl& \
url )<br> > +Nepomuk2::SearchFolder* Nepomuk2::SearchProtocol::getQueryFolder( \
const KUrl& url )<br> > {<br>
> return new SearchFolder( url, this );<br>
> }<br>
><br>
><br>
> -void Nepomuk::SearchProtocol::updateQueryUrlHistory( const KUrl& url )<br>
> +void Nepomuk2::SearchProtocol::updateQueryUrlHistory( const KUrl& url )<br>
> {<br>
> //<br>
> // if the url is already in the history update its timestamp<br>
> @@ -387,7 +387,7 @@ extern "C"<br>
><br>
> kDebug(7102) << "Starting nepomuksearch slave " \
<< getpid();<br> ><br>
> - Nepomuk::SearchProtocol slave( argv[2], argv[3] );<br>
> + Nepomuk2::SearchProtocol slave( argv[2], argv[3] );<br>
> slave.dispatchLoop();<br>
><br>
> kDebug(7102) << "Nepomuksearch slave Done";<br>
> @@ -398,7 +398,7 @@ extern "C"<br>
><br>
><br>
> #if 0<br>
> -void Nepomuk::SearchProtocol::listUserQueries()<br>
> +void Nepomuk2::SearchProtocol::listUserQueries()<br>
> {<br>
> UserQueryUrlList userQueries;<br>
> Q_FOREACH( const KUrl& url, userQueries ) {<br>
> @@ -407,7 +407,7 @@ void Nepomuk::SearchProtocol::listUserQueries()<br>
> listEntry( uds, false );<br>
> }<br>
> }<br>
> -void Nepomuk::SearchProtocol::listLastQueries()<br>
> +void Nepomuk2::SearchProtocol::listLastQueries()<br>
> {<br>
> KSharedConfigPtr cfg = KSharedConfig::openConfig( \
"kio_nepomuksearchrc" );<br> > KConfigGroup grp = cfg->group( \
"Last Queries" );<br> > diff --git \
a/nepomuk/kioslaves/search/kio_nepomuksearch.h \
b/nepomuk/kioslaves/search/kio_nepomuksearch.h<br> > index 9f4c4ba..e68ff29 \
100644<br> > --- a/nepomuk/kioslaves/search/kio_nepomuksearch.h<br>
> +++ b/nepomuk/kioslaves/search/kio_nepomuksearch.h<br>
> @@ -25,7 +25,7 @@<br>
><br>
> #include <QtCore/QQueue><br>
><br>
> -namespace Nepomuk {<br>
> +namespace Nepomuk2 {<br>
> namespace Search {<br>
> class Query;<br>
> }<br>
> diff --git a/nepomuk/kioslaves/search/queryutils.h \
b/nepomuk/kioslaves/search/queryutils.h<br> > index 3b5b707..056e01b 100644<br>
> --- a/nepomuk/kioslaves/search/queryutils.h<br>
> +++ b/nepomuk/kioslaves/search/queryutils.h<br>
> @@ -27,15 +27,15 @@<br>
> #include <KUrl><br>
> #include <KDebug><br>
><br>
> -#include <Nepomuk/Query/Query><br>
> -#include <Nepomuk/Query/OptionalTerm><br>
> -#include <Nepomuk/Query/ComparisonTerm><br>
> -#include <Nepomuk/Query/AndTerm><br>
> -#include <Nepomuk/Vocabulary/NIE><br>
> -#include <Nepomuk/Vocabulary/NFO><br>
> +#include <Nepomuk2/Query/Query><br>
> +#include <Nepomuk2/Query/OptionalTerm><br>
> +#include <Nepomuk2/Query/ComparisonTerm><br>
> +#include <Nepomuk2/Query/AndTerm><br>
> +#include <Nepomuk2/Vocabulary/NIE><br>
> +#include <Nepomuk2/Vocabulary/NFO><br>
><br>
><br>
> -namespace Nepomuk {<br>
> +namespace Nepomuk2 {<br>
> namespace Query {<br>
> /**<br>
> * KIO specific query handling shared by the KIO slave and the kded \
search module<br> > @@ -43,31 +43,31 @@ namespace Nepomuk {<br>
> bool parseQueryUrl( const KUrl& url, Query& query, QString& \
sparqlQuery )<br> > {<br>
> // parse URL (this may fail in which case we fall back to pure \
SPARQL below)<br> > - query = Nepomuk::Query::Query::fromQueryUrl( url \
);<br> > + query = Nepomuk2::Query::Query::fromQueryUrl( url );<br>
><br>
> // request properties to easily create UDSEntry instances<br>
> QList<Query::RequestProperty> reqProperties;<br>
> // local URL<br>
> - reqProperties << Query::RequestProperty( \
Nepomuk::Vocabulary::NIE::url(), !query.isFileQuery() );<br> > + \
reqProperties << Query::RequestProperty( Nepomuk2::Vocabulary::NIE::url(), \
!query.isFileQuery() );<br> > #ifdef Q_OS_UNIX<br>
> if( query.isFileQuery() ) {<br>
> // file size<br>
> - ComparisonTerm contentSizeTerm( \
Nepomuk::Vocabulary::NIE::contentSize(), Term() );<br> > + \
ComparisonTerm contentSizeTerm( Nepomuk2::Vocabulary::NIE::contentSize(), Term() \
);<br> > contentSizeTerm.setVariableName( \
QLatin1String("size") );<br> > // mimetype<br>
> - ComparisonTerm mimetypeTerm( \
Nepomuk::Vocabulary::NIE::mimeType(), Term() );<br> > + \
ComparisonTerm mimetypeTerm( Nepomuk2::Vocabulary::NIE::mimeType(), Term() );<br> \
> mimetypeTerm.setVariableName( QLatin1String("mime") \
);<br> > // mtime<br>
> - ComparisonTerm mtimeTerm( \
Nepomuk::Vocabulary::NIE::lastModified(), Term() );<br> > + \
ComparisonTerm mtimeTerm( Nepomuk2::Vocabulary::NIE::lastModified(), Term() );<br> \
> mtimeTerm.setVariableName( QLatin1String("mtime") \
);<br> > // mode<br>
> - ComparisonTerm modeTerm( \
Nepomuk::Vocabulary::KExt::unixFileMode(), Term() );<br> > + \
ComparisonTerm modeTerm( Nepomuk2::Vocabulary::KExt::unixFileMode(), Term() );<br> \
> modeTerm.setVariableName( QLatin1String("mode") \
);<br> > // user<br>
> - ComparisonTerm userTerm( \
Nepomuk::Vocabulary::KExt::unixFileOwner(), Term() );<br> > + \
ComparisonTerm userTerm( Nepomuk2::Vocabulary::KExt::unixFileOwner(), Term() );<br> \
> userTerm.setVariableName( QLatin1String("user") \
);<br> > // group<br>
> - ComparisonTerm groupTerm( \
Nepomuk::Vocabulary::KExt::unixFileGroup(), Term() );<br> > + \
ComparisonTerm groupTerm( Nepomuk2::Vocabulary::KExt::unixFileGroup(), Term() );<br> \
> groupTerm.setVariableName( QLatin1String("group") \
);<br> ><br>
> // instead of separate request properties we use one optional \
and term. That way<br> > @@ -90,7 +90,7 @@ namespace Nepomuk {<br>
> }<br>
> else {<br>
> // the URL contains pure sparql.<br>
> - sparqlQuery = Nepomuk::Query::Query::sparqlFromQueryUrl( url \
);<br> > + sparqlQuery = \
Nepomuk2::Query::Query::sparqlFromQueryUrl( url );<br> > kDebug() \
<< "Extracted SPARL query" << sparqlQuery;<br> > \
}<br> ><br>
> diff --git a/nepomuk/kioslaves/search/searchfolder.cpp \
b/nepomuk/kioslaves/search/searchfolder.cpp<br> > index 8a51c42..8088c46 \
100644<br> > --- a/nepomuk/kioslaves/search/searchfolder.cpp<br>
> +++ b/nepomuk/kioslaves/search/searchfolder.cpp<br>
> @@ -27,16 +27,16 @@<br>
> #include <Soprano/Vocabulary/NAO><br>
> #include <Soprano/Node> // for qHash( QUrl )<br>
><br>
> -#include <Nepomuk/Variant><br>
> -#include <Nepomuk/Thing><br>
> -#include <Nepomuk/Types/Class><br>
> -#include <Nepomuk/Query/Query><br>
> -#include <Nepomuk/Query/QueryParser><br>
> -#include <Nepomuk/Query/ResourceTypeTerm><br>
> -#include <Nepomuk/Query/QueryServiceClient><br>
> -#include <Nepomuk/Vocabulary/NFO><br>
> -#include <Nepomuk/Vocabulary/NIE><br>
> -#include <Nepomuk/Vocabulary/PIMO><br>
> +#include <Nepomuk2/Variant><br>
> +#include <Nepomuk2/Thing><br>
> +#include <Nepomuk2/Types/Class><br>
> +#include <Nepomuk2/Query/Query><br>
> +#include <Nepomuk2/Query/QueryParser><br>
> +#include <Nepomuk2/Query/ResourceTypeTerm><br>
> +#include <Nepomuk2/Query/QueryServiceClient><br>
> +#include <Nepomuk2/Vocabulary/NFO><br>
> +#include <Nepomuk2/Vocabulary/NIE><br>
> +#include <Nepomuk2/Vocabulary/PIMO><br>
><br>
> #include <QtCore/QMutexLocker><br>
> #include <QTextDocument><br>
> @@ -51,7 +51,7 @@<br>
> #include <KConfigGroup><br>
><br>
><br>
> -Nepomuk::SearchFolder::SearchFolder( const KUrl& url, KIO::SlaveBase* slave \
)<br> > +Nepomuk2::SearchFolder::SearchFolder( const KUrl& url, \
KIO::SlaveBase* slave )<br> > : QThread(),<br>
> m_url( url ),<br>
> m_initialListingFinished( false ),<br>
> @@ -66,7 +66,7 @@ Nepomuk::SearchFolder::SearchFolder( const KUrl& url, \
KIO::SlaveBase* slave )<br> > }<br>
><br>
><br>
> -Nepomuk::SearchFolder::~SearchFolder()<br>
> +Nepomuk2::SearchFolder::~SearchFolder()<br>
> {<br>
> kDebug() << m_url << QThread::currentThread();<br>
><br>
> @@ -76,18 +76,18 @@ Nepomuk::SearchFolder::~SearchFolder()<br>
> }<br>
><br>
><br>
> -void Nepomuk::SearchFolder::run()<br>
> +void Nepomuk2::SearchFolder::run()<br>
> {<br>
> kDebug() << m_url << QThread::currentThread();<br>
><br>
> - m_client = new Nepomuk::Query::QueryServiceClient();<br>
> + m_client = new Nepomuk2::Query::QueryServiceClient();<br>
><br>
> // results signals are connected directly to update the results cache \
m_resultsQueue<br> > // and the entries cache m_entries, as well as emitting \
KDirNotify signals<br> > // a queued connection is not possible since we have \
no event loop after the<br> > // initial listing which means that queued \
signals would never get delivered<br> > - connect( m_client, SIGNAL( \
newEntries( const QList<Nepomuk::Query::Result>& ) ),<br> > - \
this, SLOT( slotNewEntries( const QList<Nepomuk::Query::Result>& ) ),<br> \
> + connect( m_client, SIGNAL( newEntries( const \
QList<Nepomuk2::Query::Result>& ) ),<br> > + this, SLOT( \
slotNewEntries( const QList<Nepomuk2::Query::Result>& ) ),<br> > \
Qt::DirectConnection );<br> > connect( m_client, SIGNAL( resultCount(int) \
),<br> > this, SLOT( slotResultCount(int) ),<br>
> @@ -110,7 +110,7 @@ void Nepomuk::SearchFolder::run()<br>
> }<br>
><br>
><br>
> -void Nepomuk::SearchFolder::list()<br>
> +void Nepomuk2::SearchFolder::list()<br>
> {<br>
> kDebug() << m_url << QThread::currentThread();<br>
><br>
> @@ -129,7 +129,7 @@ void Nepomuk::SearchFolder::list()<br>
><br>
><br>
> // always called in search thread<br>
> -void Nepomuk::SearchFolder::slotNewEntries( const \
QList<Nepomuk::Query::Result>& results )<br> > +void \
Nepomuk2::SearchFolder::slotNewEntries( const \
QList<Nepomuk2::Query::Result>& results )<br> > {<br>
> // kDebug() << m_url;<br>
><br>
> @@ -143,7 +143,7 @@ void Nepomuk::SearchFolder::slotNewEntries( const \
QList<Nepomuk::Query::Result>&<br> > }<br>
><br>
><br>
> -void Nepomuk::SearchFolder::slotResultCount( int count )<br>
> +void Nepomuk2::SearchFolder::slotResultCount( int count )<br>
> {<br>
> if ( !m_initialListingFinished ) {<br>
> QMutexLocker lock( &m_slaveMutex );<br>
> @@ -153,7 +153,7 @@ void Nepomuk::SearchFolder::slotResultCount( int count )<br>
><br>
><br>
> // always called in search thread<br>
> -void Nepomuk::SearchFolder::slotFinishedListing()<br>
> +void Nepomuk2::SearchFolder::slotFinishedListing()<br>
> {<br>
> kDebug() << m_url;<br>
> QMutexLocker lock( &m_resultMutex );<br>
> @@ -163,7 +163,7 @@ void Nepomuk::SearchFolder::slotFinishedListing()<br>
><br>
><br>
> // always called in main thread<br>
> -void Nepomuk::SearchFolder::statResults()<br>
> +void Nepomuk2::SearchFolder::statResults()<br>
> {<br>
> while ( 1 ) {<br>
> m_resultMutex.lock();<br>
> @@ -204,9 +204,9 @@ namespace {<br>
> }<br>
> }<br>
><br>
> - Nepomuk::Resource res( url );<br>
> + Nepomuk2::Resource res( url );<br>
> if ( res.exists() ) {<br>
> - uds = Nepomuk::statNepomukResource( res );<br>
> + uds = Nepomuk2::statNepomukResource( res );<br>
> return true;<br>
> }<br>
><br>
> @@ -217,13 +217,13 @@ namespace {<br>
><br>
><br>
> // always called in main thread<br>
> -// This method tries to avoid loading the Nepomuk::Resource as long as possible \
by only using the<br> > +// This method tries to avoid loading the \
Nepomuk2::Resource as long as possible by only using the<br> > // request \
property nie:url in the Result for local files.<br> > -KIO::UDSEntry \
Nepomuk::SearchFolder::statResult( const Query::Result& result )<br> > \
+KIO::UDSEntry Nepomuk2::SearchFolder::statResult( const Query::Result& result \
)<br> > {<br>
> Resource res( result.resource() );<br>
> const KUrl uri( res.resourceUri() );<br>
> - KUrl nieUrl( result[Nepomuk::Vocabulary::NIE::url()].uri() );<br>
> + KUrl nieUrl( result[Nepomuk2::Vocabulary::NIE::url()].uri() );<br>
><br>
> // the additional bindings that we only have on unix systems<br>
> // Either all are bound or none of them.<br>
> @@ -263,7 +263,7 @@ KIO::UDSEntry Nepomuk::SearchFolder::statResult( const \
Query::Result& result )<br> ><br>
> // check if we have a pimo thing relating to a file<br>
> if ( nieUrl.isEmpty() )<br>
> - nieUrl = Nepomuk::nepomukToFileUrl( uri );<br>
> + nieUrl = Nepomuk2::nepomukToFileUrl( uri );<br>
><br>
> // try to stat the file<br>
> if ( statFile( uri, nieUrl, uds ) ) {<br>
> @@ -280,10 +280,10 @@ KIO::UDSEntry Nepomuk::SearchFolder::statResult( const \
Query::Result& result )<br> > // make sure we do not use these \
ugly names for display<br> > if ( !uds.contains( \
KIO::UDSEntry::UDS_DISPLAY_NAME ) ) {<br> > if ( nieUrl.isEmpty() \
&&<br> > - res.hasType( \
Nepomuk::Vocabulary::PIMO::Thing() ) ) {<br> > + \
res.hasType( Nepomuk2::Vocabulary::PIMO::Thing() ) ) {<br> > \
if ( !res.pimoThing().groundingOccurrences().isEmpty() ) {<br> > \
res = res.pimoThing().groundingOccurrences().first();<br> > - \
nieUrl = res.property(Nepomuk::Vocabulary::NIE::url()).toUrl();<br> > + \
nieUrl = res.property(Nepomuk2::Vocabulary::NIE::url()).toUrl();<br> > \
}<br> > }<br>
><br>
> diff --git a/nepomuk/kioslaves/search/searchfolder.h \
b/nepomuk/kioslaves/search/searchfolder.h<br> > index 83dfe6b..c0839b5 100644<br>
> --- a/nepomuk/kioslaves/search/searchfolder.h<br>
> +++ b/nepomuk/kioslaves/search/searchfolder.h<br>
> @@ -27,17 +27,17 @@<br>
> #include <QtCore/QMutex><br>
> #include <QtCore/QWaitCondition><br>
><br>
> -#include <Nepomuk/Query/Term><br>
> -#include <Nepomuk/Query/Result><br>
> -#include <Nepomuk/Query/Query><br>
> +#include <Nepomuk2/Query/Term><br>
> +#include <Nepomuk2/Query/Result><br>
> +#include <Nepomuk2/Query/Query><br>
><br>
> #include <kio/udsentry.h><br>
> #include <kio/slavebase.h><br>
> -#include <Nepomuk/Resource><br>
> +#include <Nepomuk2/Resource><br>
> #include <KUrl><br>
><br>
><br>
> -namespace Nepomuk {<br>
> +namespace Nepomuk2 {<br>
> namespace Query {<br>
> class QueryServiceClient;<br>
> }<br>
> @@ -80,7 +80,7 @@ namespace Nepomuk {<br>
><br>
> private Q_SLOTS:<br>
> /// connected to the QueryServiceClient in the search thread<br>
> - void slotNewEntries( const QList<Nepomuk::Query::Result>& \
);<br> > + void slotNewEntries( const \
QList<Nepomuk2::Query::Result>& );<br> ><br>
> /// connected to the QueryServiceClient in the search thread<br>
> void slotResultCount( int );<br>
> diff --git a/nepomuk/kioslaves/search/userqueries.h \
b/nepomuk/kioslaves/search/userqueries.h<br> > index f1d48fb..5430f22 100644<br>
> --- a/nepomuk/kioslaves/search/userqueries.h<br>
> +++ b/nepomuk/kioslaves/search/userqueries.h<br>
> @@ -30,20 +30,20 @@<br>
> #include <QtCore/QStringList><br>
><br>
><br>
> -namespace Nepomuk {<br>
> +namespace Nepomuk2 {<br>
> /// convert a normal query URL which can be listed to a URL which is used \
as location for user queries<br> > inline KUrl queryUrlToUserQueryUrl( const \
KUrl& url )<br> > {<br>
> // the query URL is NOT the URL under which the query is listed!<br>
> KUrl queryListUrl;<br>
> queryListUrl.setProtocol( QLatin1String( "nepomuksearch" ) \
);<br> > - queryListUrl.setFileName( Nepomuk::resourceUriToUdsName( url ) \
);<br> > + queryListUrl.setFileName( Nepomuk2::resourceUriToUdsName( url ) \
);<br> > return queryListUrl;<br>
> }<br>
><br>
> inline KUrl queryUrlFromUserQueryUrl( const KUrl& url )<br>
> {<br>
> - return Nepomuk::udsNameToResourceUri( url.fileName() );<br>
> + return Nepomuk2::udsNameToResourceUri( url.fileName() );<br>
> }<br>
><br>
> class UserQueryUrlList : public KUrl::List<br>
> @@ -114,7 +114,7 @@ namespace Nepomuk {<br>
> QStringList oldUserQueryUrls;<br>
> QList<KUrl>::iterator it = findQueryUrl( url );<br>
> while ( it != end() ) {<br>
> - oldUserQueryUrls << Nepomuk::queryUrlToUserQueryUrl( *it \
).url();<br> > + oldUserQueryUrls << \
Nepomuk2::queryUrlToUserQueryUrl( *it ).url();<br> > erase( it \
);<br> > it = findQueryUrl( url );<br>
> }<br>
> diff --git a/nepomuk/kioslaves/timeline/CMakeLists.txt \
b/nepomuk/kioslaves/timeline/CMakeLists.txt<br> > index 6ba43d1..903f13f \
100644<br> > --- a/nepomuk/kioslaves/timeline/CMakeLists.txt<br>
> +++ b/nepomuk/kioslaves/timeline/CMakeLists.txt<br>
> @@ -4,7 +4,7 @@ include_directories(<br>
> ${QT_INCLUDES}<br>
> ${KDE4_INCLUDES}<br>
> ${KDE4_KIO_INCLUDES}<br>
> - ${NEPOMUK_INCLUDE_DIR}<br>
> + ${NEPOMUK_CORE_INCLUDE_DIR}<br>
> ${CMAKE_CURRENT_BINARY_DIR}<br>
> ${nepomuk_kio_slaves_SOURCE_DIR}/common<br>
> )<br>
> @@ -15,15 +15,14 @@ set(kio_timeline_PART_SRCS<br>
> kio_timeline.cpp<br>
> ../common/timelinetools.cpp)<br>
><br>
> -qt4_add_dbus_interface(kio_timeline_PART_SRCS \
../../interfaces/org.kde.nepomuk.ServiceControl.xml \
nepomukservicecontrolinterface)<br> > \
+qt4_add_dbus_interface(kio_timeline_PART_SRCS \
${NEPOMUK_CORE_DBUS_INTERFACES_DIR}/org.kde.nepomuk.ServiceControl.xml \
nepomukservicecontrolinterface)<br> ><br>
> kde4_add_plugin(kio_timeline ${kio_timeline_PART_SRCS})<br>
><br>
> target_link_libraries(kio_timeline<br>
> nepomukcommon<br>
> ${KDE4_KIO_LIBS}<br>
> - ${NEPOMUK_LIBRARIES}<br>
> - ${NEPOMUK_QUERY_LIBRARIES}<br>
> + ${NEPOMUK_CORE_LIBRARIES}<br>
> ${SOPRANO_LIBRARIES}<br>
> )<br>
><br>
> diff --git a/nepomuk/kioslaves/timeline/kio_timeline.cpp \
b/nepomuk/kioslaves/timeline/kio_timeline.cpp<br> > index 24eb424..7ddca1f \
100644<br> > --- a/nepomuk/kioslaves/timeline/kio_timeline.cpp<br>
> +++ b/nepomuk/kioslaves/timeline/kio_timeline.cpp<br>
> @@ -22,10 +22,10 @@<br>
> #include "nepomukservicecontrolinterface.h"<br>
> #include "timelinetools.h"<br>
><br>
> -#include <Nepomuk/ResourceManager><br>
> -#include <Nepomuk/Vocabulary/NFO><br>
> -#include <Nepomuk/Vocabulary/NIE><br>
> -#include <Nepomuk/Vocabulary/NUAO><br>
> +#include <Nepomuk2/ResourceManager><br>
> +#include <Nepomuk2/Vocabulary/NFO><br>
> +#include <Nepomuk2/Vocabulary/NIE><br>
> +#include <Nepomuk2/Vocabulary/NUAO><br>
><br>
> #include <KUrl><br>
> #include <kio/global.h><br>
> @@ -92,33 +92,33 @@ namespace {<br>
> KIO::UDSEntry uds = createFolderUDSEntry( \
date.toString("yyyy-MM-dd"),<br> > \
KGlobal::locale()->formatDate( date, KLocale::FancyLongDate ),<br> > \
date );<br> > - uds.insert( KIO::UDSEntry::UDS_NEPOMUK_QUERY, \
Nepomuk::buildTimelineQuery( date ).toString() );<br> > + uds.insert( \
KIO::UDSEntry::UDS_NEPOMUK_QUERY, Nepomuk2::buildTimelineQuery( date ).toString() \
);<br> > return uds;<br>
> }<br>
><br>
> bool filesInDateRange( const QDate& from, const QDate& to = QDate() \
)<br> > {<br>
> - return \
Nepomuk::ResourceManager::instance()->mainModel()->executeQuery(<br> > - \
Nepomuk::buildTimelineQuery( from, to \
).toSparqlQuery(Nepomuk::Query::Query::CreateAskQuery),<br> > + return \
Nepomuk2::ResourceManager::instance()->mainModel()->executeQuery(<br> > + \
Nepomuk2::buildTimelineQuery( from, to \
).toSparqlQuery(Nepomuk2::Query::Query::CreateAskQuery),<br> > \
Soprano::Query::QueryLanguageSparql ).boolValue();<br> > }<br>
> }<br>
><br>
><br>
> -Nepomuk::TimelineProtocol::TimelineProtocol( const QByteArray& poolSocket, \
const QByteArray& appSocket )<br> > \
+Nepomuk2::TimelineProtocol::TimelineProtocol( const QByteArray& poolSocket, \
const QByteArray& appSocket )<br> > : KIO::ForwardingSlaveBase( \
"timeline", poolSocket, appSocket )<br> > {<br>
> kDebug();<br>
> }<br>
><br>
><br>
> -Nepomuk::TimelineProtocol::~TimelineProtocol()<br>
> +Nepomuk2::TimelineProtocol::~TimelineProtocol()<br>
> {<br>
> kDebug();<br>
> }<br>
><br>
><br>
> -void Nepomuk::TimelineProtocol::listDir( const KUrl& url )<br>
> +void Nepomuk2::TimelineProtocol::listDir( const KUrl& url )<br>
> {<br>
> // without a running file indexer timeline is not at all reliable<br>
> if ( !QDBusConnection::sessionBus().interface()->isServiceRegistered( \
"org.kde.nepomuk.services.nepomukfileindexer" ) ||<br> > @@ -162,14 \
+162,14 @@ void Nepomuk::TimelineProtocol::listDir( const KUrl& url )<br> > \
}<br> ><br>
><br>
> -void Nepomuk::TimelineProtocol::mkdir( const KUrl &url, int permissions \
)<br> > +void Nepomuk2::TimelineProtocol::mkdir( const KUrl &url, int \
permissions )<br> > {<br>
> Q_UNUSED(permissions);<br>
> error( ERR_UNSUPPORTED_ACTION, url.prettyUrl() );<br>
> }<br>
><br>
><br>
> -void Nepomuk::TimelineProtocol::get( const KUrl& url )<br>
> +void Nepomuk2::TimelineProtocol::get( const KUrl& url )<br>
> {<br>
> kDebug() << url;<br>
><br>
> @@ -182,7 +182,7 @@ void Nepomuk::TimelineProtocol::get( const KUrl& url \
)<br> > }<br>
><br>
><br>
> -void Nepomuk::TimelineProtocol::put( const KUrl& url, int permissions, \
KIO::JobFlags flags )<br> > +void Nepomuk2::TimelineProtocol::put( const KUrl& \
url, int permissions, KIO::JobFlags flags )<br> > {<br>
> kDebug() << url;<br>
><br>
> @@ -195,7 +195,7 @@ void Nepomuk::TimelineProtocol::put( const KUrl& url, \
int permissions, KIO::JobF<br> > }<br>
><br>
><br>
> -void Nepomuk::TimelineProtocol::copy( const KUrl& src, const KUrl& \
dest, int permissions, KIO::JobFlags flags )<br> > +void \
Nepomuk2::TimelineProtocol::copy( const KUrl& src, const KUrl& dest, int \
permissions, KIO::JobFlags flags )<br> > {<br>
> Q_UNUSED(src);<br>
> Q_UNUSED(dest);<br>
> @@ -206,7 +206,7 @@ void Nepomuk::TimelineProtocol::copy( const KUrl& src, \
const KUrl& dest, int per<br> > }<br>
><br>
><br>
> -void Nepomuk::TimelineProtocol::rename( const KUrl& src, const KUrl& \
dest, KIO::JobFlags flags )<br> > +void Nepomuk2::TimelineProtocol::rename( const \
KUrl& src, const KUrl& dest, KIO::JobFlags flags )<br> > {<br>
> Q_UNUSED(src);<br>
> Q_UNUSED(dest);<br>
> @@ -216,21 +216,21 @@ void Nepomuk::TimelineProtocol::rename( const KUrl& \
src, const KUrl& dest, KIO::<br> > }<br>
><br>
><br>
> -void Nepomuk::TimelineProtocol::del( const KUrl& url, bool isfile )<br>
> +void Nepomuk2::TimelineProtocol::del( const KUrl& url, bool isfile )<br>
> {<br>
> kDebug() << url;<br>
> ForwardingSlaveBase::del( url, isfile );<br>
> }<br>
><br>
><br>
> -void Nepomuk::TimelineProtocol::mimetype( const KUrl& url )<br>
> +void Nepomuk2::TimelineProtocol::mimetype( const KUrl& url )<br>
> {<br>
> kDebug() << url;<br>
> ForwardingSlaveBase::mimetype( url );<br>
> }<br>
><br>
><br>
> -void Nepomuk::TimelineProtocol::stat( const KUrl& url )<br>
> +void Nepomuk2::TimelineProtocol::stat( const KUrl& url )<br>
> {<br>
> switch( parseTimelineUrl( url, &m_date, &m_filename ) ) {<br>
> case RootFolder: {<br>
> @@ -272,7 +272,7 @@ void Nepomuk::TimelineProtocol::stat( const KUrl& url \
)<br> ><br>
><br>
> // only used for the queries<br>
> -bool Nepomuk::TimelineProtocol::rewriteUrl( const KUrl& url, KUrl& \
newURL )<br> > +bool Nepomuk2::TimelineProtocol::rewriteUrl( const KUrl& url, \
KUrl& newURL )<br> > {<br>
> if ( parseTimelineUrl( url, &m_date, &m_filename ) == DayFolder ) \
{<br> > newURL = buildTimelineQuery( m_date ).toSearchUrl();<br>
> @@ -286,7 +286,7 @@ bool Nepomuk::TimelineProtocol::rewriteUrl( const KUrl& \
url, KUrl& newURL )<br> > }<br>
><br>
><br>
> -void Nepomuk::TimelineProtocol::prepareUDSEntry( KIO::UDSEntry& entry,<br>
> +void Nepomuk2::TimelineProtocol::prepareUDSEntry( KIO::UDSEntry& entry,<br>
> bool listing ) const<br>
> {<br>
> kDebug() << entry.stringValue( KIO::UDSEntry::UDS_NEPOMUK_URI) \
<< entry.stringValue( KIO::UDSEntry::UDS_MIME_TYPE) << listing;<br> > \
@@ -294,7 +294,7 @@ void Nepomuk::TimelineProtocol::prepareUDSEntry( \
KIO::UDSEntry& entry,<br> > }<br>
><br>
><br>
> -void Nepomuk::TimelineProtocol::listDays( int month, int year )<br>
> +void Nepomuk2::TimelineProtocol::listDays( int month, int year )<br>
> {<br>
> kDebug() << month << year;<br>
> const int days = KGlobal::locale()->calendar()->daysInMonth( QDate( \
year, month, 1 ) );<br> > @@ -308,7 +308,7 @@ void \
Nepomuk::TimelineProtocol::listDays( int month, int year )<br> > }<br>
><br>
><br>
> -void Nepomuk::TimelineProtocol::listThisYearsMonths()<br>
> +void Nepomuk2::TimelineProtocol::listThisYearsMonths()<br>
> {<br>
> kDebug();<br>
> int currentMonth = QDate::currentDate().month();<br>
> @@ -322,7 +322,7 @@ void Nepomuk::TimelineProtocol::listThisYearsMonths()<br>
> }<br>
><br>
><br>
> -void Nepomuk::TimelineProtocol::listPreviousYears()<br>
> +void Nepomuk2::TimelineProtocol::listPreviousYears()<br>
> {<br>
> kDebug();<br>
> // TODO: list years before this year that have files, but first get the \
smallest date<br> > @@ -345,7 +345,7 @@ extern "C"<br>
> exit(-1);<br>
> }<br>
><br>
> - Nepomuk::TimelineProtocol slave(argv[2], argv[3]);<br>
> + Nepomuk2::TimelineProtocol slave(argv[2], argv[3]);<br>
> slave.dispatchLoop();<br>
><br>
> kDebug(7102) << "Timeline slave Done";<br>
> diff --git a/nepomuk/kioslaves/timeline/kio_timeline.h \
b/nepomuk/kioslaves/timeline/kio_timeline.h<br> > index c31d6ee..d20005c \
100644<br> > --- a/nepomuk/kioslaves/timeline/kio_timeline.h<br>
> +++ b/nepomuk/kioslaves/timeline/kio_timeline.h<br>
> @@ -25,7 +25,7 @@<br>
><br>
> #include <QtCore/QDate><br>
><br>
> -namespace Nepomuk {<br>
> +namespace Nepomuk2 {<br>
> class TimelineProtocol : public KIO::ForwardingSlaveBase<br>
> {<br>
> Q_OBJECT<br>
> diff --git a/nepomuk/ontologies/CMakeLists.txt \
b/nepomuk/ontologies/CMakeLists.txt<br> > deleted file mode 100644<br>
> index 7a7a590..0000000<br>
> --- a/nepomuk/ontologies/CMakeLists.txt<br>
> +++ /dev/null<br>
> @@ -1,14 +0,0 @@<br>
> -project(nepomuk_ontologies)<br>
> -<br>
> -configure_file(<a href="http://kuvo.ontology.in" \
target="_blank">kuvo.ontology.in</a> ${CMAKE_CURRENT_BINARY_DIR}/kuvo.ontology)<br> \
> -configure_file(<a href="http://nrio.ontology.in" \
target="_blank">nrio.ontology.in</a> ${CMAKE_CURRENT_BINARY_DIR}/nrio.ontology)<br> \
> -configure_file(<a href="http://kext.ontology.in" \
target="_blank">kext.ontology.in</a> ${CMAKE_CURRENT_BINARY_DIR}/kext.ontology)<br> \
> -<br> > -install(FILES<br>
> - kuvo.trig<br>
> - ${CMAKE_CURRENT_BINARY_DIR}/kuvo.ontology<br>
> - nrio.trig<br>
> - ${CMAKE_CURRENT_BINARY_DIR}/nrio.ontology<br>
> - kext.trig<br>
> - ${CMAKE_CURRENT_BINARY_DIR}/kext.ontology<br>
> -DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ontology/kde)<br>
> diff --git a/nepomuk/ontologies/README b/nepomuk/ontologies/README<br>
> deleted file mode 100644<br>
> index 567dae8..0000000<br>
> --- a/nepomuk/ontologies/README<br>
> +++ /dev/null<br>
> @@ -1,5 +0,0 @@<br>
> -This folder contains ontologies that build upon the ones<br>
> -from shared-desktop-ontologies and contain KDE-specific<br>
> -extensions that can not be or are hard to generalize.<br>
> -<br>
> -Sebastian Trueg <<a href="mailto:trueg@kde.org">trueg@kde.org</a>> \
2010-08-18<br> > diff --git a/nepomuk/ontologies/<a href="http://kext.ontology.in" \
target="_blank">kext.ontology.in</a> b/nepomuk/ontologies/<a \
href="http://kext.ontology.in" target="_blank">kext.ontology.in</a><br> > deleted \
file mode 100644<br> > index a9ada44..0000000<br>
> --- a/nepomuk/ontologies/<a href="http://kext.ontology.in" \
target="_blank">kext.ontology.in</a><br> > +++ /dev/null<br>
> @@ -1,8 +0,0 @@<br>
> -[Ontology]<br>
> -Version=1.0<br>
> -Name=KDE Extensions Ontology<br>
> -Comment=The KDE Extensions Ontology contains extensions to the \
shared-desktop-ontologies that are not generic enough.<br> > -Namespace=<a \
href="http://nepomuk.kde.org/ontologies/2010/11/29/kext#" \
target="_blank">http://nepomuk.kde.org/ontologies/2010/11/29/kext#</a><br> > \
-Path=${CMAKE_INSTALL_PREFIX}/share/ontology/kde/kext.trig<br> > \
-MimeType=application/x-trig<br> > -Type=Data<br>
> diff --git a/nepomuk/ontologies/kext.trig b/nepomuk/ontologies/kext.trig<br>
> deleted file mode 100644<br>
> index b7c1773..0000000<br>
> --- a/nepomuk/ontologies/kext.trig<br>
> +++ /dev/null<br>
> @@ -1,91 +0,0 @@<br>
> -#<br>
> -# Copyright (c) 2010-2011 Sebastian Trueg <<a \
href="mailto:trueg@kde.org">trueg@kde.org</a>><br> > -# All rights reserved, \
licensed under either CC-BY or BSD.<br> > -#<br>
> -# You are free:<br>
> -# * to Share - to copy, distribute and transmit the work<br>
> -# * to Remix - to adapt the work<br>
> -# Under the following conditions:<br>
> -# * Attribution - You must attribute the work in the manner specified by the \
author<br> > -# or licensor (but not in any way that suggests that they endorse \
you or your use<br> > -# of the work).<br>
> -#<br>
> -# Redistribution and use in source and binary forms, with or without \
modification,<br> > -# are permitted provided that the following conditions are \
met:<br> > -# * Redistributions of source code must retain the above copyright \
notice, this<br> > -# list of conditions and the following disclaimer.<br>
> -# * Redistributions in binary form must reproduce the above copyright notice, \
this<br> > -# list of conditions and the following disclaimer in the \
documentation and/or<br> > -# other materials provided with the \
distribution.<br> > -# * Neither the names of the authors nor the names of \
contributors may<br> > -# be used to endorse or promote products derived from \
this ontology without<br> > -# specific prior written permission.<br>
> -#<br>
> -# THIS ONTOLOGY IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS \
OR<br> > -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED \
WARRANTIES<br> > -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE \
DISCLAIMED.<br> > -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, \
INDIRECT,<br> > -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES \
(INCLUDING, BUT<br> > -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR \
SERVICES; LOSS OF USE,<br> > -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) \
HOWEVER CAUSED AND ON ANY<br> > -# THEORY OF LIABILITY, WHETHER IN CONTRACT, \
STRICT LIABILITY, OR TORT<br> > -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN \
ANY WAY OUT OF THE USE OF<br> > -# THIS ONTOLOGY, EVEN IF ADVISED OF THE \
POSSIBILITY OF SUCH DAMAGE.<br> > -#<br>
> -<br>
> -@prefix rdfs: <<a href="http://www.w3.org/2000/01/rdf-schema#" \
target="_blank">http://www.w3.org/2000/01/rdf-schema#</a>> .<br> > -@prefix \
nao: <<a href="http://www.semanticdesktop.org/ontologies/2007/08/15/nao#" \
target="_blank">http://www.semanticdesktop.org/ontologies/2007/08/15/nao#</a>> \
.<br> > -@prefix nrl: <<a \
href="http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#" \
target="_blank">http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#</a>> \
.<br> > -@prefix nie: <<a \
href="http://www.semanticdesktop.org/ontologies/2007/01/19/nie#" \
target="_blank">http://www.semanticdesktop.org/ontologies/2007/01/19/nie#</a>> \
.<br> > -@prefix xsd: <<a href="http://www.w3.org/2001/XMLSchema#" \
target="_blank">http://www.w3.org/2001/XMLSchema#</a>> .<br> > -@prefix rdf: \
<<a href="http://www.w3.org/1999/02/22-rdf-syntax-ns#" \
target="_blank">http://www.w3.org/1999/02/22-rdf-syntax-ns#</a>> .<br> > \
-@prefix kext: <<a href="http://nepomuk.kde.org/ontologies/2010/11/29/kext#" \
target="_blank">http://nepomuk.kde.org/ontologies/2010/11/29/kext#</a>> .<br> > \
-@prefix nfo: <<a \
href="http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#" \
target="_blank">http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#</a>> \
.<br> > -<br>
> -kext: {<br>
> - kext:unixFileMode<br>
> - a rdf:Property ;<br>
> - rdfs:label "Unix file mode" ;<br>
> - rdfs:comment "The file mode value as seen on unix file \
systems." ;<br> > - rdfs:domain nfo:FileDataObject ;<br>
> - rdfs:range xsd:integer ;<br>
> - nrl:maxCardinality 1 ;<br>
> - nao:userVisible false .<br>
> -<br>
> - kext:unixFileOwner<br>
> - a rdf:Property ;<br>
> - rdfs:label "Unix file owner" ;<br>
> - rdfs:comment "The owner of the file as seen on unix file \
systems. This is intended as the low-level counterpart to nfo:owner." ;<br> > \
- rdfs:domain nfo:FileDataObject ;<br> > - rdfs:range xsd:string \
;<br> > - nrl:maxCardinality 1 ;<br>
> - nao:userVisible false .<br>
> -<br>
> - kext:unixFileGroup<br>
> - a rdf:Property ;<br>
> - rdfs:label "Unix file group" ;<br>
> - rdfs:comment "The group of the file as seen on unix file \
systems." ;<br> > - rdfs:domain nfo:FileDataObject ;<br>
> - rdfs:range xsd:string ;<br>
> - nrl:maxCardinality 1 ;<br>
> - nao:userVisible false .<br>
> -}<br>
> -<br>
> -<<a href="http://nepomuk.kde.org/ontologies/2010/11/29/kext/metadata" \
target="_blank">http://nepomuk.kde.org/ontologies/2010/11/29/kext/metadata</a>> \
{<br> > - <<a \
href="http://nepomuk.kde.org/ontologies/2010/11/29/kext/metadata" \
target="_blank">http://nepomuk.kde.org/ontologies/2010/11/29/kext/metadata</a>><br>
> - a nrl:GraphMetadata ;<br>
> - nrl:coreGraphMetadataFor kext: .<br>
> -<br>
> -<br>
> - kext:<br>
> - a nrl:Ontology , nrl:DocumentGraph ;<br>
> - nao:prefLabel "KDE Extensions Ontology" ;<br>
> - nao:hasDefaultNamespace "<a \
href="http://nepomuk.kde.org/ontologies/2010/11/29/kext#" \
target="_blank">http://nepomuk.kde.org/ontologies/2010/11/29/kext#</a>" ;<br> \
> - nao:hasDefaultNamespaceAbbreviation "kext" ;<br> > - \
nao:lastModified "2012-03-09T13:04:43Z" ;<br> > - \
nao:serializationLanguage "TriG" ;<br> > - nao:status \
"Unstable" ;<br> > - nrl:updatable "0" ;<br>
> - nao:version "2" .<br>
> -}<br>
> -<br>
> diff --git a/nepomuk/ontologies/<a href="http://kuvo.ontology.in" \
target="_blank">kuvo.ontology.in</a> b/nepomuk/ontologies/<a \
href="http://kuvo.ontology.in" target="_blank">kuvo.ontology.in</a><br> > deleted \
file mode 100644<br> > index f50d5e8..0000000<br>
> --- a/nepomuk/ontologies/<a href="http://kuvo.ontology.in" \
target="_blank">kuvo.ontology.in</a><br> > +++ /dev/null<br>
> @@ -1,8 +0,0 @@<br>
> -[Ontology]<br>
> -Version=1.0<br>
> -Name=KDE User Visibility Ontology<br>
> -Comment=The KDE User Visibility Ontology does not define any new classes or \
properties. It simply defines nao:userVisible on existing classes and properties.<br> \
> -Namespace=<a href="http://nepomuk.kde.org/ontologies/2010/08/18/kuvo#" \
target="_blank">http://nepomuk.kde.org/ontologies/2010/08/18/kuvo#</a><br> > \
-Path=${CMAKE_INSTALL_PREFIX}/share/ontology/kde/kuvo.trig<br> > \
-MimeType=application/x-trig<br> > -Type=Data<br>
> diff --git a/nepomuk/ontologies/kuvo.trig b/nepomuk/ontologies/kuvo.trig<br>
> deleted file mode 100644<br>
> index 11ac9f4..0000000<br>
> --- a/nepomuk/ontologies/kuvo.trig<br>
> +++ /dev/null<br>
> @@ -1,93 +0,0 @@<br>
> -#<br>
> -# Copyright (c) 2010 Sebastian Trueg <<a \
href="mailto:trueg@kde.org">trueg@kde.org</a>><br> > -# All rights reserved, \
licensed under either CC-BY or BSD.<br> > -#<br>
> -# You are free:<br>
> -# * to Share - to copy, distribute and transmit the work<br>
> -# * to Remix - to adapt the work<br>
> -# Under the following conditions:<br>
> -# * Attribution - You must attribute the work in the manner specified by the \
author<br> > -# or licensor (but not in any way that suggests that they endorse \
you or your use<br> > -# of the work).<br>
> -#<br>
> -# Redistribution and use in source and binary forms, with or without \
modification,<br> > -# are permitted provided that the following conditions are \
met:<br> > -# * Redistributions of source code must retain the above copyright \
notice, this<br> > -# list of conditions and the following disclaimer.<br>
> -# * Redistributions in binary form must reproduce the above copyright notice, \
this<br> > -# list of conditions and the following disclaimer in the \
documentation and/or<br> > -# other materials provided with the \
distribution.<br> > -# * Neither the names of the authors nor the names of \
contributors may<br> > -# be used to endorse or promote products derived from \
this ontology without<br> > -# specific prior written permission.<br>
> -#<br>
> -# THIS ONTOLOGY IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS \
OR<br> > -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED \
WARRANTIES<br> > -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE \
DISCLAIMED.<br> > -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, \
INDIRECT,<br> > -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES \
(INCLUDING, BUT<br> > -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR \
SERVICES; LOSS OF USE,<br> > -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) \
HOWEVER CAUSED AND ON ANY<br> > -# THEORY OF LIABILITY, WHETHER IN CONTRACT, \
STRICT LIABILITY, OR TORT<br> > -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN \
ANY WAY OUT OF THE USE OF<br> > -# THIS ONTOLOGY, EVEN IF ADVISED OF THE \
POSSIBILITY OF SUCH DAMAGE.<br> > -#<br>
> -<br>
> -@prefix rdfs: <<a href="http://www.w3.org/2000/01/rdf-schema#" \
target="_blank">http://www.w3.org/2000/01/rdf-schema#</a>> .<br> > -@prefix \
nao: <<a href="http://www.semanticdesktop.org/ontologies/2007/08/15/nao#" \
target="_blank">http://www.semanticdesktop.org/ontologies/2007/08/15/nao#</a>> \
.<br> > -@prefix nrl: <<a \
href="http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#" \
target="_blank">http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#</a>> \
.<br> > -@prefix nie: <<a \
href="http://www.semanticdesktop.org/ontologies/2007/01/19/nie#" \
target="_blank">http://www.semanticdesktop.org/ontologies/2007/01/19/nie#</a>> \
.<br> > -@prefix xsd: <<a href="http://www.w3.org/2001/XMLSchema#" \
target="_blank">http://www.w3.org/2001/XMLSchema#</a>> .<br> > -@prefix rdf: \
<<a href="http://www.w3.org/1999/02/22-rdf-syntax-ns#" \
target="_blank">http://www.w3.org/1999/02/22-rdf-syntax-ns#</a>> .<br> > \
-@prefix kuvo: <<a href="http://nepomuk.kde.org/ontologies/2010/08/18/kuvo#" \
target="_blank">http://nepomuk.kde.org/ontologies/2010/08/18/kuvo#</a>> .<br> > \
-@prefix nuao: <<a \
href="http://www.semanticdesktop.org/ontologies/2010/01/25/nuao#" \
target="_blank">http://www.semanticdesktop.org/ontologies/2010/01/25/nuao#</a>> \
.<br> > -@prefix nfo: <<a \
href="http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#" \
target="_blank">http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#</a>> \
.<br> > -<br>
> -kuvo: {<br>
> - # Setting a baseline calms down the algorithm that creates all the \
entries.<br> > - rdfs:Resource<br>
> - nao:userVisible true .<br>
> -<br>
> - nao:userVisible<br>
> - nao:userVisible false .<br>
> -<br>
> - nao:hasSubResource<br>
> - nao:userVisible false .<br>
> -<br>
> - nuao:Event<br>
> - nao:userVisible false .<br>
> -<br>
> - nao:score<br>
> - nao:userVisible false .<br>
> -<br>
> - nie:hasPart<br>
> - nao:userVisible false .<br>
> -<br>
> - nrl:Graph<br>
> - nao:userVisible false .<br>
> -<br>
> - rdf:Property<br>
> - nao:userVisible false .<br>
> -<br>
> - rdfs:Class<br>
> - nao:userVisible false .<br>
> -}<br>
> -<br>
> -<<a href="http://nepomuk.kde.org/ontologies/2010/08/18/kuvo/metadata" \
target="_blank">http://nepomuk.kde.org/ontologies/2010/08/18/kuvo/metadata</a>> \
{<br> > - <<a \
href="http://nepomuk.kde.org/ontologies/2010/08/18/kuvo/metadata" \
target="_blank">http://nepomuk.kde.org/ontologies/2010/08/18/kuvo/metadata</a>><br>
> - a nrl:GraphMetadata ;<br>
> - nrl:coreGraphMetadataFor kuvo: .<br>
> -<br>
> -<br>
> - kuvo:<br>
> - a nrl:Ontology , nrl:DocumentGraph ;<br>
> - nao:prefLabel "KDE User Visibility Ontology" ;<br>
> - nao:hasDefaultNamespace "<a \
href="http://nepomuk.kde.org/ontologies/2010/08/18/kuvo#" \
target="_blank">http://nepomuk.kde.org/ontologies/2010/08/18/kuvo#</a>" ;<br> \
> - nao:hasDefaultNamespaceAbbreviation "kuvo" ;<br> > - \
nao:lastModified "2010-11-29T12:31:43Z" ;<br> > - \
nao:serializationLanguage "TriG" ;<br> > - nao:status \
"Unstable" ;<br> > - nrl:updatable "0" ;<br>
> - nao:version "2" .<br>
> -}<br>
> -<br>
> diff --git a/nepomuk/ontologies/<a href="http://nrio.ontology.in" \
target="_blank">nrio.ontology.in</a> b/nepomuk/ontologies/<a \
href="http://nrio.ontology.in" target="_blank">nrio.ontology.in</a><br> > deleted \
file mode 100644<br> > index 814383f..0000000<br>
> --- a/nepomuk/ontologies/<a href="http://nrio.ontology.in" \
target="_blank">nrio.ontology.in</a><br> > +++ /dev/null<br>
> @@ -1,8 +0,0 @@<br>
> -[Ontology]<br>
> -Version=1.0<br>
> -Name=Nepomuk Resource Identification Ontology<br>
> -Comment=Required for backup and sync.<br>
> -Namespace=<a href="http://nepomuk.kde.org/ontologies/2010/11/11/nrio#" \
target="_blank">http://nepomuk.kde.org/ontologies/2010/11/11/nrio#</a><br> > \
-Path=${CMAKE_INSTALL_PREFIX}/share/ontology/kde/nrio.trig<br> > \
-MimeType=application/x-trig<br> > -Type=Data<br>
> diff --git a/nepomuk/ontologies/nrio.trig b/nepomuk/ontologies/nrio.trig<br>
> deleted file mode 100644<br>
> index 15ad04f..0000000<br>
> --- a/nepomuk/ontologies/nrio.trig<br>
> +++ /dev/null<br>
> @@ -1,327 +0,0 @@<br>
> -#<br>
> -# Copyright (c) 2010 Vishesh Handa <<a \
href="mailto:handa.vish@gmail.com">handa.vish@gmail.com</a>><br> > -# All \
rights reserved, licensed under either CC-BY or BSD.<br> > -#<br>
> -# You are free:<br>
> -# * to Share - to copy, distribute and transmit the work<br>
> -# * to Remix - to adapt the work<br>
> -# Under the following conditions:<br>
> -# * Attribution - You must attribute the work in the manner specified by the \
author<br> > -# or licensor (but not in any way that suggests that they endorse \
you or your use<br> > -# of the work).<br>
> -#<br>
> -# Redistribution and use in source and binary forms, with or without \
modification,<br> > -# are permitted provided that the following conditions are \
met:<br> > -# * Redistributions of source code must retain the above copyright \
notice, this<br> > -# list of conditions and the following disclaimer.<br>
> -# * Redistributions in binary form must reproduce the above copyright notice, \
this<br> > -# list of conditions and the following disclaimer in the \
documentation and/or<br> > -# other materials provided with the \
distribution.<br> > -# * Neither the names of the authors nor the names of \
contributors may<br> > -# be used to endorse or promote products derived from \
this ontology without<br> > -# specific prior written permission.<br>
> -#<br>
> -# THIS ONTOLOGY IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS \
OR<br> > -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED \
WARRANTIES<br> > -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE \
DISCLAIMED.<br> > -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, \
INDIRECT,<br> > -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES \
(INCLUDING, BUT<br> > -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR \
SERVICES; LOSS OF USE,<br> > -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) \
HOWEVER CAUSED AND ON ANY<br> > -# THEORY OF LIABILITY, WHETHER IN CONTRACT, \
STRICT LIABILITY, OR TORT<br> > -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN \
ANY WAY OUT OF THE USE OF<br> > -# THIS ONTOLOGY, EVEN IF ADVISED OF THE \
POSSIBILITY OF SUCH DAMAGE.<br> > -#<br>
> -<br>
> -@prefix nao: <<a \
href="http://www.semanticdesktop.org/ontologies/2007/08/15/nao#" \
target="_blank">http://www.semanticdesktop.org/ontologies/2007/08/15/nao#</a>> \
.<br> > -@prefix nfo: <<a \
href="http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#" \
target="_blank">http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#</a>> \
.<br> > -@prefix nie: <<a \
href="http://www.semanticdesktop.org/ontologies/2007/01/19/nie#" \
target="_blank">http://www.semanticdesktop.org/ontologies/2007/01/19/nie#</a>> \
.<br> > -@prefix ncal: <<a \
href="http://www.semanticdesktop.org/ontologies/2007/04/02/ncal#" \
target="_blank">http://www.semanticdesktop.org/ontologies/2007/04/02/ncal#</a>> \
.<br> > -@prefix nco: <<a \
href="http://www.semanticdesktop.org/ontologies/2007/03/22/nco#" \
target="_blank">http://www.semanticdesktop.org/ontologies/2007/03/22/nco#</a>> \
.<br> > -@prefix rdfs: <<a href="http://www.w3.org/2000/01/rdf-schema#" \
target="_blank">http://www.w3.org/2000/01/rdf-schema#</a>> .<br> > -@prefix \
pimo: <<a href="http://www.semanticdesktop.org/ontologies/2007/11/01/pimo#" \
target="_blank">http://www.semanticdesktop.org/ontologies/2007/11/01/pimo#</a>> \
.<br> > -@prefix nmo: <<a \
href="http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#" \
target="_blank">http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#</a>> \
.<br> > -@prefix nmm: <<a \
href="http://www.semanticdesktop.org/ontologies/2009/02/19/nmm#" \
target="_blank">http://www.semanticdesktop.org/ontologies/2009/02/19/nmm#</a>> \
.<br> > -@prefix nrl: <<a \
href="http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#" \
target="_blank">http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#</a>> \
.<br> > -@prefix rdf: <<a \
href="http://www.w3.org/1999/02/22-rdf-syntax-ns#" \
target="_blank">http://www.w3.org/1999/02/22-rdf-syntax-ns#</a>> .<br> > \
-@prefix xsd: <<a href="http://www.w3.org/2001/XMLSchema#" \
target="_blank">http://www.w3.org/2001/XMLSchema#</a>> .<br> > -<br>
> -@prefix nrio: <<a \
href="http://nepomuk.kde.org/ontologies/2010/11/11/nrio#" \
target="_blank">http://nepomuk.kde.org/ontologies/2010/11/11/nrio#</a>> .<br> > \
-<br> > -nrio: {<br>
> - nao:created<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nao:creator<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nao:description<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nao:identifier<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nao:iconName<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nao:lastModified<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nao:personalIdentifier<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nao:pluralPrefLabel<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nao:prefLabel<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nao:prefSymbol<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nao:rating<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nao:score<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> -<br>
> - nco:birthdate<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nco:contactUID<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nco:fullname<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nco:gender<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> -<br>
> - nie:byteSize<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nie:comment<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nie:contentCreated<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nie:contentLastModified<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nie:contentSize<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nie:created<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nie:description<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nie:identifier<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nie:informationElementDate<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nie:lastModified<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nie:lastRefreshed<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nie:mimeType<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nie:subject<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nie:title<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nie:url<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> -<br>
> - nfo:aspectRatio<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:averageBitrate<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:bitDepth<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:bitsPerSample<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:channels<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:characterCount<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:colorDepth<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:commentCharacterCount<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:compressionType<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:count<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:deletionDate<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:duration<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:encoding<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:encryptionStatus<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:fileCreated<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:fileLastAccessed<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:fileLastModified<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:fileName<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> -<br>
> - nfo:fileSize<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:fileUrl<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> -<br>
> - nfo:filesystemType<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> -<br>
> - nfo:frameCount<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:frameRate<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:freeSpace<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> -<br>
> - nfo:frontChannels<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> -<br>
> - nfo:hashAlgorithm<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:hashValue<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:height<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:horizontalResolution<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:interlaceMode<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:isPasswordProtected<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:lfeChannels<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:lineCount<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:occupiedSpace<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> -<br>
> - nfo:pageCount<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> -<br>
> - nfo:permissions<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:programmingLanguage<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:rate<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:rearChannels<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:sampleCount<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:sampleRate<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:sideChannels<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:streamPosition<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> -<br>
> - nfo:totalSpace<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:uncompressedSize<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:uuid<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:verticalResolution<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:width<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - nfo:wordCount<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> -<br>
> - rdfs:comment<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> - rdfs:label<br>
> - nrl:maxCardinality "1"^^xsd:integer .<br>
> -<br>
> -}<br>
> -<br>
> -<<a href="http://nepomuk.kde.org/ontologies/2010/11/11/nrio/metadata" \
target="_blank">http://nepomuk.kde.org/ontologies/2010/11/11/nrio/metadata</a>> \
{<br> > -<br>
> - nrio: a nrl:Ontology ;<br>
> - nao:hasDefaultNamespace "<a \
href="http://nepomuk.kde.org/ontologies/2010/11/11/nrio#" \
target="_blank">http://nepomuk.kde.org/ontologies/2010/11/11/nrio#</a>" ;<br> \
> - nao:hasDefaultNamespaceAbbreviation "nrio" ;<br> > -<br>
> - nao:serializationLanguage "TriG" ;<br>
> - nao:lastModified "2012-01-06T16:08:58Z" ;<br>
> - nao:status "Unstable" ;<br>
> - nao:updatable "0 " ;<br>
> - nao:version "Revision-1" .<br>
> -<br>
> - <<a href="http://nepomuk.kde.org/ontologies/2010/11/11/nrio/metadata" \
target="_blank">http://nepomuk.kde.org/ontologies/2010/11/11/nrio/metadata</a>><br>
> - a nrl:GraphMetadata ;<br>
> - nrl:coreGraphMetadataFor nrio: .<br>
> -}<br>
><br>
</blockquote></div><br>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic