cleanup & fix crash on project saving with Qt 4.5:

[kdenlive] / src / kdenlivedoc.h

diff --git a/src/kdenlivedoc.h b/src/kdenlivedoc.h
index 29cd402b7e6954975511f7057a12006edcbefb03..df9d0a890d665b42601da70a3f3f2820e201e978 100644 (file)
--- a/src/kdenlivedoc.h
+++ b/src/kdenlivedoc.h
@@ -56,7 +56,6 @@ Q_OBJECT public:
     int height() const;
     KUrl url() const;
     KAutoSaveFile *m_autosave;
-    void backupMltPlaylist();
     Timecode timecode() const;
     QDomDocument toXml();
     //void setRenderer(Render *render);
@@ -81,9 +80,9 @@ Q_OBJECT public:
     void deleteProjectClip(QList <QString> ids);
     /** Inform application of the audio thumbnails generation progress */
     void setThumbsProgress(const QString &message, int progress);
-    QString profilePath() const;
+    const QString &profilePath() const;
     MltVideoProfile mltProfile() const;
-    QString description() const;
+    const QString description() const;
     void setUrl(KUrl url);
     void setProfilePath(QString path);
     const QString &getFreeClipId();
@@ -98,7 +97,7 @@ Q_OBJECT public:
     int zoom() const;
     const double dar();
     double projectDuration() const;
-    bool saveSceneList(const QString &path, QDomDocument sceneList);
+    bool saveSceneList(const QString &path, const QString &scene);
     int tracksCount() const;
     TrackInfo trackInfoAt(int ix) const;
     void insertTrack(int ix, TrackInfo type);
@@ -106,9 +105,9 @@ Q_OBJECT public:
     void setTrackType(int ix, TrackInfo type);
     const QList <TrackInfo> tracksList() const;
     QPoint getTracksCount() const;
-    QString getTracksInfo() const;
     void switchTrackVideo(int ix, bool hide);
     void switchTrackAudio(int ix, bool hide);
+    void switchTrackLock(int ix, bool lock);
     void cachePixmap(const QString &fileId, const QPixmap &pix) const;
     void setProjectFolder(KUrl url);
     QString getLadspaFile() const;
@@ -116,6 +115,7 @@ Q_OBJECT public:
     QPoint zone() const;
     void setSceneList();
     void updatePreviewSettings();
+    bool isTrackLocked(int ix) const;
 
 private:
     KUrl m_url;
@@ -133,7 +133,6 @@ private:
     QDomDocument generateSceneList();
     ClipManager *m_clipManager;
     MltVideoProfile m_profile;
-    QString m_scenelist;
     QTimer *m_autoSaveTimer;
     QString m_searchFolder;
     /** tells whether current doc has been changed since last save event */
@@ -142,6 +141,7 @@ private:
     KUrl m_projectFolder;
     double m_documentLoadingStep;
     double m_documentLoadingProgress;
+    bool m_abortLoading;
     int m_zoneStart;
     int m_zoneEnd;
 
@@ -164,6 +164,7 @@ private slots:
     void slotAutoSave();
 
 signals:
+    void resetProjectList();
     void addProjectClip(DocClipBase *, bool getInfo = true);
     void signalDeleteProjectClip(const QString &);
     void updateClipDisplay(const QString&);