From 32f4f7b6fc13d24126bebadac93fb634edc368ea Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Mon, 9 May 2011 20:48:59 +0200
Subject: [PATCH] Fix a number of potential or actual static object
 initialization issues

---
 src/query/plaintorich.cpp |  2 --
 src/query/plaintorich.h   |  2 +-
 src/rcldb/rcldb_p.h       | 15 ---------------
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/query/plaintorich.cpp b/src/query/plaintorich.cpp
index 7a4c4b28..b5a16c74 100644
--- a/src/query/plaintorich.cpp
+++ b/src/query/plaintorich.cpp
@@ -41,8 +41,6 @@ using std::set;
 #include "cancelcheck.h"
 #include "unacpp.h"
 
-const string PlainToRich::snull = "";
-
 // For debug printing
 static string vecStringToString(const vector<string>& t)
 {
diff --git a/src/query/plaintorich.h b/src/query/plaintorich.h
index 0678f39d..5e7c117e 100644
--- a/src/query/plaintorich.h
+++ b/src/query/plaintorich.h
@@ -86,7 +86,7 @@ public:
     virtual string startChunk() {return snull;}
 
 protected:
-    static const string snull;
+    const string snull;
     bool m_inputhtml;
     // Use <br> to break plain text lines (else caller has used a <pre> tag)
     bool m_eolbr; 
diff --git a/src/rcldb/rcldb_p.h b/src/rcldb/rcldb_p.h
index 4749cc76..ab34820a 100644
--- a/src/rcldb/rcldb_p.h
+++ b/src/rcldb/rcldb_p.h
@@ -114,20 +114,5 @@ class Db::Native {
 
 };
 
-// Field names inside the index data record may differ from the rcldoc ones
-// (esp.: caption / title)
-inline const string& docfToDatf(const string& df)
-{
-    static const string keycap("caption");
-    static const string keydmtime("dmtime");
-    if (!df.compare(Doc::keytt)) {
-	return keycap;
-    } else if (!df.compare(Doc::keymt)) {
-	return keydmtime;
-    } else {
-	return df;
-    }
-}
-
 }
 #endif /* _rcldb_p_h_included_ */