Commit b0f4f208 authored by Nicolas Carion's avatar Nicolas Carion

style

parent c30f8b77
......@@ -3563,9 +3563,9 @@ void Bin::slotUpdateClipProperties(const QString &id, const QMap<QString, QStrin
void Bin::updateTimelineProducers(const QString &id, const QMap<QString, QString> &passProperties)
{
//TODO REFAC
//pCore->projectManager()->currentTimeline()->updateClipProperties(id, passProperties);
//m_doc->renderer()->updateSlowMotionProducers(id, passProperties);
// TODO REFAC
// pCore->projectManager()->currentTimeline()->updateClipProperties(id, passProperties);
// m_doc->renderer()->updateSlowMotionProducers(id, passProperties);
}
void Bin::showSlideshowWidget(ProjectClip *clip)
......
......@@ -65,8 +65,7 @@ class KdenliveDoc : public QObject
Q_OBJECT
public:
KdenliveDoc(const QUrl &url, const QString &projectFolder, QUndoGroup *undoGroup, const QString &profileName, const QMap<QString, QString> &properties,
const QMap<QString, QString> &metadata, const QPoint &tracks, Render *render, bool *openBackup,
MainWindow *parent = nullptr);
const QMap<QString, QString> &metadata, const QPoint &tracks, Render *render, bool *openBackup, MainWindow *parent = nullptr);
~KdenliveDoc();
/** @brief Get current document's producer. */
Mlt::Producer *getProjectProducer();
......
......@@ -22,7 +22,6 @@
#ifndef MACROS_H
#define MACROS_H
/* This file contains a collection of macros that can be used in model related classes.
The class only needs to have the following members:
- std::weak_ptr<DocUndoStack> m_undoStack; this is a pointer to the undoStack
......@@ -31,8 +30,6 @@
See for example TimelineModel.
*/
// This convenience macro adds lock/unlock ability to a given lambda function
#define LOCK_IN_LAMBDA(lambda) \
lambda = [this, lambda]() { \
......@@ -57,7 +54,6 @@ reading a Read-protected property. In that case, we try to write lock it first (
rlocker.reset(new QReadLocker(&m_lock)); \
}
/* @brief This macro takes some lambdas that represent undo/redo for an operation and the text (name) associated with this operation
The lambdas are transformed to make sure they lock access to the class they operate on.
Then they are added on the undoStack
......
......@@ -21,8 +21,8 @@ the Free Software Foundation, either version 3 of the License, or
#include "profiles/profilemodel.hpp"
#include "project/dialogs/archivewidget.h"
#include "project/dialogs/backupwidget.h"
#include "project/dialogs/projectsettings.h"
#include "project/dialogs/noteswidget.h"
#include "project/dialogs/projectsettings.h"
#include "project/notesplugin.h"
#include "timeline/customtrackview.h"
#include "timeline/timeline.h"
......
......@@ -195,7 +195,7 @@ private:
int m_currentInsertionOrder;
std::map<int, std::shared_ptr<ClipModel>> m_allClips; /*this is important to keep an
ordered structure to store the clips, since we use their ids order as row order*/
ordered structure to store the clips, since we use their ids order as row order*/
std::map<int, std::shared_ptr<CompositionModel>>
m_allCompositions; /*this is important to keep an
ordered structure to store the clips, since we use their ids order as row order*/
......
......@@ -88,7 +88,6 @@ void TimelineWidget::setModel(std::shared_ptr<TimelineItemModel> model)
rootContext()->setContextProperty("transitionModel", m_transitionProxyModel.get());
setSource(QUrl(QStringLiteral("qrc:/qml/timeline.qml")));
setVisible(true);
}
void TimelineWidget::setSelection(const QList<int> &newSelection, int trackIndex, bool isMultitrack)
......
......@@ -60,7 +60,6 @@ public:
/* @brief Sets the model shown by this widget */
void setModel(std::shared_ptr<TimelineItemModel> model);
/* @brief Sets the list of currently selected clips
@param selection is the list of id's
@param trackIndex is current clip's track
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment