const modifiers are useless on integral return types [PATCH by Ray Lehtiniemi]

[kdenlive] / src / titledocument.cpp

diff --git a/src/titledocument.cpp b/src/titledocument.cpp
index 000ab0ac1d50ea23cd2831858b4dbe2033e8e0e7..664c3311825e803c04b391e6fcddfca1944b6f3c 100644 (file)
--- a/src/titledocument.cpp
+++ b/src/titledocument.cpp
@@ -113,20 +113,29 @@ QDomDocument TitleDocument::xml(QGraphicsPolygonItem* startv, QGraphicsPolygonIt
         main.appendChild(endp);
     }
     QDomElement backgr = doc.createElement("background");
-    QList<QGraphicsItem *> items = scene->items();
-    QColor color(0, 0, 0, 0);
-    for (int i = 0; i < items.size(); i++) {
-        if (items.at(i)->zValue() == -1100) {
-            color = ((QGraphicsRectItem *)items.at(i))->brush().color();
-            break;
-        }
-    }
+    QColor color = getBackgroundColor();
     backgr.setAttribute("color", colorToString(color));
     main.appendChild(backgr);
 
     return doc;
 }
 
+/** \brief Get the background color (incl. alpha) from the document, if possibly
+  * \returns The background color of the document, inclusive alpha. If none found, returns (0,0,0,0) */
+QColor TitleDocument::getBackgroundColor() {
+    QColor color(0, 0, 0, 0);
+    if (scene) {
+        QList<QGraphicsItem *> items = scene->items();
+        for (int i = 0; i < items.size(); i++) {
+            if (items.at(i)->zValue() == -1100) {
+                color = ((QGraphicsRectItem *)items.at(i))->brush().color();
+                return color;
+            }
+        }
+    }
+    return color;
+}
+
 
 bool TitleDocument::saveDocument(const KUrl& url, QGraphicsPolygonItem* startv, QGraphicsPolygonItem* endv) {
     if (!scene)
@@ -137,7 +146,7 @@ bool TitleDocument::saveDocument(const KUrl& url, QGraphicsPolygonItem* startv,
     if (!tmpfile.open()) kWarning() << "/////  CANNOT CREATE TMP FILE in: " << tmpfile.fileName();
     QFile xmlf(tmpfile.fileName());
     xmlf.open(QIODevice::WriteOnly);
-    xmlf.write(doc.toString().toAscii());
+    xmlf.write(doc.toString().toUtf8());
     xmlf.close();
     kDebug() << KIO::NetAccess::upload(tmpfile.fileName(), url, 0);
     return true;
@@ -146,7 +155,6 @@ bool TitleDocument::saveDocument(const KUrl& url, QGraphicsPolygonItem* startv,
 int TitleDocument::loadDocument(const KUrl& url, QGraphicsPolygonItem* startv, QGraphicsPolygonItem* endv) {
     QString tmpfile;
     QDomDocument doc;
-    double aspect_ratio = 4.0 / 3.0;
     if (!scene)
         return -1;
 
@@ -160,6 +168,7 @@ int TitleDocument::loadDocument(const KUrl& url, QGraphicsPolygonItem* startv, Q
         KIO::NetAccess::removeTempFile(tmpfile);
         return loadFromXml(doc, startv, endv);
     }
+    return -1;
 }
 
 int TitleDocument::loadFromXml(QDomDocument doc, QGraphicsPolygonItem* startv, QGraphicsPolygonItem* endv) {
@@ -263,20 +272,20 @@ QString TitleDocument::rectFToString(const QRectF& c) {
 
 QRectF TitleDocument::stringToRect(const QString & s) {
 
-    QStringList l = s.split(",");
+    QStringList l = s.split(',');
     if (l.size() < 4)
         return QRectF();
     return QRectF(l[0].toDouble(), l[1].toDouble(), l[2].toDouble(), l[3].toDouble());
 }
 
 QColor TitleDocument::stringToColor(const QString & s) {
-    QStringList l = s.split(",");
+    QStringList l = s.split(',');
     if (l.size() < 4)
         return QColor();
     return QColor(l[0].toInt(), l[1].toInt(), l[2].toInt(), l[3].toInt());;
 }
 QTransform TitleDocument::stringToTransform(const QString& s) {
-    QStringList l = s.split(",");
+    QStringList l = s.split(',');
     if (l.size() < 9)
         return QTransform();
     return QTransform(