cosmetics

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

src/Buffer.cpp

@@ -431,7 +431,7 @@ void Buffer::setReadonly(bool const flag)
 {
 	if (pimpl_->read_only != flag) {
 		pimpl_->read_only = flag;
-		readonly(flag);
+		setReadOnly(flag);
 	}
 }
 
@@ -1923,14 +1923,14 @@ void Buffer::message(docstring const & msg) const
 void Buffer::setBusy(bool on) const
 {
 	if (gui_)
-		gui_->busy(on);
+		gui_->setBusy(on);
 }
 
 
-void Buffer::readonly(bool on) const
+void Buffer::setReadOnly(bool on) const
 {
 	if (gui_)
-		gui_->readonly(on);
+		gui_->setReadOnly(on);
 }
 
 
@@ -2203,8 +2203,8 @@ string Buffer::bufferFormat() const
 }
 
 
-bool Buffer::doExport(string const & format,
-	bool put_in_tempdir, string & result_file)
+bool Buffer::doExport(string const & format, bool put_in_tempdir,
+	string & result_file)
 {
 	string backend_format;
 	OutputParams runparams(&params().encoding());

src/Buffer.h

@@ -399,7 +399,7 @@ public:
 	/// This function is called when the buffer busy status change.
 	void setBusy(bool on) const;
 	/// This function is called when the buffer readonly status change.
-	void readonly(bool on) const;
+	void setReadOnly(bool on) const;
 	/// Update window titles of all users.
 	void updateTitles() const;
 	/// Reset autosave timers for all users.

src/Converter.h

@@ -78,9 +78,7 @@ public:
 	///
 	typedef ConverterList::const_iterator const_iterator;
 	///
-	Converter const & get(int i) const {
-		return converterlist_[i];
-	}
+	Converter const & get(int i) const { return converterlist_[i]; }
 	///
 	Converter const * getConverter(std::string const & from,
 				       std::string const & to) const;
@@ -128,12 +126,9 @@ public:
 	///
 	bool formatIsUsed(std::string const & format);
 	///
-	const_iterator begin() const {
-		return converterlist_.begin();
-	}
-	const_iterator end() const {
-		return converterlist_.end();
-	}
+	const_iterator begin() const { return converterlist_.begin(); }
+	///
+	const_iterator end() const { return converterlist_.end(); }
 	///
 	void buildGraph();
 private:

src/LayoutPtr.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file lyxlayout_ptr_fwd.h
+ * \file LayoutPtr.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -9,8 +9,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef LYXLAYOUT_PTR_FWD_H
-#define LYXLAYOUT_PTR_FWD_H
+#ifndef LAYOUTPTR_H
+#define LAYOUTPTR_H
 
 #include <boost/shared_ptr.hpp>
 

src/Makefile.am

@@ -176,6 +176,7 @@ liblyxcore_la_SOURCES = \
 	LaTeX.h \
 	Layout.cpp \
 	Layout.h \
+	LayoutPtr.h \
 	LayoutEnums.h \
 	Length.cpp \
 	Length.h \
@@ -192,7 +193,6 @@ liblyxcore_la_SOURCES = \
 	LyXFunc.cpp \
 	LyXFunc.h \
 	LyX.h \
-	lyxlayout_ptr_fwd.h \
 	LyXRC.cpp \
 	LyXRC.h \
 	Server.cpp \

src/Paragraph.h

@@ -16,7 +16,7 @@
 #ifndef PARAGRAPH_H
 #define PARAGRAPH_H
 
-#include "lyxlayout_ptr_fwd.h"
+#include "LayoutPtr.h"
 
 #include "insets/InsetCode.h"
 

src/TextClass.h

@@ -13,7 +13,7 @@
 #include "Color.h"
 #include "Font.h"
 #include "LayoutEnums.h"
-#include "lyxlayout_ptr_fwd.h"
+#include "LayoutPtr.h"
 
 #include <boost/shared_ptr.hpp>
 

src/buffer_funcs.cpp

@@ -28,8 +28,8 @@
 #include "Language.h"
 #include "LaTeX.h"
 #include "Layout.h"
+#include "LayoutPtr.h"
 #include "LyX.h"
-#include "lyxlayout_ptr_fwd.h"
 #include "TextClass.h"
 #include "TextClassList.h"
 #include "Paragraph.h"

src/frontends/Delegates.h

@@ -58,9 +58,9 @@ public:
 	/// This function is called when some message shows up.
 	virtual void message(docstring const &) = 0;
 	/// This function is called when the buffer busy status change.
-	virtual void busy(bool) = 0;
+	virtual void setBusy(bool) = 0;
 	/// This function is called when the buffer readonly status change.
-	virtual void readonly(bool) = 0;
+	virtual void setReadOnly(bool) = 0;
 	/// Update window titles of all users.
 	virtual void updateTitles() = 0;
 	/// Reset autosave timers for all users.

src/frontends/LyXView.cpp

@@ -105,7 +105,7 @@ Buffer const * LyXView::buffer() const
 void LyXView::setBuffer(Buffer * newBuffer)
 {
 	BOOST_ASSERT(newBuffer);
-	busy(true);
+	setBusy(true);
 
 	WorkArea * wa = workArea(*newBuffer);
 	if (wa == 0) {
@@ -119,20 +119,20 @@ void LyXView::setBuffer(Buffer * newBuffer)
 	connectBufferView(wa->bufferView());
 	setCurrentWorkArea(wa);
 
-	busy(false);
+	setBusy(false);
 }
 
 
 Buffer * LyXView::loadLyXFile(FileName const & filename, bool tolastfiles)
 {
-	busy(true);
+	setBusy(true);
 
 	Buffer * newBuffer = checkAndLoadLyXFile(filename);
 
 	if (!newBuffer) {
 		message(_("Document not loaded."));
 		updateStatusBar();
-		busy(false);
+		setBusy(false);
 		return 0;
 	}
 
@@ -153,7 +153,7 @@ Buffer * LyXView::loadLyXFile(FileName const & filename, bool tolastfiles)
 	if (tolastfiles)
 		LyX::ref().session().lastFiles().add(filename);
 
-	busy(false);
+	setBusy(false);
 	return newBuffer;
 }
 
@@ -218,7 +218,7 @@ void LyXView::updateDialog(string const & name, string const & data)
 }
 
 
-void LyXView::showReadonly(bool)
+void LyXView::setReadOnly(bool)
 {
 	updateWindowTitle();
 	getDialogs().updateBufferDependent(false);

src/frontends/LyXView.h

@@ -107,7 +107,7 @@ public:
 	virtual void saveGeometry() = 0;
 
 	/// show busy cursor
-	virtual void busy(bool) = 0;
+	virtual void setBusy(bool) = 0;
 
 	//@{ generic accessor functions
 
@@ -186,10 +186,8 @@ public:
 	void structureChanged() { updateToc(); }
 	/// This function is called when some parsing error shows up.
 	void errors(std::string const & err) { showErrorList(err); }
-	/// This function is called when the buffer busy status change.
-	//void busy(bool);
 	/// This function is called when the buffer readonly status change.
-	void readonly(bool on) { showReadonly(on); }
+	void setReadOnly(bool on);
 	/// Update window titles of all users.
 	void updateTitles() { updateWindowTitle(); }
 	/// Reset autosave timers for all users.
@@ -231,9 +229,6 @@ private:
 		std::string const & data);
 	//@}
 
-	/// notify readonly status
-	void showReadonly(bool);
-
 protected:
 	///
 	void updateToc();

src/frontends/WorkArea.cpp

@@ -229,10 +229,10 @@ void WorkArea::resizeBufferView()
 {
 	// WARNING: Please don't put any code that will trigger a repaint here!
 	// We are already inside a paint event.
-	lyx_view_->busy(true);
+	lyx_view_->setBusy(true);
 	buffer_view_->resize(width(), height());
 	lyx_view_->updateLayoutChoice();
-	lyx_view_->busy(false);
+	lyx_view_->setBusy(false);
 }
 
 

src/frontends/qt4/GuiView.cpp

@@ -734,7 +734,7 @@ void GuiViewBase::showView()
 }
 
 
-void GuiViewBase::busy(bool yes)
+void GuiViewBase::setBusy(bool yes)
 {
 	GuiWorkArea * wa = d.tab_widget_->currentWorkArea();
 	if (wa) {

src/frontends/qt4/GuiView.h

@@ -66,7 +66,7 @@ public:
 		unsigned int iconSizeXY,
 		const std::string & geometryArg);
 	virtual void saveGeometry();
-	virtual void busy(bool);
+	virtual void setBusy(bool);
 	/// add toolbar, if newline==true, add a toolbar break before the toolbar
 	GuiToolbar * makeToolbar(ToolbarInfo const & tbinfo, bool newline);
 	virtual void updateStatusBar();

src/insets/InsetEnvironment.h

@@ -13,7 +13,7 @@
 #define INSETENVIRONMENT_H
 
 #include "InsetText.h"
-#include "lyxlayout_ptr_fwd.h"
+#include "LayoutPtr.h"
 
 
 namespace lyx {