Angus's compile patch.

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index eb1d945d59d64339867e4a38b6660e608fad8e5b..857a2a039540b9ae1a85d3a9d992384a68f6e708 100644 (file)
--- 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 e4a296ca3e9aa011e632ebecf43851db6f100ce5..bfaa65f1bbbbaeb309051ba19f132893ab2c00ca 100644 (file)
--- 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 1aefb79d0db413ac371923ae506f48277b83c66d..49e250594638afc32af5a5cc5f9643b20d9700ce 100644 (file)
--- 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 1bf777f30419aff0267fe5a138e376d15a61cc4e..c2098c11f84771ffa940d021db69bacdb8e651cb 100644 (file)
--- 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 c58f4a5b89ffbad09cb18b0a893972b08c106926..4fce4481d7d4c4cb1686e353320083673268f42d 100644 (file)
--- 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 1df0d10cf22a75d0cf4c32374238a0b76fb86982..079b53a1c7d76d73794ba479b4cb408a5d968ea9 100644 (file)
--- 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 dddc08635add6341cd713d204f2db98cc88cafa8..f7cceee21dd76ee028877f37857800d2d02491f3 100644 (file)
--- 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 7d8cc5d212d6814491af57db2b53da8fab20111d..4a3ac167d317a4ece93dc8930e66f80e5edeb917 100644 (file)
--- 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)