From a5c39240f7b6641f2ebf38af9ced327600f14622 Mon Sep 17 00:00:00 2001
From: John Levon <levon@movementarian.org>
Date: Wed, 29 Aug 2001 15:37:39 +0000
Subject: [PATCH] Angus's compile patch.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2618 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt2/ChangeLog         | 17 +++++++++++++++++
 src/frontends/qt2/QAbout.C          |  2 ++
 src/frontends/qt2/QCitationDialog.C |  2 +-
 src/frontends/qt2/QDocument.C       |  5 +++++
 src/frontends/qt2/QDocument.h       |  2 +-
 src/frontends/qt2/QLog.C            |  3 +++
 src/frontends/qt2/QPreambleDialog.C |  2 ++
 src/frontends/qt2/QToc.C            |  8 +++++---
 8 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index eb1d945d59..857a2a0395 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,20 @@
+2001-08-29  Angus Leeming  <a.leeming@ic.ac.uk>
+
+	* QAbout.C: added a using std::getline directive.
+
+	* QCitationDialog.C (doFind): removed const from argument to make it
+	consistent with the header file.
+
+	* QDocument.[Ch] (c-tor): moved declaration of into .C file. Compilation
+	was failing with "incomplete type is not allowed" in instantiation
+	of boost::scoped_ptr<QDocumentDialog> dialog_.
+
+	* QLog.C: added a couple of using std::xyz directives.
+
+	* QPreambleDialog.C: added a using std::getline directive.
+
+	* QToc.C: using SigC::slot directive.
+
 2001-08-29  Edwin Leuven  <leuven@fee.uva.nl>
 
 	* ui/QURLDialog.ui : minor layout tweak
diff --git a/src/frontends/qt2/QAbout.C b/src/frontends/qt2/QAbout.C
index e4a296ca3e..bfaa65f1bb 100644
--- a/src/frontends/qt2/QAbout.C
+++ b/src/frontends/qt2/QAbout.C
@@ -24,6 +24,8 @@
 #include "ControlAboutlyx.h"
 #include "QAbout.h"
 
+using std::getline;
+
 typedef Qt2CB<ControlAboutlyx, Qt2DB<QAboutDialog> > base_class;
 
 QAbout::QAbout(ControlAboutlyx & c) 
diff --git a/src/frontends/qt2/QCitationDialog.C b/src/frontends/qt2/QCitationDialog.C
index 1aefb79d0d..49e2505946 100644
--- a/src/frontends/qt2/QCitationDialog.C
+++ b/src/frontends/qt2/QCitationDialog.C
@@ -243,7 +243,7 @@ void QCitationDialog::slotNextClicked()
 }
 
 
-void QCitationDialog::doFind(biblio::Direction const dir)
+void QCitationDialog::doFind(biblio::Direction dir)
 {
 	biblio::InfoMap const & theMap = form_->controller().bibkeysInfo();
 	string const str = searchED->text().latin1();
diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C
index 1bf777f304..c2098c11f8 100644
--- a/src/frontends/qt2/QDocument.C
+++ b/src/frontends/qt2/QDocument.C
@@ -46,6 +46,11 @@ QDocument::QDocument(ControlDocument & c)
 	: base_class(c, _("Document Settings"))
 {
 }
+
+#else
+QDocument::QDocument(LyXView *, Dialogs *)
+{
+}
 #endif 
 
 
diff --git a/src/frontends/qt2/QDocument.h b/src/frontends/qt2/QDocument.h
index c58f4a5b89..4fce4481d7 100644
--- a/src/frontends/qt2/QDocument.h
+++ b/src/frontends/qt2/QDocument.h
@@ -33,7 +33,7 @@ class QDocument
 {
 public:
 	// FIXME!!!!!!! 
-	QDocument(LyXView *, Dialogs *) {};
+	QDocument(LyXView *, Dialogs *);
 private:
 	///
 	enum State {
diff --git a/src/frontends/qt2/QLog.C b/src/frontends/qt2/QLog.C
index 1df0d10cf2..079b53a1c7 100644
--- a/src/frontends/qt2/QLog.C
+++ b/src/frontends/qt2/QLog.C
@@ -24,6 +24,9 @@
 #include "QtLyXView.h"
 #include "ControlLog.h"
 
+using std::ifstream;
+using std::getline;
+
 typedef Qt2CB<ControlLog, Qt2DB<QLogDialog> > base_class;
 
 QLog::QLog(ControlLog & c)
diff --git a/src/frontends/qt2/QPreambleDialog.C b/src/frontends/qt2/QPreambleDialog.C
index dddc08635a..f7cceee21d 100644
--- a/src/frontends/qt2/QPreambleDialog.C
+++ b/src/frontends/qt2/QPreambleDialog.C
@@ -25,6 +25,8 @@
 #include "QtLyXView.h"
 #include "ControlPreamble.h" 
 
+using std::getline;
+
 QPreambleDialog::QPreambleDialog(QPreamble * form)
 	: QPreambleDialogBase(0, 0, false, 0),
 	form_(form)
diff --git a/src/frontends/qt2/QToc.C b/src/frontends/qt2/QToc.C
index 7d8cc5d212..4a3ac167d3 100644
--- a/src/frontends/qt2/QToc.C
+++ b/src/frontends/qt2/QToc.C
@@ -23,14 +23,16 @@
 #include "lyxfunc.h"
 #include "debug.h"
 
+#include <qlistview.h>
+#include <qcombobox.h>
+
 using std::vector;
 using std::pair;
 using std::stack;
 using std::endl;
+using SigC::slot;
+
 
-#include <qlistview.h>
-#include <qcombobox.h>
- 
 QToc::QToc(LyXView *v, Dialogs *d)
 	: dialog_(0), lv_(v), d_(d), inset_(0), h_(0), u_(0), ih_(0),
 	/*toclist(0),*/ depth(1)
-- 
2.39.2