Patches from Ray Lehtiniemi

 - Missing include guards in a header file
 - Add braces and update indentation to clarify ambiguous if/else

svn path=/trunk/kdenlive/; revision=3200

diff --git a/src/parameterplotter.h b/src/parameterplotter.h
index 8f1a070b9595c2aed54b3eee2875c66379e79f8a..a5c8816efc96af2287afa58574d6b13c71016954 100644 (file)
--- a/src/parameterplotter.h
+++ b/src/parameterplotter.h
@@ -15,6 +15,9 @@
  *                                                                         *
  ***************************************************************************/
 
+#ifndef _PARAMETERPLOTTER_H_
+#define _PARAMETERPLOTTER_H_
+
 #include <KPlotWidget>
 #include <QDomElement>
 #include <QMap>
@@ -58,3 +61,5 @@ signals:
     void parameterList(QStringList);
 
 };
+
+#endif

diff --git a/src/titledocument.cpp b/src/titledocument.cpp
index 3a841510acf8b1146453a0b67b2521b1feb48620..0a90afbc28f3bcd5b39bd5d70b337e3e0979607a 100644 (file)
--- a/src/titledocument.cpp
+++ b/src/titledocument.cpp
@@ -194,7 +194,7 @@ int TitleDocument::loadFromXml(QDomDocument doc, QGraphicsPolygonItem* /*startv*
             QGraphicsItem *gitem = NULL;
             kDebug() << items.item(i).attributes().namedItem("type").nodeValue();
             int zValue = items.item(i).attributes().namedItem("z-index").nodeValue().toInt();
-            if (zValue > -1000)
+            if (zValue > -1000) {
                 if (items.item(i).attributes().namedItem("type").nodeValue() == "QGraphicsTextItem") {
                     QDomNamedNodeMap txtProperties = items.item(i).namedItem("content").attributes();
                     QFont font(txtProperties.namedItem("font").nodeValue());
@@ -212,29 +212,27 @@ int TitleDocument::loadFromXml(QDomDocument doc, QGraphicsPolygonItem* /*startv*
                     txt->setDefaultTextColor(col);
                     txt->setTextInteractionFlags(Qt::NoTextInteraction);
                     gitem = txt;
-                } else
-                    if (items.item(i).attributes().namedItem("type").nodeValue() == "QGraphicsRectItem") {
-                        QString rect = items.item(i).namedItem("content").attributes().namedItem("rect").nodeValue();
-                        QString br_str = items.item(i).namedItem("content").attributes().namedItem("brushcolor").nodeValue();
-                        QString pen_str = items.item(i).namedItem("content").attributes().namedItem("pencolor").nodeValue();
-                        double penwidth = items.item(i).namedItem("content").attributes().namedItem("penwidth").nodeValue().toDouble();
-                        QGraphicsRectItem *rec = scene->addRect(stringToRect(rect), QPen(QBrush(stringToColor(pen_str)), penwidth), QBrush(stringToColor(br_str)));
-                        gitem = rec;
-                    } else
-                        if (items.item(i).attributes().namedItem("type").nodeValue() == "QGraphicsPixmapItem") {
-                            QString url = items.item(i).namedItem("content").attributes().namedItem("url").nodeValue();
-                            QPixmap pix(url);
-                            QGraphicsPixmapItem *rec = scene->addPixmap(pix);
-                            rec->setData(Qt::UserRole, url);
-                            gitem = rec;
-                        } else
-                            if (items.item(i).attributes().namedItem("type").nodeValue() == "QGraphicsSvgItem") {
-                                QString url = items.item(i).namedItem("content").attributes().namedItem("url").nodeValue();
-                                QGraphicsSvgItem *rec = new QGraphicsSvgItem(url);
-                                scene->addItem(rec);
-                                rec->setData(Qt::UserRole, url);
-                                gitem = rec;
-                            }
+                } else if (items.item(i).attributes().namedItem("type").nodeValue() == "QGraphicsRectItem") {
+                    QString rect = items.item(i).namedItem("content").attributes().namedItem("rect").nodeValue();
+                    QString br_str = items.item(i).namedItem("content").attributes().namedItem("brushcolor").nodeValue();
+                    QString pen_str = items.item(i).namedItem("content").attributes().namedItem("pencolor").nodeValue();
+                    double penwidth = items.item(i).namedItem("content").attributes().namedItem("penwidth").nodeValue().toDouble();
+                    QGraphicsRectItem *rec = scene->addRect(stringToRect(rect), QPen(QBrush(stringToColor(pen_str)), penwidth), QBrush(stringToColor(br_str)));
+                    gitem = rec;
+                } else if (items.item(i).attributes().namedItem("type").nodeValue() == "QGraphicsPixmapItem") {
+                    QString url = items.item(i).namedItem("content").attributes().namedItem("url").nodeValue();
+                    QPixmap pix(url);
+                    QGraphicsPixmapItem *rec = scene->addPixmap(pix);
+                    rec->setData(Qt::UserRole, url);
+                    gitem = rec;
+                } else if (items.item(i).attributes().namedItem("type").nodeValue() == "QGraphicsSvgItem") {
+                    QString url = items.item(i).namedItem("content").attributes().namedItem("url").nodeValue();
+                    QGraphicsSvgItem *rec = new QGraphicsSvgItem(url);
+                    scene->addItem(rec);
+                    rec->setData(Qt::UserRole, url);
+                    gitem = rec;
+                }
+            }
             //pos and transform
             if (gitem) {
                 QPointF p(items.item(i).namedItem("position").attributes().namedItem("x").nodeValue().toDouble(),