[Till Theato <root@tt...>]

Git commit bc083fabe4c9b19b4412b13a92d72b54a9248b75 by Till Theato.
Committed on 20/08/2012 at 15:11.
Pushed by theato into branch 'refactoring'.

Reformat.

M  +50   -37   src/core/bin/bin.cpp
M  +1    -1    src/plugins/cliptypes/CMakeLists.txt
M  +1    -1    src/plugins/cliptypes/imageclip/imagetimelineclipitem.cpp
R  +0    -0    src/plugins/cliptypes/videoclip/CMakeLists.txt [from: src/plugins/cliptypes/videocliptype/CMakeLists.txt - 100% similarity]
R  +0    -0    src/plugins/cliptypes/videoclip/kdenlivevideoclip.desktop [from: src/plugins/cliptypes/videocliptype/kdenlivevideoclip.desktop - 100% similarity]
R  +0    -0    src/plugins/cliptypes/videoclip/videoclipplugin.cpp [from: src/plugins/cliptypes/videocliptype/videoclipplugin.cpp - 100% similarity]
R  +0    -0    src/plugins/cliptypes/videoclip/videoclipplugin.h [from: src/plugins/cliptypes/videocliptype/videoclipplugin.h - 100% similarity]
R  +0    -0    src/plugins/cliptypes/videoclip/videoprojectclip.cpp [from: src/plugins/cliptypes/videocliptype/videoprojectclip.cpp - 100% similarity]
R  +0    -0    src/plugins/cliptypes/videoclip/videoprojectclip.h [from: src/plugins/cliptypes/videocliptype/videoprojectclip.h - 100% similarity]
R  +0    -0    src/plugins/cliptypes/videoclip/videotimelineclip.cpp [from: src/plugins/cliptypes/videocliptype/videotimelineclip.cpp - 100% similarity]
R  +0    -0    src/plugins/cliptypes/videoclip/videotimelineclip.h [from: src/plugins/cliptypes/videocliptype/videotimelineclip.h - 100% similarity]
R  +1    -1    src/plugins/cliptypes/videoclip/videotimelineclipitem.cpp [from: src/plugins/cliptypes/videocliptype/videotimelineclipitem.cpp - 096% similarity]
R  +0    -0    src/plugins/cliptypes/videoclip/videotimelineclipitem.h [from: src/plugins/cliptypes/videocliptype/videotimelineclipitem.h - 100% similarity]

http://commits.kde.org/kdenlive/bc083fabe4c9b19b4412b13a92d72b54a9248b75

diff --git a/src/core/bin/bin.cpp b/src/core/bin/bin.cpp
index bd151bc..c73f2d6 100644
--- a/src/core/bin/bin.cpp
+++ b/src/core/bin/bin.cpp
@@ -31,27 +31,34 @@ Bin::Bin(QWidget* parent) :
 {
     // TODO: proper ui, search line, add menu, ...
     QVBoxLayout *layout = new QVBoxLayout(this);
-    KToolBar *tb = new KToolBar(this);
-    tb->setToolButtonStyle(Qt::ToolButtonIconOnly);
-    tb->setIconDimensions(style()->pixelMetric(QStyle::PM_SmallIconSize));
-    layout->addWidget(tb);
-    QSlider *sl = new QSlider(Qt::Horizontal, this);
-    sl->setMaximumWidth(100);
-    sl->setValue(m_iconSize / 2);
-    connect(sl, SIGNAL(valueChanged(int)), this, SLOT(slotSetIconSize(int)));
-    tb->addWidget(sl);
+
+    KToolBar *toolbar = new KToolBar(this);
+    toolbar->setToolButtonStyle(Qt::ToolButtonIconOnly);
+    toolbar->setIconDimensions(style()->pixelMetric(QStyle::PM_SmallIconSize));
+    layout->addWidget(toolbar);
+
+    QSlider *slider = new QSlider(Qt::Horizontal, this);
+    slider->setMaximumWidth(100);
+    slider->setValue(m_iconSize / 2);
+    connect(slider, SIGNAL(valueChanged(int)), this, SLOT(slotSetIconSize(int)));
+    toolbar->addWidget(slider);
+
     KSelectAction *listType = new KSelectAction(KIcon("view-list-tree"), i18n("View Mode"), this);
-    KAction *a = listType->addAction(KIcon("view-list-tree"), i18n("Tree View"));
-    a->setData(BinTreeView);
-    if (m_listType == a->data().toInt()) listType->setCurrentAction(a);
-    a = listType->addAction(KIcon("view-list-icons"), i18n("Icon View"));
-    a->setData(BinIconView);
-    if (m_listType == a->data().toInt()) listType->setCurrentAction(a);
+    KAction *treeViewAction = listType->addAction(KIcon("view-list-tree"), i18n("Tree View"));
+    treeViewAction->setData(BinTreeView);
+    if (m_listType == treeViewAction->data().toInt()) {
+        listType->setCurrentAction(treeViewAction);
+    }
+    KAction *iconViewAction = listType->addAction(KIcon("view-list-icons"), i18n("Icon View"));
+    iconViewAction->setData(BinIconView);
+    if (m_listType == iconViewAction->data().toInt()) {
+        listType->setCurrentAction(iconViewAction);
+    }
     listType->setToolBarMode(KSelectAction::MenuMode);
     connect(listType, SIGNAL(triggered(QAction*)), this, SLOT(slotInitView(QAction *)));
-    tb->addAction(listType);
-    connect(pCore->projectManager(), SIGNAL(projectOpened(Project*)), this, SLOT(setProject(Project*)));
+    toolbar->addAction(listType);
 
+    connect(pCore->projectManager(), SIGNAL(projectOpened(Project*)), this, SLOT(setProject(Project*)));
 }
 
 Bin::~Bin()
@@ -74,44 +81,50 @@ void Bin::setProject(Project* project)
 void Bin::slotInitView(QAction *action)
 {
     if (action) {
-	int viewType = action->data().toInt();
-	if (viewType == m_listType) return;
-	if (m_listType == BinTreeView) {
-	    // save current treeview state (column width)
-	    QTreeView *view = static_cast<QTreeView*>(m_itemView);
-	    m_headerInfo = view->header()->saveState();
-	}
-	m_listType = (BinViewType) viewType;
+        int viewType = action->data().toInt();
+        if (viewType == m_listType) {
+            return;
+        }
+        if (m_listType == BinTreeView) {
+            // save current treeview state (column width)
+            QTreeView *view = static_cast<QTreeView*>(m_itemView);
+            m_headerInfo = view->header()->saveState();
+        }
+        m_listType = static_cast<BinViewType>(viewType);
     }
+    
     if (m_itemView) {
         delete m_itemView;
     }
+
     switch (m_listType) {
-      case BinIconView:
-	  m_itemView = new QListView();
-	  static_cast<QListView*>(m_itemView)->setViewMode(QListView::IconMode);
-	  break;
-      default:
-	  m_itemView = new QTreeView();
-	  break;
+    case BinIconView:
+        m_itemView = new QListView(this);
+        static_cast<QListView*>(m_itemView)->setViewMode(QListView::IconMode);
+        break;
+    default:
+        m_itemView = new QTreeView(this);
+        break;
     }
 
-    layout()->addWidget(m_itemView);
     m_itemView->setIconSize(QSize(m_iconSize, m_iconSize));
     m_itemView->setModel(m_itemModel);
     m_itemView->setSelectionModel(m_itemModel->selectionModel());
+    layout()->addWidget(m_itemView);
 
     // setup some default view specific parameters
     if (m_listType == BinTreeView) {
-	QTreeView *view = static_cast<QTreeView*>(m_itemView);
-	if (!m_headerInfo.isEmpty())
-	    view->header()->restoreState(m_headerInfo);
+        QTreeView *view = static_cast<QTreeView*>(m_itemView);
+        if (!m_headerInfo.isEmpty())
+            view->header()->restoreState(m_headerInfo);
     }
 }
 
 void Bin::slotSetIconSize(int size)
 {
-    if (!m_itemView) return;
+    if (!m_itemView) {
+        return;
+    }
     m_iconSize = size * 2;
     m_itemView->setIconSize(QSize(m_iconSize, m_iconSize));
 }
diff --git a/src/plugins/cliptypes/CMakeLists.txt b/src/plugins/cliptypes/CMakeLists.txt
index b0f3eba..f6eb35d 100644
--- a/src/plugins/cliptypes/CMakeLists.txt
+++ b/src/plugins/cliptypes/CMakeLists.txt
@@ -1,4 +1,4 @@
 
 add_subdirectory(imageclip)
-add_subdirectory(videocliptype)
+add_subdirectory(videoclip)
 install(FILES kdenliveclip.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
diff --git a/src/plugins/cliptypes/imageclip/imagetimelineclipitem.cpp b/src/plugins/cliptypes/imageclip/imagetimelineclipitem.cpp
index 5ff855b..75dd225 100644
--- a/src/plugins/cliptypes/imageclip/imagetimelineclipitem.cpp
+++ b/src/plugins/cliptypes/imageclip/imagetimelineclipitem.cpp
@@ -24,7 +24,7 @@ ImageTimelineClipItem::ImageTimelineClipItem(ImageTimelineClip* clip, QGraphicsI
 
 void ImageTimelineClipItem::paintBackgroundLayer(QPainter* painter, QRectF exposed)
 {
-    painter->setWorldMatrixEnabled(false);;
+    painter->setWorldMatrixEnabled(false);
     const QRectF mapped = painter->worldTransform().mapRect(rect());
 
     QPixmap thumbnail = m_projectClip->thumbnail().scaledToHeight(mapped.height());
diff --git a/src/plugins/cliptypes/videocliptype/CMakeLists.txt b/src/plugins/cliptypes/videoclip/CMakeLists.txt
similarity index 100%
rename from src/plugins/cliptypes/videocliptype/CMakeLists.txt
rename to src/plugins/cliptypes/videoclip/CMakeLists.txt
diff --git a/src/plugins/cliptypes/videocliptype/kdenlivevideoclip.desktop b/src/plugins/cliptypes/videoclip/kdenlivevideoclip.desktop
similarity index 100%
rename from src/plugins/cliptypes/videocliptype/kdenlivevideoclip.desktop
rename to src/plugins/cliptypes/videoclip/kdenlivevideoclip.desktop
diff --git a/src/plugins/cliptypes/videocliptype/videoclipplugin.cpp b/src/plugins/cliptypes/videoclip/videoclipplugin.cpp
similarity index 100%
rename from src/plugins/cliptypes/videocliptype/videoclipplugin.cpp
rename to src/plugins/cliptypes/videoclip/videoclipplugin.cpp
diff --git a/src/plugins/cliptypes/videocliptype/videoclipplugin.h b/src/plugins/cliptypes/videoclip/videoclipplugin.h
similarity index 100%
rename from src/plugins/cliptypes/videocliptype/videoclipplugin.h
rename to src/plugins/cliptypes/videoclip/videoclipplugin.h
diff --git a/src/plugins/cliptypes/videocliptype/videoprojectclip.cpp b/src/plugins/cliptypes/videoclip/videoprojectclip.cpp
similarity index 100%
rename from src/plugins/cliptypes/videocliptype/videoprojectclip.cpp
rename to src/plugins/cliptypes/videoclip/videoprojectclip.cpp
diff --git a/src/plugins/cliptypes/videocliptype/videoprojectclip.h b/src/plugins/cliptypes/videoclip/videoprojectclip.h
similarity index 100%
rename from src/plugins/cliptypes/videocliptype/videoprojectclip.h
rename to src/plugins/cliptypes/videoclip/videoprojectclip.h
diff --git a/src/plugins/cliptypes/videocliptype/videotimelineclip.cpp b/src/plugins/cliptypes/videoclip/videotimelineclip.cpp
similarity index 100%
rename from src/plugins/cliptypes/videocliptype/videotimelineclip.cpp
rename to src/plugins/cliptypes/videoclip/videotimelineclip.cpp
diff --git a/src/plugins/cliptypes/videocliptype/videotimelineclip.h b/src/plugins/cliptypes/videoclip/videotimelineclip.h
similarity index 100%
rename from src/plugins/cliptypes/videocliptype/videotimelineclip.h
rename to src/plugins/cliptypes/videoclip/videotimelineclip.h
diff --git a/src/plugins/cliptypes/videocliptype/videotimelineclipitem.cpp b/src/plugins/cliptypes/videoclip/videotimelineclipitem.cpp
similarity index 96%
rename from src/plugins/cliptypes/videocliptype/videotimelineclipitem.cpp
rename to src/plugins/cliptypes/videoclip/videotimelineclipitem.cpp
index a628be0..9f9aa83 100644
--- a/src/plugins/cliptypes/videocliptype/videotimelineclipitem.cpp
+++ b/src/plugins/cliptypes/videoclip/videotimelineclipitem.cpp
@@ -24,7 +24,7 @@ VideoTimelineClipItem::VideoTimelineClipItem(VideoTimelineClip* clip, QGraphicsI
 
 void VideoTimelineClipItem::paintBackgroundLayer(QPainter* painter, QRectF exposed)
 {
-    painter->setWorldMatrixEnabled(false);;
+    painter->setWorldMatrixEnabled(false);
     const QRectF mapped = painter->worldTransform().mapRect(rect());
 
     QPixmap thumbnail = m_projectClip->thumbnail().scaledToHeight(mapped.height());
diff --git a/src/plugins/cliptypes/videocliptype/videotimelineclipitem.h b/src/plugins/cliptypes/videoclip/videotimelineclipitem.h
similarity index 100%
rename from src/plugins/cliptypes/videocliptype/videotimelineclipitem.h
rename to src/plugins/cliptypes/videoclip/videotimelineclipitem.h