From 605b71b3ea9d15dbda4f20b4d08850c8d982b964 Mon Sep 17 00:00:00 2001
From: dockes <none@none>
Date: Thu, 19 Jan 2006 14:57:59 +0000
Subject: [PATCH] end of initial experimentation

---
 src/kde/kioslave/recoll/Makefile       |  8 ++----
 src/kde/kioslave/recoll/kio_recoll.cpp | 12 +--------
 src/kde/kioslave/recoll/kio_recoll.h   | 12 ++++-----
 src/kde/kioslave/recoll/kio_recoll.la  | 35 ++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 24 deletions(-)
 create mode 100755 src/kde/kioslave/recoll/kio_recoll.la

diff --git a/src/kde/kioslave/recoll/Makefile b/src/kde/kioslave/recoll/Makefile
index a5ba3368..bcf2cefe 100644
--- a/src/kde/kioslave/recoll/Makefile
+++ b/src/kde/kioslave/recoll/Makefile
@@ -28,13 +28,9 @@ kio_recoll.so : kio_recoll.o piclib/librcl.a
 	    -Wl,--no-undefined \
 	    kio_recoll.o piclib/librcl.a \
 	    $(LIBXAPIAN) $(LIBICONV) \
-	    -L/usr/local/lib -L/usr/X11R6/lib -lkio -lkdeui -lkdesu \
-	    -lkdecore \
-	    -lDCOP \
+	    -L/usr/local/lib -L/usr/X11R6/lib -lkio -lkdecore \
 	    -lqt-mt \
-	    -lpng -lXext -lX11 -lSM -lICE -lXrender \
-	    -lz -lfam -lsasl2 -ljpeg -L/usr/lib -lstdc++ -lm \
-	    -lstdc++ -lc \
+	    -L/usr/lib -lstdc++ -lm -lc \
 	    -o kio_recoll.so 
 
 kio_recoll.o : kio_recoll.cpp kio_recoll.h
diff --git a/src/kde/kioslave/recoll/kio_recoll.cpp b/src/kde/kioslave/recoll/kio_recoll.cpp
index f7e74109..15bea4f4 100644
--- a/src/kde/kioslave/recoll/kio_recoll.cpp
+++ b/src/kde/kioslave/recoll/kio_recoll.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: kio_recoll.cpp,v 1.2 2006-01-19 12:01:42 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: kio_recoll.cpp,v 1.3 2006-01-19 14:57:59 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 
 #include <stdio.h>
@@ -13,10 +13,7 @@ using namespace std;
 
 #include <qfile.h>
 
-#include <kglobal.h>
-#include <kurl.h>
 #include <kinstance.h>
-#include <kio/global.h>
 
 #include "rclconfig.h"
 #include "rcldb.h"
@@ -184,13 +181,6 @@ void RecollProtocol::get(const KURL & url)
     finished();
 }
 
-void RecollProtocol::mimetype(const KURL & /*url*/)
-{
-  fprintf(stderr, "RecollProtocol::mimetype\n");
-  mimeType("text/html");
-  finished();
-}
-
 void RecollProtocol::outputError(const QString& errmsg)
 {
     QByteArray array;
diff --git a/src/kde/kioslave/recoll/kio_recoll.h b/src/kde/kioslave/recoll/kio_recoll.h
index 7236905d..b85300e0 100644
--- a/src/kde/kioslave/recoll/kio_recoll.h
+++ b/src/kde/kioslave/recoll/kio_recoll.h
@@ -1,4 +1,5 @@
 #ifndef _RECOLL_H
+/* @(#$Id: kio_recoll.h,v 1.3 2006-01-19 14:57:59 dockes Exp $  (C) 2005 J.F.Dockes */
 #define _RECOLL_H
 
 #include <string>
@@ -6,16 +7,12 @@
 #include <kio/global.h>
 #include <kio/slavebase.h>
 
-class RecollProtocol : public KIO::SlaveBase
-{
-public:
+class RecollProtocol : public KIO::SlaveBase {
+ public:
     RecollProtocol( const QCString &pool, const QCString &app );
     virtual ~RecollProtocol();
-    virtual void mimetype(const KURL& url);
     virtual void get( const KURL & url );
 
-    //    virtual void listDir( const KURL & url );
-    //    virtual void stat( const KURL & url );
  private:
     bool m_initok;
     RclConfig *m_rclconfig;
@@ -26,4 +23,5 @@ public:
     bool maybeOpenDb(string &reason);
     void outputError(const QString& errmsg);
 };
-#endif
+
+#endif // _RECOLL_H
diff --git a/src/kde/kioslave/recoll/kio_recoll.la b/src/kde/kioslave/recoll/kio_recoll.la
new file mode 100755
index 00000000..3078ac0a
--- /dev/null
+++ b/src/kde/kioslave/recoll/kio_recoll.la
@@ -0,0 +1,35 @@
+# kio_recoll.la - a libtool library file
+# Generated by ltmain.sh - GNU libtool 1.5a (1.1240 2003/06/26 06:55:19)
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='kio_recoll.so'
+
+# Names of this library.
+library_names='kio_recoll.so kio_recoll.so kio_recoll.so'
+
+# The name of the static archive.
+old_library=''
+
+# Libraries that this one depends upon.
+dependency_libs=' -R/usr/local/lib -R/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib /usr/local/lib/libkio.la /usr/local/lib/libkdeui.la /usr/local/lib/libkdesu.la /usr/local/lib/libkwalletclient.la /usr/local/lib/libkdecore.la /usr/local/lib/libDCOP.la -lutil -lart_lgpl_2 -lidn /usr/local/lib/libkdefx.la -lqt-mt -lpng -lXext -lX11 -lSM -lICE -lXrender -lz /usr/local/lib/libfam.la -ljpeg'
+
+# Version information for kio_recoll.
+current=0
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn recoll portability when linking against -modules?
+shouldnotlink=yes
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/usr/local/lib/kde3'