re-indented :-/

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

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 614fee446cf5a9e06853a214547c115a30ed332e..e3b91a9d0a70cbc2ef1bb1f91dec1c7cea85fb9d 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -549,7 +549,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo
     char *tmp = decodedString(clipId);
     producer->set("id", tmp);
     delete[] tmp;
-    
+
     if (!replaceProducer && xml.hasAttribute("file_hash")) {
         // Clip  already has all properties
         emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer);

diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index 392a1cfffaf087346ceb3085c2ecac1b9d227326..f0c8a43a2de2aeec3e4ecfd3ffddafa25a25572e 100644 (file)
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -167,8 +167,8 @@ TitleWidget::TitleWidget(KUrl url, QString projectTitlePath, Render *render, QWi
     m_buttonCursor->setCheckable(true);
     m_buttonCursor->setShortcut(Qt::ALT + Qt::Key_S);
     connect(m_buttonCursor, SIGNAL(triggered()), this, SLOT(slotSelectTool()));
-       
-       m_toolbar->addSeparator();
+
+    m_toolbar->addSeparator();
 
     m_buttonLoad = m_toolbar->addAction(KIcon("document-open"), i18n("Open Document"));
     m_buttonLoad->setCheckable(false);
@@ -238,8 +238,8 @@ TitleWidget::TitleWidget(KUrl url, QString projectTitlePath, Render *render, QWi
     } else {
         slotRectTool();
     }
-       
-       showToolbars(TITLE_NONE);
+
+    showToolbars(TITLE_NONE);
 }
 
 TitleWidget::~TitleWidget()
@@ -294,7 +294,7 @@ void TitleWidget::resizeEvent(QResizeEvent * /*event*/)
 void TitleWidget::slotTextTool()
 {
     m_scene->setTool(TITLE_TEXT);
-       showToolbars(TITLE_TEXT);
+    showToolbars(TITLE_TEXT);
     m_buttonRect->setChecked(false);
     m_buttonCursor->setChecked(false);
 }
@@ -302,7 +302,7 @@ void TitleWidget::slotTextTool()
 void TitleWidget::slotRectTool()
 {
     m_scene->setTool(TITLE_RECTANGLE);
-       showToolbars(TITLE_RECTANGLE);
+    showToolbars(TITLE_RECTANGLE);
     m_buttonText->setChecked(false);
     m_buttonCursor->setChecked(false);
     m_buttonRect->setChecked(true);
@@ -311,26 +311,26 @@ void TitleWidget::slotRectTool()
 void TitleWidget::slotSelectTool()
 {
     m_scene->setTool(TITLE_SELECT);
-       
-       // Find out which toolbars need to be shown, depending on selected item
-       TITLETOOL t = TITLE_SELECT;
-       QList<QGraphicsItem *> l = graphicsView->scene()->selectedItems();
-       if (l.size() > 0) {
-               switch (l.at(0)->type()) {
-                       case TEXTITEM:
-                               t = TITLE_TEXT;
-                               break;
-                       case RECTITEM:
-                               t = TITLE_RECTANGLE;
-                               break;
-                       case IMAGEITEM:
-                               t = TITLE_IMAGE;
-                               break;
-               }
-       }
-       enableToolbars(t);
-       showToolbars(t);
-       
+
+    // Find out which toolbars need to be shown, depending on selected item
+    TITLETOOL t = TITLE_SELECT;
+    QList<QGraphicsItem *> l = graphicsView->scene()->selectedItems();
+    if (l.size() > 0) {
+        switch (l.at(0)->type()) {
+        case TEXTITEM:
+            t = TITLE_TEXT;
+            break;
+        case RECTITEM:
+            t = TITLE_RECTANGLE;
+            break;
+        case IMAGEITEM:
+            t = TITLE_IMAGE;
+            break;
+        }
+    }
+    enableToolbars(t);
+    showToolbars(t);
+
     m_buttonCursor->setChecked(true);
     m_buttonText->setChecked(false);
     m_buttonRect->setChecked(false);
@@ -357,7 +357,7 @@ void TitleWidget::slotImageTool()
         }
     }
     m_scene->setTool(TITLE_SELECT);
-       showToolbars(TITLE_SELECT);
+    showToolbars(TITLE_SELECT);
     m_buttonRect->setChecked(false);
     m_buttonCursor->setChecked(true);
     m_buttonText->setChecked(false);
@@ -365,60 +365,60 @@ void TitleWidget::slotImageTool()
 
 void TitleWidget::showToolbars(TITLETOOL toolType)
 {
-       bool bText = false;
-       bool bRect = false;
-       bool bNone = false;
-       
-       switch (toolType) {
-               case TITLE_TEXT:
-                       bText = true;
-                       break;
-               case TITLE_RECTANGLE:
-                       bRect = true;
-                       break;
-               case TITLE_IMAGE: //fall through
-               default:
-                       bNone = true;
-                       break;
-       }
-       text_properties->setHidden(!bText);
-       rect_properties->setHidden(!bRect);
-       no_properties->setHidden(!bNone);
+    bool bText = false;
+    bool bRect = false;
+    bool bNone = false;
+
+    switch (toolType) {
+    case TITLE_TEXT:
+        bText = true;
+        break;
+    case TITLE_RECTANGLE:
+        bRect = true;
+        break;
+    case TITLE_IMAGE: //fall through
+    default:
+        bNone = true;
+        break;
+    }
+    text_properties->setHidden(!bText);
+    rect_properties->setHidden(!bRect);
+    no_properties->setHidden(!bNone);
 }
 
 void TitleWidget::enableToolbars(TITLETOOL toolType)
 {
-       // TITLETOOL is defined in graphicsscenerectmove.h
-       bool bFrame = false;
-       bool bText = false;
-       bool bRect = false;
-       bool bValue_w = false;
-       bool bValue_h = false;
-       
-       switch (toolType) {
-               case TITLE_SELECT:
-                       break;
-               case TITLE_TEXT:
-                       bFrame = true;
-                       bText = true;
-                       break;
-               case TITLE_RECTANGLE:
-                       bFrame = true;
-                       bRect = true;
-                       bValue_w = true;
-                       bValue_h = true;
-                       break;
-               case TITLE_IMAGE:
-                       bFrame = true;
-                       break;
-               default:
-                       break;
-       }
-       frame_properties->setEnabled(bFrame);
-       text_properties->setEnabled(bText);
-       rect_properties->setEnabled(bRect);
-       value_w->setEnabled(bValue_w);
-       value_h->setEnabled(bValue_h);
+    // TITLETOOL is defined in graphicsscenerectmove.h
+    bool bFrame = false;
+    bool bText = false;
+    bool bRect = false;
+    bool bValue_w = false;
+    bool bValue_h = false;
+
+    switch (toolType) {
+    case TITLE_SELECT:
+        break;
+    case TITLE_TEXT:
+        bFrame = true;
+        bText = true;
+        break;
+    case TITLE_RECTANGLE:
+        bFrame = true;
+        bRect = true;
+        bValue_w = true;
+        bValue_h = true;
+        break;
+    case TITLE_IMAGE:
+        bFrame = true;
+        break;
+    default:
+        break;
+    }
+    frame_properties->setEnabled(bFrame);
+    text_properties->setEnabled(bText);
+    rect_properties->setEnabled(bRect);
+    value_w->setEnabled(bValue_w);
+    value_h->setEnabled(bValue_h);
 }
 
 void TitleWidget::displayBackgroundFrame()
@@ -567,12 +567,12 @@ void TitleWidget::selectionChanged()
         origin_y_top->setChecked(false);
         updateTextOriginX();
         updateTextOriginY();
-               enableToolbars(TITLE_NONE);
+        enableToolbars(TITLE_NONE);
         if (blockX) origin_x_left->blockSignals(false);
         if (blockY) origin_y_top->blockSignals(false);
     } else if (l.size() == 1) {
         if (l.at(0)->type() == TEXTITEM) {
-                       showToolbars(TITLE_TEXT);
+            showToolbars(TITLE_TEXT);
             QGraphicsTextItem* i = static_cast <QGraphicsTextItem *>(l.at(0));
             //if (l[0]->hasFocus())
             toolBox->setCurrentIndex(0);
@@ -622,10 +622,10 @@ void TitleWidget::selectionChanged()
             updateAxisButtons(i);
             updateCoordinates(i);
             updateDimension(i);
-                       enableToolbars(TITLE_TEXT);
+            enableToolbars(TITLE_TEXT);
 
         } else if ((l.at(0))->type() == RECTITEM) {
-                       showToolbars(TITLE_RECTANGLE);
+            showToolbars(TITLE_RECTANGLE);
             settingUp = true;
             QGraphicsRectItem *rec = static_cast <QGraphicsRectItem *>(l.at(0));
             toolBox->setCurrentIndex(0);
@@ -645,17 +645,17 @@ void TitleWidget::selectionChanged()
             updateAxisButtons(l.at(0));
             updateCoordinates(rec);
             updateDimension(rec);
-                       enableToolbars(TITLE_RECTANGLE);
+            enableToolbars(TITLE_RECTANGLE);
 
         } else if (l.at(0)->type() == IMAGEITEM) {
             updateCoordinates(l.at(0));
             updateDimension(l.at(0));
 
-                       enableToolbars(TITLE_IMAGE);
+            enableToolbars(TITLE_IMAGE);
 
         } else {
             //toolBox->setCurrentIndex(0);
-                       enableToolbars(TITLE_NONE);
+            enableToolbars(TITLE_NONE);
             /*frame_properties->setEnabled(false);
             text_properties->setEnabled(false);
             rect_properties->setEnabled(false);*/

diff --git a/src/titlewidget.h b/src/titlewidget.h
index 1126c9e3bf049f67d6cad24dd710ad1554743c18..4a1439e6ea7903af6b35008b472af81f66a20425 100644 (file)
--- a/src/titlewidget.h
+++ b/src/titlewidget.h
@@ -114,11 +114,11 @@ private:
 
     void updateTextOriginX();
     void updateTextOriginY();
-       
-       /** \brief Enables the toolbars suiting to toolType */
-       void enableToolbars(TITLETOOL toolType);
-       /** \brief Shows the toolbars suiting to toolType */
-       void showToolbars(TITLETOOL toolType);
+
+    /** \brief Enables the toolbars suiting to toolType */
+    void enableToolbars(TITLETOOL toolType);
+    /** \brief Shows the toolbars suiting to toolType */
+    void showToolbars(TITLETOOL toolType);
 
 public slots:
     void slotNewText(QGraphicsTextItem *tt);