From kde-commits Sat Dec 03 12:36:36 2016 From: Jean-Baptiste Mardelle Date: Sat, 03 Dec 2016 12:36:36 +0000 To: kde-commits Subject: [kdenlive/Applications/16.12] src: Remove unused QLocale declarations Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=148076860609303 Git commit 4e115e20d62303d539a2c5a3356ec392f4a31cf7 by Jean-Baptiste Mardel= le. Committed on 03/12/2016 at 12:36. Pushed by mardelle into branch 'Applications/16.12'. Remove unused QLocale declarations M +0 -1 src/bin/abstractprojectitem.cpp M +0 -1 src/doc/documentvalidator.cpp M +0 -1 src/effectstack/widgets/animationwidget.cpp M +0 -1 src/mainwindow.cpp M +1 -1 src/mltcontroller/bincontroller.cpp M +0 -2 src/mltcontroller/clippropertiescontroller.cpp M +0 -2 src/mltcontroller/effectscontroller.cpp M +0 -2 src/stopmotion/stopmotion.cpp M +0 -2 src/timeline/abstractclipitem.cpp M +0 -2 src/timeline/clipitem.cpp M +0 -2 src/timeline/customtrackview.cpp M +6 -7 src/timeline/timeline.cpp M +0 -1 src/timeline/track.cpp https://commits.kde.org/kdenlive/4e115e20d62303d539a2c5a3356ec392f4a31cf7 diff --git a/src/bin/abstractprojectitem.cpp b/src/bin/abstractprojectitem.= cpp index c12a3ba..3e8230b 100644 --- a/src/bin/abstractprojectitem.cpp +++ b/src/bin/abstractprojectitem.cpp @@ -177,7 +177,6 @@ AbstractProjectItem::PROJECTITEMTYPE AbstractProjectIte= m::itemType() const QVariant AbstractProjectItem::data(DataType type) const { QVariant data; - QLocale locale; switch (type) { case DataName: data =3D QVariant(m_name); diff --git a/src/doc/documentvalidator.cpp b/src/doc/documentvalidator.cpp index 7e524d6..5139311 100644 --- a/src/doc/documentvalidator.cpp +++ b/src/doc/documentvalidator.cpp @@ -1858,7 +1858,6 @@ bool DocumentValidator::checkMovit() // Parse all effects in document QDomNodeList filters =3D m_doc.elementsByTagName(QStringLiteral("filte= r")); int max =3D filters.count(); - QLocale locale; for (int i =3D 0; i < max; ++i) { QDomElement filt =3D filters.at(i).toElement(); QString filterId =3D filt.attribute(QStringLiteral("id")); diff --git a/src/effectstack/widgets/animationwidget.cpp b/src/effectstack/= widgets/animationwidget.cpp index aaffa78..9f52e0d 100644 --- a/src/effectstack/widgets/animationwidget.cpp +++ b/src/effectstack/widgets/animationwidget.cpp @@ -729,7 +729,6 @@ void AnimationWidget::buildSliderWidget(const QString &= paramTag, const QDomEleme = void AnimationWidget::buildRectWidget(const QString ¶mTag, const QDomE= lement &e) { - QLocale locale; QDomElement na =3D e.firstChildElement(QStringLiteral("name")); QString paramName =3D i18n(na.text().toUtf8().data()); QDomElement commentElem =3D e.firstChildElement(QStringLiteral("commen= t")); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index dd3203b..db185af 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -3328,7 +3328,6 @@ void MainWindow::slotPrepareRendering(bool scriptExpo= rt, bool zoneOnly, const QS = QMap guidesData =3D pCore->projectManager()->cur= rentTimeline()->projectView()->guidesData(); QMapIterator g(guidesData); - QLocale locale; while (g.hasNext()) { g.next(); int time =3D (int) GenTime(g.key()).frames(project->fps()); diff --git a/src/mltcontroller/bincontroller.cpp b/src/mltcontroller/bincon= troller.cpp index a589e58..7d3eec0 100644 --- a/src/mltcontroller/bincontroller.cpp +++ b/src/mltcontroller/bincontroller.cpp @@ -181,7 +181,7 @@ QMap BinController::takeGuidesData() Mlt::Properties guidesProperties; Mlt::Properties playlistProps(m_binPlaylist->get_properties()); guidesProperties.pass_values(playlistProps, "kdenlive:guide."); - = + qDebug()<<"***********\nFOUND GUIDES: "< guidesData; for (int i =3D 0; i < guidesProperties.count(); i++) { diff --git a/src/mltcontroller/clippropertiescontroller.cpp b/src/mltcontro= ller/clippropertiescontroller.cpp index 1e0a340..9be4e97 100644 --- a/src/mltcontroller/clippropertiescontroller.cpp +++ b/src/mltcontroller/clippropertiescontroller.cpp @@ -670,7 +670,6 @@ void ClipPropertiesController::slotEnableForce(int stat= e) if (!spin || !spin2) return; properties.insert(QStringLiteral("force_aspect_den"), QString:= :number(spin2->value())); properties.insert(QStringLiteral("force_aspect_num"), QString:= :number(spin->value())); - QLocale locale; properties.insert(QStringLiteral("force_aspect_ratio"), locale= .toString((double) spin->value() / spin2->value())); } } @@ -728,7 +727,6 @@ void ClipPropertiesController::slotComboValueChanged() } QString param =3D box->objectName().section(QStringLiteral("_"), 0, -2= ); QMap properties; - QLocale locale; properties.insert(param, QString::number(box->currentData().toInt())); emit updateClipProperties(m_id, m_originalProperties, properties); m_originalProperties =3D properties; diff --git a/src/mltcontroller/effectscontroller.cpp b/src/mltcontroller/ef= fectscontroller.cpp index 026092f..2cdb610 100644 --- a/src/mltcontroller/effectscontroller.cpp +++ b/src/mltcontroller/effectscontroller.cpp @@ -98,8 +98,6 @@ void EffectsParameterList::removeParam(const QString &nam= e) { EffectsParameterList EffectsController::getEffectArgs(const ProfileInfo &i= nfo, const QDomElement &effect) { EffectsParameterList parameters; - QLocale locale; - locale.setNumberOptions(QLocale::OmitGroupSeparator); parameters.addParam(QStringLiteral("tag"), effect.attribute(QStringLit= eral("tag"))); //if (effect.hasAttribute("region")) parameters.addParam("region", eff= ect.attribute("region")); parameters.addParam(QStringLiteral("kdenlive_ix"), effect.attribute(QS= tringLiteral("kdenlive_ix"))); diff --git a/src/stopmotion/stopmotion.cpp b/src/stopmotion/stopmotion.cpp index e0a7af6..d73db20 100644 --- a/src/stopmotion/stopmotion.cpp +++ b/src/stopmotion/stopmotion.cpp @@ -461,8 +461,6 @@ void StopmotionWidget::slotLive(bool isOn) capture_button->setEnabled(false); if (isOn) { m_frame_preview->setHidden(true); - QLocale locale; - locale.setNumberOptions(QLocale::OmitGroupSeparator); = MltVideoProfile profile; QString resource; diff --git a/src/timeline/abstractclipitem.cpp b/src/timeline/abstractclipi= tem.cpp index 4f4a876..963ed12 100644 --- a/src/timeline/abstractclipitem.cpp +++ b/src/timeline/abstractclipitem.cpp @@ -532,8 +532,6 @@ void AbstractClipItem::movedKeyframe(QDomElement effect= , int newpos, int oldpos, void AbstractClipItem::removeKeyframe(QDomElement effect, int frame) { if (effect.attribute(QStringLiteral("disable")) =3D=3D QLatin1String("= 1")) return; - QLocale locale; - locale.setNumberOptions(QLocale::OmitGroupSeparator); effect.setAttribute(QStringLiteral("active_keyframe"), 0); QDomNodeList params =3D effect.elementsByTagName(QStringLiteral("param= eter")); for (int i =3D 0; i < params.count(); ++i) { diff --git a/src/timeline/clipitem.cpp b/src/timeline/clipitem.cpp index 687b978..9b4dd7f 100644 --- a/src/timeline/clipitem.cpp +++ b/src/timeline/clipitem.cpp @@ -202,8 +202,6 @@ void ClipItem::initEffect(ProfileInfo pInfo, QDomElemen= t effect, int diff, int o bool ClipItem::checkKeyFrames(int width, int height, int previousDuration,= int cutPos) { bool clipEffectsModified =3D false; - QLocale locale; - locale.setNumberOptions(QLocale::OmitGroupSeparator); int effectsCount =3D m_effectList.count(); if (effectsCount =3D=3D 0) { // reset keyframes diff --git a/src/timeline/customtrackview.cpp b/src/timeline/customtrackvie= w.cpp index 71736aa..fbbc4d4 100644 --- a/src/timeline/customtrackview.cpp +++ b/src/timeline/customtrackview.cpp @@ -6241,8 +6241,6 @@ void CustomTrackView::pasteClipEffects() void CustomTrackView::adjustKeyfames(GenTime oldstart, GenTime newstart, G= enTime duration, QDomElement xml) { // parse parameters to check if we need to adjust to the new crop start - QLocale locale; - locale.setNumberOptions(QLocale::OmitGroupSeparator); QDomNodeList params =3D xml.elementsByTagName(QStringLiteral("paramete= r")); for (int i =3D 0; i < params.count(); ++i) { QDomElement e =3D params.item(i).toElement(); diff --git a/src/timeline/timeline.cpp b/src/timeline/timeline.cpp index dcccfba..827e3b1 100644 --- a/src/timeline/timeline.cpp +++ b/src/timeline/timeline.cpp @@ -364,10 +364,8 @@ void Timeline::checkDuration() { } = void Timeline::getTransitions() { - QLocale locale; int compositeMode =3D 0; double fps =3D m_doc->fps(); - locale.setNumberOptions(QLocale::OmitGroupSeparator); mlt_service service =3D mlt_service_get_producer(m_tractor->get_servic= e()); QScopedPointer field(m_tractor->field()); while (service) { @@ -1051,10 +1049,9 @@ void Timeline::loadGuides(QMap gui= desData) } } = -void Timeline::getEffects(Mlt::Service &service, ClipItem *clip, int track= ) { +void Timeline::getEffects(Mlt::Service &service, ClipItem *clip, int track= ) = +{ int effectNb =3D clip =3D=3D NULL ? 0 : clip->effectsCount(); - QLocale locale; - locale.setNumberOptions(QLocale::OmitGroupSeparator); for (int ix =3D 0; ix < service.filter_count(); ++ix) { QScopedPointer effect(service.filter(ix)); QDomElement clipeffect =3D getEffectByTag(effect->get("tag"), effe= ct->get("kdenlive_id")); @@ -1098,7 +1095,8 @@ void Timeline::getEffects(Mlt::Service &service, Clip= Item *clip, int track) { } } = -QString Timeline::getKeyframes(Mlt::Service service, int &ix, QDomElement = e) { +QString Timeline::getKeyframes(Mlt::Service service, int &ix, QDomElement = e) = +{ QLocale locale; locale.setNumberOptions(QLocale::OmitGroupSeparator); QString starttag =3D e.attribute(QStringLiteral("starttag"), QStringLi= teral("start")); @@ -1149,7 +1147,8 @@ void Timeline::getSubfilters(Mlt::Filter *effect, QDo= mElement ¤teffect) { } = //static -void Timeline::setParam(ProfileInfo info, QDomElement param, QString value= ) { +void Timeline::setParam(ProfileInfo info, QDomElement param, QString value= ) = +{ QLocale locale; locale.setNumberOptions(QLocale::OmitGroupSeparator); //get Kdenlive scaling parameters diff --git a/src/timeline/track.cpp b/src/timeline/track.cpp index 43ce2ad..9116746 100644 --- a/src/timeline/track.cpp +++ b/src/timeline/track.cpp @@ -339,7 +339,6 @@ QList Track::replaceAll(const QString &id, M= lt::Producer *original, M QString idForVideoTrack; QString service =3D original->parent().get("mlt_service"); QString idForTrack =3D original->parent().get("id"); - QLocale locale; int tkState =3D state(); if (needsDuplicate(service)) { // We have to use the track clip duplication functions, because of= audio glitches in MLT's multitrack