Andre Poenitz wrote:

> I'd prefer some more compact code like
> 
> +                     if (isBranchSelected(branchlist))
> +                             flag.enabled(status() != Open);
> +                     else
> +                             flag.enabled(status() != Collapsed);

I don't care that much. I'll change it.


Georg
Index: src/insets/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/ChangeLog,v
retrieving revision 1.1135
diff -u -p -r1.1135 ChangeLog
--- src/insets/ChangeLog	22 Apr 2005 14:59:12 -0000	1.1135
+++ src/insets/ChangeLog	22 Apr 2005 15:37:39 -0000
@@ -1,3 +1,7 @@
+2005-04-22  Georg Baum  <[EMAIL PROTECTED]>
+
+	* insetbranch.C (getStatus): make the code more compact
+
 2005-04-22  Jean-Marc Lasgouttes  <[EMAIL PROTECTED]>
 
 	* insetcollapsable.C (doDispatch): do not pass through double/triple
Index: src/insets/insetbranch.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetbranch.C,v
retrieving revision 1.52
diff -u -p -r1.52 insetbranch.C
--- src/insets/insetbranch.C	22 Apr 2005 08:57:21 -0000	1.52
+++ src/insets/insetbranch.C	22 Apr 2005 15:37:39 -0000
@@ -202,17 +202,10 @@ bool InsetBranch::getStatus(LCursor & cu
 			   || cmd.argument.empty()) {
 			BranchList const & branchlist =
 				cur.buffer().params().branchlist();
-			if (isBranchSelected(branchlist)) {
-				if (status() != Open)
-					flag.enabled(true);
-				else
-					flag.enabled(false);
-			} else {
-				if (status() != Collapsed)
-					flag.enabled(true);
-				else
-					flag.enabled(false);
-			}
+			if (isBranchSelected(branchlist))
+				flag.enabled(status() != Open);
+			else
+				flag.enabled(status() != Collapsed);
 		} else
 			flag.enabled(true);
 		break;

Reply via email to