Squash gcc warnings.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29560 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/Toolbars.cpp b/src/frontends/qt4/Toolbars.cpp
index bd1c9af7639f41c9e2d6ad4888501ebec59edc07..4af1582cdfc8b52c2be809484555f34e395d98ac 100644 (file)
--- a/src/frontends/qt4/Toolbars.cpp
+++ b/src/frontends/qt4/Toolbars.cpp
@@ -154,7 +154,7 @@ ToolbarInfo & ToolbarInfo::read(Lexer & lex)
                                add(ToolbarItem(ToolbarItem::POPUPMENU, name, label));
                        }
                        break;
-               
+
                case TO_STICKYPOPUPMENU:
                        if (lex.next(true)) {
                                string const name = lex.getString();
@@ -210,7 +210,7 @@ ToolbarInfo & ToolbarInfo::read(Lexer & lex)
                                docstring const prettyname =
                                        from_utf8((*fit)->prettyname());
                                docstring tooltip;
-                               FuncCode lfun;
+                               FuncCode lfun = LFUN_NOACTION;
                                switch (code) {
                                case TO_EXPORTFORMATS:
                                        lfun = LFUN_BUFFER_EXPORT;

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index efbd00b223b3acfbf5a18b6ba7cc3d2782b71860..e3c237bf904d58f4c1da38ff7a37d9518b131ada 100644 (file)
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -117,7 +117,7 @@ bool findBackwards(DocIterator & cur, MatchString const & match,
 
 bool findChange(DocIterator & cur, bool next)
 {
-       if (!next) 
+       if (!next)
                cur.backwardPos();
        for (; cur; next ? cur.forwardPos() : cur.backwardPos())
                if (cur.inTexted() && !cur.paragraph().isUnchanged(cur.pos())) {
@@ -311,7 +311,7 @@ void replace(BufferView * bv, FuncRequest const & ev, bool has_deleted)
                int const replace_count = all
                        ? replaceAll(bv, search, rplc, casesensitive, matchword)
                        : replace(bv, search, rplc, casesensitive, matchword, forward);
-       
+
                Buffer & buf = bv->buffer();
                if (replace_count == 0) {
                        // emit message signal.
@@ -355,20 +355,20 @@ bool findChange(BufferView * bv, bool next)
        if (bv->cursor().selection()) {
                // set the cursor at the beginning or at the end of the selection
                // before searching. Otherwise, the current change will be found.
-               if (next != bv->cursor().top() > bv->cursor().anchor())
+               if (next != (bv->cursor().top() > bv->cursor().anchor()))
                        bv->cursor().setCursorToAnchor();
        }
 
        DocIterator cur = bv->cursor();
-       
-       // Are we within a change ? Then first search forward (backward), 
+
+       // Are we within a change ? Then first search forward (backward),
        // clear the selection and search the other way around (see the end
        // of this function). This will avoid changes to be selected half.
        bool search_both_sides = false;
        if (cur.pos() > 1) {
-               Change change_next_pos  
+               Change change_next_pos
                        = cur.paragraph().lookupChange(cur.pos());
-               Change change_prev_pos 
+               Change change_prev_pos
                        = cur.paragraph().lookupChange(cur.pos() - 1);
                if (change_next_pos.isSimilarTo(change_prev_pos))
                        search_both_sides = true;
@@ -602,7 +602,7 @@ public:
         ** @param at_begin
         **     If set, then match is searched only against beginning of text starting at cur.
         **     If unset, then match is searched anywhere in text starting at cur.
-        ** 
+        **
         ** @return
         ** The length of the matching text, or zero if no match was found.
         **/