Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-08 09:05:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

FeedReader:

Browse source 
- Added error handling to xml functions
- Added xslt transformation
- Added retransform of existing messages
- Redesigned preview dialog
- Enabled embed images for forum feeds
- Changed config format, switching back to an older version results in a loss of all data of the FeedReader

Added new base class RSPlainTextEdit with placeholder text.
New library libxslt needed

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6081 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-01-22 00:11:43 +00:00
parent 919fb3f62d
commit ef49000b9a
28 changed files with 1549 additions and 849 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libretroshare/src/util/rsstring.cc
View file

@ -229,14 +229,11 @@ static int vasprintf(char **sptr, const char *fmt, va_list argv)
//}
#endif
int rs_sprintf(std::string &str, const char *fmt, ...)
int rs_sprintf_args(std::string &str, const char *fmt, va_list ap)
{
char *buffer = NULL;
va_list ap;
va_start(ap, fmt);
int retval = vasprintf(&buffer, fmt, ap);
va_end(ap);
int retval = vasprintf(&buffer, fmt, (va_list) ap);
if (retval >= 0) {
if (buffer) {
@ -252,15 +249,23 @@ int rs_sprintf(std::string &str, const char *fmt, ...)
return retval;
}
int rs_sprintf_append(std::string &str, const char *fmt, ...)
int rs_sprintf(std::string &str, const char *fmt, ...)
{
va_list ap;
char *buffer = NULL;
va_start(ap, fmt);
int retval = vasprintf(&buffer, fmt, ap);
int retval = rs_sprintf_args(str, fmt, ap);
va_end(ap);
return retval;
}
int rs_sprintf_append_args(std::string &str, const char *fmt, va_list ap)
{
char *buffer = NULL;
int retval = vasprintf(&buffer, fmt, (va_list) ap);
if (retval >= 0) {
if (buffer) {
str.append(buffer);
@ -271,6 +276,17 @@ int rs_sprintf_append(std::string &str, const char *fmt, ...)
return retval;
}
int rs_sprintf_append(std::string &str, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
int retval = rs_sprintf_append_args(str, fmt, ap);
va_end(ap);
return retval;
}
void stringToUpperCase(const std::string& s, std::string &upper)
{
upper = s ;

5
libretroshare/src/util/rsstring.h
View file

@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
****************************************************************/
@ -23,6 +23,7 @@
#define RSSTRING_H_
#include <string>
#include <stdarg.h>
namespace librs { namespace util {
@ -39,7 +40,9 @@ bool ConvertUtf16ToUtf8(const std::wstring& source, std::string& dest);
#define UINT64FMT "%llu"
#endif
int rs_sprintf_args(std::string &str, const char *fmt, va_list ap);
int rs_sprintf(std::string &str, const char *fmt, ...);
int rs_sprintf_append_args(std::string &str, const char *fmt, va_list ap);
int rs_sprintf_append(std::string &str, const char *fmt, ...);
void stringToUpperCase(const std::string& s, std::string &upper);