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

List:       kde-commits
Subject:    Re: [kdepim-runtime] agents/nepomukfeeder: Use nepomuk-core
From:       Vishesh Handa <handa.vish () gmail ! com>
Date:       2012-07-12 18:54:12
Message-ID: CAOPTMKAOHDU2eURMtTPU6LybjTiOMT+mTew50BkSHueodP2tyw () mail ! gmail ! com
[Download RAW message or body]

On Fri, Jul 13, 2012 at 12:09 AM, Montel Laurent <montel@kde.org> wrote:

> Git commit f1bcb88eff88f0270e7ce37b3df8363e90e1d708 by Montel Laurent.
> Committed on 12/07/2012 at 20:39.
> Pushed by mlaurent into branch 'master'.
>
> Use nepomuk-core
>
> M  +6    -6    agents/nepomukfeeder/nepomukfeederagent.cpp
>
>
> http://commits.kde.org/kdepim-runtime/f1bcb88eff88f0270e7ce37b3df8363e90e1d708
>
> diff --git a/agents/nepomukfeeder/nepomukfeederagent.cpp
> b/agents/nepomukfeeder/nepomukfeederagent.cpp
> index 0b9bd8c..9ee6f6d 100644
> --- a/agents/nepomukfeeder/nepomukfeederagent.cpp
> +++ b/agents/nepomukfeeder/nepomukfeederagent.cpp
> @@ -38,7 +38,7 @@
>  #include <nepomuk2/simpleresource.h>
>  #include <nepomuk2/simpleresourcegraph.h>
>  #include <nepomuk2/datamanagement.h>
> -#include <nepomuk/resourcemanager.h>
> +#include <nepomuk2/resourcemanager.h>
>

We have fancy headers as well :) In case you want to use them.

>
>  #include <KLocale>
>  #include <KUrl>
> @@ -92,7 +92,7 @@ NepomukFeederAgent::NepomukFeederAgent(const QString&
> id) :
>    KGlobal::locale()->insertCatalog( "akonadi_nepomukfeeder" ); //TODO do
> we really need this?
>
>    // initialize Nepomuk
> -  Nepomuk::ResourceManager::instance()->init();
> +  Nepomuk2::ResourceManager::instance()->init();
>

You can skip this if you want. It will automatically get initialized when
it is first used.


>    changeRecorder()->fetchCollection( true );
>    changeRecorder()->itemFetchScope().setAncestorRetrieval(
> ItemFetchScope::Parent );
> @@ -103,8 +103,8 @@ NepomukFeederAgent::NepomukFeederAgent(const QString&
> id) :
>    mNepomukStartupTimeout.setInterval( 300 * 1000 );
>    mNepomukStartupTimeout.setSingleShot( true );
>    connect( &mNepomukStartupTimeout, SIGNAL(timeout()), SLOT(selfTest()) );
> -  connect( Nepomuk::ResourceManager::instance(),
> SIGNAL(nepomukSystemStarted()), SLOT(selfTest()) );
> -  connect( Nepomuk::ResourceManager::instance(),
> SIGNAL(nepomukSystemStopped()), SLOT(selfTest()) );
> +  connect( Nepomuk2::ResourceManager::instance(),
> SIGNAL(nepomukSystemStarted()), SLOT(selfTest()) );
> +  connect( Nepomuk2::ResourceManager::instance(),
> SIGNAL(nepomukSystemStopped()), SLOT(selfTest()) );
>    connect( this, SIGNAL(reloadConfiguration()), SLOT(selfTest()) );
>    connect( this, SIGNAL(fullyIndexed()), this, SLOT(slotFullyIndexed()) );
>
> @@ -228,7 +228,7 @@ void NepomukFeederAgent::selfTest()
>    }
>
>    // if Nepomuk is not running, try to start it
> -  if ( !mNepomukStartupAttempted &&
> !Nepomuk::ResourceManager::instance()->initialized() ) {
> +  if ( !mNepomukStartupAttempted &&
> !Nepomuk2::ResourceManager::instance()->initialized() ) {
>      KProcess process;
>      const QString nepomukserver = KStandardDirs::findExe( QLatin1String(
> "nepomukserver" ) );
>      if ( process.startDetached( nepomukserver ) == 0 ) {
> @@ -243,7 +243,7 @@ void NepomukFeederAgent::selfTest()
>      }
>    }
>
> -  if ( !Nepomuk::ResourceManager::instance()->initialized() ) {
> +  if ( !Nepomuk2::ResourceManager::instance()->initialized() ) {
>      if ( mNepomukStartupAttempted && mNepomukStartupTimeout.isActive() ) {
>        // still waiting for Nepomuk to start
>        setOnline( false );
>

[Attachment #3 (text/html)]

<br><br><div class="gmail_quote">On Fri, Jul 13, 2012 at 12:09 AM, Montel Laurent \
<span dir="ltr">&lt;<a href="mailto:montel@kde.org" \
target="_blank">montel@kde.org</a>&gt;</span> wrote:<br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"> Git commit f1bcb88eff88f0270e7ce37b3df8363e90e1d708 by \
Montel Laurent.<br> Committed on 12/07/2012 at 20:39.<br>
Pushed by mlaurent into branch &#39;master&#39;.<br>
<br>
Use nepomuk-core<br>
<br>
M  +6    -6    agents/nepomukfeeder/nepomukfeederagent.cpp<br>
<br>
<a href="http://commits.kde.org/kdepim-runtime/f1bcb88eff88f0270e7ce37b3df8363e90e1d708" \
target="_blank">http://commits.kde.org/kdepim-runtime/f1bcb88eff88f0270e7ce37b3df8363e90e1d708</a><br>
 <br>
diff --git a/agents/nepomukfeeder/nepomukfeederagent.cpp \
b/agents/nepomukfeeder/nepomukfeederagent.cpp<br> index 0b9bd8c..9ee6f6d 100644<br>
--- a/agents/nepomukfeeder/nepomukfeederagent.cpp<br>
+++ b/agents/nepomukfeeder/nepomukfeederagent.cpp<br>
@@ -38,7 +38,7 @@<br>
 #include &lt;nepomuk2/simpleresource.h&gt;<br>
 #include &lt;nepomuk2/simpleresourcegraph.h&gt;<br>
 #include &lt;nepomuk2/datamanagement.h&gt;<br>
-#include &lt;nepomuk/resourcemanager.h&gt;<br>
+#include &lt;nepomuk2/resourcemanager.h&gt;<br></blockquote><div><br>We have fancy \
headers as well :) In case you want to use them. <br></div><blockquote \
class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid \
rgb(204,204,204);padding-left:1ex">

<br>
 #include &lt;KLocale&gt;<br>
 #include &lt;KUrl&gt;<br>
@@ -92,7 +92,7 @@ NepomukFeederAgent::NepomukFeederAgent(const QString&amp; id) :<br>
   KGlobal::locale()-&gt;insertCatalog( &quot;akonadi_nepomukfeeder&quot; ); //TODO \
do we really need this?<br> <br>
   // initialize Nepomuk<br>
-  Nepomuk::ResourceManager::instance()-&gt;init();<br>
+  Nepomuk2::ResourceManager::instance()-&gt;init();<br></blockquote><div><br>You can \
skip this if you want. It will automatically get initialized when it is first \
used.<br> <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px \
0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">

   changeRecorder()-&gt;fetchCollection( true );<br>
   changeRecorder()-&gt;itemFetchScope().setAncestorRetrieval( ItemFetchScope::Parent \
);<br> @@ -103,8 +103,8 @@ NepomukFeederAgent::NepomukFeederAgent(const QString&amp; \
id) :<br>  mNepomukStartupTimeout.setInterval( 300 * 1000 );<br>
   mNepomukStartupTimeout.setSingleShot( true );<br>
   connect( &amp;mNepomukStartupTimeout, SIGNAL(timeout()), SLOT(selfTest()) );<br>
-  connect( Nepomuk::ResourceManager::instance(), SIGNAL(nepomukSystemStarted()), \
                SLOT(selfTest()) );<br>
-  connect( Nepomuk::ResourceManager::instance(), SIGNAL(nepomukSystemStopped()), \
SLOT(selfTest()) );<br> +  connect( Nepomuk2::ResourceManager::instance(), \
SIGNAL(nepomukSystemStarted()), SLOT(selfTest()) );<br> +  connect( \
Nepomuk2::ResourceManager::instance(), SIGNAL(nepomukSystemStopped()), \
SLOT(selfTest()) );<br>  connect( this, SIGNAL(reloadConfiguration()), \
SLOT(selfTest()) );<br>  connect( this, SIGNAL(fullyIndexed()), this, \
SLOT(slotFullyIndexed()) );<br> <br>
@@ -228,7 +228,7 @@ void NepomukFeederAgent::selfTest()<br>
   }<br>
<br>
   // if Nepomuk is not running, try to start it<br>
-  if ( !mNepomukStartupAttempted &amp;&amp; \
!Nepomuk::ResourceManager::instance()-&gt;initialized() ) {<br> +  if ( \
!mNepomukStartupAttempted &amp;&amp; \
!Nepomuk2::ResourceManager::instance()-&gt;initialized() ) {<br>  KProcess \
                process;<br>
     const QString nepomukserver = KStandardDirs::findExe( QLatin1String( \
&quot;nepomukserver&quot; ) );<br>  if ( process.startDetached( nepomukserver ) == 0 \
) {<br> @@ -243,7 +243,7 @@ void NepomukFeederAgent::selfTest()<br>
     }<br>
   }<br>
<br>
-  if ( !Nepomuk::ResourceManager::instance()-&gt;initialized() ) {<br>
+  if ( !Nepomuk2::ResourceManager::instance()-&gt;initialized() ) {<br>
     if ( mNepomukStartupAttempted &amp;&amp; mNepomukStartupTimeout.isActive() ) \
{<br>  // still waiting for Nepomuk to start<br>
       setOnline( false );<br>
</blockquote></div><br>



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