From kde-commits Sun Aug 31 23:09:47 2014 From: Jaroslaw Staniek Date: Sun, 31 Aug 2014 23:09:47 +0000 To: kde-commits Subject: [calligra/calligra/2.8] /: Fix QObject connections normalize issues Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=140952659713906 Git commit 64c351763dd7d872ffae14d429bea61874b76d43 by Jaroslaw Staniek. Committed on 26/08/2014 at 13:48. Pushed by staniek into branch 'calligra/2.8'. Fix QObject connections normalize issues (using Krazy2) M +2 -2 kexi/main/kexifinddialog.cpp M +2 -2 libs/db/utils.cpp M +4 -4 libs/koproperty/EditorView.cpp M +8 -8 libs/koproperty/Set.cpp M +2 -2 libs/koreport/items/check/KoReportDesignerItemCheck.cpp M +2 -2 libs/koreport/items/field/KoReportDesignerItemField.cpp M +2 -2 libs/koreport/items/image/KoReportDesignerItemImage.cpp M +2 -2 libs/koreport/items/label/KoReportDesignerItemLabel.cpp M +2 -2 libs/koreport/items/text/KoReportDesignerItemText.cpp M +5 -4 libs/koreport/renderer/KoReportPreRenderer.cpp M +4 -4 libs/koreport/wrtembed/KoReportDesigner.cpp M +2 -2 libs/koreport/wrtembed/KoReportDesignerItemLine.cpp M +2 -2 libs/koreport/wrtembed/reportsection.cpp M +2 -2 plugins/reporting/barcode/KoReportDesignerItemBarcode.cpp M +2 -2 plugins/reporting/chart/KoReportDesignerItemChart.cpp M +2 -2 plugins/reporting/maps/KoReportDesignerItemMaps.cpp M +2 -1 plugins/reporting/web/KoReportDesignerItemWeb.cpp http://commits.kde.org/calligra/64c351763dd7d872ffae14d429bea61874b76d43 diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp index 98da6b4..e540e89 100644 --- a/kexi/main/kexifinddialog.cpp +++ b/kexi/main/kexifinddialog.cpp @@ -107,9 +107,9 @@ KexiFindDialog::KexiFindDialog(QWidget* parent) connect(m_btnClose, SIGNAL(clicked()), this, SLOT(slotCloseClicked())); connect(m_btnReplace, SIGNAL(clicked()), this, SIGNAL(replaceNext())); connect(m_btnReplaceAll, SIGNAL(clicked()), this, SIGNAL(replaceAll())= ); - connect(m_textToFind, SIGNAL(activated(const QString&)), this, SLOT(ad= dToFindHistory())); + connect(m_textToFind, SIGNAL(activated()), this, SLOT(addToFindHistory= ())); connect(m_btnFind, SIGNAL(clicked()), this, SLOT(addToFindHistory())); - connect(m_textToReplace, SIGNAL(activated(const QString&)), this, SLOT= (addToReplaceHistory())); + connect(m_textToReplace, SIGNAL(activated()), this, SLOT(addToReplaceH= istory())); connect(m_btnReplace, SIGNAL(clicked()), this, SLOT(addToReplaceHistor= y())); connect(m_btnReplaceAll, SIGNAL(clicked()), this, SLOT(addToReplaceHis= tory())); // clear message after the text is changed diff --git a/libs/db/utils.cpp b/libs/db/utils.cpp index 5966fe1..50b6f49 100644 --- a/libs/db/utils.cpp +++ b/libs/db/utils.cpp @@ -351,8 +351,8 @@ Connection* TableOrQuerySchema::connection() const ConnectionTestThread::ConnectionTestThread(ConnectionTestDialog* dlg, cons= t KexiDB::ConnectionData& connData) : m_dlg(dlg), m_connData(connData) { - connect(this, SIGNAL(error(const QString&,const QString&)), - dlg, SLOT(error(const QString&,const QString&)), Qt::QueuedCon= nection); + connect(this, SIGNAL(error(QString,QString)), + dlg, SLOT(error(QString,QString)), Qt::QueuedConnection); = // try to load driver now because it's not supported in different thre= ad KexiDB::DriverManager manager; diff --git a/libs/koproperty/EditorView.cpp b/libs/koproperty/EditorView.cpp index d8ff9b5..eff5942 100644 --- a/libs/koproperty/EditorView.cpp +++ b/libs/koproperty/EditorView.cpp @@ -392,10 +392,10 @@ void EditorView::changeSetInternal(Set *set, SetOptio= ns options, } if (d->set && setChanged) { //receive property changes - connect(d->set, SIGNAL(propertyChangedInternal(KoProperty::Set&, K= oProperty::Property&)), - this, SLOT(slotPropertyChanged(KoProperty::Set&, KoPropert= y::Property&))); - connect(d->set, SIGNAL(propertyReset(KoProperty::Set&, KoProperty:= :Property&)), - this, SLOT(slotPropertyReset(KoProperty::Set&, KoProperty:= :Property&))); + connect(d->set, SIGNAL(propertyChangedInternal(KoProperty::Set,KoP= roperty::Property)), + this, SLOT(slotPropertyChanged(KoProperty::Set,KoProperty:= :Property))); + connect(d->set, SIGNAL(propertyReset(KoProperty::Set,KoProperty::P= roperty)), + this, SLOT(slotPropertyReset(KoProperty::Set,KoProperty::P= roperty))); connect(d->set, SIGNAL(aboutToBeCleared()), this, SLOT(slotSetWill= BeCleared())); connect(d->set, SIGNAL(aboutToBeDeleted()), this, SLOT(slotSetWill= BeDeleted())); } diff --git a/libs/koproperty/Set.cpp b/libs/koproperty/Set.cpp index ac610c7..8bbdaf7 100644 --- a/libs/koproperty/Set.cpp +++ b/libs/koproperty/Set.cpp @@ -650,21 +650,21 @@ void Set::addRelatedProperty(Property *p1, Property *= p2) const Buffer::Buffer() : Set(false) { - connect(this, SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Pro= perty&)), - this, SLOT(intersectedChanged(KoProperty::Set&, KoProperty::Pr= operty&))); + connect(this, SIGNAL(propertyChanged(KoProperty::Set,KoProperty::Prope= rty)), + this, SLOT(intersectedChanged(KoProperty::Set,KoProperty::Prop= erty))); = - connect(this, SIGNAL(propertyReset(KoProperty::Set&, KoProperty::Prope= rty&)), - this, SLOT(intersectedReset(KoProperty::Set&, KoProperty::Prop= erty&))); + connect(this, SIGNAL(propertyReset(KoProperty::Set,KoProperty::Propert= y)), + this, SLOT(intersectedReset(KoProperty::Set,KoProperty::Proper= ty))); } = Buffer::Buffer(const Set& set) : Set(false) { - connect(this, SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Pro= perty&)), - this, SLOT(intersectedChanged(KoProperty::Set&, KoProperty::Pr= operty&))); + connect(this, SIGNAL(propertyChanged(KoProperty::Set,KoProperty::Prope= rty)), + this, SLOT(intersectedChanged(KoProperty::Set,KoProperty::Prop= erty))); = - connect(this, SIGNAL(propertyReset(KoProperty::Set&, KoProperty::Prope= rty&)), - this, SLOT(intersectedReset(KoProperty::Set&, KoProperty::Prop= erty&))); + connect(this, SIGNAL(propertyReset(KoProperty::Set,KoProperty::Propert= y)), + this, SLOT(intersectedReset(KoProperty::Set,KoProperty::Proper= ty))); = init(set); } diff --git a/libs/koreport/items/check/KoReportDesignerItemCheck.cpp b/libs= /koreport/items/check/KoReportDesignerItemCheck.cpp index 5c389c8..c8e6746 100644 --- a/libs/koreport/items/check/KoReportDesignerItemCheck.cpp +++ b/libs/koreport/items/check/KoReportDesignerItemCheck.cpp @@ -39,8 +39,8 @@ void KoReportDesignerItemCheck::init(QGraphicsScene * sce= ne) = KoReportDesignerItemRectBase::init(&m_pos, &m_size, m_set); = - connect(propertySet(), SIGNAL(propertyChanged(KoProperty::Set&, KoProp= erty::Property&)), - this, SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::P= roperty&))); + connect(propertySet(), SIGNAL(propertyChanged(KoProperty::Set,KoProper= ty::Property)), + this, SLOT(slotPropertyChanged(KoProperty::Set,KoProperty::Pro= perty))); = setZValue(Z); } diff --git a/libs/koreport/items/field/KoReportDesignerItemField.cpp b/libs= /koreport/items/field/KoReportDesignerItemField.cpp index 0dc9325..1a90a98 100644 --- a/libs/koreport/items/field/KoReportDesignerItemField.cpp +++ b/libs/koreport/items/field/KoReportDesignerItemField.cpp @@ -40,8 +40,8 @@ void KoReportDesignerItemField::init(QGraphicsScene * sce= ne) = KoReportDesignerItemRectBase::init(&m_pos, &m_size, m_set); = - connect(m_set, SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Pr= operty&)), - this, SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::P= roperty&))); + connect(m_set, SIGNAL(propertyChanged(KoProperty::Set,KoProperty::Prop= erty)), + this, SLOT(slotPropertyChanged(KoProperty::Set,KoProperty::Pro= perty))); = setZValue(Z); } diff --git a/libs/koreport/items/image/KoReportDesignerItemImage.cpp b/libs= /koreport/items/image/KoReportDesignerItemImage.cpp index 0010d3c..3b3c8e5 100644 --- a/libs/koreport/items/image/KoReportDesignerItemImage.cpp +++ b/libs/koreport/items/image/KoReportDesignerItemImage.cpp @@ -48,8 +48,8 @@ void KoReportDesignerItemImage::init(QGraphicsScene * sce= ne) = KoReportDesignerItemRectBase::init(&m_pos, &m_size, m_set); = - connect(m_set, SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Pr= operty&)), - this, SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::P= roperty&))); + connect(m_set, SIGNAL(propertyChanged(KoProperty::Set,KoProperty::Prop= erty)), + this, SLOT(slotPropertyChanged(KoProperty::Set,KoProperty::Pro= perty))); = m_controlSource->setListData(m_reportDesigner->fieldKeys(), m_reportDe= signer->fieldNames()); setZValue(Z); diff --git a/libs/koreport/items/label/KoReportDesignerItemLabel.cpp b/libs= /koreport/items/label/KoReportDesignerItemLabel.cpp index 163d077..92f1ade 100644 --- a/libs/koreport/items/label/KoReportDesignerItemLabel.cpp +++ b/libs/koreport/items/label/KoReportDesignerItemLabel.cpp @@ -40,8 +40,8 @@ void KoReportDesignerItemLabel::init(QGraphicsScene * sce= ne) = KoReportDesignerItemRectBase::init(&m_pos, &m_size, m_set); = - connect(propertySet(), SIGNAL(propertyChanged(KoProperty::Set&, KoProp= erty::Property&)), - this, SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::P= roperty&))); + connect(propertySet(), SIGNAL(propertyChanged(KoProperty::Set,KoProper= ty::Property)), + this, SLOT(slotPropertyChanged(KoProperty::Set,KoProperty::Pro= perty))); = setZValue(Z); } diff --git a/libs/koreport/items/text/KoReportDesignerItemText.cpp b/libs/k= oreport/items/text/KoReportDesignerItemText.cpp index 51e12d3..e011286 100644 --- a/libs/koreport/items/text/KoReportDesignerItemText.cpp +++ b/libs/koreport/items/text/KoReportDesignerItemText.cpp @@ -42,8 +42,8 @@ void KoReportDesignerItemText::init(QGraphicsScene * scen= e) if (scene) scene->addItem(this); = - connect(propertySet(), SIGNAL(propertyChanged(KoProperty::Set&, KoProp= erty::Property&)), - this, SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::P= roperty&))); + connect(propertySet(), SIGNAL(propertyChanged(KoProperty::Set,KoProper= ty::Property)), + this, SLOT(slotPropertyChanged(KoProperty::Set,KoProperty::Pro= perty))); = KoReportDesignerItemRectBase::init(&m_pos, &m_size, m_set); = diff --git a/libs/koreport/renderer/KoReportPreRenderer.cpp b/libs/koreport= /renderer/KoReportPreRenderer.cpp index 506d3ff..dbfe752 100644 --- a/libs/koreport/renderer/KoReportPreRenderer.cpp +++ b/libs/koreport/renderer/KoReportPreRenderer.cpp @@ -434,11 +434,11 @@ void KoReportPreRendererPrivate::initEngine() { m_scriptHandler =3D new KRScriptHandler(m_kodata, m_reportData); = - connect(this, SIGNAL(enteredGroup(const QString&, const QVariant&)), m= _scriptHandler, SLOT(slotEnteredGroup(const QString&, const QVariant&))); + connect(this, SIGNAL(enteredGroup(QString,QVariant)), m_scriptHandler,= SLOT(slotEnteredGroup(QString,QVariant))); = - connect(this, SIGNAL(exitedGroup(const QString&, const QVariant&)), m_= scriptHandler, SLOT(slotExitedGroup(const QString&, const QVariant&))); + connect(this, SIGNAL(exitedGroup(QString,QVariant)), m_scriptHandler, = SLOT(slotExitedGroup(QString,QVariant))); = - connect(this, SIGNAL(renderingSection(KRSectionData*, OROPage*, QPoint= F)), m_scriptHandler, SLOT(slotEnteredSection(KRSectionData*, OROPage*, QPo= intF))); + connect(this, SIGNAL(renderingSection(KRSectionData*,OROPage*,QPointF)= ), m_scriptHandler, SLOT(slotEnteredSection(KRSectionData*,OROPage*,QPointF= ))); } = void KoReportPreRendererPrivate::asyncItemsFinished() @@ -553,7 +553,8 @@ ORODocument* KoReportPreRenderer::generate() = //!TODO This is a hack if (i.key() =3D=3D "field") - QObject::connect(d->m_scriptHandler, SIGNAL(groupChanged(c= onst QString&)), i.value(), SLOT(setWhere(const QString&))); + QObject::connect(d->m_scriptHandler, SIGNAL(groupChanged(Q= String)), + i.value(), SLOT(setWhere(QString))); } } = diff --git a/libs/koreport/wrtembed/KoReportDesigner.cpp b/libs/koreport/wr= tembed/KoReportDesigner.cpp index eb9105d..9c320d0 100644 --- a/libs/koreport/wrtembed/KoReportDesigner.cpp +++ b/libs/koreport/wrtembed/KoReportDesigner.cpp @@ -176,8 +176,8 @@ void KoReportDesigner::init() connect(d->pageButton, SIGNAL(released()), this, SLOT(slotPageButton_P= ressed())); emit pagePropertyChanged(*m_set); = - connect(m_set, SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Pr= operty&)), - this, SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::P= roperty&))); + connect(m_set, SIGNAL(propertyChanged(KoProperty::Set,KoProperty::Prop= erty)), + this, SLOT(slotPropertyChanged(KoProperty::Set,KoProperty::Pro= perty))); = changeSet(m_set); = @@ -614,8 +614,8 @@ void KoReportDesigner::createProperties() QStringList keys, strings; m_set =3D new KoProperty::Set(0, "Report"); = - connect(m_set, SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Pr= operty&)), - this, SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::P= roperty&))); + connect(m_set, SIGNAL(propertyChanged(KoProperty::Set,KoProperty::Prop= erty)), + this, SLOT(slotPropertyChanged(KoProperty::Set,KoProperty::Pro= perty))); = m_title =3D new KoProperty::Property("Title", "Report", i18n("Title"),= i18n("Report Title")); = diff --git a/libs/koreport/wrtembed/KoReportDesignerItemLine.cpp b/libs/kor= eport/wrtembed/KoReportDesignerItemLine.cpp index f8946ff..bc3e2d3 100644 --- a/libs/koreport/wrtembed/KoReportDesignerItemLine.cpp +++ b/libs/koreport/wrtembed/KoReportDesignerItemLine.cpp @@ -54,8 +54,8 @@ void KoReportDesignerItemLine::init(QGraphicsScene* s, Ko= ReportDesigner *r) if (s) s->addItem(this); = - connect(m_set, SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Pr= operty&)), - this, SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::P= roperty&))); + connect(m_set, SIGNAL(propertyChanged(KoProperty::Set,KoProperty::Prop= erty)), + this, SLOT(slotPropertyChanged(KoProperty::Set,KoProperty::Pro= perty))); = setZValue(Z); } diff --git a/libs/koreport/wrtembed/reportsection.cpp b/libs/koreport/wrtem= bed/reportsection.cpp index 75d54c6..3c84532 100644 --- a/libs/koreport/wrtembed/reportsection.cpp +++ b/libs/koreport/wrtembed/reportsection.cpp @@ -75,8 +75,8 @@ ReportSection::ReportSection(KoReportDesigner * rptdes) : QWidget(rptdes) { m_sectionData =3D new KRSectionData(this); - connect(m_sectionData->propertySet(), SIGNAL(propertyChanged(KoPropert= y::Set&, KoProperty::Property&)), - this, SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::P= roperty&))); + connect(m_sectionData->propertySet(), SIGNAL(propertyChanged(KoPropert= y::Set,KoProperty::Property)), + this, SLOT(slotPropertyChanged(KoProperty::Set,KoProperty::Pro= perty))); int dpiY =3D KoDpi::dpiY(); = m_reportDesigner =3D rptdes; diff --git a/plugins/reporting/barcode/KoReportDesignerItemBarcode.cpp b/pl= ugins/reporting/barcode/KoReportDesignerItemBarcode.cpp index b4fb621..488f0c3 100644 --- a/plugins/reporting/barcode/KoReportDesignerItemBarcode.cpp +++ b/plugins/reporting/barcode/KoReportDesignerItemBarcode.cpp @@ -42,8 +42,8 @@ void KoReportDesignerItemBarcode::init(QGraphicsScene * s= cene) if (scene) scene->addItem(this); = - connect(m_set, SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Pr= operty&)), - this, SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::P= roperty&))); + connect(m_set, SIGNAL(propertyChanged(KoProperty::Set,KoProperty::Prop= erty)), + this, SLOT(slotPropertyChanged(KoProperty::Set,KoProperty::Pro= perty))); = setMaxLength(5); KoReportDesignerItemRectBase::init(&m_pos, &m_size, m_set); diff --git a/plugins/reporting/chart/KoReportDesignerItemChart.cpp b/plugin= s/reporting/chart/KoReportDesignerItemChart.cpp index 65ce99b..b565103 100644 --- a/plugins/reporting/chart/KoReportDesignerItemChart.cpp +++ b/plugins/reporting/chart/KoReportDesignerItemChart.cpp @@ -40,8 +40,8 @@ void KoReportDesignerItemChart::init(QGraphicsScene* scen= e, KoReportDesigner *de if (scene) scene->addItem(this); = - connect(m_set, SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Pr= operty&)), - this, SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::P= roperty&))); + connect(m_set, SIGNAL(propertyChanged(KoProperty::Set,KoProperty::Prop= erty)), + this, SLOT(slotPropertyChanged(KoProperty::Set,KoProperty::Pro= perty))); = KoReportDesignerItemRectBase::init(&m_pos, &m_size, m_set); setZValue(Z); diff --git a/plugins/reporting/maps/KoReportDesignerItemMaps.cpp b/plugins/= reporting/maps/KoReportDesignerItemMaps.cpp index f624db3..b437bd9 100644 --- a/plugins/reporting/maps/KoReportDesignerItemMaps.cpp +++ b/plugins/reporting/maps/KoReportDesignerItemMaps.cpp @@ -50,8 +50,8 @@ void KoReportDesignerItemMaps::init(QGraphicsScene * scen= e) = KoReportDesignerItemRectBase::init(&m_pos, &m_size, m_set); = - connect(m_set, SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Pr= operty&)), - this, SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::P= roperty&))); + connect(m_set, SIGNAL(propertyChanged(KoProperty::Set,KoProperty::Prop= erty)), + this, SLOT(slotPropertyChanged(KoProperty::Set,KoProperty::Pro= perty))); = m_controlSource->setListData(m_reportDesigner->fieldKeys(), m_reportDe= signer->fieldNames()); setZValue(Z); diff --git a/plugins/reporting/web/KoReportDesignerItemWeb.cpp b/plugins/re= porting/web/KoReportDesignerItemWeb.cpp index 63e1cc9..2638ffe 100644 --- a/plugins/reporting/web/KoReportDesignerItemWeb.cpp +++ b/plugins/reporting/web/KoReportDesignerItemWeb.cpp @@ -45,7 +45,8 @@ void KoReportDesignerItemWeb::init(QGraphicsScene *scene)= //done,compared,add fu if (scene) scene->addItem(this); = - connect(m_set, SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Pr= operty&)), this, SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Pro= perty&))); + connect(m_set, SIGNAL(propertyChanged(KoProperty::Set,KoProperty::Prop= erty)), + this, SLOT(slotPropertyChanged(KoProperty::Set,KoProperty::Pro= perty))); KoReportDesignerItemRectBase::init(&m_pos, &m_size, m_set); setZValue(Z); }