From f63d0e05df40d036afa954a0677afa3e06d96e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Thu, 26 Apr 2007 07:12:31 +0000 Subject: [PATCH] fix problem reported by Uwe git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18029 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/QBox.cpp | 4 ++-- src/frontends/qt4/QExternal.cpp | 26 +++++++++++++------------- src/frontends/qt4/QGraphicsDialog.cpp | 12 ++++++------ src/frontends/qt4/QTabular.cpp | 8 ++++---- src/frontends/qt4/QVSpace.cpp | 2 +- src/frontends/qt4/QWrap.cpp | 2 +- src/frontends/qt4/TocWidget.cpp | 6 ++---- 7 files changed, 29 insertions(+), 31 deletions(-) diff --git a/src/frontends/qt4/QBox.cpp b/src/frontends/qt4/QBox.cpp index f946716f40..2987688fa1 100644 --- a/src/frontends/qt4/QBox.cpp +++ b/src/frontends/qt4/QBox.cpp @@ -60,13 +60,13 @@ QBoxDialog::QBoxDialog(QBox * form) connect(widthED, SIGNAL(textChanged(const QString &)), this, SLOT(change_adaptor())); - connect(widthUnitsLC, SIGNAL(selectionChanged(LyXLength::UNIT)), + connect(widthUnitsLC, SIGNAL(selectionChanged(lyx::LyXLength::UNIT)), this, SLOT(change_adaptor())); connect(valignCO, SIGNAL(highlighted(const QString &)), this, SLOT(change_adaptor())); connect(heightED, SIGNAL(textChanged(const QString &)), this, SLOT(change_adaptor())); - connect(heightUnitsLC, SIGNAL(selectionChanged(LyXLength::UNIT) ), + connect(heightUnitsLC, SIGNAL(selectionChanged(lyx::LyXLength::UNIT) ), this, SLOT(change_adaptor())); connect(restorePB, SIGNAL(clicked()), this, SLOT(restoreClicked())); connect(typeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); diff --git a/src/frontends/qt4/QExternal.cpp b/src/frontends/qt4/QExternal.cpp index 27658816cd..0d9e29aa9a 100644 --- a/src/frontends/qt4/QExternal.cpp +++ b/src/frontends/qt4/QExternal.cpp @@ -87,35 +87,35 @@ QExternalDialog::QExternalDialog(QExternal * form) this, SLOT(browseClicked())); connect(editPB, SIGNAL(clicked()), this, SLOT(editClicked())); - connect(externalCO, SIGNAL(activated(const QString&)), + connect(externalCO, SIGNAL(activated(const QString &)), this, SLOT(templateChanged())); - connect(extraED, SIGNAL(textChanged(const QString&)), + connect(extraED, SIGNAL(textChanged(const QString &)), this, SLOT(extraChanged(const QString&))); - connect(extraFormatCO, SIGNAL(activated(const QString&)), + connect(extraFormatCO, SIGNAL(activated(const QString &)), this, SLOT(formatChanged(const QString&))); connect(widthUnitCO, SIGNAL(activated(int)), this, SLOT(widthUnitChanged())); - connect(heightUnitCO, SIGNAL(selectionChanged(LyXLength::UNIT)), + connect(heightUnitCO, SIGNAL(selectionChanged(lyx::LyXLength::UNIT)), this, SLOT(change_adaptor())); connect(displayCB, SIGNAL(stateChanged(int)), this, SLOT(change_adaptor())); - connect(displayscaleED, SIGNAL(textChanged(const QString&)), + connect(displayscaleED, SIGNAL(textChanged(const QString &)), this, SLOT(change_adaptor())); - connect(angleED, SIGNAL(textChanged(const QString&)), + connect(angleED, SIGNAL(textChanged(const QString &)), this, SLOT(change_adaptor())); - connect(widthED, SIGNAL(textChanged(const QString&)), + connect(widthED, SIGNAL(textChanged(const QString &)), this, SLOT(sizeChanged())); - connect(heightED, SIGNAL(textChanged(const QString&)), + connect(heightED, SIGNAL(textChanged(const QString &)), this, SLOT(sizeChanged())); - connect(fileED, SIGNAL(textChanged(const QString&)), + connect(fileED, SIGNAL(textChanged(const QString &)), this, SLOT(change_adaptor())); connect(clipCB, SIGNAL(stateChanged(int)), this, SLOT(change_adaptor())); connect(getbbPB, SIGNAL(clicked()), this, SLOT(getbbClicked())); - connect(xrED, SIGNAL(textChanged(const QString&)), this, SLOT(bbChanged())); - connect(ytED, SIGNAL(textChanged(const QString&)), this, SLOT(bbChanged())); - connect(xlED, SIGNAL(textChanged(const QString&)), this, SLOT(bbChanged())); - connect(ybED, SIGNAL(textChanged(const QString&)), this, SLOT(bbChanged())); + connect(xrED, SIGNAL(textChanged(const QString &)), this, SLOT(bbChanged())); + connect(ytED, SIGNAL(textChanged(const QString &)), this, SLOT(bbChanged())); + connect(xlED, SIGNAL(textChanged(const QString &)), this, SLOT(bbChanged())); + connect(ybED, SIGNAL(textChanged(const QString &)), this, SLOT(bbChanged())); connect(draftCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); QIntValidator * validator = new QIntValidator(displayscaleED); diff --git a/src/frontends/qt4/QGraphicsDialog.cpp b/src/frontends/qt4/QGraphicsDialog.cpp index 3aaaebcba3..1541c72b55 100644 --- a/src/frontends/qt4/QGraphicsDialog.cpp +++ b/src/frontends/qt4/QGraphicsDialog.cpp @@ -53,29 +53,29 @@ QGraphicsDialog::QGraphicsDialog(QGraphics * form) form, SLOT(slotRestore())); //graphics pane - connect(filename, SIGNAL(textChanged(const QString&)), + connect(filename, SIGNAL(textChanged(const QString &)), this, SLOT(change_adaptor())); connect(WidthCB, SIGNAL( clicked()), this, SLOT(change_adaptor())); connect(HeightCB, SIGNAL( clicked()), this, SLOT(change_adaptor())); - connect(Width, SIGNAL(textChanged(const QString&)), + connect(Width, SIGNAL(textChanged(const QString &)), this, SLOT(change_adaptor())); - connect(Height, SIGNAL(textChanged(const QString&)), + connect(Height, SIGNAL(textChanged(const QString &)), this, SLOT(change_adaptor())); - connect(heightUnit, SIGNAL(selectionChanged(LyXLength::UNIT)), + connect(heightUnit, SIGNAL(selectionChanged(lyx::LyXLength::UNIT)), this, SLOT(change_adaptor())); connect(widthUnit, SIGNAL(selectionChanged(lyx::LyXLength::UNIT)), this, SLOT(change_adaptor())); connect(aspectratio, SIGNAL(stateChanged(int)), this, SLOT(change_adaptor())); - connect(angle, SIGNAL(textChanged(const QString&)), + connect(angle, SIGNAL(textChanged(const QString &)), this, SLOT(change_adaptor())); connect(origin, SIGNAL(activated(int)), this, SLOT(change_adaptor())); connect(scaleCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); - connect(Scale, SIGNAL(textChanged(const QString&)), + connect(Scale, SIGNAL(textChanged(const QString &)), this, SLOT(change_adaptor())); filename->setValidator(new PathValidator(true, filename)); diff --git a/src/frontends/qt4/QTabular.cpp b/src/frontends/qt4/QTabular.cpp index 8ea05404d6..9a648a528d 100644 --- a/src/frontends/qt4/QTabular.cpp +++ b/src/frontends/qt4/QTabular.cpp @@ -56,17 +56,17 @@ QTabularDialog::QTabularDialog(QTabular * form) connect(topspaceED, SIGNAL(returnPressed()), this, SLOT(topspace_changed())); - connect(topspaceUnit, SIGNAL(selectionChanged(LyXLength::UNIT)), + connect(topspaceUnit, SIGNAL(selectionChanged(lyx::LyXLength::UNIT)), this, SLOT(topspace_changed())); connect(topspaceCO, SIGNAL(activated(int)), this, SLOT(topspace_changed())); connect(bottomspaceED, SIGNAL(returnPressed()), this, SLOT(bottomspace_changed())); - connect(bottomspaceUnit, SIGNAL(selectionChanged(LyXLength::UNIT)), + connect(bottomspaceUnit, SIGNAL(selectionChanged(lyx::LyXLength::UNIT)), this, SLOT(bottomspace_changed())); connect(bottomspaceCO, SIGNAL(activated(int)), this, SLOT(bottomspace_changed())); connect(interlinespaceED, SIGNAL(returnPressed()), this, SLOT(interlinespace_changed())); - connect(interlinespaceUnit, SIGNAL(selectionChanged(LyXLength::UNIT)), + connect(interlinespaceUnit, SIGNAL(selectionChanged(lyx::LyXLength::UNIT)), this, SLOT(interlinespace_changed())); connect(interlinespaceCO, SIGNAL(activated(int)), this, SLOT(interlinespace_changed())); connect(booktabsRB, SIGNAL(clicked(bool)), this, SLOT(booktabsChanged(bool))); @@ -95,7 +95,7 @@ QTabularDialog::QTabularDialog(QTabular * form) connect(lastfooterNoContentsCB, SIGNAL(clicked()), this, SLOT(ltLastFooterEmpty_clicked())); connect(specialAlignmentED, SIGNAL(returnPressed()), this, SLOT(specialAlignment_changed())); connect(widthED, SIGNAL(returnPressed()), this, SLOT(width_changed())); - connect(widthUnit, SIGNAL(selectionChanged(LyXLength::UNIT)), this, SLOT(width_changed())); + connect(widthUnit, SIGNAL(selectionChanged(lyx::LyXLength::UNIT)), this, SLOT(width_changed())); connect(closePB, SIGNAL(clicked()), this, SLOT(close_clicked())); connect(borders, SIGNAL(topSet(bool)), this, SLOT(topBorder_changed())); connect(borders, SIGNAL(bottomSet(bool)), this, SLOT(bottomBorder_changed())); diff --git a/src/frontends/qt4/QVSpace.cpp b/src/frontends/qt4/QVSpace.cpp index e7d0c48931..7ca55ad9d8 100644 --- a/src/frontends/qt4/QVSpace.cpp +++ b/src/frontends/qt4/QVSpace.cpp @@ -69,7 +69,7 @@ QVSpaceDialog::QVSpaceDialog(QVSpace * form) this, SLOT(enableCustom(int))); connect(keepCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); - connect(unitCO, SIGNAL(selectionChanged(LyXLength::UNIT)), + connect(unitCO, SIGNAL(selectionChanged(lyx::LyXLength::UNIT)), this, SLOT(change_adaptor())); valueLE->setValidator(unsignedLengthValidator(valueLE)); diff --git a/src/frontends/qt4/QWrap.cpp b/src/frontends/qt4/QWrap.cpp index 0213a0f599..37df9eb054 100644 --- a/src/frontends/qt4/QWrap.cpp +++ b/src/frontends/qt4/QWrap.cpp @@ -52,7 +52,7 @@ QWrapDialog::QWrapDialog(QWrap * form) connect(widthED, SIGNAL(textChanged(const QString &)), this, SLOT(change_adaptor())); - connect(unitsLC, SIGNAL(selectionChanged(LyXLength::UNIT)), + connect(unitsLC, SIGNAL(selectionChanged(lyx::LyXLength::UNIT)), this, SLOT(change_adaptor())); connect(valignCO, SIGNAL(highlighted(const QString &)), this, SLOT(change_adaptor())); diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp index 17e4c535a2..9d80097360 100644 --- a/src/frontends/qt4/TocWidget.cpp +++ b/src/frontends/qt4/TocWidget.cpp @@ -278,10 +278,8 @@ void TocWidget::setTocModel(size_t type) void TocWidget::reconnectSelectionModel() { connect(tocTV->selectionModel(), - SIGNAL(currentChanged(const QModelIndex &, - const QModelIndex &)), - this, SLOT(selectionChanged(const QModelIndex &, - const QModelIndex &))); + SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)), + this, SLOT(selectionChanged(const QModelIndex &, const QModelIndex &))); } } // namespace frontend