Compile fixes following Alfredo's setTitle changes.

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index d8045e09ae878f1d763220c51738fa1a18318197..0ce7139e2f4595eeb66a6f7b861681d9a993e121 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,23 @@
+2003-05-22  Angus Leeming  <leeming@lyx.org>
+
+       compile fixes.
+       * QDialogView.h: QController and QView c-tors take a string not a
+       QString.
+       * Qt2Base.h: ditto for the Qt2DB and Qt2CB c-tors.
+
+       * QDocument.C (c-tor):
+       * QPrefs.C (c-tor):
+       * QPrint.C (c-tor):
+       * QSearch.C (c-tor):
+       * QSendto.C (c-tor):
+       * QSpellchecker.C (c-tor):
+       * QTexinfo.C (c-tor): pass a string not a QString to the base class.
+
+       * QIndex.[Ch](c-tor): pass it a string, not a QString.
+
+       * Dialogs.C (build): the title passed to the Index dialog is a string,
+       not a QString.
+
 2003-05-21  Alfredo Braunstein  <abraunst@libero.it>
 
        * Qt2Base.[Ch]:

diff --git a/src/frontends/qt2/Dialogs.C b/src/frontends/qt2/Dialogs.C
index df632ca0572b9ea95c55cb26f9c637e7483162e5..a1e67661b0738bbbca31d2e81d5d71f8bb20fd1f 100644 (file)
--- a/src/frontends/qt2/Dialogs.C
+++ b/src/frontends/qt2/Dialogs.C
@@ -179,13 +179,13 @@ Dialog * Dialogs::build(string const & name)
        } else if (name == "index") {
                dialog->setController(new ControlCommand(*dialog, name));
                dialog->setView(new QIndex(*dialog,
-                                          qt_("LyX: Index Entry"),
+                                          _("LyX: Index Entry"),
                                           qt_("&Keyword")));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        } else if (name == "label") {
                dialog->setController(new ControlCommand(*dialog, name));
                dialog->setView(new QIndex(*dialog,
-                                          qt_("LyX: Label"),
+                                          _("LyX: Label"),
                                           qt_("&Label")));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        } else if (name == "log") {

diff --git a/src/frontends/qt2/QDialogView.h b/src/frontends/qt2/QDialogView.h
index 103078b895d469bcaa2df089e05db5b1fd8c303e..cf59c8fac525434854ef7edefe83cd150e601a52 100644 (file)
--- a/src/frontends/qt2/QDialogView.h
+++ b/src/frontends/qt2/QDialogView.h
@@ -83,7 +83,7 @@ private:
 template <class GUIDialog>
 class QView: public QDialogView {
 protected:
-       QView(Dialog &, QString const &);
+       QView(Dialog &, string const &);
 
        /// update the dialog
        virtual void update();
@@ -101,7 +101,7 @@ protected:
 
 
 template <class GUIDialog>
-QView<GUIDialog>::QView(Dialog & p, QString const & t)
+QView<GUIDialog>::QView(Dialog & p, string const & t)
        : QDialogView(p, t)
 {}
 
@@ -149,7 +149,7 @@ class QController: public Base
 {
 protected:
        ///
-       QController(Dialog &, QString const &);
+       QController(Dialog &, string const &);
 public:
        /// The parent controller
        Controller & controller();
@@ -159,7 +159,7 @@ public:
 
 
 template <class Controller, class Base>
-QController<Controller, Base>::QController(Dialog & p, QString const & t)
+QController<Controller, Base>::QController(Dialog & p, string const & t)
        : Base(p, t)
 {}
 

diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C
index 1f23e20f9eb7e8c9d3a2cf01b7c7311f9e14a7dd..7951a4ba1d4be1adbe152b51e0ebcd81e4eb143c 100644 (file)
--- a/src/frontends/qt2/QDocument.C
+++ b/src/frontends/qt2/QDocument.C
@@ -52,7 +52,7 @@ typedef Qt2CB<ControlDocument, Qt2DB<QDocumentDialog> > base_class;
 
 
 QDocument::QDocument()
-       : base_class(qt_("LyX: Document Settings"))
+       : base_class(_("LyX: Document Settings"))
 {
        vector<frnt::LanguagePair> const langs = frnt::getLanguageData(false);
        lang_ = getSecond(langs);

diff --git a/src/frontends/qt2/QIndex.C b/src/frontends/qt2/QIndex.C
index 0f5e01aaca6e17e6ffd9040c3569a6e9dc8abc9c..77d129aa19719349c86df181c3ec9fd2331b05bd 100644 (file)
--- a/src/frontends/qt2/QIndex.C
+++ b/src/frontends/qt2/QIndex.C
@@ -25,7 +25,7 @@
 typedef QController<ControlCommand, QView<QIndexDialog> > base_class;
 
 
-QIndex::QIndex(Dialog & parent, QString const & title, QString const & label)
+QIndex::QIndex(Dialog & parent, string const & title, QString const & label)
        : base_class(parent, title), label_(label)
 {
 }

diff --git a/src/frontends/qt2/QIndex.h b/src/frontends/qt2/QIndex.h
index 88e2c1b835dc22bc744d302ed24aa7242138590c..445a1f7a4f5d15a629c0734ebf943e4b577f3765 100644 (file)
--- a/src/frontends/qt2/QIndex.h
+++ b/src/frontends/qt2/QIndex.h
@@ -26,7 +26,7 @@ class QIndex :
 public:
        friend class QIndexDialog;
 
-       QIndex(Dialog &, QString const & title, QString const & label);
+       QIndex(Dialog &, string const & title, QString const & label);
 protected:
        virtual bool isValid();
 private:

diff --git a/src/frontends/qt2/QPrefs.C b/src/frontends/qt2/QPrefs.C
index 71394057b6af9c6db2d316504f9e5d209fd7a5ec..a4faff8e5e8025d28bc91ae6d7775e46547da0cd 100644 (file)
--- a/src/frontends/qt2/QPrefs.C
+++ b/src/frontends/qt2/QPrefs.C
@@ -64,7 +64,7 @@ typedef Qt2CB<ControlPrefs, Qt2DB<QPrefsDialog> > base_class;
 
 
 QPrefs::QPrefs()
-       : base_class(qt_("LyX: Preferences"))
+       : base_class(_("LyX: Preferences"))
 {
 }
 

diff --git a/src/frontends/qt2/QPrint.C b/src/frontends/qt2/QPrint.C
index 8c9a4f7792237fb22eb3aa5432d3df8080b3ae91..5a7925f3f489607773dca0ecbba165869257a804 100644 (file)
--- a/src/frontends/qt2/QPrint.C
+++ b/src/frontends/qt2/QPrint.C
@@ -33,7 +33,7 @@ typedef Qt2CB<ControlPrint, Qt2DB<QLPrintDialog> > base_class;
 
 
 QPrint::QPrint()
-       : base_class(qt_("LyX: Print Document"))
+       : base_class(_("LyX: Print Document"))
 {
 }
 

diff --git a/src/frontends/qt2/QSearch.C b/src/frontends/qt2/QSearch.C
index 72669f9e8131b195f4841a430fffc232f0b06680..284483ef5f4be2357e21c7ea5ae6ee4b690ca03e 100644 (file)
--- a/src/frontends/qt2/QSearch.C
+++ b/src/frontends/qt2/QSearch.C
@@ -28,7 +28,7 @@ typedef Qt2CB<ControlSearch, Qt2DB<QSearchDialog> > base_class;
 
 
 QSearch::QSearch()
-       : base_class(qt_("LyX: Find and Replace"))
+       : base_class(_("LyX: Find and Replace"))
 {
 }
 

diff --git a/src/frontends/qt2/QSendto.C b/src/frontends/qt2/QSendto.C
index ba60678a9db3f28b519ffe5b11cf191b71b64b68..4d05068f08264a5b12b32fd387b4056951be242c 100644 (file)
--- a/src/frontends/qt2/QSendto.C
+++ b/src/frontends/qt2/QSendto.C
@@ -31,7 +31,7 @@ typedef Qt2CB<ControlSendto, Qt2DB<QSendtoDialog> > base_class;
 
 
 QSendto::QSendto()
-       : base_class(qt_("LyX: Send Document to Command"))
+       : base_class(_("LyX: Send Document to Command"))
 {
 }
 

diff --git a/src/frontends/qt2/QSpellchecker.C b/src/frontends/qt2/QSpellchecker.C
index cde1c18209bc8d727ba130124fe1f39ee865bccf..05ac31554b0361fdfa4f849a861be7cc35a01ee6 100644 (file)
--- a/src/frontends/qt2/QSpellchecker.C
+++ b/src/frontends/qt2/QSpellchecker.C
@@ -29,7 +29,7 @@ typedef Qt2CB<ControlSpellchecker, Qt2DB<QSpellcheckerDialog> > base_class;
 
 
 QSpellchecker::QSpellchecker()
-       : base_class(qt_("LyX: Spell-check Document"))
+       : base_class(_("LyX: Spell-check Document"))
 {
 }
 

diff --git a/src/frontends/qt2/QTexinfo.C b/src/frontends/qt2/QTexinfo.C
index 38338438184a7ff7b4c091f538818d96280d09db..f256e328934a6a0bd63ab8969c41759939065502 100644 (file)
--- a/src/frontends/qt2/QTexinfo.C
+++ b/src/frontends/qt2/QTexinfo.C
@@ -30,7 +30,7 @@ typedef Qt2CB<ControlTexinfo, Qt2DB<QTexinfoDialog> > base_class;
 
 
 QTexinfo::QTexinfo()
-       : base_class(qt_("LyX: LaTeX Information")),
+       : base_class(_("LyX: LaTeX Information")),
          warningPosted(false), activeStyle(ControlTexinfo::cls)
 {
 }

diff --git a/src/frontends/qt2/Qt2Base.h b/src/frontends/qt2/Qt2Base.h
index 2c88f595c7de65af0426c5c32ba18e36f417f3b6..027911319f1485e35a55388626eaaa2055a9b2ed 100644 (file)
--- a/src/frontends/qt2/Qt2Base.h
+++ b/src/frontends/qt2/Qt2Base.h
@@ -79,7 +79,7 @@ private:
 template <class Dialog>
 class Qt2DB: public Qt2Base {
 protected:
-       Qt2DB(QString const &);
+       Qt2DB(string const &);
 
        /// update the dialog
        virtual void update();
@@ -97,7 +97,7 @@ protected:
 
 
 template <class Dialog>
-Qt2DB<Dialog>::Qt2DB(QString const & t)
+Qt2DB<Dialog>::Qt2DB(string const & t)
        : Qt2Base(t)
 {}
 
@@ -155,12 +155,12 @@ public:
 
 protected:
        ///
-       Qt2CB(QString const &);
+       Qt2CB(string const &);
 };
 
 
 template <class Controller, class Base>
-Qt2CB<Controller, Base>::Qt2CB(QString const & t)
+Qt2CB<Controller, Base>::Qt2CB(string const & t)
        : Base(t)
 {}