X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finiteffects.cpp;h=a9dd406bf302b2489c558395a4a98d60f8c330df;hb=f3e4009355bff682d8e0494e188abb539874541f;hp=52e40bc0db5dd3a56c2b40d6182d6e364ebca9e3;hpb=e0fa1332f109b6455207ea701da386b2fddddf09;p=kdenlive

diff --git a/src/initeffects.cpp b/src/initeffects.cpp
index 52e40bc0..a9dd406b 100644
--- a/src/initeffects.cpp
+++ b/src/initeffects.cpp
@@ -27,7 +27,7 @@
 #include <KStandardDirs>
 
 #include <QFile>
-#include <qregexp.h>
+#include <QRegExp>
 #include <QDir>
 #include <QIcon>
 
@@ -116,7 +116,7 @@ void initEffects::refreshLumas()
 }
 
 // static
-QDomDocument initEffects::getUsedCustomEffects(QMap <QString, QString> effectids)
+QDomDocument initEffects::getUsedCustomEffects(const QMap <QString, QString>& effectids)
 {
     QMapIterator<QString, QString> i(effectids);
     int ix;
@@ -353,7 +353,7 @@ void initEffects::parseCustomEffectsFile()
 }
 
 // static
-void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *audioEffectList, EffectsList *videoEffectList, QString name, QStringList filtersList, QStringList producersList, Mlt::Repository *repository)
+void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *audioEffectList, EffectsList *videoEffectList, const QString &name, QStringList filtersList, QStringList producersList, Mlt::Repository *repository)
 {
     QDomDocument doc;
     QFile file(name);
@@ -391,8 +391,8 @@ void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *au
             for (int j = 0; j < params.count(); j++) {
                 QDomNamedNodeMap attrs = params.at(j).attributes();
                 for (int k = 0; k < attrs.count(); k++) {
-                    QString name = attrs.item(k).nodeName();
-                    if (name != "type" && name != "name") {
+                    QString nodeName = attrs.item(k).nodeName();
+                    if (nodeName != "type" && nodeName != "name") {
                             QString val = attrs.item(k).nodeValue();
                             if (val.contains(oldSeparator)) {
                                 QString newVal = val.replace(oldSeparator, separator);
@@ -617,8 +617,12 @@ void initEffects::fillTransitionsList(Mlt::Repository *repository, EffectsList *
                 if (paramdesc.get("minimum"))
                     params.setAttribute("min", paramdesc.get("minimum"));
                 if (QString(paramdesc.get("type")) == "integer") {
-                    params.setAttribute("type", "constant");
-                    params.setAttribute("factor", "100");
+                    if (params.attribute("min") == "0" && params.attribute("max") == "1")
+                        params.setAttribute("type", "bool");
+                    else {
+                        params.setAttribute("type", "constant");
+                        params.setAttribute("factor", "100");
+                    }
                 }
                 if (QString(paramdesc.get("type")) == "boolean")
                     params.setAttribute("type", "bool");
@@ -741,7 +745,7 @@ void initEffects::fillTransitionsList(Mlt::Repository *repository, EffectsList *
     transitions->append(ret.documentElement());*/
 }
 
-QDomElement initEffects::quickParameterFill(QDomDocument & doc, QString name, QString tag, QString type, QString def, QString min, QString max, QString list, QString listdisplaynames, QString factor, QString namedesc, QString format, QString opacity)
+QDomElement initEffects::quickParameterFill(QDomDocument & doc, const QString &name, const QString &tag, const QString &type, const QString &def, const QString &min, const QString &max, const QString &list, const QString &listdisplaynames, const QString &factor, const QString &namedesc, const QString &format, const QString &opacity)
 {
     QDomElement parameter = doc.createElement("parameter");
     parameter.setAttribute("tag", tag);
@@ -768,3 +772,5 @@ QDomElement initEffects::quickParameterFill(QDomDocument & doc, QString name, QS
 
     return parameter;
 }
+
+#include "initeffects.moc"