Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
256
Issues
256
List
Boards
Labels
Service Desk
Milestones
Merge Requests
14
Merge Requests
14
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
596d1cb5
Commit
596d1cb5
authored
Sep 09, 2011
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cppcheck fixes, patch by Mikko Rapeli [17/27]
svn path=/trunk/kdenlive/; revision=5890
parent
42e27d85
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
17 deletions
+17
-17
src/kdenlivedoc.cpp
src/kdenlivedoc.cpp
+7
-7
src/kdenlivedoc.h
src/kdenlivedoc.h
+9
-9
src/mainwindow.cpp
src/mainwindow.cpp
+1
-1
No files found.
src/kdenlivedoc.cpp
View file @
596d1cb5
...
...
@@ -58,7 +58,7 @@
const
double
DOCUMENTVERSION
=
0.88
;
KdenliveDoc
::
KdenliveDoc
(
const
KUrl
&
url
,
const
KUrl
&
projectFolder
,
QUndoGroup
*
undoGroup
,
QString
profileName
,
QMap
<
QString
,
QString
>
properties
,
const
QPoint
tracks
,
Render
*
render
,
KTextEdit
*
notes
,
bool
*
openBackup
,
MainWindow
*
parent
,
KProgressDialog
*
progressDialog
)
:
KdenliveDoc
::
KdenliveDoc
(
const
KUrl
&
url
,
const
KUrl
&
projectFolder
,
QUndoGroup
*
undoGroup
,
QString
profileName
,
QMap
<
QString
,
QString
>
properties
,
const
QPoint
&
tracks
,
Render
*
render
,
KTextEdit
*
notes
,
bool
*
openBackup
,
MainWindow
*
parent
,
KProgressDialog
*
progressDialog
)
:
QObject
(
parent
),
m_autosave
(
NULL
),
m_url
(
url
),
...
...
@@ -568,7 +568,7 @@ QPoint KdenliveDoc::zone() const
return
QPoint
(
m_documentProperties
.
value
(
"zonein"
).
toInt
(),
m_documentProperties
.
value
(
"zoneout"
).
toInt
());
}
QDomDocument
KdenliveDoc
::
xmlSceneList
(
const
QString
&
scene
,
const
QStringList
expandedFolders
)
QDomDocument
KdenliveDoc
::
xmlSceneList
(
const
QString
&
scene
,
const
QStringList
&
expandedFolders
)
{
QDomDocument
sceneList
;
sceneList
.
setContent
(
scene
,
true
);
...
...
@@ -705,7 +705,7 @@ QDomDocument KdenliveDoc::xmlSceneList(const QString &scene, const QStringList e
return
sceneList
;
}
bool
KdenliveDoc
::
saveSceneList
(
const
QString
&
path
,
const
QString
&
scene
,
const
QStringList
expandedFolders
,
bool
autosave
)
bool
KdenliveDoc
::
saveSceneList
(
const
QString
&
path
,
const
QString
&
scene
,
const
QStringList
&
expandedFolders
,
bool
autosave
)
{
QDomDocument
sceneList
=
xmlSceneList
(
scene
,
expandedFolders
);
if
(
sceneList
.
isNull
())
{
...
...
@@ -911,7 +911,7 @@ Render *KdenliveDoc::renderer()
return
m_render
;
}
void
KdenliveDoc
::
updateClip
(
const
QString
id
)
void
KdenliveDoc
::
updateClip
(
const
QString
&
id
)
{
emit
updateClipDisplay
(
id
);
}
...
...
@@ -1180,7 +1180,7 @@ void KdenliveDoc::deleteClip(const QString &clipId)
emit
signalDeleteProjectClip
(
clipId
);
}
void
KdenliveDoc
::
slotAddClipList
(
const
KUrl
::
List
urls
,
const
QString
group
,
const
QString
&
groupId
)
void
KdenliveDoc
::
slotAddClipList
(
const
KUrl
::
List
urls
,
const
QString
&
group
,
const
QString
&
groupId
)
{
m_clipManager
->
slotAddClipList
(
urls
,
group
,
groupId
);
//emit selectLastAddedClip(QString::number(m_clipManager->lastClipId()));
...
...
@@ -1188,7 +1188,7 @@ void KdenliveDoc::slotAddClipList(const KUrl::List urls, const QString group, co
}
void
KdenliveDoc
::
slotAddClipFile
(
const
KUrl
url
,
const
QString
group
,
const
QString
&
groupId
)
void
KdenliveDoc
::
slotAddClipFile
(
const
KUrl
&
url
,
const
QString
&
group
,
const
QString
&
groupId
)
{
m_clipManager
->
slotAddClipFile
(
url
,
group
,
groupId
);
emit
selectLastAddedClip
(
QString
::
number
(
m_clipManager
->
lastClipId
()));
...
...
@@ -1219,7 +1219,7 @@ void KdenliveDoc::slotCreateColorClip(const QString &name, const QString &color,
emit
selectLastAddedClip
(
QString
::
number
(
m_clipManager
->
lastClipId
()));
}
void
KdenliveDoc
::
slotCreateSlideshowClipFile
(
const
QString
name
,
const
QString
path
,
int
count
,
const
QString
duration
,
void
KdenliveDoc
::
slotCreateSlideshowClipFile
(
const
QString
&
name
,
const
QString
&
path
,
int
count
,
const
QString
&
duration
,
const
bool
loop
,
const
bool
crop
,
const
bool
fade
,
const
QString
&
luma_duration
,
const
QString
&
luma_file
,
const
int
softness
,
const
QString
&
animation
,
QString
group
,
const
QString
&
groupId
)
...
...
src/kdenlivedoc.h
View file @
596d1cb5
...
...
@@ -52,7 +52,7 @@ class KdenliveDoc: public QObject
{
Q_OBJECT
public
:
KdenliveDoc
(
const
KUrl
&
url
,
const
KUrl
&
projectFolder
,
QUndoGroup
*
undoGroup
,
QString
profileName
,
QMap
<
QString
,
QString
>
properties
,
const
QPoint
tracks
,
Render
*
render
,
KTextEdit
*
notes
,
bool
*
openBackup
,
MainWindow
*
parent
=
0
,
KProgressDialog
*
progressDialog
=
0
);
KdenliveDoc
(
const
KUrl
&
url
,
const
KUrl
&
projectFolder
,
QUndoGroup
*
undoGroup
,
QString
profileName
,
QMap
<
QString
,
QString
>
properties
,
const
QPoint
&
tracks
,
Render
*
render
,
KTextEdit
*
notes
,
bool
*
openBackup
,
MainWindow
*
parent
=
0
,
KProgressDialog
*
progressDialog
=
0
);
~
KdenliveDoc
();
QDomNodeList
producersList
();
double
fps
()
const
;
...
...
@@ -83,12 +83,12 @@ 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
slotAddClipFile
(
const
KUrl
url
,
const
QString
group
,
const
QString
&
groupId
=
QString
());
void
slotAddClipList
(
const
KUrl
::
List
urls
,
const
QString
group
,
const
QString
&
groupId
=
QString
());
void
slotAddClipFile
(
const
KUrl
&
url
,
const
QString
&
group
,
const
QString
&
groupId
=
QString
());
void
slotAddClipList
(
const
KUrl
::
List
urls
,
const
QString
&
group
,
const
QString
&
groupId
=
QString
());
void
deleteClip
(
const
QString
&
clipId
);
int
getFramePos
(
QString
duration
);
DocClipBase
*
getBaseClip
(
const
QString
&
clipId
);
void
updateClip
(
const
QString
id
);
void
updateClip
(
const
QString
&
id
);
/** @brief Informs Kdenlive of the audio thumbnails generation progress. */
void
setThumbsProgress
(
const
QString
&
message
,
int
progress
);
...
...
@@ -113,9 +113,9 @@ Q_OBJECT public:
double
dar
()
const
;
double
projectDuration
()
const
;
/** @brief Returns the project file xml. */
QDomDocument
xmlSceneList
(
const
QString
&
scene
,
const
QStringList
expandedFolders
);
QDomDocument
xmlSceneList
(
const
QString
&
scene
,
const
QStringList
&
expandedFolders
);
/** @brief Saves the project file xml to a file. */
bool
saveSceneList
(
const
QString
&
path
,
const
QString
&
scene
,
const
QStringList
expandedFolders
,
bool
autosave
=
false
);
bool
saveSceneList
(
const
QString
&
path
,
const
QString
&
scene
,
const
QStringList
&
expandedFolders
,
bool
autosave
=
false
);
int
tracksCount
()
const
;
TrackInfo
trackInfoAt
(
int
ix
)
const
;
void
insertTrack
(
int
ix
,
TrackInfo
type
);
...
...
@@ -206,8 +206,8 @@ private:
public
slots
:
void
slotCreateXmlClip
(
const
QString
&
name
,
const
QDomElement
xml
,
QString
group
,
const
QString
&
groupId
);
void
slotCreateColorClip
(
const
QString
&
name
,
const
QString
&
color
,
const
QString
&
duration
,
QString
group
,
const
QString
&
groupId
);
void
slotCreateSlideshowClipFile
(
const
QString
name
,
const
QString
path
,
int
count
,
const
QString
duration
,
void
slotCreateSlideshowClipFile
(
const
QString
&
name
,
const
QString
&
path
,
int
count
,
const
QString
&
duration
,
const
bool
loop
,
const
bool
crop
,
const
bool
fade
,
const
QString
&
luma_duration
,
const
QString
&
luma_file
,
const
int
softness
,
...
...
@@ -238,7 +238,7 @@ signals:
void
selectLastAddedClip
(
const
QString
&
);
void
guidesUpdated
();
/** @brief When creating a backup file, also save a thumbnail of current timeline */
void
saveTimelinePreview
(
const
QString
path
);
void
saveTimelinePreview
(
const
QString
&
path
);
};
#endif
src/mainwindow.cpp
View file @
596d1cb5
...
...
@@ -2493,7 +2493,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha
connect
(
doc
,
SIGNAL
(
docModified
(
bool
)),
this
,
SLOT
(
slotUpdateDocumentState
(
bool
)));
connect
(
doc
,
SIGNAL
(
guidesUpdated
()),
this
,
SLOT
(
slotGuidesUpdated
()));
connect
(
doc
,
SIGNAL
(
saveTimelinePreview
(
const
QString
)),
trackView
,
SLOT
(
slotSaveTimelinePreview
(
const
QString
)));
connect
(
doc
,
SIGNAL
(
saveTimelinePreview
(
const
QString
&
)),
trackView
,
SLOT
(
slotSaveTimelinePreview
(
const
QString
)));
connect
(
m_notesWidget
,
SIGNAL
(
textChanged
()),
doc
,
SLOT
(
setModified
()));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment