Only set buffer if it is not null.

[lyx.git] / src / mathed / MathStream.h

diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h
index 9344dac497e85e6f37531b06984327ed65ed7ea2..94e810de8302c98c7f3b72a09ed72c6bdcdf0301 100644 (file)
--- a/src/mathed/MathStream.h
+++ b/src/mathed/MathStream.h
@@ -25,7 +25,6 @@
 namespace lyx {
 
 class Encoding;
-class InsetMath;
 class MathAtom;
 class MathData;
 
@@ -50,7 +49,7 @@ public:
        ///
        explicit WriteStream(otexrowstream & os, bool fragile = false,
                             bool latex = false, OutputType output = wsDefault,
-                            Encoding const * encoding = 0);
+                            Encoding const * encoding = nullptr);
        ///
        ~WriteStream();
        ///
@@ -117,37 +116,37 @@ private:
        ///
        otexrowstream & os_;
        /// do we have to write \\protect sometimes
-       bool fragile_;
+       bool fragile_ = false;
        /// are we at the beginning of an MathData?
-       bool firstitem_;
+       bool firstitem_ = false;
        /// are we writing to .tex?
-       int latex_;
+       int latex_ = false;
        /// output type (default, source preview, instant preview)?
-       OutputType output_;
+       OutputType output_ = wsDefault;
        /// do we have a space pending?
-       bool pendingspace_;
+       bool pendingspace_ = false;
        /// do we have a brace pending?
-       bool pendingbrace_;
+       bool pendingbrace_ = false;
        /// are we in text mode when producing latex code?
-       bool textmode_;
+       bool textmode_ = false;
        /// are we allowed to switch mode when producing latex code?
-       bool locked_;
+       bool locked_ = false;
        /// should we use only ascii chars when producing latex code?
-       bool ascii_;
+       bool ascii_ = false;
        /// are we allowed to output an immediately following newline?
-       bool canbreakline_;
+       bool canbreakline_ = true;
        /// should we take care for striking out display math?
-       bool mathsout_;
+       bool mathsout_ = false;
        /// what ulem command are we inside (none, underline, strikeout)?
-       UlemCmdType ulemcmd_;
+       UlemCmdType ulemcmd_ = NONE;
        ///
-       int line_;
+       int line_ = 0;
        ///
-       Encoding const * encoding_;
+       Encoding const * encoding_ = nullptr;
        /// Row entry we are in
-       TexRow::RowEntry row_entry_;
+       TexRow::RowEntry row_entry_ = TexRow::row_none;
        /// whether we are in a MathClass inset
-       bool mathclass_;
+       bool mathclass_ = false;
 };
 
 ///
@@ -327,7 +326,7 @@ public:
 class CTag {
 public:
        ///
-       CTag(char const * const tag, std::string attr = "")
+       CTag(char const * const tag, std::string const & attr = "")
             : tag_(tag), attr_(attr) {}
        ///
        char const * const tag_;
@@ -346,7 +345,7 @@ class MathExportException : public std::exception {};
 class MathStream {
 public:
        /// Builds a stream proxy for os; the MathML namespace is given by xmlns (supposed to be already defined elsewhere in the document).
-       explicit MathStream(odocstream & os, std::string xmlns="", bool xmlMode=false);
+       explicit MathStream(odocstream & os, std::string const & xmlns = "", bool xmlMode = false);
        ///
        void cr();
        ///
@@ -370,7 +369,9 @@ public:
        ///
        bool xmlMode() const { return xml_mode_; }
        /// Returns the tag name prefixed by the name space if needed.
-       std::string namespacedTag(std::string tag) const { return ((xmlns().empty()) ? "" : xmlns() + ":") + tag; }
+       std::string namespacedTag(std::string const & tag) const {
+               return (xmlns().empty() ? "" : xmlns() + ":") + tag;
+       }
 private:
        ///
        void setTextMode(bool t) { in_text_ = t; }