From bd6336c629841c6db3a6ca53a936d629d34db53b Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:15:16 +0200 Subject: 4.1 --- shared/string_conv.h | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 shared/string_conv.h (limited to 'shared/string_conv.h') diff --git a/shared/string_conv.h b/shared/string_conv.h deleted file mode 100644 index 976080fb..00000000 --- a/shared/string_conv.h +++ /dev/null @@ -1,25 +0,0 @@ -// ************************************************************************** -// * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * -// * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de) * -// ************************************************************************** - -#ifndef STRINGCONV_H_INCLUDED -#define STRINGCONV_H_INCLUDED - -#include -#include -#include "zstring.h" - -namespace zen -{ -inline wxString operator+(const wxString& lhs, const char* rhs) { return wxString(lhs) += utf8CvrtTo(rhs); } -inline wxString operator+(const wxString& lhs, const Zstring& rhs) { return wxString(lhs) += utf8CvrtTo(rhs); } - - -//conversion between Zstring and wxString -inline wxString toWx(const Zstring& str) { return utf8CvrtTo(str); } -inline Zstring toZ(const wxString& str) { return utf8CvrtTo(str); } -} - -#endif // STRINGCONV_H_INCLUDED -- cgit