the qtclean-2 patch with some very small changes

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

src/frontends/ChangeLog

@@ -1,3 +1,11 @@
+2002-10-20  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* LyXKeySym.h: move operator== out of class. Separate
+	implementations for xforms and qt.
+
+	* Liason.[Ch]: get rid of setMinibuffer, where used call message
+	directly through LyXView::message instead.
+
 2002-09-25  Angus Leeming  <leeming@lyx.org>
 
 	* Dialogs.C: doxygen fix.

src/frontends/Liason.C

@@ -154,11 +154,4 @@ bool printBuffer(Buffer * buffer, PrinterParams const & pp)
 	return res == 0;
 }
 
-
-void setMinibuffer(LyXView * lv, string const & msg)
-{
-	lyx::Assert(lv);
-	lv->message(msg);
-}
-
 } // namespace Liason

src/frontends/Liason.h

@@ -52,8 +52,6 @@ namespace Liason {
 	PrinterParams getPrinterParams(Buffer *);
 	/// print the current buffer
 	bool printBuffer(Buffer *, PrinterParams const &);
-	/// set the minibuffer
-	void setMinibuffer(LyXView *, string const & msg);
 	//@}
 
 } // namespace Liason

src/frontends/LyXKeySym.h

@@ -45,13 +45,14 @@ public:
 	 * This relies on user to use the right encoding.
 	 */
 	virtual char getISOEncoded() const = 0;
+};
 
-	/**
+
+/**
  * We need to be able to equality compare these for the
  * sake of the keymap business.
  */
-	virtual bool operator==(LyXKeySym const & k) const = 0;
+bool operator==(LyXKeySym const & k1, LyXKeySym const & k1);
-};
 
 typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
 

src/frontends/controllers/ChangeLog

@@ -1,3 +1,13 @@
+2002-10-20  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* ControlCharacter.C (apply): setMinibuffer change
+	* ControlDocument.C (apply): ditto
+	(classApply): ditto
+	* ControlThesaurus.C (replace): ditto
+	* ControlSearch.C (find): ditto
+	(replace): ditto
+	* ControlPreamble.C (apply): ditto
+	* ControlParagraph.C (apply): ditto
 
 2002-10-14  André Pönitz <poenitz@gmx.net>
 

src/frontends/controllers/ControlCharacter.C

@@ -24,11 +24,8 @@
 #include "gettext.h"
 #include "language.h"
 
-#include "frontends/Liason.h"
 #include "frontends/LyXView.h"
 
-using Liason::setMinibuffer;
-
 
 ControlCharacter::ControlCharacter(LyXView & lv, Dialogs & d)
 	: ControlDialogBD(lv, d),
@@ -68,7 +65,7 @@ void ControlCharacter::apply()
 	toggleAndShow(bufferview(), *(font_.get()), toggleall_);
 	lv_.view_state_changed();
 	buffer()->markDirty();
-	setMinibuffer(&lv_, _("Character set"));
+	lv_.message(_("Character set"));
 }
 
 

src/frontends/controllers/ControlDocument.C

@@ -29,15 +29,12 @@
 #include "lyxtextclasslist.h"
 #include "CutAndPaste.h"
 
-#include "frontends/Liason.h"
 #include "frontends/LyXView.h"
 #include "frontends/Alert.h"
 
 #include "support/lstrings.h"
 #include "support/filetools.h"
 
-using Liason::setMinibuffer;
-
 
 ControlDocument::ControlDocument(LyXView & lv, Dialogs & d)
 	: ControlDialogBD(lv, d), bp_(0)
@@ -58,6 +55,7 @@ BufferParams & ControlDocument::params()
 	return *bp_;
 }
 
+
 LyXTextClass ControlDocument::textClass()
 {
 	return textclasslist[bp_->textclass];
@@ -70,7 +68,9 @@ void ControlDocument::apply()
 		return;
 
 	setLanguage();
-	bool succes = classApply();
+
+	// FIXME: do we need to use return value from classApply() here? (Lgb)
+	classApply();
 	lv_.view()->redoCurrentBuffer();
 
 	view().apply();
@@ -78,7 +78,7 @@ void ControlDocument::apply()
 
 	buffer()->markDirty();
 
-	Liason::setMinibuffer(&lv_, _("Document Settings Applied"));
+	lv_.message(_("Document Settings Applied"));
 }
 
 
@@ -105,7 +105,7 @@ void ControlDocument::setLanguage()
 
 bool ControlDocument::classApply()
 {
-	BufferParams &params = lv_.buffer()->params;
+	BufferParams & params = lv_.buffer()->params;
 	unsigned int const old_class = bp_->textclass;
 	// exit if nothing changes
 	if (params.textclass == old_class)
@@ -122,8 +122,7 @@ bool ControlDocument::classApply()
 	}
 
 	// successfully loaded
-	Liason::setMinibuffer(&lv_,
+	lv_.message(_("Converting document to new document class..."));
-			      _("Converting document to new document class..."));
 	int ret = CutAndPaste::SwitchLayoutsBetweenClasses(
 		old_class, params.textclass,
 		&*(lv_.buffer()->paragraphs.begin()),

src/frontends/controllers/ControlDocument.h

@@ -32,6 +32,7 @@ class ControlDocument : public ControlDialogBD {
 public:
 	///
 	ControlDocument(LyXView &, Dialogs &);
+	///
 	~ControlDocument();
 	/// show latex preamble
 	void showPreamble();
@@ -45,7 +46,6 @@ public:
 	void saveAsDefault();
 	///
 	bool classApply();
-   
 private:
 	/// apply settings
 	void apply();
@@ -56,5 +56,3 @@ private:
 };
 
 #endif // CONTROLDOCUMENT_H
-
-

src/frontends/controllers/ControlParagraph.C

@@ -26,12 +26,10 @@
 #include "lyxtext.h"
 #include "ParagraphParameters.h"
 
-#include "frontends/Liason.h"
+#include "frontends/LyXView.h"
 
 #include "support/LAssert.h"
 
-using Liason::setMinibuffer;
-
 
 ControlParagraph::ControlParagraph(LyXView & lv, Dialogs & d)
 	: ControlDialogBD(lv, d), pp_(0), ininset_(false)
@@ -89,7 +87,7 @@ void ControlParagraph::apply()
 
 	buffer()->markDirty();
 
-	setMinibuffer(&lv_, _("Paragraph layout set"));
+	lv_.message(_("Paragraph layout set"));
 }
 
 

src/frontends/controllers/ControlPreamble.C

@@ -21,7 +21,7 @@
 #include "buffer.h"
 #include "gettext.h"
 
-#include "frontends/Liason.h"
+#include "frontends/LyXView.h"
 
 
 ControlPreamble::ControlPreamble(LyXView & lv, Dialogs & d)
@@ -39,7 +39,7 @@ void ControlPreamble::apply()
 
 	buffer()->params.preamble = params();
 	buffer()->markDirty();
-	Liason::setMinibuffer(&lv_, _("LaTeX preamble set"));
+	lv_.message(_("LaTeX preamble set"));
 }
 
 

src/frontends/controllers/ControlSearch.C

@@ -19,12 +19,10 @@
 #include "gettext.h"
 #include "lyxfind.h"
 
-#include "frontends/Liason.h"
+#include "frontends/LyXView.h"
 
 #include "support/lstrings.h"
 
-using Liason::setMinibuffer;
-
 
 ControlSearch::ControlSearch(LyXView & lv, Dialogs & d)
 	: ControlDialogBD(lv, d)
@@ -39,7 +37,7 @@ void ControlSearch::find(string const & search,
 					    matchword);
 
 	if (!found)
-		setMinibuffer(&lv_, _("String not found!"));
+		lv_.message(_("String not found!"));
 }
 
 
@@ -56,14 +54,14 @@ void ControlSearch::replace(string const & search, string const & replace,
 				    matchword, all, once);
 
 	if (replace_count == 0) {
-		setMinibuffer(&lv_, _("String not found!"));
+		lv_.message(_("String not found!"));
 	} else {
 		if (replace_count == 1) {
-			setMinibuffer(&lv_, _("String has been replaced."));
+			lv_.message(_("String has been replaced."));
 		} else {
 			string str = tostr(replace_count);
 			str += _(" strings have been replaced.");
-			setMinibuffer(&lv_, str.c_str());
+			lv_.message(str.c_str());
 		}
 	}
 }

src/frontends/controllers/ControlThesaurus.C

@@ -19,10 +19,7 @@
 #include "gettext.h"
 #include "lyxfind.h"
 
-#include "frontends/Liason.h"
+#include "frontends/LyXView.h"
-
-
-using Liason::setMinibuffer;
 
 
 ControlThesaurus::ControlThesaurus(LyXView & lv, Dialogs & d)
@@ -50,9 +47,9 @@ void ControlThesaurus::replace(string const & newstr)
 	oldstr_ = newstr;
 
 	if (replace_count == 0)
-		setMinibuffer(&lv_, _("String not found!"));
+		lv_.message(_("String not found!"));
 	else
-		setMinibuffer(&lv_, _("String has been replaced."));
+		lv_.message(_("String has been replaced."));
 }
 
 

src/frontends/qt2/Alert_pimpl.C

@@ -29,9 +29,11 @@
 using std::pair;
 using std::make_pair;
 
+
 void alert_pimpl(string const & s1, string const & s2, string const & s3)
 {
-	QMessageBox::warning(0, "LyX", (s1 + "\n" + "\n" + s2 + "\n" + s3).c_str());
+	QMessageBox::warning(0, "LyX",
+			     (s1 + "\n" + "\n" + s2 + "\n" + s3).c_str());
 }
 
 
@@ -49,7 +51,8 @@ int askConfirmation_pimpl(string const & s1, string const & s2, string const & s
 }
 
 
-pair<bool, string> const askForText_pimpl(string const & msg, string const & dflt)
+pair<bool, string> const
+askForText_pimpl(string const & msg, string const & dflt)
 {
 	string title = _("LyX: ");
 	title += msg;

src/frontends/qt2/BulletsModule.C

@@ -22,16 +22,17 @@
 #include "ui/BulletsModuleBase.h"
 #include "QBrowseBox.h"
 
-BulletsModule::BulletsModule( QWidget* parent,  const char* name, WFlags fl )
+
+BulletsModule::BulletsModule(QWidget * parent,  char const * name, WFlags fl)
 	: BulletsModuleBase(parent, name, fl)
 {
-   standard = new QBrowseBox(6,6);
+	standard = new QBrowseBox(6, 6);
 	standard->insertItem(QPixmap("standard.xpm"));
 
-   maths = new QBrowseBox(6,6);
+	maths = new QBrowseBox(6, 6);
 	maths->insertItem(QPixmap("amssymb.xpm"));
 
-   QPopupMenu * pm = new QPopupMenu();
+	QPopupMenu * pm = new QPopupMenu;
 
 	QPopupMenu * pm1 = new QPopupMenu(pm);
 	pm1->insertItem(standard);
@@ -39,9 +40,8 @@ BulletsModule::BulletsModule( QWidget* parent,  const char* name, WFlags fl )
 	QPopupMenu * pm2 = new QPopupMenu(pm);
 	pm2->insertItem(maths);
 
-   
+	pm->insertItem("Standard", pm1);
-   pm->insertItem("Standard",pm1);
+	pm->insertItem("Maths", pm2);
-   pm->insertItem("Maths",pm2);
 	pm->insertItem("Ding 1");
 	pm->insertItem("Ding 2");
 	pm->insertItem("Ding 3");
@@ -49,25 +49,26 @@ BulletsModule::BulletsModule( QWidget* parent,  const char* name, WFlags fl )
 
 	setbullet1TB->setPopup(pm);
 
-   connect( standard, SIGNAL( selected(int,int) ),
+	connect(standard, SIGNAL(selected(int, int)),
-		 this , SLOT( checkThis(int,int) ) );
+		this, SLOT(checkThis(int, int)));
 
 }
 
+
 BulletsModule::~BulletsModule()
 {
 	delete standard;
 	delete maths;
-     
 }
 
+
 void BulletsModule::setLevel1()
 {
 	qWarning("no setLevel1() yet");
 }
 
+
 void BulletsModule::checkThis(int x, int y)
 {
-   qWarning("Check, x: %d y: %d ",x,y);
+	qWarning("Check, x: %d y: %d ", x, y);
 }
-

src/frontends/qt2/BulletsModule.h

@@ -18,21 +18,18 @@
 
 #include "ui/BulletsModuleBase.h"
 #include "LString.h"
+
 class QBrowseBox;
 
-class BulletsModule : public BulletsModuleBase
+class BulletsModule : public BulletsModuleBase {
-{ 
 	Q_OBJECT
 public:
-	
+	BulletsModule(QWidget* parent = 0, const char* name = 0,
-   BulletsModule( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+		      WFlags fl = 0);
 	~BulletsModule();
-	
 public slots:
-
    void checkThis(int,int);
    void setLevel1();
-
 private:
 	QBrowseBox * standard;
 	QBrowseBox * maths;

src/frontends/qt2/ChangeLog

@@ -1,3 +1,84 @@
+2002-10-20  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* Toolbar_pimpl.C (setLayout): initialize i to 0, don't
+	reinitialize.
+
+	* README: add a comment about the strange moc behaviour.
+
+	* QWrap.C (apply): local ref to params
+	(update_contents): ditto
+	(numtostr): use erase to clear string
+
+	* QWorkArea.C (setScrollbarParams): use explicit std::max
+
+	* QURL.C (update_contents): local ref to params
+	(apply): ditto
+
+	* QRef.C (update_contents): local ref to params
+	(apply): ditto
+
+	* QPreambleDialog.C (editClicked): no need to explicitly
+	initialize an std::string.
+	(editClicked): read file with smaller overhead.
+
+	* QParagraph.C (apply): local ref to params
+	(update_contents): ditto
+
+	* QMinipage.C (apply): local ref to params
+	(update_contents): ditto
+	(update_contents): handle InsetMinipage::top in switch
+
+	* QMath.C (createMathPanel): use "new Type" not "new Type()"
+
+	* QLyXKeySym.h: adda key_ accessor key().
+
+	* QLyXKeySym.C (operator=): out of class version.
+
+	* QLog.C (update_contents): use a simpler and faster way to fill
+	the log dialog.
+
+	* QLPopupMenu.C (getLabel): use subst directly on mi.label()
+
+	* QLPainter.C (QLPainter): use "new Type" not "new Type()"
+	(lines): put int i inside for scope
+	(fillPolygon): put j insize for scope
+
+	* QInclude.C (update_contents): local ref to params
+	(apply): ditto
+
+	* QGraphics.C (update_contents): initialize item to 0
+	(apply): use erase to clear string
+
+	* QFloat.C (update_contents): local ref to params
+	(apply): ditto
+
+	* QExternal.C (update_contents): local ref to params
+	(helpText): ditto
+	(apply): ditto
+
+	* QERT.C (apply): local reference to params
+
+	* QDocument.C (apply): have a local reference to the params
+	(update_contents): ditto
+
+	* QCommandEdit.C: add missing include config.h
+
+	* QCommandBuffer.C (QCommandBuffer): call method directly on
+	unnamed pointer objects.
+	(complete): use "new Type", not "new Type()"
+	(complete): use explict std::max
+
+	* QCharacter.C (update_contents): use a local reference as
+	controller cache
+	(apply): ditto
+
+	* QBibtex.C (update_contents): use erase to clear a string.
+
+	* QAbout.C (build_dialog): fill the credits view in a bit more
+	elegant way
+
+	* almost all files: clean up formatting and indenting. 
+
 2002-10-19  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
 	* qfont_loader.C (update): move loop vars into for scopes.

src/frontends/qt2/Dialogs2.C

@@ -18,6 +18,7 @@
 
 #include "Dialogs_impl.h"
 
+
 void Dialogs::showAboutlyx()
 {
 	pimpl_->aboutlyx.controller().show();
@@ -215,11 +216,11 @@ void Dialogs::showSpellchecker()
 }
 
 
-void Dialogs::showTabular(InsetTabular * it)
+void Dialogs::showTabular(InsetTabular *)
 {}
 
 
-void Dialogs::updateTabular(InsetTabular * it)
+void Dialogs::updateTabular(InsetTabular *)
 {}
 
 

src/frontends/qt2/FileDialog.C

@@ -29,12 +29,15 @@ using std::make_pair;
 using std::pair;
 using std::endl;
 
+
 struct FileDialog::Private {
 	Button b1;
 	Button b2;
 };
 
-FileDialog::FileDialog(LyXView *lv, string const & t, kb_action s, Button b1, Button b2)
+
+FileDialog::FileDialog(LyXView * lv, string const & t,
+		       kb_action s, Button b1, Button b2)
 	: private_(new FileDialog::Private), lv_(lv), title_(t), success_(s)
 {
 	private_->b1 = b1;
@@ -48,14 +51,18 @@ FileDialog::~FileDialog()
 }
 
 
-FileDialog::Result const FileDialog::Select(string const & path, string const & mask, string const & suggested)
+FileDialog::Result const FileDialog::Select(string const & path,
+					    string const & mask,
+					    string const & suggested)
 {
-	string filter = mask;
+	string filter(mask);
 	if (mask.empty())
 		filter = _("*|All files");
 
 	LyXFileDialog dlg(path, filter, title_, private_->b1, private_->b2);
-	lyxerr[Debug::GUI] << "Select with path \"" << path << "\", mask \"" << filter << "\", suggested \"" << suggested << endl;
+	lyxerr[Debug::GUI] << "Select with path \"" << path
+			   << "\", mask \"" << filter
+			   << "\", suggested \"" << suggested << endl;
 
 	dlg.setMode(QFileDialog::AnyFile);
 

src/frontends/qt2/FileDialog_private.C

@@ -28,8 +28,9 @@
 
 
 namespace {
-	/// return the Qt form of the label
+
-	string const getLabel(string const & str) {
+/// return the Qt form of the label
+string const getLabel(string const & str) {
 	string label;
 	string sc(split(str, label, '|'));
 	if (sc.length() < 2)
@@ -39,9 +40,10 @@ namespace {
 		return label;
 	label.insert(pos, "&");
 	return label;
-	}
 }
 
+} // namespace anon
+
 
 LyXFileDialog::LyXFileDialog(string const & p, string const & m,
 			     string const & t,

src/frontends/qt2/FileDialog_private.h

@@ -27,11 +27,10 @@ class LyXFileDialog : public QFileDialog
 	Q_OBJECT
 public:
 	LyXFileDialog(string const & p, string const & m, string const & t,
-		FileDialog::Button const & b1, FileDialog::Button const & b2);
+		      FileDialog::Button const & b1,
-
+		      FileDialog::Button const & b2);
 public slots:
 	void buttonClicked();
-
 private:
 	QToolButton * b1_;
 	string b1_dir_;

src/frontends/qt2/LyXKeySymFactory.C

@@ -25,4 +25,4 @@ LyXKeySym * create()
 	return new QLyXKeySym();
 }
 
-}
+} // namespace LyXKeySymFactory

src/frontends/qt2/LyXScreenFactory.C

@@ -26,4 +26,4 @@ LyXScreen * create(WorkArea & owner)
 	return new QScreen(static_cast<QWorkArea &>(owner));
 }
 
-}
+} // namespace LyXScreenFactory

src/frontends/qt2/Menubar_pimpl.C

@@ -10,8 +10,6 @@
 
 #include <config.h>
 
-#include <algorithm>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -34,6 +32,8 @@
 #include <qmenubar.h>
 #include <qcursor.h>
 
+#include <algorithm>
+
 using std::endl;
 using std::vector;
 using std::max;
@@ -41,6 +41,7 @@ using std::min;
 using std::for_each;
 using std::pair;
 
+
 Menubar::Pimpl::Pimpl(LyXView * view, MenuBackend const & mbe)
 	: owner_(static_cast<QtView*>(view)), menubackend_(mbe)
 {

src/frontends/qt2/Menubar_pimpl.h

@@ -35,7 +35,7 @@ public:
 	void openByName(string const &);
 
 	/// update the state of the menuitems - not needed
-	void update() {};
+	void update() {}
 
 	/// return the owning view
 	QtView * view() { return owner_; }

src/frontends/qt2/QAbout.C

@@ -34,6 +34,7 @@ using std::getline;
 
 typedef Qt2CB<ControlAboutlyx, Qt2DB<QAboutDialog> > base_class;
 
+
 QAbout::QAbout()
 	: base_class(_("About LyX"))
 {
@@ -42,7 +43,7 @@ QAbout::QAbout()
 
 void QAbout::build_dialog()
 {
-	dialog_.reset(new QAboutDialog());
+	dialog_.reset(new QAboutDialog);
 	connect(dialog_.get()->closePB, SIGNAL(clicked()),
 		this, SLOT(slotClose()));
 
@@ -54,25 +55,52 @@ void QAbout::build_dialog()
 
 	dialog_->versionLA->setText(controller().getVersion().c_str());
 
-	stringstream in;
+	// The code below should depend on a autoconf test. (Lgb)
+#if 0
+	// There are a lot of buggy stringstream implementations..., but the
+	// code below will work on all of them (I hope). The drawback with
+	// this solutions os the extra copying. (Lgb)
+
+	ostringstream in;
 	controller().getCredits(in);
 
 	istringstream ss(in.str().c_str());
 
 	string s;
-	string out;
+	ostringstream out;
 
 	while (getline(ss, s)) {
 		if (prefixIs(s, "@b"))
-			out += "<b>" + s.substr(2) + "</b>";
+			out << "<b>" << s.substr(2) << "</b>";
 		else if (prefixIs(s, "@i"))
-			out += "<i>" + s.substr(2) + "</i>";
+			out << "<i>" << s.substr(2) << "</i>";
 		else
-			out += s;
+			out << s;
-		out += "<br>";
+		out << "<br>";
 	}
+#else
+	// Good stringstream implementations can handle this. It avoids
+	// some copying, and should thus be faster and use less memory. (Lgb)
+	// I'll make this the default for a short while to see if anyone
+	// see the error...
+	stringstream in;
+	controller().getCredits(in);
+	in.seekg(0);
+	string s;
+	ostringstream out;
 
-	dialog_->creditsTV->setText(out.c_str());
+	while (getline(in, s)) {
+		if (prefixIs(s, "@b"))
+			out << "<b>" << s.substr(2) << "</b>";
+		else if (prefixIs(s, "@i"))
+			out << "<i>" << s.substr(2) << "</i>";
+		else
+			out << s;
+		out << "<br>";
+	}
+#endif
+
+	dialog_->creditsTV->setText(out.str().c_str());
 
 	// try to resize to a good size
 	dialog_->copyright->hide();

src/frontends/qt2/QAbout.h

@@ -26,7 +26,6 @@ class QAbout
 {
 public:
 	QAbout();
-
 private:
 	/// not needed
 	virtual void apply() {}

src/frontends/qt2/QAboutDialog.C

@@ -16,7 +16,9 @@
 
 #include "QAboutDialog.h"
 
-QAboutDialog::QAboutDialog(QWidget * parent,  const char * name, bool modal, WFlags fl)
+
+QAboutDialog::QAboutDialog(QWidget * parent, char const * name,
+			   bool modal, WFlags fl)
     : QAboutDialogBase(parent, name, modal, fl)
 {
 }

src/frontends/qt2/QAboutDialog.h

@@ -18,11 +18,11 @@
 
 #include "ui/QAboutDialogBase.h"
 
-class QAboutDialog : public QAboutDialogBase
+class QAboutDialog : public QAboutDialogBase {
-{
+	Q_OBJECT
-Q_OBJECT
 public:
-	QAboutDialog(QWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags fl = 0);
+	QAboutDialog(QWidget * parent = 0, const char * name = 0,
+		     bool modal = FALSE, WFlags fl = 0);
 	~QAboutDialog();
 };
 

src/frontends/qt2/QBibitem.C

@@ -29,6 +29,7 @@
 
 typedef Qt2CB<ControlBibitem, Qt2DB<QBibitemDialog> > base_class;
 
+
 QBibitem::QBibitem()
 	: base_class(_("Bibliography Item"))
 {

src/frontends/qt2/QBibitem.h

@@ -21,17 +21,15 @@
 class ControlBibitem;
 class QBibitemDialog;
 
-class QBibitem :
+class QBibitem
-	public Qt2CB<ControlBibitem, Qt2DB<QBibitemDialog> >
+	: public Qt2CB<ControlBibitem, Qt2DB<QBibitemDialog> >
 {
+public:
 	friend class QBibitemDialog;
 
-public:
 	QBibitem();
-
 protected:
 	virtual bool isValid();
-
 private:
 	/// Apply changes
 	virtual void apply();

src/frontends/qt2/QBibitemDialog.C

@@ -22,6 +22,7 @@
 #include "QBibitemDialog.h"
 #include "QBibitem.h"
 
+
 QBibitemDialog::QBibitemDialog(QBibitem * form)
 	: QBibitemDialogBase(0, 0, false, 0),
 	form_(form)

src/frontends/qt2/QBibitemDialog.h

@@ -20,19 +20,14 @@
 
 class QBibitem;
 
-class QBibitemDialog : public QBibitemDialogBase
+class QBibitemDialog : public QBibitemDialogBase {
-{ Q_OBJECT
+	Q_OBJECT
-
 public:
 	QBibitemDialog(QBibitem * form);
-
 protected slots:
 	virtual void change_adaptor();
-
-
 protected:
 	virtual void closeEvent(QCloseEvent * e);
-
 private:
 	QBibitem * form_;
 };

src/frontends/qt2/QBibtex.C

@@ -19,8 +19,10 @@
 #include "ControlBibtex.h"
 #include "gettext.h"
 #include "debug.h"
+
 #include "support/filetools.h" // ChangeExtension
 #include "support/lstrings.h" // getVectorFromString
+
 #include <qlineedit.h>
 #include <qcombobox.h>
 #include <qpushbutton.h>
@@ -35,6 +37,7 @@ using std::vector;
 
 typedef Qt2CB<ControlBibtex, Qt2DB<QBibtexDialog> > base_class;
 
+
 QBibtex::QBibtex()
 	: base_class(_("BibTeX"))
 {
@@ -82,7 +85,7 @@ void QBibtex::update_contents()
 		if (contains(bibstyle,','))
 			bibstyle = split(bibstyle, bibtotoc, ',');
 		else
-			bibstyle = "";
+			bibstyle.erase();
 	} else
 		dialog_->bibtocCB->setChecked(false);
 
@@ -91,7 +94,7 @@ void QBibtex::update_contents()
 		controller().getBibStyles(),"\n");
 	for (vector<string>::const_iterator it = str.begin();
 		it != str.end(); ++it) {
-		dialog_->styleCB->insertItem(ChangeExtension(*it,"").c_str());
+		dialog_->styleCB->insertItem(ChangeExtension(*it, "").c_str());
 	}
 	dialog_->styleCB->insertItem(bibstyle.c_str(),0);
 }

src/frontends/qt2/QBibtex.h

@@ -21,17 +21,15 @@
 class ControlBibtex;
 class QBibtexDialog;
 
-class QBibtex :
+class QBibtex
-	public Qt2CB<ControlBibtex, Qt2DB<QBibtexDialog> >
+	: public Qt2CB<ControlBibtex, Qt2DB<QBibtexDialog> >
 {
+public:
 	friend class QBibtexDialog;
 
-public:
 	QBibtex();
-
 protected:
 	virtual bool isValid();
-
 private:
 	/// Apply changes
 	virtual void apply();

src/frontends/qt2/QBibtexDialog.C

@@ -14,7 +14,6 @@
 #pragma implementation
 #endif
 
-#include <vector>
 #include "ControlBibtex.h"
 #include "gettext.h"
 #include "debug.h"
@@ -32,6 +31,9 @@
 #include "QBibtexDialog.h"
 #include "QBibtex.h"
 
+#include <vector>
+
+
 QBibtexDialog::QBibtexDialog(QBibtex * form)
 	: QBibtexDialogBase(0, 0, false, 0),
 	form_(form)
@@ -90,7 +92,7 @@ void QBibtexDialog::deletePressed()
 }
 
 
-void QBibtexDialog::styleChanged(const QString & sel)
+void QBibtexDialog::styleChanged(QString const & sel)
 {
 	styleCB->insertItem(sel,0);
 }

src/frontends/qt2/QBibtexDialog.h

@@ -20,13 +20,10 @@
 
 class QBibtex;
 
-class QBibtexDialog : public QBibtexDialogBase
+class QBibtexDialog : public QBibtexDialogBase {
-{
 	Q_OBJECT
-
 public:
 	QBibtexDialog(QBibtex * form);
-
 protected slots:
 	virtual void change_adaptor();
 	virtual void browsePressed();
@@ -34,10 +31,8 @@ protected slots:
 	virtual void deletePressed();
 	virtual void styleChanged(const QString &);
 	virtual void databaseChanged();
-
 protected:
 	virtual void closeEvent(QCloseEvent * e);
-
 private:
 	QBibtex * form_;
 };

src/frontends/qt2/QBrowseBox.C

@@ -2,13 +2,14 @@
  * \file QBrowseBox.C
  *
  * Original file taken from klyx 0.10 sources:
- * $Id: QBrowseBox.C,v 1.5 2002/10/17 13:31:04 leeming Exp $
+ * $Id: QBrowseBox.C,v 1.6 2002/10/20 01:48:27 larsbj Exp $
  *
  * \author Kalle Dalheimer ?
  *
  * Full author contact details are available in file CREDITS
  */
 
+#include <config.h>
 
 #include <qstring.h>
 #include <qpixmap.h>
@@ -19,11 +20,11 @@
 #include <qstyle.h>
 #include <qimage.h>
 
-#include <stdio.h>
-#include <math.h>
-
 #include "QBrowseBox.h"
 
+#include <cstdio>
+#include <cmath>
+
 
 QBrowseBox::QBrowseBox(int rows, int cols)
 	: QGridView()
@@ -290,4 +291,3 @@ void QBrowseBox::moveDown()
 	updateCell(x, activecell_.y());
 	updateCell(activecell_.x(), activecell_.y());
 }
-

src/frontends/qt2/QBrowseBox.h

@@ -3,7 +3,7 @@
  * \file QBrowseBox.h
  *
  * Original file taken from klyx 0.10 sources:
- * $Id: QBrowseBox.h,v 1.3 2002/10/17 13:31:04 leeming Exp $
+ * $Id: QBrowseBox.h,v 1.4 2002/10/20 01:48:27 larsbj Exp $
  *
  * \author Kalle Dalheimer ?
  *
@@ -40,9 +40,9 @@ public:
 	QString text(int x, int y);
 	QPixmap pixmap(int x, int y);
 	
-//  int exec(QPoint const & pos);
+	//  int exec(QPoint const & pos);
-//  int exec(int x, int y);
+	//  int exec(int x, int y);
-//  int exec(QWidget * trigger);
+	//  int exec(QWidget * trigger);
 	
 signals:
         void selected(int, int);
@@ -51,7 +51,7 @@ protected:
 	virtual void keyPressEvent(QKeyEvent * e);
 	virtual void resizeEvent(QResizeEvent * e);
 	virtual void mouseReleaseEvent(QMouseEvent * e);
-//  virtual void closeEvent(QCloseEvent * e);
+	//  virtual void closeEvent(QCloseEvent * e);
 	virtual void mouseMoveEvent(QMouseEvent * e);
 	virtual void paintCell(QPainter *, int x, int y);
 	
@@ -69,8 +69,5 @@ private:
 	QString * texts_;
 	QPixmap* pixmaps_;
 	QPoint activecell_;
-    
 };
-
-
 #endif

src/frontends/qt2/QCharacter.C

@@ -34,6 +34,7 @@ using std::vector;
 
 typedef Qt2CB<ControlCharacter, Qt2DB<QCharacterDialog> > base_class;
 
+
 QCharacter::QCharacter()
 	: base_class(_("Character"))
 {
@@ -56,6 +57,7 @@ void QCharacter::build_dialog()
 		cit != family.end(); ++cit) {
 		dialog_->familyCO->insertItem(cit->first.c_str(), -1);
 	}
+
 	for (vector<SeriesPair>::const_iterator cit = series.begin();
 		cit != series.end(); ++cit) {
 		dialog_->seriesCO->insertItem(cit->first.c_str(), -1);
@@ -117,27 +119,34 @@ int findPos2nd(vector<std::pair<A,B> > const & vec, B const & val)
 
 void QCharacter::update_contents()
 {
-	dialog_->familyCO->setCurrentItem(findPos2nd(family, controller().getFamily()));
+	ControlCharacter const & ctrl = controller();
-	dialog_->seriesCO->setCurrentItem(findPos2nd(series, controller().getSeries()));
-	dialog_->shapeCO->setCurrentItem(findPos2nd(shape, controller().getShape()));
-	dialog_->sizeCO->setCurrentItem(findPos2nd(size, controller().getSize()));
-	dialog_->miscCO->setCurrentItem(findPos2nd(bar, controller().getBar()));
-	dialog_->colorCO->setCurrentItem(findPos2nd(color, controller().getColor()));
-	dialog_->langCO->setCurrentItem(findPos2nd(language, controller().getLanguage()));
 
-	dialog_->toggleallCB->setChecked(controller().getToggleAll());
+	dialog_->familyCO->setCurrentItem(findPos2nd(family,
+						     ctrl.getFamily()));
+	dialog_->seriesCO->setCurrentItem(findPos2nd(series,
+						     ctrl.getSeries()));
+	dialog_->shapeCO->setCurrentItem(findPos2nd(shape, ctrl.getShape()));
+	dialog_->sizeCO->setCurrentItem(findPos2nd(size, ctrl.getSize()));
+	dialog_->miscCO->setCurrentItem(findPos2nd(bar, ctrl.getBar()));
+	dialog_->colorCO->setCurrentItem(findPos2nd(color, ctrl.getColor()));
+	dialog_->langCO->setCurrentItem(findPos2nd(language,
+						   ctrl.getLanguage()));
+
+	dialog_->toggleallCB->setChecked(ctrl.getToggleAll());
 }
 
 
 void QCharacter::apply()
 {
-	controller().setFamily(family[dialog_->familyCO->currentItem()].second);
+	ControlCharacter & ctrl = controller();
-	controller().setSeries(series[dialog_->seriesCO->currentItem()].second);
-	controller().setShape(shape[dialog_->shapeCO->currentItem()].second);
-	controller().setSize(size[dialog_->sizeCO->currentItem()].second);
-	controller().setBar(bar[dialog_->miscCO->currentItem()].second);
-	controller().setColor(color[dialog_->colorCO->currentItem()].second);
-	controller().setLanguage(language[dialog_->langCO->currentItem()].second);
 
-	controller().setToggleAll(dialog_->toggleallCB->isChecked());
+	ctrl.setFamily(family[dialog_->familyCO->currentItem()].second);
+	ctrl.setSeries(series[dialog_->seriesCO->currentItem()].second);
+	ctrl.setShape(shape[dialog_->shapeCO->currentItem()].second);
+	ctrl.setSize(size[dialog_->sizeCO->currentItem()].second);
+	ctrl.setBar(bar[dialog_->miscCO->currentItem()].second);
+	ctrl.setColor(color[dialog_->colorCO->currentItem()].second);
+	ctrl.setLanguage(language[dialog_->langCO->currentItem()].second);
+
+	ctrl.setToggleAll(dialog_->toggleallCB->isChecked());
 }

src/frontends/qt2/QCharacter.h

@@ -22,6 +22,7 @@
 #include "controllers/frnt_lang.h"
 
 #include "LString.h"
+
 #include <vector>
 
 
@@ -29,14 +30,13 @@ class ControlCharacter;
 class QCharacterDialog;
 
 
-class QCharacter :
+class QCharacter
-	public Qt2CB<ControlCharacter, Qt2DB<QCharacterDialog> >
+	: public Qt2CB<ControlCharacter, Qt2DB<QCharacterDialog> >
 {
+public:
 	friend class QCharacterDialog;
 
-public:
 	QCharacter();
-
 private:
 	/// Apply changes
 	virtual void apply();

src/frontends/qt2/QCharacterDialog.C

@@ -21,6 +21,7 @@
 #include <qpushbutton.h>
 #include <qgroupbox.h>
 
+
 QCharacterDialog::QCharacterDialog(QCharacter * form)
 	: QCharacterDialogBase(0, 0, false, 0),
 	form_(form)

src/frontends/qt2/QCharacterDialog.h

@@ -26,18 +26,14 @@
 
 class LyXFont;
 
-class QCharacterDialog : public QCharacterDialogBase
+class QCharacterDialog : public QCharacterDialogBase {
-{ Q_OBJECT
+	Q_OBJECT
-
 public:
 	QCharacterDialog(QCharacter * form);
-
 protected:
 	void closeEvent(QCloseEvent * e);
-
 private:
 	QCharacter * form_;
-
 protected slots:
 	void change_adaptor();
 };

src/frontends/qt2/QCitation.C

@@ -43,6 +43,7 @@ using std::vector;
 
 typedef Qt2CB<ControlCitation, Qt2DB<QCitationDialog> > base_class;
 
+
 QCitation::QCitation()
 	: base_class(_("Citation"))
 {}
@@ -174,7 +175,7 @@ void QCitation::update_contents()
 }
 
 
-void QCitation::updateBrowser(QListBox* browser,
+void QCitation::updateBrowser(QListBox * browser,
 				  vector<string> const & keys) const
 {
 	browser->clear();

src/frontends/qt2/QCitation.h

@@ -24,14 +24,13 @@ class ControlCitation;
 class QCitationDialog;
 
 
-class QCitation : public Qt2CB<ControlCitation, Qt2DB<QCitationDialog> >
+class QCitation
+	: public Qt2CB<ControlCitation, Qt2DB<QCitationDialog> >
 {
-	friend class QCitationDialog;
-
 public:
+	friend class QCitationDialog;
 	///
 	QCitation();
-
 private:
 	///
 	enum State {

src/frontends/qt2/QCitationDialog.C

@@ -36,6 +36,7 @@ using std::vector;
 using std::find;
 using std::max;
 
+
 QCitationDialog::QCitationDialog(QCitation * form)
 	: QCitationDialogBase(0, 0, false, 0),
 	form_(form)

src/frontends/qt2/QCitationDialog.h

@@ -21,13 +21,11 @@
 
 class QCitation;
 
-class QCitationDialog : public QCitationDialogBase
+class QCitationDialog : public QCitationDialogBase {
-{ Q_OBJECT
+	Q_OBJECT
-
 public:
 	QCitationDialog(QCitation * form);
 	~QCitationDialog();
-
 protected slots:
 	virtual void slotBibHighlighted(int sel);
 	virtual void slotBibSelected(int sel);
@@ -39,10 +37,8 @@ protected slots:
 	virtual void slotPreviousClicked();
 	virtual void slotNextClicked();
 	virtual void changed_adaptor();
-
 private:
 	void doFind(biblio::Direction dir);
-
 private:
 	QCitation * form_;
 };

src/frontends/qt2/QCommandBuffer.C

@@ -41,7 +41,6 @@ public:
 			   WType_Modal | WType_Popup | WDestructiveClose) {
 		setHScrollBarMode(AlwaysOff);
 	}
-
 protected:
 	void mouseReleaseEvent(QMouseEvent * e) {
 		if (e->x() < 0 || e->y() < 0
@@ -61,7 +60,8 @@ protected:
 	}
 };
 
-}
+} // end of anon
+
 
 QCommandBuffer::QCommandBuffer(QtView * view, ControlCommandBuffer & control)
 	: QToolBar(view), view_(view), controller_(control)
@@ -70,11 +70,8 @@ QCommandBuffer::QCommandBuffer(QtView * view, ControlCommandBuffer & control)
 
 	QPixmap qp(LibFileSearch("images", "unknown", "xpm").c_str());
 
-	QToolButton * upb = new QToolButton(qp, _("Up"), "", this, SLOT(up()), this);
+	(new QToolButton(qp, _("Up"), "", this, SLOT(up()), this))->show();
-	upb->show();
+	(new QToolButton(qp, _("Down"), "", this, SLOT(down()), this))->show();
-
-	QToolButton * downb = new QToolButton(qp, _("Down"), "", this, SLOT(down()), this);
-	downb->show();
 
 	edit_ = new QCommandEdit(this);
 	edit_->setMinimumSize(edit_->sizeHint());
@@ -132,7 +129,7 @@ void QCommandBuffer::complete()
 
 	edit_->setText(new_input.c_str());
 
-	QTempListBox * list = new QTempListBox();
+	QTempListBox * list = new QTempListBox;
 
 	// For some reason the scrollview's contents are larger
 	// than the number of actual items...
@@ -147,9 +144,9 @@ void QCommandBuffer::complete()
 
 	list->resize(list->sizeHint());
 	QPoint pos(edit_->mapToGlobal(QPoint(0, 0)));
-	int y = pos.y() - list->height();
+
-	if (y < 0)
+	int y = std::max(0, pos.y() - list->height());
-		y = 0;
+
 	list->move(pos.x(), y);
 
 	connect(list, SIGNAL(selected(const QString &)),
@@ -160,7 +157,7 @@ void QCommandBuffer::complete()
 }
 
 
-void QCommandBuffer::complete_selected(const QString & str)
+void QCommandBuffer::complete_selected(QString const & str)
 {
 	edit_->setText(str + " ");
 	QWidget const * widget = static_cast<QWidget const *>(sender());
@@ -170,7 +167,7 @@ void QCommandBuffer::complete_selected(const QString & str)
 
 void QCommandBuffer::up()
 {
-	string const input = edit_->text().latin1();
+	string const input(edit_->text().latin1());
 	string const h(controller_.historyUp());
 
 	if (h.empty()) {
@@ -183,7 +180,7 @@ void QCommandBuffer::up()
 
 void QCommandBuffer::down()
 {
-	string const input = edit_->text().latin1();
+	string const input(edit_->text().latin1());
 	string const h(controller_.historyDown());
 
 	if (h.empty()) {

src/frontends/qt2/QCommandBuffer.h

@@ -26,12 +26,10 @@ class ControlCommandBuffer;
 class QCommandBuffer : public QToolBar {
 	Q_OBJECT
 public:
-
 	QCommandBuffer(QtView * view, ControlCommandBuffer & control);
 
 	/// focus the edit widget
 	void focus_command();
-
 public slots:
 	/// cancel command compose
 	void cancel();
@@ -40,12 +38,11 @@ public slots:
 	/// tab-complete
 	void complete();
 	/// select-complete
-	void complete_selected(const QString & str);
+	void complete_selected(QString const & str);
 	/// up
 	void up();
 	/// down
 	void down();
-
 private:
 	/// owning view
 	QtView * view_;

src/frontends/qt2/QCommandEdit.C

@@ -8,8 +8,11 @@
  * Full author contact details are available in file CREDITS
  */
 
+#include <config.h>
+
 #include "QCommandEdit.h"
 
+
 QCommandEdit::QCommandEdit(QWidget * parent)
 	: QLineEdit(parent)
 {

src/frontends/qt2/QCommandEdit.h

@@ -17,9 +17,7 @@
 class QCommandEdit : public QLineEdit {
 	Q_OBJECT
 public:
-
 	QCommandEdit(QWidget * parent);
-
 signals:
 	/// cancel
 	void escapePressed();
@@ -32,7 +30,6 @@ signals:
 
 	/// complete
 	void rightPressed();
-
 protected:
 	virtual void keyPressEvent(QKeyEvent * e);
 };

src/frontends/qt2/QContentPane.C

@@ -42,6 +42,7 @@ key_modifier::state q_key_state(Qt::ButtonState state)
 	return k;
 }
 
+
 /// return the LyX mouse button state from Qt's
 mouse_button::state q_button_state(Qt::ButtonState button)
 {
@@ -110,16 +111,16 @@ void QContentPane::mousePressEvent(QMouseEvent * e)
 		return;
 	}
 
-	FuncRequest cmd
+	FuncRequest cmd(LFUN_MOUSE_PRESS, e->x(), e->y(),
-		(LFUN_MOUSE_PRESS, e->x(), e->y(), q_button_state(e->button()));
+			q_button_state(e->button()));
 	wa_->dispatch(cmd);
 }
 
 
 void QContentPane::mouseReleaseEvent(QMouseEvent * e)
 {
-	FuncRequest cmd
+	FuncRequest cmd(LFUN_MOUSE_RELEASE, e->x(), e->y(),
-		(LFUN_MOUSE_RELEASE, e->x(), e->y(), q_button_state(e->button()));
+			q_button_state(e->button()));
 	wa_->dispatch(cmd);
 }
 

src/frontends/qt2/QContentPane.h

@@ -19,6 +19,7 @@
 #include <qwidget.h>
 #include <qevent.h>
 #include <qpixmap.h>
+
 #include <boost/scoped_ptr.hpp>
 
 class QWorkArea;
@@ -43,18 +44,17 @@ struct double_click {
 		state(e->button()), active(true) {}
 };
 
+
 /**
  * Widget for actually drawing the document on
  */
 class QContentPane : public QWidget {
 	Q_OBJECT
-
 public:
 	QContentPane(QWorkArea * parent);
 
 	/// return the backing pixmap
 	QPixmap * pixmap() const { return pixmap_.get(); }
-
 protected:
 	/// repaint part of the widget
 	void paintEvent(QPaintEvent * e);
@@ -72,12 +72,10 @@ protected:
 
 	/// key press
 	void keyPressEvent(QKeyEvent * e);
-
 public slots:
 	void doubleClickTimeout();
 
 	void scrollBarChanged(int);
-
 private:
 	/// owning widget
 	QWorkArea * wa_;

src/frontends/qt2/QDelimiterDialog.C

@@ -29,14 +29,17 @@
 #include <qcheckbox.h>
 
 namespace {
-	char const * delim[] = {
+
+char const * delim[] = {
 	"(", ")", "{", "}", "[", "]",
 	"lceil", "rceil", "lfloor", "rfloor", "langle", "rangle",
 	"uparrow", "Uparrow", "downarrow", "Downarrow",
 	"|", "Vert", "slash", "backslash", ""
-	};
+};
 
-	string do_match(string str) {
+
+string do_match(string const & str)
+{
 	if (str == "(") return ")";
 	if (str == ")") return "(";
 	if (str == "[") return "]";
@@ -53,10 +56,23 @@ namespace {
 	if (str == "backslash") return "slash";
 	if (str == "slash") return "backslash";
 	return str;
-	}
- 
 }
 
+
+string fix_name(string const & str)
+{
+	if (str == "slash")
+		return "/";
+	if (str == "backslash")
+		return "\\";
+	if (str == "empty")
+		return ".";
+	return str;
+}
+
+} // namespace anon
+
+
 QDelimiterDialog::QDelimiterDialog(QMath * form)
 	: QDelimiterDialogBase(0, 0, false, 0),
 	form_(form)
@@ -81,18 +97,6 @@ QDelimiterDialog::QDelimiterDialog(QMath * form)
 }
 
 
-namespace {
-	string fix_name(string const & str) {
-		if (str == "slash")
-			return "/";
-		if (str == "backslash")
-			return "\\";
-		if (str == "empty")
-			return ".";
-		return str;
-	}
-}
- 
 void QDelimiterDialog::insertClicked()
 {
 	form_->insertDelim(fix_name(left_) + " " + fix_name(right_));

src/frontends/qt2/QDelimiterDialog.h

@@ -23,21 +23,16 @@ class QMath;
 class IconPalette;
 class QLabel;
 
-class QDelimiterDialog : public QDelimiterDialogBase
+class QDelimiterDialog : public QDelimiterDialogBase {
-{
 	Q_OBJECT
-
 public:
 	QDelimiterDialog(QMath * form);
-
 public slots:
 	void ldelim_clicked(string str);
 	void rdelim_clicked(string str);
 	void insertClicked();
-
 protected:
 	//needed ? virtual void closeEvent(QCloseEvent * e);
-
 private:
 	void set_label(QLabel * label, string const & str);
 

src/frontends/qt2/QDocument.C

@@ -16,7 +16,6 @@
 
 #include "gettext.h"
 
-
 #include "ControlDocument.h"
 #include "QDocument.h"
 #include "QDocumentDialog.h"
@@ -49,6 +48,7 @@ using std::vector;
 
 typedef Qt2CB<ControlDocument, Qt2DB<QDocumentDialog> > base_class;
 
+
 QDocument::QDocument()
 	: base_class(_("Document Settings"))
 {
@@ -56,16 +56,17 @@ QDocument::QDocument()
 	lang_ = getSecond(langs);
 }
 
+
 void QDocument::build_dialog()
 {
 	dialog_.reset(new QDocumentDialog(this));
 
-	/* biblio */
+	// biblio
 	dialog_->biblioModule->citeStyleCO->insertItem(_("Author-year"));
 	dialog_->biblioModule->citeStyleCO->insertItem(_("Numerical"));
 	dialog_->biblioModule->citeStyleCO->setCurrentItem(0);
 
-	/* language & quotes */
+	// language & quotes
 	vector<frnt::LanguagePair> const langs = frnt::getLanguageData(false);
 	vector<frnt::LanguagePair>::const_iterator lit  = langs.begin();
 	vector<frnt::LanguagePair>::const_iterator lend = langs.end();
@@ -81,7 +82,7 @@ void QDocument::build_dialog()
 	dialog_->langModule->quoteStyleCO->insertItem(_("«text»"));
 	dialog_->langModule->quoteStyleCO->insertItem(_("»text«"));
 
-	/* packages */
+	// packages
 	char const * items[] = {"default","auto","latin1","latin2",
 			     "latin3","latin4","latin5","latin9",
 			     "koi8-r","koi8-u","cp866","cp1251",
@@ -89,27 +90,27 @@ void QDocument::build_dialog()
 	dialog_->packagesModule->encodingCO->insertStrList(items);
 
 	dialog_->packagesModule->lspacingCO->insertItem(
-		_("Single"),Spacing::Single);
+		_("Single"), Spacing::Single);
 	dialog_->packagesModule->lspacingCO->insertItem(
-		_("OneHalf"),Spacing::Onehalf);
+		_("OneHalf"), Spacing::Onehalf);
 	dialog_->packagesModule->lspacingCO->insertItem(
-		_("Double"),Spacing::Double);
+		_("Double"), Spacing::Double);
 	dialog_->packagesModule->lspacingCO->insertItem(
-		_("Custom"),Spacing::Other);
+		_("Custom"), Spacing::Other);
 
 	for (int n = 0; tex_graphics[n][0]; ++n) {
 		QString enc = tex_graphics[n];
 		dialog_->packagesModule->psdriverCO->insertItem(enc);
 	}
 
-	/* paper */
+	// paper
 	QStringList papersize_;
 	papersize_ << _("Default") << _("Custom") << _("US letter") << _("US legal")
 		   << _("US executive") << _("A3") << _("A4") << _("A5")
 		   << _("B3") << _("B4") << _("B5");
 	dialog_->paperModule->papersizeCO->insertStringList(papersize_);
 
-	/* layout */
+	// layout
 	for (LyXTextClassList::const_iterator cit = textclasslist.begin();
 	     cit != textclasslist.end(); ++cit) {
 		dialog_->layoutModule->classCO->insertItem(cit->description().c_str());
@@ -136,12 +137,11 @@ void QDocument::build_dialog()
 	dialog_->layoutModule->pagestyleCO->insertItem(_("headings"));
 	dialog_->layoutModule->pagestyleCO->insertItem(_("fancy"));
 
-	/* margins */
+	// margins
 	dialog_->setMargins(0);
 
 	string const bmtablefile = LibFileSearch("images", "standard", "xpm");
 	QString s = bmtablefile.c_str();
-	qWarning("%d", s);
 
 	// Manage the restore, ok, apply, restore and cancel/close buttons
 	bc().setOK(dialog_->okPB);
@@ -153,21 +153,23 @@ void QDocument::build_dialog()
 
 void QDocument::apply()
 {
-	/* preamble */
+	BufferParams & params = controller().params();
-	controller().params().preamble =
+
+	// preamble
+	params.preamble =
 		dialog_->preambleModule->preambleMLE->text().latin1();
 
-	/* biblio */
+	// biblio
-	controller().params().use_natbib =
+	params.use_natbib =
 		dialog_->biblioModule->natbibCB->isChecked();
-	controller().params().use_numerical_citations  =
+	params.use_numerical_citations  =
 		dialog_->biblioModule->citeStyleCO->currentItem();
 
-	/* language & quotes */
+	// language & quotes
 	if (dialog_->langModule->singleQuoteRB->isChecked())
-		controller().params().quotes_times = InsetQuotes::SingleQ;
+		params.quotes_times = InsetQuotes::SingleQ;
 	else
-		controller().params().quotes_times = InsetQuotes::DoubleQ;
+		params.quotes_times = InsetQuotes::DoubleQ;
 
 
 	InsetQuotes::quote_language lga = InsetQuotes::EnglishQ;
@@ -191,74 +193,74 @@ void QDocument::apply()
 		lga = InsetQuotes::DanishQ;
 		break;
 	}
-	controller().params().quotes_language = lga;
+	params.quotes_language = lga;
 
 	int const pos = dialog_->langModule->languageCO->currentItem();
-	controller().params().language = languages.getLanguage(lang_[pos]);
+	params.language = languages.getLanguage(lang_[pos]);
 
-	/* numbering */
+	// numbering
-	controller().params().secnumdepth =
+	params.secnumdepth =
 		dialog_->numberingModule->tocDepthSB->value();
-	controller().params().tocdepth =
+	params.tocdepth =
 		dialog_->numberingModule->sectionnrDepthSB->value();
 
-	/* packages */
+	// packages
 	switch (dialog_->packagesModule->lspacingCO->currentItem()) {
 	case 0:
-		controller().params().spacing.set(Spacing::Single);
+		params.spacing.set(Spacing::Single);
 		break;
 	case 1:
-		controller().params().spacing.set(Spacing::Onehalf);
+		params.spacing.set(Spacing::Onehalf);
 		break;
 	case 2:
-		controller().params().spacing.set(Spacing::Double);
+		params.spacing.set(Spacing::Double);
 		break;
 	case 3:
-		controller().params().spacing.set(Spacing::Other,
+		params.spacing.set(Spacing::Other,
 				   dialog_->packagesModule->
 				   lspacingLE->text().toFloat()
 				   );
 		break;
 	}
 
-	controller().params().graphicsDriver =
+	params.graphicsDriver =
 		dialog_->packagesModule->psdriverCO->currentText().latin1();
 
-	controller().params().use_amsmath =
+	params.use_amsmath =
 		dialog_->packagesModule->amsCB->isChecked();
 
-	controller().params().inputenc =
+	params.inputenc =
 		dialog_->packagesModule->encodingCO->currentText().latin1();
 
-	/* layout */
+	// layout
-	controller().params().textclass =
+	params.textclass =
 		dialog_->layoutModule->classCO->currentItem();
 
 	//bool succes = controller().classApply();
 
-	controller().params().fonts =
+	params.fonts =
 		dialog_->layoutModule->fontsCO->currentText().latin1();
 
-	controller().params().fontsize =
+	params.fontsize =
 		dialog_->layoutModule->fontsizeCO->currentText().latin1();
 
-	controller().params().pagestyle =
+	params.pagestyle =
 		dialog_->layoutModule->pagestyleCO->currentText().latin1();
 
 	if (dialog_->layoutModule->indentRB->isChecked())
-		controller().params().paragraph_separation = BufferParams::PARSEP_INDENT;
+		params.paragraph_separation = BufferParams::PARSEP_INDENT;
 	else
-		controller().params().paragraph_separation = BufferParams::PARSEP_SKIP;
+		params.paragraph_separation = BufferParams::PARSEP_SKIP;
 
 	switch (dialog_->layoutModule->skipCO->currentItem()) {
 	case 0:
-		controller().params().setDefSkip(VSpace(VSpace::SMALLSKIP));
+		params.setDefSkip(VSpace(VSpace::SMALLSKIP));
 		break;
 	case 1:
-		controller().params().setDefSkip(VSpace(VSpace::MEDSKIP));
+		params.setDefSkip(VSpace(VSpace::MEDSKIP));
 		break;
 	case 2:
-		controller().params().setDefSkip(VSpace(VSpace::BIGSKIP));
+		params.setDefSkip(VSpace(VSpace::BIGSKIP));
 		break;
 	case 3:
 	{
@@ -268,102 +270,103 @@ void QDocument::apply()
 		double length =
 			dialog_->layoutModule->skipLE->text().toDouble();
 		VSpace vs = VSpace(LyXGlueLength(LyXLength(length,unit)));
-		controller().params().setDefSkip(vs);
+		params.setDefSkip(vs);
 		break;
 	}
 	default:
 		// DocumentDefskipCB assures that this never happens
-		controller().params().setDefSkip(VSpace(VSpace::MEDSKIP));
+		params.setDefSkip(VSpace(VSpace::MEDSKIP));
 		break;
 	}
 
-	controller().params().options =
+	params.options =
 		dialog_->layoutModule->optionsLE->text().latin1();
 
-	controller().params().float_placement =
+	params.float_placement =
 		dialog_->layoutModule->floatPlacementLE->text().latin1();
 
-	/* paper */
+	// paper
-	controller().params().papersize2 =
+	params.papersize2 =
 		dialog_->paperModule->papersizeCO->currentItem();
 
-	controller().params().paperwidth =
+	params.paperwidth =
 		LyXLength(dialog_->paperModule->paperwidthLE->text().toDouble(),
 			  dialog_->paperModule->paperwidthUnitCO->currentLengthItem()
 			).asString();
 
-	controller().params().paperheight =
+	params.paperheight =
 		LyXLength(dialog_->paperModule->paperheightLE->text().toDouble(),
 			  dialog_->paperModule->paperheightUnitCO->currentLengthItem()
 			).asString();
 
 	if (dialog_->paperModule->twoColumnCB->isChecked())
-		controller().params().columns = 2;
+		params.columns = 2;
 	else
-		controller().params().columns = 1;
+		params.columns = 1;
 
 	if (dialog_->paperModule->facingPagesCB->isChecked())
-		controller().params().sides = LyXTextClass::TwoSides;
+		params.sides = LyXTextClass::TwoSides;
 	else
-		controller().params().sides = LyXTextClass::OneSide;
+		params.sides = LyXTextClass::OneSide;
 
 	if (dialog_->paperModule->landscapeRB->isChecked())
-		controller().params().orientation = BufferParams::ORIENTATION_LANDSCAPE;
+		params.orientation = BufferParams::ORIENTATION_LANDSCAPE;
 	else
-		controller().params().orientation = BufferParams::ORIENTATION_PORTRAIT;
+		params.orientation = BufferParams::ORIENTATION_PORTRAIT;
 
-	/* margins */
+	// margins
-	controller().params().use_geometry =
+	params.use_geometry =
-		dialog_->marginsModule->marginCO->currentItem()==1;
+		(dialog_->marginsModule->marginCO->currentItem() == 1);
 
 	int margin = dialog_->marginsModule->marginCO->currentItem();
-	if (margin>0) {
+	if (margin > 0) {
 		margin = margin - 1;
 	}
-	controller().params().paperpackage = char(margin);
+	params.paperpackage = char(margin);
 
-	controller().params().leftmargin =
+	params.leftmargin =
 		LyXLength(dialog_->marginsModule->innerLE->text().toDouble(),
 			  dialog_->marginsModule->innerUnit->currentLengthItem()
 			  ).asString();
 
-	controller().params().topmargin =
+	params.topmargin =
 		LyXLength(dialog_->marginsModule->topLE->text().toDouble(),
 			  dialog_->marginsModule->topUnit->currentLengthItem()
 			  ).asString();
 
 
-	controller().params().rightmargin =
+	params.rightmargin =
 		LyXLength(dialog_->marginsModule->outerLE->text().toDouble(),
 			  dialog_->marginsModule->outerUnit->currentLengthItem()
 			  ).asString();
 
 
-	controller().params().bottommargin =
+	params.bottommargin =
 		LyXLength(dialog_->marginsModule->bottomLE->text().toDouble(),
 			  dialog_->marginsModule->bottomUnit->currentLengthItem()
 			  ).asString();
 
 
-	controller().params().headheight =
+	params.headheight =
 		LyXLength(dialog_->marginsModule->headheightLE->text().toDouble(),
 			  dialog_->marginsModule->headheightUnit->currentLengthItem()
 			  ).asString();
 
 
-	controller().params().headsep =
+	params.headsep =
 		LyXLength(dialog_->marginsModule->headsepLE->text().toDouble(),
 			  dialog_->marginsModule->headsepUnit->currentLengthItem()
 			  ).asString();
 
 
-	controller().params().footskip =
+	params.footskip =
 		LyXLength(dialog_->marginsModule->footskipLE->text().toDouble(),
 			  dialog_->marginsModule->footskipUnit->currentLengthItem()
 			  ).asString();
 
 }
 
+
 namespace {
 
 /** Return the position of val in the vector if found.
@@ -382,41 +385,44 @@ findPos(std::vector<A> const & vec, A const & val)
 
 } // namespace anom
 
+
 void QDocument::update_contents()
 {
 	if (!dialog_.get())
 		return;
 
-	/* preamble */
+	BufferParams const & params = controller().params();
-	QString preamble = controller().params().preamble.c_str();
+
+	// preamble
+	QString preamble = params.preamble.c_str();
 	dialog_->preambleModule->preambleMLE->setText(preamble);
 
-	/* biblio */
+	// biblio
 	dialog_->biblioModule->natbibCB->setChecked(
-		controller().params().use_natbib);
+		params.use_natbib);
 	dialog_->biblioModule->citeStyleCO->setCurrentItem(
-		controller().params().use_numerical_citations ? 1 : 0);
+		params.use_numerical_citations ? 1 : 0);
 
-	/* language & quotes */
+	// language & quotes
 	dialog_->langModule->singleQuoteRB->setChecked(
-		controller().params().quotes_times == InsetQuotes::SingleQ);
+		params.quotes_times == InsetQuotes::SingleQ);
 	dialog_->langModule->doubleQuoteRB->setChecked(
-		controller().params().quotes_times == InsetQuotes::DoubleQ);
+		params.quotes_times == InsetQuotes::DoubleQ);
 
 	int const pos = int(findPos(lang_,
-				    controller().params().language->lang()));
+				    params.language->lang()));
 	dialog_->langModule->languageCO->setCurrentItem(pos);
 
 	dialog_->langModule->quoteStyleCO->setCurrentItem(
-		controller().params().quotes_language);
+		params.quotes_language);
 
-	/* numbering */
+	// numbering
 	dialog_->numberingModule->tocDepthSB->setValue(
-		controller().params().secnumdepth);
+		params.secnumdepth);
 	dialog_->numberingModule->sectionnrDepthSB->setValue(
-		controller().params().tocdepth);
+		params.tocdepth);
 
-	/* packages */
+	// packages
 	QStringList enc;
 	enc <<  "default" << "auto" << "latin1" << "latin2" << "latin3" <<
 		"latin4" << "latin5" << "latin9" << "koi8-r" << "koi8-u" <<
@@ -424,14 +430,14 @@ void QDocument::update_contents()
 	int pos2 = 0;
 	for (QStringList::Iterator it = enc.begin();
 	     it!=enc.end(); ++it) {
-		if (*it==controller().params().inputenc.c_str()) {
+		if (*it == params.inputenc.c_str()) {
 			dialog_->packagesModule->encodingCO->setCurrentItem(pos2);
 		}
 		++pos2;
 	}
 
 
-	QString text = controller().params().graphicsDriver.c_str();
+	QString text = params.graphicsDriver.c_str();
 	int nitem = dialog_->packagesModule->psdriverCO->count();
 	for (int n = 0; n < nitem ; ++n) {
 		QString enc = tex_graphics[n];
@@ -442,20 +448,19 @@ void QDocument::update_contents()
 
 
 	dialog_->packagesModule->amsCB->setChecked(
-		controller().params().use_amsmath);
+		params.use_amsmath);
 
 	dialog_->packagesModule->lspacingCO->
-		setCurrentItem(controller().params().spacing.getSpace());
+		setCurrentItem(params.spacing.getSpace());
-	if (controller().params().spacing.getSpace()==
+	if (params.spacing.getSpace() == Spacing::Other) {
-	    Spacing::Other) {
 		dialog_->packagesModule->lspacingLE->setText(
-			tostr(controller().params().spacing.getValue()).c_str());
+			tostr(params.spacing.getValue()).c_str());
 		dialog_->setLSpacing(3);
 	}
 
-	/* layout */
+	// layout
 	for (int n = 0; n<dialog_->layoutModule->classCO->count(); ++n) {
-		if (dialog_->layoutModule->classCO->text(n)==
+		if (dialog_->layoutModule->classCO->text(n) ==
 		    controller().textClass().description().c_str()) {
 			dialog_->layoutModule->classCO->setCurrentItem(n);
 			break;
@@ -463,19 +468,19 @@ void QDocument::update_contents()
 	}
 
 	dialog_->updateFontsize(controller().textClass().opt_fontsize(),
-				controller().params().fontsize);
+				params.fontsize);
 
 	dialog_->updatePagestyle(controller().textClass().opt_pagestyle(),
-				 controller().params().pagestyle);
+				 params.pagestyle);
 
 	for (int n = 0; tex_fonts[n][0]; ++n) {
-		if (tex_fonts[n]==controller().params().fonts) {
+		if (tex_fonts[n] == params.fonts) {
 			dialog_->layoutModule->fontsCO->setCurrentItem(n);
 			break;
 		}
 	}
 
-	if (controller().params().paragraph_separation
+	if (params.paragraph_separation
 	    == BufferParams::PARSEP_INDENT) {
 		dialog_->layoutModule->indentRB->setChecked(true);
 	} else {
@@ -483,7 +488,7 @@ void QDocument::update_contents()
 	}
 
 	int skip = 0;
-	switch (controller().params().getDefSkip().kind()) {
+	switch (params.getDefSkip().kind()) {
 	case VSpace::SMALLSKIP:
 		skip = 0;
 		break;
@@ -496,7 +501,7 @@ void QDocument::update_contents()
 	case VSpace::LENGTH:
 	{
 		skip = 3;
-		string const length = controller().params().getDefSkip().asLyXCommand();
+		string const length = params.getDefSkip().asLyXCommand();
 		dialog_->layoutModule->skipLengthCO->setCurrentItem(LyXLength(length).unit());
 		dialog_->layoutModule->skipLE->setText(tostr(LyXLength(length).value()).c_str());
 		break;
@@ -508,45 +513,45 @@ void QDocument::update_contents()
 	dialog_->layoutModule->skipCO->setCurrentItem(skip);
 	dialog_->setSkip(skip);
 
-	if (!controller().params().options.empty()) {
+	if (!params.options.empty()) {
 		dialog_->layoutModule->optionsLE->setText(
-			controller().params().options.c_str());
+			params.options.c_str());
 	} else {
 		dialog_->layoutModule->optionsLE->setText("");
 	}
 
-	/* paper */
+	// paper
-	int const psize = controller().params().papersize2;
+	int const psize = params.papersize2;
 	dialog_->paperModule->papersizeCO->setCurrentItem(psize);
 	dialog_->setMargins(psize);
 	dialog_->setCustomPapersize(psize);
 
 	bool const landscape =
-		controller().params().orientation == BufferParams::ORIENTATION_LANDSCAPE;
+		params.orientation == BufferParams::ORIENTATION_LANDSCAPE;
 	dialog_->paperModule->landscapeRB->setChecked(landscape);
 	dialog_->paperModule->portraitRB->setChecked(!landscape);
 
 	dialog_->paperModule->facingPagesCB->setChecked(
-		controller().params().sides == LyXTextClass::TwoSides);
+		params.sides == LyXTextClass::TwoSides);
 
 	dialog_->paperModule->twoColumnCB->setChecked(
-		controller().params().columns == 2);
+		params.columns == 2);
 
 	dialog_->paperModule->paperwidthUnitCO->setCurrentItem(
-		LyXLength(controller().params().paperwidth).unit());
+		LyXLength(params.paperwidth).unit());
 
 	dialog_->paperModule->paperwidthLE->setText(
-		tostr(LyXLength(controller().params().paperwidth).value()).c_str());
+		tostr(LyXLength(params.paperwidth).value()).c_str());
 
 	dialog_->paperModule->paperheightUnitCO->setCurrentItem(
-		LyXLength(controller().params().paperheight).unit());
+		LyXLength(params.paperheight).unit());
 
 	dialog_->paperModule->paperheightLE->setText(
-		tostr(LyXLength(controller().params().paperheight).value()).c_str());
+		tostr(LyXLength(params.paperheight).value()).c_str());
 
-	/* margins */
+	// margins
-	int item = controller().params().paperpackage;
+	int item = params.paperpackage;
-	if (controller().params().use_geometry) {
+	if (params.use_geometry) {
 		item = 1;
 	} else if (item > 0) {
 		item = item + 1;
@@ -555,39 +560,37 @@ void QDocument::update_contents()
 	dialog_->setCustomMargins(item);
 
 	dialog_->marginsModule->topUnit->setCurrentItem(
-		LyXLength(controller().params().topmargin).unit());
+		LyXLength(params.topmargin).unit());
 	dialog_->marginsModule->topLE->setText(
-		tostr(LyXLength(controller().params().topmargin).value()).c_str());
+		tostr(LyXLength(params.topmargin).value()).c_str());
 
 	dialog_->marginsModule->bottomUnit->setCurrentItem(
-		LyXLength(controller().params().bottommargin).unit());
+		LyXLength(params.bottommargin).unit());
 	dialog_->marginsModule->bottomLE->setText(
-		tostr(LyXLength(controller().params().bottommargin).value()).c_str());
+		tostr(LyXLength(params.bottommargin).value()).c_str());
 
 	dialog_->marginsModule->innerUnit->setCurrentItem(
-		LyXLength(controller().params().leftmargin).unit());
+		LyXLength(params.leftmargin).unit());
 	dialog_->marginsModule->innerLE->setText(
-		tostr(LyXLength(controller().params().leftmargin).value()).c_str());
+		tostr(LyXLength(params.leftmargin).value()).c_str());
 
 	dialog_->marginsModule->outerUnit->setCurrentItem(
-		LyXLength(controller().params().rightmargin).unit());
+		LyXLength(params.rightmargin).unit());
 	dialog_->marginsModule->outerLE->setText(
-		tostr(LyXLength(controller().params().rightmargin).value()).c_str());
+		tostr(LyXLength(params.rightmargin).value()).c_str());
 
 	dialog_->marginsModule->headheightUnit->setCurrentItem(
-		LyXLength(controller().params().headheight).unit());
+		LyXLength(params.headheight).unit());
 	dialog_->marginsModule->headheightLE->setText(
-		tostr(LyXLength(controller().params().headheight).value()).c_str());
+		tostr(LyXLength(params.headheight).value()).c_str());
 
 	dialog_->marginsModule->headsepUnit->setCurrentItem(
-		LyXLength(controller().params().headsep).unit());
+		LyXLength(params.headsep).unit());
 	dialog_->marginsModule->headsepLE->setText(
-		tostr(LyXLength(controller().params().headsep).value()).c_str());
+		tostr(LyXLength(params.headsep).value()).c_str());
 
 	dialog_->marginsModule->footskipUnit->setCurrentItem(
-		LyXLength(controller().params().footskip).unit());
+		LyXLength(params.footskip).unit());
 	dialog_->marginsModule->footskipLE->setText(
-		tostr(LyXLength(controller().params().footskip).value()).c_str());
+		tostr(LyXLength(params.footskip).value()).c_str());
-
-
 }

src/frontends/qt2/QDocument.h

@@ -30,10 +30,10 @@ class QDocument
 	: public Qt2CB<ControlDocument, Qt2DB<QDocumentDialog> >
 {
 public:
-	///
-	QDocument();
 	///
 	friend class QDocumentDialog;
+	///
+	QDocument();
 private:
 	/// Apply changes
 	void apply();

src/frontends/qt2/QDocumentDialog.C

@@ -51,6 +51,8 @@
 #include <qcheckbox.h>
 #include <qspinbox.h>
 #include "lengthcombo.h"
+
+
 /*
  *  Constructs a DocumentDialog which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
@@ -249,6 +251,7 @@ QDocumentDialog::QDocumentDialog( QDocument * form)
 
 }
 
+
 void QDocumentDialog::showPreamble()
 {
 	moduleStack->raiseWidget(PREAMBLE);
@@ -256,6 +259,7 @@ void QDocumentDialog::showPreamble()
 	QDocumentDialogBase::show();
 }
 
+
 /*
  *  Destroys the object and frees any allocated resources
  */
@@ -264,6 +268,7 @@ QDocumentDialog::~QDocumentDialog()
     // no need to delete child widgets, Qt does it all for us
 }
 
+
 /*
  * public slot
  */
@@ -301,12 +306,14 @@ void QDocumentDialog::setTitle(int item)
 	}
 }
 
+
 /*
  * public slot
  */
 void QDocumentDialog::saveDocDefault()
 {}
 
+
 /*
  * public slot
  */
@@ -315,6 +322,7 @@ void QDocumentDialog::restore()
     qWarning( "DocumentDialog::restore() not yet implemented!" );
 }
 
+
 /*
  * public slot
  */
@@ -323,29 +331,34 @@ void QDocumentDialog::useClassDefaults()
     qWarning( "DocumentDialog::useClassDefaults() not yet implemented!" );
 }
 
+
 void QDocumentDialog::change_adaptor()
 {
 	form_->changed();
 }
 
+
 void QDocumentDialog::closeEvent(QCloseEvent * e)
 {
 	form_->slotWMHide();
 	e->accept();
 }
 
+
 void QDocumentDialog::setLSpacing(int item)
 {
-	packagesModule->lspacingLE->setEnabled(item==3);
+	packagesModule->lspacingLE->setEnabled(item == 3);
 }
 
+
 void QDocumentDialog::setSkip(int item)
 {
-	bool enable = (item==3);
+	bool enable = (item == 3);
 	layoutModule->skipLE->setEnabled(enable);
 	layoutModule->skipLengthCO->setEnabled(enable);
 }
 
+
 void QDocumentDialog::enableSkip(bool skip)
 {
 	layoutModule->skipCO->setEnabled(skip);
@@ -355,6 +368,7 @@ void QDocumentDialog::enableSkip(bool skip)
 		setSkip(layoutModule->skipCO->currentItem());
 }
 
+
 void QDocumentDialog::setMargins(int papersize)
 {
 	QStringList a4only;
@@ -376,7 +390,7 @@ void QDocumentDialog::setMargins(int papersize)
 
 void QDocumentDialog::setCustomPapersize(int papersize)
 {
-	bool const custom = (papersize==1);
+	bool const custom = (papersize == 1);
 
 	paperModule->paperwidthL->setEnabled(custom);
 	paperModule->paperwidthLE->setEnabled(custom);
@@ -390,7 +404,7 @@ void QDocumentDialog::setCustomPapersize(int papersize)
 
 void QDocumentDialog::setCustomMargins(int margin)
 {
-	bool const custom = (margin==1);
+	bool const custom = (margin == 1);
 
 	marginsModule->topL->setEnabled(custom);
 	marginsModule->topLE->setEnabled(custom);
@@ -422,6 +436,7 @@ void QDocumentDialog::setCustomMargins(int margin)
 
 }
 
+
 void QDocumentDialog::updateFontsize(string const & items, string const & sel)
 {
 	layoutModule->fontsizeCO->clear();
@@ -439,6 +454,7 @@ void QDocumentDialog::updateFontsize(string const & items, string const & sel)
 	}
 }
 
+
 void QDocumentDialog::updatePagestyle(string const & items, string const & sel)
 {
 	layoutModule->pagestyleCO->clear();
@@ -456,6 +472,7 @@ void QDocumentDialog::updatePagestyle(string const & items, string const & sel)
 	}
 }
 
+
 void QDocumentDialog::classChanged()
 {
 	updateFontsize(form_->controller().textClass().opt_fontsize(),
@@ -465,5 +482,3 @@ void QDocumentDialog::classChanged()
 			form_->controller().params().pagestyle);
 
 }
-
-

src/frontends/qt2/QDocumentDialog.h

@@ -33,34 +33,27 @@
 
 class QDocument;
 
-class QDocumentDialog : public QDocumentDialogBase
+class QDocumentDialog : public QDocumentDialogBase {
-{ 
 	Q_OBJECT
-
 public:
+	friend class QDocument;
 
-	QDocumentDialog( QDocument * );
+	QDocumentDialog(QDocument *);
 
 	~QDocumentDialog();
 
 	void showPreamble();
 
-	friend class QDocument;
+	void updateFontsize(string const & , string const &);
-
-	void updateFontsize(string const & , string const & );
-	
-	void updatePagestyle(string const & , string const & );
 
+	void updatePagestyle(string const & , string const &);
 public slots:
-
 	void setTitle(int);
 	void change_adaptor();
 	void saveDocDefault();
 	void restore();
 	void useClassDefaults();
-
 protected slots:
-
 	void setLSpacing(int);
 	void setMargins(int);
 	void setCustomPapersize(int);
@@ -68,11 +61,8 @@ protected slots:
 	void setSkip(int);
 	void enableSkip(bool);
 	void classChanged();
-	
 protected:
-    
     void closeEvent(QCloseEvent * e);
-
 private:
 	enum Module {
 		LAYOUT,

src/frontends/qt2/QERT.C

@@ -26,6 +26,7 @@
 
 typedef Qt2CB<ControlERT, Qt2DB<QERTDialog> > base_class;
 
+
 QERT::QERT()
 	: base_class(_("LaTeX ERT"))
 {
@@ -43,12 +44,14 @@ void QERT::build_dialog()
 
 void QERT::apply()
 {
+	ERTParams & params = controller().params();
+
 	if (dialog_->openRB->isChecked())
-		controller().params().status = InsetERT::Open;
+		params.status = InsetERT::Open;
 	else if (dialog_->inlineRB->isChecked())
-		controller().params().status = InsetERT::Inlined;
+		params.status = InsetERT::Inlined;
 	else
-		controller().params().status = InsetERT::Collapsed;
+		params.status = InsetERT::Collapsed;
 }
 
 

src/frontends/qt2/QERT.h

@@ -21,15 +21,13 @@
 class ControlERT;
 class QERTDialog;
 
-
+class QERT
-class QERT :
+	: public Qt2CB<ControlERT, Qt2DB<QERTDialog> >
-	public Qt2CB<ControlERT, Qt2DB<QERTDialog> >
 {
+public:
 	friend class QERTDialog;
 
-public:
 	QERT();
-
 private:
 	/// Apply changes
 	virtual void apply();

src/frontends/qt2/QERTDialog.C

@@ -19,6 +19,7 @@
 
 #include <qpushbutton.h>
 
+
 QERTDialog::QERTDialog(QERT * form)
 	: QERTDialogBase(0, 0, false, 0),
 	form_(form)

src/frontends/qt2/QERTDialog.h

@@ -20,18 +20,14 @@
 
 class QERT;
 
-class QERTDialog : public QERTDialogBase
+class QERTDialog : public QERTDialogBase {
-{ Q_OBJECT
+	Q_OBJECT
-
 public:
 	QERTDialog(QERT * form);
-
 protected slots:
 	virtual void change_adaptor();
-
 protected:
 	virtual void closeEvent(QCloseEvent * e);
-
 private:
 	QERT * form_;
 };

src/frontends/qt2/QError.C

@@ -26,6 +26,7 @@
 
 typedef Qt2CB<ControlError, Qt2DB<QErrorDialog> > base_class;
 
+
 QError::QError()
 	: base_class(_("LaTeX Error"))
 {

src/frontends/qt2/QError.h

@@ -22,17 +22,16 @@ class ControlError;
 class QErrorDialog;
 
 
-class QError :
+class QError
-	public Qt2CB<ControlError, Qt2DB<QErrorDialog> >
+	: public Qt2CB<ControlError, Qt2DB<QErrorDialog> >
 {
+public:
 	friend class QErrorDialog;
 
-public:
 	QError();
-
 private:
 	/// Apply changes
-	virtual void apply() {};
+	virtual void apply() {}
 	/// update
 	virtual void update_contents();
 	/// build the dialog

src/frontends/qt2/QErrorDialog.C

@@ -21,6 +21,7 @@
 
 #include "QErrorDialog.h"
 
+
 QErrorDialog::QErrorDialog(QError * form)
 	: QErrorDialogBase(0, 0, false, 0),
 	form_(form)

src/frontends/qt2/QErrorDialog.h

@@ -20,15 +20,12 @@
 
 class QError;
 
-class QErrorDialog : public QErrorDialogBase
+class QErrorDialog : public QErrorDialogBase {
-{ Q_OBJECT
+	Q_OBJECT
-
 public:
 	QErrorDialog(QError * form);
-
 protected:
 	virtual void closeEvent(QCloseEvent * e);
-
 private:
 	QError * form_;
 };

src/frontends/qt2/QExternal.C

@@ -14,8 +14,6 @@
 #pragma implementation
 #endif
 
-#include <vector>
-
 #include "ControlExternal.h"
 #include "gettext.h"
 
@@ -28,8 +26,11 @@
 #include "QExternal.h"
 #include "Qt2BC.h"
 
+#include <vector>
+
 typedef Qt2CB<ControlExternal, Qt2DB<QExternalDialog> > base_class;
 
+
 QExternal::QExternal()
 	: base_class(_("External"))
 {
@@ -64,26 +65,28 @@ void QExternal::update_contents()
 	dialog_->paramsED->setText(params.parameters.c_str());
 
 	dialog_->externalCO->setCurrentItem(controller().getTemplateNumber(params.templ.lyxName));
-	dialog_->externalTV->setText(controller().params().templ.helpText.c_str());
+	dialog_->externalTV->setText(params.templ.helpText.c_str());
 	isValid();
 }
 
 
 string const & QExternal::helpText()
 {
-	controller().params().templ = controller().getTemplate(dialog_->externalCO->currentItem() + 1);
+	InsetExternal::Params & params = controller().params();
-	return controller().params().templ.helpText;
+
+	params.templ = controller().getTemplate(dialog_->externalCO->currentItem() + 1);
+	return params.templ.helpText;
 }
 
 
 void QExternal::apply()
 {
-	controller().params().filename =
+	InsetExternal::Params & params = controller().params();
-		string(dialog_->fileED->text().latin1());
-	controller().params().parameters =
-		string(dialog_->paramsED->text().latin1());
 
-	controller().params().templ = controller().getTemplate(dialog_->externalCO->currentItem() + 1);
+	params.filename = dialog_->fileED->text().latin1();
+	params.parameters = dialog_->paramsED->text().latin1();
+
+	params.templ = controller().getTemplate(dialog_->externalCO->currentItem() + 1);
 }
 
 

src/frontends/qt2/QExternal.h

@@ -21,17 +21,15 @@
 class ControlExternal;
 class QExternalDialog;
 
-class QExternal :
+class QExternal
-	public Qt2CB<ControlExternal, Qt2DB<QExternalDialog> >
+	: public Qt2CB<ControlExternal, Qt2DB<QExternalDialog> >
 {
+public:
 	friend class QExternalDialog;
 
-public:
 	QExternal();
-
 protected:
 	virtual bool isValid();
-
 private:
 	/// Apply changes
 	virtual void apply();

src/frontends/qt2/QExternalDialog.C

@@ -27,6 +27,7 @@
 #include "QExternalDialog.h"
 #include "QExternal.h"
 
+
 QExternalDialog::QExternalDialog(QExternal * form)
 	: QExternalDialogBase(0, 0, false, 0),
 	form_(form)
@@ -81,8 +82,11 @@ void QExternalDialog::updateClicked()
 
 void QExternalDialog::browseClicked()
 {
-	QString file = QFileDialog::getOpenFileName(QString::null,
+	QString file =
-		_("External material (*)"), this, 0, _("Select external material"));
+		QFileDialog::getOpenFileName(QString::null,
+					     _("External material (*)"),
+					     this, 0,
+					     _("Select external material"));
 	if (!file.isNull()) {
 		fileED->setText(file.latin1());
 		form_->changed();

src/frontends/qt2/QExternalDialog.h

@@ -20,14 +20,12 @@
 
 class QExternal;
 
-class QExternalDialog : public QExternalDialogBase
+class QExternalDialog : public QExternalDialogBase {
-{ Q_OBJECT
+	Q_OBJECT
-
 public:
 	QExternalDialog(QExternal * form);
 
 	virtual void show();
-
 protected slots:
 	virtual void change_adaptor();
 	virtual void editClicked();
@@ -35,10 +33,8 @@ protected slots:
 	virtual void updateClicked();
 	virtual void browseClicked();
 	virtual void templateChanged();
-
 protected:
 	virtual void closeEvent(QCloseEvent * e);
-
 private:
 	QExternal * form_;
 };

src/frontends/qt2/QFloat.C

@@ -27,6 +27,7 @@
 
 typedef Qt2CB<ControlFloat, Qt2DB<QFloatDialog> > base_class;
 
+
 QFloat::QFloat()
 	: base_class(_("Float Settings"))
 {
@@ -63,7 +64,9 @@ void QFloat::update_contents()
 	bool force = false;
 	bool here_definitely = false;
 
-	string const placement(controller().params().placement);
+	FloatParams const & params = controller().params();
+
+	string const & placement = params.placement;
 
 	if (placement.empty()) {
 		def_placement = true;
@@ -96,21 +99,23 @@ void QFloat::update_contents()
 	dialog_->ignoreCB->setEnabled(top || bottom || page || here);
 	dialog_->heredefinitelyCB->setChecked(here_definitely);
 
-	if (controller().params().wide) {
+	if (params.wide) {
 		dialog_->herepossiblyCB->setChecked(false);
 		dialog_->bottomCB->setChecked(false);
 	}
 
-	dialog_->spanCB->setChecked(controller().params().wide);
+	dialog_->spanCB->setChecked(params.wide);
 }
 
 
 void QFloat::apply()
 {
-	controller().params().wide = dialog_->spanCB->isChecked(); 
+	FloatParams & params = controller().params();
+
+	params.wide = dialog_->spanCB->isChecked();
 
 	if (dialog_->defaultsCB->isChecked()) {
-		controller().params().placement = "";
+		params.placement.erase();
 		return;
 	}
 
@@ -135,5 +140,5 @@ void QFloat::apply()
 			placement += "h";
 		}
 	}
-	controller().params().placement = placement;
+	params.placement = placement;
 }

src/frontends/qt2/QFloatDialog.C

@@ -24,6 +24,7 @@
 #include "QFloatDialog.h"
 #include "QFloat.h"
 
+
 QFloatDialog::QFloatDialog(QFloat * form)
 	: QFloatDialogBase(0, 0, false, 0),
 	form_(form)

src/frontends/qt2/QFloatDialog.h

@@ -20,21 +20,17 @@
 
 class QFloat;
 
-class QFloatDialog : public QFloatDialogBase
+class QFloatDialog : public QFloatDialogBase {
-{ Q_OBJECT
+	Q_OBJECT
-
 public:
 	QFloatDialog(QFloat * form);
-
 protected slots:
 	virtual void change_adaptor();
 	virtual void tbhpClicked();
 	virtual void heredefinitelyClicked();
 	virtual void spanClicked();
-
 protected:
 	virtual void closeEvent(QCloseEvent * e);
-
 private:
 	QFloat * form_;
 };

src/frontends/qt2/QGraphics.C

@@ -43,6 +43,7 @@
 
 typedef Qt2CB<ControlGraphics, Qt2DB<QGraphicsDialog> > base_class;
 
+
 QGraphics::QGraphics()
 	: base_class(_("Graphics"))
 {
@@ -106,12 +107,16 @@ void QGraphics::update_contents()
 
 		case BufferParams::PAPER_USLETTER:
 		case BufferParams::PAPER_LEGALPAPER:
-		case BufferParams::PAPER_EXECUTIVEPAPER: unit = "in"; break;
+		case BufferParams::PAPER_EXECUTIVEPAPER:
+			unit = "in";
+			break;
 
 		case BufferParams::PAPER_A3PAPER:
 		case BufferParams::PAPER_A4PAPER:
 		case BufferParams::PAPER_A5PAPER:
-		case BufferParams::PAPER_B5PAPER: unit = "cm"; break;
+		case BufferParams::PAPER_B5PAPER:
+			unit = "cm";
+			break;
 	}
 
 	dialog_->filename->setText(igp.filename.c_str());
@@ -148,7 +153,7 @@ void QGraphics::update_contents()
 	dialog_->subfigure->setChecked(igp.subcaption);
 	dialog_->subcaption->setText(igp.subcaptionText.c_str());
 
-	int item;
+	int item = 0;
 	switch (igp.display) {
 		case grfx::DefaultDisplay: item = 0; break;
 		case grfx::MonochromeDisplay: item = 1; break;
@@ -187,7 +192,7 @@ void QGraphics::apply()
 	igp.filename = dialog_->filename->text();
 
 	if (!controller().bbChanged) {
-		igp.bb = string();
+		igp.bb.erase();
 	} else {
 		string bb;
 		string lbX(dialog_->lbX->text());
@@ -251,7 +256,7 @@ void QGraphics::apply()
 	if ((dialog_->origin->currentItem()) > 0)
 		igp.rotateOrigin = dialog_->origin->currentText();
 	else
-	    igp.rotateOrigin = string();
+	    igp.rotateOrigin.erase();
 
 	igp.special = dialog_->latexoptions->text();
 }

src/frontends/qt2/QGraphics.h

@@ -31,10 +31,8 @@ public:
 	friend class QGraphicsDialog;
 	///
 	QGraphics();
-
 protected:
 	virtual bool isValid();
-
 private:
 	/// Apply changes
 	virtual void apply();

src/frontends/qt2/QGraphicsDialog.C

@@ -14,8 +14,6 @@
 #pragma implementation
 #endif
 
-#include <vector>
-
 #include "ControlGraphics.h"
 #include "debug.h"
 #include "LString.h"
@@ -28,6 +26,9 @@
 #include "QGraphicsDialog.h"
 #include "QGraphics.h"
 
+#include <vector>
+
+
 QGraphicsDialog::QGraphicsDialog(QGraphics * form)
 	: QGraphicsDialogBase(0, 0, false, 0),
 	form_(form)

src/frontends/qt2/QGraphicsDialog.h

@@ -20,22 +20,18 @@
 
 class QGraphics;
 
-class QGraphicsDialog : public QGraphicsDialogBase
+class QGraphicsDialog : public QGraphicsDialogBase {
-{ Q_OBJECT
+	Q_OBJECT
-
 public:
 	QGraphicsDialog(QGraphics * form);
 
 	virtual void show();
-
 protected slots:
 	virtual void change_adaptor();
 	virtual void browse_clicked();
 	virtual void get_clicked();
-
 protected:
 	virtual void closeEvent(QCloseEvent * e);
-
 private:
 	QGraphics * form_;
 };

src/frontends/qt2/QInclude.C

@@ -27,8 +27,10 @@
 #include <qcheckbox.h>
 #include <qcombobox.h>
 
+
 typedef Qt2CB<ControlInclude, Qt2DB<QIncludeDialog> > base_class;
 
+
 QInclude::QInclude()
 	: base_class(_("Include"))
 {
@@ -50,9 +52,11 @@ void QInclude::build_dialog()
 
 void QInclude::update_contents()
 {
-	dialog_->filenameED->setText(controller().params().cparams.getContents().c_str());
+	InsetInclude::Params const & params = controller().params();
 
-	string const cmdname = controller().params().cparams.getCmdName();
+	dialog_->filenameED->setText(params.cparams.getContents().c_str());
+
+	string const & cmdname = params.cparams.getCmdName();
 
 	dialog_->visiblespaceCB->setChecked(false);
 	dialog_->visiblespaceCB->setEnabled(false);
@@ -71,19 +75,20 @@ void QInclude::update_contents()
 
 void QInclude::apply()
 {
-	controller().params().cparams.
+	InsetInclude::Params & params = controller().params();
-		setContents(dialog_->filenameED->text().latin1());
+
+	params.cparams.setContents(dialog_->filenameED->text().latin1());
 
 	int const item = dialog_->typeCO->currentItem();
 	if (item == 0)
-		controller().params().flag = InsetInclude::INPUT;
+		params.flag = InsetInclude::INPUT;
 	else if (item == 1)
-		controller().params().flag = InsetInclude::INCLUDE;
+		params.flag = InsetInclude::INCLUDE;
 	else {
 		if (dialog_->visiblespaceCB->isChecked())
-			controller().params().flag = InsetInclude::VERBAST;
+			params.flag = InsetInclude::VERBAST;
 		else
-			controller().params().flag = InsetInclude::VERB;
+			params.flag = InsetInclude::VERB;
 	}
 }
 
@@ -93,9 +98,9 @@ void QInclude::browse()
 	ControlInclude::Type type;
 
 	int const item = dialog_->typeCO->currentItem();
-	if (item==0)
+	if (item == 0)
 		type = ControlInclude::INPUT;
-	else if (item==1)
+	else if (item == 1)
 		type = ControlInclude::INCLUDE;
 	else
 		type = ControlInclude::VERBATIM;

src/frontends/qt2/QInclude.h

@@ -30,10 +30,8 @@ public:
 	friend class QIncludeDialog;
 	///
 	QInclude();
-
 protected:
 	virtual bool isValid();
-
 private:
 	/// Apply changes
 	virtual void apply();

src/frontends/qt2/QIncludeDialog.C

@@ -14,8 +14,6 @@
 #pragma implementation
 #endif
 
-#include <vector>
-
 #include "ControlInclude.h"
 #include "debug.h"
 #include "LString.h"
@@ -28,6 +26,9 @@
 #include "QIncludeDialog.h"
 #include "QInclude.h"
 
+#include <vector>
+
+
 QIncludeDialog::QIncludeDialog(QInclude * form)
 	: QIncludeDialogBase(0, 0, false, 0),
 	form_(form)

src/frontends/qt2/QIncludeDialog.h

@@ -20,25 +20,21 @@
 
 class QInclude;
 
-class QIncludeDialog : public QIncludeDialogBase
+class QIncludeDialog : public QIncludeDialogBase {
-{ Q_OBJECT
+	Q_OBJECT
-
 public:
 	QIncludeDialog(QInclude * form);
 
 	void updateLists();
 
 	virtual void show();
-
 protected slots:
 	virtual void change_adaptor();
 	virtual void loadClicked();
 	virtual void browseClicked();
 	virtual void typeChanged(int v);
-
 protected:
 	virtual void closeEvent(QCloseEvent * e);
-
 private:
 	QInclude * form_;
 };

src/frontends/qt2/QIndex.C

@@ -25,6 +25,7 @@
 
 typedef Qt2CB<ControlIndex, Qt2DB<QIndexDialog> > base_class;
 
+
 QIndex::QIndex()
 	: base_class(_("Index"))
 {

src/frontends/qt2/QIndex.h

@@ -26,14 +26,12 @@ class QIndexDialog;
 class QIndex :
 	public Qt2CB<ControlIndex, Qt2DB<QIndexDialog> >
 {
+public:
 	friend class QIndexDialog;
 
-public:
 	QIndex();
-
 protected:
 	virtual bool isValid();
-
 private:
 	/// Apply changes
 	virtual void apply();

src/frontends/qt2/QIndexDialog.C

@@ -23,6 +23,7 @@
 #include <qlineedit.h>
 #include <qwhatsthis.h>
 
+
 QIndexDialog::QIndexDialog(QIndex * form)
 	: QIndexDialogBase(0, 0, false, 0),
 	form_(form)

src/frontends/qt2/QIndexDialog.h

@@ -20,20 +20,16 @@
 
 class QIndex;
 
-class QIndexDialog : public QIndexDialogBase
+class QIndexDialog : public QIndexDialogBase {
-{ Q_OBJECT
+	Q_OBJECT
-
 public:
 	QIndexDialog(QIndex * form);
 
 	virtual void show();
-
 protected slots:
 	virtual void change_adaptor();
-
 protected:
 	virtual void closeEvent(QCloseEvent * e);
-
 private:
 	QIndex * form_;
 };

src/frontends/qt2/QLImage.C

@@ -99,7 +99,8 @@ QLImage::QLImage()
 
 
 QLImage::QLImage(QLImage const & other)
-	: Image(other), pixmap_(other.pixmap_), xformed_pixmap_(other.xformed_pixmap_)
+	: Image(other), pixmap_(other.pixmap_),
+	  xformed_pixmap_(other.xformed_pixmap_)
 {
 }
 

src/frontends/qt2/QLImage.h

@@ -23,8 +23,7 @@
 
 namespace grfx {
 
-class QLImage : public Image
+class QLImage : public Image {
-{
 public:
 	/// Access to this class is through this static method.
 	static ImagePtr newImage();
@@ -71,7 +70,6 @@ public:
 
 	/// Scale the image using params.
 	virtual void scale(Params const & params);
-
 private:
 	/// Access to the class is through newImage() and clone.
 	QLImage();

src/frontends/qt2/QLPainter.C

@@ -14,9 +14,6 @@
 #pragma implementation
 #endif
 
-#include <iostream>
-#include <boost/scoped_array.hpp>
- 
 #include "font_metrics.h"
 #include "support/lstrings.h"
 #include "lyxrc.h"
@@ -30,16 +27,21 @@
 #include "QLPainter.h"
 #include "QLImage.h"
 
+#include <boost/scoped_array.hpp>
+
 #include <qpainter.h>
 #include <qbrush.h>
 #include <qcolor.h>
 
+#include <iostream>
+
 using std::endl;
 
+
 QLPainter::QLPainter(QWorkArea & qwa)
 	: Painter(), owner_(qwa), paint_check_(0)
 {
-	qp_.reset(new QPainter());
+	qp_.reset(new QPainter);
 }
 
 
@@ -123,9 +125,7 @@ Painter & QLPainter::lines(int const * xp, int const * yp,
 	// Must use new as np is not known at compile time.
 	boost::scoped_array<QCOORD> points(new QCOORD[np * 2]);
 
-	int j = 0;
+	for (int i = 0, j = 0; i < np; ++i) {
- 
-	for (int i = 0; i < np; ++i) {
 		points[j++] = xp[i];
 		points[j++] = yp[i];
 	}
@@ -165,9 +165,8 @@ Painter & QLPainter::fillPolygon(int const * xp, int const * yp,
 	boost::scoped_array<QCOORD> points(new QCOORD[np * 2]);
 
 	//if (1) return *this;
-	int j = 0;
 
-	for (int i = 0; i < np; ++i) {
+	for (int i = 0, j = 0; i < np; ++i) {
 		points[j++] = xp[i];
 		points[j++] = yp[i];
 	}
@@ -263,7 +262,7 @@ Painter & QLPainter::text(int x, int y,
 		str[i] = QChar(encoding->ucs(s[i]));
 	// HACK: QT3 refuses to show single compose characters
 	if (ls = 1 && str[0].unicode() >= 0x05b0 && str[0].unicode() <= 0x05c2)
-		str = ' '+str;
+		str = ' ' + str;
 #else
 	for (size_t i = 0; i < ls; ++i)
 		str += QChar(encoding->ucs(s[i]));

src/frontends/qt2/QLPainter.h

@@ -119,7 +119,6 @@ public:
 	/// draw a char at position x, y (y is the baseline)
 	virtual Painter & text(int x, int y,
 		char c, LyXFont const & f);
-
 private:
 	/// draw small caps text
 	void smallCapsText(int x, int y,

src/frontends/qt2/QLPopupMenu.C

@@ -32,9 +32,7 @@ namespace {
 string const getLabel(MenuItem const & mi)
 {
 	string const shortcut = mi.shortcut();
-	string label = mi.label();
+	string label = subst(mi.label(), "&", "&&");
-
-	label = subst(label, "&", "&&");
 
 	if (shortcut.empty())
 		return label;
@@ -47,10 +45,11 @@ string const getLabel(MenuItem const & mi)
 	return label;
 }
 
-} 
+} // namespace anon
 
 
-pair<int, QLPopupMenu *> createMenu(QMenuData * parent, MenuItem const * item, Menubar::Pimpl * owner, bool is_toplevel)
+pair<int, QLPopupMenu *>
+createMenu(QMenuData * parent, MenuItem const * item, Menubar::Pimpl * owner, bool is_toplevel)
 {
 	// FIXME: leaks ??
 	QLPopupMenu * pm = new QLPopupMenu(owner, item->submenuname(), is_toplevel);
@@ -59,7 +58,8 @@ pair<int, QLPopupMenu *> createMenu(QMenuData * parent, MenuItem const * item, M
 }
 
 
-QLPopupMenu::QLPopupMenu(Menubar::Pimpl * owner, string const & name, bool toplevel)
+QLPopupMenu::QLPopupMenu(Menubar::Pimpl * owner,
+			 string const & name, bool toplevel)
 	: owner_(owner), name_(name)
 {
 	if (toplevel)
@@ -76,11 +76,13 @@ bool QLPopupMenu::disabled(Menu * menu)
 	Menu::const_iterator m = menu->begin();
 	Menu::const_iterator end = menu->end();
 	for (; m != end; ++m) {
-		if (m->kind() == MenuItem::Submenu && !disabled(m->submenu())) {
+		if (m->kind() == MenuItem::Submenu
+		    && !disabled(m->submenu())) {
 			disable = false;
 		} else {
 			FuncStatus const status =
-				owner_->view()->getLyXFunc().getStatus(m->action());
+				owner_->view()->getLyXFunc()
+				.getStatus(m->action());
 			if (!status.disabled())
 				disable = false;
 		}

src/frontends/qt2/QLPopupMenu.h

@@ -30,21 +30,21 @@ class QLPopupMenu;
 
 /// create a sub-menu
 std::pair<int, QLPopupMenu *>
-	createMenu(QMenuData * parent, MenuItem const * item, Menubar::Pimpl * owner, bool is_toplevel = false);
+createMenu(QMenuData * parent, MenuItem const * item,
+	   Menubar::Pimpl * owner, bool is_toplevel = false);
 
 /// a submenu
 class QLPopupMenu : public QPopupMenu {
 	Q_OBJECT
 public:
-	QLPopupMenu(Menubar::Pimpl * owner, string const & name, bool toplevel);
+	QLPopupMenu(Menubar::Pimpl * owner,
+		    string const & name, bool toplevel);
 
 	/// populate the menu
 	void populate(Menu * menu);
-
 public slots:
 	/// populate the toplevel menu and all children
 	void showing();
-
 private:
 	/// return true if the given submenu is disabled
 	bool disabled(Menu * menu);

src/frontends/qt2/QLog.C

@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <fstream>
 
 #ifdef __GNUG__
 #pragma implementation
@@ -18,6 +17,7 @@
 #include "LyXView.h"
 #include "gettext.h"
 #include "ControlLog.h"
+#include "Lsstream.h"
 
 #include <qtextview.h>
 #include <qpushbutton.h>
@@ -26,6 +26,8 @@
 #include "QLog.h"
 #include "Qt2BC.h"
 
+#include <fstream>
+
 using std::ifstream;
 using std::getline;
 
@@ -47,7 +49,8 @@ void QLog::build_dialog()
 
 void QLog::update_contents()
 {
-	std::pair<Buffer::LogType, string> const logfile = controller().logfile();
+	std::pair<Buffer::LogType, string> const & logfile =
+		controller().logfile();
 
 	if (logfile.first == Buffer::buildlog)
 		dialog_->setCaption(_("Build log"));
@@ -65,11 +68,8 @@ void QLog::update_contents()
 		return;
 	}
 
-	string text;
+	ostringstream ost;
-	string line;
+	ost << ifstr.rdbuf();
 
-	while (getline(ifstr, line))
+	dialog_->logTV->setText(ost.str().c_str());
-		text += line + "\n";
-
-	dialog_->logTV->setText(text.c_str());
 }

src/frontends/qt2/QLog.h

@@ -30,10 +30,9 @@ public:
 	friend class QLogDialog;
 	///
 	QLog();
-
 private:
 	/// Apply changes
-	virtual void apply() {};
+	virtual void apply() {}
 	/// update
 	virtual void update_contents();
 	/// build the dialog

src/frontends/qt2/QLogDialog.C

@@ -14,8 +14,6 @@
 #pragma implementation
 #endif
 
-#include <vector>
-
 #include "LyXView.h"
 #include "ControlLog.h"
 
@@ -25,6 +23,9 @@
 #include "QLogDialog.h"
 #include "QLog.h"
 
+#include <vector>
+
+
 QLogDialog::QLogDialog(QLog * form)
 	: QLogDialogBase(0, 0, false, 0),
 	form_(form)

src/frontends/qt2/QLogDialog.h

@@ -20,18 +20,14 @@
 
 class QLog;
 
-class QLogDialog : public QLogDialogBase
+class QLogDialog : public QLogDialogBase {
-{ Q_OBJECT
+	Q_OBJECT
-
 public:
 	QLogDialog(QLog * form);
-
 protected slots:
 	virtual void updateClicked();
-
 protected:
 	virtual void closeEvent(QCloseEvent * e);
-
 private:
 	QLog * form_;
 };

src/frontends/qt2/QLyXKeySym.C

@@ -23,6 +23,7 @@
 
 using std::endl;
 
+
 QLyXKeySym::QLyXKeySym()
 	: LyXKeySym(), key_(0)
 {
@@ -76,9 +77,12 @@ char QLyXKeySym::getISOEncoded() const
 }
 
 
-bool QLyXKeySym::operator==(LyXKeySym const & k) const
+bool operator==(LyXKeySym const & k1, LyXKeySym const & k2)
 {
-	QLyXKeySym const & o = static_cast<QLyXKeySym const &>(k);
+	// note we ignore text_ here (non-strict ==), because
-	// ignore text_ ! 
+	// text_ is not filled out by keymap initialisation
-	return o.key_ == key_;
+
+	return static_cast<QLyXKeySym const &>(k1).key()
+		== static_cast<QLyXKeySym const &>(k2).key();
+
 }

src/frontends/qt2/QLyXKeySym.h

@@ -56,9 +56,10 @@ public:
 	 * This relies on user to use the right encoding.
 	 */
 	virtual char getISOEncoded() const;
-
+	///
-	virtual bool operator==(LyXKeySym const & k) const;
+	int key() const {
-
+		return key_;
+	}
 private:
 	/// the Qt sym value
 	int key_;

src/frontends/qt2/QMath.C

@@ -26,12 +26,16 @@
 
 #include "iconpalette.h"
 
+// needless to say, this can't last for long
+extern BufferView * current_view;
+
+
 // FIXME temporary HACK !
 void createMathPanel()
 {
 	static QMath * dialog = 0;
 	if (!dialog) {
-		dialog = new QMath();
+		dialog = new QMath;
 		dialog->build_dialog();
 	}
 	dialog->do_show();
@@ -55,9 +59,6 @@ void QMath::build_dialog()
 }
 
 
-// needless to say, this can't last for long
-extern BufferView * current_view;
-
 void QMath::subscript()
 {
 	current_view->owner()->dispatch(FuncRequest(LFUN_SUBSCRIPT));

src/frontends/qt2/QMath.h

@@ -20,8 +20,7 @@
 
 class QMathDialog;
 
-class QMath
+class QMath {
-{
 public:
 	friend class QMathDialog;
 
@@ -53,7 +52,6 @@ public:
 
 	/// switch between display and inline
 	void toggleDisplay();
-
 private:
 	/// Apply changes
 	virtual void apply() {}

src/frontends/qt2/QMathDialog.C

@@ -40,6 +40,7 @@ using std::min;
 using std::max;
 using std::endl;
 
+
 class QScrollViewSingle : public QScrollView {
 public:
 	QScrollViewSingle(QWidget * p)
@@ -56,7 +57,6 @@ public:
 		setMinimumWidth(verticalScrollBar()->width() + w_->width() + 4);
 		addChild(w_);
 	}
-
 protected:
 	virtual void resizeEvent(QResizeEvent * e) {
 		QScrollView::resizeEvent(e);
@@ -68,22 +68,24 @@ protected:
 		qApp->processEvents();
 		resizeContents(w_->width(), w_->height());
 	}
-
 private:
 	QWidget * w_;
 };
 
 namespace {
-	char const ** panels[] = {
+
+char const ** panels[] = {
 	latex_bop, latex_varsz, latex_brel, latex_greek, latex_arrow,
 	latex_dots, latex_deco, latex_misc, latex_ams_ops,
 	latex_ams_rel, latex_ams_nrel, latex_ams_arrows,
 	latex_ams_misc
-	};
+};
-	int const nr_panels = sizeof(panels)/sizeof(panels[0]);
+
+int const nr_panels = sizeof(panels)/sizeof(panels[0]);
 
 bool panel_initialised[nr_panels];
-}
+
+} // namespace anon
 
 
 QMathDialog::QMathDialog(QMath * form)
@@ -191,7 +193,7 @@ void QMathDialog::addPanel(int num)
 }
 
 
-void QMathDialog::symbol_clicked(string str)
+void QMathDialog::symbol_clicked(string const & str)
 {
 	form_->insert(str);
 }