Menu
▾
▴
[Kdenlive-svn] [kdenlive/v0.9] src: const'ify. Remove unimplemented function. Fix indent. Optimization
|
From: Jean-Baptiste M. <jb...@kd...> - 2013-06-04 20:24:37
|
Git commit 678e5dcf4ece7d8a67b36caae1448339b9c25986 by Jean-Baptiste Mardelle, on behalf of Montel Laurent. Committed on 27/05/2013 at 20:47. Pushed by mardelle into branch 'v0.9'. const'ify. Remove unimplemented function. Fix indent. Optimization M +3 -1 src/clipproperties.h M +1 -1 src/clipstabilize.h M +3 -3 src/colorcorrection/histogramgenerator.cpp M +3 -3 src/colorcorrection/histogramgenerator.h M +2 -2 src/colorcorrection/rgbparadegenerator.cpp M +1 -1 src/colorcorrection/rgbparadegenerator.h M +1 -1 src/colorcorrection/vectorscopegenerator.cpp M +2 -2 src/colorcorrection/vectorscopegenerator.h M +1 -1 src/colorcorrection/waveformgenerator.cpp M +1 -1 src/colorcorrection/waveformgenerator.h M +2 -2 src/complexparameter.h M +6 -6 src/customtrackview.cpp M +6 -7 src/customtrackview.h M +4 -4 src/databackup/backupwidget.cpp M +118 -116 src/docclipbase.cpp M +6 -6 src/docclipbase.h M +6 -6 src/dragvalue.h M +3 -3 src/effectstack/abstractcollapsiblewidget.h M +5 -5 src/effectstack/collapsibleeffect.h M +3 -4 src/effectstack/collapsiblegroup.h M +4 -4 src/effectstack/effectstackview2.cpp M +11 -11 src/effectstack/effectstackview2.h M +3 -3 src/effectstack/parametercontainer.h M +2 -2 src/lib/audio/audioInfo.cpp M +0 -1 src/lib/audio/audioInfo.h M +1 -1 src/lib/audio/audioStreamInfo.cpp M +7 -7 src/onmonitoritems/onmonitorcornersitem.cpp M +5 -4 src/onmonitoritems/onmonitorpathitem.cpp M +1 -1 src/onmonitoritems/onmonitorpathitem.h M +2 -2 src/onmonitoritems/onmonitorrectitem.cpp M +1 -1 src/scopes/audioscopes/audiosignal.cpp M +1 -1 src/scopes/audioscopes/audiosignal.h M +20 -20 src/scopes/audioscopes/audiospectrum.cpp http://commits.kde.org/kdenlive/678e5dcf4ece7d8a67b36caae1448339b9c25986 diff --git a/src/clipproperties.h b/src/clipproperties.h index dd41577..0753b49 100644 --- a/src/clipproperties.h +++ b/src/clipproperties.h @@ -32,7 +32,9 @@ class PropertiesViewDelegate : public QStyledItemDelegate { Q_OBJECT public: - PropertiesViewDelegate(QWidget *parent) : QStyledItemDelegate(parent) { + PropertiesViewDelegate(QWidget *parent) + : QStyledItemDelegate(parent) + { m_height = parent->fontMetrics().height() * 1.2; } protected: diff --git a/src/clipstabilize.h b/src/clipstabilize.h index 4f4bfdc..86f4a23 100644 --- a/src/clipstabilize.h +++ b/src/clipstabilize.h @@ -68,7 +68,7 @@ private: QStringList m_fixedParams; signals: - void addClip(KUrl url); + void addClip(const KUrl &url); }; diff --git a/src/colorcorrection/histogramgenerator.cpp b/src/colorcorrection/histogramgenerator.cpp index 05a41f5..c08cb0e 100644 --- a/src/colorcorrection/histogramgenerator.cpp +++ b/src/colorcorrection/histogramgenerator.cpp @@ -19,7 +19,7 @@ HistogramGenerator::HistogramGenerator() } QImage HistogramGenerator::calculateHistogram(const QSize ¶deSize, const QImage &image, const int &components, - HistogramGenerator::Rec rec, const bool &unscaled, const uint &accelFactor) const + HistogramGenerator::Rec rec, bool unscaled, uint accelFactor) const { if (paradeSize.height() <= 0 || paradeSize.width() <= 0 || image.width() <= 0 || image.height() <= 0) { return QImage(); @@ -130,7 +130,7 @@ QImage HistogramGenerator::calculateHistogram(const QSize ¶deSize, const QIm } QImage HistogramGenerator::drawComponent(const int *y, const QSize &size, const float &scaling, const QColor &color, - const bool &unscaled, const uint &max) const + bool unscaled, uint max) const { QImage component(max, size.height(), QImage::Format_ARGB32); component.fill(qRgba(0, 0, 0, 0)); @@ -159,7 +159,7 @@ QImage HistogramGenerator::drawComponent(const int *y, const QSize &size, const } void HistogramGenerator::drawComponentFull(QPainter *davinci, const int *y, const float &scaling, const QRect &rect, - const QColor &color, const int &textSpace, const bool &unscaled, const uint &max) const + const QColor &color, int textSpace, bool unscaled, uint max) const { QImage component = drawComponent(y, rect.size() - QSize(0, textSpace), scaling, color, unscaled, max); davinci->drawImage(rect.topLeft(), component); diff --git a/src/colorcorrection/histogramgenerator.h b/src/colorcorrection/histogramgenerator.h index 9e28f0f..faa7dd5 100644 --- a/src/colorcorrection/histogramgenerator.h +++ b/src/colorcorrection/histogramgenerator.h @@ -33,12 +33,12 @@ public: components are OR-ed HistogramGenerator::Components flags and decide with components (Y, R, G, B) to paint. unscaled = true leaves the width at 256 if the widget is wider (to avoid scaling). */ QImage calculateHistogram(const QSize ¶deSize, const QImage &image, const int &components, const HistogramGenerator::Rec rec, - const bool &unscaled, const uint &accelFactor = 1) const; + bool unscaled, uint accelFactor = 1) const; - QImage drawComponent(const int *y, const QSize &size, const float &scaling, const QColor &color, const bool &unscaled, const uint &max) const; + QImage drawComponent(const int *y, const QSize &size, const float &scaling, const QColor &color, bool unscaled, uint max) const; void drawComponentFull(QPainter *davinci, const int *y, const float &scaling, const QRect &rect, - const QColor &color, const int &textSpace, const bool &unscaled, const uint &max) const; + const QColor &color, int textSpace, bool unscaled, uint max) const; enum Components { ComponentY = 1<<0, ComponentR = 1<<1, ComponentG = 1<<2, ComponentB = 1<<3, ComponentSum = 1<<4 }; diff --git a/src/colorcorrection/rgbparadegenerator.cpp b/src/colorcorrection/rgbparadegenerator.cpp index 97ae402..dea166b 100644 --- a/src/colorcorrection/rgbparadegenerator.cpp +++ b/src/colorcorrection/rgbparadegenerator.cpp @@ -37,8 +37,8 @@ RGBParadeGenerator::RGBParadeGenerator() } QImage RGBParadeGenerator::calculateRGBParade(const QSize ¶deSize, const QImage &image, - const RGBParadeGenerator::PaintMode paintMode, const bool &drawAxis, - const bool &drawGradientRef, const uint &accelFactor) + const RGBParadeGenerator::PaintMode paintMode, bool drawAxis, + bool drawGradientRef, uint accelFactor) { Q_ASSERT(accelFactor >= 1); diff --git a/src/colorcorrection/rgbparadegenerator.h b/src/colorcorrection/rgbparadegenerator.h index 17a3752..80c9c48 100644 --- a/src/colorcorrection/rgbparadegenerator.h +++ b/src/colorcorrection/rgbparadegenerator.h @@ -23,7 +23,7 @@ public: RGBParadeGenerator(); QImage calculateRGBParade(const QSize ¶deSize, const QImage &image, const RGBParadeGenerator::PaintMode paintMode, - const bool &drawAxis, const bool &drawGradientRef, const uint &accelFactor = 1); + bool drawAxis, bool drawGradientRef, uint accelFactor = 1); static const QColor colHighlight; static const QColor colLight; diff --git a/src/colorcorrection/vectorscopegenerator.cpp b/src/colorcorrection/vectorscopegenerator.cpp index 971b9be..480286f 100644 --- a/src/colorcorrection/vectorscopegenerator.cpp +++ b/src/colorcorrection/vectorscopegenerator.cpp @@ -118,7 +118,7 @@ QPoint VectorscopeGenerator::mapToCircle(const QSize &targetSize, const QPointF QImage VectorscopeGenerator::calculateVectorscope(const QSize &vectorscopeSize, const QImage &image, const float &gain, const VectorscopeGenerator::PaintMode &paintMode, const VectorscopeGenerator::ColorSpace &colorSpace, - const bool &, const uint &accelFactor) const + bool, uint accelFactor) const { if (vectorscopeSize.width() <= 0 || vectorscopeSize.height() <= 0 || image.width() <= 0 || image.height() <= 0) { // Invalid size diff --git a/src/colorcorrection/vectorscopegenerator.h b/src/colorcorrection/vectorscopegenerator.h index 3aa3669..8067627 100644 --- a/src/colorcorrection/vectorscopegenerator.h +++ b/src/colorcorrection/vectorscopegenerator.h @@ -30,13 +30,13 @@ public: QImage calculateVectorscope(const QSize &vectorscopeSize, const QImage &image, const float &gain, const VectorscopeGenerator::PaintMode &paintMode, const VectorscopeGenerator::ColorSpace &colorSpace, - const bool&, const uint &accelFactor = 1) const; + bool, uint accelFactor = 1) const; QPoint mapToCircle(const QSize &targetSize, const QPointF &point) const; static const float scaling; signals: - void signalCalculationFinished(QImage image, const uint &ms); + void signalCalculationFinished(const QImage &image, uint ms); }; diff --git a/src/colorcorrection/waveformgenerator.cpp b/src/colorcorrection/waveformgenerator.cpp index ba624b5..f1c0a3b 100644 --- a/src/colorcorrection/waveformgenerator.cpp +++ b/src/colorcorrection/waveformgenerator.cpp @@ -29,7 +29,7 @@ WaveformGenerator::~WaveformGenerator() } QImage WaveformGenerator::calculateWaveform(const QSize &waveformSize, const QImage &image, WaveformGenerator::PaintMode paintMode, - const bool &drawAxis, WaveformGenerator::Rec rec, const uint &accelFactor) + bool drawAxis, WaveformGenerator::Rec rec, uint accelFactor) { Q_ASSERT(accelFactor >= 1); diff --git a/src/colorcorrection/waveformgenerator.h b/src/colorcorrection/waveformgenerator.h index b4f4155..d974ee9 100644 --- a/src/colorcorrection/waveformgenerator.h +++ b/src/colorcorrection/waveformgenerator.h @@ -27,7 +27,7 @@ public: ~WaveformGenerator(); QImage calculateWaveform(const QSize &waveformSize, const QImage &image, WaveformGenerator::PaintMode paintMode, - const bool &drawAxis, const WaveformGenerator::Rec rec, const uint &accelFactor = 1); + bool drawAxis, const WaveformGenerator::Rec rec, uint accelFactor = 1); //signals: //void signalCalculationFinished(QImage image, const uint &ms); diff --git a/src/complexparameter.h b/src/complexparameter.h index 9c2338b..b1519af 100644 --- a/src/complexparameter.h +++ b/src/complexparameter.h @@ -49,8 +49,8 @@ public slots: void slotUpdateEffectParams(const QDomElement &e); void slotUpdateParameterList(const QStringList &); signals: - void removeEffect(ClipItem*, QDomElement); - void updateClipEffect(ClipItem*, QDomElement); + void removeEffect(ClipItem*, const QDomElement &); + void updateClipEffect(ClipItem*, const QDomElement &); void parameterChanged(); }; diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index e1034e8..d8dab19 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -2020,7 +2020,7 @@ void CustomTrackView::slotDropEffect(ClipItem *clip, QDomElement effect, GenTime } } -void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) +void CustomTrackView::slotAddEffect(QDomElement effect, const GenTime &pos, int track) { QList<QGraphicsItem *> itemList; QUndoCommand *effectCommand = new QUndoCommand(); @@ -2432,7 +2432,7 @@ void CustomTrackView::slotUpdateClipRegion(ClipItem *clip, int ix, QString regio m_commandStack->push(command); } -ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, EffectsList oldStack, bool execute) +ClipItem *CustomTrackView::cutClip(const ItemInfo &info, const GenTime &cutTime, bool cut, const EffectsList &oldStack, bool execute) { if (cut) { // cut clip @@ -2666,7 +2666,7 @@ void CustomTrackView::slotAddTransition(ClipItem* /*clip*/, ItemInfo transitionI setDocumentModified(); } -void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params, bool refresh) +void CustomTrackView::addTransition(const ItemInfo &transitionInfo, int endTrack, const QDomElement ¶ms, bool refresh) { Transition *tr = new Transition(transitionInfo, endTrack, m_document->fps(), params, true); //kDebug() << "---- ADDING transition " << params.attribute("value"); @@ -2679,7 +2679,7 @@ void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomE } } -void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement /*params*/, bool refresh) +void CustomTrackView::deleteTransition(const ItemInfo &transitionInfo, int endTrack, QDomElement /*params*/, bool refresh) { Transition *item = getTransitionItemAt(transitionInfo.startPos, transitionInfo.track); if (!item) { @@ -3049,7 +3049,7 @@ int CustomTrackView::duration() const return m_projectDuration; } -void CustomTrackView::addTrack(TrackInfo type, int ix) +void CustomTrackView::addTrack(const TrackInfo &type, int ix) { QList <TransitionInfo> transitionInfos; if (ix == -1 || ix == m_document->tracksCount()) { @@ -4830,7 +4830,7 @@ bool CustomTrackView::moveClip(const ItemInfo &start, const ItemInfo &end, bool return success; } -void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> startTransition, const GenTime &offset, const int trackOffset, bool reverseMove) +void CustomTrackView::moveGroup(QList<ItemInfo> startClip, QList<ItemInfo> startTransition, const GenTime &offset, const int trackOffset, bool reverseMove) { // Group Items resetSelectionGroup(); diff --git a/src/customtrackview.h b/src/customtrackview.h index 835d151..f3a6fa0 100644 --- a/src/customtrackview.h +++ b/src/customtrackview.h @@ -55,7 +55,7 @@ public: virtual void mouseReleaseEvent(QMouseEvent * event); virtual void mouseMoveEvent(QMouseEvent * event); virtual void mouseDoubleClickEvent(QMouseEvent *event); - void addTrack(TrackInfo type, int ix = -1); + void addTrack(const TrackInfo &type, int ix = -1); void removeTrack(int ix); /** @brief Makes the document use new track infos (name, type, ...). */ void configTracks(const QList<TrackInfo> &trackInfos); @@ -68,7 +68,7 @@ public: For example, attempting to move a clip to t = -1 s will actually move it to t = 0 s. */ bool moveClip(const ItemInfo &start, const ItemInfo &end, bool refresh, ItemInfo *out_actualEnd = NULL); - void moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> startTransition, const GenTime &offset, const int trackOffset, bool reverseMove = false); + void moveGroup(QList<ItemInfo> startClip, QList<ItemInfo> startTransition, const GenTime &offset, const int trackOffset, bool reverseMove = false); /** move transition, startPos = (old start, old end), endPos = (new start, new end) */ void moveTransition(const ItemInfo &start, const ItemInfo &end, bool refresh); void resizeClip(const ItemInfo &start, const ItemInfo &end, bool dontWorry = false); @@ -83,7 +83,7 @@ public: /** @brief An effect was dropped on @param clip */ void slotDropEffect(ClipItem *clip, QDomElement effect, GenTime pos, int track); /** @brief Add effect to current clip */ - void slotAddEffect(QDomElement effect, GenTime pos, int track); + void slotAddEffect(QDomElement effect, const GenTime &pos, int track); void slotAddGroupEffect(QDomElement effect, AbstractGroupItem *group, AbstractClipItem *dropTarget = NULL); void addEffect(int track, GenTime pos, QDomElement effect); void deleteEffect(int track, GenTime pos, QDomElement effect); @@ -91,10 +91,9 @@ public: /** @brief Enable / disable a list of effects */ void updateEffectState(int track, GenTime pos, QList <int> effectIndexes, bool disable, bool updateEffectStack); void moveEffect(int track, GenTime pos, QList <int> oldPos, QList <int> newPos); - void addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params, bool refresh); - void deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement params, bool refresh); + void addTransition(const ItemInfo &transitionInfo, int endTrack, const QDomElement ¶ms, bool refresh); + void deleteTransition(const ItemInfo &transitionInfo, int endTrack, QDomElement params, bool refresh); void updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget); - void moveTransition(GenTime oldpos, GenTime newpos); void activateMonitor(); int duration() const; void deleteSelectedClips(); @@ -105,7 +104,7 @@ public: void updateSceneFrameWidth(); //QList <TrackInfo> tracksList() const; void setTool(PROJECTTOOL tool); - ClipItem *cutClip(ItemInfo info, GenTime cutTime, bool cut, EffectsList oldStack = EffectsList(), bool execute = true); + ClipItem *cutClip(const ItemInfo &info, const GenTime &cutTime, bool cut, const EffectsList &oldStack = EffectsList(), bool execute = true); void slotSeekToPreviousSnap(); void slotSeekToNextSnap(); double getSnapPointForPos(double pos); diff --git a/src/databackup/backupwidget.cpp b/src/databackup/backupwidget.cpp index eba2ca5..ce00abe 100644 --- a/src/databackup/backupwidget.cpp +++ b/src/databackup/backupwidget.cpp @@ -34,8 +34,7 @@ BackupWidget::BackupWidget(const KUrl &projectUrl, const KUrl &projectFolder, co // No url, means we opened the backup dialog from an empty project info_label->setText(i18n("Showing all backup files in folder")); m_projectWildcard = '*'; - } - else { + } else { info_label->setText(i18n("Showing backup files for %1", projectUrl.fileName())); m_projectWildcard = projectUrl.fileName().section('.', 0, -2); if (!projectId.isEmpty()) m_projectWildcard.append('-' + projectId); @@ -83,7 +82,7 @@ void BackupWidget::slotParseBackupFiles() QString label; for (int i = 0; i < resultList.count(); ++i) { label = resultList.at(i).lastModified().toString(Qt::SystemLocaleLongDate); - if (m_projectWildcard.startsWith('*')) { + if (m_projectWildcard.startsWith(QLatin1Char('*'))) { // Displaying all backup files, so add project name in the entries label.prepend(resultList.at(i).fileName().section('-', 0, -7) + ".kdenlive - "); } @@ -106,7 +105,8 @@ void BackupWidget::slotDisplayBackupPreview() QString BackupWidget::selectedFile() const { - if (!backup_list->currentItem()) return QString(); + if (!backup_list->currentItem()) + return QString(); return backup_list->currentItem()->data(Qt::UserRole).toString(); } diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp index 65476bd..d8f917e 100644 --- a/src/docclipbase.cpp +++ b/src/docclipbase.cpp @@ -42,20 +42,20 @@ #include <kmessagebox.h> DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QString &id) : - QObject(), - lastSeekPosition(0), - audioFrameCache(), - m_refcount(0), - m_baseTrackProducers(), - m_videoTrackProducers(), - m_audioTrackProducers(), - m_snapMarkers(QList < CommentedTime >()), - m_duration(), - m_thumbProd(NULL), - m_audioThumbCreated(false), - m_id(id), - m_placeHolder(xml.hasAttribute("placeholder")), - m_properties() + QObject(), + lastSeekPosition(0), + audioFrameCache(), + m_refcount(0), + m_baseTrackProducers(), + m_videoTrackProducers(), + m_audioTrackProducers(), + m_snapMarkers(QList < CommentedTime >()), + m_duration(), + m_thumbProd(NULL), + m_audioThumbCreated(false), + m_id(id), + m_placeHolder(xml.hasAttribute("placeholder")), + m_properties() { int type = xml.attribute("type").toInt(); m_clipType = (CLIPTYPE) type; @@ -71,8 +71,8 @@ DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QStrin for (int i = 0; i < metas.count(); ++i) { QDomElement e = metas.item(i).toElement(); if (!e.isNull()) { - m_metadata.insert(e.attribute("name").section('.', 2), QStringList() << e.firstChild().nodeValue() << e.attribute("tool")); - } + m_metadata.insert(e.attribute("name").section('.', 2), QStringList() << e.firstChild().nodeValue() << e.attribute("tool")); + } } if (xml.hasAttribute("cutzones")) { QStringList cuts = xml.attribute("cutzones").split(';', QString::SkipEmptyParts); @@ -83,9 +83,9 @@ DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QStrin } if (xml.hasAttribute("analysisdata")) { - QStringList adata = xml.attribute("analysisdata").split('#', QString::SkipEmptyParts); - for (int i = 0; i < adata.count(); ++i) - m_analysisdata.insert(adata.at(i).section('?', 0, 0), adata.at(i).section('?', 1, 1)); + QStringList adata = xml.attribute("analysisdata").split('#', QString::SkipEmptyParts); + for (int i = 0; i < adata.count(); ++i) + m_analysisdata.insert(adata.at(i).section('?', 0, 0), adata.at(i).section('?', 1, 1)); } KUrl url = KUrl(xml.attribute("resource")); @@ -96,7 +96,7 @@ DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QStrin } else { int out = xml.attribute("out").toInt(); int in = xml.attribute("in").toInt(); - if (out > in) setDuration(GenTime(out - in + 1, KdenliveSettings::project_fps())); + if (out > in) setDuration(GenTime(out - in + 1, KdenliveSettings::project_fps())); } if (!m_properties.contains("name")) m_properties.insert("name", url.fileName()); @@ -125,7 +125,7 @@ DocClipBase::~DocClipBase() m_videoTrackProducers.clear(); } -void DocClipBase::setZone(QPoint zone) +void DocClipBase::setZone(const QPoint &zone) { m_properties.insert("zone_in", QString::number(zone.x())); m_properties.insert("zone_out", QString::number(zone.y())); @@ -267,14 +267,14 @@ QDomElement DocClipBase::toXML(bool hideTemporaryProperties) const while (j.hasNext()) { j.next(); if (!j.value().isEmpty()) { - QDomElement property = doc.createElement("metaproperty"); - property.setAttribute("name", "meta.attr." + j.key()); - QStringList values = j.value(); - QDomText value = doc.createTextNode(values.at(0)); - if (values.count() > 1) property.setAttribute("tool", values.at(1)); + QDomElement property = doc.createElement("metaproperty"); + property.setAttribute("name", "meta.attr." + j.key()); + QStringList values = j.value(); + QDomText value = doc.createTextNode(values.at(0)); + if (values.count() > 1) property.setAttribute("tool", values.at(1)); property.appendChild(value); - clip.appendChild(property); - } + clip.appendChild(property); + } } doc.appendChild(clip); if (!m_cutZones.isEmpty()) { @@ -287,12 +287,12 @@ QDomElement DocClipBase::toXML(bool hideTemporaryProperties) const } QString adata; if (!m_analysisdata.isEmpty()) { - QMapIterator<QString, QString> i(m_analysisdata); - while (i.hasNext()) { - i.next(); - //WARNING: a ? and # separator is not a good idea - adata.append(i.key() + "?" + i.value() + "#"); - } + QMapIterator<QString, QString> i(m_analysisdata); + while (i.hasNext()) { + i.next(); + //WARNING: a ? and # separator is not a good idea + adata.append(i.key() + "?" + i.value() + "#"); + } } clip.setAttribute("analysisdata", adata); //kDebug() << "/// CLIP XML: " << doc.toString(); @@ -301,17 +301,17 @@ QDomElement DocClipBase::toXML(bool hideTemporaryProperties) const const QString DocClipBase::shortInfo() const { - + QString info; if (m_clipType == AV || m_clipType == VIDEO || m_clipType == IMAGE || m_clipType == PLAYLIST) { - info = m_properties.value("frame_size") + " "; - if (m_properties.contains("fps")) { - info.append(i18n("%1 fps", m_properties.value("fps").left(5))); - } - if (!info.simplified().isEmpty()) info.prepend(" - "); + info = m_properties.value("frame_size") + " "; + if (m_properties.contains("fps")) { + info.append(i18n("%1 fps", m_properties.value("fps").left(5))); + } + if (!info.simplified().isEmpty()) info.prepend(" - "); } else if (m_clipType == AUDIO) { - info = " - " + m_properties.value("frequency") + i18n("Hz"); + info = " - " + m_properties.value("frequency") + i18n("Hz"); } QString tip = "<b>"; switch (m_clipType) { @@ -390,7 +390,7 @@ void DocClipBase::addSnapMarker(const CommentedTime &marker) if ((it != m_snapMarkers.end()) && ((*it).time() == marker.time())) { (*it).setComment(marker.comment()); - (*it).setMarkerType(marker.markerType()); + (*it).setMarkerType(marker.markerType()); //kError() << "trying to add Snap Marker that already exists, this will cause inconsistancies with undo/redo"; } else { m_snapMarkers.insert(it, marker); @@ -467,7 +467,7 @@ GenTime DocClipBase::findNextSnapMarker(const GenTime & currTime) return duration(); } -QString DocClipBase::markerComment(GenTime t) const +QString DocClipBase::markerComment(const GenTime &t) const { QList < CommentedTime >::ConstIterator itt = m_snapMarkers.begin(); while (itt != m_snapMarkers.end()) { @@ -518,7 +518,7 @@ void DocClipBase::deleteProducers() } else { qDeleteAll(m_baseTrackProducers); - qDeleteAll(m_videoTrackProducers); + qDeleteAll(m_videoTrackProducers); qDeleteAll(m_audioTrackProducers); m_replaceMutex.unlock(); } @@ -544,9 +544,9 @@ void DocClipBase::cleanupProducers() }*/ if (!isClean()) { - qDeleteAll(m_toDeleteProducers); - m_toDeleteProducers.clear(); - m_replaceMutex.unlock(); + qDeleteAll(m_toDeleteProducers); + m_toDeleteProducers.clear(); + m_replaceMutex.unlock(); } } @@ -602,9 +602,9 @@ void DocClipBase::setProducer(Mlt::Producer *producer, bool reset, bool readProp else delete producer; return; } else if (id.endsWith("video")) { - int pos = 0; - // Keep compatibility with older projects where video only producers were not track specific - if (id.contains('_')) pos = id.section('_', 0, 0).toInt(); + int pos = 0; + // Keep compatibility with older projects where video only producers were not track specific + if (id.contains('_')) pos = id.section('_', 0, 0).toInt(); if (pos >= m_videoTrackProducers.count()) { while (m_videoTrackProducers.count() - 1 < pos) { m_videoTrackProducers.append(NULL); @@ -649,7 +649,7 @@ static double getPixelAspect(QMap<QString, QString>& props) { int aspectNumerator = props.value("force_aspect_num").toInt(); int aspectDenominator = props.value("force_aspect_den").toInt(); if (aspectDenominator != 0 && width != 0) - return double(height) * aspectNumerator / aspectDenominator / width; + return double(height) * aspectNumerator / aspectDenominator / width; else return 1.0; } @@ -686,24 +686,24 @@ Mlt::Producer *DocClipBase::audioProducer(int track) void DocClipBase::adjustProducerProperties(Mlt::Producer *prod, const QString &id, bool mute, bool blind) { - if (m_properties.contains("force_aspect_num") && m_properties.contains("force_aspect_den") && m_properties.contains("frame_size")) - prod->set("force_aspect_ratio", getPixelAspect(m_properties)); - if (m_properties.contains("force_fps")) prod->set("force_fps", m_properties.value("force_fps").toDouble()); - if (m_properties.contains("force_progressive")) prod->set("force_progressive", m_properties.value("force_progressive").toInt()); - if (m_properties.contains("force_tff")) prod->set("force_tff", m_properties.value("force_tff").toInt()); - if (m_properties.contains("threads")) prod->set("threads", m_properties.value("threads").toInt()); - if (mute) prod->set("audio_index", -1); - else if (m_properties.contains("audio_index")) prod->set("audio_index", m_properties.value("audio_index").toInt()); - if (blind) prod->set("video_index", -1); - else if (m_properties.contains("video_index")) prod->set("video_index", m_properties.value("video_index").toInt()); - prod->set("id", id.toUtf8().constData()); - if (m_properties.contains("force_colorspace")) prod->set("force_colorspace", m_properties.value("force_colorspace").toInt()); - if (m_properties.contains("full_luma")) prod->set("set.force_full_luma", m_properties.value("full_luma").toInt()); - if (m_properties.contains("proxy_out")) { - // We have a proxy clip, make sure the proxy has same duration as original - prod->set("length", m_properties.value("duration").toInt()); - prod->set("out", m_properties.value("proxy_out").toInt()); - } + if (m_properties.contains("force_aspect_num") && m_properties.contains("force_aspect_den") && m_properties.contains("frame_size")) + prod->set("force_aspect_ratio", getPixelAspect(m_properties)); + if (m_properties.contains("force_fps")) prod->set("force_fps", m_properties.value("force_fps").toDouble()); + if (m_properties.contains("force_progressive")) prod->set("force_progressive", m_properties.value("force_progressive").toInt()); + if (m_properties.contains("force_tff")) prod->set("force_tff", m_properties.value("force_tff").toInt()); + if (m_properties.contains("threads")) prod->set("threads", m_properties.value("threads").toInt()); + if (mute) prod->set("audio_index", -1); + else if (m_properties.contains("audio_index")) prod->set("audio_index", m_properties.value("audio_index").toInt()); + if (blind) prod->set("video_index", -1); + else if (m_properties.contains("video_index")) prod->set("video_index", m_properties.value("video_index").toInt()); + prod->set("id", id.toUtf8().constData()); + if (m_properties.contains("force_colorspace")) prod->set("force_colorspace", m_properties.value("force_colorspace").toInt()); + if (m_properties.contains("full_luma")) prod->set("set.force_full_luma", m_properties.value("full_luma").toInt()); + if (m_properties.contains("proxy_out")) { + // We have a proxy clip, make sure the proxy has same duration as original + prod->set("length", m_properties.value("duration").toInt()); + prod->set("out", m_properties.value("proxy_out").toInt()); + } } @@ -772,8 +772,8 @@ Mlt::Producer *DocClipBase::getCloneProducer() if (m_properties.contains("out"))prod->set("out", m_properties.value("out").toInt()); } if (m_clipType == AUDIO) { - prod->set("_audioclip", 1); - } + prod->set("_audioclip", 1); + } } return prod; } @@ -804,7 +804,7 @@ Mlt::Producer *DocClipBase::getProducer(int track) if (m_baseTrackProducers.at(i) != NULL) break; if (i >= m_baseTrackProducers.count()) { - // Could not find a valid producer for that clip, check in + // Could not find a valid producer for that clip, check in return NULL; } Mlt::Producer *prod = cloneProducer(m_baseTrackProducers.at(i)); @@ -820,8 +820,8 @@ Mlt::Producer *DocClipBase::cloneProducer(Mlt::Producer *source) Mlt::Producer *result = NULL; QString url = QString::fromUtf8(source->get("resource")); if (url == "<playlist>" || url == "<tractor>" || url == "<producer>") { - // Xml producer sometimes loses the correct url - url = m_properties.value("resource"); + // Xml producer sometimes loses the correct url + url = m_properties.value("resource"); } if (m_clipType == SLIDESHOW || KIO::NetAccess::exists(KUrl(url), KIO::NetAccess::SourceSide, 0)) { result = new Mlt::Producer(*(source->profile()), url.toUtf8().constData()); @@ -1156,9 +1156,9 @@ void DocClipBase::setProperty(const QString &key, const QString &value) if (key == "resource") { getFileHash(value); if (m_thumbProd) m_thumbProd->updateClipUrl(KUrl(value), m_properties.value("file_hash")); - //else if (key == "transparency") m_clipProducer->set("transparency", value.toInt()); + //else if (key == "transparency") m_clipProducer->set("transparency", value.toInt()); } else if (key == "out") { - setDuration(GenTime(value.toInt() + 1, KdenliveSettings::project_fps())); + setDuration(GenTime(value.toInt() + 1, KdenliveSettings::project_fps())); } else if (key == "colour") { setProducerProperty("colour", value.toUtf8().data()); @@ -1252,22 +1252,24 @@ bool DocClipBase::isPlaceHolder() const return m_placeHolder; } -void DocClipBase::addCutZone(int in, int out, QString desc) +void DocClipBase::addCutZone(int in, int out, const QString &desc) { CutZoneInfo info; info.zone = QPoint(in, out); info.description = desc; - for (int i = 0; i < m_cutZones.count(); ++i) + for (int i = 0; i < m_cutZones.count(); ++i) { if (m_cutZones.at(i).zone == info.zone) { return; } + } m_cutZones.append(info); } -bool DocClipBase::hasCutZone(QPoint p) const +bool DocClipBase::hasCutZone(const QPoint &p) const { for (int i = 0; i < m_cutZones.count(); ++i) - if (m_cutZones.at(i).zone == p) return true; + if (m_cutZones.at(i).zone == p) + return true; return false; } @@ -1355,38 +1357,38 @@ void DocClipBase::setAnalysisData(const QString &name, const QString &data, int { if (data.isEmpty()) m_analysisdata.remove(name); else { - if (m_analysisdata.contains(name)) { - if (KMessageBox::questionYesNo(kapp->activeWindow(), i18n("Clip already contains analysis data %1", name), QString(), KGuiItem(i18n("Merge")), KGuiItem(i18n("Add"))) == KMessageBox::Yes) { - // Merge data - Mlt::Profile *profile = m_baseTrackProducers.at(0)->profile(); - Mlt::Geometry geometry(m_analysisdata.value(name).toUtf8().data(), m_properties.value("duration").toInt(), profile->width(), profile->height()); - Mlt::Geometry newGeometry(data.toUtf8().data(), m_properties.value("duration").toInt(), profile->width(), profile->height()); - Mlt::GeometryItem item; - int pos = 0; - while (!newGeometry.next_key(&item, pos)) { - pos = item.frame(); - item.frame(pos + offset); - pos++; - geometry.insert(item); - } - m_analysisdata.insert(name, geometry.serialise()); - } - else { - // Add data with another name - int i = 1; - QString newname = name + " " + QString::number(i); - while (m_analysisdata.contains(newname)) { - ++i; - newname = name + " " + QString::number(i); - } - m_analysisdata.insert(newname, geometryWithOffset(data, offset)); - } - } - else m_analysisdata.insert(name, geometryWithOffset(data, offset)); - } -} - -const QString DocClipBase::geometryWithOffset(QString data, int offset) + if (m_analysisdata.contains(name)) { + if (KMessageBox::questionYesNo(kapp->activeWindow(), i18n("Clip already contains analysis data %1", name), QString(), KGuiItem(i18n("Merge")), KGuiItem(i18n("Add"))) == KMessageBox::Yes) { + // Merge data + Mlt::Profile *profile = m_baseTrackProducers.at(0)->profile(); + Mlt::Geometry geometry(m_analysisdata.value(name).toUtf8().data(), m_properties.value("duration").toInt(), profile->width(), profile->height()); + Mlt::Geometry newGeometry(data.toUtf8().data(), m_properties.value("duration").toInt(), profile->width(), profile->height()); + Mlt::GeometryItem item; + int pos = 0; + while (!newGeometry.next_key(&item, pos)) { + pos = item.frame(); + item.frame(pos + offset); + pos++; + geometry.insert(item); + } + m_analysisdata.insert(name, geometry.serialise()); + } + else { + // Add data with another name + int i = 1; + QString newname = name + " " + QString::number(i); + while (m_analysisdata.contains(newname)) { + ++i; + newname = name + " " + QString::number(i); + } + m_analysisdata.insert(newname, geometryWithOffset(data, offset)); + } + } + else m_analysisdata.insert(name, geometryWithOffset(data, offset)); + } +} + +const QString DocClipBase::geometryWithOffset(const QString &data, int offset) { if (offset == 0) return data; Mlt::Profile *profile = m_baseTrackProducers.at(0)->profile(); @@ -1395,10 +1397,10 @@ const QString DocClipBase::geometryWithOffset(QString data, int offset) Mlt::GeometryItem item; int pos = 0; while (!geometry.next_key(&item, pos)) { - pos = item.frame(); - item.frame(pos + offset); - pos++; - newgeometry.insert(item); + pos = item.frame(); + item.frame(pos + offset); + pos++; + newgeometry.insert(item); } return newgeometry.serialise(); } diff --git a/src/docclipbase.h b/src/docclipbase.h index e4f90fc..2c55931 100644 --- a/src/docclipbase.h +++ b/src/docclipbase.h @@ -172,7 +172,7 @@ public: void deleteProducers(); /** Set default play zone for clip monitor */ - void setZone(QPoint zone); + void setZone(const QPoint &zone); /** Get default play zone for clip monitor */ QPoint zone() const; @@ -181,8 +181,8 @@ public: void setValid(); static QString getHash(const QString &path); - void addCutZone(int in, int out, QString desc = QString()); - bool hasCutZone(QPoint p) const; + void addCutZone(int in, int out, const QString &desc = QString()); + bool hasCutZone(const QPoint &p) const; void removeCutZone(int in, int out); QList <CutZoneInfo> cutZones() const; void updateCutZone(int oldin, int oldout, int in, int out, QString desc = QString()); @@ -261,7 +261,7 @@ private: // Private attributes /** @brief Create another instance of a producer. */ Mlt::Producer *cloneProducer(Mlt::Producer *source); /** @brief Offset all keyframes of a geometry. */ - const QString geometryWithOffset(QString data, int offset); + const QString geometryWithOffset(const QString &data, int offset); public slots: @@ -274,11 +274,11 @@ public slots: void editSnapMarker(const GenTime & time, const QString &comment); void addSnapMarker(const CommentedTime &marker); QList < GenTime > snapMarkers() const; - QString markerComment(GenTime t) const; + QString markerComment(const GenTime &t) const; CommentedTime markerAt(GenTime t) const; void setClipThumbFrame(const uint &ix); uint getClipThumbFrame() const; - void setProperties(QMap <QString, QString> properties); + void setProperties(QMap<QString, QString> properties); void setMetadata(QMap <QString, QString> properties, QString tool = QString()); void slotExtractImage(QList <int> frames); diff --git a/src/dragvalue.h b/src/dragvalue.h index eda130f..2ca950e 100644 --- a/src/dragvalue.h +++ b/src/dragvalue.h @@ -41,13 +41,13 @@ public: protected: //virtual void mouseDoubleClickEvent(QMouseEvent * event); - virtual void mousePressEvent(QMouseEvent * event); - virtual void mouseReleaseEvent(QMouseEvent *event); - virtual void mouseMoveEvent(QMouseEvent *event); + void mousePressEvent(QMouseEvent * event); + void mouseReleaseEvent(QMouseEvent *event); + void mouseMoveEvent(QMouseEvent *event); //virtual void paintEvent(QPaintEvent *event); - virtual void wheelEvent(QWheelEvent * event); - virtual void focusInEvent(QFocusEvent *e); - virtual void focusOutEvent(QFocusEvent *e); + void wheelEvent(QWheelEvent * event); + void focusInEvent(QFocusEvent *e); + void focusOutEvent(QFocusEvent *e); private: QPoint m_dragStartPosition; diff --git a/src/effectstack/abstractcollapsiblewidget.h b/src/effectstack/abstractcollapsiblewidget.h index fd0de8d..afe4e20 100644 --- a/src/effectstack/abstractcollapsiblewidget.h +++ b/src/effectstack/abstractcollapsiblewidget.h @@ -36,11 +36,11 @@ public: virtual bool isGroup() const = 0; signals: - void addEffect(QDomElement e); + void addEffect(const QDomElement &e); /** @brief Move effects in the stack one step up or down. */ - void changeEffectPosition(QList <int>, bool upwards); + void changeEffectPosition(const QList <int>&, bool upwards); /** @brief Move effects in the stack. */ - void moveEffect(QList <int> current_pos, int new_pos, int groupIndex, QString groupName); + void moveEffect(const QList <int> ¤t_pos, int new_pos, int groupIndex, const QString &groupName); /** @brief An effect was saved, trigger effect list reload. */ void reloadEffects(); diff --git a/src/effectstack/collapsibleeffect.h b/src/effectstack/collapsibleeffect.h index 9851523..74fb9de 100644 --- a/src/effectstack/collapsibleeffect.h +++ b/src/effectstack/collapsibleeffect.h @@ -122,22 +122,22 @@ protected: virtual void dropEvent(QDropEvent *event); signals: - void parameterChanged(const QDomElement, const QDomElement, int); + void parameterChanged(const QDomElement &, const QDomElement&, int); void syncEffectsPos(int); void effectStateChanged(bool, int ix, bool effectNeedsMonitorScene); - void deleteEffect(const QDomElement); + void deleteEffect(const QDomElement &); void activateEffect(int); void checkMonitorPosition(int); void seekTimeline(int); /** @brief Start an MLT filter job on this clip. */ - void startFilterJob(QString filterName, QString filterParams, QString consumer, QString consumerParams, const QMap <QString, QString>extraParams); + void startFilterJob(const QString &filterName, const QString &filterParams, const QString &consumer, const QString &consumerParams, const QMap <QString, QString> &extraParams); /** @brief An effect was reset, trigger param reload. */ void resetEffect(int ix); /** @brief Ask for creation of a group. */ void createGroup(int ix); void unGroup(CollapsibleEffect *); - void createRegion(int, KUrl); - void deleteGroup(QDomDocument); + void createRegion(int, const KUrl&); + void deleteGroup(const QDomDocument&); void importClipKeyframes(); }; diff --git a/src/effectstack/collapsiblegroup.h b/src/effectstack/collapsiblegroup.h index b9ed523..21bab3d 100644 --- a/src/effectstack/collapsiblegroup.h +++ b/src/effectstack/collapsiblegroup.h @@ -36,12 +36,11 @@ class MyEditableLabel : public QLineEdit { Q_OBJECT - public: - MyEditableLabel(QWidget * parent = 0); + explicit MyEditableLabel(QWidget * parent = 0); protected: - virtual void mouseDoubleClickEvent( QMouseEvent *e); + void mouseDoubleClickEvent( QMouseEvent *e); }; @@ -103,7 +102,7 @@ protected: virtual void dropEvent(QDropEvent *event); signals: - void deleteGroup(QDomDocument); + void deleteGroup(const QDomDocument&); void unGroup(CollapsibleGroup *); void groupRenamed(CollapsibleGroup *); diff --git a/src/effectstack/effectstackview2.cpp b/src/effectstack/effectstackview2.cpp index 4a88891..933ede4 100644 --- a/src/effectstack/effectstackview2.cpp +++ b/src/effectstack/effectstackview2.cpp @@ -579,7 +579,7 @@ CollapsibleEffect *EffectStackView2::getEffectByIndex(int ix) return NULL; } -void EffectStackView2::slotUpdateEffectParams(const QDomElement old, const QDomElement e, int ix) +void EffectStackView2::slotUpdateEffectParams(const QDomElement &old, const QDomElement &e, int ix) { if (m_effectMetaInfo.trackMode) emit updateEffect(NULL, m_trackindex, old, e, ix,false); @@ -626,7 +626,7 @@ void EffectStackView2::slotDeleteGroup(QDomDocument doc) emit removeEffect(clip, ix, effects.at(i).toElement()); } -void EffectStackView2::slotDeleteEffect(const QDomElement effect) +void EffectStackView2::slotDeleteEffect(const QDomElement &effect) { if (m_effectMetaInfo.trackMode) emit removeEffect(NULL, m_trackindex, effect); @@ -634,12 +634,12 @@ void EffectStackView2::slotDeleteEffect(const QDomElement effect) emit removeEffect(m_clipref, -1, effect); } -void EffectStackView2::slotAddEffect(QDomElement effect) +void EffectStackView2::slotAddEffect(const QDomElement &effect) { emit addEffect(m_clipref, effect); } -void EffectStackView2::slotMoveEffectUp(QList <int> indexes, bool up) +void EffectStackView2::slotMoveEffectUp(const QList<int> &indexes, bool up) { if (up && indexes.first() <= 1) return; if (!up && indexes.last() >= m_currentEffectList.count()) return; diff --git a/src/effectstack/effectstackview2.h b/src/effectstack/effectstackview2.h index dde1871..72ce830 100644 --- a/src/effectstack/effectstackview2.h +++ b/src/effectstack/effectstackview2.h @@ -152,15 +152,15 @@ private slots: /** @brief Checks whether the monitor scene has to be displayed. */ void slotCheckMonitorPosition(int renderPos); - void slotUpdateEffectParams(const QDomElement old, const QDomElement e, int ix); + void slotUpdateEffectParams(const QDomElement &old, const QDomElement& e, int ix); /** @brief Move an effect in the stack. * @param indexes The list of effect index in the stack * @param up true if we want to move effect up, false for down */ - void slotMoveEffectUp(QList <int> indexes, bool up); + void slotMoveEffectUp(const QList <int> &indexes, bool up); /** @brief Delete an effect in the stack. */ - void slotDeleteEffect(const QDomElement effect); + void slotDeleteEffect(const QDomElement &effect); /** @brief Delete all effect in a group. */ void slotDeleteGroup(QDomDocument doc); @@ -197,7 +197,7 @@ private slots: void slotUnGroup(CollapsibleGroup* group); /** @brief Add en effect to selected clip */ - void slotAddEffect(QDomElement effect); + void slotAddEffect(const QDomElement &effect); /** @brief Enable / disable all effects for the clip */ void slotCheckAll(int state); @@ -212,26 +212,26 @@ private slots: void slotRenameGroup(CollapsibleGroup *group); signals: - void removeEffect(ClipItem*, int, QDomElement); + void removeEffect(ClipItem*, int, const QDomElement&); /** Parameters for an effect changed, update the filter in playlist */ - void updateEffect(ClipItem*, int, QDomElement, QDomElement, int,bool); + void updateEffect(ClipItem*, int, const QDomElement&, const QDomElement &, int,bool); /** An effect in stack was moved, we need to regenerate all effects for this clip in the playlist */ void refreshEffectStack(ClipItem *); /** Enable or disable an effect */ - void changeEffectState(ClipItem*, int, QList <int>, bool); + void changeEffectState(ClipItem*, int, const QList <int>&, bool); /** An effect in stack was moved */ - void changeEffectPosition(ClipItem*, int, QList <int>, int); + void changeEffectPosition(ClipItem*, int, const QList <int>&, int); /** an effect was saved, reload list */ void reloadEffects(); /** An effect with position parameter was changed, seek */ void seekTimeline(int); /** The region effect for current effect was changed */ - void updateClipRegion(ClipItem*, int, QString); + void updateClipRegion(ClipItem*, int, const QString&); void displayMessage(const QString&, int); void showComments(bool show); - void startFilterJob(ItemInfo info, const QString &clipId, const QString &filterName, const QString &filterParams, const QString &consumer, const QString &consumerParams, const QMap<QString, QString> &extraParams); - void addEffect(ClipItem*,QDomElement); + void startFilterJob(const ItemInfo &info, const QString &clipId, const QString &filterName, const QString &filterParams, const QString &consumer, const QString &consumerParams, const QMap<QString, QString> &extraParams); + void addEffect(ClipItem*,const QDomElement &); void importClipKeyframes(GRAPHICSRECTITEM = AVWIDGET); }; diff --git a/src/effectstack/parametercontainer.h b/src/effectstack/parametercontainer.h index 8cc5951..4890cb7 100644 --- a/src/effectstack/parametercontainer.h +++ b/src/effectstack/parametercontainer.h @@ -50,8 +50,8 @@ public: explicit MySpinBox(QWidget * parent = 0); protected: - virtual void focusInEvent(QFocusEvent*); - virtual void focusOutEvent(QFocusEvent*); + void focusInEvent(QFocusEvent*); + void focusOutEvent(QFocusEvent*); }; class ParameterContainer : public QObject @@ -106,7 +106,7 @@ signals: void seekTimeline(int); void showComments(bool); /** @brief Start an MLT filter job on this clip. */ - void startFilterJob(QString filterName, QString filterParams, QString consumer, QString consumerParams, const QMap <QString, QString>extra); + void startFilterJob(const QString &filterName, const QString &filterParams, const QString &consumer, const QString &consumerParams, const QMap <QString, QString> &extra); /** @brief Request import of keyframes from clip data. */ void importClipKeyframes(); /** @brief Master clip was resized, update effect. */ diff --git a/src/lib/audio/audioInfo.cpp b/src/lib/audio/audioInfo.cpp index e7a563b..30e18f2 100644 --- a/src/lib/audio/audioInfo.cpp +++ b/src/lib/audio/audioInfo.cpp @@ -16,7 +16,7 @@ #include <cstdlib> AudioInfo::AudioInfo(Mlt::Producer *producer) : -m_producer(NULL) + m_producer(NULL) { // Since we already receive an MLT producer, we do not need to initialize MLT: // Mlt::Factory::init(NULL); @@ -25,7 +25,7 @@ m_producer(NULL) int streams = producer->get_int("meta.media.nb_streams"); for (int i = 0; i < streams; ++i) { QByteArray propertyName = QString("meta.media.%1.stream.type").arg(i).toLocal8Bit(); - const char* streamtype = producer->get(propertyName.data()); + const char* streamtype = producer->get(propertyName.data()); if (streamtype && strcmp("audio", streamtype) == 0) { m_list << new AudioStreamInfo(producer, i); } diff --git a/src/lib/audio/audioInfo.h b/src/lib/audio/audioInfo.h index b1213d8..41a24ce 100644 --- a/src/lib/audio/audioInfo.h +++ b/src/lib/audio/audioInfo.h @@ -29,7 +29,6 @@ public: private: Mlt::Producer *m_producer; QList<AudioStreamInfo*> m_list; - }; #endif // AUDIOINFO_H diff --git a/src/lib/audio/audioStreamInfo.cpp b/src/lib/audio/audioStreamInfo.cpp index 8fe64cf..7c39475 100644 --- a/src/lib/audio/audioStreamInfo.cpp +++ b/src/lib/audio/audioStreamInfo.cpp @@ -17,7 +17,6 @@ the Free Software Foundation, either version 3 of the License, or AudioStreamInfo::AudioStreamInfo(Mlt::Producer *producer, int audioStreamIndex) : m_audioStreamIndex(audioStreamIndex) { - QByteArray key; key = QString("meta.media.%1.codec.sample_fmt").arg(audioStreamIndex).toLocal8Bit(); @@ -38,6 +37,7 @@ AudioStreamInfo::AudioStreamInfo(Mlt::Producer *producer, int audioStreamIndex) key = QString("meta.media.%1.codec.long_name").arg(audioStreamIndex).toLocal8Bit(); m_codecLongName = QString(producer->get(key.data())); } + AudioStreamInfo::~AudioStreamInfo() { } diff --git a/src/onmonitoritems/onmonitorcornersitem.cpp b/src/onmonitoritems/onmonitorcornersitem.cpp index 9ff9fb7..0b6d135 100644 --- a/src/onmonitoritems/onmonitorcornersitem.cpp +++ b/src/onmonitoritems/onmonitorcornersitem.cpp @@ -29,11 +29,11 @@ #include <QGraphicsView> OnMonitorCornersItem::OnMonitorCornersItem(QGraphicsItem* parent) : - QGraphicsPolygonItem(parent) - , m_mode(NoAction) - , m_selectedCorner(-1) - , m_modified(false) - , m_view(NULL) + QGraphicsPolygonItem(parent) + , m_mode(NoAction) + , m_selectedCorner(-1) + , m_modified(false) + , m_view(NULL) { setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); @@ -264,8 +264,8 @@ bool OnMonitorCornersItem::getView() if (m_view) return true; - if (scene() && scene()->views().count()) { - m_view = scene()->views()[0]; + if (scene() && !scene()->views().isEmpty()) { + m_view = scene()->views().first(); return true; } else { return false; diff --git a/src/onmonitoritems/onmonitorpathitem.cpp b/src/onmonitoritems/onmonitorpathitem.cpp index 3db6d43..c3b79df 100644 --- a/src/onmonitoritems/onmonitorpathitem.cpp +++ b/src/onmonitoritems/onmonitorpathitem.cpp @@ -59,7 +59,8 @@ void OnMonitorPathItem::setPoints(Mlt::Geometry *geometry) rebuildShape(); } -void OnMonitorPathItem::rebuildShape() { +void OnMonitorPathItem::rebuildShape() +{ if (m_activePoint > m_points.count()) m_activePoint = -1; QPainterPath p; QPainterPath shape; @@ -81,7 +82,7 @@ void OnMonitorPathItem::rebuildShape() { setPath(p); } -void OnMonitorPathItem::getMode(QPointF pos) +void OnMonitorPathItem::getMode(const QPointF &pos) { double dist = 8; if (getView()) { @@ -193,8 +194,8 @@ bool OnMonitorPathItem::getView() if (m_view) return true; - if (scene() && scene()->views().count()) { - m_view = scene()->views()[0]; + if (scene() && !scene()->views().isEmpty()) { + m_view = scene()->views().first(); return true; } else { return false; diff --git a/src/onmonitoritems/onmonitorpathitem.h b/src/onmonitoritems/onmonitorpathitem.h index 7665852..55f1296 100644 --- a/src/onmonitoritems/onmonitorpathitem.h +++ b/src/onmonitoritems/onmonitorpathitem.h @@ -38,7 +38,7 @@ class OnMonitorPathItem : public QObject, public QGraphicsPathItem public: OnMonitorPathItem(double dar, QGraphicsItem *parent = 0); void setPoints(Mlt::Geometry *geometry); - void getMode(QPointF pos); + void getMode(const QPointF &pos); void rebuildShape(); QList <QPointF> points() const; virtual QPainterPath shape () const; diff --git a/src/onmonitoritems/onmonitorrectitem.cpp b/src/onmonitoritems/onmonitorrectitem.cpp index d65ca99..44e6f42 100644 --- a/src/onmonitoritems/onmonitorrectitem.cpp +++ b/src/onmonitoritems/onmonitorrectitem.cpp @@ -291,8 +291,8 @@ bool OnMonitorRectItem::getView() if (m_view) return true; - if (scene() && scene()->views().count()) { - m_view = scene()->views()[0]; + if (scene() && !scene()->views().isEmpty()) { + m_view = scene()->views().first(); return true; } else { return false; diff --git a/src/scopes/audioscopes/audiosignal.cpp b/src/scopes/audioscopes/audiosignal.cpp index 989f90b..0b796ee 100644 --- a/src/scopes/audioscopes/audiosignal.cpp +++ b/src/scopes/audioscopes/audiosignal.cpp @@ -201,7 +201,7 @@ void AudioSignal::slotNoAudioTimeout(){ m_timer.stop(); } -void AudioSignal::showAudio(const QByteArray arr) +void AudioSignal::showAudio(const QByteArray &arr) { channels = arr; if (peeks.count()!=channels.count()){ diff --git a/src/scopes/audioscopes/audiosignal.h b/src/scopes/audioscopes/audiosignal.h index d555cc5..e4df41e 100644 --- a/src/scopes/audioscopes/audiosignal.h +++ b/src/scopes/audioscopes/audiosignal.h @@ -57,7 +57,7 @@ private: QList<int> dbscale; public slots: - void showAudio(const QByteArray); + void showAudio(const QByteArray &); void slotReceiveAudio(QVector<int16_t>,int,int,int); private slots: void slotNoAudioTimeout(); diff --git a/src/scopes/audioscopes/audiospectrum.cpp b/src/scopes/audioscopes/audiospectrum.cpp index a4ee112..71f13ec 100644 --- a/src/scopes/audioscopes/audiospectrum.cpp +++ b/src/scopes/audioscopes/audiospectrum.cpp @@ -43,19 +43,19 @@ AudioSpectrum::AudioSpectrum(QWidget *parent) : AbstractAudioScopeWidget(true, parent) - , m_fftTools() - , m_lastFFT() - , m_lastFFTLock(1) - , m_peaks() + , m_fftTools() + , m_lastFFT() + , m_lastFFTLock(1) + , m_peaks() #ifdef DEBUG_AUDIOSPEC - , m_timeTotal(0) - , m_showTotal(0) + , m_timeTotal(0) + , m_showTotal(0) #endif - , m_dBmin(-70) - , m_dBmax(0) - , m_freqMax(0) - , m_customFreq(false) - ,colorizeFactor(0) + , m_dBmin(-70) + , m_dBmax(0) + , m_freqMax(0) + , m_customFreq(false) + ,colorizeFactor(0) { ui = new Ui::AudioSpectrum_UI; ui->setupUi(this); @@ -181,7 +181,7 @@ QImage AudioSpectrum::renderAudioScope(uint, const QVector<int16_t> &audioFrame, if ( audioFrame.size() > 63 && m_innerScopeRect.width() > 0 && m_innerScopeRect.height() > 0 // <= 0 if widget is too small (resized by user) - ) { + ) { if (!m_customFreq) { m_freqMax = freq / 2; } @@ -503,21 +503,21 @@ QImage AudioSpectrum::renderHUD(uint) QRect AudioSpectrum::scopeRect() { m_scopeRect = QRect( - QPoint( + QPoint( 10, // Left ui->verticalSpacer->geometry().top()+6 // Top - ), - AbstractAudioScopeWidget::rect().bottomRight() - ); + ), + AbstractAudioScopeWidget::rect().bottomRight() + ); m_innerScopeRect = QRect( - QPoint( + QPoint( m_scopeRect.left()+6, // Left m_scopeRect.top()+6 // Top - ), QPoint( + ), QPoint( ui->verticalSpacer->geometry().right()-70, ui->verticalSpacer->geometry().bottom()-40 - ) - ); + ) + ); return m_scopeRect; } |