From 37395e05aba83ec89733b0fd5caa1700d0b65162 Mon Sep 17 00:00:00 2001
From: dockes <none@none>
Date: Thu, 26 Jan 2006 07:03:35 +0000
Subject: [PATCH] *** empty log message ***

---
 src/qtgui/recoll.pro    |  2 +-
 src/qtgui/recoll.pro.in | 42 ++++++++++++++++++-----------------------
 src/utils/smallut.h     |  8 ++++----
 3 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/src/qtgui/recoll.pro b/src/qtgui/recoll.pro
index 37815011..f93af43c 100644
--- a/src/qtgui/recoll.pro
+++ b/src/qtgui/recoll.pro
@@ -35,7 +35,7 @@ unix {
   DEFINES += RECOLL_DATADIR=\"/usr/local/share\"
   LIBS += ../lib/librcl.a ../bincimapmime/libmime.a \
             $(BSTATIC) -L/usr/local/lib -lxapian -L/usr/local/lib -liconv $(BDYNAMIC) \
-           -lkdecore -lz
+           -lz
 
   INCLUDEPATH += ../common ../index ../query ../unac ../utils 
   POST_TARGETDEPS = ../lib/librcl.a
diff --git a/src/qtgui/recoll.pro.in b/src/qtgui/recoll.pro.in
index 3121dae6..e50a7cb1 100644
--- a/src/qtgui/recoll.pro.in
+++ b/src/qtgui/recoll.pro.in
@@ -3,35 +3,29 @@ LANGUAGE	= C++
 
 CONFIG	+= qt warn_on thread release debug
 
+HEADERS	+= rclmain.h
+
 SOURCES	+= main.cpp \
 	rclmain.cpp \
 	idxthread.cpp \
-	plaintorich.cpp
+	plaintorich.cpp \
+	guiutils.cpp
 
-HEADERS = rclmain.h
+FORMS	= reslistb.ui \
+	recollmain.ui \
+	advsearch.ui \
+	preview/preview.ui \
+	sort.ui \
+	uiprefs.ui \
+	ssearchb.ui
 
-FORMS	= recollmain.ui \
-          advsearch.ui \
-	  preview/preview.ui \
-          sort.ui \
-          uiprefs.ui
-
-
-IMAGES	= images/filenew \
-	images/fileopen \
-	images/filesave \
-	images/print \
-	images/undo \
-	images/redo \
-	images/editcut \
-	images/editcopy \
-	images/editpaste \
-	images/searchfind \
-	images/asearch \
-	images/history \
-	images/nextpage \
-	images/prevpage \
-	images/sortparms
+IMAGES	= images/asearch.png \
+	images/history.png \
+	images/d_nextpage.png \
+	images/nextpage.png \
+	images/d_prevpage.png \
+	images/prevpage.png \
+	images/sortparms.png
 
 unix {
   UI_DIR = .ui
diff --git a/src/utils/smallut.h b/src/utils/smallut.h
index 9cc6b6a2..14f09a32 100644
--- a/src/utils/smallut.h
+++ b/src/utils/smallut.h
@@ -1,6 +1,6 @@
 #ifndef _SMALLUT_H_INCLUDED_
 #define _SMALLUT_H_INCLUDED_
-/* @(#$Id: smallut.h,v 1.12 2006-01-19 12:01:43 dockes Exp $  (C) 2004 J.F.Dockes */
+/* @(#$Id: smallut.h,v 1.13 2006-01-26 07:03:35 dockes Exp $  (C) 2004 J.F.Dockes */
 #include <string>
 #include <list>
 
@@ -25,12 +25,12 @@ extern string stringlistdisp(const list<string>& strs);
  * Token delimiter is " \t" except inside dquotes. dquote inside
  * dquotes can be escaped with \ etc...
  */
-extern bool stringToStrings(const string &s, std::list<string> &tokens);
+extern bool stringToStrings(const string &s, list<string> &tokens);
 
 /**
  * Split input string. No handling of quoting
  */
-extern void stringToTokens(const string &s, std::list<string> &tokens, 
+extern void stringToTokens(const string &s, list<string> &tokens, 
 			   const string &delims = " \t");
 
 /** Convert string to boolean */
@@ -40,6 +40,6 @@ extern bool stringToBool(const string &s);
     tab}) at beginning and end of input string */
 extern void trimstring(string &s, const char *ws = " \t");
 
-extern std::string escapeHtml(const std::string &in);
+extern string escapeHtml(const string &in);
 
 #endif /* _SMALLUT_H_INCLUDED_ */