Correct comment

[lyx.git] / src / support / docstream.cpp

diff --git a/src/support/docstream.cpp b/src/support/docstream.cpp
index 6642e09d5f78ee94bd27ba54a8980d4d436cf99f..c2d2d7e86767a743d2a9095ada02363b941e0a85 100644 (file)
--- a/src/support/docstream.cpp
+++ b/src/support/docstream.cpp
@@ -120,7 +120,7 @@ protected:
                // As a workaround, we append a nul char in order to force
                // a switch to ASCII, and then remove it from output after
                // the conversion.
-               intern_type * from_new = 0;
+               intern_type * from_new = nullptr;
                intern_type const * from_old = from;
                size_t extra = 0;
                if (*(from_end - 1) >= 0x80 && encoding_ == "ISO-2022-JP") {
@@ -168,16 +168,16 @@ protected:
                        fprintf(stderr, "\nStopped at: 0x%04x\n", c);
                        fputs("Unconverted input:", stderr);
                        for (intern_type const * i = from_next + 1; i < from_end; ++i) {
-                               unsigned int const c = *i;
-                               fprintf(stderr, " 0x%04x", c);
+                               unsigned int const cc = *i;
+                               fprintf(stderr, " 0x%04x", cc);
                        }
                        fputs("\nConverted output:", stderr);
                        for (extern_type const * i = to; i < to_next; ++i) {
                                // extern_type may be signed, avoid output of
                                // something like 0xffffffc2
-                               unsigned int const c =
+                               unsigned int const cc =
                                        *reinterpret_cast<unsigned char const *>(i);
-                               fprintf(stderr, " 0x%02x", c);
+                               fprintf(stderr, " 0x%02x", cc);
                        }
                        fputc('\n', stderr);
                        fflush(stderr);
@@ -222,14 +222,14 @@ protected:
                        fprintf(stderr, "\nStopped at: 0x%02x\n", c);
                        fputs("Unconverted input:", stderr);
                        for (extern_type const * i = from_next + 1; i < from_end; ++i) {
-                               unsigned int const c =
+                               unsigned int const cc =
                                        *reinterpret_cast<unsigned char const *>(i);
-                               fprintf(stderr, " 0x%02x", c);
+                               fprintf(stderr, " 0x%02x", cc);
                        }
                        fputs("\nConverted output:", stderr);
                        for (intern_type const * i = to; i < to_next; ++i) {
-                               unsigned int const c = *i;
-                               fprintf(stderr, " 0x%02x", c);
+                               unsigned int const cc = *i;
+                               fprintf(stderr, " 0x%02x", cc);
                        }
                        fputc('\n', stderr);
                        fflush(stderr);
@@ -307,7 +307,7 @@ private:
        string encoding_;
 };
 
-} // namespace anon
+} // namespace
 
 
 namespace lyx {
@@ -315,7 +315,7 @@ namespace lyx {
 template<class Ios>
 void setEncoding(Ios & ios, string const & encoding, ios_base::openmode mode)
 {
-       // We must imbue the stream before openening the file
+       // We must imbue the stream before opening the file
        locale global;
        locale locale(global, new iconv_codecvt_facet(encoding, mode));
        ios.imbue(locale);
@@ -447,13 +447,13 @@ odocstream & operator<<(odocstream & os, char c)
 }
 #endif
 
-}
+} // namespace lyx
 
 
 #if ! defined(USE_WCHAR_T) && defined(__GNUC__)
 // We get undefined references to these virtual methods. This looks like
 // a bug in gcc. The implementation here does not do anything useful, since
-// it is overriden in iconv_codecvt_facet.
+// it is overridden in iconv_codecvt_facet.
 namespace std {
 
 template<> codecvt<lyx::char_type, char, mbstate_t>::result