A random collection of small fixes
thanks
john
--
"Please crack down on the Chinaman's friends and Hitler's commander.
Mother is the best bet and don't let Satan draw you too fast.
A boy has never wept ... nor dashed a thousand kim. Did you hear me?"
- Dutch Schultz
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.182
diff -u -r1.182 ChangeLog
--- ChangeLog 2001/06/01 15:10:25 1.182
+++ ChangeLog 2001/06/02 10:49:19
@@ -1,3 +1,16 @@
+2001-06-02 John Levon <[EMAIL PROTECTED]>
+
+ * ToolbarDefaults.C: place local stuff in anon namespace
+
+ * buffer.h: remove outdated comment (changelog !)
+
+ * layout.h: make enum anonymous
+
+ * tabular.C: remove tabsize force
+
+ * Spacing.h:
+ * Spacing.C: move string array to be private static member
+
2001-06-01 Juergen Vigna <[EMAIL PROTECTED]>
* lyxfunc.C (Dispatch): LFUN_PREFIX don't call the update if we're
diff -u -r1.18 Spacing.C
--- Spacing.C 2001/05/30 13:53:25 1.18
+++ Spacing.C 2001/06/02 10:49:22
@@ -21,10 +21,10 @@
using std::ios;
using std::ostream;
-/// how can I put this inside of Spacing (class)
namespace {
-char const * const spacing_string[] = {"single", "onehalf", "double", "other"};
+char const * const Spacing::spacing_string[]
+ = {"single", "onehalf", "double", "other"};
} // namespace anon
Index: Spacing.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Spacing.h,v
retrieving revision 1.18
diff -u -r1.18 Spacing.h
--- Spacing.h 2001/05/30 13:53:25 1.18
+++ Spacing.h 2001/06/02 10:49:22
@@ -68,6 +68,8 @@
Space space;
///
float value;
+
+ static char const * const spacing_string[];
};
Index: ToolbarDefaults.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ToolbarDefaults.C,v
retrieving revision 1.18
diff -u -r1.18 ToolbarDefaults.C
--- ToolbarDefaults.C 2001/05/30 13:53:25 1.18
+++ ToolbarDefaults.C 2001/06/02 10:49:22
@@ -26,7 +26,29 @@
extern LyXAction lyxaction;
ToolbarDefaults toolbardefaults;
+namespace {
+enum _tooltags {
+ TO_ADD = 1,
+ TO_ENDTOOLBAR,
+ TO_SEPARATOR,
+ TO_LAYOUTS,
+ TO_NEWLINE,
+ TO_LAST
+};
+
+
+struct keyword_item toolTags[TO_LAST - 1] = {
+ { "end", TO_ENDTOOLBAR },
+ { "icon", TO_ADD },
+ { "layouts", TO_LAYOUTS },
+ { "newline", TO_NEWLINE },
+ { "separator", TO_SEPARATOR }
+};
+
+}; // end of anon namespace
+
+
ToolbarDefaults::ToolbarDefaults()
{
init();
@@ -73,25 +95,6 @@
}
-enum _tooltags {
- TO_ADD = 1,
- TO_ENDTOOLBAR,
- TO_SEPARATOR,
- TO_LAYOUTS,
- TO_NEWLINE,
- TO_LAST
-};
-
-
-struct keyword_item toolTags[TO_LAST - 1] = {
- { "end", TO_ENDTOOLBAR },
- { "icon", TO_ADD },
- { "layouts", TO_LAYOUTS },
- { "newline", TO_NEWLINE },
- { "separator", TO_SEPARATOR }
-};
-
-
void ToolbarDefaults::read(LyXLex & lex)
{
//consistency check
@@ -134,8 +137,6 @@
break;
case TO_ENDTOOLBAR:
- // should not set automatically
- //set();
quit = true;
break;
default:
diff -u -r1.71 buffer.h
--- buffer.h 2001/05/09 09:14:48 1.71
+++ buffer.h 2001/06/02 10:49:32
@@ -10,15 +10,6 @@
*
* ====================================================== */
-// Change Log:
-// ===========
-// 23/03/98 Heinrich Bauer ([EMAIL PROTECTED])
-// Spots marked "changed Heinrich Bauer, 23/03/98" modified due to the
-// following bug: dvi file export did not work after printing (or previewing)
-// and vice versa as long as the same file was concerned. This happened
-// every time the LyX-file was left unchanged between the two actions mentioned
-// above.
-
#ifndef BUFFER_H
#define BUFFER_H
diff -u -r1.31 layout.h
--- layout.h 2001/05/30 13:53:29 1.31
+++ layout.h 2001/06/02 10:49:33
@@ -27,7 +27,7 @@
extern void LyXSetStyle();
///
-enum no_good_name_for_this {
+enum {
///
LYX_ENVIRONMENT_DEFAULT = 97,
///
diff -u -r1.81 tabular.C
--- tabular.C 2001/06/01 10:53:23 1.81
+++ tabular.C 2001/06/02 10:49:47
@@ -2570,10 +2570,3 @@
}
return BOX_NONE;
}
-
-/* Emacs:
- * Local variables:
- * tab-width: 4
- * End:
- * vi:set tabstop=4:
- */
Index: insets/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/ChangeLog,v
retrieving revision 1.91
diff -u -r1.91 ChangeLog
--- insets/ChangeLog 2001/06/01 15:27:04 1.91
+++ insets/ChangeLog 2001/06/02 10:50:08
@@ -1,3 +1,8 @@
+2001-06-02 John Levon <[EMAIL PROTECTED]>
+
+ * insettabular.C:
+ * insettext.C: remove tabsize force
+
2001-06-01 Lars Gullik Bjønnes <[EMAIL PROTECTED]>
* figinset.C: fix typo
Index: insets/insettabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettabular.C,v
retrieving revision 1.108
diff -u -r1.108 insettabular.C
--- insets/insettabular.C 2001/06/01 15:10:26 1.108
+++ insets/insettabular.C 2001/06/02 10:50:15
@@ -2347,10 +2347,3 @@
else
ecol = tabular->right_column_of_cell(sel_cell_end);
}
-
-/* Emacs:
- * Local variables:
- * tab-width: 4
- * End:
- * vi:set tabstop=4:
- */
Index: insets/insettext.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettext.C,v
retrieving revision 1.151
diff -u -r1.151 insettext.C
--- insets/insettext.C 2001/06/01 15:10:26 1.151
+++ insets/insettext.C 2001/06/02 10:50:19
@@ -1769,9 +1769,3 @@
cleared = true;
need_update = FULL;
}
-/* Emacs:
- * Local variables:
- * tab-width: 4
- * End:
- * vi:set tabstop=4:
- */
