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

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index e231f4f7616f2dfc5d2651ee4f0fcf0434170791..362f3b4c916f8dcb3fdab432d09a4592972ee192 100644 (file)
--- 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 f570c3eec41fe294e47545fbe1265613f10f3c13..7f0861b8c0d8fc0c1523804ab27ba7bd99645caf 100644 (file)
--- 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 c15d0af63932750f05c8bbb19f42cc3239c54a20..861b46a8d7115062efb6fb089be332cb673b20bd 100644 (file)
--- 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;
 }