Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 8880c016 authored by Nicolas Carion's avatar Nicolas Carion

clang format

parent 24ecc96f
......@@ -24,9 +24,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "bpoint.h"
#include <QPersistentModelIndex>
#include <QVariant>
#include <QWidget>
#include <QPersistentModelIndex>
class Monitor;
......@@ -65,8 +65,7 @@ private slots:
void slotUpdateRotoMonitor(const QVariantList &v);
signals:
void updateRotoKeyframe(QPersistentModelIndex, const QVariantList&);
void updateRotoKeyframe(QPersistentModelIndex, const QVariantList &);
};
#endif
......@@ -26,9 +26,9 @@
class NegQColor
{
public:
int8_t sign_r=1;
int8_t sign_g=1;
int8_t sign_b=1;
int8_t sign_r = 1;
int8_t sign_g = 1;
int8_t sign_b = 1;
QColor qcolor;
static NegQColor fromHsvF(qreal h, qreal s, qreal l, qreal a = 1.0);
static NegQColor fromRgbF(qreal r, qreal g, qreal b, qreal a = 1.0);
......
......@@ -27,9 +27,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "undohelper.hpp"
#include <QDateTime>
#include <QIcon>
#include <QObject>
#include <QReadWriteLock>
#include <QIcon>
class ProjectClip;
class ProjectFolder;
......
......@@ -34,11 +34,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QFuture>
#include <QLineEdit>
#include <QListView>
#include <QTreeView>
#include <QMutex>
#include <QPainter>
#include <QPushButton>
#include <QStyledItemDelegate>
#include <QTreeView>
#include <QUrl>
#include <QWidget>
......
......@@ -108,7 +108,7 @@ enum ProducerType {
QText
};
Q_ENUM_NS(ProducerType)
}
} // namespace ClipType
enum ProjectItemType { ProjectClipType = 0, ProjectFolderType, ProjectSubclipType };
......
......@@ -27,7 +27,9 @@
#include <QStyledItemDelegate>
#ifdef KF5_USE_PURPOSE
namespace Purpose { class Menu; }
namespace Purpose {
class Menu;
}
#endif
#include "definitions.h"
......
......@@ -26,9 +26,9 @@
class NegQColor
{
public:
int8_t sign_r=1;
int8_t sign_g=1;
int8_t sign_b=1;
int8_t sign_r = 1;
int8_t sign_g = 1;
int8_t sign_b = 1;
QColor qcolor;
static NegQColor fromHsvF(qreal h, qreal s, qreal l, qreal a = 1.0);
static NegQColor fromRgbF(qreal r, qreal g, qreal b, qreal a = 1.0);
......
......@@ -23,8 +23,8 @@
#include "abstractclipjob.h"
#include <memory>
#include <QImage>
#include <memory>
/* @brief This class represents the job that corresponds to computing the thumb of a clip
*/
......
......@@ -24,8 +24,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "definitions.h"
#include <QString>
#include <QPoint>
#include <QString>
#include <mlt++/Mlt.h>
/**)
......
......@@ -19,16 +19,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
/** @brief This class is a wrapper around the monitor / glwidget and handles communication
/** @brief This class is a wrapper around the monitor / glwidget and handles communication
* with the qml overlay through its properties.
*/
#ifndef MONITORPROXY_H
#define MONITORPROXY_H
#include <QObject>
#include <QImage>
#include <QObject>
class GLWidget;
......
......@@ -36,6 +36,7 @@ public:
~NotesWidget();
/** @brief insert current timeline timecode and focus widget to allow entering quick note */
void addProjectNote();
protected:
void mouseMoveEvent(QMouseEvent *e) override;
void mousePressEvent(QMouseEvent *e) override;
......
......@@ -25,8 +25,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "definitions.h"
#include <KIO/DirectorySizeJob>
#include <QDir>
#include <QWidget>
#include <QTreeWidgetItem>
#include <QWidget>
class KdenliveDoc;
class QPaintEvent;
......
......@@ -145,7 +145,8 @@ protected:
bool requestResize(int size, bool right, Fun &undo, Fun &redo, bool logUndo = true) override;
/* @brief Performs a resize of the given clip.
Returns true if the operation succeeded, and otherwise nothing is modified
This method should only be called if some operation before the resize did alter the previous duration, like when using timewarp operation. Otherwise the normal requestResize should be used with only size passed.
This method should only be called if some operation before the resize did alter the previous duration, like when using timewarp operation. Otherwise the
normal requestResize should be used with only size passed.
*/
bool requestResize(int old_in, int old_out, int oldDuration, int delta, bool right, Fun &undo, Fun &redo, bool logUndo);
......@@ -155,7 +156,8 @@ protected:
/* @brief This functions should be called when the producer of the binClip changes, to allow refresh
* @param state corresponds to the state of the clip we want (audio or video)
* @param speed corresponds to the speed we need. Leave to 0 to keep current speed. Warning: this function doesn't notify the model. Unless you know what you are doing, better use uteTimewarProducer to change the speed
* @param speed corresponds to the speed we need. Leave to 0 to keep current speed. Warning: this function doesn't notify the model. Unless you know what
* you are doing, better use uteTimewarProducer to change the speed
*/
void refreshProducerFromBin(PlaylistState::ClipState state, double speed = 0);
void refreshProducerFromBin();
......
......@@ -104,24 +104,24 @@ public:
/// Two level model: tracks and clips on track
enum {
NameRole = Qt::UserRole + 1,
ResourceRole, /// clip only
ServiceRole, /// clip only
IsBlankRole, /// clip only
StartRole, /// clip only
BinIdRole, /// clip only
MarkersRole, /// clip only
StatusRole, /// clip only
TypeRole, /// clip only
ResourceRole, /// clip only
ServiceRole, /// clip only
IsBlankRole, /// clip only
StartRole, /// clip only
BinIdRole, /// clip only
MarkersRole, /// clip only
StatusRole, /// clip only
TypeRole, /// clip only
KeyframesRole,
DurationRole,
InPointRole, /// clip only
OutPointRole, /// clip only
FramerateRole, /// clip only
GroupedRole, /// clip only
HasAudio, /// clip only
CanBeAudioRole, /// clip only
CanBeVideoRole, /// clip only
IsDisabledRole, /// track only
InPointRole, /// clip only
OutPointRole, /// clip only
FramerateRole, /// clip only
GroupedRole, /// clip only
HasAudio, /// clip only
CanBeAudioRole, /// clip only
CanBeVideoRole, /// clip only
IsDisabledRole, /// track only
IsAudioRole,
SortRole,
ShowKeyframesRole,
......@@ -310,7 +310,7 @@ public:
@param trackId id of the target track
@param position target position
@param snapDistance the maximum distance for a snap result, -1 for no snapping
of the clip
of the clip
@param dontRefreshMasterClip when false, no view refresh is attempted
*/
Q_INVOKABLE int suggestClipMove(int clipId, int trackId, int position, int snapDistance = -1, bool allowViewUpdate = true);
......@@ -361,7 +361,8 @@ public:
@param allowViewRefresh if false, the view will never get updated (useful for suggestMove)
*/
bool requestGroupMove(int clipId, int groupId, int delta_track, int delta_pos, bool updateView = true, bool logUndo = true);
bool requestGroupMove(int clipId, int groupId, int delta_track, int delta_pos, bool updateView, bool finalMove, Fun &undo, Fun &redo, bool allowViewRefresh = true);
bool requestGroupMove(int clipId, int groupId, int delta_track, int delta_pos, bool updateView, bool finalMove, Fun &undo, Fun &redo,
bool allowViewRefresh = true);
/* @brief Deletes all clips inside the group that contains the given clip.
This action is undoable
......
......@@ -46,7 +46,7 @@ public:
private:
int m_audioCount;
int m_videoCount;
QMap<int, int>m_positionByIndex;
QMap<int, int> m_positionByIndex;
};
#endif
......@@ -76,7 +76,7 @@ using namespace fakeit;
#define CHECK_UPDATE(role) \
Verify(OverloadedMethod(timMock, notifyChange, void(const QModelIndex &, const QModelIndex &, int)) \
.Matching([](const QModelIndex &, const QModelIndex &, int c) { return c == role; })) \
.Matching([](const QModelIndex &, const QModelIndex &, int c) { return c == role; })) \
.Exactly(1); \
NO_OTHERS();
......
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