Fix compilation on OSX (moc issue)

diff --git a/src/dvdwizard.h b/src/dvdwizard.h
index 2aa6a554ceebe5c559602333bddbc7088dd22877..cfeba33251e4f90134dd54125304e6d81d859d65 100644 (file)
--- a/src/dvdwizard.h
+++ b/src/dvdwizard.h
@@ -37,6 +37,8 @@
 #include "ui_dvdwizardstatus_ui.h"
 #include "ui_dvdwizardchapters_ui.h"
 
+typedef QMap <QString, QRect> stringRectMap;
+
 class DvdWizard : public QWizard
 {
     Q_OBJECT
@@ -75,7 +77,7 @@ private:
     QMenu *m_burnMenu;
     void errorMessage(const QString &text);
     void infoMessage(const QString &text);
-    void processDvdauthor(QString menuMovieUrl = QString(), QMap <QString, QRect> buttons = QMap <QString, QRect>(), QStringList buttonsTarget = QStringList());
+    void processDvdauthor(QString menuMovieUrl = QString(), stringRectMap buttons = stringRectMap(), QStringList buttonsTarget = QStringList());
 
 private slots:
     void slotPageChanged(int page);

diff --git a/src/kdenlivedoc.h b/src/kdenlivedoc.h
index 955aee993f5f120fa2958f475a311386cba9ef24..22aeac31b18014f2f12d306c5ebfb762073485bf 100644 (file)
--- a/src/kdenlivedoc.h
+++ b/src/kdenlivedoc.h
@@ -83,7 +83,7 @@ Q_OBJECT public:
      *
      * If the clip wasn't added before, it tries to add it to the project. */
     bool addClipInfo(QDomElement elem, QDomElement orig, QString clipId);
-    void slotAddClipList(const KUrl::List urls, stringMap data = QMap <QString, QString>());
+    void slotAddClipList(const KUrl::List urls, stringMap data = stringMap());
     void deleteClip(const QString &clipId);
     int getFramePos(QString duration);
     DocClipBase *getBaseClip(const QString &clipId);

diff --git a/src/projectlist.h b/src/projectlist.h
index 5edc32ea1df0019130941b740d281790ee26763e..021058dc32f10dd34dcaa8a97012bded68e4a63f 100644 (file)
--- a/src/projectlist.h
+++ b/src/projectlist.h
@@ -423,7 +423,7 @@ private:
     /** @brief Get the list of job names for current clip. */
     QStringList getPendingJobs(const QString &id);
     /** @brief Start an MLT process job. */
-    void processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, QMap <QString, QString>extraParams = QMap <QString, QString>());
+    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);

diff --git a/src/projecttree/meltjob.h b/src/projecttree/meltjob.h
index f4c5f05ece55e2ced197ed512271c34b71d5bbb9..22dd03448704a237b599b565177670e48309b22b 100644 (file)
--- a/src/projecttree/meltjob.h
+++ b/src/projecttree/meltjob.h
@@ -41,7 +41,7 @@ class MeltJob : public AbstractClipJob
     Q_OBJECT
 
 public:
-    MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters, QMap <QString, QString> extraParams = QMap <QString, QString>());
+    MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters, stringMap extraParams = stringMap());
     virtual ~ MeltJob();
     const QString destination() const;
     void startJob();