Fix compilation warnings

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

diff --git a/src/documentvalidator.cpp b/src/documentvalidator.cpp
index 8f55c732a7a415397968326bbac9416eab5e380f..bb6d8999b4f7fa76e18b5c69d8b1e779c272eb1a 100644 (file)
--- a/src/documentvalidator.cpp
+++ b/src/documentvalidator.cpp
@@ -674,7 +674,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion)
     if (version <= 0.83) {
         // Replace point size with pixel size in text titles
         if (m_doc.toString().contains("font-size")) {
-            KMessageBox::ButtonCode convert;
+            KMessageBox::ButtonCode convert = KMessageBox::Continue;
             QDomNodeList kproducerNodes = m_doc.elementsByTagName("kdenlive_producer");
             for (int i = 0; i < kproducerNodes.count() && convert != KMessageBox::No; ++i) {
                 QDomElement kproducer = kproducerNodes.at(i).toElement();

diff --git a/src/documentvalidator.h b/src/documentvalidator.h
index 680af5467023e79d82b9ce9a1774e76e3ed70a36..2ee0a59f7ad92170977cbe11943aee77f9659311 100644 (file)
--- a/src/documentvalidator.h
+++ b/src/documentvalidator.h
@@ -34,8 +34,8 @@ public:
     bool isModified() const;
 
 private:
-    bool m_modified;
     QDomDocument m_doc;
+    bool m_modified;
     bool upgrade(double version, const double currentVersion);
     QString colorToString(const QColor& c);
 };

diff --git a/src/editeffectcommand.h b/src/editeffectcommand.h
index 362110d610a28d77ba2a33a0316bbce2ff427cae..1b01ede7e674a8bc261f3edde902a67ef88a7a20 100644 (file)
--- a/src/editeffectcommand.h
+++ b/src/editeffectcommand.h
@@ -41,8 +41,8 @@ public:
 private:
     CustomTrackView *m_view;
     const int m_track;
-    QDomElement m_effect;
     QDomElement m_oldeffect;
+    QDomElement m_effect;
     const GenTime m_pos;
     int m_stackPos;
     bool m_doIt;

diff --git a/src/moveclipcommand.cpp b/src/moveclipcommand.cpp
index a5f0c3f5b0ebcc555a9662e8de0746ea8ee2a9e2..74d159d80f6c978b45ac3781b0b3964bfe88ed44 100644 (file)
--- a/src/moveclipcommand.cpp
+++ b/src/moveclipcommand.cpp
@@ -44,7 +44,7 @@ void MoveClipCommand::undo()
 // virtual
 void MoveClipCommand::redo()
 {
-    kDebug() << "----  redoing action";
+    //kDebug() << "----  redoing action";
     if (m_doIt)
         m_view->moveClip(m_startPos, m_endPos);
     m_doIt = true;

diff --git a/src/moveclipcommand.h b/src/moveclipcommand.h
index 933318887488c3f80402493d57b22115d0da6bf4..41ab4a8c08f544a33f164bc2973ea4cd45781b75 100644 (file)
--- a/src/moveclipcommand.h
+++ b/src/moveclipcommand.h
@@ -21,12 +21,9 @@
 #ifndef MOVECLIPCOMMAND_H
 #define MOVECLIPCOMMAND_H
 
-#include <QUndoCommand>
-#include <QGraphicsView>
-#include <QPointF>
 
-#include <KDebug>
 #include "definitions.h"
+#include <QUndoCommand>
 
 class CustomTrackView;
 

diff --git a/src/movegroupcommand.h b/src/movegroupcommand.h
index aa2a6ba49f345d37a0cca0b6b87e5fe83fec6151..c9550ea53aa1795dee460665c9e8992c5342e133 100644 (file)
--- a/src/movegroupcommand.h
+++ b/src/movegroupcommand.h
@@ -21,12 +21,8 @@
 #ifndef MOVEGROUPCOMMAND_H
 #define MOVEGROUPCOMMAND_H
 
-#include <QUndoCommand>
-#include <QGraphicsView>
-#include <QPointF>
-
-#include <KDebug>
 #include "definitions.h"
+#include <QUndoCommand>
 
 class GenTime;
 class CustomTrackView;

diff --git a/src/movetransitioncommand.cpp b/src/movetransitioncommand.cpp
index fb8ff8bc6d81c903649f884fb0c30085d11e0721..71c29444aff0dbbc81da4e57d494c7bc6242fde9 100644 (file)
--- a/src/movetransitioncommand.cpp
+++ b/src/movetransitioncommand.cpp
@@ -41,9 +41,9 @@ void MoveTransitionCommand::undo()
 // virtual
 void MoveTransitionCommand::redo()
 {
-    kDebug() << "----  redoing action";
+    //kDebug() << "----  redoing action";
     if (m_doIt) m_view->moveTransition(m_startPos, m_endPos);
     m_doIt = true;
 }
 
-#include "moveclipcommand.moc"
+

diff --git a/src/movetransitioncommand.h b/src/movetransitioncommand.h
index feaeca437151f56a3398bf0c91f2d27e4ff88230..aecd47a88a45cb1bdba4e1b509f53d6376b8cb18 100644 (file)
--- a/src/movetransitioncommand.h
+++ b/src/movetransitioncommand.h
@@ -18,14 +18,10 @@
 #ifndef MOVETRANSITIONCOMMAND_H
 #define MOVETRANSITIONCOMMAND_H
 
-#include <QUndoCommand>
-#include <QGraphicsView>
-#include <QPointF>
-
-#include <KDebug>
-
 #include "definitions.h"
 
+#include <QUndoCommand>
+
 class CustomTrackView;
 
 class MoveTransitionCommand : public QUndoCommand