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

List:       kde-commits
Subject:    playground/base/nepomuk-kde
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2009-01-28 10:55:33
Message-ID: 1233140133.847029.22461.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 917651 by trueg:

made the Nepomuk Social Query Daemon and Client work again

 M  +3 -2      CMakeLists.txt  
 M  +5 -4      nsqclient/CMakeLists.txt  
 M  +13 -6     nsqclient/mainwindow.cpp  
 A             nsqclient/searchcore.cpp   [License: LGPL (v2)]
 A             nsqclient/searchcore.h   [License: LGPL (v2)]
 A             nsqclient/searchthread.cpp   [License: LGPL (v2)]
 A             nsqclient/searchthread.h   [License: LGPL (v2)]


--- trunk/playground/base/nepomuk-kde/CMakeLists.txt #917650:917651
@@ -34,8 +34,8 @@
 # nsq depends on a class internal to the query client
 # maybe we can enable this again with an svn external
 # once the query service is in kdebase
-#add_subdirectory(nsqd)
-#add_subdirectory(nsqclient)
+add_subdirectory(nsqd)
+add_subdirectory(nsqclient)
 
 add_subdirectory(akademy08-bof)
 
@@ -50,3 +50,4 @@
 add_subdirectory(resourceinspector)
 add_subdirectory(usercontext)
 add_subdirectory(ontologyimportclient)
+add_subdirectory(download)
--- trunk/playground/base/nepomuk-kde/nsqclient/CMakeLists.txt #917650:917651
@@ -4,7 +4,8 @@
   include_directories(
     ${QT_INCLUDES}
     ${KDE4_INCLUDES}
-    ${NEPOMUK_INCLUDES}
+    ${NEPOMUK_INCLUDE_DIR}
+    ${NEPOMUK_INCLUDE_DIR}/nepomuk
     ${nepomuksearch_SOURCE_DIR}
     ${nepomuk_queryservice_SOURCE_DIR}
     ${nepomuk_visualization_SOURCE_DIR}
@@ -14,15 +15,15 @@
     main.cpp
     mainwindow.cpp
     nsqclientmodel.cpp
-    ../queryservice/searchcore.cpp
-    ../queryservice/searchthread.cpp
+    searchcore.cpp
+    searchthread.cpp
     )
 
   kde4_add_executable(nsqclient ${SRCS})
 
   target_link_libraries(nsqclient 
     nepomukvisualization
-    nepomuksearch
+    nepomukquery
     ${NEPOMUK_LIBRARIES}
     ${QT_QTGUI_LIBRARY}
     ${QT_QTDBUS_LIBRARY}
--- trunk/playground/base/nepomuk-kde/nsqclient/mainwindow.cpp #917650:917651
@@ -18,12 +18,15 @@
 
 #include "mainwindow.h"
 #include "nsqclientmodel.h"
-#include "query.h"
 #include "searchcore.h"
-#include "queryparser.h"
 #include "searchhitmodel.h"
 #include "searchhitview.h"
 
+#include <nepomuk/query.h>
+#include <nepomuk/result.h>
+#include <nepomuk/queryparser.h>
+#include <nepomuk/resourcemanager.h>
+
 #include <QtGui/QLabel>
 #include <QtGui/QListView>
 #include <QtGui/QHBoxLayout>
@@ -51,6 +54,7 @@
 
 #include <nepomuk/resourcemanager.h>
 
+Q_DECLARE_METATYPE( Nepomuk::Search::Result )
 
 MainWindow::MainWindow()
     : QWidget( 0 ),
@@ -93,15 +97,18 @@
 
     m_searchCore = new Nepomuk::Search::SearchCore( this );
 
-    connect( m_searchCore, SIGNAL( newResult( const QUrl&, double ) ),
-             m_resultsView, SLOT( updateResource( const QUrl&, double ) ) );
-    connect( m_searchCore, SIGNAL( scoreChanged( const QUrl&, double ) ),
-             m_resultsView, SLOT( updateResource( const QUrl&, double ) ) );
+    connect( m_searchCore, SIGNAL( newResult( const Nepomuk::Search::Result& ) ),
+             m_resultsView, SLOT( updateResource( const Nepomuk::Search::Result& ) ) );
+    connect( m_searchCore, SIGNAL( scoreChanged( const Nepomuk::Search::Result& ) ),
+             m_resultsView, SLOT( updateResource( const Nepomuk::Search::Result& ) ) );
 
     connect( m_buddyView, SIGNAL( doubleClicked(const QModelIndex& ) ),
              this, SLOT( slotItemActivated( const QModelIndex& ) ) );
     connect( m_resultsView, SIGNAL( customContextMenuRequested( const QPoint& ) ),
              this, SLOT( slotContextMenu( const QPoint& ) ) );
+
+    Nepomuk::ResourceManager::instance()->init();
+    qRegisterMetaType<Nepomuk::Search::Result>();
 }
 
 
[prev in list] [next in list] [prev in thread] [next in thread]