angus' patch

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index b8e6ad461783d2d029b5ad06579eafea6ddbdaaf..e6cea762c999bf8726d93d8f057a0c049dc0d6df 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,13 @@
+2002-01-25  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * Dialogs.C: removed now redundant #include "QParagraph.h".
+
+       * QSearchDialog.h (remember): removed unnecessary
+       QSearchDialog qualifier.
+
+       * QTexinfo.C:
+       * QToc.C: added various using std::xyz directives.
+
 2002-01-25  Edwin Leuven  <leuven@fee.uva.nl>
 
        * Makefile.am:

diff --git a/src/frontends/qt2/Dialogs.C b/src/frontends/qt2/Dialogs.C
index 981fec2811ac77e0ef7dbd9c1cfd9d280c7aa303..30880a906685e460a0d01b5b4493a82a75ebc7e6 100644 (file)
--- a/src/frontends/qt2/Dialogs.C
+++ b/src/frontends/qt2/Dialogs.C
@@ -52,7 +52,6 @@
 #include "QIndex.h"
 #include "QLog.h"
 #include "QMinipage.h"
-#include "QParagraph.h"
 #include "QPreamble.h"
 #include "QPrint.h"
 #include "QRef.h"

diff --git a/src/frontends/qt2/QSearchDialog.h b/src/frontends/qt2/QSearchDialog.h
index 00f59a833f44470c7b588cac00b110103b568e8d..38b6e8cc607678e50d55a1b45687a01302834c5a 100644 (file)
--- a/src/frontends/qt2/QSearchDialog.h
+++ b/src/frontends/qt2/QSearchDialog.h
@@ -34,7 +34,7 @@ protected:
 
 private:
        // add a string to the combo if needed
-       void QSearchDialog::remember(string const & find, QComboBox & combo);
+       void remember(string const & find, QComboBox & combo);
  
        QSearch * form_;
 

diff --git a/src/frontends/qt2/QTexinfo.C b/src/frontends/qt2/QTexinfo.C
index 012f9ee57214d96ef94dc48b008ff5dfced192d4..504c5fbc3223e89c5ac0b3e3c93141285c0a861c 100644 (file)
--- a/src/frontends/qt2/QTexinfo.C
+++ b/src/frontends/qt2/QTexinfo.C
@@ -25,6 +25,8 @@
 #include <qpushbutton.h>
 #include <qcheckbox.h>
 
+using std::vector;
+
 typedef Qt2CB<ControlTexinfo, Qt2DB<QTexinfoDialog> > base_class;
  
 QTexinfo::QTexinfo(ControlTexinfo & c)

diff --git a/src/frontends/qt2/QToc.C b/src/frontends/qt2/QToc.C
index 84acd10baffe363a28900a2e7f528108d6ad2a34..50d8042c425d99686073749850d39ca3f3149755 100644 (file)
--- a/src/frontends/qt2/QToc.C
+++ b/src/frontends/qt2/QToc.C
@@ -28,6 +28,9 @@
 
 #include "QtLyXView.h"
  
+using std::endl;
+using std::pair;
+using std::stack;
 using std::vector;
  
 typedef Qt2CB<ControlToc, Qt2DB<QTocDialog> > base_class;