From 337bbb7a06504cf5f55b77ce0a17956b76a5f186 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 6 May 2013 00:30:49 +0000 Subject: [PATCH] No real changes, just rename double variables to "d". Don't use "i" or "f" for double variable names, this is confusing, especially when we do it inconsistently. See #10625. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/datstrm.h | 4 ++-- interface/wx/datstrm.h | 4 ++-- src/common/datstrm.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h index e231f4f761..362f3b4c91 100644 --- a/include/wx/datstrm.h +++ b/include/wx/datstrm.h @@ -97,7 +97,7 @@ public: wxDataInputStream& operator>>(wxULongLong& i); wxDataInputStream& operator>>(wxLongLong& i); #endif - wxDataInputStream& operator>>(double& i); + wxDataInputStream& operator>>(double& d); wxDataInputStream& operator>>(float& f); protected: @@ -159,7 +159,7 @@ public: wxDataOutputStream& operator<<(const wxULongLong &i); wxDataOutputStream& operator<<(const wxLongLong &i); #endif - wxDataOutputStream& operator<<(double f); + wxDataOutputStream& operator<<(double d); wxDataOutputStream& operator<<(float f); protected: diff --git a/interface/wx/datstrm.h b/interface/wx/datstrm.h index f570c3eec4..7f0861b8c0 100644 --- a/interface/wx/datstrm.h +++ b/interface/wx/datstrm.h @@ -110,9 +110,9 @@ public: void Write64(const wxUint64* buffer, size_t size); /** - Writes the double @a f to the stream using the IEEE format. + Writes the double @a d to the stream using the IEEE format. */ - void WriteDouble(double f); + void WriteDouble(double d); /** Writes an array of double to the stream. The amount of double to write is specified with the @a size variable. diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp index c15d0af639..861b46a8d7 100644 --- a/src/common/datstrm.cpp +++ b/src/common/datstrm.cpp @@ -458,9 +458,9 @@ wxDataInputStream& wxDataInputStream::operator>>(wxLongLong& i) } #endif // wxLongLong_t -wxDataInputStream& wxDataInputStream::operator>>(double& i) +wxDataInputStream& wxDataInputStream::operator>>(double& d) { - i = ReadDouble(); + d = ReadDouble(); return *this; } @@ -734,9 +734,9 @@ wxDataOutputStream& wxDataOutputStream::operator<<(const wxLongLong &i) } #endif // wxLongLong_t -wxDataOutputStream& wxDataOutputStream::operator<<(double f) +wxDataOutputStream& wxDataOutputStream::operator<<(double d) { - WriteDouble(f); + WriteDouble(d); return *this; } -- 2.45.2