From 6528d97d0eac480008930a28700c6e65d84e3b30 Mon Sep 17 00:00:00 2001 From: John Levon Date: Sat, 7 Dec 2002 18:09:39 +0000 Subject: [PATCH] fix some connectinos hopefully git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5785 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 8 ++++++++ src/frontends/qt2/QDelimiterDialog.C | 4 ++-- src/frontends/qt2/QDelimiterDialog.h | 4 ++-- src/frontends/qt2/QMathDialog.C | 2 +- src/frontends/qt2/QMathDialog.h | 4 ++-- src/frontends/qt2/iconpalette.h | 2 +- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index bfaa9fbedd..fedd41dbb2 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,11 @@ +2002-12-07 John Levon + + * QDelimiterDialog.C: + * QDelimiterDialog.h: + * QMathDialog.C: + * QMathDialog.h: + * iconpalette.h: fix connections for Qt 3, hopefully + 2002-12-05 John Levon * QContentPane.C: set I-beam cursor diff --git a/src/frontends/qt2/QDelimiterDialog.C b/src/frontends/qt2/QDelimiterDialog.C index 8de79d376d..f9823b82ec 100644 --- a/src/frontends/qt2/QDelimiterDialog.C +++ b/src/frontends/qt2/QDelimiterDialog.C @@ -90,8 +90,8 @@ QDelimiterDialog::QDelimiterDialog(QMath * form) leftIP->add(QPixmap(empty_xpm.c_str()), "empty", "empty"); rightIP->add(QPixmap(empty_xpm.c_str()), "empty", "empty"); - connect(leftIP, SIGNAL(button_clicked(string const &)), this, SLOT(ldelim_clicked(string const &))); - connect(rightIP, SIGNAL(button_clicked(string const &)), this, SLOT(rdelim_clicked(string const &))); + 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 &))); ldelim_clicked("("); rdelim_clicked(")"); } diff --git a/src/frontends/qt2/QDelimiterDialog.h b/src/frontends/qt2/QDelimiterDialog.h index 0fbdbe3bf4..662fe6d3d3 100644 --- a/src/frontends/qt2/QDelimiterDialog.h +++ b/src/frontends/qt2/QDelimiterDialog.h @@ -28,8 +28,8 @@ class QDelimiterDialog : public QDelimiterDialogBase { public: QDelimiterDialog(QMath * form); public slots: - void ldelim_clicked(string const & str); - void rdelim_clicked(string const & str); + void ldelim_clicked(const string & str); + void rdelim_clicked(const string & str); void insertClicked(); protected: //needed ? virtual void closeEvent(QCloseEvent * e); diff --git a/src/frontends/qt2/QMathDialog.C b/src/frontends/qt2/QMathDialog.C index f3e8496ca8..a37b3720f8 100644 --- a/src/frontends/qt2/QMathDialog.C +++ b/src/frontends/qt2/QMathDialog.C @@ -183,7 +183,7 @@ IconPalette * QMathDialog::makePanel(QWidget * parent, char const ** entries) for (int i = 0; *entries[i]; ++i) { p->add(QPixmap(find_xpm(entries[i]).c_str()), entries[i], string("\\") + entries[i]); } - connect(p, SIGNAL(button_clicked(string const &)), this, SLOT(symbol_clicked(string const &))); + connect(p, SIGNAL(button_clicked(const string &)), this, SLOT(symbol_clicked(const string &))); return p; } diff --git a/src/frontends/qt2/QMathDialog.h b/src/frontends/qt2/QMathDialog.h index fdf4763ab1..96c9c2f747 100644 --- a/src/frontends/qt2/QMathDialog.h +++ b/src/frontends/qt2/QMathDialog.h @@ -31,12 +31,12 @@ public slots: virtual void delimiterClicked(); virtual void expandClicked(); virtual void fracClicked(); - virtual void functionSelected(QString const &); + virtual void functionSelected(const QString &); virtual void matrixClicked(); virtual void subscriptClicked(); virtual void superscriptClicked(); virtual void equationClicked(); - void symbol_clicked(string const & str); + void symbol_clicked(const string &); void insertSpace(int id); void insertRoot(int id); void insertStyle(int id); diff --git a/src/frontends/qt2/iconpalette.h b/src/frontends/qt2/iconpalette.h index 7f1b9d9ee9..ebeb312e0d 100644 --- a/src/frontends/qt2/iconpalette.h +++ b/src/frontends/qt2/iconpalette.h @@ -36,7 +36,7 @@ public: /// add a button void add(QPixmap const & pixmap, string name, string tooltip); signals: - void button_clicked(string const &); + void button_clicked(const string &); protected: virtual void resizeEvent(QResizeEvent * e); protected slots: -- 2.39.2