Update cursor and scrollbar after resize.

[lyx.git] / src / ParagraphParameters.cpp

diff --git a/src/ParagraphParameters.cpp b/src/ParagraphParameters.cpp
index 1c9bf612798aaf194d81285b95c1d9cbcb0ceef4..d0d4b261278f61fa21450865f68a4b600eacaf79 100644 (file)
--- a/src/ParagraphParameters.cpp
+++ b/src/ParagraphParameters.cpp
@@ -17,7 +17,7 @@
 #include "ParagraphParameters.h"
 
 #include "Buffer.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "Layout.h"
 #include "Lexer.h"
 #include "Text.h"
@@ -27,16 +27,12 @@
 
 #include <sstream>
 
-using lyx::support::rtrim;
-
-using std::istringstream;
-using std::ostream;
-using std::ostringstream;
-using std::string;
-
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
+
 //NOTE The order of these MUST be the same as in Layout.h.
 static char const * const string_align[] = {
        "block", "left", "right", "center", "default", ""
@@ -173,9 +169,9 @@ void ParagraphParameters::leftIndent(Length const & li)
 }
 
 
-void ParagraphParameters::read(std::string str, bool merge)
+void ParagraphParameters::read(string str, bool merge)
 {
-       std::istringstream is(str);
+       istringstream is(str);
        Lexer lex(0, 0);
        lex.setStream(is);
        read(lex, merge);
@@ -233,7 +229,7 @@ void ParagraphParameters::read(Lexer & lex, bool merge)
                        }
                } else if (token == "\\align") {
                        lex.next();
-                       int tmpret = support::findToken(string_align, lex.getString());
+                       int tmpret = findToken(string_align, lex.getString());
                        if (tmpret == -1)
                                ++tmpret;
                        align(LyXAlignment(1 << tmpret));
@@ -260,7 +256,10 @@ void ParagraphParameters::apply(
 }
 
 
-bool canApply(ParagraphParameters const & params, Layout const & layout)
+//FIXME This needs to be made a real method, so that getStatus()
+//can return sensible information.
+bool ParagraphParameters::canApply(
+       ParagraphParameters const & /*params*/, Layout const & /*layout*/)
 {
        return true;
 }
@@ -313,7 +312,7 @@ void params2string(Paragraph const & par, string & data)
        ostringstream os;
        params.write(os);
 
-       Layout_ptr const & layout = par.layout();
+       LayoutPtr const & layout = par.layout();
 
        // Is alignment possible
        os << "\\alignpossible " << layout->alignpossible << '\n';