compilation fix; a couple of warnings

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

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 6861b5b2b24a1f8c17ac9fad8f429f3a6928a1dc..0faa29e847c972542f0118058fa2dc01219df59c 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -874,6 +874,7 @@ docstring const i18npreamble(Language const * lang, Encoding const & enc,
 #ifdef TEX2LYX
        // tex2lyx does not have getMessages()
        LASSERT(false, /**/);
+       (void)enc;
 #else
        string const langenc = lang->encoding()->iconvName();
        string const texenc = lang->encoding()->latexName();

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 12b7bda1170a5e03bf53599948ea8b28f1764639..10075dcf4ad58b0d1e7c48f3404c0db41470d700 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -244,7 +244,7 @@ completer_(new GuiCompleter(p, p))
 }
 
 
-GuiWorkArea::GuiWorkArea(QWidget * w)
+GuiWorkArea::GuiWorkArea(QWidget * /* w */)
 : d(new Private(this)) 
 {
 }

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 73c37eaa66e1dd0b838a273211a3d568756c09c9..5473e393f1fc4f1b96bcbdc0044cd16850b78206 100644 (file)
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -167,7 +167,7 @@ NOMOCHEADER = \
        GuiImage.h \
        GuiKeySymbol.h \
        GuiPainter.h \
-       GuiWorkArea_Private.cpp \
+       GuiWorkArea_Private.h \
        LaTeXHighlighter.h \
        qt_i18n.h \
        qt_helpers.h \