Ticket #37837: patch-src-stringMap.diff

File patch-src-stringMap.diff, 2.8 KB (added by ddennedy (Dan Dennedy), 12 years ago)

patch to fix a build problem

  • src/dvdwizard.h

    diff --git a/src/dvdwizard.h b/src/dvdwizard.h
    index 2aa6a55..cfeba33 100644
     
    3737#include "ui_dvdwizardstatus_ui.h"
    3838#include "ui_dvdwizardchapters_ui.h"
    3939
     40typedef QMap <QString, QRect> stringRectMap;
     41
    4042class DvdWizard : public QWizard
    4143{
    4244    Q_OBJECT
    private: 
    7577    QMenu *m_burnMenu;
    7678    void errorMessage(const QString &text);
    7779    void infoMessage(const QString &text);
    78     void processDvdauthor(QString menuMovieUrl = QString(), QMap <QString, QRect> buttons = QMap <QString, QRect>(), QStringList buttonsTarget = QStringList());
     80    void processDvdauthor(QString menuMovieUrl = QString(), stringRectMap buttons = stringRectMap(), QStringList buttonsTarget = QStringList());
    7981
    8082private slots:
    8183    void slotPageChanged(int page);
  • src/kdenlivedoc.h

    diff --git a/src/kdenlivedoc.h b/src/kdenlivedoc.h
    index 955aee9..22aeac3 100644
    Q_OBJECT public: 
    8383     *
    8484     * If the clip wasn't added before, it tries to add it to the project. */
    8585    bool addClipInfo(QDomElement elem, QDomElement orig, QString clipId);
    86     void slotAddClipList(const KUrl::List urls, stringMap data = QMap <QString, QString>());
     86    void slotAddClipList(const KUrl::List urls, stringMap data = stringMap());
    8787    void deleteClip(const QString &clipId);
    8888    int getFramePos(QString duration);
    8989    DocClipBase *getBaseClip(const QString &clipId);
  • src/projectlist.h

    diff --git a/src/projectlist.h b/src/projectlist.h
    index 5edc32e..021058d 100644
    private: 
    423423    /** @brief Get the list of job names for current clip. */
    424424    QStringList getPendingJobs(const QString &id);
    425425    /** @brief Start an MLT process job. */
    426     void processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, QMap <QString, QString>extraParams = QMap <QString, QString>());
     426    void processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, stringMap extraParams = stringMap());
    427427    /** @brief Create rounded shape pixmap for project tree thumb. */
    428428    QPixmap roundedPixmap(QImage img);
    429429    QPixmap roundedPixmap(QPixmap source);
  • src/projecttree/meltjob.h

    diff --git a/src/projecttree/meltjob.h b/src/projecttree/meltjob.h
    index f4c5f05..22dd034 100644
    class MeltJob : public AbstractClipJob 
    4141    Q_OBJECT
    4242
    4343public:
    44     MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters, QMap <QString, QString> extraParams = QMap <QString, QString>());
     44    MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters, stringMap extraParams = stringMap());
    4545    virtual ~ MeltJob();
    4646    const QString destination() const;
    4747    void startJob();