From d1f7065c8a6e648c3fc2f7bb62a1fbe2a8eea0b9 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 5 May 2022 10:35:15 +0300 Subject: [PATCH] PICout::writePIString -> PICout::write --- libs/main/core/picout.cpp | 10 +++++----- libs/main/core/picout.h | 2 +- libs/main/core/pistring.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/main/core/picout.cpp b/libs/main/core/picout.cpp index 21c57fd0..9fac78f6 100644 --- a/libs/main/core/picout.cpp +++ b/libs/main/core/picout.cpp @@ -337,7 +337,7 @@ PICout PICout::operator <<(const PIFlags & v) if (!act_) return *this; \ space(); \ if (cnb_ == 10) PICOUTTOTARGET(v) \ - else writePIString(PIString::fromNumber(v, cnb_)); \ + else write(PIString::fromNumber(v, cnb_)); \ return *this; \ } @@ -370,7 +370,7 @@ PICout PICout::operator <<(const float v) {if (!act_) return *this; space(); PIC PICout PICout::operator <<(const double v) {if (!act_) return *this; space(); PICOUTTOTARGET(v) return *this;} -PICout PICout::operator <<(const void * v) {if (!act_) return *this; space(); PICOUTTOTARGET("0x") writePIString(PIString::fromNumber(ullong(v), 16)); return *this;} +PICout PICout::operator <<(const void * v) {if (!act_) return *this; space(); PICOUTTOTARGET("0x") write(PIString::fromNumber(ullong(v), 16)); return *this;} PICout PICout::operator <<(const PIObject * v) { if (!act_) return *this; @@ -379,9 +379,9 @@ PICout PICout::operator <<(const PIObject * v) { else { PICOUTTOTARGET(v->className()) PICOUTTOTARGET("*(0x") - writePIString(PIString::fromNumber(ullong(v), 16)); + write(PIString::fromNumber(ullong(v), 16)); PICOUTTOTARGET(", \"") - writePIString(v->name()); + write(v->name()); PICOUTTOTARGET("\")") } return *this; @@ -544,7 +544,7 @@ PICout & PICout::write(const char * str, int len) { } -PICout & PICout::writePIString(const PIString & s) { +PICout & PICout::write(const PIString & s) { if (!act_) return *this; if (buffer_) { buffer_->append(s); diff --git a/libs/main/core/picout.h b/libs/main/core/picout.h index f47b70b9..87c3a1a4 100644 --- a/libs/main/core/picout.h +++ b/libs/main/core/picout.h @@ -293,7 +293,7 @@ public: //! \~english Write raw \a PIString //! \~russian Пишет сырой \a PIString - PICout & writePIString(const PIString & s); + PICout & write(const PIString & s); //! \~english Output \a PIString to stdout //! \~russian Вывод \a PIString в stdout diff --git a/libs/main/core/pistring.cpp b/libs/main/core/pistring.cpp index 90808881..5138b7bb 100644 --- a/libs/main/core/pistring.cpp +++ b/libs/main/core/pistring.cpp @@ -1669,7 +1669,7 @@ PIString versionNormalize(const PIString & v) { PICout operator <<(PICout s, const PIString & v) { s.space(); s.quote(); - s.writePIString(v); + s.write(v); s.quote(); return s; }