This should be the last of the commits refactoring the InsetLayout code.

[lyx.git] / src / insets / InsetCommandParams.cpp

diff --git a/src/insets/InsetCommandParams.cpp b/src/insets/InsetCommandParams.cpp
index 5a9ee9f7b95aa996d6b85e1ae98ef5bc0d64b06c..f93f83552eaabad7e06ebd48e047604209eb991e 100644 (file)
--- a/src/insets/InsetCommandParams.cpp
+++ b/src/insets/InsetCommandParams.cpp
@@ -27,26 +27,21 @@
 #include "InsetRef.h"
 #include "InsetTOC.h"
 
-#include "debug.h"
-#include "gettext.h"
 #include "Lexer.h"
 
+#include "support/debug.h"
 #include "support/ExceptionMessage.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/docstream.h"
 
 #include <boost/assert.hpp>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::findToken;
-
-using std::string;
-using std::endl;
-using std::ostream;
-
-using support::ExceptionMessage;
-using support::WarningException;
 
 InsetCommandParams::InsetCommandParams(InsetCode code)
        : insetCode_(code), preview_(false)
@@ -69,7 +64,7 @@ InsetCommandParams::InsetCommandParams(InsetCode code,
 
 
 CommandInfo const * InsetCommandParams::findInfo(
-       InsetCode code, std::string const & cmdName)
+       InsetCode code, string const & cmdName)
 {
        switch (code) {
        case BIBITEM_CODE:
@@ -105,7 +100,7 @@ CommandInfo const * InsetCommandParams::findInfo(
 }
 
 
-std::string InsetCommandParams::getDefaultCmd(InsetCode code) {
+string InsetCommandParams::getDefaultCmd(InsetCode code) {
        switch (code) {
                case BIBITEM_CODE: 
                        return InsetBibitem::defaultCommand();
@@ -141,7 +136,7 @@ std::string InsetCommandParams::getDefaultCmd(InsetCode code) {
 
 
 bool InsetCommandParams::isCompatibleCommand(
-               InsetCode code, std::string const & s)
+               InsetCode code, string const & s)
 {
        switch (code) {
                case BIBITEM_CODE: 
@@ -180,17 +175,17 @@ bool InsetCommandParams::isCompatibleCommand(
 void InsetCommandParams::setCmdName(string const & name)
 {
        if (!isCompatibleCommand(insetCode_, cmdName_)){
-               lyxerr << "InsetCommand: Incompatible command name " << 
-                               name << "." << std::endl;
+               LYXERR0("InsetCommand: Incompatible command name " << 
+                               name << ".");
                throw ExceptionMessage(WarningException, _("InsetCommand Error: "),
-                                      from_utf8("Incompatible command name."));
+                                      _("Incompatible command name."));
        }
 
        cmdName_ = name;
        CommandInfo const * const info = findInfo(insetCode_, cmdName_);
        if (!info) {
-               lyxerr << "Command '" << name << "' is not compatible with a '" <<
-                       insetType() << "' inset." << std::endl;
+               LYXERR0("Command '" << name << "' is not compatible with a '" <<
+                       insetType() << "' inset.");
                return;
        }
        ParamVector params(info->n);
@@ -201,7 +196,7 @@ void InsetCommandParams::setCmdName(string const & name)
                        params[j] = params_[i];
        }
        info_ = info;
-       std::swap(params, params_);
+       swap(params, params_);
 }
 
 
@@ -212,9 +207,9 @@ void InsetCommandParams::read(Lexer & lex)
                string const insetType = lex.getString();
                InsetCode const code = insetCode(insetType);
                if (code != insetCode_) {
-                       lex.printError("InsetCommand: Attempt to change type of parameters.");
-                       throw ExceptionMessage(WarningException, _("InsetCommand Error: "),
-                               from_utf8("Attempt to change type of parameters."));
+                       lex.printError("InsetCommandParams: Attempt to change type of inset.");
+                       throw ExceptionMessage(WarningException, _("InsetCommandParams Error: "),
+                                        _("Attempt to change type of parameters."));
                }
        }
 
@@ -222,24 +217,24 @@ void InsetCommandParams::read(Lexer & lex)
                lex.next();
                string const test = lex.getString();
                if (test != "LatexCommand") {
-                       lex.printError("InsetCommand: no LatexCommand line found.");
-                       throw ExceptionMessage(WarningException, _("InsetCommand error:"),
-                               from_utf8("Can't find LatexCommand line."));
+                       lex.printError("InsetCommandParams: No LatexCommand line found.");
+                       throw ExceptionMessage(WarningException, _("InsetCommandParams error:"),
+                                              _("Can't find LatexCommand line."));
                }
        }
        lex.next();
        cmdName_ = lex.getString();
        if (!isCompatibleCommand(insetCode_, cmdName_)){
-               lex.printError("InsetCommand: Incompatible command name " + cmdName_ + ".");
-               throw ExceptionMessage(WarningException, _("InsetCommand Error: "),
-                                      from_utf8("Incompatible command name."));
+               lex.printError("InsetCommandParams: Incompatible command name " + cmdName_ + ".");
+               throw ExceptionMessage(WarningException, _("InsetCommandParams Error: "),
+                                      _("Incompatible command name."));
        }
 
        info_ = findInfo(insetCode_, cmdName_);
        if (!info_) {
-               lex.printError("InsetCommand: Unknown inset name `$$Token'");
+               lex.printError("InsetCommandParams: Unknown inset name `$$Token'");
                throw ExceptionMessage(WarningException,
-                       _("Unknown inset name: "), from_utf8(insetType()));
+                                      _("Unknown inset name: "), from_utf8(insetType()));
        }
        
        string token;
@@ -260,7 +255,7 @@ void InsetCommandParams::read(Lexer & lex)
                } else {
                        lex.printError("Unknown parameter name `$$Token' for command " + cmdName_);
                        throw ExceptionMessage(WarningException,
-                               _("Inset Command: ") + from_ascii(cmdName_),
+                               _("InsetCommandParams: ") + from_ascii(cmdName_),
                                _("Unknown parameter name: ") + from_utf8(token));
                }
        }