diff --git a/src/VERSION b/src/VERSION index 2ac9634d..5b09c67c 100644 --- a/src/VERSION +++ b/src/VERSION @@ -1 +1 @@ -1.0.13 +1.0.14 diff --git a/src/internfile/mh_mail.cpp b/src/internfile/mh_mail.cpp index 326561b7..5ecaab94 100644 --- a/src/internfile/mh_mail.cpp +++ b/src/internfile/mh_mail.cpp @@ -1,11 +1,12 @@ #ifndef lint -static char rcsid[] = "@(#$Id: mh_mail.cpp,v 1.11 2005-11-24 07:16:15 dockes Exp $ (C) 2005 J.F.Dockes"; +static char rcsid[] = "@(#$Id: mh_mail.cpp,v 1.12 2005-12-07 15:41:50 dockes Exp $ (C) 2005 J.F.Dockes"; #endif #include #include #include #include +#include #include #include diff --git a/src/qtgui/preview/preview.ui.h b/src/qtgui/preview/preview.ui.h index 855dcc7d..7cce4678 100644 --- a/src/qtgui/preview/preview.ui.h +++ b/src/qtgui/preview/preview.ui.h @@ -10,6 +10,7 @@ ** destructor. *****************************************************************************/ #include +#include #include #include @@ -267,7 +268,7 @@ void Preview::setCurTabProps(const string &fn, const Rcl::Doc &doc) time_t mtime = doc.dmtime.empty() ? atol(doc.fmtime.c_str()) : atol(doc.dmtime.c_str()); struct tm *tm = localtime(&mtime); - strftime(datebuf, 99, "%F %T", tm); + strftime(datebuf, 99, "%Y-%m-%d %H:%M:%S", tm); } string tiptxt = doc.url + string("\n"); tiptxt += doc.mimetype + " " + string(datebuf) + "\n"; diff --git a/src/qtgui/recollmain.ui.h b/src/qtgui/recollmain.ui.h index da444034..f38e9428 100644 --- a/src/qtgui/recollmain.ui.h +++ b/src/qtgui/recollmain.ui.h @@ -10,11 +10,12 @@ ** destructor. *****************************************************************************/ -#include #include +#include +#include #include #include -#include +#include #include #ifndef NO_NAMESPACES diff --git a/src/query/docseq.cpp b/src/query/docseq.cpp index b5aa4223..e2d92bca 100644 --- a/src/query/docseq.cpp +++ b/src/query/docseq.cpp @@ -1,7 +1,8 @@ #ifndef lint -static char rcsid[] = "@(#$Id: docseq.cpp,v 1.4 2005-12-05 16:13:12 dockes Exp $ (C) 2005 J.F.Dockes"; +static char rcsid[] = "@(#$Id: docseq.cpp,v 1.5 2005-12-07 15:41:50 dockes Exp $ (C) 2005 J.F.Dockes"; #endif #include +#include #include "docseq.h" diff --git a/src/utils/utf8iter.h b/src/utils/utf8iter.h index 17305306..43d5417a 100644 --- a/src/utils/utf8iter.h +++ b/src/utils/utf8iter.h @@ -1,6 +1,6 @@ #ifndef _UTF8ITER_H_INCLUDED_ #define _UTF8ITER_H_INCLUDED_ -/* @(#$Id: utf8iter.h,v 1.3 2005-03-17 14:02:06 dockes Exp $ (C) 2004 J.F.Dockes */ +/* @(#$Id: utf8iter.h,v 1.4 2005-12-07 15:41:50 dockes Exp $ (C) 2004 J.F.Dockes */ /** * A small helper class to iterate over utf8 strings. This is not an @@ -137,7 +137,7 @@ class Utf8Iter { } operator string() { if (bad || (!cl && compute_cl() < 0)) { - return false; + return std::string(""); } return s.substr(pos, cl); }