Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 193f15aa authored by Ray Lehtiniemi's avatar Ray Lehtiniemi

Sort initializers in declaration order

Suppress compiler warnings about out-of-order initializers by
initializing all member variables in declaration order.
Signed-off-by: default avatarRay Lehtiniemi <rayl@mail.com>

svn path=/trunk/kdenlive/; revision=3226
parent 5ee798ae
......@@ -38,9 +38,9 @@ static QDBusConnection connection(QLatin1String(""));
RenderJob::RenderJob(bool erase, bool usekuiserver, const QString &renderer, const QString &profile, const QString &rendermodule, const QString &player, const QString &scenelist, const QString &dest, const QStringList &preargs, const QStringList &args, int in, int out) :
QObject(),
m_usekuiserver(usekuiserver),
m_jobUiserver(NULL),
m_kdenliveinterface(NULL)
m_kdenliveinterface(NULL),
m_usekuiserver(usekuiserver)
{
m_scenelist = scenelist;
m_dest = dest;
......
......@@ -31,10 +31,10 @@
AbstractClipItem::AbstractClipItem(const ItemInfo info, const QRectF& rect, double fps) :
QGraphicsRectItem(rect),
m_track(0),
m_fps(fps),
m_editedKeyframe(-1),
m_selectedKeyframe(0),
m_keyframeFactor(1)
m_keyframeFactor(1),
m_fps(fps)
{
setFlags(/*QGraphicsItem::ItemClipsToShape | */QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
setTrack(info.track);
......
......@@ -27,8 +27,8 @@ AddEffectCommand::AddEffectCommand(CustomTrackView *view, const int track, GenTi
QUndoCommand(parent),
m_view(view),
m_track(track),
m_pos(pos),
m_effect(effect),
m_pos(pos),
m_doIt(doIt)
{
QString effectName;
......
......@@ -26,10 +26,10 @@
AddTimelineClipCommand::AddTimelineClipCommand(CustomTrackView *view, QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects, bool doIt, bool doRemove, QUndoCommand * parent) :
QUndoCommand(parent),
m_view(view),
m_xml(xml),
m_clipId(clipId),
m_clipInfo(info),
m_effects(effects),
m_clipId(clipId),
m_xml(xml),
m_doIt(doIt),
m_remove(doRemove)
{
......
......@@ -27,8 +27,8 @@ AddTrackCommand::AddTrackCommand(CustomTrackView *view, int ix, TrackInfo info,
QUndoCommand(parent),
m_view(view),
m_ix(ix),
m_info(info),
m_addTrack(addTrack)
m_addTrack(addTrack),
m_info(info)
{
if (addTrack) setText(i18n("Add track"));
else setText(i18n("Delete track"));
......
......@@ -25,10 +25,10 @@ AddTransitionCommand::AddTransitionCommand(CustomTrackView *view, ItemInfo info,
QUndoCommand(parent),
m_view(view),
m_info(info),
m_track(transitiontrack),
m_params(params),
m_remove(remove),
m_doIt(doIt)
m_track(transitiontrack),
m_doIt(doIt),
m_remove(remove)
{
if (m_remove) setText(i18n("Delete transition from clip"));
else setText(i18n("Add transition to clip"));
......
......@@ -26,8 +26,8 @@
ChangeClipTypeCommand::ChangeClipTypeCommand(CustomTrackView *view, const int track, const GenTime &pos, bool videoOnly, bool audioOnly, bool originalVideo, bool originalAudio, QUndoCommand * parent) :
QUndoCommand(parent),
m_view(view),
m_track(track),
m_pos(pos),
m_track(track),
m_videoOnly(videoOnly),
m_audioOnly(audioOnly),
m_originalVideoOnly(originalVideo),
......
......@@ -27,9 +27,9 @@ ChangeSpeedCommand::ChangeSpeedCommand(CustomTrackView *view, ItemInfo info, dou
QUndoCommand(parent),
m_view(view),
m_clipInfo(info),
m_clipId(clipId),
m_old_speed(old_speed),
m_new_speed(new_speed),
m_clipId(clipId)
m_new_speed(new_speed)
{
setText(i18n("Adjust clip length"));
}
......
......@@ -28,8 +28,8 @@
ClipDurationDialog::ClipDurationDialog(AbstractClipItem *clip, Timecode tc, QWidget * parent):
QDialog(parent),
m_tc(tc),
m_clip(clip)
m_clip(clip),
m_tc(tc)
{
setFont(KGlobalSettings::toolBarFont());
m_fps = m_tc.fps();
......
......@@ -41,25 +41,25 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, b
m_clip(clip),
m_resizeMode(NONE),
m_grabPoint(0),
m_startFade(0),
m_endFade(0),
m_maxTrack(0),
m_audioOnly(false),
m_videoOnly(false),
m_startPix(QPixmap()),
m_endPix(QPixmap()),
m_hasThumbs(false),
startThumbTimer(NULL),
endThumbTimer(NULL),
audioThumbWasDrawn(false),
m_selectedEffect(-1),
m_opacity(1.0),
m_timeLine(0),
m_startThumbRequested(false),
m_endThumbRequested(false),
m_startFade(0),
m_endFade(0),
m_hover(false),
m_selectedEffect(-1),
m_speed(speed),
framePixelWidth(0),
m_startPix(QPixmap()),
m_endPix(QPixmap()),
m_videoOnly(false),
m_audioOnly(false)
audioThumbWasDrawn(false),
framePixelWidth(0)
{
setZValue(1);
setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (double)(KdenliveSettings::trackheight() - 2));
......
......@@ -35,9 +35,9 @@
#include <QGraphicsItemGroup>
ClipManager::ClipManager(KdenliveDoc *doc) :
m_audioThumbsQueue(QList <QString> ()),
m_doc(doc),
m_audioThumbsEnabled(false),
m_audioThumbsQueue(QList <QString> ()),
m_generatingAudioId(QString())
{
m_clipIdCounter = 1;
......
......@@ -45,11 +45,11 @@ static const int TYPE_GIF = 3;
ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidget * parent) :
QDialog(parent),
m_tc(tc),
m_clip(clip),
m_tc(tc),
m_fps(fps),
m_clipNeedsRefresh(false),
m_count(0)
m_count(0),
m_clipNeedsRefresh(false)
{
setFont(KGlobalSettings::toolBarFont());
m_view.setupUi(this);
......
......@@ -83,32 +83,32 @@
CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent) :
QGraphicsView(projectscene, parent),
m_scene(projectscene),
m_tracksHeight(KdenliveSettings::trackheight()),
m_selectedTrack(0),
m_projectDuration(0),
m_cursorPos(0),
m_document(doc),
m_scene(projectscene),
m_cursorLine(NULL),
m_operationMode(NONE),
m_moveOpMode(NONE),
m_dragItem(NULL),
m_dragGuide(NULL),
m_visualTip(NULL),
m_moveOpMode(NONE),
m_animation(NULL),
m_projectDuration(0),
m_clickPoint(QPoint()),
m_document(doc),
m_autoScroll(KdenliveSettings::autoscroll()),
m_tracksHeight(KdenliveSettings::trackheight()),
m_tool(SELECTTOOL),
m_dragGuide(NULL),
m_findIndex(0),
m_menuPosition(QPoint()),
m_blockRefresh(false),
m_selectionGroup(NULL),
m_selectedTrack(0),
m_copiedItems(QList<AbstractClipItem *> ()),
m_scrollOffset(0),
m_changeSpeedAction(NULL),
m_pasteEffectsAction(NULL),
m_ungroupAction(NULL),
m_clipDrag(false)
m_scrollOffset(0),
m_clipDrag(false),
m_findIndex(0),
m_tool(SELECTTOOL),
m_copiedItems(QList<AbstractClipItem *> ()),
m_menuPosition(QPoint()),
m_blockRefresh(false),
m_selectionGroup(NULL)
{
if (doc) m_commandStack = doc->commandStack();
else m_commandStack = NULL;
......
......@@ -34,19 +34,19 @@
#include <QCryptographicHash>
DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QString &id) :
m_id(id),
audioFrameChache(QMap<int, QMap<int, QByteArray> > ()),
m_description(QString()),
m_refcount(0),
m_audioThumbCreated(false),
m_duration(GenTime()),
m_thumbProd(NULL),
m_audioTimer(NULL),
m_properties(QMap <QString, QString> ()),
audioFrameChache(QMap<int, QMap<int, QByteArray> > ()),
m_baseTrackProducers(QList <Mlt::Producer *>()),
m_snapMarkers(QList < CommentedTime > ()),
m_audioTrackProducers(QList <Mlt::Producer *>()),
m_videoOnlyProducer(NULL),
m_audioTrackProducers(QList <Mlt::Producer *>())
m_snapMarkers(QList < CommentedTime > ()),
m_duration(GenTime()),
m_audioTimer(NULL),
m_thumbProd(NULL),
m_audioThumbCreated(false),
m_id(id),
m_properties(QMap <QString, QString> ())
{
int type = xml.attribute("type").toInt();
m_clipType = (CLIPTYPE) type;
......
......@@ -25,9 +25,9 @@
EditClipCommand::EditClipCommand(ProjectList *list, const QString &id, QMap <QString, QString> oldparams, QMap <QString, QString> newparams, bool doIt, QUndoCommand * parent) :
QUndoCommand(parent),
m_list(list),
m_id(id),
m_oldparams(oldparams),
m_newparams(newparams),
m_id(id),
m_doIt(doIt)
{
setText(i18n("Edit clip"));
......
......@@ -26,8 +26,8 @@
EditEffectCommand::EditEffectCommand(CustomTrackView *view, const int track, GenTime pos, QDomElement oldeffect, QDomElement effect, int stackPos, bool doIt) :
m_view(view),
m_track(track),
m_pos(pos),
m_oldeffect(oldeffect),
m_pos(pos),
m_stackPos(stackPos),
m_doIt(doIt)
{
......
......@@ -24,10 +24,10 @@
EditGuideCommand::EditGuideCommand(CustomTrackView *view, const GenTime oldPos, const QString &oldcomment, const GenTime pos, const QString &comment, bool doIt, QUndoCommand * parent) :
QUndoCommand(parent),
m_view(view),
m_oldPos(oldPos),
m_oldcomment(oldcomment),
m_pos(pos),
m_comment(comment),
m_oldPos(oldPos),
m_pos(pos),
m_doIt(doIt)
{
if (m_oldcomment.isEmpty()) setText(i18n("Add guide"));
......
......@@ -23,11 +23,11 @@
EditKeyFrameCommand::EditKeyFrameCommand(CustomTrackView *view, const int track, GenTime pos, const int effectIndex, const QString& oldkeyframes, const QString& newkeyframes, bool doIt) :
m_view(view),
m_track(track),
m_pos(pos),
m_index(effectIndex),
m_oldkfr(oldkeyframes),
m_newkfr(newkeyframes),
m_track(track),
m_index(effectIndex),
m_pos(pos),
m_doIt(doIt)
{
int prev = m_oldkfr.split(';', QString::SkipEmptyParts).count();
......
......@@ -23,8 +23,8 @@
EditTransitionCommand::EditTransitionCommand(CustomTrackView *view, const int track, GenTime pos, QDomElement oldeffect, QDomElement effect, bool doIt) :
m_view(view),
m_track(track),
m_pos(pos),
m_oldeffect(oldeffect),
m_pos(pos),
m_doIt(doIt)
{
m_effect = effect.cloneNode().toElement();
......
......@@ -30,9 +30,9 @@
Geometryval::Geometryval(const MltVideoProfile profile, QWidget* parent) :
QWidget(parent),
m_profile(profile),
paramRect(NULL),
m_geom(NULL),
m_path(NULL),
paramRect(NULL),
m_fixedMode(false)
{
ui.setupUi(this);
......
......@@ -29,10 +29,10 @@
Guide::Guide(CustomTrackView *view, GenTime pos, QString label, double fps, double height) :
QGraphicsLineItem(),
m_view(view),
m_position(pos),
m_label(label),
m_fps(fps)
m_fps(fps),
m_view(view)
{
setFlags(QGraphicsItem::ItemIsMovable);
setToolTip(label);
......
......@@ -28,8 +28,8 @@ InsertSpaceCommand::InsertSpaceCommand(CustomTrackView *view, QList<ItemInfo> cl
m_view(view),
m_clipsToMove(clipsToMove),
m_transToMove(transToMove),
m_track(track),
m_duration(duration),
m_track(track),
m_doIt(doIt)
{
if (duration > GenTime()) setText(i18n("Insert space"));
......
......@@ -44,19 +44,19 @@
KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, const QString &profileName, const QPoint tracks, Render *render, MainWindow *parent) :
QObject(parent),
m_render(render),
m_autosave(NULL),
m_url(url),
m_projectFolder(projectFolder),
m_zoom(7),
m_startPos(0),
m_render(render),
m_commandStack(new QUndoStack(undoGroup)),
m_modified(false),
m_documentLoadingProgress(0),
m_projectFolder(projectFolder),
m_documentLoadingStep(0.0),
m_startPos(0),
m_zoom(7),
m_autosave(NULL),
m_documentLoadingProgress(0),
m_abortLoading(false),
m_zoneStart(0),
m_zoneEnd(100),
m_abortLoading(false)
m_zoneEnd(100)
{
m_clipManager = new ClipManager(this);
m_autoSaveTimer = new QTimer(this);
......
......@@ -28,11 +28,11 @@
MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, const QString &caption, QWidget * parent) :
QDialog(parent),
m_tc(tc),
m_producer(NULL),
m_profile(NULL),
m_clip(clip),
m_marker(t),
m_producer(NULL),
m_profile(NULL)
m_tc(tc)
{
setFont(KGlobalSettings::toolBarFont());
m_fps = m_tc.fps();
......
......@@ -27,9 +27,9 @@ MoveEffectCommand::MoveEffectCommand(CustomTrackView *view, const int track, Gen
QUndoCommand(parent),
m_view(view),
m_track(track),
m_pos(pos),
m_oldindex(oldPos),
m_newindex(newPos)
m_newindex(newPos),
m_pos(pos)
{
/* QString effectName;
QDomNode namenode = effect.elementsByTagName("name").item(0);
......
......@@ -30,8 +30,8 @@
ProfilesDialog::ProfilesDialog(QWidget * parent) :
QDialog(parent),
m_isCustomProfile(false),
m_profileIsModified(false)
m_profileIsModified(false),
m_isCustomProfile(false)
{
m_view.setupUi(this);
......
......@@ -36,10 +36,10 @@ const int UsageRole = NameRole + 2;
// folder
ProjectItem::ProjectItem(QTreeWidget * parent, const QStringList & strings, const QString &clipId) :
QTreeWidgetItem(parent, strings),
m_groupname(strings.at(1)),
m_clipType(FOLDER),
m_clipId(clipId),
m_clip(NULL),
m_groupname(strings.at(1))
m_clip(NULL)
{
setSizeHint(0, QSize(65, 45));
setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable);
......
......@@ -59,14 +59,14 @@ ProjectList::ProjectList(QWidget *parent) :
m_render(NULL),
m_fps(-1),
m_commandStack(NULL),
m_selectedItem(NULL),
m_infoQueue(QMap <QString, QDomElement> ()),
m_thumbnailQueue(QList <QString> ()),
m_refreshed(false),
m_editAction(NULL),
m_openAction(NULL),
m_deleteAction(NULL),
m_reloadAction(NULL)
m_openAction(NULL),
m_reloadAction(NULL),
m_selectedItem(NULL),
m_refreshed(false),
m_infoQueue(QMap <QString, QDomElement> ()),
m_thumbnailQueue(QList <QString> ())
{
listView = new ProjectListView(this);;
......
......@@ -43,8 +43,8 @@ RecMonitor::RecMonitor(QString name, QWidget *parent) :
m_name(name),
m_isActive(false),
m_isCapturing(false),
m_isPlaying(false),
m_didCapture(false)
m_didCapture(false),
m_isPlaying(false)
{
ui.setupUi(this);
......
......@@ -55,18 +55,18 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr
Render::Render(const QString & rendererName, int winid, int extid, QWidget *parent) :
QObject(parent),
m_isBlocked(true),
m_name(rendererName),
m_mltConsumer(NULL),
m_mltProducer(NULL),
m_mltTextProducer(NULL),
m_winid(winid),
m_externalwinid(extid),
m_framePosition(0),
m_isBlocked(true),
m_blackClip(NULL),
m_isSplitView(false),
m_isZoneMode(false),
m_isLoopMode(false)
m_isLoopMode(false),
m_isSplitView(false),
m_blackClip(NULL),
m_winid(winid),
m_externalwinid(extid)
{
kDebug() << "////////// USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data();
refreshTimer = new QTimer(this);
......
......@@ -26,8 +26,8 @@
SplitAudioCommand::SplitAudioCommand(CustomTrackView *view, const int track, const GenTime &pos, QUndoCommand * parent) :
QUndoCommand(parent),
m_view(view),
m_track(track),
m_pos(pos)
m_pos(pos),
m_track(track)
{
setText(i18n("Split audio"));
}
......
......@@ -35,11 +35,11 @@ int settingUp = false;
TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget *parent) :
QDialog(parent),
startViewport(NULL),
endViewport(NULL),
m_render(render),
m_count(0),
m_projectPath(projectPath),
startViewport(NULL),
endViewport(NULL)
m_projectPath(projectPath)
{
setupUi(this);
setFont(KGlobalSettings::toolBarFont());
......
......@@ -38,9 +38,9 @@
TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) :
QWidget(parent),
m_doc(doc),
m_scale(1.0),
m_projectTracks(0)
m_projectTracks(0),
m_doc(doc)
{
view = new Ui::TimeLine_UI();
......
......@@ -33,8 +33,8 @@
Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) :
AbstractClipItem(info, QRectF(), fps),
m_automaticTransition(automaticTransition),
m_forceTransitionTrack(false)
m_forceTransitionTrack(false),
m_automaticTransition(automaticTransition)
{
setZValue(2);
setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (qreal)(KdenliveSettings::trackheight() / 3 * 2 - 1));
......
......@@ -28,8 +28,8 @@
TransitionSettings::TransitionSettings(QWidget* parent) :
QWidget(parent),
m_tracksCount(0),
m_usedTransition(NULL)
m_usedTransition(NULL),
m_tracksCount(0)
{
ui.setupUi(this);
effectEdit = new EffectStackEdit(ui.frame);
......
......@@ -48,8 +48,8 @@ extern "C"
}
WestleyPreview::WestleyPreview() :
m_rand(0),
m_inigoprocess(0)
m_inigoprocess(0),
m_rand(0)
{
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment