Make symbol insertion / delimiters work for Qt again

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index c0ec88ef7940e521c8884b5eae0a04be8b42dfe4..9cf54c3bd1ae17eeb97209c3eae8566dfc573e7d 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-18  John Levon  <levon@movementarian.org>
+
+       * QDelimiterDialog.C:
+       * QMathDialog.C: make button callbacks work again
+
+       * README: add a warning
+
 2004-04-13  Angus Leeming  <leeming@lyx.org>
 
        * ui/QExternalDialogBase.ui:

diff --git a/src/frontends/qt2/QDelimiterDialog.C b/src/frontends/qt2/QDelimiterDialog.C
index 056f19b3ba696f3bba13a08bf497ddf9d6dc6ca0..fea71f48185aed44a97a64c7d992469d91d052fb 100644 (file)
--- a/src/frontends/qt2/QDelimiterDialog.C
+++ b/src/frontends/qt2/QDelimiterDialog.C
@@ -86,8 +86,11 @@ QDelimiterDialog::QDelimiterDialog(QMathDelimiter * form)
 
        leftIP->add(QPixmap(toqstr(empty_xpm)), "empty", "empty");
        rightIP->add(QPixmap(toqstr(empty_xpm)), "empty", "empty");
-       connect(leftIP, SIGNAL(button_clicked(const string &)), this, SLOT(ldelim_clicked(const string &)));
-       connect(rightIP, SIGNAL(button_clicked(const string &)), this, SLOT(rdelim_clicked(const string &)));
+       // Leave these std:: qualifications alone !
+       connect(leftIP, SIGNAL(button_clicked(const std::string &)),
+               this, SLOT(ldelim_clicked(const std::string &)));
+       connect(rightIP, SIGNAL(button_clicked(const std::string &)),
+               this, SLOT(rdelim_clicked(const std::string &)));
        ldelim_clicked("(");
        rdelim_clicked(")");
 }

diff --git a/src/frontends/qt2/QMathDialog.C b/src/frontends/qt2/QMathDialog.C
index 897eec9ae9c3f26243dfc6273863801c6903ba12..933b9057a8940d8da5a0892a20d6233bc6828dd9 100644 (file)
--- a/src/frontends/qt2/QMathDialog.C
+++ b/src/frontends/qt2/QMathDialog.C
@@ -169,7 +169,9 @@ IconPalette * QMathDialog::makePanel(QWidget * parent, char const ** entries)
        for (int i = 0; *entries[i]; ++i) {
                p->add(QPixmap(toqstr(find_xpm(entries[i]))), entries[i], string("\\") + entries[i]);
        }
-       connect(p, SIGNAL(button_clicked(const string &)), this, SLOT(symbol_clicked(const string &)));
+       // Leave these std:: qualifications alone !
+       connect(p, SIGNAL(button_clicked(const std::string &)),
+               this, SLOT(symbol_clicked(const std::string &)));
 
        return p;
 }

diff --git a/src/frontends/qt2/README b/src/frontends/qt2/README
index aa7e0e485b11075b43621b9e6b917210975e0e4f..14ddede18675e5afed656a663515b9d7d6b81cce 100644 (file)
--- a/src/frontends/qt2/README
+++ b/src/frontends/qt2/README
@@ -18,6 +18,9 @@ constructor, and use _("..."). Non-trivial means that things like "OK"
 *DO NOT USE DESIGNER FROM Qt 3*. You must use a designer from Qt 2 to
 maintain compatibility.
 
+moc is incredibly stupid and sometimes you need a fully qualified
+"std::string" for .connect() statements to work. Be very, very careful.
+
 Remember to check tab order on a dialog (third icon, with blue bars in designer).
 
 Remember to check sensible resizing behaviour on a dialog.