namespace PT renamed to pt
This commit is contained in:
@@ -123,7 +123,7 @@ bool ExportInfo::DecodePass(Export & exp)
|
||||
/*
|
||||
if( system->crypt.RSA(false, rsa_key, exp.ftp_pass_bin, pass_decrypted) )
|
||||
{
|
||||
PT::UTF8ToWide(pass_decrypted, exp.ftp_pass);
|
||||
pt::UTF8ToWide(pass_decrypted, exp.ftp_pass);
|
||||
system->crypt.ClearString(pass_decrypted);
|
||||
}
|
||||
else
|
||||
@@ -143,7 +143,7 @@ bool ExportInfo::SkipDir(long dir_id, std::wstring & dir)
|
||||
{
|
||||
if( system->dirs.MakePath(dir_id, tmp_dir) )
|
||||
{
|
||||
if( !tmp_dir.empty() && PT::is_substr(tmp_dir, dir) )
|
||||
if( !tmp_dir.empty() && pt::is_substr(tmp_dir, dir) )
|
||||
{
|
||||
// tmp_dir has a slash at the end
|
||||
// we want the slash at the beginning
|
||||
@@ -334,7 +334,7 @@ void ExportInfo::AdditionalExport(const Item & item)
|
||||
{
|
||||
for(size_t i=0 ; i<item.item_content.meta.child_spaces->size() ; ++i)
|
||||
{
|
||||
PT::Space & child = *(*item.item_content.meta.child_spaces)[i];
|
||||
pt::Space & child = *(*item.item_content.meta.child_spaces)[i];
|
||||
|
||||
if( child.name && *child.name == L"export" )
|
||||
AdditionalExport(item, child);
|
||||
@@ -343,7 +343,7 @@ void ExportInfo::AdditionalExport(const Item & item)
|
||||
}
|
||||
|
||||
|
||||
void ExportInfo::AdditionalExport(const Item & item, PT::Space & meta)
|
||||
void ExportInfo::AdditionalExport(const Item & item, pt::Space & meta)
|
||||
{
|
||||
meta.to_list(L"additional_export", additional_export);
|
||||
|
||||
|
@@ -103,7 +103,7 @@ private:
|
||||
bool SkipDir(long dir_id, std::wstring & dir);
|
||||
|
||||
void AdditionalExport(const Item & item);
|
||||
void AdditionalExport(const Item & item, PT::Space & meta);
|
||||
void AdditionalExport(const Item & item, pt::Space & meta);
|
||||
void AdditionalExport(const std::wstring & path);
|
||||
|
||||
bool HasRecurrenceId(long id);
|
||||
|
@@ -262,7 +262,7 @@ return len;
|
||||
void ExportThread::Convert(const std::wstring & in, std::string & out, bool clear)
|
||||
{
|
||||
Lock();
|
||||
PT::WideToUTF8(in, out, clear);
|
||||
pt::WideToUTF8(in, out, clear);
|
||||
Unlock();
|
||||
}
|
||||
|
||||
@@ -393,13 +393,13 @@ bool ExportThread::HasThumbInAdress(std::string & buf, size_t i)
|
||||
|
||||
for( ; i<buf.size() ; ++i)
|
||||
{
|
||||
if( PT::is_substr(thumb1, &buf[i]) )
|
||||
if( pt::is_substr(thumb1, &buf[i]) )
|
||||
{
|
||||
buf.erase(i, len1);
|
||||
return true;
|
||||
}
|
||||
|
||||
if( PT::is_substr(thumb2, &buf[i]) )
|
||||
if( pt::is_substr(thumb2, &buf[i]) )
|
||||
{
|
||||
buf.erase(i, len2);
|
||||
return true;
|
||||
@@ -427,7 +427,7 @@ void ExportThread::ChangeAdressesThumb(std::string & buf, const char * http_pref
|
||||
|
||||
for(size_t i=0 ; i<buf.size() ; ++i)
|
||||
{
|
||||
if( PT::is_substr(look_for_url.c_str(), &buf[i]) )
|
||||
if( pt::is_substr(look_for_url.c_str(), &buf[i]) )
|
||||
{
|
||||
i += look_for_url.size() - 1; // without skipping the last slash
|
||||
|
||||
|
Reference in New Issue
Block a user