Just renames a function according to lyxStyle();
Andre'
--
Those who desire to give up Freedom in order to gain Security, will not have,
nor do they deserve, either one. (T. Jefferson or B. Franklin or both...)
? .lyxfunc.C.swp
? .lyxfunc.h.swp
? 1.diff
? 2.diff
? 3.diff
? fullredraw.diff
? par-row.diff
? qfont_loader.tar.bz2
? search.diff
? tabular-il.diff
? textcache.diff
? tmp.diff
? vspace.diff
? frontends/xforms/1.diff
? insets/1.diff
? mathed/1.diff
? mathed/cursor.diff
? support/1.diff
Index: cursor.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/cursor.C,v
retrieving revision 1.61
diff -u -p -r1.61 cursor.C
--- cursor.C 16 Feb 2004 12:09:31 -0000 1.61
+++ cursor.C 20 Feb 2004 08:25:54 -0000
@@ -1920,6 +1920,7 @@ string LCursor::currentState()
void LCursor::replaceWord(string const & replacestring)
{
LyXText * t = text();
+ BOOST_ASSERT(t);
t->replaceSelectionWithString(*this, replacestring);
t->setSelectionRange(*this, replacestring.length());
Index: lyxfunc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfunc.C,v
retrieving revision 1.573
diff -u -p -r1.573 lyxfunc.C
--- lyxfunc.C 13 Feb 2004 16:22:51 -0000 1.573
+++ lyxfunc.C 20 Feb 2004 08:25:54 -0000
@@ -1729,18 +1729,16 @@ void LyXFunc::setStatusMessage(string co
}
-string const LyXFunc::view_status_message()
+string const LyXFunc::viewStatusMessage()
{
// When meta-fake key is pressed, show the key sequence so far + "M-".
- if (wasMetaKey()) {
+ if (wasMetaKey())
return keyseq.print() + "M-";
- }
// Else, when a non-complete key sequence is pressed,
// show the available options.
- if (keyseq.length() > 0 && !keyseq.deleted()) {
+ if (keyseq.length() > 0 && !keyseq.deleted())
return keyseq.printOptions();
- }
if (!view()->available())
return _("Welcome to LyX!");
Index: lyxfunc.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfunc.h,v
retrieving revision 1.66
diff -u -p -r1.66 lyxfunc.h
--- lyxfunc.h 13 Nov 2003 13:43:38 -0000 1.66
+++ lyxfunc.h 20 Feb 2004 08:25:54 -0000
@@ -45,7 +45,7 @@ public:
void dispatch(FuncRequest const &, bool verbose = false);
/// return the status bar state string
- std::string const view_status_message();
+ std::string const viewStatusMessage();
///
typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
Index: frontends/gtk/GView.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gtk/GView.C,v
retrieving revision 1.6
diff -u -p -r1.6 GView.C
--- frontends/gtk/GView.C 8 Oct 2003 11:31:49 -0000 1.6
+++ frontends/gtk/GView.C 20 Feb 2004 08:25:55 -0000
@@ -97,7 +97,7 @@ void GView::message(string const & msg)
void GView::showViewState()
{
- message(getLyXFunc().view_status_message());
+ message(getLyXFunc().viewStatusMessage());
}
@@ -112,16 +112,16 @@ void GView::busy(bool yes) const
if (yes ) {
view()->hideCursor();
Gdk::Cursor cursor(Gdk::WATCH);
- const_cast<GView*>(this)->get_window()->set_cursor(cursor);
- const_cast<GView*>(this)->set_sensitive(false);
+ const_cast<GView *>(this)->get_window()->set_cursor(cursor);
+ const_cast<GView *>(this)->set_sensitive(false);
} else {
- const_cast<GView*>(this)->get_window()->set_cursor();
- const_cast<GView*>(this)->set_sensitive(true);
+ const_cast<GView *>(this)->get_window()->set_cursor();
+ const_cast<GView *>(this)->set_sensitive(true);
}
}
void GView::clearMessage()
{
- message(getLyXFunc().view_status_message());
+ message(getLyXFunc().viewStatusMessage());
}
Index: frontends/qt2/QtView.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QtView.C,v
retrieving revision 1.42
diff -u -p -r1.42 QtView.C
--- frontends/qt2/QtView.C 6 Oct 2003 15:42:52 -0000 1.42
+++ frontends/qt2/QtView.C 20 Feb 2004 08:25:55 -0000
@@ -116,7 +116,7 @@ void QtView::focus_command_widget()
void QtView::update_view_state_qt()
{
- statusBar()->message(toqstr(getLyXFunc().view_status_message()));
+ statusBar()->message(toqstr(getLyXFunc().viewStatusMessage()));
statusbar_timer_.stop();
}
@@ -127,7 +127,7 @@ void QtView::update_view_state()
if (statusbar_timer_.isActive())
return;
- statusBar()->message(toqstr(getLyXFunc().view_status_message()));
+ statusBar()->message(toqstr(getLyXFunc().viewStatusMessage()));
}
@@ -155,5 +155,5 @@ void QtView::busy(bool yes) const
if (yes)
QApplication::setOverrideCursor(Qt::waitCursor);
else
- QApplication::restoreOverrideCursor();
+ QApplication::restoreOverrideCursor();
}
Index: frontends/xforms/XFormsView.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/XFormsView.C,v
retrieving revision 1.43
diff -u -p -r1.43 XFormsView.C
--- frontends/xforms/XFormsView.C 6 Oct 2003 15:42:57 -0000 1.43
+++ frontends/xforms/XFormsView.C 20 Feb 2004 08:25:55 -0000
@@ -55,12 +55,15 @@ XFormsView::XFormsView(int width, int he
create_form_form_main(width, height);
fl_set_form_atclose(getForm(), C_XFormsView_atCloseMainFormCB, 0);
- view_state_con =
view_state_changed.connect(boost::bind(&XFormsView::show_view_state, this));
- focus_con = focus_command_buffer.connect(boost::bind(&XMiniBuffer::focus,
minibuffer_.get()));
+ view_state_con =
+ view_state_changed.connect(boost::bind(&XFormsView::show_view_state,
this));
+ focus_con =
+ focus_command_buffer.connect(boost::bind(&XMiniBuffer::focus,
minibuffer_.get()));
// Make sure the buttons are disabled if needed.
updateToolbar();
- redraw_con = getDialogs().redrawGUI().connect(boost::bind(&XFormsView::redraw,
this));
+ redraw_con =
+ getDialogs().redrawGUI().connect(boost::bind(&XFormsView::redraw,
this));
}
@@ -188,13 +191,13 @@ void XFormsView::message(string const &
void XFormsView::clearMessage()
{
- message(getLyXFunc().view_status_message());
+ message(getLyXFunc().viewStatusMessage());
}
void XFormsView::show_view_state()
{
- message(getLyXFunc().view_status_message());
+ message(getLyXFunc().viewStatusMessage());
}
