From 3f967eb9bde6a8d5e1a5980ad4cdc9fd0d3af3ab Mon Sep 17 00:00:00 2001
From: Angus Leeming <leeming@lyx.org>
Date: Wed, 24 Jul 2002 07:35:59 +0000
Subject: [PATCH] Trivial compilation fixes.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4769 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt2/ChangeLog            | 15 +++++++++++++++
 src/frontends/qt2/FileDialog_private.C |  2 +-
 src/frontends/qt2/QBibtex.C            |  4 +++-
 src/frontends/qt2/QBibtexDialog.C      |  2 +-
 src/frontends/qt2/QCommandBuffer.C     |  6 ++++--
 src/frontends/qt2/QTexinfo.h           |  6 +++---
 6 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index eb9ab0574a..0f7de6287b 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,18 @@
+2002-07-24  Angus Leeming  <leeming@lyx.org>
+
+	* FileDialog_private.C (done): add a false to the arguments passed to
+	getLyXFunc.
+
+	* QBibtex.C:
+	* QCommandBuffer.C: add a using std::vector directive.
+
+	* QBibtexDialog.C: s/<vector.h>/<vector>/
+
+	* QCommandBuffer.C: remove trailing semi-colon at the end of the
+	namespace scope.
+
+	* QTexinfo.h: s/vector<string>/std::vector<string>/
+
 2002-07-23  Edwin Leuven <leuven@fee.uva.nl>
 
 	* QBibtex.C: syle combobox instead of listbox
diff --git a/src/frontends/qt2/FileDialog_private.C b/src/frontends/qt2/FileDialog_private.C
index 313b80f5c0..4a90977dc8 100644
--- a/src/frontends/qt2/FileDialog_private.C
+++ b/src/frontends/qt2/FileDialog_private.C
@@ -34,7 +34,7 @@ void LyXFileDialog::done(int what)
 		QDialog::done(what);
 		return;
 	} else if (what == QDialog::Accepted) {
-		lv_->getLyXFunc()->dispatch(action_, selectedFile().data());
+		lv_->getLyXFunc()->dispatch(action_, selectedFile().data(), false);
 	}
 
 	delete this;
diff --git a/src/frontends/qt2/QBibtex.C b/src/frontends/qt2/QBibtex.C
index 44cfe20231..efd89f45ea 100644
--- a/src/frontends/qt2/QBibtex.C
+++ b/src/frontends/qt2/QBibtex.C
@@ -24,7 +24,9 @@
 #include "QBibtexDialog.h"
 #include "QBibtex.h"
 #include "Qt2BC.h"
- 
+
+using std::vector;
+
 typedef Qt2CB<ControlBibtex, Qt2DB<QBibtexDialog> > base_class;
 
 QBibtex::QBibtex(ControlBibtex & c, Dialogs &)
diff --git a/src/frontends/qt2/QBibtexDialog.C b/src/frontends/qt2/QBibtexDialog.C
index 191140863b..966c143e2f 100644
--- a/src/frontends/qt2/QBibtexDialog.C
+++ b/src/frontends/qt2/QBibtexDialog.C
@@ -7,7 +7,7 @@
  */
 
 #include <config.h>
-#include <vector.h> 
+#include <vector> 
 #include "ControlBibtex.h"
 #include "gettext.h"
 #include "debug.h"
diff --git a/src/frontends/qt2/QCommandBuffer.C b/src/frontends/qt2/QCommandBuffer.C
index 8288924328..7aef1cc1f8 100644
--- a/src/frontends/qt2/QCommandBuffer.C
+++ b/src/frontends/qt2/QCommandBuffer.C
@@ -19,7 +19,9 @@
 #include <qcombobox.h>
 #include <qtoolbutton.h>
 #include <qpixmap.h>
- 
+
+using std::vector;
+
 namespace {
  
 class QTempComboBox : public QComboBox {
@@ -31,7 +33,7 @@ public:
 	void popup() { QComboBox::popup(); }
 };
 
-};
+}
  
 QCommandBuffer::QCommandBuffer(QtView * view, ControlCommandBuffer & control)
 	: QToolBar(view), view_(view), controller_(control)
diff --git a/src/frontends/qt2/QTexinfo.h b/src/frontends/qt2/QTexinfo.h
index 68a1169c59..1e1daf5101 100644
--- a/src/frontends/qt2/QTexinfo.h
+++ b/src/frontends/qt2/QTexinfo.h
@@ -45,11 +45,11 @@ private:
 	///
 	ControlTexinfo::texFileSuffix activeStyle;
 	///
-	vector<string> cls_;
+	std::vector<string> cls_;
 	///
-	vector<string> sty_;
+	std::vector<string> sty_;
 	///
-	vector<string> bst_;
+	std::vector<string> bst_;
 };
 
 #endif // QTEXINFO_H
-- 
2.39.2