Commit 6a374fe3 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Coding style

parent 5c195bfa
......@@ -1043,7 +1043,7 @@ void Bin::setDocument(KdenliveDoc* project)
autoSelect();
}
void Bin::slotAddUrl(const QString &url, int folderId, const QMap <QString, QString> &data)
void Bin::slotAddUrl(const QString &url, int folderId, const QMap<QString, QString> &data)
{
QList<QUrl>urls;
urls << QUrl::fromLocalFile(url);
......@@ -1059,7 +1059,7 @@ void Bin::slotAddUrl(const QString &url, int folderId, const QMap <QString, QStr
ClipCreationDialog::createClipsCommand(m_doc, urls, folderInfo, this, data);
}
void Bin::slotAddUrl(const QString &url, const QMap <QString, QString> &data)
void Bin::slotAddUrl(const QString &url, const QMap<QString, QString> &data)
{
QList<QUrl>urls;
urls << QUrl::fromLocalFile(url);
......@@ -2601,11 +2601,11 @@ void Bin::slotExpandUrl(const ItemInfo &info, const QUrl &url, QUndoCommand *com
return;
}
// Maps playlist producer IDs to (project) bin producer IDs.
QMap <QString, QString> idMap;
QMap<QString, QString> idMap;
// Maps hash IDs to (project) first playlist producer instance ID. This is
// necessary to detect duplicate producer serializations produced by MLT.
// This covers, for instance, images and titles.
QMap <QString, QString> hashToIdMap;
QMap<QString, QString> hashToIdMap;
QDir mltRoot(doc.documentElement().attribute(QStringLiteral("root")));
for (int i = 0; i < producers.count(); i++) {
QDomElement prod = producers.at(i).toElement();
......@@ -2752,7 +2752,7 @@ void Bin::slotCancelRunningJob(const QString &id, const QMap<QString, QString> &
if (newProps.isEmpty()) return;
ProjectClip *clip = getBinClip(id);
if (!clip) return;
QMap <QString, QString> oldProps;
QMap<QString, QString> oldProps;
QMapIterator<QString, QString> i(newProps);
while (i.hasNext()) {
i.next();
......@@ -2846,12 +2846,12 @@ Timecode Bin::projectTimecode() const
return m_doc->timecode();
}
void Bin::slotStartFilterJob(const ItemInfo &info, const QString&id, QMap <QString, QString> &filterParams, QMap <QString, QString> &consumerParams, QMap <QString, QString> &extraParams)
void Bin::slotStartFilterJob(const ItemInfo &info, const QString&id, QMap<QString, QString> &filterParams, QMap<QString, QString> &consumerParams, QMap<QString, QString> &extraParams)
{
ProjectClip *clip = getBinClip(id);
if (!clip) return;
QMap <QString, QString> producerParams = QMap <QString, QString> ();
QMap<QString, QString> producerParams = QMap<QString, QString> ();
producerParams.insert(QStringLiteral("producer"), clip->url().path());
if (info.cropDuration != GenTime()) {
producerParams.insert(QStringLiteral("in"), QString::number((int) info.cropStart.frames(m_doc->fps())));
......@@ -3226,7 +3226,7 @@ void Bin::showTitleWidget(ProjectClip *clip)
}
dia_ui.setXml(doc);
if (dia_ui.exec() == QDialog::Accepted) {
QMap <QString, QString> newprops;
QMap<QString, QString> newprops;
newprops.insert(QStringLiteral("xmldata"), dia_ui.xml().toString());
if (dia_ui.duration() != clip->duration().frames(m_doc->fps())) {
// duration changed, we need to update duration
......@@ -3332,15 +3332,15 @@ void Bin::slotAddClipExtraData(const QString &id, const QString &key, const QStr
ProjectClip *clip = m_rootFolder->clip(id);
if (!clip) return;
QString oldValue = clip->getProducerProperty(key);
QMap <QString, QString> oldProps;
QMap<QString, QString> oldProps;
oldProps.insert(key, oldValue);
QMap <QString, QString> newProps;
QMap<QString, QString> newProps;
newProps.insert(key, data);
EditClipCommand *command = new EditClipCommand(this, id, oldProps, newProps, true, groupCommand);
if (!groupCommand) m_doc->commandStack()->push(command);
}
void Bin::slotUpdateClipProperties(const QString &id, const QMap <QString, QString> &properties, bool refreshPropertiesPanel)
void Bin::slotUpdateClipProperties(const QString &id, const QMap<QString, QString> &properties, bool refreshPropertiesPanel)
{
ProjectClip *clip = m_rootFolder->clip(id);
if (clip) {
......@@ -3360,7 +3360,7 @@ void Bin::showSlideshowWidget(ProjectClip *clip)
SlideshowClip *dia = new SlideshowClip(m_doc->timecode(), folder, clip, this);
if (dia->exec() == QDialog::Accepted) {
// edit clip properties
QMap <QString, QString> properties;
QMap<QString, QString> properties;
properties.insert(QStringLiteral("out"), QString::number(m_doc->getFramePos(dia->clipDuration()) * dia->imageCount() - 1));
properties.insert(QStringLiteral("length"), QString::number(m_doc->getFramePos(dia->clipDuration()) * dia->imageCount()));
properties.insert(QStringLiteral("kdenlive:clipname"), dia->clipName());
......@@ -3373,7 +3373,7 @@ void Bin::showSlideshowWidget(ProjectClip *clip)
properties.insert(QStringLiteral("softness"), QString::number(dia->softness()));
properties.insert(QStringLiteral("animation"), dia->animation());
QMap <QString, QString> oldProperties;
QMap<QString, QString> oldProperties;
oldProperties.insert(QStringLiteral("out"), clip->getProducerProperty(QStringLiteral("out")));
oldProperties.insert(QStringLiteral("length"), clip->getProducerProperty(QStringLiteral("length")));
oldProperties.insert(QStringLiteral("kdenlive:clipname"), clip->name());
......
......@@ -561,8 +561,8 @@ private slots:
void slotUpdateEffect(QString id, QDomElement oldEffect, QDomElement newEffect, int ix);
void slotChangeEffectState(QString id, const QList<int> &indexes, bool disable);
void slotItemEdited(const QModelIndex &, const QModelIndex &, const QVector<int> &);
void slotAddUrl(const QString &url, int folderId, const QMap<QString, QString> &data = QMap <QString, QString>());
void slotAddUrl(const QString &url, const QMap<QString, QString> &data = QMap <QString, QString>());
void slotAddUrl(const QString &url, int folderId, const QMap<QString, QString> &data = QMap<QString, QString>());
void slotAddUrl(const QString &url, const QMap<QString, QString> &data = QMap<QString, QString>());
void slotPrepareJobsMenu();
void slotShowJobLog();
/** @brief process clip job result. */
......@@ -620,7 +620,7 @@ public slots:
void slotEditClipCommand(const QString &id, const QMap<QString, QString> &oldProps, const QMap<QString, QString> &newProps);
void slotCancelRunningJob(const QString &id, const QMap<QString, QString> &newProps);
/** @brief Start a filter job requested by a filter applied in timeline */
void slotStartFilterJob(const ItemInfo &info, const QString&id, QMap <QString, QString> &filterParams, QMap <QString, QString> &consumerParams, QMap <QString, QString> &extraParams);
void slotStartFilterJob(const ItemInfo &info, const QString&id, QMap<QString, QString> &filterParams, QMap<QString, QString> &consumerParams, QMap<QString, QString> &extraParams);
/** @brief Add a sub clip */
void slotAddClipCut(const QString&id, int in, int out);
/** @brief Open current clip in an external editing application */
......
......@@ -278,7 +278,7 @@ void AddBinClipCutCommand::redo()
}
}
EditClipCommand::EditClipCommand(Bin *bin, const QString &id, const QMap <QString, QString> &oldparams, const QMap <QString, QString> &newparams, bool doIt, QUndoCommand * parent) :
EditClipCommand::EditClipCommand(Bin *bin, const QString &id, const QMap<QString, QString> &oldparams, const QMap<QString, QString> &newparams, bool doIt, QUndoCommand * parent) :
QUndoCommand(parent),
m_bin(bin),
m_oldparams(oldparams),
......
......@@ -180,13 +180,13 @@ private:
class EditClipCommand : public QUndoCommand
{
public:
EditClipCommand(Bin *bin, const QString &id, const QMap <QString, QString> &oldparams, const QMap <QString, QString> &newparams, bool doIt, QUndoCommand * parent = Q_NULLPTR);
EditClipCommand(Bin *bin, const QString &id, const QMap<QString, QString> &oldparams, const QMap<QString, QString> &newparams, bool doIt, QUndoCommand * parent = Q_NULLPTR);
void undo() Q_DECL_OVERRIDE;
void redo() Q_DECL_OVERRIDE;
private:
Bin *m_bin;
QMap <QString, QString> m_oldparams;
QMap <QString, QString> m_newparams;
QMap<QString, QString> m_oldparams;
QMap<QString, QString> m_newparams;
QString m_id;
/** @brief Should this command be executed on first redo ? TODO: we should refactor the code to get rid of this and always execute actions through the command system.
*. */
......
......@@ -460,9 +460,9 @@ void ProjectClip::setProducerProperty(const QString &name, const QString &data)
}
}
QMap <QString, QString> ProjectClip::currentProperties(const QMap <QString, QString> &props)
QMap<QString, QString> ProjectClip::currentProperties(const QMap<QString, QString> &props)
{
QMap <QString, QString> currentProps;
QMap<QString, QString> currentProps;
if (!m_controller) {
return currentProps;
}
......@@ -590,10 +590,10 @@ bool ProjectClip::hasProxy() const
return true;
}
void ProjectClip::setProperties(const QMap <QString, QString> &properties, bool refreshPanel)
void ProjectClip::setProperties(const QMap<QString, QString> &properties, bool refreshPanel)
{
QMapIterator<QString, QString> i(properties);
QMap <QString, QString> passProperties;
QMap<QString, QString> passProperties;
bool refreshAnalysis = false;
bool reload = false;
bool refreshOnly = true;
......@@ -722,8 +722,8 @@ const QString ProjectClip::codec(bool audioCodec) const
bool ProjectClip::rename(const QString &name, int column)
{
QMap <QString, QString> newProperites;
QMap <QString, QString> oldProperites;
QMap<QString, QString> newProperites;
QMap<QString, QString> oldProperites;
bool edited = false;
switch (column) {
case 0:
......@@ -1287,7 +1287,7 @@ QStringList ProjectClip::updatedAnalysisData(const QString &name, const QString
}
}
QMap <QString, QString> ProjectClip::analysisData(bool withPrefix)
QMap<QString, QString> ProjectClip::analysisData(bool withPrefix)
{
return m_controller->getPropertiesFromPrefix(QStringLiteral("kdenlive:clipanalysis."), withPrefix);
}
......
......@@ -161,7 +161,7 @@ public:
void resetProducerProperty(const QString &name);
/** @brief Get a property from the MLT producer. */
QMap <QString, QString> currentProperties(const QMap <QString, QString> &props);
QMap<QString, QString> currentProperties(const QMap<QString, QString> &props);
QString getProducerProperty(const QString &key) const;
int getProducerIntProperty(const QString &key) const;
qint64 getProducerInt64Property(const QString &key) const;
......@@ -202,7 +202,7 @@ public:
int audioChannels() const;
/** @brief get data analysis value. */
QStringList updatedAnalysisData(const QString &name, const QString &data, int offset);
QMap <QString, QString> analysisData(bool withPrefix = false);
QMap<QString, QString> analysisData(bool withPrefix = false);
/** @brief Abort running audio thumb process if any. */
void abortAudioThumbs();
/** @brief Returns the list of this clip's subclip's ids. */
......
......@@ -115,7 +115,7 @@ void ClipCreationDialog::createColorClip(KdenliveDoc *doc, const QStringList &gr
prod.setAttribute(QStringLiteral("id"), QString::number(id));
prod.setAttribute(QStringLiteral("in"), QStringLiteral("0"));
prod.setAttribute(QStringLiteral("out"), doc->getFramePos(doc->timecode().getTimecode(t->gentime())) - 1);
QMap <QString, QString> properties;
QMap<QString, QString> properties;
properties.insert(QStringLiteral("resource"), color);
properties.insert(QStringLiteral("kdenlive:clipname"), dia_ui.clip_name->text());
properties.insert(QStringLiteral("mlt_service"), QStringLiteral("color"));
......@@ -178,7 +178,7 @@ void ClipCreationDialog::createQTextClip(KdenliveDoc *doc, const QStringList &gr
prod.setAttribute(QStringLiteral("in"), QStringLiteral("0"));
prod.setAttribute(QStringLiteral("out"), doc->timecode().getFrameCount(dia_ui.duration->text()));
QMap <QString, QString> properties;
QMap<QString, QString> properties;
properties.insert(QStringLiteral("kdenlive:clipname"), dia_ui.name->text());
if (!groupInfo.isEmpty()) {
properties.insert(QStringLiteral("kdenlive:folderid"), groupInfo.at(0));
......@@ -200,7 +200,7 @@ void ClipCreationDialog::createQTextClip(KdenliveDoc *doc, const QStringList &gr
properties.insert(QStringLiteral("style"), dia_ui.italic->isChecked() ? QStringLiteral("italic") : QStringLiteral("normal"));
properties.insert(QStringLiteral("weight"), QString::number(dia_ui.weight->value()));
if (clip) {
QMap <QString, QString> oldProperties;
QMap<QString, QString> oldProperties;
oldProperties.insert(QStringLiteral("out"), clip->getProducerProperty(QStringLiteral("out")));
oldProperties.insert(QStringLiteral("length"), clip->getProducerProperty(QStringLiteral("length")));
oldProperties.insert(QStringLiteral("kdenlive:clipname"), clip->name());
......@@ -236,7 +236,7 @@ void ClipCreationDialog::createSlideshowClip(KdenliveDoc *doc, const QStringList
prod.setAttribute(QStringLiteral("in"), QStringLiteral("0"));
prod.setAttribute(QStringLiteral("out"), QString::number(doc->getFramePos(dia->clipDuration()) * dia->imageCount() - 1));
prod.setAttribute(QStringLiteral("type"), (int) SlideShow);
QMap <QString, QString> properties;
QMap<QString, QString> properties;
properties.insert(QStringLiteral("kdenlive:clipname"), dia->clipName());
properties.insert(QStringLiteral("resource"), dia->selectedPath());
properties.insert(QStringLiteral("ttl"), QString::number(doc->getFramePos(dia->clipDuration())));
......@@ -274,7 +274,7 @@ void ClipCreationDialog::createTitleClip(KdenliveDoc *doc, const QStringList &gr
uint id = bin->getFreeClipId();
prod.setAttribute(QStringLiteral("id"), QString::number(id));
QMap <QString, QString> properties;
QMap<QString, QString> properties;
properties.insert(QStringLiteral("xmldata"), dia_ui->xml().toString());
properties.insert(QStringLiteral("kdenlive:clipname"), i18n("Title clip"));
if (!groupInfo.isEmpty()) {
......@@ -303,7 +303,7 @@ void ClipCreationDialog::createTitleTemplateClip(KdenliveDoc *doc, const QString
QDomElement prod = xml.createElement(QStringLiteral("producer"));
xml.appendChild(prod);
QMap <QString, QString> properties;
QMap<QString, QString> properties;
properties.insert(QStringLiteral("resource"), textTemplate);
properties.insert(QStringLiteral("kdenlive:clipname"), i18n("Template title clip"));
if (!groupInfo.isEmpty()) {
......@@ -342,7 +342,7 @@ void ClipCreationDialog::createTitleTemplateClip(KdenliveDoc *doc, const QString
delete dia;
}
void ClipCreationDialog::addXmlProperties(QDomElement &producer, QMap <QString, QString> &properties)
void ClipCreationDialog::addXmlProperties(QDomElement &producer, QMap<QString, QString> &properties)
{
QMapIterator<QString, QString> i(properties);
while (i.hasNext()) {
......@@ -355,7 +355,7 @@ void ClipCreationDialog::addXmlProperties(QDomElement &producer, QMap <QString,
}
}
void ClipCreationDialog::createClipsCommand(KdenliveDoc *doc, const QList<QUrl> &urls, const QStringList &groupInfo, Bin *bin, const QMap <QString, QString> &data)
void ClipCreationDialog::createClipsCommand(KdenliveDoc *doc, const QList<QUrl> &urls, const QStringList &groupInfo, Bin *bin, const QMap<QString, QString> &data)
{
QUndoCommand *addClips = new QUndoCommand();
......@@ -419,7 +419,7 @@ void ClipCreationDialog::createClipsCommand(KdenliveDoc *doc, const QList<QUrl>
QDomDocument xml;
QDomElement prod = xml.createElement(QStringLiteral("producer"));
xml.appendChild(prod);
QMap <QString, QString> properties;
QMap<QString, QString> properties;
properties.insert(QStringLiteral("resource"), file.path());
if (!groupInfo.isEmpty()) {
properties.insert(QStringLiteral("kdenlive:folderid"), groupInfo.at(0));
......@@ -562,7 +562,7 @@ void ClipCreationDialog::createClipsCommand(KdenliveDoc *doc, const QStringList
prod.setAttribute(QStringLiteral("in"), QStringLiteral("0"));
QString duration = doc->timecode().reformatSeparators(KdenliveSettings::sequence_duration());
prod.setAttribute(QStringLiteral("out"), QString::number(doc->getFramePos(duration) * count));
QMap <QString, QString> properties;
QMap<QString, QString> properties;
properties.insert(QStringLiteral("resource"), pattern);
properties.insert(QStringLiteral("kdenlive:clipname"), fileName);
properties.insert(QStringLiteral("ttl"), QString::number(doc->getFramePos(duration)));
......
......@@ -45,10 +45,10 @@ void createClipFromXml(KdenliveDoc *doc, QDomElement xml, const QStringList &gro
void createSlideshowClip(KdenliveDoc *doc, const QStringList &groupInfo, Bin *bin);
void createTitleClip(KdenliveDoc *doc, const QStringList &groupInfo, const QString &templatePath, Bin *bin);
void createTitleTemplateClip(KdenliveDoc *doc, const QStringList &groupInfo, Bin *bin);
void createClipsCommand(KdenliveDoc *doc, const QList<QUrl> &urls, const QStringList &groupInfo, Bin *bin, const QMap <QString, QString> &data = QMap <QString, QString>());
void createClipsCommand(KdenliveDoc *doc, const QList<QUrl> &urls, const QStringList &groupInfo, Bin *bin, const QMap<QString, QString> &data = QMap<QString, QString>());
void createClipsCommand(Bin *bin, const QDomElement &producer, const QString &id, QUndoCommand *command);
void createClipsCommand(KdenliveDoc *doc, const QStringList &groupInfo, Bin *bin);
void addXmlProperties(QDomElement &producer, QMap <QString, QString> &properties);
void addXmlProperties(QDomElement &producer, QMap<QString, QString> &properties);
};
#endif
......
......@@ -159,7 +159,7 @@ void ProfilesDialog::fillList(const QString &selectedProfile)
{
// List the Mlt profiles
m_view.profiles_list->clear();
QMap <QString, QString> profilesInfo = ProfilesDialog::getProfilesInfo();
QMap<QString, QString> profilesInfo = ProfilesDialog::getProfilesInfo();
QMapIterator<QString, QString> i(profilesInfo);
while (i.hasNext()) {
i.next();
......@@ -367,7 +367,7 @@ MltVideoProfile ProfilesDialog::getProfileFromPath(const QString &path, const QS
{
KConfig confFile(path, KConfig::SimpleConfig);
MltVideoProfile result;
QMap <QString, QString> entries = confFile.entryMap();
QMap<QString, QString> entries = confFile.entryMap();
result.path = name;
result.description = entries.value(QStringLiteral("description"));
result.frame_rate_num = entries.value(QStringLiteral("frame_rate_num")).toInt();
......@@ -507,9 +507,9 @@ QList <MltVideoProfile> ProfilesDialog::profilesList()
}
// static
QMap <QString, QString> ProfilesDialog::getProfilesInfo()
QMap<QString, QString> ProfilesDialog::getProfilesInfo()
{
QMap <QString, QString> result;
QMap<QString, QString> result;
QStringList profilesFilter;
profilesFilter << QStringLiteral("*");
......@@ -576,12 +576,12 @@ bool ProfilesDialog::matchProfile(int width, int height, double fps, double par,
}
// static
QMap <QString, QString> ProfilesDialog::getProfilesFromProperties(int width, int height, double fps, double par, bool useDisplayWidth)
QMap<QString, QString> ProfilesDialog::getProfilesFromProperties(int width, int height, double fps, double par, bool useDisplayWidth)
{
QStringList profilesNames;
QStringList profilesFiles;
QStringList profilesFilter;
QMap <QString, QString> result;
QMap<QString, QString> result;
profilesFilter << QStringLiteral("*");
// List the Mlt profiles
QDir mltDir(KdenliveSettings::mltpath());
......
......@@ -41,7 +41,7 @@ public:
static MltVideoProfile getVideoProfileFromXml(const QDomElement &element);
static MltVideoProfile getVideoProfile(const QString &name);
static MltVideoProfile getVideoProfile(Mlt::Profile &profile);
static QMap <QString, QString> getProfilesInfo();
static QMap<QString, QString> getProfilesInfo();
static void saveProfile(MltVideoProfile &profile, QString profilePath = QString());
/** @brief Check if a given profile has a profile file describing it */
static QString existingProfile(const MltVideoProfile &profile);
......@@ -65,7 +65,7 @@ public:
* @param par The sample aspect ratio
* @param useDisplayWidth If true, compare width with profile's display width ( = dar * height)
* @return A string list of the matching profiles description */
static QMap <QString, QString> getProfilesFromProperties(int width, int height, double fps, double par, bool useDisplayWidth = false);
static QMap<QString, QString> getProfilesFromProperties(int width, int height, double fps, double par, bool useDisplayWidth = false);
/** @brief Get the descriptive text for given colorspace code (defined by MLT)
* @param colorspace An int as defined in mlt_profile.h
......
......@@ -1303,7 +1303,7 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut,
}
// Save rendering profile to document
QMap <QString, QString> renderProps;
QMap<QString, QString> renderProps;
renderProps.insert(QStringLiteral("rendercategory"), m_view.formats->currentItem()->parent()->text(0));
renderProps.insert(QStringLiteral("renderprofile"), m_view.formats->currentItem()->text(0));
renderProps.insert(QStringLiteral("renderurl"), destBase);
......
......@@ -120,7 +120,7 @@ public:
void setRenderStatus(const QString &dest, int status, const QString &error);
void setDocumentPath(const QString &path);
void reloadProfiles();
void setRenderProfile(const QMap <QString, QString> &props);
void setRenderProfile(const QMap<QString, QString> &props);
int waitingJobsCount() const;
QString getFreeScriptName(const QUrl &projectName = QUrl(), const QString &prefix = QString());
bool startWaitingRenderJobs();
......@@ -149,7 +149,7 @@ protected:
public slots:
void slotExport(bool scriptExport, int zoneIn, int zoneOut,
const QMap <QString, QString> &metadata,
const QMap<QString, QString> &metadata,
const QList<QString> &playlistPaths, const QList<QString> &trackNames,
const QString &scriptPath, bool exportAudio);
void slotAbortCurrentJob();
......@@ -227,7 +227,7 @@ signals:
void openDvdWizard(const QString &url);
/** Send the info about rendering that will be saved in the document:
(profile destination, profile name and url of rendered file */
void selectedRenderProfile(const QMap <QString, QString> &renderProps);
void selectedRenderProfile(const QMap<QString, QString> &renderProps);
void prepareRenderingData(bool scriptExport, bool zoneOnly, const QString &chapterFile, const QString scriptPath);
void shutdown();
};
......
......@@ -65,9 +65,9 @@ private:
QString m_errors;
QString m_warnings;
QString m_infos;
QMap <QString, QString> m_dvProfiles;
QMap <QString, QString> m_hdvProfiles;
QMap <QString, QString> m_otherProfiles;
QMap<QString, QString> m_dvProfiles;
QMap<QString, QString> m_hdvProfiles;
QMap<QString, QString> m_otherProfiles;
void slotCheckPrograms();
void checkMltComponents();
void checkMissingCodecs();
......
......@@ -224,7 +224,7 @@ bool DocumentChecker::hasErrorInClips()
}
}
QMap <QString, QString> autoFixLuma;
QMap<QString, QString> autoFixLuma;
// Check existence of luma files
foreach (const QString &lumafile, filesToCheck) {
filePath = lumafile;
......
......@@ -68,8 +68,8 @@ private:
QString searchPathRecursively(const QDir &dir, const QString &fileName, ClipType type = Unknown) const;
QString searchFileRecursively(const QDir &dir, const QString &matchSize, const QString &matchHash, const QString &fileName) const;
void checkStatus();
QMap <QString, QString> m_missingTitleImages;
QMap <QString, QString> m_missingTitleFonts;
QMap<QString, QString> m_missingTitleImages;
QMap<QString, QString> m_missingTitleFonts;
QList <QDomElement> m_missingClips;
QStringList m_missingFonts;
QStringList m_safeImages;
......
......@@ -1074,9 +1074,9 @@ bool DocumentValidator::upgrade(double version, const double currentVersion)
QDomNodeList kdenlive_producers = m_doc.elementsByTagName(QStringLiteral("kdenlive_producer"));
// Rename all track producers to correct name: "id_playlistName" instead of "id_trackNumber"
QMap <QString, QString> trackRenaming;
QMap<QString, QString> trackRenaming;
// Create a list of which producers / track on which the producer is
QMap <QString, QString> playlistForId;
QMap<QString, QString> playlistForId;
QDomNodeList entries = m_doc.elementsByTagName(QStringLiteral("entry"));
for (int i = 0; i < entries.count(); i++) {
QDomElement entry = entries.at(i).toElement();
......
......@@ -82,7 +82,7 @@ void DocUndoStack::push(QUndoCommand *cmd)
const double DOCUMENTVERSION = 0.95;
KdenliveDoc::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, NotesPlugin *notes, bool *openBackup, MainWindow *parent) :
KdenliveDoc::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, NotesPlugin *notes, bool *openBackup, MainWindow *parent) :
QObject(parent),
m_autosave(Q_NULLPTR),
m_url(url),
......@@ -629,7 +629,7 @@ QDomDocument KdenliveDoc::xmlSceneList(const QString &scene)
QDomNodeList effects = mlt.elementsByTagName(QStringLiteral("filter"));
int maxEffects = effects.count();
//qCDebug(KDENLIVE_LOG) << "// FOUD " << maxEffects << " EFFECTS+++++++++++++++++++++";
QMap <QString, QString> effectIds;
QMap<QString, QString> effectIds;
for (int i = 0; i < maxEffects; ++i) {
QDomNode m = effects.at(i);
QDomNodeList params = m.childNodes();
......@@ -1015,9 +1015,9 @@ const QString KdenliveDoc::getDocumentProperty(const QString &name, const QStrin
return defaultValue;
}
QMap <QString, QString> KdenliveDoc::getRenderProperties() const
QMap<QString, QString> KdenliveDoc::getRenderProperties() const
{
QMap <QString, QString> renderProperties;
QMap<QString, QString> renderProperties;
QMapIterator<QString, QString> i(m_documentProperties);
while (i.hasNext()) {
i.next();
......@@ -1251,7 +1251,7 @@ void KdenliveDoc::cleanupBackupFiles()
}
}
const QMap <QString, QString> KdenliveDoc::metadata() const
const QMap<QString, QString> KdenliveDoc::metadata() const
{
return m_documentMetadata;
}
......@@ -1287,8 +1287,8 @@ void KdenliveDoc::slotProxyCurrentItem(bool doProxy, QList<ProjectClip *> clipLi
}
// Prepare updated properties
QMap <QString, QString> newProps;
QMap <QString, QString> oldProps;
QMap<QString, QString> newProps;
QMap<QString, QString> oldProps;
if (!doProxy) newProps.insert(QStringLiteral("kdenlive:proxy"), QStringLiteral("-"));
// Parse clips
......@@ -1384,7 +1384,7 @@ void KdenliveDoc::slotProcessModifiedClips()
if (m_modifiedClips.isEmpty()) m_modifiedTimer.stop();
}
QMap <QString, QString> KdenliveDoc::documentProperties()
QMap<QString, QString> KdenliveDoc::documentProperties()
{
m_documentProperties.insert(QStringLiteral("version"), QString::number(DOCUMENTVERSION));
m_documentProperties.insert(QStringLiteral("kdenliveversion"), QStringLiteral(KDENLIVE_VERSION));
......
......@@ -75,7 +75,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, NotesPlugin *notes, bool *openBackup, MainWindow *parent = Q_NULLPTR);
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, NotesPlugin *notes, bool *openBackup, MainWindow *parent = Q_NULLPTR);
~KdenliveDoc();
QDomNodeList producersList();
double fps() const;
......@@ -131,21 +131,21 @@ public:
const QString getDocumentProperty(const QString &name, const QString &defaultValue = QString()) const;
/** @brief Gets the list of renderer properties saved into the document. */
QMap <QString, QString> getRenderProperties() const;
QMap<QString, QString> getRenderProperties() const;
/** @brief Read the display ratio from an xml project file. */
static double getDisplayRatio(const QString &path);
/** @brief Backup the project file */
void backupLastSavedVersion(const QString &path);
/** @brief Returns the document metadata (author, copyright, ...) */
const QMap <QString, QString> metadata() const;
const QMap<QString, QString> metadata() const;
/** @brief Set the document metadata (author, copyright, ...) */
void setMetadata(const QMap <QString, QString>& meta);
void setMetadata(const QMap<QString, QString>& meta);
/** @brief Get frame size of the renderer (profile)*/
const QSize getRenderSize() const;
/** @brief Add url to the file watcher so that we monitor changes */
void watchFile(const QUrl &url);
/** @brief Get all document properties that need to be saved */
QMap <QString, QString> documentProperties();
QMap<QString, QString> documentProperties();
bool useProxy() const;
bool autoGenerateProxy(int width) const;
bool autoGenerateImageProxy(int width) const;
......@@ -202,8 +202,8 @@ private:
/** @brief The project folder, used to store project files (titles, effects...). */
QString m_projectFolder;
QList<int> m_undoChunks;
QMap <QString, QString> m_documentProperties;
QMap <QString, QString> m_documentMetadata;
QMap<QString, QString> m_documentProperties;
QMap<QString, QString> m_documentMetadata;
QString searchFileRecursively(const QDir &dir, const QString &matchSize, const QString &matchHash) const;
......
......@@ -175,9 +175,9 @@ void DvdWizardChapters::setVobFiles(DVDFORMAT format, const QStringList &movies,
}
}
QMap <QString, QString> DvdWizardChapters::chaptersData() const
QMap<QString, QString> DvdWizardChapters::chaptersData() const
{
QMap <QString, QString> result;
QMap<QString, QString> result;
int max = m_view.vob_list->count();
for (int i = 0; i < max; ++i) {
QString chapters = m_view.vob_list->itemData(i, Qt::UserRole + 1).toStringList().join(QStringLiteral(";"));
......