>>>>> "Jean-Marc" == Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes:

Jean-Marc> And concerning the warnings, they seem indeed very
Jean-Marc> interesting. At least the one in qt2/floatplacement.C is a
Jean-Marc> bug.

The following micropatch fixes two real bugs and silences a warning.
Of course, I went after the easiest ones :)

I'll commit shortly.

JMarc

Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.2090
diff -u -p -r1.2090 ChangeLog
--- src/ChangeLog	19 Jan 2005 15:26:38 -0000	1.2090
+++ src/ChangeLog	20 Jan 2005 14:08:38 -0000
@@ -1,3 +1,9 @@
+2005-01-20  Jean-Marc Lasgouttes  <[EMAIL PROTECTED]>
+
+	* output_linuxdoc.C (linuxdocParagraphs): silence warning
+
+	* lyxfind.C (MatchString::operator()): remove bogus semicolon
+
 2005-01-19  Asger Ottar Alstrup  <[EMAIL PROTECTED]>
 
 	* buffer.C (readHeader): use "&&" rather than "and".
Index: src/lyxfind.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfind.C,v
retrieving revision 1.93
diff -u -p -r1.93 lyxfind.C
--- src/lyxfind.C	6 Jan 2005 16:39:22 -0000	1.93
+++ src/lyxfind.C	20 Jan 2005 14:08:38 -0000
@@ -88,7 +88,7 @@ public:
 			if (pos > 0 && par.isLetter(pos - 1))
 				return false;
 			if (pos + lyx::pos_type(size) < parsize
-			    && par.isLetter(pos + size));
+			    && par.isLetter(pos + size))
 				return false;
 		}
 
Index: src/output_linuxdoc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/output_linuxdoc.C,v
retrieving revision 1.10
diff -u -p -r1.10 output_linuxdoc.C
--- src/output_linuxdoc.C	25 Nov 2004 19:13:00 -0000	1.10
+++ src/output_linuxdoc.C	20 Jan 2005 14:08:38 -0000
@@ -74,9 +74,10 @@ void linuxdocParagraphs(Buffer const & b
 			break;
 
 		case LATEX_COMMAND:
+#if 0
 			if (depth != 0)
-				//error(ErrorItem(_("Error:"), _("Wrong depth for LatexType Command.\n"), pit->id(), 0, pit->size()));
-				;
+				error(ErrorItem(_("Error:"), _("Wrong depth for LatexType Command.\n"), pit->id(), 0, pit->size()));
+#endif
 
 			if (!environment_stack[depth].empty()) {
 				sgml::closeTag(os, environment_stack[depth]);
Index: src/frontends/qt2/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ChangeLog,v
retrieving revision 1.752
diff -u -p -r1.752 ChangeLog
--- src/frontends/qt2/ChangeLog	16 Jan 2005 21:01:39 -0000	1.752
+++ src/frontends/qt2/ChangeLog	20 Jan 2005 14:08:38 -0000
@@ -1,3 +1,8 @@
+2005-01-20  Jean-Marc Lasgouttes  <[EMAIL PROTECTED]>
+
+	* floatplacement.C (heredefinitelyClicked): remove bogus
+	semicolon. 
+
 2005-01-15  Angus Leeming  <[EMAIL PROTECTED]>
 
 	* QPrefs.C, QPrefsDialog.C, ui/QPrefPathsModule.ui: add an interface
Index: src/frontends/qt2/floatplacement.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/floatplacement.C,v
retrieving revision 1.12
diff -u -p -r1.12 floatplacement.C
--- src/frontends/qt2/floatplacement.C	5 Apr 2004 10:38:04 -0000	1.12
+++ src/frontends/qt2/floatplacement.C	20 Jan 2005 14:08:38 -0000
@@ -215,7 +215,7 @@ void FloatPlacement::tbhpClicked()
 
 void FloatPlacement::heredefinitelyClicked()
 {
-	if (heredefinitelyCB->isChecked());
+	if (heredefinitelyCB->isChecked())
 		ignoreCB->setEnabled(false);
 
 	topCB->setChecked(false);

Reply via email to