X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.cpp;h=fcbc8e56ce924160378e0b79b52ad1b6407f3a87;hb=a3eee7be24126f5a3458d488f44cd61c66135e17;hp=8016c7cc84bf9f24c1cfbd8a7d6e3e2d2d0c5d5f;hpb=8be6c85ffd189c228938a982d0d6a5f97650481a;p=kdenlive

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index 8016c7cc..fcbc8e56 100644
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -26,7 +26,7 @@
 #include "kdenlivesettings.h"
 #include "slideshowclip.h"
 #include "ui_colorclip_ui.h"
-#include "titlewidget.h"
+#include "widgets/titlewidget.h"
 #include "definitions.h"
 #include "clipmanager.h"
 #include "docclipbase.h"
@@ -63,15 +63,15 @@
 #include <KHBox>
 
 #ifdef USE_NEPOMUK
-#include <nepomuk/global.h>
-#include <nepomuk/resourcemanager.h>
-#include <Nepomuk/Resource>
-//#include <nepomuk/tag.h>
+  #include <nepomuk/global.h>
+  #include <nepomuk/resourcemanager.h>
+  #include <Nepomuk/Resource>
+  //#include <nepomuk/tag.h>
 #endif
 
 #ifdef USE_NEPOMUKCORE
-#include <nepomuk2/resourcemanager.h>
-#include <Nepomuk2/Resource>
+  #include <nepomuk2/resourcemanager.h>
+  #include <Nepomuk2/Resource>
 #endif
 
 #include <QMouseEvent>
@@ -86,6 +86,7 @@
 #include <QtConcurrentRun>
 #include <QVBoxLayout>
 #include <KPassivePopup>
+#include <QGLWidget>
 
 
 MyMessageWidget::MyMessageWidget(QWidget *parent) : KMessageWidget(parent) {}
@@ -185,7 +186,7 @@ void SmallInfoLabel::slotSetJobCount(int jobCount)
     
 }
 
-ProjectList::ProjectList(QWidget *parent) :
+ProjectList::ProjectList(QGLWidget *glContext, QWidget *parent) :
     QWidget(parent)
   , m_render(NULL)
   , m_fps(-1)
@@ -204,6 +205,7 @@ ProjectList::ProjectList(QWidget *parent) :
   , m_abortAllJobs(false)
   , m_closing(false)
   , m_invalidClipDialog(NULL)
+  , m_mainGLContext(glContext)
 {
     qRegisterMetaType<stringMap> ("stringMap");
     QVBoxLayout *layout = new QVBoxLayout;
@@ -324,7 +326,7 @@ ProjectList::~ProjectList()
 {
     m_abortAllJobs = true;
     for (int i = 0; i < m_jobList.count(); ++i) {
-        m_jobList.at(i)->setStatus(JOBABORTED);
+        m_jobList.at(i)->setStatus(JobAborted);
     }
     m_closing = true;
     m_thumbnailQueue.clear();
@@ -454,14 +456,14 @@ void ProjectList::slotEditClip()
 {
     QList<QTreeWidgetItem *> list = m_listView->selectedItems();
     if (list.isEmpty()) return;
-    if (list.count() > 1 || list.at(0)->type() == PROJECTFOLDERTYPE) {
+    if (list.count() > 1 || list.at(0)->type() == ProjectFoldeType) {
         editClipSelection(list);
         return;
     }
     ProjectItem *item;
-    if (!m_listView->currentItem() || m_listView->currentItem()->type() == PROJECTFOLDERTYPE)
+    if (!m_listView->currentItem() || m_listView->currentItem()->type() == ProjectFoldeType)
         return;
-    if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE)
+    if (m_listView->currentItem()->type() == ProjectSubclipType)
         item = static_cast <ProjectItem*>(m_listView->currentItem()->parent());
     else
         item = static_cast <ProjectItem*>(m_listView->currentItem());
@@ -494,7 +496,7 @@ void ProjectList::editClipSelection(QList<QTreeWidgetItem *> list)
     ProjectItem *item;
     for (int i = 0; i < list.count(); ++i) {
         item = NULL;
-        if (list.at(i)->type() == PROJECTFOLDERTYPE) {
+        if (list.at(i)->type() == ProjectFoldeType) {
             // Add folder items to the list
             int ct = list.at(i)->childCount();
             for (int j = 0; j < ct; j++) {
@@ -502,7 +504,7 @@ void ProjectList::editClipSelection(QList<QTreeWidgetItem *> list)
             }
             continue;
         }
-        else if (list.at(i)->type() == PROJECTSUBCLIPTYPE)
+        else if (list.at(i)->type() == ProjectSubclipType)
             item = static_cast <ProjectItem*>(list.at(i)->parent());
         else
             item = static_cast <ProjectItem*>(list.at(i));
@@ -512,7 +514,7 @@ void ProjectList::editClipSelection(QList<QTreeWidgetItem *> list)
             // check properties
             DocClipBase *clip = item->referencedClip();
             if (clipList.contains(clip)) continue;
-            if (clip->clipType() == IMAGE) {
+            if (clip->clipType() == Image) {
                 hasImages = true;
                 if (clip->getProperty("transparency").isEmpty() || clip->getProperty("transparency").toInt() == 0) {
                     if (transparency == "-") {
@@ -535,7 +537,7 @@ void ProjectList::editClipSelection(QList<QTreeWidgetItem *> list)
                     }
                 }
             }
-            if (clip->clipType() != COLOR && clip->clipType() != IMAGE && clip->clipType() != TEXT)
+            if (clip->clipType() != Color && clip->clipType() != Image && clip->clipType() != Text)
                 allowDurationChange = false;
             if (allowDurationChange && commonDuration != 0) {
                 if (commonDuration == -1)
@@ -578,20 +580,20 @@ void ProjectList::editClipSelection(QList<QTreeWidgetItem *> list)
 void ProjectList::slotOpenClip()
 {
     ProjectItem *item;
-    if (!m_listView->currentItem() || m_listView->currentItem()->type() == PROJECTFOLDERTYPE)
+    if (!m_listView->currentItem() || m_listView->currentItem()->type() == ProjectFoldeType)
         return;
     if (m_listView->currentItem()->type() == QTreeWidgetItem::UserType + 1)
         item = static_cast <ProjectItem*>(m_listView->currentItem()->parent());
     else
         item = static_cast <ProjectItem*>(m_listView->currentItem());
     if (item) {
-        if (item->clipType() == IMAGE) {
+        if (item->clipType() == Image) {
             if (KdenliveSettings::defaultimageapp().isEmpty())
                 KMessageBox::sorry(kapp->activeWindow(), i18n("Please set a default application to open images in the Settings dialog"));
             else
                 QProcess::startDetached(KdenliveSettings::defaultimageapp(), QStringList() << item->clipUrl().path());
         }
-        if (item->clipType() == AUDIO) {
+        if (item->clipType() == Audio) {
             if (KdenliveSettings::defaultaudioapp().isEmpty())
                 KMessageBox::sorry(kapp->activeWindow(), i18n("Please set a default application to open audio files in the Settings dialog"));
             else
@@ -606,7 +608,7 @@ void ProjectList::cleanup()
     QTreeWidgetItemIterator it(m_listView);
     ProjectItem *item;
     while (*it) {
-        if ((*it)->type() != PROJECTCLIPTYPE) {
+        if ((*it)->type() != ProjectClipType) {
             it++;
             continue;
         }
@@ -625,7 +627,7 @@ void ProjectList::trashUnusedClips()
     QStringList ids;
     QStringList urls;
     while (*it) {
-        if ((*it)->type() != PROJECTCLIPTYPE) {
+        if ((*it)->type() != ProjectClipType) {
             it++;
             continue;
         }
@@ -642,7 +644,7 @@ void ProjectList::trashUnusedClips()
     // Check that we don't use the URL in another clip
     QTreeWidgetItemIterator it2(m_listView);
     while (*it2) {
-        if ((*it2)->type() != PROJECTCLIPTYPE) {
+        if ((*it2)->type() != ProjectClipType) {
             it2++;
             continue;
         }
@@ -670,8 +672,8 @@ void ProjectList::slotReloadClip(const QString &id)
     }
     ProjectItem *item;
     for (int i = 0; i < selected.count(); ++i) {
-        if (selected.at(i)->type() != PROJECTCLIPTYPE) {
-            if (selected.at(i)->type() == PROJECTFOLDERTYPE) {
+        if (selected.at(i)->type() != ProjectClipType) {
+            if (selected.at(i)->type() == ProjectFoldeType) {
                 for (int j = 0; j < selected.at(i)->childCount(); j++)
                     selected.append(selected.at(i)->child(j));
             }
@@ -684,20 +686,20 @@ void ProjectList::slotReloadClip(const QString &id)
                 kDebug()<<"//// TRYING TO RELOAD: "<<item->clipId()<<", but it is busy";
                 continue;
             }
-            CLIPTYPE t = item->clipType();
-            if (t == TEXT) {
+            ClipType t = item->clipType();
+            if (t == Text) {
                 if (clip && !clip->getProperty("xmltemplate").isEmpty())
                     regenerateTemplate(item);
-            } else if (t != COLOR && t != SLIDESHOW && clip && clip->checkHash() == false) {
+            } else if (t != Color && t != SlideShow && clip && clip->checkHash() == false) {
                 item->referencedClip()->setPlaceHolder(true);
                 item->setProperty("file_hash", QString());
-            } else if (t == IMAGE) {
+            } else if (t == Image) {
                 //clip->getProducer() clip->getProducer()->set("force_reload", 1);
             }
 
             QDomElement e = item->toXml();
             // Make sure we get the correct producer length if it was adjusted in timeline
-            if (t == COLOR || t == IMAGE || t == SLIDESHOW || t == TEXT) {
+            if (t == Color || t == Image || t == SlideShow || t == Text) {
                 int length = QString(clip->producerProperty("length")).toInt();
                 if (length > 0 && !e.hasAttribute("length")) {
                     e.setAttribute("length", length);
@@ -789,7 +791,7 @@ bool ProjectList::hasMissingClips()
     bool missing = false;
     QTreeWidgetItemIterator it(m_listView);
     while (*it) {
-        if ((*it)->type() == PROJECTCLIPTYPE && !((*it)->flags() & Qt::ItemIsDragEnabled)) {
+        if ((*it)->type() == ProjectClipType && !((*it)->flags() & Qt::ItemIsDragEnabled)) {
             missing = true;
             break;
         }
@@ -810,7 +812,7 @@ void ProjectList::slotClipSelected()
     QTreeWidgetItem *item = m_listView->currentItem();
     ProjectItem *clip = NULL;
     if (item) {
-        if (item->type() == PROJECTFOLDERTYPE) {
+        if (item->type() == ProjectFoldeType) {
             emit clipSelected(NULL);
             m_editButton->defaultAction()->setEnabled(item->childCount() > 0);
             m_deleteButton->defaultAction()->setEnabled(true);
@@ -820,7 +822,7 @@ void ProjectList::slotClipSelected()
             m_transcodeAction->setEnabled(false);
             m_clipsActionsMenu->setEnabled(false);
         } else {
-            if (item->type() == PROJECTSUBCLIPTYPE) {
+            if (item->type() == ProjectSubclipType) {
                 // this is a sub item, use base clip
                 m_deleteButton->defaultAction()->setEnabled(true);
                 clip = static_cast <ProjectItem*>(item->parent());
@@ -848,10 +850,10 @@ void ProjectList::slotClipSelected()
             m_extractAudioAction->setEnabled(true);
             m_transcodeAction->setEnabled(true);
             m_clipsActionsMenu->setEnabled(true);
-            if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) {
+            if (clip && clip->clipType() == Image && !KdenliveSettings::defaultimageapp().isEmpty()) {
                 m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp()));
                 m_openAction->setEnabled(true);
-            } else if (clip && clip->clipType() == AUDIO && !KdenliveSettings::defaultaudioapp().isEmpty()) {
+            } else if (clip && clip->clipType() == Audio && !KdenliveSettings::defaultaudioapp().isEmpty()) {
                 m_openAction->setIcon(KIcon(KdenliveSettings::defaultaudioapp()));
                 m_openAction->setEnabled(true);
             } else {
@@ -879,7 +881,7 @@ void ProjectList::slotClipSelected()
 void ProjectList::adjustProxyActions(ProjectItem *clip) const
 {
     if (!m_proxyAction) return;
-    if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == SLIDESHOW || clip->clipType() == AUDIO) {
+    if (clip == NULL || clip->type() != ProjectClipType || clip->clipType() == Color || clip->clipType() == Text || clip->clipType() == SlideShow || clip->clipType() == Audio) {
         m_proxyAction->setEnabled(false);
         return;
     }
@@ -894,7 +896,7 @@ void ProjectList::adjustProxyActions(ProjectItem *clip) const
 void ProjectList::adjustStabilizeActions(ProjectItem *clip) const
 {
 
-    if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == SLIDESHOW) {
+    if (clip == NULL || clip->type() != ProjectClipType || clip->clipType() == Color || clip->clipType() == Text || clip->clipType() == SlideShow) {
         m_clipsActionsMenu->setEnabled(false);
         return;
     }
@@ -904,7 +906,7 @@ void ProjectList::adjustStabilizeActions(ProjectItem *clip) const
 
 void ProjectList::adjustTranscodeActions(ProjectItem *clip) const
 {
-    if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST || clip->clipType() == SLIDESHOW) {
+    if (clip == NULL || clip->type() != ProjectClipType || clip->clipType() == Color || clip->clipType() == Text || clip->clipType() == Playlist || clip->clipType() == SlideShow) {
         m_transcodeAction->setEnabled(false);
         m_extractAudioAction->setEnabled(false);
         return;
@@ -961,7 +963,7 @@ void ProjectList::slotUpdateClipProperties(ProjectItem *clip, QMap <QString, QSt
     if (properties.contains("proxy")) {
         if (properties.value("proxy") == "-" || properties.value("proxy").isEmpty())
             // this should only apply to proxy jobs
-            clip->setConditionalJobStatus(NOJOB, PROXYJOB);
+            clip->setConditionalJobStatus(NoJob, PROXYJOB);
     }
     if (properties.contains("name")) {
         monitorItemEditing(false);
@@ -970,12 +972,18 @@ void ProjectList::slotUpdateClipProperties(ProjectItem *clip, QMap <QString, QSt
         emit clipNameChanged(clip->clipId(), properties.value("name"));
     }
     if (properties.contains("description")) {
-        CLIPTYPE type = clip->clipType();
+#ifdef USE_NEPOMUK
+        ClipType type = clip->clipType();
+#endif
         monitorItemEditing(false);
         clip->setText(1, properties.value("description"));
         monitorItemEditing(true);
+
 #ifdef USE_NEPOMUK
-        if (KdenliveSettings::activate_nepomuk() && (type == AUDIO || type == VIDEO || type == AV || type == IMAGE || type == PLAYLIST)) {
+        bool hasType = (type == Audio || type == Video || type == AV ||
+                        type == Image || type == Playlist);
+
+        if (KdenliveSettings::activate_nepomuk() && hasType) {
             // Use Nepomuk system to store clip description
             Nepomuk::Resource f(clip->clipUrl().path());
             f.setDescription(properties.value("description"));
@@ -987,7 +995,7 @@ void ProjectList::slotUpdateClipProperties(ProjectItem *clip, QMap <QString, QSt
 
 void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column)
 {
-    if (item->type() == PROJECTSUBCLIPTYPE) {
+    if (item->type() == ProjectSubclipType) {
         // this is a sub-item
         if (column == 1) {
             // user edited description
@@ -999,7 +1007,7 @@ void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column)
         }
         return;
     }
-    if (item->type() == PROJECTFOLDERTYPE) {
+    if (item->type() == ProjectFoldeType) {
         if (column == 0) {
             FolderProjectItem *folder = static_cast <FolderProjectItem*>(item);
             if (item->text(0) == folder->groupName()) return;
@@ -1023,7 +1031,7 @@ void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column)
             oldprops["description"] = clip->referencedClip()->getProperty("description");
             newprops["description"] = item->text(1);
 
-            if (clip->clipType() == TEXT) {
+            if (clip->clipType() == Text) {
                 // This is a text template clip, update the image
                 /*oldprops.insert("xmldata", clip->referencedClip()->getProperty("xmldata"));
                 newprops.insert("xmldata", generateTemplateXml(clip->referencedClip()->getProperty("xmltemplate"), item->text(2)).toString());*/
@@ -1071,13 +1079,13 @@ void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item)
     m_clipsActionsMenu->setEnabled(enable);
     if (enable) {
         ProjectItem *clip = NULL;
-        if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) {
+        if (m_listView->currentItem()->type() == ProjectSubclipType) {
             clip = static_cast <ProjectItem*>(item->parent());
             m_extractAudioAction->setEnabled(false);
             m_transcodeAction->setEnabled(false);
             m_clipsActionsMenu->setEnabled(false);
             adjustProxyActions(clip);
-        } else if (m_listView->currentItem()->type() == PROJECTCLIPTYPE) {
+        } else if (m_listView->currentItem()->type() == ProjectClipType) {
             clip = static_cast <ProjectItem*>(item);
             // Display relevant transcoding actions only
             adjustTranscodeActions(clip);
@@ -1090,10 +1098,10 @@ void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item)
             m_transcodeAction->setEnabled(false);
             m_clipsActionsMenu->setEnabled(false);
         }
-        if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) {
+        if (clip && clip->clipType() == Image && !KdenliveSettings::defaultimageapp().isEmpty()) {
             m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp()));
             m_openAction->setEnabled(true);
-        } else if (clip && clip->clipType() == AUDIO && !KdenliveSettings::defaultaudioapp().isEmpty()) {
+        } else if (clip && clip->clipType() == Audio && !KdenliveSettings::defaultaudioapp().isEmpty()) {
             m_openAction->setIcon(KIcon(KdenliveSettings::defaultaudioapp()));
             m_openAction->setEnabled(true);
         } else {
@@ -1117,12 +1125,12 @@ void ProjectList::slotRemoveClip()
     QUndoCommand *delCommand = new QUndoCommand();
     delCommand->setText(i18n("Delete Clip Zone"));
     for (int i = 0; i < selected.count(); ++i) {
-        if (selected.at(i)->type() == PROJECTSUBCLIPTYPE) {
+        if (selected.at(i)->type() == ProjectSubclipType) {
             // subitem
             SubProjectItem *sub = static_cast <SubProjectItem *>(selected.at(i));
             ProjectItem *item = static_cast <ProjectItem *>(sub->parent());
             new AddClipCutCommand(this, item->clipId(), sub->zone().x(), sub->zone().y(), sub->description(), false, true, delCommand);
-        } else if (selected.at(i)->type() == PROJECTFOLDERTYPE) {
+        } else if (selected.at(i)->type() == ProjectFoldeType) {
             // folder
             FolderProjectItem *folder = static_cast <FolderProjectItem *>(selected.at(i));
             folderids[folder->groupName()] = folder->clipId();
@@ -1161,7 +1169,7 @@ void ProjectList::updateButtons() const
         if (!m_listView->currentItem())
             m_listView->setCurrentItem(m_listView->topLevelItem(0));
         QTreeWidgetItem *item = m_listView->currentItem();
-        if (item && item->type() == PROJECTCLIPTYPE) {
+        if (item && item->type() == ProjectClipType) {
             m_editButton->defaultAction()->setEnabled(true);
             m_openAction->setEnabled(true);
             m_reloadAction->setEnabled(true);
@@ -1169,7 +1177,7 @@ void ProjectList::updateButtons() const
             m_clipsActionsMenu->setEnabled(true);
             return;
         }
-        else if (item && item->type() == PROJECTFOLDERTYPE && item->childCount() > 0) {
+        else if (item && item->type() == ProjectFoldeType && item->childCount() > 0) {
             m_editButton->defaultAction()->setEnabled(true);
         }
         else m_editButton->defaultAction()->setEnabled(false);
@@ -1308,7 +1316,7 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties)
     if (item == NULL) {
         item = new ProjectItem(m_listView, clip, pixelSize);
     }
-    if (item->data(0, DurationRole).isNull()) item->setData(0, DurationRole, i18n("Loading"));
+    if (item->data(0, ItemDelegate::DurationRole).isNull()) item->setData(0, ItemDelegate::DurationRole, i18n("Loading"));
     connect(clip, SIGNAL(createProxy(QString)), this, SLOT(slotCreateProxy(QString)));
     connect(clip, SIGNAL(abortProxy(QString,QString)), this, SLOT(slotAbortProxy(QString,QString)));
 
@@ -1376,7 +1384,7 @@ void ProjectList::slotGotProxy(const QString &proxyPath)
     ProjectItem *item;
 
     while (*it && !m_closing) {
-        if ((*it)->type() == PROJECTCLIPTYPE) {
+        if ((*it)->type() == ProjectClipType) {
             item = static_cast <ProjectItem *>(*it);
             if (item->referencedClip()->getProperty("proxy") == proxyPath)
                 slotGotProxy(item);
@@ -1406,8 +1414,8 @@ void ProjectList::slotGotProxy(ProjectItem *item)
     QDomElement e = clip->toXML().cloneNode().toElement();
 
     // Make sure we get the correct producer length if it was adjusted in timeline
-    CLIPTYPE t = item->clipType();
-    if (t == COLOR || t == IMAGE || t == SLIDESHOW || t == TEXT) {
+    ClipType t = item->clipType();
+    if (t == Color || t == Image || t == SlideShow || t == Text) {
         int length = QString(clip->producerProperty("length")).toInt();
         if (length > 0 && !e.hasAttribute("length")) {
             e.setAttribute("length", length);
@@ -1422,7 +1430,7 @@ void ProjectList::slotResetProjectList()
     m_listView->blockSignals(true);
     m_abortAllJobs = true;
     for (int i = 0; i < m_jobList.count(); ++i) {
-        m_jobList.at(i)->setStatus(JOBABORTED);
+        m_jobList.at(i)->setStatus(JobAborted);
     }
     m_closing = true;
     m_jobThreads.waitForFinished();
@@ -1444,7 +1452,9 @@ void ProjectList::slotUpdateClip(const QString &id)
 {
     ProjectItem *item = getItemById(id);
     monitorItemEditing(false);
-    if (item) item->setData(0, UsageRole, QString::number(item->numReferences()));
+    if (item){
+        item->setData(0, ItemDelegate::UsageRole, QString::number(item->numReferences()));
+    }
     monitorItemEditing(true);
 }
 
@@ -1523,6 +1533,10 @@ void ProjectList::getCachedThumbnail(SubProjectItem *item)
 
 void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, const QStringList &brokenClips)
 {
+    // We are in a new thread, so we need a new OpenGL context for the remainder of the function.
+    QGLWidget ctx(0, m_mainGLContext);
+    ctx.makeCurrent();
+
     if (!m_allClipsProcessed) m_listView->setEnabled(false);
     m_listView->setSortingEnabled(false);
     QTreeWidgetItemIterator it(m_listView);
@@ -1544,7 +1558,7 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, cons
 
     while (*it) {
         emit displayMessage(i18n("Loading thumbnails"), (int)(100 *(max - ct++) / max));
-        if ((*it)->type() == PROJECTSUBCLIPTYPE) {
+        if ((*it)->type() == ProjectSubclipType) {
             // subitem
             SubProjectItem *sub = static_cast <SubProjectItem *>(*it);
             if (displayRatioChanged) {
@@ -1556,7 +1570,7 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, cons
             }
             ++it;
             continue;
-        } else if ((*it)->type() == PROJECTFOLDERTYPE) {
+        } else if ((*it)->type() == ProjectFoldeType) {
             // folder
             ++it;
             continue;
@@ -1567,7 +1581,7 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, cons
                 bool replace = false;
                 if (brokenClips.contains(item->clipId())) {
                     // if this is a proxy clip, disable proxy
-                    item->setConditionalJobStatus(NOJOB, PROXYJOB);
+                    item->setConditionalJobStatus(NoJob, PROXYJOB);
                     discardJobs(item->clipId(), PROXYJOB);
                     clip->setProperty("proxy", "-");
                     replace = true;
@@ -1611,7 +1625,7 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, cons
                 else if (!item->hasPixmap()) {
                     getCachedThumbnail(item);
                 }
-                if (item->data(0, DurationRole).toString().isEmpty()) {
+                if (item->data(0, ItemDelegate::DurationRole).toString().isEmpty()) {
                     item->changeDuration(clip->getProducer()->get_playtime());
                 }
                 if (clip->isPlaceHolder()) {
@@ -1630,7 +1644,7 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, cons
                     slotCreateProxy(clip->getId());
                 }
             }
-            item->setData(0, UsageRole, QString::number(item->numReferences()));
+            item->setData(0, ItemDelegate::UsageRole, QString::number(item->numReferences()));
         }
         ++it;
     }
@@ -1849,7 +1863,7 @@ void ProjectList::slotRemoveInvalidProxy(const QString &id, bool durationError)
             kDebug() << "Proxy duration is wrong, try changing transcoding parameters.";
             emit displayMessage(i18n("Proxy clip unusable (duration is different from original)."), -2, ErrorMessage);
         }
-        slotUpdateJobStatus(item, PROXYJOB, JOBCRASHED, i18n("Failed to create proxy for %1. check parameters", item->text(0)), "project_settings");
+        slotUpdateJobStatus(item, PROXYJOB, JobCrashed, i18n("Failed to create proxy for %1. check parameters", item->text(0)), "project_settings");
         QString path = item->referencedClip()->getProperty("proxy");
         KUrl proxyFolder(m_doc->projectFolder().path( KUrl::AddTrailingSlash) + "proxy/");
 
@@ -1971,7 +1985,7 @@ QStringList ProjectList::getGroup() const
 {
     QStringList result;
     QTreeWidgetItem *item = m_listView->currentItem();
-    while (item && item->type() != PROJECTFOLDERTYPE)
+    while (item && item->type() != ProjectFoldeType)
         item = item->parent();
 
     if (item) {
@@ -1988,7 +2002,7 @@ void ProjectList::setDocument(KdenliveDoc *doc)
     m_listView->blockSignals(true);
     m_abortAllJobs = true;
     for (int i = 0; i < m_jobList.count(); ++i) {
-        m_jobList.at(i)->setStatus(JOBABORTED);
+        m_jobList.at(i)->setStatus(JobAborted);
     }
     m_closing = true;
     m_jobThreads.waitForFinished();
@@ -2043,7 +2057,7 @@ void ProjectList::slotSetThumbnail(const QString &id, int framePos, QImage img)
     if (!item && framePos == 0) pItem = getItemById(id);
     if (!item && !pItem) return;
     if (item) {
-        if (item->type() == PROJECTCLIPTYPE) static_cast<ProjectItem*>(item)->setPixmap(QPixmap::fromImage(img));
+        if (item->type() == ProjectClipType) static_cast<ProjectItem*>(item)->setPixmap(QPixmap::fromImage(img));
         else item->setData(0, Qt::DecorationRole, QPixmap::fromImage(img));
     }
     else if (pItem) pItem->setPixmap(QPixmap::fromImage(img));
@@ -2068,7 +2082,7 @@ QDomElement ProjectList::producersList()
     doc.appendChild(prods);
     QTreeWidgetItemIterator it(m_listView);
     while (*it) {
-        if ((*it)->type() != PROJECTCLIPTYPE) {
+        if ((*it)->type() != ProjectClipType) {
             // subitem
             ++it;
             continue;
@@ -2140,8 +2154,8 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update)
     ProjectItem *item = NULL;
     bool isSubItem = false;
     int frame;
-    if (it->type() == PROJECTFOLDERTYPE) return;
-    if (it->type() == PROJECTSUBCLIPTYPE) {
+    if (it->type() == ProjectFoldeType) return;
+    if (it->type() == ProjectSubclipType) {
         item = static_cast <ProjectItem *>(it->parent());
         frame = static_cast <SubProjectItem *>(it)->zone().x();
         isSubItem = true;
@@ -2160,10 +2174,10 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update)
         int height = m_listView->iconSize().height();
         int swidth = (int)(height  * m_render->frameRenderWidth() / m_render->renderHeight()+ 0.5);
         int dwidth = (int)(height  * m_render->dar() + 0.5);
-        if (clip->clipType() == IMAGE) {
+        if (clip->clipType() == Image) {
             img = KThumb::getFrame(item->referencedClip()->getProducer(), 0, swidth, dwidth, height);
         }
-        else if (clip->clipType() != AUDIO) {
+        else if (clip->clipType() != Audio) {
             img = item->referencedClip()->extractImage(frame, dwidth, height);
         }
         if (!img.isNull()) {
@@ -2190,8 +2204,8 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update)
 
 void ProjectList::extractMetadata(DocClipBase *clip)
 {
-    CLIPTYPE t = clip->clipType();
-    if (t != AV && t != VIDEO) {
+    ClipType t = clip->clipType();
+    if (t != AV && t != Video) {
         // Currently, we only use exiftool on video files
         return;
     }
@@ -2287,27 +2301,27 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce
         // Proxy stuff
         QString size = properties.value("frame_size");
         if (!useProxy() && clip->getProperty("proxy").isEmpty()) {
-            item->setConditionalJobStatus(NOJOB, PROXYJOB);
+            item->setConditionalJobStatus(NoJob, PROXYJOB);
             discardJobs(clipId, PROXYJOB);
         }
         if (useProxy() && generateProxy() && clip->getProperty("proxy") == "-") {
-            item->setConditionalJobStatus(NOJOB, PROXYJOB);
+            item->setConditionalJobStatus(NoJob, PROXYJOB);
             discardJobs(clipId, PROXYJOB);
         }
         else if (useProxy() && !item->hasProxy() && !hasPendingJob(item, PROXYJOB)) {
             // proxy video and image clips
             int maxSize;
-            CLIPTYPE t = item->clipType();
-            if (t == IMAGE) maxSize = m_doc->getDocumentProperty("proxyimageminsize").toInt();
+            ClipType t = item->clipType();
+            if (t == Image) maxSize = m_doc->getDocumentProperty("proxyimageminsize").toInt();
             else maxSize = m_doc->getDocumentProperty("proxyminsize").toInt();
-            if ((((t == AV || t == VIDEO || t == PLAYLIST) && generateProxy()) || (t == IMAGE && generateImageProxy())) && (size.section('x', 0, 0).toInt() > maxSize || size.section('x', 1, 1).toInt() > maxSize)) {
+            if ((((t == AV || t == Video || t == Playlist) && generateProxy()) || (t == Image && generateImageProxy())) && (size.section('x', 0, 0).toInt() > maxSize || size.section('x', 1, 1).toInt() > maxSize)) {
                 if (clip->getProperty("proxy").isEmpty()) {
                     KUrl proxyPath = m_doc->projectFolder();
                     proxyPath.addPath("proxy/");
-                    proxyPath.addPath(clip->getClipHash() + '.' + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension")));
+                    proxyPath.addPath(clip->getClipHash() + '.' + (t == Image ? "png" : m_doc->getDocumentProperty("proxyextension")));
                     QMap <QString, QString> newProps;
                     // insert required duration for proxy
-                    if (t != IMAGE) newProps.insert("proxy_out", clip->producerProperty("out"));
+                    if (t != Image) newProps.insert("proxy_out", clip->producerProperty("out"));
                     newProps.insert("proxy", proxyPath.path());
                     QMap <QString, QString> oldProps = clip->properties();
                     oldProps.insert("proxy", QString());
@@ -2334,7 +2348,7 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce
                 m_listView->setCurrentItem(item);
             bool updatedProfile = false;
             if (item->parent()) {
-                if (item->parent()->type() == PROJECTFOLDERTYPE)
+                if (item->parent()->type() == ProjectFoldeType)
                     static_cast <FolderProjectItem *>(item->parent())->switchIcon();
             } else if (KdenliveSettings::checkfirstprojectclip() &&  m_listView->topLevelItemCount() == 1 && m_refreshed && m_allClipsProcessed) {
                 // this is the first clip loaded in project, check if we want to adjust project settings to the clip
@@ -2366,7 +2380,7 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce
 bool ProjectList::adjustProjectProfileToItem(ProjectItem *item)
 {
     if (item == NULL) {
-        if (m_listView->currentItem() && m_listView->currentItem()->type() != PROJECTFOLDERTYPE)
+        if (m_listView->currentItem() && m_listView->currentItem()->type() != ProjectFoldeType)
             item = static_cast <ProjectItem*>(m_listView->currentItem());
     }
     if (item == NULL || item->referencedClip() == NULL) {
@@ -2381,10 +2395,10 @@ bool ProjectList::adjustProjectProfileToItem(ProjectItem *item)
     if (height == 1088) height = 1080;
     double fps = item->referencedClip()->getProperty("fps").toDouble();
     double par = item->referencedClip()->getProperty("aspect_ratio").toDouble();
-    if (item->clipType() == IMAGE || item->clipType() == AV || item->clipType() == VIDEO) {
-        if (ProfilesDialog::matchProfile(width, height, fps, par, item->clipType() == IMAGE, m_doc->mltProfile()) == false) {
+    if (item->clipType() == Image || item->clipType() == AV || item->clipType() == Video) {
+        if (ProfilesDialog::matchProfile(width, height, fps, par, item->clipType() == Image, m_doc->mltProfile()) == false) {
             // get a list of compatible profiles
-            QMap <QString, QString> suggestedProfiles = ProfilesDialog::getProfilesFromProperties(width, height, fps, par, item->clipType() == IMAGE);
+            QMap <QString, QString> suggestedProfiles = ProfilesDialog::getProfilesFromProperties(width, height, fps, par, item->clipType() == Image);
             if (!suggestedProfiles.isEmpty()) {
                 KDialog *dialog = new KDialog(this);
                 dialog->setCaption(i18n("Change project profile"));
@@ -2479,7 +2493,7 @@ QTreeWidgetItem *ProjectList::getAnyItemById(const QString &id)
 
     ProjectItem *result = NULL;
     while (*it) {
-        if ((*it)->type() != PROJECTCLIPTYPE) {
+        if ((*it)->type() != ProjectClipType) {
             // subitem
             ++it;
             continue;
@@ -2510,7 +2524,7 @@ ProjectItem *ProjectList::getItemById(const QString &id)
     ProjectItem *item;
     QTreeWidgetItemIterator it(m_listView);
     while (*it) {
-        if ((*it)->type() != PROJECTCLIPTYPE) {
+        if ((*it)->type() != ProjectClipType) {
             // subitem or folder
             ++it;
             continue;
@@ -2528,7 +2542,7 @@ FolderProjectItem *ProjectList::getFolderItemByName(const QString &name)
     FolderProjectItem *item = NULL;
     QList <QTreeWidgetItem *> hits = m_listView->findItems(name, Qt::MatchExactly, 0);
     for (int i = 0; i < hits.count(); ++i) {
-        if (hits.at(i)->type() == PROJECTFOLDERTYPE) {
+        if (hits.at(i)->type() == ProjectFoldeType) {
             item = static_cast<FolderProjectItem *>(hits.at(i));
             break;
         }
@@ -2541,7 +2555,7 @@ FolderProjectItem *ProjectList::getFolderItemById(const QString &id)
     FolderProjectItem *item;
     QTreeWidgetItemIterator it(m_listView);
     while (*it) {
-        if ((*it)->type() == PROJECTFOLDERTYPE) {
+        if ((*it)->type() == ProjectFoldeType) {
             item = static_cast<FolderProjectItem *>(*it);
             if (item->clipId() == id)
                 return item;
@@ -2563,10 +2577,10 @@ void ProjectList::slotSelectClip(const QString &ix)
         m_extractAudioAction->setEnabled(true);
         m_transcodeAction->setEnabled(true);
         m_clipsActionsMenu->setEnabled(true);
-        if (clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) {
+        if (clip->clipType() == Image && !KdenliveSettings::defaultimageapp().isEmpty()) {
             m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp()));
             m_openAction->setEnabled(true);
-        } else if (clip->clipType() == AUDIO && !KdenliveSettings::defaultaudioapp().isEmpty()) {
+        } else if (clip->clipType() == Audio && !KdenliveSettings::defaultaudioapp().isEmpty()) {
             m_openAction->setIcon(KIcon(KdenliveSettings::defaultaudioapp()));
             m_openAction->setEnabled(true);
         } else {
@@ -2578,8 +2592,8 @@ void ProjectList::slotSelectClip(const QString &ix)
 QString ProjectList::currentClipUrl() const
 {
     ProjectItem *item;
-    if (!m_listView->currentItem() || m_listView->currentItem()->type() == PROJECTFOLDERTYPE) return QString();
-    if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) {
+    if (!m_listView->currentItem() || m_listView->currentItem()->type() == ProjectFoldeType) return QString();
+    if (m_listView->currentItem()->type() == ProjectSubclipType) {
         // subitem
         item = static_cast <ProjectItem*>(m_listView->currentItem()->parent());
     } else {
@@ -2596,15 +2610,15 @@ KUrl::List ProjectList::getConditionalUrls(const QString &condition) const
     ProjectItem *item;
     QList<QTreeWidgetItem *> list = m_listView->selectedItems();
     for (int i = 0; i < list.count(); ++i) {
-        if (list.at(i)->type() == PROJECTFOLDERTYPE)
+        if (list.at(i)->type() == ProjectFoldeType)
             continue;
-        if (list.at(i)->type() == PROJECTSUBCLIPTYPE) {
+        if (list.at(i)->type() == ProjectSubclipType) {
             // subitem
             item = static_cast <ProjectItem*>(list.at(i)->parent());
         } else {
             item = static_cast <ProjectItem*>(list.at(i));
         }
-        if (item == NULL || item->type() == COLOR || item->type() == SLIDESHOW || item->type() == TEXT)
+        if (item == NULL || item->type() == Color || item->type() == SlideShow || item->type() == Text)
             continue;
         DocClipBase *clip = item->referencedClip();
         if (!condition.isEmpty()) {
@@ -2624,15 +2638,15 @@ QMap <QString, QString> ProjectList::getConditionalIds(const QString &condition)
     ProjectItem *item;
     QList<QTreeWidgetItem *> list = m_listView->selectedItems();
     for (int i = 0; i < list.count(); ++i) {
-        if (list.at(i)->type() == PROJECTFOLDERTYPE)
+        if (list.at(i)->type() == ProjectFoldeType)
             continue;
-        if (list.at(i)->type() == PROJECTSUBCLIPTYPE) {
+        if (list.at(i)->type() == ProjectSubclipType) {
             // subitem
             item = static_cast <ProjectItem*>(list.at(i)->parent());
         } else {
             item = static_cast <ProjectItem*>(list.at(i));
         }
-        if (item == NULL || item->type() == COLOR || item->type() == SLIDESHOW || item->type() == TEXT)
+        if (item == NULL || item->type() == Color || item->type() == SlideShow || item->type() == Text)
             continue;
         DocClipBase *clip = item->referencedClip();
         if (!condition.isEmpty()) {
@@ -2734,7 +2748,7 @@ SubProjectItem *ProjectList::getSubItem(ProjectItem *clip, const QPoint &zone)
     if (clip) {
         for (int i = 0; i < clip->childCount(); ++i) {
             QTreeWidgetItem *it = clip->child(i);
-            if (it->type() == PROJECTSUBCLIPTYPE) {
+            if (it->type() == ProjectSubclipType) {
                 sub = static_cast <SubProjectItem*>(it);
                 if (sub->zone() == zone)
                     break;
@@ -2748,7 +2762,7 @@ SubProjectItem *ProjectList::getSubItem(ProjectItem *clip, const QPoint &zone)
 
 void ProjectList::slotUpdateClipCut(QPoint p)
 {
-    if (!m_listView->currentItem() || m_listView->currentItem()->type() != PROJECTSUBCLIPTYPE)
+    if (!m_listView->currentItem() || m_listView->currentItem()->type() != ProjectSubclipType)
         return;
     SubProjectItem *sub = static_cast <SubProjectItem*>(m_listView->currentItem());
     ProjectItem *item = static_cast <ProjectItem *>(sub->parent());
@@ -2822,7 +2836,7 @@ QMap <QString, QString> ProjectList::getProxies()
     ProjectItem *item;
     QTreeWidgetItemIterator it(m_listView);
     while (*it) {
-        if ((*it)->type() != PROJECTCLIPTYPE) {
+        if ((*it)->type() != ProjectClipType) {
             ++it;
             continue;
         }
@@ -2844,18 +2858,18 @@ void ProjectList::slotCreateProxy(const QString &id)
     if (!item || hasPendingJob(item, PROXYJOB) || item->referencedClip()->isPlaceHolder()) return;
     QString path = item->referencedClip()->getProperty("proxy");
     if (path.isEmpty()) {
-        slotUpdateJobStatus(item, PROXYJOB, JOBCRASHED, i18n("Failed to create proxy, empty path."));
+        slotUpdateJobStatus(item, PROXYJOB, JobCrashed, i18n("Failed to create proxy, empty path."));
         return;
     }
     
     if (QFileInfo(path).size() > 0) {
         // Proxy already created
-        setJobStatus(item, PROXYJOB, JOBDONE);
+        setJobStatus(item, PROXYJOB, JobDone);
         slotGotProxy(path);
         return;
     }
     QString sourcePath = item->clipUrl().path();
-    if (item->clipType() == PLAYLIST) {
+    if (item->clipType() == Playlist) {
         // Special case: playlists use the special 'consumer' producer to support resizing
         sourcePath.prepend("consumer:");
     }
@@ -2866,7 +2880,7 @@ void ProjectList::slotCreateProxy(const QString &id)
     }
 
     m_jobList.append(job);
-    setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage());
+    setJobStatus(item, job->jobType, JobWaiting, 0, job->statusMessage());
     slotCheckJobProcess();
 }
 
@@ -2939,7 +2953,7 @@ void ProjectList::slotCutClipJob(const QString &id, QPoint zone)
         return;
     }
     m_jobList.append(job);
-    setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage());
+    setJobStatus(item, job->jobType, JobWaiting, 0, job->statusMessage());
 
     slotCheckJobProcess();
 }
@@ -3013,7 +3027,7 @@ void ProjectList::slotTranscodeClipJob(const QString &condition, QString params,
             continue;
         }
         m_jobList.append(job);
-        setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage());
+        setJobStatus(item, job->jobType, JobWaiting, 0, job->statusMessage());
         ++i;
     }
     delete d;
@@ -3037,7 +3051,7 @@ void ProjectList::slotCheckJobProcess()
     m_jobMutex.lock();
     int count = 0;
     for (int i = 0; i < m_jobList.count(); ++i) {
-        if (m_jobList.at(i)->status() == JOBWORKING || m_jobList.at(i)->status() == JOBWAITING)
+        if (m_jobList.at(i)->status() == JobWorking || m_jobList.at(i)->status() == JobWaiting)
             count ++;
         else {
             // remove finished jobs
@@ -3058,7 +3072,7 @@ void ProjectList::slotAbortProxy(const QString &id, const QString &path)
     ProjectItem *item = getItemById(id);
     if (!item) return;
     if (!item->isProxyRunning()) slotGotProxy(item);
-    item->setConditionalJobStatus(NOJOB, PROXYJOB);
+    item->setConditionalJobStatus(NoJob, PROXYJOB);
     discardJobs(id, PROXYJOB);
 }
 
@@ -3070,14 +3084,14 @@ void ProjectList::slotProcessJobs()
         int count = 0;
         m_jobMutex.lock();
         for (int i = 0; i < m_jobList.count(); ++i) {
-            if (m_jobList.at(i)->status() == JOBWAITING) {
+            if (m_jobList.at(i)->status() == JobWaiting) {
                 if (job == NULL) {
-                    m_jobList.at(i)->setStatus(JOBWORKING);
+                    m_jobList.at(i)->setStatus(JobWorking);
                     job = m_jobList.at(i);
                 }
                 count++;
             }
-            else if (m_jobList.at(i)->status() == JOBWORKING)
+            else if (m_jobList.at(i)->status() == JobWorking)
                 count ++;
         }
         // Set jobs count
@@ -3092,7 +3106,7 @@ void ProjectList::slotProcessJobs()
         DocClipBase *currentClip = m_doc->clipManager()->getClipById(job->clipId());
         //ProjectItem *processingItem = getItemById(job->clipId());
         if (currentClip == NULL) {
-            job->setStatus(JOBDONE);
+            job->setStatus(JobDone);
             continue;
         }
         // Set clip status to started
@@ -3102,8 +3116,8 @@ void ProjectList::slotProcessJobs()
         if (!destination.isEmpty()) {
             QFile file(destination);
             if (!file.open(QIODevice::WriteOnly)) {
-                emit updateJobStatus(job->clipId(), job->jobType, JOBCRASHED, i18n("Cannot write to path: %1", destination));
-                job->setStatus(JOBCRASHED);
+                emit updateJobStatus(job->clipId(), job->jobType, JobCrashed, i18n("Cannot write to path: %1", destination));
+                job->setStatus(JobCrashed);
                 continue;
             }
             file.close();
@@ -3121,14 +3135,14 @@ void ProjectList::slotProcessJobs()
                 connect(job, SIGNAL(gotFilterJobResults(QString,int,int,stringMap,stringMap)), this, SIGNAL(gotFilterJobResults(QString,int,int,stringMap,stringMap)));
         }
         job->startJob();
-        if (job->status() == JOBDONE) {
-            emit updateJobStatus(job->clipId(), job->jobType, JOBDONE);
+        if (job->status() == JobDone) {
+            emit updateJobStatus(job->clipId(), job->jobType, JobDone);
             //TODO: replace with more generic clip replacement framework
             if (job->jobType == PROXYJOB) emit gotProxy(job->clipId());
             if (job->addClipToProject()) {
                 emit addClip(destination, QString(), QString());
             }
-        } else if (job->status() == JOBCRASHED || job->status() == JOBABORTED) {
+        } else if (job->status() == JobCrashed || job->status() == JobAborted) {
             emit updateJobStatus(job->clipId(), job->jobType, job->status(), job->errorMessage(), QString(), job->logDetails());
         }
     }
@@ -3145,7 +3159,7 @@ void ProjectList::updateProxyConfig()
     command->setText(i18n("Update proxy settings"));
     QString proxydir = m_doc->projectFolder().path( KUrl::AddTrailingSlash) + "proxy/";
     while (*it) {
-        if ((*it)->type() != PROJECTCLIPTYPE) {
+        if ((*it)->type() != ProjectClipType) {
             ++it;
             continue;
         }
@@ -3154,8 +3168,8 @@ void ProjectList::updateProxyConfig()
             ++it;
             continue;
         }
-        CLIPTYPE t = item->clipType();
-        if ((t == VIDEO || t == AV || t == UNKNOWN) && item->referencedClip() != NULL) {
+        ClipType t = item->clipType();
+        if ((t == Video || t == AV || t == Unknown) && item->referencedClip() != NULL) {
             if  (generateProxy() && useProxy() && !hasPendingJob(item, PROXYJOB)) {
                 DocClipBase *clip = item->referencedClip();
                 if (clip->getProperty("frame_size").section('x', 0, 0).toInt() > m_doc->getDocumentProperty("proxyminsize").toInt()) {
@@ -3178,7 +3192,7 @@ void ProjectList::updateProxyConfig()
                 new EditClipCommand(this, item->clipId(), item->referencedClip()->currentProperties(newProps), newProps, true, command);
             }
         }
-        else if (t == IMAGE && item->referencedClip() != NULL) {
+        else if (t == Image && item->referencedClip() != NULL) {
             if  (generateImageProxy() && useProxy()) {
                 DocClipBase *clip = item->referencedClip();
                 int maxImageSize = m_doc->getDocumentProperty("proxyimageminsize").toInt();
@@ -3209,7 +3223,7 @@ void ProjectList::updateProxyConfig()
 void ProjectList::slotProcessLog(const QString &id, int progress, int type, const QString &message)
 {
     ProjectItem *item = getItemById(id);
-    setJobStatus(item, (JOBTYPE) type, JOBWORKING, progress, message);
+    setJobStatus(item, (JOBTYPE) type, JobWorking, progress, message);
 }
 
 void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy)
@@ -3223,21 +3237,21 @@ void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy)
     QList<ProjectItem *> clipList;
     for (int i = 0; i < list.count(); ++i) {
         listItem = list.at(i);
-        if (listItem->type() == PROJECTFOLDERTYPE) {
+        if (listItem->type() == ProjectFoldeType) {
             for (int j = 0; j < listItem->childCount(); j++) {
                 QTreeWidgetItem *sub = listItem->child(j);
-                if (sub->type() == PROJECTCLIPTYPE) {
+                if (sub->type() == ProjectClipType) {
                     ProjectItem *item = static_cast <ProjectItem*>(sub);
                     if (!clipList.contains(item)) clipList.append(item);
                 }
             }
         }
-        else if (listItem->type() == PROJECTSUBCLIPTYPE) {
+        else if (listItem->type() == ProjectSubclipType) {
             QTreeWidgetItem *sub = listItem->parent();
             ProjectItem *item = static_cast <ProjectItem*>(sub);
             if (!clipList.contains(item)) clipList.append(item);
         }
-        else if (listItem->type() == PROJECTCLIPTYPE) {
+        else if (listItem->type() == ProjectClipType) {
             ProjectItem *item = static_cast <ProjectItem*>(listItem);
             if (!clipList.contains(item)) clipList.append(item);
         }
@@ -3256,8 +3270,8 @@ void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy)
     if (!doProxy) newProps.insert("proxy", "-");
     for (int i = 0; i < clipList.count(); ++i) {
         ProjectItem *item = clipList.at(i);
-        CLIPTYPE t = item->clipType();
-        if ((t == VIDEO || t == AV || t == UNKNOWN || t == IMAGE || t == PLAYLIST) && item->referencedClip()) {
+        ClipType t = item->clipType();
+        if ((t == Video || t == AV || t == Unknown || t == Image || t == Playlist) && item->referencedClip()) {
             if ((doProxy && item->hasProxy()) || (!doProxy && !item->hasProxy() && item->referencedClip()->getProducer() != NULL)) continue;
             DocClipBase *clip = item->referencedClip();
             if (!clip || !clip->isClean() || m_render->isProcessing(item->clipId())) {
@@ -3268,7 +3282,7 @@ void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy)
             //oldProps = clip->properties();
             if (doProxy) {
                 newProps.clear();
-                QString path = proxydir + clip->getClipHash() + '.' + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension"));
+                QString path = proxydir + clip->getClipHash() + '.' + (t == Image ? "png" : m_doc->getDocumentProperty("proxyextension"));
                 // insert required duration for proxy
                 newProps.insert("proxy_out", clip->producerProperty("out"));
                 newProps.insert("proxy", path);
@@ -3301,7 +3315,7 @@ void ProjectList::slotDeleteProxy(const QString proxyPath)
     QTreeWidgetItemIterator it(m_listView);
     ProjectItem *item;
     while (*it) {
-        if ((*it)->type() == PROJECTCLIPTYPE) {
+        if ((*it)->type() == ProjectClipType) {
             item = static_cast <ProjectItem *>(*it);
             if (item->referencedClip()->getProperty("proxy") == proxyPath) {
                 QMap <QString, QString> props;
@@ -3319,12 +3333,12 @@ void ProjectList::slotDeleteProxy(const QString proxyPath)
     QFile::remove(proxyPath);
 }
 
-void ProjectList::setJobStatus(ProjectItem *item, JOBTYPE jobType, CLIPJOBSTATUS status, int progress, const QString &statusMessage)
+void ProjectList::setJobStatus(ProjectItem *item, JOBTYPE jobType, ClipJobStatus status, int progress, const QString &statusMessage)
 {
     if (item == NULL || (m_abortAllJobs && m_closing)) return;
     monitorItemEditing(false);
     item->setJobStatus(jobType, status, progress, statusMessage);
-    if (status == JOBCRASHED) {
+    if (status == JobCrashed) {
         DocClipBase *clip = item->referencedClip();
         if (!clip) {
             kDebug()<<"// PROXY CRASHED";
@@ -3355,7 +3369,7 @@ QStringList ProjectList::expandedFolders() const
     FolderProjectItem *item;
     QTreeWidgetItemIterator it(m_listView);
     while (*it) {
-        if ((*it)->type() != PROJECTFOLDERTYPE) {
+        if ((*it)->type() != ProjectFoldeType) {
             ++it;
             continue;
         }
@@ -3387,7 +3401,7 @@ void ProjectList::slotCancelJobs()
 {
     m_abortAllJobs = true;
     for (int i = 0; i < m_jobList.count(); ++i) {
-        m_jobList.at(i)->setStatus(JOBABORTED);
+        m_jobList.at(i)->setStatus(JobAborted);
     }
     m_jobThreads.waitForFinished();
     m_jobThreads.clearFutures();
@@ -3433,7 +3447,7 @@ bool ProjectList::hasPendingJob(ProjectItem *item, JOBTYPE type)
     for (int i = 0; i < m_jobList.count(); ++i) {
         if (m_abortAllJobs) break;
         job = m_jobList.at(i);
-        if (job->clipId() == item->clipId() && job->jobType == type && (job->status() == JOBWAITING || job->status() == JOBWORKING)) return true;
+        if (job->clipId() == item->clipId() && job->jobType == type && (job->status() == JobWaiting || job->status() == JobWorking)) return true;
     }
     
     return false;
@@ -3444,7 +3458,7 @@ void ProjectList::deleteJobsForClip(const QString &clipId)
     QMutexLocker lock(&m_jobMutex);
     for (int i = 0; i < m_jobList.count(); ++i) {
         if (m_jobList.at(i)->clipId() == clipId) {
-            m_jobList.at(i)->setStatus(JOBABORTED);
+            m_jobList.at(i)->setStatus(JobAborted);
         }
     }
 }
@@ -3459,8 +3473,8 @@ void ProjectList::slotUpdateJobStatus(const QString id, int type, int status, co
 
 void ProjectList::slotUpdateJobStatus(ProjectItem *item, int type, int status, const QString &label, const QString &actionName, const QString details)
 {
-    item->setJobStatus((JOBTYPE) type, (CLIPJOBSTATUS) status);
-    if (status != JOBCRASHED) return;
+    item->setJobStatus((JOBTYPE) type, (ClipJobStatus) status);
+    if (status != JobCrashed) return;
 #if KDE_IS_VERSION(4,7,0)
     QList<QAction *> actions = m_infoMessage->actions();
     if (m_infoMessage->isHidden()) {
@@ -3525,7 +3539,7 @@ QStringList ProjectList::getPendingJobs(const QString &id)
     QStringList result;
     QMutexLocker lock(&m_jobMutex);
     for (int i = 0; i < m_jobList.count(); ++i) {
-        if (m_jobList.at(i)->clipId() == id && (m_jobList.at(i)->status() == JOBWAITING || m_jobList.at(i)->status() == JOBWORKING)) {
+        if (m_jobList.at(i)->clipId() == id && (m_jobList.at(i)->status() == JobWaiting || m_jobList.at(i)->status() == JobWorking)) {
             // discard this job
             result << m_jobList.at(i)->description;
         }
@@ -3538,7 +3552,7 @@ void ProjectList::discardJobs(const QString &id, JOBTYPE type) {
     for (int i = 0; i < m_jobList.count(); ++i) {
         if (m_jobList.at(i)->clipId() == id && (m_jobList.at(i)->jobType == type || type == NOJOBTYPE)) {
             // discard this job
-            m_jobList.at(i)->setStatus(JOBABORTED);
+            m_jobList.at(i)->setStatus(JobAborted);
         }
     }
 }
@@ -3557,7 +3571,7 @@ void ProjectList::slotStartFilterJob(ItemInfo info, const QString&id, const QStr
     }
     job->description = i18n("Filter %1", extraParams.value("finalfilter"));
     m_jobList.append(job);
-    setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage());
+    setJobStatus(item, job->jobType, JobWaiting, 0, job->statusMessage());
     slotCheckJobProcess();
 }
 
@@ -3727,7 +3741,7 @@ void ProjectList::processClipJob(QStringList ids, const QString&destination, boo
         }
         job->description = description;
         m_jobList.append(job);
-        setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage());
+        setJobStatus(item, job->jobType, JobWaiting, 0, job->statusMessage());
         slotCheckJobProcess();
     }
 }
@@ -3736,9 +3750,9 @@ void ProjectList::processClipJob(QStringList ids, const QString&destination, boo
 void ProjectList::slotPrepareJobsMenu()
 {
     ProjectItem *item;
-    if (!m_listView->currentItem() || m_listView->currentItem()->type() == PROJECTFOLDERTYPE)
+    if (!m_listView->currentItem() || m_listView->currentItem()->type() == ProjectFoldeType)
         return;
-    if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE)
+    if (m_listView->currentItem()->type() == ProjectSubclipType)
         item = static_cast <ProjectItem*>(m_listView->currentItem()->parent());
     else
         item = static_cast <ProjectItem*>(m_listView->currentItem());
@@ -3870,93 +3884,3 @@ void ProjectList::checkCamcorderFilters(DocClipBase *clip, QMap <QString, QStrin
 }*/
 
 #include "projectlist.moc"
-
-
-void ItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const {
-    if (index.column() == 0 && !index.data(DurationRole).isNull()) {
-        QRect r1 = option.rect;
-        painter->save();
-        QStyleOptionViewItemV4 opt(option);
-        QStyle *style = opt.widget ? opt.widget->style() : QApplication::style();
-        style->drawPrimitive(QStyle::PE_PanelItemViewItem, &opt, painter, opt.widget);
-
-        if (option.state & QStyle::State_Selected) {
-            painter->setPen(option.palette.highlightedText().color());
-        }
-        const int textMargin = style->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1;
-        QPixmap pixmap = qVariantValue<QPixmap>(index.data(Qt::DecorationRole));
-        QPoint pixmapPoint(r1.left() + textMargin, r1.top() + (r1.height() - pixmap.height()) / 2);
-        painter->drawPixmap(pixmapPoint, pixmap);
-        int decoWidth = pixmap.width() + 2 * textMargin;
-
-        QFont font = painter->font();
-        font.setBold(true);
-        painter->setFont(font);
-        int mid = (int)((r1.height() / 2));
-        r1.adjust(decoWidth, 0, 0, -mid);
-        QRect r2 = option.rect;
-        r2.adjust(decoWidth, mid, 0, 0);
-        painter->drawText(r1, Qt::AlignLeft | Qt::AlignBottom, index.data().toString());
-        font.setBold(false);
-        painter->setFont(font);
-        QString subText = index.data(DurationRole).toString();
-        int usage = index.data(UsageRole).toInt();
-        if (usage != 0) subText.append(QString::fromLatin1(" (%1)").arg(usage));
-        QRectF bounding;
-        painter->drawText(r2, Qt::AlignLeft | Qt::AlignVCenter , subText, &bounding);
-        int jobProgress = index.data(Qt::UserRole + 5).toInt();
-        if (jobProgress != 0 && jobProgress != JOBDONE && jobProgress != JOBABORTED) {
-            if (jobProgress != JOBCRASHED) {
-                // Draw job progress bar
-                QColor color = option.palette.alternateBase().color();
-                color.setAlpha(150);
-                painter->setPen(option.palette.link().color());
-                QRect progress(pixmapPoint.x() + 2, pixmapPoint.y() + pixmap.height() - 9, pixmap.width() - 4, 7);
-                painter->setBrush(QBrush(color));
-                painter->drawRect(progress);
-                painter->setBrush(option.palette.link());
-                progress.adjust(2, 2, -2, -2);
-                if (jobProgress == JOBWAITING) {
-                    progress.setLeft(progress.right() - 2);
-                    painter->drawRect(progress);
-                    progress.moveLeft(progress.left() - 5);
-                    painter->drawRect(progress);
-                }
-                else if (jobProgress > 0) {
-                    progress.setWidth(progress.width() * jobProgress / 100);
-                    painter->drawRect(progress);
-                }
-            } else if (jobProgress == JOBCRASHED) {
-                QString jobText = index.data(Qt::UserRole + 7).toString();
-                if (!jobText.isEmpty()) {
-                    QRectF txtBounding = painter->boundingRect(r2, Qt::AlignRight | Qt::AlignVCenter, QLatin1Char(' ') + jobText + QLatin1Char(' ') );
-                    painter->setPen(Qt::NoPen);
-                    painter->setBrush(option.palette.highlight());
-                    painter->drawRoundedRect(txtBounding, 2, 2);
-                    painter->setPen(option.palette.highlightedText().color());
-                    painter->drawText(txtBounding, Qt::AlignCenter, jobText);
-                }
-            }
-        }
-
-        painter->restore();
-    } else if (index.column() == 2 && KdenliveSettings::activate_nepomuk()) {
-        if (index.data().toString().isEmpty()) {
-            QStyledItemDelegate::paint(painter, option, index);
-            return;
-        }
-        QRect r1 = option.rect;
-        if (option.state & (QStyle::State_Selected)) {
-            painter->fillRect(r1, option.palette.highlight());
-        }
-#ifdef NEPOMUK
-        KRatingPainter::paintRating(painter, r1, Qt::AlignCenter, index.data().toInt());
-#endif
-#ifdef NEPOMUKCORE
-        KRatingPainter::paintRating(painter, r1, Qt::AlignCenter, index.data().toInt());
-#endif
-
-    } else {
-        QStyledItemDelegate::paint(painter, option, index);
-    }
-}