X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.h;h=32c0ade5c0ca7957dcfbbb8c086fa900275b0e1e;hb=58c5d98d7ea0cbe8745a52a0d55414cf56938d97;hp=021058dc32f10dd34dcaa8a97012bded68e4a63f;hpb=95231df40ffdcd433b080b9dad205dd66ea3b2a0;p=kdenlive

diff --git a/src/projectlist.h b/src/projectlist.h
index 021058dc..32c0ade5 100644
--- a/src/projectlist.h
+++ b/src/projectlist.h
@@ -60,6 +60,7 @@
 #else
 // Dummy KMessageWidget to allow compilation of MyMessageWidget class since Qt's moc doesn work inside #ifdef
 #include <QLabel>
+
 class KMessageWidget: public QLabel
 {
 public:
@@ -86,7 +87,7 @@ signals:
 namespace Mlt
 {
 class Producer;
-};
+}
 
 class ProjectItem;
 class ProjectListView;
@@ -242,8 +243,8 @@ public:
     void setupGeneratorMenu(const QHash<QString,QMenu*>& menus);
     QString currentClipUrl() const;
     KUrl::List getConditionalUrls(const QString &condition) const;
-    /** @brief Get a list of selected clip Id's that match a condition. */
-    QStringList getConditionalIds(const QString &condition) const;
+    /** @brief Get a list of selected clip Id's and url's that match a condition. */
+    QMap <QString, QString> getConditionalIds(const QString &condition) const;
     QDomDocument generateTemplateXml(QString data, const QString &replaceString);
     void cleanup();
     void trashUnusedClips();
@@ -251,8 +252,8 @@ public:
     void addClipCut(const QString &id, int in, int out, const QString desc, bool newItem);
     void removeClipCut(const QString &id, int in, int out);
     void focusTree() const;
-    SubProjectItem *getSubItem(ProjectItem *clip, QPoint zone);
-    void doUpdateClipCut(const QString &id, const QPoint oldzone, const QPoint zone, const QString &comment);
+    SubProjectItem *getSubItem(ProjectItem *clip, const QPoint &zone);
+    void doUpdateClipCut(const QString &id, const QPoint &oldzone, const QPoint &zone, const QString &comment);
     bool hasMissingClips();
     void deleteProjectFolder(QMap <QString, QString> map);
     void selectItemById(const QString &clipId);
@@ -425,8 +426,8 @@ private:
     /** @brief Start an MLT process job. */
     void processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, stringMap extraParams = stringMap());
     /** @brief Create rounded shape pixmap for project tree thumb. */
-    QPixmap roundedPixmap(QImage img);
-    QPixmap roundedPixmap(QPixmap source);
+    QPixmap roundedPixmap(const QImage &img);
+    QPixmap roundedPixmap(const QPixmap &source);
     /** @brief Extract a clip's metadata with the exiftool program. */
     void extractMetadata(DocClipBase *clip);
     /** @brief Add a special FFmpeg tag if clip matches some properties (for example set full_luma for Sony NEX camcorders. */
@@ -459,16 +460,16 @@ private slots:
     /** @brief Try to find a matching profile for given item. */
     bool adjustProjectProfileToItem(ProjectItem *item = NULL);
     /** @brief Add a sequence from the stopmotion widget. */
-    void slotAddOrUpdateSequence(const QString frameName);
+    void slotAddOrUpdateSequence(const QString &frameName);
     /** @brief A proxy clip was created, update display. */
     void slotGotProxy(const QString &proxyPath);
     void slotGotProxy(ProjectItem *item);
     /** @brief Enable / disable proxy for current clip. */
     void slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy = NULL);
     /** @brief Put clip in the proxy waiting list. */
-    void slotCreateProxy(const QString id);
+    void slotCreateProxy(const QString &id);
     /** @brief Stop creation of this clip's proxy. */
-    void slotAbortProxy(const QString id, const QString path);
+    void slotAbortProxy(const QString &id, const QString& path);
     /** @brief Start creation of clip jobs. */
     void slotProcessJobs();
     /** @brief Discard running and pending clip jobs. */
@@ -476,7 +477,7 @@ private slots:
     /** @brief Discard a running clip jobs. */
     void slotCancelRunningJob(const QString id, stringMap);
     /** @brief Update a clip's job status. */
-    void slotProcessLog(const QString, int progress, int, const QString = QString());
+    void slotProcessLog(const QString&, int progress, int, const QString & tmp= QString());
     /** @brief A clip job crashed, inform user. */
     void slotUpdateJobStatus(const QString id, int type, int status, const QString label, const QString actionName, const QString details);
     void slotUpdateJobStatus(ProjectItem *item, int type, int status, const QString &label, const QString &actionName = QString(), const QString details = QString());