From 75d4cd899bb27a916261fd1cbdedd532b0337678 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Tue, 17 Nov 2020 20:24:42 +1100 Subject: [PATCH] use hardcoded namespace The macro defined namespaces confused the hell out of lupdate and more or less broke translations permanently. Looks like the only way we can do it is to have a hardcoded namespace, which goes against my instinct, but honestly how likely is it that we'll change the namespace anyway (I guess forks might want to do it, but that's their problem ;) ) --- app/audio/audiomanager.cpp | 4 +- app/audio/audiomanager.h | 4 +- app/audio/audiovisualwaveform.cpp | 4 +- app/audio/audiovisualwaveform.h | 6 +- app/audio/outputdeviceproxy.cpp | 4 +- app/audio/outputdeviceproxy.h | 4 +- app/audio/outputmanager.cpp | 4 +- app/audio/outputmanager.h | 6 +- app/audio/tempoprocessor.cpp | 4 +- app/audio/tempoprocessor.h | 4 +- app/cli/cliexport/cliexportmanager.cpp | 4 +- app/cli/cliexport/cliexportmanager.h | 4 +- app/cli/cliprogress/cliprogressdialog.cpp | 4 +- app/cli/cliprogress/cliprogressdialog.h | 4 +- app/cli/clitask/clitaskdialog.cpp | 4 +- app/cli/clitask/clitaskdialog.h | 4 +- app/codec/decoder.cpp | 4 +- app/codec/decoder.h | 6 +- app/codec/encoder.cpp | 4 +- app/codec/encoder.h | 10 +- app/codec/exportcodec.cpp | 4 +- app/codec/exportcodec.h | 4 +- app/codec/exportformat.cpp | 4 +- app/codec/exportformat.h | 4 +- app/codec/ffmpeg/avframeptr.h | 4 +- app/codec/ffmpeg/ffmpegdecoder.cpp | 4 +- app/codec/ffmpeg/ffmpegdecoder.h | 4 +- app/codec/ffmpeg/ffmpegencoder.cpp | 4 +- app/codec/ffmpeg/ffmpegencoder.h | 8 +- app/codec/ffmpeg/ffmpegframepool.cpp | 4 +- app/codec/ffmpeg/ffmpegframepool.h | 4 +- app/codec/frame.cpp | 4 +- app/codec/frame.h | 6 +- app/codec/oiio/oiiodecoder.cpp | 4 +- app/codec/oiio/oiiodecoder.h | 4 +- app/codec/samplebuffer.cpp | 4 +- app/codec/samplebuffer.h | 6 +- app/codec/waveinput.cpp | 4 +- app/codec/waveinput.h | 4 +- app/codec/waveoutput.cpp | 4 +- app/codec/waveoutput.h | 4 +- app/common/autoscroll.h | 4 +- app/common/bezier.cpp | 4 +- app/common/bezier.h | 4 +- app/common/cancelableobject.h | 4 +- app/common/crashpadinterface.cpp | 4 +- app/common/debug.cpp | 4 +- app/common/debug.h | 4 +- app/common/define.h | 16 +- app/common/ffmpegutils.cpp | 4 +- app/common/ffmpegutils.h | 4 +- app/common/filefunctions.cpp | 4 +- app/common/filefunctions.h | 4 +- app/common/flipmodifiers.cpp | 4 +- app/common/flipmodifiers.h | 4 +- app/common/memorypool.cpp | 4 +- app/common/memorypool.h | 4 +- app/common/ocioutils.cpp | 4 +- app/common/ocioutils.h | 4 +- app/common/oiioutils.cpp | 4 +- app/common/oiioutils.h | 4 +- app/common/power.h | 4 +- app/common/qtutils.cpp | 4 +- app/common/qtutils.h | 4 +- app/common/ratiodialog.cpp | 4 +- app/common/ratiodialog.h | 4 +- app/common/rational.cpp | 6 +- app/common/rational.h | 8 +- app/common/threadedobject.cpp | 4 +- app/common/threadedobject.h | 4 +- app/common/timecodefunctions.cpp | 4 +- app/common/timecodefunctions.h | 4 +- app/common/timerange.cpp | 6 +- app/common/timerange.h | 10 +- app/common/tohex.h | 4 +- app/common/xmlutils.cpp | 4 +- app/common/xmlutils.h | 4 +- app/config/config.cpp | 4 +- app/config/config.h | 4 +- app/core.cpp | 24 +- app/core.h | 6 +- app/dialog/about/about.cpp | 4 +- app/dialog/about/about.h | 4 +- app/dialog/actionsearch/actionsearch.cpp | 4 +- app/dialog/actionsearch/actionsearch.h | 4 +- app/dialog/color/colordialog.cpp | 4 +- app/dialog/color/colordialog.h | 4 +- app/dialog/crashhandler/crashhandler.cpp | 4 +- app/dialog/crashhandler/crashhandler.h | 4 +- app/dialog/crashhandler/crashhandlermain.cpp | 2 +- app/dialog/diskcache/diskcachedialog.cpp | 4 +- app/dialog/diskcache/diskcachedialog.h | 4 +- app/dialog/export/codec/codecsection.cpp | 4 +- app/dialog/export/codec/codecsection.h | 4 +- app/dialog/export/codec/h264section.cpp | 4 +- app/dialog/export/codec/h264section.h | 4 +- app/dialog/export/codec/imagesection.cpp | 4 +- app/dialog/export/codec/imagesection.h | 4 +- app/dialog/export/export.cpp | 4 +- app/dialog/export/export.h | 4 +- .../export/exportadvancedvideodialog.cpp | 4 +- app/dialog/export/exportadvancedvideodialog.h | 4 +- app/dialog/export/exportaudiotab.cpp | 4 +- app/dialog/export/exportaudiotab.h | 4 +- app/dialog/export/exportvideotab.cpp | 4 +- app/dialog/export/exportvideotab.h | 4 +- .../footageproperties/footageproperties.cpp | 4 +- .../footageproperties/footageproperties.h | 4 +- .../audiostreamproperties.cpp | 4 +- .../streamproperties/audiostreamproperties.h | 4 +- .../streamproperties/streamproperties.cpp | 4 +- .../streamproperties/streamproperties.h | 4 +- .../videostreamproperties.cpp | 4 +- .../streamproperties/videostreamproperties.h | 4 +- .../footagerelink/footagerelinkdialog.cpp | 4 +- .../footagerelink/footagerelinkdialog.h | 4 +- .../keyframeproperties/keyframeproperties.cpp | 4 +- .../keyframeproperties/keyframeproperties.h | 4 +- app/dialog/preferences/keysequenceeditor.cpp | 4 +- app/dialog/preferences/keysequenceeditor.h | 4 +- app/dialog/preferences/preferences.cpp | 4 +- app/dialog/preferences/preferences.h | 4 +- .../tabs/preferencesappearancetab.cpp | 4 +- .../tabs/preferencesappearancetab.h | 4 +- .../preferences/tabs/preferencesaudiotab.cpp | 4 +- .../preferences/tabs/preferencesaudiotab.h | 4 +- .../tabs/preferencesbehaviortab.cpp | 4 +- .../preferences/tabs/preferencesbehaviortab.h | 4 +- .../preferences/tabs/preferencesdisktab.cpp | 4 +- .../preferences/tabs/preferencesdisktab.h | 4 +- .../tabs/preferencesgeneraltab.cpp | 4 +- .../preferences/tabs/preferencesgeneraltab.h | 4 +- .../tabs/preferenceskeyboardtab.cpp | 4 +- .../preferences/tabs/preferenceskeyboardtab.h | 4 +- .../preferences/tabs/preferencestab.cpp | 4 +- app/dialog/preferences/tabs/preferencestab.h | 4 +- app/dialog/progress/progress.cpp | 4 +- app/dialog/progress/progress.h | 4 +- .../projectproperties/projectproperties.cpp | 4 +- .../projectproperties/projectproperties.h | 4 +- app/dialog/rendercancel/rendercancel.cpp | 4 +- app/dialog/rendercancel/rendercancel.h | 4 +- app/dialog/richtext/richtext.cpp | 4 +- app/dialog/richtext/richtext.h | 4 +- app/dialog/sequence/presetmanager.h | 4 +- app/dialog/sequence/sequence.cpp | 4 +- app/dialog/sequence/sequence.h | 4 +- .../sequence/sequencedialogparametertab.cpp | 4 +- .../sequence/sequencedialogparametertab.h | 4 +- .../sequence/sequencedialogpresettab.cpp | 4 +- app/dialog/sequence/sequencedialogpresettab.h | 4 +- app/dialog/sequence/sequencepreset.h | 4 +- app/dialog/task/task.cpp | 4 +- app/dialog/task/task.h | 4 +- app/main.cpp | 10 +- app/node/audio/pan/pan.cpp | 4 +- app/node/audio/pan/pan.h | 4 +- app/node/audio/volume/volume.cpp | 4 +- app/node/audio/volume/volume.h | 4 +- app/node/block/block.cpp | 4 +- app/node/block/block.h | 4 +- app/node/block/clip/clip.cpp | 4 +- app/node/block/clip/clip.h | 4 +- app/node/block/gap/gap.cpp | 4 +- app/node/block/gap/gap.h | 4 +- .../crossdissolve/crossdissolvetransition.cpp | 4 +- .../crossdissolve/crossdissolvetransition.h | 4 +- .../diptocolor/diptocolortransition.cpp | 4 +- .../diptocolor/diptocolortransition.h | 4 +- app/node/block/transition/transition.cpp | 4 +- app/node/block/transition/transition.h | 4 +- app/node/edge.cpp | 4 +- app/node/edge.h | 4 +- app/node/factory.cpp | 4 +- app/node/factory.h | 4 +- app/node/filter/blur/blur.cpp | 4 +- app/node/filter/blur/blur.h | 4 +- app/node/filter/stroke/stroke.cpp | 4 +- app/node/filter/stroke/stroke.h | 4 +- app/node/generator/matrix/matrix.cpp | 4 +- app/node/generator/matrix/matrix.h | 4 +- app/node/generator/polygon/polygon.cpp | 4 +- app/node/generator/polygon/polygon.h | 4 +- app/node/generator/solid/solid.cpp | 4 +- app/node/generator/solid/solid.h | 4 +- app/node/generator/text/text.cpp | 4 +- app/node/generator/text/text.h | 4 +- app/node/graph.cpp | 4 +- app/node/graph.h | 4 +- app/node/input.cpp | 4 +- app/node/input.h | 6 +- app/node/input/media/audio/audio.cpp | 4 +- app/node/input/media/audio/audio.h | 4 +- app/node/input/media/media.cpp | 4 +- app/node/input/media/media.h | 4 +- app/node/input/media/video/video.cpp | 4 +- app/node/input/media/video/video.h | 4 +- app/node/input/time/timeinput.cpp | 4 +- app/node/input/time/timeinput.h | 4 +- app/node/inputarray.cpp | 4 +- app/node/inputarray.h | 4 +- app/node/inputdragger.cpp | 4 +- app/node/inputdragger.h | 4 +- app/node/keyframe.cpp | 4 +- app/node/keyframe.h | 6 +- app/node/math/math/math.cpp | 4 +- app/node/math/math/math.h | 4 +- app/node/math/math/mathbase.cpp | 4 +- app/node/math/math/mathbase.h | 4 +- app/node/math/merge/merge.cpp | 4 +- app/node/math/merge/merge.h | 4 +- app/node/math/trigonometry/trigonometry.cpp | 4 +- app/node/math/trigonometry/trigonometry.h | 4 +- app/node/node.cpp | 4 +- app/node/node.h | 6 +- app/node/output.cpp | 4 +- app/node/output.h | 4 +- app/node/output/track/track.cpp | 4 +- app/node/output/track/track.h | 4 +- app/node/output/track/tracklist.cpp | 4 +- app/node/output/track/tracklist.h | 4 +- app/node/output/viewer/viewer.cpp | 4 +- app/node/output/viewer/viewer.h | 4 +- app/node/param.cpp | 4 +- app/node/param.h | 4 +- app/node/traverser.cpp | 4 +- app/node/traverser.h | 4 +- app/node/value.cpp | 4 +- app/node/value.h | 10 +- app/panel/audiomonitor/audiomonitor.cpp | 4 +- app/panel/audiomonitor/audiomonitor.h | 4 +- app/panel/curve/curve.cpp | 4 +- app/panel/curve/curve.h | 4 +- app/panel/footageviewer/footageviewer.cpp | 4 +- app/panel/footageviewer/footageviewer.h | 4 +- app/panel/node/node.cpp | 4 +- app/panel/node/node.h | 4 +- app/panel/panelmanager.cpp | 4 +- app/panel/panelmanager.h | 4 +- app/panel/param/param.cpp | 4 +- app/panel/param/param.h | 4 +- app/panel/pixelsampler/pixelsamplerpanel.cpp | 4 +- app/panel/pixelsampler/pixelsamplerpanel.h | 4 +- app/panel/project/footagemanagementpanel.h | 4 +- app/panel/project/project.cpp | 4 +- app/panel/project/project.h | 6 +- app/panel/scope/scope.cpp | 4 +- app/panel/scope/scope.h | 4 +- app/panel/sequenceviewer/sequenceviewer.cpp | 4 +- app/panel/sequenceviewer/sequenceviewer.h | 4 +- app/panel/table/table.cpp | 4 +- app/panel/table/table.h | 4 +- app/panel/taskmanager/taskmanager.cpp | 4 +- app/panel/taskmanager/taskmanager.h | 4 +- app/panel/timebased/timebased.cpp | 4 +- app/panel/timebased/timebased.h | 4 +- app/panel/timeline/timeline.cpp | 4 +- app/panel/timeline/timeline.h | 4 +- app/panel/tool/tool.cpp | 4 +- app/panel/tool/tool.h | 4 +- app/panel/viewer/viewer.cpp | 4 +- app/panel/viewer/viewer.h | 4 +- app/panel/viewer/viewerbase.cpp | 4 +- app/panel/viewer/viewerbase.h | 4 +- app/project/item/folder/folder.cpp | 4 +- app/project/item/folder/folder.h | 4 +- app/project/item/footage/audiostream.cpp | 4 +- app/project/item/footage/audiostream.h | 4 +- app/project/item/footage/footage.cpp | 4 +- app/project/item/footage/footage.h | 4 +- app/project/item/footage/stream.cpp | 4 +- app/project/item/footage/stream.h | 6 +- app/project/item/footage/videostream.cpp | 4 +- app/project/item/footage/videostream.h | 4 +- app/project/item/item.cpp | 4 +- app/project/item/item.h | 4 +- app/project/item/sequence/sequence.cpp | 4 +- app/project/item/sequence/sequence.h | 4 +- app/project/project.cpp | 4 +- app/project/project.h | 4 +- app/project/projectviewmodel.cpp | 4 +- app/project/projectviewmodel.h | 4 +- app/render/audioparams.cpp | 4 +- app/render/audioparams.h | 6 +- app/render/audioplaybackcache.cpp | 4 +- app/render/audioplaybackcache.h | 4 +- app/render/color.cpp | 6 +- app/render/color.h | 8 +- app/render/colormanager.cpp | 4 +- app/render/colormanager.h | 4 +- app/render/colorprocessor.cpp | 4 +- app/render/colorprocessor.h | 6 +- app/render/colorprocessorcache.h | 4 +- app/render/colortransform.h | 4 +- app/render/diskmanager.cpp | 4 +- app/render/diskmanager.h | 4 +- app/render/framehashcache.cpp | 4 +- app/render/framehashcache.h | 6 +- app/render/job/acceleratedjob.h | 4 +- app/render/job/generatejob.h | 6 +- app/render/job/samplejob.h | 6 +- app/render/job/shaderjob.h | 6 +- app/render/managedcolor.cpp | 4 +- app/render/managedcolor.h | 4 +- app/render/opengl/openglrenderer.cpp | 4 +- app/render/opengl/openglrenderer.h | 22 +- app/render/playbackcache.cpp | 4 +- app/render/playbackcache.h | 12 +- app/render/previewautocacher.cpp | 4 +- app/render/previewautocacher.h | 8 +- app/render/rendercache.h | 4 +- app/render/renderer.cpp | 4 +- app/render/renderer.h | 28 +- app/render/rendererthreadwrapper.cpp | 4 +- app/render/rendererthreadwrapper.h | 20 +- app/render/rendermanager.cpp | 4 +- app/render/rendermanager.h | 6 +- app/render/rendermodes.h | 4 +- app/render/renderprocessor.cpp | 4 +- app/render/renderprocessor.h | 6 +- app/render/shadercode.h | 4 +- app/render/shadervalue.h | 4 +- app/render/stillimagecache.h | 4 +- app/render/texture.cpp | 4 +- app/render/texture.h | 6 +- app/render/videoparams.cpp | 4 +- app/render/videoparams.h | 8 +- app/task/conform/conform.cpp | 4 +- app/task/conform/conform.h | 4 +- app/task/export/export.cpp | 4 +- app/task/export/export.h | 4 +- app/task/export/exportparams.cpp | 4 +- app/task/export/exportparams.h | 4 +- app/task/precache/precachetask.cpp | 4 +- app/task/precache/precachetask.h | 4 +- app/task/project/import/import.cpp | 4 +- app/task/project/import/import.h | 4 +- app/task/project/import/importerrordialog.cpp | 4 +- app/task/project/import/importerrordialog.h | 4 +- app/task/project/load/load.cpp | 4 +- app/task/project/load/load.h | 4 +- app/task/project/load/loadbasetask.cpp | 4 +- app/task/project/load/loadbasetask.h | 4 +- app/task/project/loadotio/loadotio.cpp | 4 +- app/task/project/loadotio/loadotio.h | 4 +- app/task/project/save/save.cpp | 4 +- app/task/project/save/save.h | 4 +- app/task/project/saveotio/saveotio.cpp | 4 +- app/task/project/saveotio/saveotio.h | 4 +- app/task/render/render.cpp | 4 +- app/task/render/render.h | 4 +- app/task/task.h | 4 +- app/task/taskmanager.cpp | 4 +- app/task/taskmanager.h | 4 +- app/threading/threadpool.cpp | 4 +- app/threading/threadpool.h | 6 +- app/threading/threadticket.cpp | 4 +- app/threading/threadticket.h | 6 +- app/threading/threadticketwatcher.cpp | 4 +- app/threading/threadticketwatcher.h | 4 +- app/timeline/timelinecommon.h | 4 +- app/timeline/timelinecoordinate.cpp | 4 +- app/timeline/timelinecoordinate.h | 4 +- app/timeline/timelinemarker.cpp | 4 +- app/timeline/timelinemarker.h | 4 +- app/timeline/timelinepoints.cpp | 4 +- app/timeline/timelinepoints.h | 4 +- app/timeline/timelineworkarea.cpp | 4 +- app/timeline/timelineworkarea.h | 4 +- app/timeline/trackreference.cpp | 4 +- app/timeline/trackreference.h | 4 +- app/tool/tool.h | 4 +- app/ts/en_US.ts | 1195 +++++++++-------- app/ui/icons/icons.cpp | 4 +- app/ui/icons/icons.h | 4 +- app/ui/style/style.cpp | 4 +- app/ui/style/style.h | 4 +- app/undo/undocommand.cpp | 4 +- app/undo/undocommand.h | 4 +- app/undo/undostack.cpp | 4 +- app/undo/undostack.h | 4 +- app/widget/audiomonitor/audiomonitor.cpp | 4 +- app/widget/audiomonitor/audiomonitor.h | 4 +- app/widget/clickablelabel/clickablelabel.cpp | 4 +- app/widget/clickablelabel/clickablelabel.h | 4 +- app/widget/collapsebutton/collapsebutton.cpp | 4 +- app/widget/collapsebutton/collapsebutton.h | 4 +- app/widget/colorbutton/colorbutton.cpp | 6 +- app/widget/colorbutton/colorbutton.h | 4 +- app/widget/colorwheel/colorgradientwidget.cpp | 4 +- app/widget/colorwheel/colorgradientwidget.h | 4 +- app/widget/colorwheel/colorpreviewbox.cpp | 4 +- app/widget/colorwheel/colorpreviewbox.h | 4 +- app/widget/colorwheel/colorspacechooser.cpp | 4 +- app/widget/colorwheel/colorspacechooser.h | 4 +- app/widget/colorwheel/colorswatchwidget.cpp | 4 +- app/widget/colorwheel/colorswatchwidget.h | 4 +- app/widget/colorwheel/colorvalueswidget.cpp | 4 +- app/widget/colorwheel/colorvalueswidget.h | 4 +- app/widget/colorwheel/colorwheelwidget.cpp | 4 +- app/widget/colorwheel/colorwheelwidget.h | 4 +- .../columnedgridlayout/columnedgridlayout.cpp | 4 +- .../columnedgridlayout/columnedgridlayout.h | 4 +- .../curvewidget/beziercontrolpointitem.cpp | 4 +- .../curvewidget/beziercontrolpointitem.h | 4 +- app/widget/curvewidget/curveview.cpp | 4 +- app/widget/curvewidget/curveview.h | 4 +- app/widget/curvewidget/curvewidget.cpp | 4 +- app/widget/curvewidget/curvewidget.h | 4 +- .../focusablelineedit/focusablelineedit.cpp | 4 +- .../focusablelineedit/focusablelineedit.h | 4 +- .../footagecombobox/footagecombobox.cpp | 4 +- app/widget/footagecombobox/footagecombobox.h | 4 +- app/widget/keyframeview/keyframeview.cpp | 4 +- app/widget/keyframeview/keyframeview.h | 4 +- app/widget/keyframeview/keyframeviewbase.cpp | 4 +- app/widget/keyframeview/keyframeviewbase.h | 4 +- app/widget/keyframeview/keyframeviewitem.cpp | 4 +- app/widget/keyframeview/keyframeviewitem.h | 4 +- app/widget/keyframeview/keyframeviewundo.cpp | 4 +- app/widget/keyframeview/keyframeviewundo.h | 4 +- app/widget/manageddisplay/manageddisplay.cpp | 4 +- app/widget/manageddisplay/manageddisplay.h | 4 +- app/widget/menu/menu.cpp | 4 +- app/widget/menu/menu.h | 4 +- app/widget/menu/menushared.cpp | 4 +- app/widget/menu/menushared.h | 4 +- app/widget/nodecombobox/nodecombobox.cpp | 4 +- app/widget/nodecombobox/nodecombobox.h | 4 +- app/widget/nodecopypaste/nodecopypaste.cpp | 4 +- app/widget/nodecopypaste/nodecopypaste.h | 4 +- app/widget/nodeparamview/nodeparamview.cpp | 4 +- app/widget/nodeparamview/nodeparamview.h | 4 +- .../nodeparamviewarraywidget.cpp | 4 +- .../nodeparamview/nodeparamviewarraywidget.h | 4 +- .../nodeparamviewconnectedlabel.cpp | 4 +- .../nodeparamviewconnectedlabel.h | 4 +- .../nodeparamview/nodeparamviewitem.cpp | 4 +- app/widget/nodeparamview/nodeparamviewitem.h | 4 +- .../nodeparamviewkeyframecontrol.cpp | 4 +- .../nodeparamviewkeyframecontrol.h | 4 +- .../nodeparamview/nodeparamviewrichtext.cpp | 4 +- .../nodeparamview/nodeparamviewrichtext.h | 4 +- .../nodeparamview/nodeparamviewundo.cpp | 4 +- app/widget/nodeparamview/nodeparamviewundo.h | 4 +- .../nodeparamviewwidgetbridge.cpp | 4 +- .../nodeparamview/nodeparamviewwidgetbridge.h | 4 +- .../nodetableview/nodetabletraverser.cpp | 4 +- app/widget/nodetableview/nodetabletraverser.h | 4 +- app/widget/nodetableview/nodetableview.cpp | 4 +- app/widget/nodetableview/nodetableview.h | 4 +- app/widget/nodetableview/nodetablewidget.cpp | 4 +- app/widget/nodetableview/nodetablewidget.h | 4 +- app/widget/nodetreeview/nodetreeview.cpp | 4 +- app/widget/nodetreeview/nodetreeview.h | 4 +- app/widget/nodeview/nodeview.cpp | 4 +- app/widget/nodeview/nodeview.h | 4 +- app/widget/nodeview/nodeviewcommon.h | 4 +- app/widget/nodeview/nodeviewedge.cpp | 4 +- app/widget/nodeview/nodeviewedge.h | 4 +- app/widget/nodeview/nodeviewitem.cpp | 4 +- app/widget/nodeview/nodeviewitem.h | 4 +- app/widget/nodeview/nodeviewscene.cpp | 4 +- app/widget/nodeview/nodeviewscene.h | 4 +- app/widget/nodeview/nodeviewundo.cpp | 4 +- app/widget/nodeview/nodeviewundo.h | 4 +- app/widget/panel/panel.cpp | 4 +- app/widget/panel/panel.h | 4 +- app/widget/path/pathwidget.cpp | 4 +- app/widget/path/pathwidget.h | 4 +- app/widget/pixelsampler/pixelsampler.cpp | 4 +- app/widget/pixelsampler/pixelsampler.h | 4 +- app/widget/playbackcontrols/dragbutton.cpp | 4 +- app/widget/playbackcontrols/dragbutton.h | 4 +- .../playbackcontrols/playbackcontrols.cpp | 4 +- .../playbackcontrols/playbackcontrols.h | 4 +- .../projectexplorer/projectexplorer.cpp | 4 +- app/widget/projectexplorer/projectexplorer.h | 4 +- .../projectexplorericonview.cpp | 4 +- .../projectexplorer/projectexplorericonview.h | 4 +- .../projectexplorericonviewitemdelegate.cpp | 4 +- .../projectexplorericonviewitemdelegate.h | 4 +- .../projectexplorerlistview.cpp | 4 +- .../projectexplorer/projectexplorerlistview.h | 4 +- .../projectexplorerlistviewbase.cpp | 4 +- .../projectexplorerlistviewbase.h | 4 +- .../projectexplorerlistviewitemdelegate.cpp | 4 +- .../projectexplorerlistviewitemdelegate.h | 4 +- .../projectexplorernavigation.cpp | 4 +- .../projectexplorernavigation.h | 4 +- .../projectexplorertreeview.cpp | 4 +- .../projectexplorer/projectexplorertreeview.h | 4 +- .../projectexplorer/projectexplorerundo.cpp | 4 +- .../projectexplorer/projectexplorerundo.h | 4 +- app/widget/projecttoolbar/projecttoolbar.cpp | 4 +- app/widget/projecttoolbar/projecttoolbar.h | 4 +- .../resizablescrollbar/resizablescrollbar.cpp | 4 +- .../resizablescrollbar/resizablescrollbar.h | 4 +- app/widget/scope/histogram/histogram.cpp | 4 +- app/widget/scope/histogram/histogram.h | 4 +- app/widget/scope/scopebase/scopebase.cpp | 4 +- app/widget/scope/scopebase/scopebase.h | 4 +- app/widget/scope/waveform/waveform.cpp | 4 +- app/widget/scope/waveform/waveform.h | 4 +- app/widget/slider/floatslider.cpp | 4 +- app/widget/slider/floatslider.h | 4 +- app/widget/slider/integerslider.cpp | 4 +- app/widget/slider/integerslider.h | 4 +- app/widget/slider/sliderbase.cpp | 4 +- app/widget/slider/sliderbase.h | 4 +- app/widget/slider/sliderlabel.cpp | 4 +- app/widget/slider/sliderlabel.h | 4 +- app/widget/slider/sliderladder.cpp | 4 +- app/widget/slider/sliderladder.h | 4 +- app/widget/slider/stringslider.cpp | 4 +- app/widget/slider/stringslider.h | 4 +- app/widget/slider/timeslider.cpp | 4 +- app/widget/slider/timeslider.h | 4 +- .../standardcombos/channellayoutcombobox.h | 4 +- app/widget/standardcombos/frameratecombobox.h | 4 +- .../standardcombos/interlacedcombobox.h | 4 +- .../standardcombos/pixelaspectratiocombobox.h | 4 +- .../standardcombos/pixelformatcombobox.h | 4 +- .../standardcombos/sampleratecombobox.h | 4 +- .../standardcombos/videodividercombobox.h | 4 +- app/widget/taskview/elapsedcounterwidget.cpp | 4 +- app/widget/taskview/elapsedcounterwidget.h | 4 +- app/widget/taskview/taskview.cpp | 4 +- app/widget/taskview/taskview.h | 4 +- app/widget/taskview/taskviewitem.cpp | 4 +- app/widget/taskview/taskviewitem.h | 4 +- app/widget/timebased/timebased.cpp | 4 +- app/widget/timebased/timebased.h | 4 +- app/widget/timelinewidget/snapservice.h | 4 +- .../timelinewidget/timelineandtrackview.cpp | 4 +- .../timelinewidget/timelineandtrackview.h | 4 +- .../timelinewidget/timelinescaledobject.cpp | 4 +- .../timelinewidget/timelinescaledobject.h | 4 +- app/widget/timelinewidget/timelinewidget.cpp | 28 +- app/widget/timelinewidget/timelinewidget.h | 4 +- .../timelinewidgetselections.cpp | 4 +- .../timelinewidget/timelinewidgetselections.h | 4 +- app/widget/timelinewidget/tool/add.cpp | 30 +- app/widget/timelinewidget/tool/add.h | 4 +- app/widget/timelinewidget/tool/beam.cpp | 4 +- app/widget/timelinewidget/tool/beam.h | 4 +- app/widget/timelinewidget/tool/edit.cpp | 4 +- app/widget/timelinewidget/tool/edit.h | 4 +- app/widget/timelinewidget/tool/import.cpp | 4 +- app/widget/timelinewidget/tool/import.h | 4 +- app/widget/timelinewidget/tool/pointer.cpp | 4 +- app/widget/timelinewidget/tool/pointer.h | 4 +- app/widget/timelinewidget/tool/razor.cpp | 4 +- app/widget/timelinewidget/tool/razor.h | 4 +- app/widget/timelinewidget/tool/ripple.cpp | 4 +- app/widget/timelinewidget/tool/ripple.h | 4 +- app/widget/timelinewidget/tool/rolling.cpp | 4 +- app/widget/timelinewidget/tool/rolling.h | 4 +- app/widget/timelinewidget/tool/slide.cpp | 4 +- app/widget/timelinewidget/tool/slide.h | 4 +- app/widget/timelinewidget/tool/slip.cpp | 4 +- app/widget/timelinewidget/tool/slip.h | 4 +- app/widget/timelinewidget/tool/tool.cpp | 4 +- app/widget/timelinewidget/tool/tool.h | 4 +- app/widget/timelinewidget/tool/transition.cpp | 4 +- app/widget/timelinewidget/tool/transition.h | 4 +- app/widget/timelinewidget/tool/zoom.cpp | 4 +- app/widget/timelinewidget/tool/zoom.h | 4 +- .../timelinewidget/trackview/trackview.cpp | 4 +- .../timelinewidget/trackview/trackview.h | 4 +- .../trackview/trackviewitem.cpp | 4 +- .../timelinewidget/trackview/trackviewitem.h | 4 +- .../trackview/trackviewsplitter.cpp | 4 +- .../trackview/trackviewsplitter.h | 4 +- app/widget/timelinewidget/undo/undo.cpp | 4 +- app/widget/timelinewidget/undo/undo.h | 4 +- .../timelinewidget/view/handmovableview.cpp | 4 +- .../timelinewidget/view/handmovableview.h | 4 +- .../timelinewidget/view/timelineview.cpp | 4 +- app/widget/timelinewidget/view/timelineview.h | 4 +- .../timelinewidget/view/timelineviewbase.cpp | 4 +- .../timelinewidget/view/timelineviewbase.h | 4 +- .../view/timelineviewblockitem.cpp | 4 +- .../view/timelineviewblockitem.h | 4 +- .../view/timelineviewghostitem.cpp | 4 +- .../view/timelineviewghostitem.h | 4 +- .../view/timelineviewmouseevent.cpp | 4 +- .../view/timelineviewmouseevent.h | 4 +- .../timelinewidget/view/timelineviewrect.cpp | 4 +- .../timelinewidget/view/timelineviewrect.h | 4 +- app/widget/timeruler/seekablewidget.cpp | 4 +- app/widget/timeruler/seekablewidget.h | 4 +- app/widget/timeruler/timeruler.cpp | 4 +- app/widget/timeruler/timeruler.h | 4 +- app/widget/timetarget/timetarget.cpp | 4 +- app/widget/timetarget/timetarget.h | 4 +- app/widget/toolbar/toolbar.cpp | 4 +- app/widget/toolbar/toolbar.h | 4 +- app/widget/toolbar/toolbarbutton.cpp | 4 +- app/widget/toolbar/toolbarbutton.h | 4 +- app/widget/viewer/audiowaveformview.cpp | 4 +- app/widget/viewer/audiowaveformview.h | 4 +- app/widget/viewer/footageviewer.cpp | 4 +- app/widget/viewer/footageviewer.h | 4 +- app/widget/viewer/gizmotraverser.cpp | 4 +- app/widget/viewer/gizmotraverser.h | 4 +- app/widget/viewer/viewer.cpp | 4 +- app/widget/viewer/viewer.h | 8 +- app/widget/viewer/viewerdisplay.cpp | 4 +- app/widget/viewer/viewerdisplay.h | 4 +- app/widget/viewer/viewerplaybacktimer.cpp | 4 +- app/widget/viewer/viewerplaybacktimer.h | 4 +- app/widget/viewer/viewerqueue.h | 4 +- app/widget/viewer/viewersafemargininfo.h | 4 +- app/widget/viewer/viewersizer.cpp | 4 +- app/widget/viewer/viewersizer.h | 4 +- app/widget/viewer/viewerwindow.cpp | 4 +- app/widget/viewer/viewerwindow.h | 4 +- app/window/mainwindow/mainmenu.cpp | 4 +- app/window/mainwindow/mainmenu.h | 4 +- app/window/mainwindow/mainstatusbar.cpp | 4 +- app/window/mainwindow/mainstatusbar.h | 4 +- app/window/mainwindow/mainwindow.cpp | 4 +- app/window/mainwindow/mainwindow.h | 4 +- .../mainwindow/mainwindowlayoutinfo.cpp | 4 +- app/window/mainwindow/mainwindowlayoutinfo.h | 6 +- 626 files changed, 1971 insertions(+), 1972 deletions(-) diff --git a/app/audio/audiomanager.cpp b/app/audio/audiomanager.cpp index 820c77add..d4716a7f9 100644 --- a/app/audio/audiomanager.cpp +++ b/app/audio/audiomanager.cpp @@ -24,7 +24,7 @@ #include "config/config.h" -OLIVE_NAMESPACE_ENTER +namespace olive { AudioManager* AudioManager::instance_ = nullptr; @@ -268,4 +268,4 @@ void AudioManager::InputDevicesRefreshed() emit InputListReady(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/audio/audiomanager.h b/app/audio/audiomanager.h index 381d0a533..26503e26c 100644 --- a/app/audio/audiomanager.h +++ b/app/audio/audiomanager.h @@ -32,7 +32,7 @@ #include "render/audioparams.h" #include "render/audioplaybackcache.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief Audio input and output management class @@ -124,6 +124,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // AUDIOMANAGER_H diff --git a/app/audio/audiovisualwaveform.cpp b/app/audio/audiovisualwaveform.cpp index d8ba57e6c..2fc07b683 100644 --- a/app/audio/audiovisualwaveform.cpp +++ b/app/audio/audiovisualwaveform.cpp @@ -24,7 +24,7 @@ #include "config/config.h" -OLIVE_NAMESPACE_ENTER +namespace olive { const int AudioVisualWaveform::kSumSampleRate = 200; @@ -330,4 +330,4 @@ void AudioVisualWaveform::ExpandMinMax(AudioVisualWaveform::SamplePerChannel &su } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/audio/audiovisualwaveform.h b/app/audio/audiovisualwaveform.h index fef95be1a..759f71385 100644 --- a/app/audio/audiovisualwaveform.h +++ b/app/audio/audiovisualwaveform.h @@ -27,7 +27,7 @@ #include "codec/samplebuffer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A buffer of data used to store a visual representation of audio @@ -108,8 +108,8 @@ private: }; -OLIVE_NAMESPACE_EXIT +} -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::AudioVisualWaveform) +Q_DECLARE_METATYPE(olive::AudioVisualWaveform) #endif // SUMSAMPLES_H diff --git a/app/audio/outputdeviceproxy.cpp b/app/audio/outputdeviceproxy.cpp index 039934905..d7c77caa0 100644 --- a/app/audio/outputdeviceproxy.cpp +++ b/app/audio/outputdeviceproxy.cpp @@ -22,7 +22,7 @@ #include "audiomanager.h" -OLIVE_NAMESPACE_ENTER +namespace olive { AudioOutputDeviceProxy::AudioOutputDeviceProxy(QObject *parent) : QIODevice(parent), @@ -137,4 +137,4 @@ qint64 AudioOutputDeviceProxy::ReverseAwareRead(char *data, qint64 maxlen) return read_count; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/audio/outputdeviceproxy.h b/app/audio/outputdeviceproxy.h index 93ebca282..5767d97c4 100644 --- a/app/audio/outputdeviceproxy.h +++ b/app/audio/outputdeviceproxy.h @@ -26,7 +26,7 @@ #include "common/define.h" #include "tempoprocessor.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief QIODevice wrapper that can adjust speed/reverse an audio file @@ -61,6 +61,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // AUDIOOUTPUTDEVICEPROXY_H diff --git a/app/audio/outputmanager.cpp b/app/audio/outputmanager.cpp index 415fc4487..42afd5f2a 100644 --- a/app/audio/outputmanager.cpp +++ b/app/audio/outputmanager.cpp @@ -25,7 +25,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { AudioOutputManager::AudioOutputManager(QObject *parent) : QObject(parent), @@ -151,4 +151,4 @@ void AudioOutputManager::OutputStateChanged(QAudio::State state) qDebug() << state << output_->error(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/audio/outputmanager.h b/app/audio/outputmanager.h index 01d11a208..8c29ef299 100644 --- a/app/audio/outputmanager.h +++ b/app/audio/outputmanager.h @@ -30,7 +30,7 @@ #include "outputdeviceproxy.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class AudioOutputManager : public QObject { @@ -59,7 +59,7 @@ public slots: void ResetToPushMode(); // Queued - void SetParameters(OLIVE_NAMESPACE::AudioParams params); + void SetParameters(olive::AudioParams params); // Queued void Close(); @@ -84,6 +84,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // AUDIOHYBRIDDEVICE_H diff --git a/app/audio/tempoprocessor.cpp b/app/audio/tempoprocessor.cpp index 1ffd1dbac..444acece3 100644 --- a/app/audio/tempoprocessor.cpp +++ b/app/audio/tempoprocessor.cpp @@ -30,7 +30,7 @@ extern "C" { #include "common/ffmpegutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TempoProcessor::TempoProcessor() : filter_graph_(nullptr), @@ -274,4 +274,4 @@ AVFilterContext *TempoProcessor::CreateTempoFilter(AVFilterGraph* graph, AVFilte return nullptr; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/audio/tempoprocessor.h b/app/audio/tempoprocessor.h index eff244bf4..53d5ee96b 100644 --- a/app/audio/tempoprocessor.h +++ b/app/audio/tempoprocessor.h @@ -35,7 +35,7 @@ extern "C" { #include "render/audioparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TempoProcessor { @@ -78,6 +78,6 @@ private: bool flushed_; }; -OLIVE_NAMESPACE_EXIT +} #endif // TEMPOPROCESSOR_H diff --git a/app/cli/cliexport/cliexportmanager.cpp b/app/cli/cliexport/cliexportmanager.cpp index 195d9fdb2..f0bbaa0d4 100644 --- a/app/cli/cliexport/cliexportmanager.cpp +++ b/app/cli/cliexport/cliexportmanager.cpp @@ -20,11 +20,11 @@ #include "cliexportmanager.h" -OLIVE_NAMESPACE_ENTER +namespace olive { CLIExportManager::CLIExportManager() { } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/cli/cliexport/cliexportmanager.h b/app/cli/cliexport/cliexportmanager.h index a9d2afed7..7bfd9f14b 100644 --- a/app/cli/cliexport/cliexportmanager.h +++ b/app/cli/cliexport/cliexportmanager.h @@ -23,7 +23,7 @@ #include "task/export/export.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class CLIExportManager : public QObject { @@ -31,6 +31,6 @@ public: CLIExportManager(); }; -OLIVE_NAMESPACE_EXIT +} #endif // CLIEXPORTMANAGER_H diff --git a/app/cli/cliprogress/cliprogressdialog.cpp b/app/cli/cliprogress/cliprogressdialog.cpp index ebd53ecf9..522b23e31 100644 --- a/app/cli/cliprogress/cliprogressdialog.cpp +++ b/app/cli/cliprogress/cliprogressdialog.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { CLIProgressDialog::CLIProgressDialog(const QString& title, QObject *parent) : QObject(parent), @@ -103,4 +103,4 @@ void CLIProgressDialog::SetProgress(double p) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/cli/cliprogress/cliprogressdialog.h b/app/cli/cliprogress/cliprogressdialog.h index ce1811e5f..c5874ed26 100644 --- a/app/cli/cliprogress/cliprogressdialog.h +++ b/app/cli/cliprogress/cliprogressdialog.h @@ -26,7 +26,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class CLIProgressDialog : public QObject { @@ -47,6 +47,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // CLIPROGRESSDIALOG_H diff --git a/app/cli/clitask/clitaskdialog.cpp b/app/cli/clitask/clitaskdialog.cpp index 84f62e18b..b06c18a66 100644 --- a/app/cli/clitask/clitaskdialog.cpp +++ b/app/cli/clitask/clitaskdialog.cpp @@ -20,7 +20,7 @@ #include "clitaskdialog.h" -OLIVE_NAMESPACE_ENTER +namespace olive { CLITaskDialog::CLITaskDialog(Task *task, QObject* parent) : CLIProgressDialog(task->GetTitle(), parent), @@ -34,4 +34,4 @@ bool CLITaskDialog::Run() return task_->Start(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/cli/clitask/clitaskdialog.h b/app/cli/clitask/clitaskdialog.h index 69c161955..79a626900 100644 --- a/app/cli/clitask/clitaskdialog.h +++ b/app/cli/clitask/clitaskdialog.h @@ -24,7 +24,7 @@ #include "cli/cliprogress/cliprogressdialog.h" #include "task/task.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class CLITaskDialog : public CLIProgressDialog { @@ -39,6 +39,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // CLITASKDIALOG_H diff --git a/app/codec/decoder.cpp b/app/codec/decoder.cpp index c6fcc4ece..26efa8ccc 100644 --- a/app/codec/decoder.cpp +++ b/app/codec/decoder.cpp @@ -37,7 +37,7 @@ #include "task/taskmanager.h" #include "project/project.h" -OLIVE_NAMESPACE_ENTER +namespace olive { QMutex Decoder::currently_conforming_mutex_; QWaitCondition Decoder::currently_conforming_wait_cond_; @@ -377,4 +377,4 @@ SampleBufferPtr Decoder::RetrieveAudioFromConform(const QString &conform_filenam return nullptr; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/codec/decoder.h b/app/codec/decoder.h index 8e165b9c8..74137e33b 100644 --- a/app/codec/decoder.h +++ b/app/codec/decoder.h @@ -36,7 +36,7 @@ extern "C" { #include "common/rational.h" #include "project/item/footage/footage.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class Decoder; using DecoderPtr = std::shared_ptr; @@ -248,8 +248,8 @@ private: }; -OLIVE_NAMESPACE_EXIT +} -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::Decoder::RetrieveState) +Q_DECLARE_METATYPE(olive::Decoder::RetrieveState) #endif // DECODER_H diff --git a/app/codec/encoder.cpp b/app/codec/encoder.cpp index 189e4f939..fe7204c36 100644 --- a/app/codec/encoder.cpp +++ b/app/codec/encoder.cpp @@ -24,7 +24,7 @@ #include "ffmpeg/ffmpegencoder.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Encoder::Encoder(const EncodingParams ¶ms) : params_(params) @@ -236,4 +236,4 @@ Encoder* Encoder::CreateFromID(const QString &id, const EncodingParams& params) return new FFmpegEncoder(params); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/codec/encoder.h b/app/codec/encoder.h index 47c9a0710..24ac3a84c 100644 --- a/app/codec/encoder.h +++ b/app/codec/encoder.h @@ -32,7 +32,7 @@ #include "render/audioparams.h" #include "render/videoparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class Encoder; using EncoderPtr = std::shared_ptr; @@ -114,10 +114,10 @@ public: virtual bool Open() = 0; - virtual bool WriteFrame(OLIVE_NAMESPACE::FramePtr frame, OLIVE_NAMESPACE::rational time) = 0; - virtual void WriteAudio(OLIVE_NAMESPACE::AudioParams pcm_info, + virtual bool WriteFrame(olive::FramePtr frame, olive::rational time) = 0; + virtual void WriteAudio(olive::AudioParams pcm_info, QIODevice *file) = 0; - void WriteAudio(OLIVE_NAMESPACE::AudioParams pcm_info, + void WriteAudio(olive::AudioParams pcm_info, const QString& pcm_filename); virtual void Close() = 0; @@ -132,6 +132,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // ENCODER_H diff --git a/app/codec/exportcodec.cpp b/app/codec/exportcodec.cpp index 09d25800d..0654c5f78 100644 --- a/app/codec/exportcodec.cpp +++ b/app/codec/exportcodec.cpp @@ -25,7 +25,7 @@ extern "C" { #include } -OLIVE_NAMESPACE_ENTER +namespace olive { QString ExportCodec::GetCodecName(ExportCodec::Codec c) { @@ -125,4 +125,4 @@ QStringList ExportCodec::GetPixelFormatsForCodec(ExportCodec::Codec c) return pix_fmts; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/codec/exportcodec.h b/app/codec/exportcodec.h index d0a57eb61..6f3e0c49e 100644 --- a/app/codec/exportcodec.h +++ b/app/codec/exportcodec.h @@ -26,7 +26,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ExportCodec : public QObject { @@ -57,6 +57,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // EXPORTCODEC_H diff --git a/app/codec/exportformat.cpp b/app/codec/exportformat.cpp index b241168fb..caeca6412 100644 --- a/app/codec/exportformat.cpp +++ b/app/codec/exportformat.cpp @@ -20,7 +20,7 @@ #include "exportformat.h" -OLIVE_NAMESPACE_ENTER +namespace olive { QString ExportFormat::GetName(olive::ExportFormat::Format f) { @@ -135,4 +135,4 @@ QList ExportFormat::GetAudioCodecs(ExportFormat::Format f) return {}; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/codec/exportformat.h b/app/codec/exportformat.h index ca5ef1afe..eaaea84c5 100644 --- a/app/codec/exportformat.h +++ b/app/codec/exportformat.h @@ -27,7 +27,7 @@ #include "common/define.h" #include "exportcodec.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ExportFormat : public QObject { @@ -53,6 +53,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // EXPORTFORMAT_H diff --git a/app/codec/ffmpeg/avframeptr.h b/app/codec/ffmpeg/avframeptr.h index 8841b7c89..5660fd4b2 100644 --- a/app/codec/ffmpeg/avframeptr.h +++ b/app/codec/ffmpeg/avframeptr.h @@ -30,7 +30,7 @@ extern "C" { #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class AVFrameWrapper { public: @@ -55,6 +55,6 @@ private: using AVFramePtr = std::shared_ptr; -OLIVE_NAMESPACE_EXIT +} #endif // AVFRAMEPTR_H diff --git a/app/codec/ffmpeg/ffmpegdecoder.cpp b/app/codec/ffmpeg/ffmpegdecoder.cpp index b17ff24f7..494e14827 100644 --- a/app/codec/ffmpeg/ffmpegdecoder.cpp +++ b/app/codec/ffmpeg/ffmpegdecoder.cpp @@ -45,7 +45,7 @@ extern "C" { #include "render/framehashcache.h" #include "render/diskmanager.h" -OLIVE_NAMESPACE_ENTER +namespace olive { FFmpegDecoder::FFmpegDecoder() : scale_ctx_(nullptr), @@ -1085,4 +1085,4 @@ void FFmpegDecoder::Instance::Seek(int64_t timestamp) av_seek_frame(fmt_ctx_, avstream_->index, timestamp, AVSEEK_FLAG_BACKWARD); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/codec/ffmpeg/ffmpegdecoder.h b/app/codec/ffmpeg/ffmpegdecoder.h index 9861e0fdc..2634f06f4 100644 --- a/app/codec/ffmpeg/ffmpegdecoder.h +++ b/app/codec/ffmpeg/ffmpegdecoder.h @@ -38,7 +38,7 @@ extern "C" { #include "ffmpegframepool.h" #include "project/item/footage/videostream.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A Decoder derivative that wraps FFmpeg functions as on Olive decoder @@ -162,6 +162,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // FFMPEGDECODER_H diff --git a/app/codec/ffmpeg/ffmpegencoder.cpp b/app/codec/ffmpeg/ffmpegencoder.cpp index 2c5001d4d..7b28558e1 100644 --- a/app/codec/ffmpeg/ffmpegencoder.cpp +++ b/app/codec/ffmpeg/ffmpegencoder.cpp @@ -28,7 +28,7 @@ extern "C" { #include "common/ffmpegutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { FFmpegEncoder::FFmpegEncoder(const EncodingParams ¶ms) : Encoder(params), @@ -634,4 +634,4 @@ void FFmpegEncoder::Error(const QString &s) Close(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/codec/ffmpeg/ffmpegencoder.h b/app/codec/ffmpeg/ffmpegencoder.h index 46ddb2ae2..75e5b25bd 100644 --- a/app/codec/ffmpeg/ffmpegencoder.h +++ b/app/codec/ffmpeg/ffmpegencoder.h @@ -30,7 +30,7 @@ extern "C" { #include "codec/encoder.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class FFmpegEncoder : public Encoder { @@ -40,9 +40,9 @@ public: virtual bool Open() override; - virtual bool WriteFrame(OLIVE_NAMESPACE::FramePtr frame, OLIVE_NAMESPACE::rational time) override; + virtual bool WriteFrame(olive::FramePtr frame, olive::rational time) override; - virtual void WriteAudio(OLIVE_NAMESPACE::AudioParams pcm_info, + virtual void WriteAudio(olive::AudioParams pcm_info, QIODevice *file) override; virtual void Close() override; @@ -97,6 +97,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // FFMPEGENCODER_H diff --git a/app/codec/ffmpeg/ffmpegframepool.cpp b/app/codec/ffmpeg/ffmpegframepool.cpp index e7ec89238..c4cfb3412 100644 --- a/app/codec/ffmpeg/ffmpegframepool.cpp +++ b/app/codec/ffmpeg/ffmpegframepool.cpp @@ -22,7 +22,7 @@ #include "codec/frame.h" -OLIVE_NAMESPACE_ENTER +namespace olive { FFmpegFramePool::FFmpegFramePool(int element_count) : MemoryPool(element_count), @@ -48,4 +48,4 @@ size_t FFmpegFramePool::GetElementSize() return Frame::generate_linesize_bytes(width_, format_, channel_count_) * height_; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/codec/ffmpeg/ffmpegframepool.h b/app/codec/ffmpeg/ffmpegframepool.h index 189cec3a1..cffe58ab6 100644 --- a/app/codec/ffmpeg/ffmpegframepool.h +++ b/app/codec/ffmpeg/ffmpegframepool.h @@ -24,7 +24,7 @@ #include "common/memorypool.h" #include "render/videoparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class FFmpegFramePool : public MemoryPool { @@ -57,6 +57,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // FFMPEGFRAMEPOOL_H diff --git a/app/codec/frame.cpp b/app/codec/frame.cpp index 42733c0b9..5bcb6041c 100644 --- a/app/codec/frame.cpp +++ b/app/codec/frame.cpp @@ -27,7 +27,7 @@ #include "common/oiioutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Frame::Frame() : timestamp_(0) @@ -129,4 +129,4 @@ FramePtr Frame::convert(VideoParams::Format format) const } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/codec/frame.h b/app/codec/frame.h index 5dd763110..b9f7e3cb0 100644 --- a/app/codec/frame.h +++ b/app/codec/frame.h @@ -28,7 +28,7 @@ #include "render/color.h" #include "render/videoparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class Frame; using FramePtr = std::shared_ptr; @@ -163,8 +163,8 @@ private: }; -OLIVE_NAMESPACE_EXIT +} -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::FramePtr) +Q_DECLARE_METATYPE(olive::FramePtr) #endif // FRAME_H diff --git a/app/codec/oiio/oiiodecoder.cpp b/app/codec/oiio/oiiodecoder.cpp index 3cc893a15..7f4a280c1 100644 --- a/app/codec/oiio/oiiodecoder.cpp +++ b/app/codec/oiio/oiiodecoder.cpp @@ -31,7 +31,7 @@ #include "config/config.h" #include "core.h" -OLIVE_NAMESPACE_ENTER +namespace olive { QStringList OIIODecoder::supported_formats_; @@ -261,4 +261,4 @@ void OIIODecoder::CloseImageHandle() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/codec/oiio/oiiodecoder.h b/app/codec/oiio/oiiodecoder.h index 767ba0e01..3a6398d45 100644 --- a/app/codec/oiio/oiiodecoder.h +++ b/app/codec/oiio/oiiodecoder.h @@ -26,7 +26,7 @@ #include "codec/decoder.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class OIIODecoder : public Decoder { @@ -72,6 +72,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // OIIODECODER_H diff --git a/app/codec/samplebuffer.cpp b/app/codec/samplebuffer.cpp index eb615cc75..dc5f3ffb8 100644 --- a/app/codec/samplebuffer.cpp +++ b/app/codec/samplebuffer.cpp @@ -20,7 +20,7 @@ #include "samplebuffer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { SampleBuffer::SampleBuffer() : sample_count_per_channel_(0), @@ -310,4 +310,4 @@ void SampleBuffer::destroy_sample_buffer(float ***data, int nb_channels) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/codec/samplebuffer.h b/app/codec/samplebuffer.h index b412c171c..984959788 100644 --- a/app/codec/samplebuffer.h +++ b/app/codec/samplebuffer.h @@ -25,7 +25,7 @@ #include "render/audioparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class SampleBuffer; using SampleBufferPtr = std::shared_ptr; @@ -94,8 +94,8 @@ private: }; -OLIVE_NAMESPACE_EXIT +} -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::SampleBufferPtr) +Q_DECLARE_METATYPE(olive::SampleBufferPtr) #endif // SAMPLEBUFFER_H diff --git a/app/codec/waveinput.cpp b/app/codec/waveinput.cpp index 43130b9c5..49de1eb59 100644 --- a/app/codec/waveinput.cpp +++ b/app/codec/waveinput.cpp @@ -27,7 +27,7 @@ extern "C" { #include #include -OLIVE_NAMESPACE_ENTER +namespace olive { WaveInput::WaveInput(const QString &f) : file_(f) @@ -239,4 +239,4 @@ qint64 WaveInput::calculate_max_read() const return data_size_ - (file_.pos() - data_position_ ); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/codec/waveinput.h b/app/codec/waveinput.h index ebb2f1fbc..51131891e 100644 --- a/app/codec/waveinput.h +++ b/app/codec/waveinput.h @@ -25,7 +25,7 @@ #include "render/audioparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class WaveInput { @@ -70,6 +70,6 @@ private: quint32 data_size_; }; -OLIVE_NAMESPACE_EXIT +} #endif // WAVEINPUT_H diff --git a/app/codec/waveoutput.cpp b/app/codec/waveoutput.cpp index 958180f1c..b6b858957 100644 --- a/app/codec/waveoutput.cpp +++ b/app/codec/waveoutput.cpp @@ -22,7 +22,7 @@ #include "render/audioparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { const int16_t kWAVIntegerFormat = 1; const int16_t kWAVFloatFormat = 3; @@ -177,4 +177,4 @@ void WaveOutput::write_int(QFile *file, T integer) file->write(bytes); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/codec/waveoutput.h b/app/codec/waveoutput.h index f48490838..54ef72ed0 100644 --- a/app/codec/waveoutput.h +++ b/app/codec/waveoutput.h @@ -26,7 +26,7 @@ #include "render/audioparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class WaveOutput { @@ -63,6 +63,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // WAVEAUDIO_H diff --git a/app/common/autoscroll.h b/app/common/autoscroll.h index 19cd0a8dc..9d21a5df4 100644 --- a/app/common/autoscroll.h +++ b/app/common/autoscroll.h @@ -23,7 +23,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class AutoScroll { public: @@ -34,6 +34,6 @@ public: }; }; -OLIVE_NAMESPACE_EXIT +} #endif // AUTOSCROLL_H diff --git a/app/common/bezier.cpp b/app/common/bezier.cpp index 926f10a49..11e7c4aac 100644 --- a/app/common/bezier.cpp +++ b/app/common/bezier.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { double Bezier::QuadraticXtoT(double x, double a, double b, double c) { @@ -63,4 +63,4 @@ double Bezier::CubicTtoY(double a, double b, double c, double d, double t) return qPow(1.0 - t, 3)*a + 3*qPow(1.0 - t, 2)*t*b + 3*(1.0 - t)*qPow(t, 2)*c + qPow(t, 3)*d; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/common/bezier.h b/app/common/bezier.h index c53838616..55cb7dd0f 100644 --- a/app/common/bezier.h +++ b/app/common/bezier.h @@ -23,7 +23,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class Bezier { @@ -37,6 +37,6 @@ public: static double CubicTtoY(double a, double b, double c, double d, double t); }; -OLIVE_NAMESPACE_EXIT +} #endif // BEZIER_H diff --git a/app/common/cancelableobject.h b/app/common/cancelableobject.h index 310bf9098..25b42f143 100644 --- a/app/common/cancelableobject.h +++ b/app/common/cancelableobject.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class CancelableObject { public: @@ -53,6 +53,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // CANCELABLEOBJECT_H diff --git a/app/common/crashpadinterface.cpp b/app/common/crashpadinterface.cpp index 61b8f9613..6014bd493 100644 --- a/app/common/crashpadinterface.cpp +++ b/app/common/crashpadinterface.cpp @@ -40,7 +40,7 @@ crashpad::CrashpadClient *client; QString GenerateReportPath() { - return QDir(OLIVE_NAMESPACE::FileFunctions::GetTempFilePath()).filePath(QStringLiteral("reports")); + return QDir(olive::FileFunctions::GetTempFilePath()).filePath(QStringLiteral("reports")); } base::FilePath GenerateReportPathForCrashpad() @@ -90,7 +90,7 @@ bool InitializeCrashpad() base::FilePath reports_dir = GenerateReportPathForCrashpad(); - base::FilePath metrics_dir(QSTRING_TO_BASE_STRING(QDir(OLIVE_NAMESPACE::FileFunctions::GetTempFilePath()).filePath(QStringLiteral("metrics")))); + base::FilePath metrics_dir(QSTRING_TO_BASE_STRING(QDir(olive::FileFunctions::GetTempFilePath()).filePath(QStringLiteral("metrics")))); // Metadata that will be posted to the server with the crash report map std::map annotations; diff --git a/app/common/debug.cpp b/app/common/debug.cpp index f859c8cee..195f74f4d 100644 --- a/app/common/debug.cpp +++ b/app/common/debug.cpp @@ -20,7 +20,7 @@ #include "debug.h" -OLIVE_NAMESPACE_ENTER +namespace olive { void DebugHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) { @@ -54,4 +54,4 @@ void DebugHandler(QtMsgType type, const QMessageLogContext &context, const QStri #endif } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/common/debug.h b/app/common/debug.h index 214ba376b..edb2aeb68 100644 --- a/app/common/debug.h +++ b/app/common/debug.h @@ -25,10 +25,10 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { void DebugHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg); -OLIVE_NAMESPACE_EXIT +} #endif // DEBUG_H diff --git a/app/common/define.h b/app/common/define.h index d613f1480..6bc08b3a1 100644 --- a/app/common/define.h +++ b/app/common/define.h @@ -21,13 +21,7 @@ #ifndef OLIVECOMMONDEFINE_H #define OLIVECOMMONDEFINE_H -#define OLIVE_NAMESPACE olive - -#define OLIVE_NAMESPACE_ENTER namespace OLIVE_NAMESPACE { - -#define OLIVE_NAMESPACE_EXIT } - -OLIVE_NAMESPACE_ENTER +namespace olive { /// The minimum size an icon in ProjectExplorer can be const int kProjectIconSizeMinimum = 16; @@ -40,14 +34,14 @@ const int kProjectIconSizeDefault = 64; const int kBytesInGigabyte = 1073741824; -OLIVE_NAMESPACE_EXIT +} #define MACRO_NAME_AS_STR(s) #s #define MACRO_VAL_AS_STR(s) MACRO_NAME_AS_STR(s) -#define OLIVE_NS_CONST_ARG(x, y) QArgument("const " MACRO_VAL_AS_STR(OLIVE_NAMESPACE) "::" #x, y) -#define OLIVE_NS_ARG(x, y) QArgument(MACRO_VAL_AS_STR(OLIVE_NAMESPACE) "::" #x, y) -#define OLIVE_NS_RETURN_ARG(x, y) QReturnArgument(MACRO_VAL_AS_STR(OLIVE_NAMESPACE) "::" #x, y) +#define OLIVE_NS_CONST_ARG(x, y) QArgument("const " MACRO_VAL_AS_STR(olive) "::" #x, y) +#define OLIVE_NS_ARG(x, y) QArgument(MACRO_VAL_AS_STR(olive) "::" #x, y) +#define OLIVE_NS_RETURN_ARG(x, y) QReturnArgument(MACRO_VAL_AS_STR(olive) "::" #x, y) /** * Copy/move deleters. Similar to Q_DISABLE_COPY_MOVE, et al. but those functions are not present in Qt < 5.13 so we diff --git a/app/common/ffmpegutils.cpp b/app/common/ffmpegutils.cpp index bf335aa0c..46723e915 100644 --- a/app/common/ffmpegutils.cpp +++ b/app/common/ffmpegutils.cpp @@ -20,7 +20,7 @@ #include "common/ffmpegutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { AVPixelFormat FFmpegUtils::GetCompatiblePixelFormat(const AVPixelFormat &pix_fmt) { @@ -138,4 +138,4 @@ VideoParams::Format FFmpegUtils::GetCompatiblePixelFormat(const VideoParams::For return VideoParams::kFormatInvalid; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/common/ffmpegutils.h b/app/common/ffmpegutils.h index c4aa4667c..e40cf1c6d 100644 --- a/app/common/ffmpegutils.h +++ b/app/common/ffmpegutils.h @@ -28,7 +28,7 @@ extern "C" { #include "render/audioparams.h" #include "render/videoparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class FFmpegUtils { public: @@ -58,6 +58,6 @@ public: static AVSampleFormat GetFFmpegSampleFormat(const AudioParams::Format &smp_fmt); }; -OLIVE_NAMESPACE_EXIT +} #endif // FFMPEGABSTRACTION_H diff --git a/app/common/filefunctions.cpp b/app/common/filefunctions.cpp index d6c480abb..8314acb4c 100644 --- a/app/common/filefunctions.cpp +++ b/app/common/filefunctions.cpp @@ -29,7 +29,7 @@ #include "config/config.h" -OLIVE_NAMESPACE_ENTER +namespace olive { QString FileFunctions::GetUniqueFileIdentifier(const QString &filename) { @@ -240,4 +240,4 @@ bool FileFunctions::RenameFileAllowOverwrite(const QString &from, const QString return true; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/common/filefunctions.h b/app/common/filefunctions.h index c883da0a0..124d42b17 100644 --- a/app/common/filefunctions.h +++ b/app/common/filefunctions.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A collection of static file and directory functions @@ -88,6 +88,6 @@ public: -OLIVE_NAMESPACE_EXIT +} #endif // FILEFUNCTIONS_H diff --git a/app/common/flipmodifiers.cpp b/app/common/flipmodifiers.cpp index e43146606..e126bae16 100644 --- a/app/common/flipmodifiers.cpp +++ b/app/common/flipmodifiers.cpp @@ -20,7 +20,7 @@ #include "flipmodifiers.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Qt::KeyboardModifiers FlipControlAndShiftModifiers(Qt::KeyboardModifiers e) { if (e & Qt::ControlModifier & Qt::ShiftModifier) { @@ -38,4 +38,4 @@ Qt::KeyboardModifiers FlipControlAndShiftModifiers(Qt::KeyboardModifiers e) { return e; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/common/flipmodifiers.h b/app/common/flipmodifiers.h index c8d508b65..010b13058 100644 --- a/app/common/flipmodifiers.h +++ b/app/common/flipmodifiers.h @@ -25,10 +25,10 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Qt::KeyboardModifiers FlipControlAndShiftModifiers(Qt::KeyboardModifiers e); -OLIVE_NAMESPACE_EXIT +} #endif // FLIPMODIFIERS_H diff --git a/app/common/memorypool.cpp b/app/common/memorypool.cpp index f88ba8d46..31e987e73 100644 --- a/app/common/memorypool.cpp +++ b/app/common/memorypool.cpp @@ -1,6 +1,6 @@ #include "memorypool.h" -OLIVE_NAMESPACE_ENTER +namespace olive { size_t memory_pool_consumption = 0; QMutex memory_pool_consumption_lock; @@ -11,4 +11,4 @@ bool MemoryPoolLimitReached() return (memory_pool_consumption >= 2147483648); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/common/memorypool.h b/app/common/memorypool.h index b5d75bbbd..cc54db121 100644 --- a/app/common/memorypool.h +++ b/app/common/memorypool.h @@ -30,7 +30,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { extern size_t memory_pool_consumption; extern QMutex memory_pool_consumption_lock; @@ -397,6 +397,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // MEMORYPOOL_H diff --git a/app/common/ocioutils.cpp b/app/common/ocioutils.cpp index 6750a6f09..4b7a8a306 100644 --- a/app/common/ocioutils.cpp +++ b/app/common/ocioutils.cpp @@ -20,7 +20,7 @@ #include "ocioutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { OCIO::BitDepth OCIOUtils::GetOCIOBitDepthFromPixelFormat(VideoParams::Format format) { @@ -44,4 +44,4 @@ OCIO::BitDepth OCIOUtils::GetOCIOBitDepthFromPixelFormat(VideoParams::Format for return OCIO::BIT_DEPTH_UNKNOWN; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/common/ocioutils.h b/app/common/ocioutils.h index 788c4ea7c..d7fb0c977 100644 --- a/app/common/ocioutils.h +++ b/app/common/ocioutils.h @@ -26,7 +26,7 @@ namespace OCIO = OpenColorIO_v2_0dev; #include "render/videoparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class OCIOUtils { @@ -34,6 +34,6 @@ public: static OCIO::BitDepth GetOCIOBitDepthFromPixelFormat(VideoParams::Format format); }; -OLIVE_NAMESPACE_EXIT +} #endif // OCIOUTILS_H diff --git a/app/common/oiioutils.cpp b/app/common/oiioutils.cpp index 38452fd27..f98b435b4 100644 --- a/app/common/oiioutils.cpp +++ b/app/common/oiioutils.cpp @@ -20,7 +20,7 @@ #include "oiioutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { void OIIOUtils::FrameToBuffer(const Frame* frame, OIIO::ImageBuf *buf) { @@ -117,4 +117,4 @@ VideoParams::Format OIIOUtils::GetFormatFromOIIOBasetype(OIIO::TypeDesc::BASETYP return VideoParams::kFormatInvalid; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/common/oiioutils.h b/app/common/oiioutils.h index 8c52a54a7..68677df8f 100644 --- a/app/common/oiioutils.h +++ b/app/common/oiioutils.h @@ -27,7 +27,7 @@ #include "codec/frame.h" #include "render/videoparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class OIIOUtils { public: @@ -60,6 +60,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // OIIOUTILS_H diff --git a/app/common/power.h b/app/common/power.h index 2ecf12578..6ecebaf62 100644 --- a/app/common/power.h +++ b/app/common/power.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { uint32_t ceil_to_power_of_2(uint32_t v) { @@ -51,6 +51,6 @@ uint32_t floor_to_power_of_2(uint32_t x) return x - (x >> 1); } -OLIVE_NAMESPACE_EXIT +} #endif // POWER_H diff --git a/app/common/qtutils.cpp b/app/common/qtutils.cpp index a6a15b60c..225a7b7e3 100644 --- a/app/common/qtutils.cpp +++ b/app/common/qtutils.cpp @@ -20,7 +20,7 @@ #include "qtutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { int QtUtils::QFontMetricsWidth(QFontMetrics fm, const QString& s) { #if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) @@ -38,4 +38,4 @@ QFrame *QtUtils::CreateHorizontalLine() return horizontal_line; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/common/qtutils.h b/app/common/qtutils.h index 12b70a17a..d01ba1f03 100644 --- a/app/common/qtutils.h +++ b/app/common/qtutils.h @@ -32,7 +32,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class QtUtils { public: @@ -49,6 +49,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // QTVERSIONABSTRACTION_H diff --git a/app/common/ratiodialog.cpp b/app/common/ratiodialog.cpp index d1bb98449..20e64bc43 100644 --- a/app/common/ratiodialog.cpp +++ b/app/common/ratiodialog.cpp @@ -23,7 +23,7 @@ #include #include -OLIVE_NAMESPACE_ENTER +namespace olive { double GetFloatRatioFromUser(QWidget* parent, const QString& title, @@ -88,4 +88,4 @@ double GetFloatRatioFromUser(QWidget* parent, } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/common/ratiodialog.h b/app/common/ratiodialog.h index 10c44f899..8d09b583b 100644 --- a/app/common/ratiodialog.h +++ b/app/common/ratiodialog.h @@ -25,12 +25,12 @@ #include "common/rational.h" -OLIVE_NAMESPACE_ENTER +namespace olive { double GetFloatRatioFromUser(QWidget* parent, const QString& title, bool* ok_in); -OLIVE_NAMESPACE_EXIT +} #endif // RATIODIALOG_H diff --git a/app/common/rational.cpp b/app/common/rational.cpp index 2160e3f0e..fa4bfd133 100644 --- a/app/common/rational.cpp +++ b/app/common/rational.cpp @@ -3,7 +3,7 @@ #include "rational.h" -OLIVE_NAMESPACE_ENTER +namespace olive { rational rational::fromDouble(const double &flt) { @@ -391,9 +391,9 @@ uint qHash(const rational &r, uint seed) return ::qHash(r.toDouble(), seed); } -OLIVE_NAMESPACE_EXIT +} -QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::rational &r) +QDebug operator<<(QDebug debug, const olive::rational &r) { return debug.space() << r.toDouble(); /* diff --git a/app/common/rational.h b/app/common/rational.h index 358ea9697..9b8f05e1e 100644 --- a/app/common/rational.h +++ b/app/common/rational.h @@ -20,7 +20,7 @@ extern "C" { #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { typedef int64_t intType; /* @@ -140,10 +140,10 @@ private: uint qHash(const rational& r, uint seed); -OLIVE_NAMESPACE_EXIT +} -QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::rational& r); +QDebug operator<<(QDebug debug, const olive::rational& r); -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::rational) +Q_DECLARE_METATYPE(olive::rational) #endif // RATIONAL_H diff --git a/app/common/threadedobject.cpp b/app/common/threadedobject.cpp index 833face4c..38efd7d8a 100644 --- a/app/common/threadedobject.cpp +++ b/app/common/threadedobject.cpp @@ -20,7 +20,7 @@ #include "threadedobject.h" -OLIVE_NAMESPACE_ENTER +namespace olive { void ThreadedObject::LockDeletes() { @@ -54,4 +54,4 @@ bool ThreadedObject::TryLockMutex(int timeout) return threadobj_main_lock_.tryLock(timeout); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/common/threadedobject.h b/app/common/threadedobject.h index 9d0013386..7340433b9 100644 --- a/app/common/threadedobject.h +++ b/app/common/threadedobject.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ThreadedObject { @@ -45,6 +45,6 @@ private: QAtomicInt threadobj_delete_lock_; }; -OLIVE_NAMESPACE_EXIT +} #endif // THREADEDOBJECT_H diff --git a/app/common/timecodefunctions.cpp b/app/common/timecodefunctions.cpp index e18454acd..613fe8aa9 100644 --- a/app/common/timecodefunctions.cpp +++ b/app/common/timecodefunctions.cpp @@ -24,7 +24,7 @@ #include "config/config.h" -OLIVE_NAMESPACE_ENTER +namespace olive { QString padded(int64_t arg, int padding) { return QStringLiteral("%1").arg(arg, padding, 10, QChar('0')); @@ -289,4 +289,4 @@ int64_t Timecode::rescale_timestamp_ceil(const int64_t &ts, const rational &sour return qCeil(static_cast(ts) * source.toDouble() / dest.toDouble()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/common/timecodefunctions.h b/app/common/timecodefunctions.h index 6d4b1b2cc..872b9f823 100644 --- a/app/common/timecodefunctions.h +++ b/app/common/timecodefunctions.h @@ -25,7 +25,7 @@ #include "common/rational.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief Functions for converting times/timecodes/timestamps @@ -72,6 +72,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMECODEFUNCTIONS_H diff --git a/app/common/timerange.cpp b/app/common/timerange.cpp index f314006e2..b71d3e6b4 100644 --- a/app/common/timerange.cpp +++ b/app/common/timerange.cpp @@ -23,7 +23,7 @@ #include #include -OLIVE_NAMESPACE_ENTER +namespace olive { TimeRange::TimeRange(const rational &in, const rational &out) : in_(in), @@ -296,9 +296,9 @@ uint qHash(const TimeRange &r, uint seed) return qHash(r.in(), seed) ^ qHash(r.out(), seed); } -OLIVE_NAMESPACE_EXIT +} -QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::TimeRange &r) +QDebug operator<<(QDebug debug, const olive::TimeRange &r) { debug.nospace() << r.in().toDouble() << " - " << r.out().toDouble(); return debug.space(); diff --git a/app/common/timerange.h b/app/common/timerange.h index 869e90b63..a14ceb69d 100644 --- a/app/common/timerange.h +++ b/app/common/timerange.h @@ -23,7 +23,7 @@ #include "rational.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TimeRange { public: @@ -139,11 +139,11 @@ private: uint qHash(const TimeRange& r, uint seed); -OLIVE_NAMESPACE_EXIT +} -QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::TimeRange& r); -QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::TimeRangeList& r); +QDebug operator<<(QDebug debug, const olive::TimeRange& r); +QDebug operator<<(QDebug debug, const olive::TimeRangeList& r); -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::TimeRange) +Q_DECLARE_METATYPE(olive::TimeRange) #endif // TIMERANGE_H diff --git a/app/common/tohex.h b/app/common/tohex.h index 3843ebf84..0e7eff7dd 100644 --- a/app/common/tohex.h +++ b/app/common/tohex.h @@ -5,12 +5,12 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { inline QString ToHex(quint64 t) { return QStringLiteral("%1").arg(t, 0, 16); } -OLIVE_NAMESPACE_EXIT +} #endif // TOHEX_H diff --git a/app/common/xmlutils.cpp b/app/common/xmlutils.cpp index 54eafe7a1..0ff66750a 100644 --- a/app/common/xmlutils.cpp +++ b/app/common/xmlutils.cpp @@ -24,7 +24,7 @@ #include "node/factory.h" #include "widget/nodeview/nodeviewundo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { void XMLConnectNodes(const XMLNodeData &xml_node_data, QUndoCommand *command) { @@ -64,4 +64,4 @@ void XMLLinkBlocks(const XMLNodeData &xml_node_data) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/common/xmlutils.h b/app/common/xmlutils.h index 64f77bd32..40a029732 100644 --- a/app/common/xmlutils.h +++ b/app/common/xmlutils.h @@ -26,7 +26,7 @@ #include "project/item/footage/stream.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class Block; class Node; @@ -71,6 +71,6 @@ bool XMLReadNextStartElement(QXmlStreamReader* reader); void XMLLinkBlocks(const XMLNodeData& xml_node_data); -OLIVE_NAMESPACE_EXIT +} #endif // XMLREADLOOP_H diff --git a/app/config/config.cpp b/app/config/config.cpp index 24a827839..51dc15713 100644 --- a/app/config/config.cpp +++ b/app/config/config.cpp @@ -34,7 +34,7 @@ #include "ui/style/style.h" #include "window/mainwindow/mainwindow.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Config Config::current_config_; @@ -268,4 +268,4 @@ NodeParam::DataType Config::GetConfigEntryType(const QString &key) const return config_map_[key].type; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/config/config.h b/app/config/config.h index 727f4778b..5fedcdbd1 100644 --- a/app/config/config.h +++ b/app/config/config.h @@ -28,7 +28,7 @@ #include "common/timecodefunctions.h" #include "node/param.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class Config { public: @@ -63,6 +63,6 @@ private: static QString GetConfigFilePath(); }; -OLIVE_NAMESPACE_EXIT +} #endif // CONFIG_H diff --git a/app/core.cpp b/app/core.cpp index 6f4222d35..9687b9f53 100644 --- a/app/core.cpp +++ b/app/core.cpp @@ -68,7 +68,7 @@ #include "widget/viewer/viewer.h" #include "window/mainwindow/mainwindow.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Core* Core::instance_ = nullptr; const uint Core::kProjectVersion = 201003; @@ -103,17 +103,17 @@ void Core::DeclareTypesForQt() qRegisterMetaType(); qRegisterMetaType(); qRegisterMetaType(); - qRegisterMetaType(); + qRegisterMetaType(); qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); } void Core::Start() @@ -1375,4 +1375,4 @@ Core::CoreParams::CoreParams() : { } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/core.h b/app/core.h index f068a388d..ed1727541 100644 --- a/app/core.h +++ b/app/core.h @@ -36,7 +36,7 @@ #include "tool/tool.h" #include "undo/undostack.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class MainWindow; @@ -563,7 +563,7 @@ private slots: /** * @brief Adds a project to the "open projects" list */ - void AddOpenProject(OLIVE_NAMESPACE::ProjectPtr p); + void AddOpenProject(olive::ProjectPtr p); void AddOpenProjectFromTask(Task* task); @@ -584,6 +584,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // CORE_H diff --git a/app/dialog/about/about.cpp b/app/dialog/about/about.cpp index fb2f418bb..330a613cb 100644 --- a/app/dialog/about/about.cpp +++ b/app/dialog/about/about.cpp @@ -25,7 +25,7 @@ #include #include -OLIVE_NAMESPACE_ENTER +namespace olive { AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent) @@ -67,4 +67,4 @@ AboutDialog::AboutDialog(QWidget *parent) : connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/about/about.h b/app/dialog/about/about.h index ed334f46a..53557ebec 100644 --- a/app/dialog/about/about.h +++ b/app/dialog/about/about.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief The AboutDialog class @@ -49,6 +49,6 @@ public: explicit AboutDialog(QWidget *parent = nullptr); }; -OLIVE_NAMESPACE_EXIT +} #endif // ABOUTDIALOG_H diff --git a/app/dialog/actionsearch/actionsearch.cpp b/app/dialog/actionsearch/actionsearch.cpp index 57c1cd2dc..ac632f415 100644 --- a/app/dialog/actionsearch/actionsearch.cpp +++ b/app/dialog/actionsearch/actionsearch.cpp @@ -25,7 +25,7 @@ #include #include -OLIVE_NAMESPACE_ENTER +namespace olive { ActionSearch::ActionSearch(QWidget *parent) : QDialog(parent), @@ -254,4 +254,4 @@ void ActionSearchList::mouseDoubleClickEvent(QMouseEvent *) { } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/actionsearch/actionsearch.h b/app/dialog/actionsearch/actionsearch.h index 386a0cd07..ecb446955 100644 --- a/app/dialog/actionsearch/actionsearch.h +++ b/app/dialog/actionsearch/actionsearch.h @@ -29,7 +29,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ActionSearchList; @@ -182,6 +182,6 @@ signals: void moveSelectionDown(); }; -OLIVE_NAMESPACE_EXIT +} #endif // ACTIONSEARCH_H diff --git a/app/dialog/color/colordialog.cpp b/app/dialog/color/colordialog.cpp index f67438f0e..e838ce982 100644 --- a/app/dialog/color/colordialog.cpp +++ b/app/dialog/color/colordialog.cpp @@ -26,7 +26,7 @@ #include "common/qtutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ColorDialog::ColorDialog(ColorManager* color_manager, const ManagedColor& start, QWidget *parent) : QDialog(parent), @@ -160,4 +160,4 @@ void ColorDialog::ColorSpaceChanged(const QString &input, const ColorTransform & color_values_widget_->SetColorProcessor(input_to_ref_processor_, ref_to_display, nullptr, ref_to_input); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/color/colordialog.h b/app/dialog/color/colordialog.h index d4c8e0274..ccba97c18 100644 --- a/app/dialog/color/colordialog.h +++ b/app/dialog/color/colordialog.h @@ -31,7 +31,7 @@ #include "widget/colorwheel/colorvalueswidget.h" #include "widget/colorwheel/colorwheelwidget.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ColorDialog : public QDialog { @@ -87,6 +87,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // COLORDIALOG_H diff --git a/app/dialog/crashhandler/crashhandler.cpp b/app/dialog/crashhandler/crashhandler.cpp index ca15f805c..61f8c276b 100644 --- a/app/dialog/crashhandler/crashhandler.cpp +++ b/app/dialog/crashhandler/crashhandler.cpp @@ -36,7 +36,7 @@ #include "common/crashpadutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { CrashHandlerDialog::CrashHandlerDialog(const char *report_dir, const char* crash_time) { @@ -208,4 +208,4 @@ void CrashHandlerDialog::SendErrorReport() manager->post(request, multipart); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/crashhandler/crashhandler.h b/app/dialog/crashhandler/crashhandler.h index d180eb273..f93be9dfa 100644 --- a/app/dialog/crashhandler/crashhandler.h +++ b/app/dialog/crashhandler/crashhandler.h @@ -30,7 +30,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class CrashHandlerDialog : public QDialog { @@ -72,6 +72,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // CRASHHANDLERDIALOG_H diff --git a/app/dialog/crashhandler/crashhandlermain.cpp b/app/dialog/crashhandler/crashhandlermain.cpp index 7530607c3..7142fc244 100644 --- a/app/dialog/crashhandler/crashhandlermain.cpp +++ b/app/dialog/crashhandler/crashhandlermain.cpp @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); - OLIVE_NAMESPACE::CrashHandlerDialog chd(argv[1], argv[2]); + olive::CrashHandlerDialog chd(argv[1], argv[2]); chd.open(); return a.exec(); diff --git a/app/dialog/diskcache/diskcachedialog.cpp b/app/dialog/diskcache/diskcachedialog.cpp index 58361c40a..3e8831f49 100644 --- a/app/dialog/diskcache/diskcachedialog.cpp +++ b/app/dialog/diskcache/diskcachedialog.cpp @@ -27,7 +27,7 @@ #include "config/config.h" -OLIVE_NAMESPACE_ENTER +namespace olive { DiskCacheDialog::DiskCacheDialog(DiskCacheFolder *folder, QWidget* parent) : QDialog(parent), @@ -104,4 +104,4 @@ void DiskCacheDialog::ClearDiskCache() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/diskcache/diskcachedialog.h b/app/dialog/diskcache/diskcachedialog.h index 1f0f3cb76..b1ea61395 100644 --- a/app/dialog/diskcache/diskcachedialog.h +++ b/app/dialog/diskcache/diskcachedialog.h @@ -28,7 +28,7 @@ #include "render/diskmanager.h" #include "widget/slider/floatslider.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class DiskCacheDialog : public QDialog { @@ -53,6 +53,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // DISKCACHEDIALOG_H diff --git a/app/dialog/export/codec/codecsection.cpp b/app/dialog/export/codec/codecsection.cpp index 181bc2970..9847bb697 100644 --- a/app/dialog/export/codec/codecsection.cpp +++ b/app/dialog/export/codec/codecsection.cpp @@ -20,11 +20,11 @@ #include "codecsection.h" -OLIVE_NAMESPACE_ENTER +namespace olive { CodecSection::CodecSection(QWidget *parent) : QWidget(parent) { } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/export/codec/codecsection.h b/app/dialog/export/codec/codecsection.h index 22281dd5b..82f70b69e 100644 --- a/app/dialog/export/codec/codecsection.h +++ b/app/dialog/export/codec/codecsection.h @@ -25,7 +25,7 @@ #include "codec/encoder.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class CodecSection : public QWidget { @@ -37,6 +37,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // CODECSECTION_H diff --git a/app/dialog/export/codec/h264section.cpp b/app/dialog/export/codec/h264section.cpp index bcbc3734d..ac4dcda78 100644 --- a/app/dialog/export/codec/h264section.cpp +++ b/app/dialog/export/codec/h264section.cpp @@ -28,7 +28,7 @@ #include "common/qtutils.h" #include "widget/slider/integerslider.h" -OLIVE_NAMESPACE_ENTER +namespace olive { H264Section::H264Section(QWidget *parent) : CodecSection(parent) @@ -208,4 +208,4 @@ int64_t H264FileSizeSection::GetFileSize() const return qRound64(file_size_->GetValue() * 1024.0 * 1024.0 * 8.0); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/export/codec/h264section.h b/app/dialog/export/codec/h264section.h index 85477a5bf..f00e9cb17 100644 --- a/app/dialog/export/codec/h264section.h +++ b/app/dialog/export/codec/h264section.h @@ -27,7 +27,7 @@ #include "codecsection.h" #include "widget/slider/floatslider.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class H264CRFSection : public QWidget { @@ -112,6 +112,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // H264SECTION_H diff --git a/app/dialog/export/codec/imagesection.cpp b/app/dialog/export/codec/imagesection.cpp index 319f7460e..611a99504 100644 --- a/app/dialog/export/codec/imagesection.cpp +++ b/app/dialog/export/codec/imagesection.cpp @@ -23,7 +23,7 @@ #include #include -OLIVE_NAMESPACE_ENTER +namespace olive { ImageSection::ImageSection(QWidget* parent) : CodecSection(parent) @@ -44,4 +44,4 @@ QCheckBox *ImageSection::image_sequence_checkbox() const return image_sequence_checkbox_; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/export/codec/imagesection.h b/app/dialog/export/codec/imagesection.h index e9880b626..d21f782a2 100644 --- a/app/dialog/export/codec/imagesection.h +++ b/app/dialog/export/codec/imagesection.h @@ -25,7 +25,7 @@ #include "codecsection.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ImageSection : public CodecSection { @@ -40,6 +40,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // IMAGESECTION_H diff --git a/app/dialog/export/export.cpp b/app/dialog/export/export.cpp index 90bc52435..799594715 100644 --- a/app/dialog/export/export.cpp +++ b/app/dialog/export/export.cpp @@ -37,7 +37,7 @@ #include "project/project.h" #include "ui/icons/icons.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ExportDialog::ExportDialog(ViewerOutput *viewer_node, TimelinePoints *points, QWidget *parent) : QDialog(parent), @@ -507,4 +507,4 @@ void ExportDialog::UpdateViewerDimensions() preview_viewer_->SetMatrix(transform); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/export/export.h b/app/dialog/export/export.h index b422f3806..37144b6b3 100644 --- a/app/dialog/export/export.h +++ b/app/dialog/export/export.h @@ -34,7 +34,7 @@ #include "task/export/export.h" #include "widget/viewer/viewer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ExportDialog : public QDialog { @@ -95,6 +95,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // EXPORTDIALOG_H diff --git a/app/dialog/export/exportadvancedvideodialog.cpp b/app/dialog/export/exportadvancedvideodialog.cpp index f4fc6b6e6..9e38969fb 100644 --- a/app/dialog/export/exportadvancedvideodialog.cpp +++ b/app/dialog/export/exportadvancedvideodialog.cpp @@ -5,7 +5,7 @@ #include #include -OLIVE_NAMESPACE_ENTER +namespace olive { ExportAdvancedVideoDialog::ExportAdvancedVideoDialog(const QList &pix_fmts, QWidget *parent) : QDialog(parent) @@ -59,4 +59,4 @@ ExportAdvancedVideoDialog::ExportAdvancedVideoDialog(const QList &pix_f layout->addWidget(buttons); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/export/exportadvancedvideodialog.h b/app/dialog/export/exportadvancedvideodialog.h index bdadbbebe..275ae44f9 100644 --- a/app/dialog/export/exportadvancedvideodialog.h +++ b/app/dialog/export/exportadvancedvideodialog.h @@ -6,7 +6,7 @@ #include "widget/slider/integerslider.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ExportAdvancedVideoDialog : public QDialog { @@ -42,6 +42,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // EXPORTADVANCEDVIDEODIALOG_H diff --git a/app/dialog/export/exportaudiotab.cpp b/app/dialog/export/exportaudiotab.cpp index fb08d87d8..781183c19 100644 --- a/app/dialog/export/exportaudiotab.cpp +++ b/app/dialog/export/exportaudiotab.cpp @@ -25,7 +25,7 @@ #include "core.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ExportAudioTab::ExportAudioTab(QWidget* parent) : QWidget(parent) @@ -64,4 +64,4 @@ ExportAudioTab::ExportAudioTab(QWidget* parent) : outer_layout->addStretch(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/export/exportaudiotab.h b/app/dialog/export/exportaudiotab.h index d3b7b13db..5ef06d2a2 100644 --- a/app/dialog/export/exportaudiotab.h +++ b/app/dialog/export/exportaudiotab.h @@ -27,7 +27,7 @@ #include "common/define.h" #include "widget/standardcombos/standardcombos.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ExportAudioTab : public QWidget { @@ -57,6 +57,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // EXPORTAUDIOTAB_H diff --git a/app/dialog/export/exportvideotab.cpp b/app/dialog/export/exportvideotab.cpp index 82be998ee..d37f61389 100644 --- a/app/dialog/export/exportvideotab.cpp +++ b/app/dialog/export/exportvideotab.cpp @@ -31,7 +31,7 @@ #include "render/colormanager.h" #include "task/export/exportparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ExportVideoTab::ExportVideoTab(ColorManager* color_manager, QWidget *parent) : QWidget(parent), @@ -206,4 +206,4 @@ void ExportVideoTab::VideoCodecChanged() qDebug() << "Set default pix fmt" << pix_fmt_; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/export/exportvideotab.h b/app/dialog/export/exportvideotab.h index 1e2bfaa57..feed9eb78 100644 --- a/app/dialog/export/exportvideotab.h +++ b/app/dialog/export/exportvideotab.h @@ -33,7 +33,7 @@ #include "widget/slider/integerslider.h" #include "widget/standardcombos/standardcombos.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ExportVideoTab : public QWidget { @@ -167,6 +167,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // EXPORTVIDEOTAB_H diff --git a/app/dialog/footageproperties/footageproperties.cpp b/app/dialog/footageproperties/footageproperties.cpp index 88a43b3af..e08da2564 100644 --- a/app/dialog/footageproperties/footageproperties.cpp +++ b/app/dialog/footageproperties/footageproperties.cpp @@ -36,7 +36,7 @@ #include "streamproperties/audiostreamproperties.h" #include "streamproperties/videostreamproperties.h" -OLIVE_NAMESPACE_ENTER +namespace olive { FootagePropertiesDialog::FootagePropertiesDialog(QWidget *parent, Footage *footage) : QDialog(parent), @@ -198,4 +198,4 @@ void FootagePropertiesDialog::StreamEnableChangeCommand::undo_internal() stream_->set_enabled(old_enabled_); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/footageproperties/footageproperties.h b/app/dialog/footageproperties/footageproperties.h index 513df2f03..614fb8800 100644 --- a/app/dialog/footageproperties/footageproperties.h +++ b/app/dialog/footageproperties/footageproperties.h @@ -32,7 +32,7 @@ #include "project/item/footage/footage.h" #include "undo/undocommand.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief The MediaPropertiesDialog class @@ -132,6 +132,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // MEDIAPROPERTIESDIALOG_H diff --git a/app/dialog/footageproperties/streamproperties/audiostreamproperties.cpp b/app/dialog/footageproperties/streamproperties/audiostreamproperties.cpp index 5dc7a32d8..9f52c0e3e 100644 --- a/app/dialog/footageproperties/streamproperties/audiostreamproperties.cpp +++ b/app/dialog/footageproperties/streamproperties/audiostreamproperties.cpp @@ -20,7 +20,7 @@ #include "audiostreamproperties.h" -OLIVE_NAMESPACE_ENTER +namespace olive { AudioStreamProperties::AudioStreamProperties(AudioStreamPtr stream) : stream_(stream) @@ -31,4 +31,4 @@ void AudioStreamProperties::Accept(QUndoCommand*) { } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/footageproperties/streamproperties/audiostreamproperties.h b/app/dialog/footageproperties/streamproperties/audiostreamproperties.h index 1d8373dc5..f3a77c4b9 100644 --- a/app/dialog/footageproperties/streamproperties/audiostreamproperties.h +++ b/app/dialog/footageproperties/streamproperties/audiostreamproperties.h @@ -24,7 +24,7 @@ #include "project/item/footage/audiostream.h" #include "streamproperties.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class AudioStreamProperties : public StreamProperties { @@ -37,6 +37,6 @@ private: AudioStreamPtr stream_; }; -OLIVE_NAMESPACE_EXIT +} #endif // AUDIOSTREAMPROPERTIES_H diff --git a/app/dialog/footageproperties/streamproperties/streamproperties.cpp b/app/dialog/footageproperties/streamproperties/streamproperties.cpp index 102ac7d70..96f3bbd5a 100644 --- a/app/dialog/footageproperties/streamproperties/streamproperties.cpp +++ b/app/dialog/footageproperties/streamproperties/streamproperties.cpp @@ -20,11 +20,11 @@ #include "streamproperties.h" -OLIVE_NAMESPACE_ENTER +namespace olive { StreamProperties::StreamProperties(QWidget *parent) : QWidget(parent) { } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/footageproperties/streamproperties/streamproperties.h b/app/dialog/footageproperties/streamproperties/streamproperties.h index 8af0934b1..677be9b0a 100644 --- a/app/dialog/footageproperties/streamproperties/streamproperties.h +++ b/app/dialog/footageproperties/streamproperties/streamproperties.h @@ -26,7 +26,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class StreamProperties : public QWidget { @@ -39,6 +39,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // STREAMPROPERTIES_H diff --git a/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp b/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp index 81ed24770..c97b011c0 100644 --- a/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp +++ b/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp @@ -32,7 +32,7 @@ #include "project/project.h" #include "undo/undostack.h" -OLIVE_NAMESPACE_ENTER +namespace olive { VideoStreamProperties::VideoStreamProperties(VideoStreamPtr stream) : stream_(stream), @@ -253,4 +253,4 @@ void VideoStreamProperties::ImageSequenceChangeCommand::undo_internal() video_stream_->set_timebase(old_frame_rate_.flipped()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/footageproperties/streamproperties/videostreamproperties.h b/app/dialog/footageproperties/streamproperties/videostreamproperties.h index 332a00791..96416f596 100644 --- a/app/dialog/footageproperties/streamproperties/videostreamproperties.h +++ b/app/dialog/footageproperties/streamproperties/videostreamproperties.h @@ -30,7 +30,7 @@ #include "widget/slider/integerslider.h" #include "widget/standardcombos/standardcombos.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class VideoStreamProperties : public StreamProperties { @@ -143,6 +143,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // VIDEOSTREAMPROPERTIES_H diff --git a/app/dialog/footagerelink/footagerelinkdialog.cpp b/app/dialog/footagerelink/footagerelinkdialog.cpp index eae68b38e..cfdde7fc5 100644 --- a/app/dialog/footagerelink/footagerelinkdialog.cpp +++ b/app/dialog/footagerelink/footagerelinkdialog.cpp @@ -27,7 +27,7 @@ #include #include -OLIVE_NAMESPACE_ENTER +namespace olive { FootageRelinkDialog::FootageRelinkDialog(const QList& footage, QWidget* parent) : QDialog(parent), @@ -100,4 +100,4 @@ void FootageRelinkDialog::BrowseForFootage() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/footagerelink/footagerelinkdialog.h b/app/dialog/footagerelink/footagerelinkdialog.h index 1c9984f9c..b201b6762 100644 --- a/app/dialog/footagerelink/footagerelinkdialog.h +++ b/app/dialog/footagerelink/footagerelinkdialog.h @@ -26,7 +26,7 @@ #include "project/item/footage/footage.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class FootageRelinkDialog : public QDialog { @@ -44,6 +44,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // FOOTAGERELINKDIALOG_H diff --git a/app/dialog/keyframeproperties/keyframeproperties.cpp b/app/dialog/keyframeproperties/keyframeproperties.cpp index dfbfcb49e..469734cfd 100644 --- a/app/dialog/keyframeproperties/keyframeproperties.cpp +++ b/app/dialog/keyframeproperties/keyframeproperties.cpp @@ -28,7 +28,7 @@ #include "widget/keyframeview/keyframeviewundo.h" #include "widget/nodeparamview/nodeparamviewundo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { KeyframePropertiesDialog::KeyframePropertiesDialog(const QList &keys, const rational &timebase, QWidget *parent) : QDialog(parent), @@ -240,4 +240,4 @@ void KeyframePropertiesDialog::KeyTypeChanged(int index) bezier_group_->setEnabled(type_select_->itemData(index) == NodeKeyframe::kBezier); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/keyframeproperties/keyframeproperties.h b/app/dialog/keyframeproperties/keyframeproperties.h index 3fada931a..3ad6145af 100644 --- a/app/dialog/keyframeproperties/keyframeproperties.h +++ b/app/dialog/keyframeproperties/keyframeproperties.h @@ -29,7 +29,7 @@ #include "widget/slider/floatslider.h" #include "widget/slider/timeslider.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class KeyframePropertiesDialog : public QDialog { @@ -66,6 +66,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // KEYFRAMEPROPERTIESDIALOG_H diff --git a/app/dialog/preferences/keysequenceeditor.cpp b/app/dialog/preferences/keysequenceeditor.cpp index 4c915d9d6..34012ef2f 100644 --- a/app/dialog/preferences/keysequenceeditor.cpp +++ b/app/dialog/preferences/keysequenceeditor.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { KeySequenceEditor::KeySequenceEditor(QWidget* parent, QAction* a) : QKeySequenceEdit(parent), action(a) { @@ -49,4 +49,4 @@ QString KeySequenceEditor::export_shortcut() { return nullptr; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/preferences/keysequenceeditor.h b/app/dialog/preferences/keysequenceeditor.h index cb507da50..3231df622 100644 --- a/app/dialog/preferences/keysequenceeditor.h +++ b/app/dialog/preferences/keysequenceeditor.h @@ -25,7 +25,7 @@ #include "common/debug.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief The KeySequenceEditor class @@ -101,6 +101,6 @@ private: QAction* action; }; -OLIVE_NAMESPACE_EXIT +} #endif // KEYSEQUENCEEDITOR_H diff --git a/app/dialog/preferences/preferences.cpp b/app/dialog/preferences/preferences.cpp index 5f38750af..c3c34131f 100644 --- a/app/dialog/preferences/preferences.cpp +++ b/app/dialog/preferences/preferences.cpp @@ -33,7 +33,7 @@ #include "tabs/preferencesaudiotab.h" #include "tabs/preferenceskeyboardtab.h" -OLIVE_NAMESPACE_ENTER +namespace olive { PreferencesDialog::PreferencesDialog(QWidget *parent, QMenuBar* main_menu_bar) : QDialog(parent) @@ -98,4 +98,4 @@ void PreferencesDialog::AddTab(PreferencesTab *tab, const QString &title) tabs_.append(tab); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/preferences/preferences.h b/app/dialog/preferences/preferences.h index 9b4074e69..e337c3eeb 100644 --- a/app/dialog/preferences/preferences.h +++ b/app/dialog/preferences/preferences.h @@ -30,7 +30,7 @@ #include "tabs/preferencestab.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief The PreferencesDialog class @@ -69,6 +69,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // PREFERENCESDIALOG_H diff --git a/app/dialog/preferences/tabs/preferencesappearancetab.cpp b/app/dialog/preferences/tabs/preferencesappearancetab.cpp index bf3a2c468..1ad9a6113 100644 --- a/app/dialog/preferences/tabs/preferencesappearancetab.cpp +++ b/app/dialog/preferences/tabs/preferencesappearancetab.cpp @@ -29,7 +29,7 @@ #include "node/node.h" #include "widget/colorbutton/colorbutton.h" -OLIVE_NAMESPACE_ENTER +namespace olive { PreferencesAppearanceTab::PreferencesAppearanceTab() { @@ -122,4 +122,4 @@ void PreferencesAppearanceTab::ColorButtonClicked() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/preferences/tabs/preferencesappearancetab.h b/app/dialog/preferences/tabs/preferencesappearancetab.h index 98f04d3ef..6e3e82751 100644 --- a/app/dialog/preferences/tabs/preferencesappearancetab.h +++ b/app/dialog/preferences/tabs/preferencesappearancetab.h @@ -28,7 +28,7 @@ #include "preferencestab.h" #include "ui/style/style.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class PreferencesAppearanceTab : public PreferencesTab { @@ -60,6 +60,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // PREFERENCESAPPEARANCETAB_H diff --git a/app/dialog/preferences/tabs/preferencesaudiotab.cpp b/app/dialog/preferences/tabs/preferencesaudiotab.cpp index fb7fc7b0c..66c34a3d9 100644 --- a/app/dialog/preferences/tabs/preferencesaudiotab.cpp +++ b/app/dialog/preferences/tabs/preferencesaudiotab.cpp @@ -26,7 +26,7 @@ #include "audio/audiomanager.h" #include "config/config.h" -OLIVE_NAMESPACE_ENTER +namespace olive { PreferencesAudioTab::PreferencesAudioTab() { @@ -206,4 +206,4 @@ void PreferencesAudioTab::PopulateComboBox(QComboBox *cb, bool still_refreshing, } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/preferences/tabs/preferencesaudiotab.h b/app/dialog/preferences/tabs/preferencesaudiotab.h index b3d0dbd9c..e0cb6fa7b 100644 --- a/app/dialog/preferences/tabs/preferencesaudiotab.h +++ b/app/dialog/preferences/tabs/preferencesaudiotab.h @@ -27,7 +27,7 @@ #include "preferencestab.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class PreferencesAudioTab : public PreferencesTab { @@ -79,6 +79,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // PREFERENCESAUDIOTAB_H diff --git a/app/dialog/preferences/tabs/preferencesbehaviortab.cpp b/app/dialog/preferences/tabs/preferencesbehaviortab.cpp index 5eef42c79..79b6d217c 100644 --- a/app/dialog/preferences/tabs/preferencesbehaviortab.cpp +++ b/app/dialog/preferences/tabs/preferencesbehaviortab.cpp @@ -25,7 +25,7 @@ #include "config/config.h" -OLIVE_NAMESPACE_ENTER +namespace olive { PreferencesBehaviorTab::PreferencesBehaviorTab() { @@ -156,4 +156,4 @@ QTreeWidgetItem *PreferencesBehaviorTab::AddParent(const QString &text, QTreeWid return AddParent(text, QString(), parent); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/preferences/tabs/preferencesbehaviortab.h b/app/dialog/preferences/tabs/preferencesbehaviortab.h index 45016b5fa..997aee0cc 100644 --- a/app/dialog/preferences/tabs/preferencesbehaviortab.h +++ b/app/dialog/preferences/tabs/preferencesbehaviortab.h @@ -25,7 +25,7 @@ #include "preferencestab.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class PreferencesBehaviorTab : public PreferencesTab { @@ -48,6 +48,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // PREFERENCESBEHAVIORTAB_H diff --git a/app/dialog/preferences/tabs/preferencesdisktab.cpp b/app/dialog/preferences/tabs/preferencesdisktab.cpp index 870c842fa..6041d19fe 100644 --- a/app/dialog/preferences/tabs/preferencesdisktab.cpp +++ b/app/dialog/preferences/tabs/preferencesdisktab.cpp @@ -29,7 +29,7 @@ #include "common/filefunctions.h" -OLIVE_NAMESPACE_ENTER +namespace olive { PreferencesDiskTab::PreferencesDiskTab() { @@ -117,4 +117,4 @@ void PreferencesDiskTab::Accept() Config::Current()["DiskCacheAhead"] = QVariant::fromValue(rational::fromDouble(cache_ahead_slider_->GetValue())); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/preferences/tabs/preferencesdisktab.h b/app/dialog/preferences/tabs/preferencesdisktab.h index 8a6fadeb2..6f4e45771 100644 --- a/app/dialog/preferences/tabs/preferencesdisktab.h +++ b/app/dialog/preferences/tabs/preferencesdisktab.h @@ -30,7 +30,7 @@ #include "widget/slider/floatslider.h" #include "widget/path/pathwidget.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class PreferencesDiskTab : public PreferencesTab { @@ -53,6 +53,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // PREFERENCESDISKTAB_H diff --git a/app/dialog/preferences/tabs/preferencesgeneraltab.cpp b/app/dialog/preferences/tabs/preferencesgeneraltab.cpp index 4ec57eeb3..e4ac956ab 100644 --- a/app/dialog/preferences/tabs/preferencesgeneraltab.cpp +++ b/app/dialog/preferences/tabs/preferencesgeneraltab.cpp @@ -29,7 +29,7 @@ #include "dialog/sequence/sequence.h" #include "project/item/sequence/sequence.h" -OLIVE_NAMESPACE_ENTER +namespace olive { PreferencesGeneralTab::PreferencesGeneralTab() { @@ -128,4 +128,4 @@ void PreferencesGeneralTab::AddLanguage(const QString &locale_name) language_combobox_->setItemData(language_combobox_->count() - 1, locale_name); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/preferences/tabs/preferencesgeneraltab.h b/app/dialog/preferences/tabs/preferencesgeneraltab.h index 8fedf64dc..e48123fc6 100644 --- a/app/dialog/preferences/tabs/preferencesgeneraltab.h +++ b/app/dialog/preferences/tabs/preferencesgeneraltab.h @@ -29,7 +29,7 @@ #include "project/item/sequence/sequence.h" #include "widget/slider/floatslider.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class PreferencesGeneralTab : public PreferencesTab { @@ -52,6 +52,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // PREFERENCESGENERALTAB_H diff --git a/app/dialog/preferences/tabs/preferenceskeyboardtab.cpp b/app/dialog/preferences/tabs/preferenceskeyboardtab.cpp index ef7e614c1..22ab4f652 100644 --- a/app/dialog/preferences/tabs/preferenceskeyboardtab.cpp +++ b/app/dialog/preferences/tabs/preferenceskeyboardtab.cpp @@ -27,7 +27,7 @@ #include #include -OLIVE_NAMESPACE_ENTER +namespace olive { PreferencesKeyboardTab::PreferencesKeyboardTab(QMenuBar *menubar) { @@ -239,4 +239,4 @@ void PreferencesKeyboardTab::save_shortcut_file() { } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/preferences/tabs/preferenceskeyboardtab.h b/app/dialog/preferences/tabs/preferenceskeyboardtab.h index c8c86a730..723d95e44 100644 --- a/app/dialog/preferences/tabs/preferenceskeyboardtab.h +++ b/app/dialog/preferences/tabs/preferenceskeyboardtab.h @@ -27,7 +27,7 @@ #include "preferencestab.h" #include "../keysequenceeditor.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class PreferencesKeyboardTab : public PreferencesTab { @@ -134,6 +134,6 @@ private: QVector key_shortcut_fields_; }; -OLIVE_NAMESPACE_EXIT +} #endif // PREFERENCESKEYBOARDTAB_H diff --git a/app/dialog/preferences/tabs/preferencestab.cpp b/app/dialog/preferences/tabs/preferencestab.cpp index 6e3c5dd59..4dc6d46d8 100644 --- a/app/dialog/preferences/tabs/preferencestab.cpp +++ b/app/dialog/preferences/tabs/preferencestab.cpp @@ -20,11 +20,11 @@ #include "preferencestab.h" -OLIVE_NAMESPACE_ENTER +namespace olive { bool PreferencesTab::Validate() { return true; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/preferences/tabs/preferencestab.h b/app/dialog/preferences/tabs/preferencestab.h index 7eaebf15c..8bfaec15d 100644 --- a/app/dialog/preferences/tabs/preferencestab.h +++ b/app/dialog/preferences/tabs/preferencestab.h @@ -25,7 +25,7 @@ #include "config/config.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class PreferencesTab : public QWidget { @@ -37,6 +37,6 @@ public: virtual void Accept() = 0; }; -OLIVE_NAMESPACE_EXIT +} #endif // PREFERENCESTAB_H diff --git a/app/dialog/progress/progress.cpp b/app/dialog/progress/progress.cpp index 96ad4e0c8..3024dffca 100644 --- a/app/dialog/progress/progress.cpp +++ b/app/dialog/progress/progress.cpp @@ -27,7 +27,7 @@ #include "window/mainwindow/mainwindow.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ProgressDialog::ProgressDialog(const QString& message, const QString& title, QWidget *parent) : QDialog(parent) @@ -101,4 +101,4 @@ void ProgressDialog::ShowErrorMessage(const QString &title, const QString &messa b.exec(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/progress/progress.h b/app/dialog/progress/progress.h index 8b011b88b..75103a900 100644 --- a/app/dialog/progress/progress.h +++ b/app/dialog/progress/progress.h @@ -27,7 +27,7 @@ #include "common/debug.h" #include "widget/taskview/elapsedcounterwidget.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ProgressDialog : public QDialog { @@ -56,6 +56,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // PROGRESSDIALOG_H diff --git a/app/dialog/projectproperties/projectproperties.cpp b/app/dialog/projectproperties/projectproperties.cpp index be8c74756..7f7414f3f 100644 --- a/app/dialog/projectproperties/projectproperties.cpp +++ b/app/dialog/projectproperties/projectproperties.cpp @@ -35,7 +35,7 @@ #include "render/colormanager.h" #include "render/diskmanager.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ProjectPropertiesDialog::ProjectPropertiesDialog(Project* p, QWidget *parent) : QDialog(parent), @@ -242,4 +242,4 @@ void ProjectPropertiesDialog::OCIOFilenameUpdated() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/projectproperties/projectproperties.h b/app/dialog/projectproperties/projectproperties.h index dbabf953c..e861004b8 100644 --- a/app/dialog/projectproperties/projectproperties.h +++ b/app/dialog/projectproperties/projectproperties.h @@ -31,7 +31,7 @@ #include "project/project.h" #include "widget/path/pathwidget.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ProjectPropertiesDialog : public QDialog { @@ -68,6 +68,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // PROJECTPROPERTIESDIALOG_H diff --git a/app/dialog/rendercancel/rendercancel.cpp b/app/dialog/rendercancel/rendercancel.cpp index 5bff8b315..29aee8137 100644 --- a/app/dialog/rendercancel/rendercancel.cpp +++ b/app/dialog/rendercancel/rendercancel.cpp @@ -20,7 +20,7 @@ #include "rendercancel.h" -OLIVE_NAMESPACE_ENTER +namespace olive { RenderCancelDialog::RenderCancelDialog(QWidget *parent) : ProgressDialog(tr("Waiting for workers to finish..."), tr("Renderer"), parent), @@ -79,4 +79,4 @@ void RenderCancelDialog::UpdateProgress() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/rendercancel/rendercancel.h b/app/dialog/rendercancel/rendercancel.h index aa23934ba..bc6dd72ed 100644 --- a/app/dialog/rendercancel/rendercancel.h +++ b/app/dialog/rendercancel/rendercancel.h @@ -23,7 +23,7 @@ #include "dialog/progress/progress.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class RenderCancelDialog : public ProgressDialog { @@ -54,6 +54,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // RENDERCANCELDIALOG_H diff --git a/app/dialog/richtext/richtext.cpp b/app/dialog/richtext/richtext.cpp index 99b5ddad5..a623ed3e1 100644 --- a/app/dialog/richtext/richtext.cpp +++ b/app/dialog/richtext/richtext.cpp @@ -28,7 +28,7 @@ #include "ui/icons/icons.h" -OLIVE_NAMESPACE_ENTER +namespace olive { RichTextDialog::RichTextDialog(QString start, QWidget* parent) : QDialog(parent) @@ -336,4 +336,4 @@ void RichTextDialog::UpdateButtons() */ } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/richtext/richtext.h b/app/dialog/richtext/richtext.h index bcf67877c..479581cb9 100644 --- a/app/dialog/richtext/richtext.h +++ b/app/dialog/richtext/richtext.h @@ -28,7 +28,7 @@ #include "common/define.h" #include "widget/slider/floatslider.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class RichTextDialog : public QDialog { @@ -82,6 +82,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // RICHTEXTDIALOG_H diff --git a/app/dialog/sequence/presetmanager.h b/app/dialog/sequence/presetmanager.h index 98e47763b..1ac467a9e 100644 --- a/app/dialog/sequence/presetmanager.h +++ b/app/dialog/sequence/presetmanager.h @@ -34,7 +34,7 @@ #include "common/filefunctions.h" #include "common/xmlutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class Preset { @@ -234,6 +234,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // PRESETMANAGER_H diff --git a/app/dialog/sequence/sequence.cpp b/app/dialog/sequence/sequence.cpp index 4ce905697..db9e50615 100644 --- a/app/dialog/sequence/sequence.cpp +++ b/app/dialog/sequence/sequence.cpp @@ -33,7 +33,7 @@ #include "common/rational.h" #include "undo/undostack.h" -OLIVE_NAMESPACE_ENTER +namespace olive { SequenceDialog::SequenceDialog(Sequence* s, Type t, QWidget* parent) : QDialog(parent), @@ -171,4 +171,4 @@ void SequenceDialog::SequenceParamCommand::undo_internal() sequence_->set_name(old_name_); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/sequence/sequence.h b/app/dialog/sequence/sequence.h index 29d20a328..947627642 100644 --- a/app/dialog/sequence/sequence.h +++ b/app/dialog/sequence/sequence.h @@ -30,7 +30,7 @@ #include "sequencedialogpresettab.h" #include "undo/undocommand.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A dialog for editing Sequence parameters @@ -133,6 +133,6 @@ private: }; }; -OLIVE_NAMESPACE_EXIT +} #endif // SEQUENCEDIALOG_H diff --git a/app/dialog/sequence/sequencedialogparametertab.cpp b/app/dialog/sequence/sequencedialogparametertab.cpp index 326df8b11..11ea7ea71 100644 --- a/app/dialog/sequence/sequencedialogparametertab.cpp +++ b/app/dialog/sequence/sequencedialogparametertab.cpp @@ -7,7 +7,7 @@ #include "core.h" -OLIVE_NAMESPACE_ENTER +namespace olive { SequenceDialogParameterTab::SequenceDialogParameterTab(Sequence* sequence, QWidget* parent) : QWidget(parent) @@ -143,4 +143,4 @@ void SequenceDialogParameterTab::UpdatePreviewResolutionLabel() QString::number(test_param.effective_height()))); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/sequence/sequencedialogparametertab.h b/app/dialog/sequence/sequencedialogparametertab.h index d2dabdea1..dcc1a4b4e 100644 --- a/app/dialog/sequence/sequencedialogparametertab.h +++ b/app/dialog/sequence/sequencedialogparametertab.h @@ -10,7 +10,7 @@ #include "widget/slider/integerslider.h" #include "widget/standardcombos/standardcombos.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class SequenceDialogParameterTab : public QWidget { @@ -97,6 +97,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // SEQUENCEDIALOGPARAMETERTAB_H diff --git a/app/dialog/sequence/sequencedialogpresettab.cpp b/app/dialog/sequence/sequencedialogpresettab.cpp index c6ff81b6d..a57852b64 100644 --- a/app/dialog/sequence/sequencedialogpresettab.cpp +++ b/app/dialog/sequence/sequencedialogpresettab.cpp @@ -36,7 +36,7 @@ #include "ui/icons/icons.h" #include "widget/menu/menu.h" -OLIVE_NAMESPACE_ENTER +namespace olive { const int kDataIsPreset = Qt::UserRole; const int kDataPresetIsCustomRole = Qt::UserRole + 1; @@ -295,4 +295,4 @@ void SequenceDialogPresetTab::DeleteSelectedPreset() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/sequence/sequencedialogpresettab.h b/app/dialog/sequence/sequencedialogpresettab.h index 1caae8268..c6296673f 100644 --- a/app/dialog/sequence/sequencedialogpresettab.h +++ b/app/dialog/sequence/sequencedialogpresettab.h @@ -28,7 +28,7 @@ #include "presetmanager.h" #include "sequencepreset.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class SequenceDialogPresetTab : public QWidget, public PresetManager { @@ -77,6 +77,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // SEQUENCEDIALOGPRESETTAB_H diff --git a/app/dialog/sequence/sequencepreset.h b/app/dialog/sequence/sequencepreset.h index e686faabe..f6fc052b9 100644 --- a/app/dialog/sequence/sequencepreset.h +++ b/app/dialog/sequence/sequencepreset.h @@ -28,7 +28,7 @@ #include "dialog/sequence/presetmanager.h" #include "render/videoparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class SequencePreset : public Preset { public: @@ -174,6 +174,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // SEQUENCEPARAM_H diff --git a/app/dialog/task/task.cpp b/app/dialog/task/task.cpp index 423c6b708..094d91120 100644 --- a/app/dialog/task/task.cpp +++ b/app/dialog/task/task.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { TaskDialog::TaskDialog(Task* task, const QString& title, QWidget *parent) : ProgressDialog(task->GetTitle(), title, parent), @@ -85,4 +85,4 @@ void TaskDialog::TaskFinished() close(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/dialog/task/task.h b/app/dialog/task/task.h index a8424f93f..7fbfaa239 100644 --- a/app/dialog/task/task.h +++ b/app/dialog/task/task.h @@ -24,7 +24,7 @@ #include "dialog/progress/progress.h" #include "task/task.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TaskDialog : public ProgressDialog { @@ -77,6 +77,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // TASKDIALOG_H diff --git a/app/main.cpp b/app/main.cpp index 5d02a37e3..c7ef668ab 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -48,7 +48,7 @@ extern "C" { int main(int argc, char *argv[]) { // Set up debug handler - qInstallMessageHandler(OLIVE_NAMESPACE::DebugHandler); + qInstallMessageHandler(olive::DebugHandler); // Generate version string QString app_version = APPVERSION; @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) // Parse command line arguments // - OLIVE_NAMESPACE::Core::CoreParams startup_params; + olive::Core::CoreParams startup_params; CommandLineParser parser; @@ -119,7 +119,7 @@ int main(int argc, char *argv[]) } if (export_option->IsSet()) { - startup_params.set_run_mode(OLIVE_NAMESPACE::Core::CoreParams::kHeadlessExport); + startup_params.set_run_mode(olive::Core::CoreParams::kHeadlessExport); } if (ts_option->IsSet()) { @@ -147,7 +147,7 @@ int main(int argc, char *argv[]) // Create application instance std::unique_ptr a; - if (startup_params.run_mode() == OLIVE_NAMESPACE::Core::CoreParams::kRunNormal) { + if (startup_params.run_mode() == olive::Core::CoreParams::kRunNormal) { a.reset(new QApplication(argc, argv)); } else { a.reset(new QCoreApplication(argc, argv)); @@ -169,7 +169,7 @@ int main(int argc, char *argv[]) #endif // USE_CRASHPAD // Start core - OLIVE_NAMESPACE::Core c(startup_params); + olive::Core c(startup_params); c.Start(); diff --git a/app/node/audio/pan/pan.cpp b/app/node/audio/pan/pan.cpp index 08770e0df..9b0b688f7 100644 --- a/app/node/audio/pan/pan.cpp +++ b/app/node/audio/pan/pan.cpp @@ -20,7 +20,7 @@ #include "pan.h" -OLIVE_NAMESPACE_ENTER +namespace olive { PanNode::PanNode() { @@ -114,4 +114,4 @@ void PanNode::Retranslate() panning_input_->set_name(tr("Pan")); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/audio/pan/pan.h b/app/node/audio/pan/pan.h index 4ef15c702..e6298fc84 100644 --- a/app/node/audio/pan/pan.h +++ b/app/node/audio/pan/pan.h @@ -23,7 +23,7 @@ #include "node/node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class PanNode : public Node { @@ -50,6 +50,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // PANNODE_H diff --git a/app/node/audio/volume/volume.cpp b/app/node/audio/volume/volume.cpp index f96370ab6..5f6d829c2 100644 --- a/app/node/audio/volume/volume.cpp +++ b/app/node/audio/volume/volume.cpp @@ -20,7 +20,7 @@ #include "volume.h" -OLIVE_NAMESPACE_ENTER +namespace olive { VolumeNode::VolumeNode() { @@ -81,4 +81,4 @@ void VolumeNode::Retranslate() volume_input_->set_name(tr("Volume")); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/audio/volume/volume.h b/app/node/audio/volume/volume.h index d6b62447e..a45aeb340 100644 --- a/app/node/audio/volume/volume.h +++ b/app/node/audio/volume/volume.h @@ -23,7 +23,7 @@ #include "node/math/math/mathbase.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class VolumeNode : public MathNodeBase { @@ -55,6 +55,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // VOLUMENODE_H diff --git a/app/node/block/block.cpp b/app/node/block/block.cpp index 79b8a7ffe..6cdc8535e 100644 --- a/app/node/block/block.cpp +++ b/app/node/block/block.cpp @@ -25,7 +25,7 @@ #include "node/output/track/track.h" #include "transition/transition.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Block::Block() : previous_(nullptr), @@ -375,4 +375,4 @@ void Block::Hash(QCryptographicHash &, const rational &) const // A block does nothing by default, so we hash nothing } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/block/block.h b/app/node/block/block.h index 14a715166..1f4362340 100644 --- a/app/node/block/block.h +++ b/app/node/block/block.h @@ -24,7 +24,7 @@ #include "node/node.h" #include "timeline/timelinecommon.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A Node that represents a block of time, also displayable on a Timeline @@ -137,6 +137,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // BLOCK_H diff --git a/app/node/block/clip/clip.cpp b/app/node/block/clip/clip.cpp index 0aaf82e76..cc73034e6 100644 --- a/app/node/block/clip/clip.cpp +++ b/app/node/block/clip/clip.cpp @@ -20,7 +20,7 @@ #include "clip.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ClipBlock::ClipBlock() { @@ -120,4 +120,4 @@ void ClipBlock::Hash(QCryptographicHash &hash, const rational &time) const } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/block/clip/clip.h b/app/node/block/clip/clip.h index c8bbcde5a..adedaaac6 100644 --- a/app/node/block/clip/clip.h +++ b/app/node/block/clip/clip.h @@ -23,7 +23,7 @@ #include "node/block/block.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief Node that represents a block of Media @@ -61,6 +61,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINEBLOCK_H diff --git a/app/node/block/gap/gap.cpp b/app/node/block/gap/gap.cpp index 495667ca7..2312cc539 100644 --- a/app/node/block/gap/gap.cpp +++ b/app/node/block/gap/gap.cpp @@ -20,7 +20,7 @@ #include "gap.h" -OLIVE_NAMESPACE_ENTER +namespace olive { GapBlock::GapBlock() { @@ -51,4 +51,4 @@ QString GapBlock::Description() const return tr("A time-based node that represents an empty space."); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/block/gap/gap.h b/app/node/block/gap/gap.h index 245627465..17856c039 100644 --- a/app/node/block/gap/gap.h +++ b/app/node/block/gap/gap.h @@ -23,7 +23,7 @@ #include "node/block/block.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief Node that represents nothing in its respective track for a certain period of time @@ -46,6 +46,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINEBLOCK_H diff --git a/app/node/block/transition/crossdissolve/crossdissolvetransition.cpp b/app/node/block/transition/crossdissolve/crossdissolvetransition.cpp index 1614eac42..9ce1e3607 100644 --- a/app/node/block/transition/crossdissolve/crossdissolvetransition.cpp +++ b/app/node/block/transition/crossdissolve/crossdissolvetransition.cpp @@ -20,7 +20,7 @@ #include "crossdissolvetransition.h" -OLIVE_NAMESPACE_ENTER +namespace olive { CrossDissolveTransition::CrossDissolveTransition() { @@ -86,4 +86,4 @@ void CrossDissolveTransition::SampleJobEvent(SampleBufferPtr from_samples, Sampl } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/block/transition/crossdissolve/crossdissolvetransition.h b/app/node/block/transition/crossdissolve/crossdissolvetransition.h index 3a68ddea8..f21d3fd7e 100644 --- a/app/node/block/transition/crossdissolve/crossdissolvetransition.h +++ b/app/node/block/transition/crossdissolve/crossdissolvetransition.h @@ -23,7 +23,7 @@ #include "node/block/transition/transition.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class CrossDissolveTransition : public TransitionBlock { @@ -47,6 +47,6 @@ protected: }; -OLIVE_NAMESPACE_EXIT +} #endif // CROSSDISSOLVETRANSITION_H diff --git a/app/node/block/transition/diptocolor/diptocolortransition.cpp b/app/node/block/transition/diptocolor/diptocolortransition.cpp index 03751374a..6925ffa25 100644 --- a/app/node/block/transition/diptocolor/diptocolortransition.cpp +++ b/app/node/block/transition/diptocolor/diptocolortransition.cpp @@ -20,7 +20,7 @@ #include "diptocolortransition.h" -OLIVE_NAMESPACE_ENTER +namespace olive { DipToColorTransition::DipToColorTransition() { @@ -65,4 +65,4 @@ void DipToColorTransition::ShaderJobEvent(NodeValueDatabase &value, ShaderJob &j job.InsertValue(color_input_, value); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/block/transition/diptocolor/diptocolortransition.h b/app/node/block/transition/diptocolor/diptocolortransition.h index 3a1dd6cc2..0f54b272b 100644 --- a/app/node/block/transition/diptocolor/diptocolortransition.h +++ b/app/node/block/transition/diptocolor/diptocolortransition.h @@ -23,7 +23,7 @@ #include "node/block/transition/transition.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class DipToColorTransition : public TransitionBlock { @@ -48,6 +48,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // DIPTOCOLORTRANSITION_H diff --git a/app/node/block/transition/transition.cpp b/app/node/block/transition/transition.cpp index 554e7fd15..eacffe377 100644 --- a/app/node/block/transition/transition.cpp +++ b/app/node/block/transition/transition.cpp @@ -22,7 +22,7 @@ #include "common/clamp.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TransitionBlock::TransitionBlock() : connected_out_block_(nullptr), @@ -319,4 +319,4 @@ double TransitionBlock::TransformCurve(double linear) const return linear; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/block/transition/transition.h b/app/node/block/transition/transition.h index 69dc2b2ec..8a6acca7e 100644 --- a/app/node/block/transition/transition.h +++ b/app/node/block/transition/transition.h @@ -23,7 +23,7 @@ #include "node/block/block.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TransitionBlock : public Block { @@ -91,6 +91,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // TRANSITIONBLOCK_H diff --git a/app/node/edge.cpp b/app/node/edge.cpp index 0fd475d9f..ed6f8efbe 100644 --- a/app/node/edge.cpp +++ b/app/node/edge.cpp @@ -24,7 +24,7 @@ #include "node.h" #include "output.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeEdge::NodeEdge(NodeOutput *output, NodeInput *input) { @@ -47,4 +47,4 @@ NodeEdge::Connection NodeEdge::ParamToConnection(NodeParam *param) return {param->parentNode(), param->id()}; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/edge.h b/app/node/edge.h index dca841edd..a3f377741 100644 --- a/app/node/edge.h +++ b/app/node/edge.h @@ -26,7 +26,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class Node; class NodeInput; @@ -82,6 +82,6 @@ private: using NodeEdgePtr = std::shared_ptr; -OLIVE_NAMESPACE_EXIT +} #endif // EDGE_H diff --git a/app/node/factory.cpp b/app/node/factory.cpp index e81bfc405..a7efd6b2e 100644 --- a/app/node/factory.cpp +++ b/app/node/factory.cpp @@ -41,7 +41,7 @@ #include "output/track/track.h" #include "output/viewer/viewer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { QList NodeFactory::library_; void NodeFactory::Initialize() @@ -224,4 +224,4 @@ Node *NodeFactory::CreateFromFactoryIndex(const NodeFactory::InternalID &id) abort(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/factory.h b/app/node/factory.h index 5a0906ba7..eeef59986 100644 --- a/app/node/factory.h +++ b/app/node/factory.h @@ -26,7 +26,7 @@ #include "node.h" #include "widget/menu/menu.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeFactory { @@ -80,6 +80,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEFACTORY_H diff --git a/app/node/filter/blur/blur.cpp b/app/node/filter/blur/blur.cpp index ce833f713..66efd333f 100644 --- a/app/node/filter/blur/blur.cpp +++ b/app/node/filter/blur/blur.cpp @@ -20,7 +20,7 @@ #include "blur.h" -OLIVE_NAMESPACE_ENTER +namespace olive { BlurFilterNode::BlurFilterNode() { @@ -128,4 +128,4 @@ NodeValueTable BlurFilterNode::Value(NodeValueDatabase &value) const return table; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/filter/blur/blur.h b/app/node/filter/blur/blur.h index 7539b440c..7a121a34b 100644 --- a/app/node/filter/blur/blur.h +++ b/app/node/filter/blur/blur.h @@ -23,7 +23,7 @@ #include "node/node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class BlurFilterNode : public Node { @@ -58,6 +58,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // BLURFILTERNODE_H diff --git a/app/node/filter/stroke/stroke.cpp b/app/node/filter/stroke/stroke.cpp index 18358fac3..41448e04d 100644 --- a/app/node/filter/stroke/stroke.cpp +++ b/app/node/filter/stroke/stroke.cpp @@ -22,7 +22,7 @@ #include "render/color.h" -OLIVE_NAMESPACE_ENTER +namespace olive { StrokeFilterNode::StrokeFilterNode() { @@ -113,4 +113,4 @@ ShaderCode StrokeFilterNode::GetShaderCode(const QString &shader_id) const return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/stroke.frag"), QString()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/filter/stroke/stroke.h b/app/node/filter/stroke/stroke.h index 30153ba3f..fb29aea33 100644 --- a/app/node/filter/stroke/stroke.h +++ b/app/node/filter/stroke/stroke.h @@ -23,7 +23,7 @@ #include "node/node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class StrokeFilterNode : public Node { @@ -56,6 +56,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // STROKEFILTERNODE_H diff --git a/app/node/generator/matrix/matrix.cpp b/app/node/generator/matrix/matrix.cpp index 70e77ec1b..466819fe1 100644 --- a/app/node/generator/matrix/matrix.cpp +++ b/app/node/generator/matrix/matrix.cpp @@ -26,7 +26,7 @@ #include "common/range.h" -OLIVE_NAMESPACE_ENTER +namespace olive { MatrixGenerator::MatrixGenerator() { @@ -294,4 +294,4 @@ MatrixGenerator::GizmoSharedData::GizmoSharedData(const QSize &viewport, const Q inverted_half_scale = QVector2D(1.0f / half_scale.x(), 1.0f / half_scale.y()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/generator/matrix/matrix.h b/app/node/generator/matrix/matrix.h index 30e21ff27..e782ff02c 100644 --- a/app/node/generator/matrix/matrix.h +++ b/app/node/generator/matrix/matrix.h @@ -26,7 +26,7 @@ #include "node/node.h" #include "node/inputdragger.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class MatrixGenerator : public Node { @@ -97,6 +97,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // TRANSFORMDISTORT_H diff --git a/app/node/generator/polygon/polygon.cpp b/app/node/generator/polygon/polygon.cpp index dc2c6baf9..aa60ee396 100644 --- a/app/node/generator/polygon/polygon.cpp +++ b/app/node/generator/polygon/polygon.cpp @@ -23,7 +23,7 @@ #include #include -OLIVE_NAMESPACE_ENTER +namespace olive { PolygonGenerator::PolygonGenerator() { @@ -204,4 +204,4 @@ QVector PolygonGenerator::GetGizmoRects(const QVector &points) return rects; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/generator/polygon/polygon.h b/app/node/generator/polygon/polygon.h index 2d38fcb44..645e8c5de 100644 --- a/app/node/generator/polygon/polygon.h +++ b/app/node/generator/polygon/polygon.h @@ -24,7 +24,7 @@ #include "node/node.h" #include "node/inputdragger.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class PolygonGenerator : public Node { @@ -68,6 +68,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // POLYGONGENERATOR_H diff --git a/app/node/generator/solid/solid.cpp b/app/node/generator/solid/solid.cpp index d82c0e903..15e5b1d2c 100644 --- a/app/node/generator/solid/solid.cpp +++ b/app/node/generator/solid/solid.cpp @@ -22,7 +22,7 @@ #include "render/color.h" -OLIVE_NAMESPACE_ENTER +namespace olive { SolidGenerator::SolidGenerator() { @@ -80,4 +80,4 @@ ShaderCode SolidGenerator::GetShaderCode(const QString &shader_id) const return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/solid.frag"), QString()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/generator/solid/solid.h b/app/node/generator/solid/solid.h index 95be72a55..dbf21cf93 100644 --- a/app/node/generator/solid/solid.h +++ b/app/node/generator/solid/solid.h @@ -23,7 +23,7 @@ #include "node/node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class SolidGenerator : public Node { @@ -48,6 +48,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // SOLIDGENERATOR_H diff --git a/app/node/generator/text/text.cpp b/app/node/generator/text/text.cpp index d88e3cd1e..c221f709f 100644 --- a/app/node/generator/text/text.cpp +++ b/app/node/generator/text/text.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { enum TextVerticalAlign { kVerticalAlignTop, @@ -176,4 +176,4 @@ void TextGenerator::GenerateFrame(FramePtr frame, const GenerateJob& job) const } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/generator/text/text.h b/app/node/generator/text/text.h index 34c452251..f672459a5 100644 --- a/app/node/generator/text/text.h +++ b/app/node/generator/text/text.h @@ -23,7 +23,7 @@ #include "node/node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TextGenerator : public Node { @@ -57,6 +57,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TEXTGENERATOR_H diff --git a/app/node/graph.cpp b/app/node/graph.cpp index 676647e12..37b674d64 100644 --- a/app/node/graph.cpp +++ b/app/node/graph.cpp @@ -20,7 +20,7 @@ #include "graph.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeGraph::NodeGraph() : operation_stack_(0) @@ -164,4 +164,4 @@ bool NodeGraph::ContainsNode(Node *n) const return (n->parent() == this); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/graph.h b/app/node/graph.h index 0a3e86c9f..e722403d7 100644 --- a/app/node/graph.h +++ b/app/node/graph.h @@ -25,7 +25,7 @@ #include "node/node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A collection of nodes @@ -110,6 +110,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEGRAPH_H diff --git a/app/node/input.cpp b/app/node/input.cpp index dac383689..c305f8557 100644 --- a/app/node/input.cpp +++ b/app/node/input.cpp @@ -35,7 +35,7 @@ #include "project/item/footage/stream.h" #include "render/color.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeInput::NodeInput(const QString& id, const DataType &type, const QVector &default_value) : NodeParam(id) @@ -1215,4 +1215,4 @@ void NodeInput::set_combobox_strings(const QStringList &strings) set_property(QStringLiteral("combo_str"), strings); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/input.h b/app/node/input.h index ab50925f4..86a10a823 100644 --- a/app/node/input.h +++ b/app/node/input.h @@ -25,7 +25,7 @@ #include "keyframe.h" #include "param.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A node parameter designed to take either user input or data from another node @@ -295,7 +295,7 @@ public: QVector GetImmediateDependencies() const; signals: - void ValueChanged(const OLIVE_NAMESPACE::TimeRange& range); + void ValueChanged(const olive::TimeRange& range); void KeyframeEnableChanged(bool); @@ -431,6 +431,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEINPUT_H diff --git a/app/node/input/media/audio/audio.cpp b/app/node/input/media/audio/audio.cpp index d98118880..fe0faff7d 100644 --- a/app/node/input/media/audio/audio.cpp +++ b/app/node/input/media/audio/audio.cpp @@ -20,7 +20,7 @@ #include "audio.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Node *AudioInput::copy() const { @@ -52,4 +52,4 @@ QString AudioInput::Description() const return tr("Import an audio footage stream."); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/input/media/audio/audio.h b/app/node/input/media/audio/audio.h index 0690c4f42..7a2b8a272 100644 --- a/app/node/input/media/audio/audio.h +++ b/app/node/input/media/audio/audio.h @@ -23,7 +23,7 @@ #include "../media.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class AudioInput : public MediaInput { @@ -42,6 +42,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // AUDIOINPUT_H diff --git a/app/node/input/media/media.cpp b/app/node/input/media/media.cpp index bd57ad7f9..a7ad7f953 100644 --- a/app/node/input/media/media.cpp +++ b/app/node/input/media/media.cpp @@ -23,7 +23,7 @@ #include "common/timecodefunctions.h" #include "common/tohex.h" -OLIVE_NAMESPACE_ENTER +namespace olive { MediaInput::MediaInput() : connected_footage_(nullptr) @@ -98,4 +98,4 @@ void MediaInput::FootageParametersChanged() InvalidateCache(TimeRange(0, RATIONAL_MAX), footage_input_, footage_input_); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/input/media/media.h b/app/node/input/media/media.h index f0fae920d..c7b23ca08 100644 --- a/app/node/input/media/media.h +++ b/app/node/input/media/media.h @@ -25,7 +25,7 @@ #include "node/node.h" #include "project/item/footage/stream.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A node that imports an image @@ -62,6 +62,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // MEDIAINPUT_H diff --git a/app/node/input/media/video/video.cpp b/app/node/input/media/video/video.cpp index 3163d327c..3bcf98352 100644 --- a/app/node/input/media/video/video.cpp +++ b/app/node/input/media/video/video.cpp @@ -28,7 +28,7 @@ #include "core.h" #include "project/item/footage/footage.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Node *VideoInput::copy() const { @@ -60,4 +60,4 @@ QString VideoInput::Description() const return tr("Import a video footage stream."); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/input/media/video/video.h b/app/node/input/media/video/video.h index 785634de8..0606ceece 100644 --- a/app/node/input/media/video/video.h +++ b/app/node/input/media/video/video.h @@ -26,7 +26,7 @@ #include "../media.h" #include "render/colormanager.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class VideoInput : public MediaInput { @@ -45,6 +45,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // VIDEOINPUT_H diff --git a/app/node/input/time/timeinput.cpp b/app/node/input/time/timeinput.cpp index 75fa6888d..101e738e8 100644 --- a/app/node/input/time/timeinput.cpp +++ b/app/node/input/time/timeinput.cpp @@ -20,7 +20,7 @@ #include "timeinput.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TimeInput::TimeInput() { @@ -71,4 +71,4 @@ void TimeInput::Hash(QCryptographicHash &hash, const rational &time) const hash.addData(NodeParam::ValueToBytes(NodeParam::kRational, QVariant::fromValue(time))); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/input/time/timeinput.h b/app/node/input/time/timeinput.h index 1f898a98f..eb2dac8f2 100644 --- a/app/node/input/time/timeinput.h +++ b/app/node/input/time/timeinput.h @@ -23,7 +23,7 @@ #include "node/node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TimeInput : public Node { @@ -44,6 +44,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMEINPUT_H diff --git a/app/node/inputarray.cpp b/app/node/inputarray.cpp index 1203e4a4d..6811e8633 100644 --- a/app/node/inputarray.cpp +++ b/app/node/inputarray.cpp @@ -25,7 +25,7 @@ #include "common/xmlutils.h" #include "node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeInputArray::NodeInputArray(const QString &id, const DataType &type, const QVariant &default_value) : NodeInput(id, type, default_value), @@ -235,4 +235,4 @@ void NodeInputArray::SaveInternal(QXmlStreamWriter *writer) const writer->writeEndElement(); // subparameters } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/inputarray.h b/app/node/inputarray.h index 7acb192d8..4af48cd5c 100644 --- a/app/node/inputarray.h +++ b/app/node/inputarray.h @@ -23,7 +23,7 @@ #include "input.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeInputArray : public NodeInput { @@ -74,6 +74,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // INPUTARRAY_H diff --git a/app/node/inputdragger.cpp b/app/node/inputdragger.cpp index 0edb8b85b..b6708d326 100644 --- a/app/node/inputdragger.cpp +++ b/app/node/inputdragger.cpp @@ -24,7 +24,7 @@ #include "node.h" #include "widget/nodeparamview/nodeparamviewundo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeInputDragger::NodeInputDragger() : input_(nullptr) @@ -115,4 +115,4 @@ void NodeInputDragger::End() input_ = nullptr; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/inputdragger.h b/app/node/inputdragger.h index 17038f003..f9f20d490 100644 --- a/app/node/inputdragger.h +++ b/app/node/inputdragger.h @@ -23,7 +23,7 @@ #include "node/input.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeInputDragger { @@ -55,6 +55,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEINPUTDRAGGER_H diff --git a/app/node/keyframe.cpp b/app/node/keyframe.cpp index 1112f10ec..dd3ae2de3 100644 --- a/app/node/keyframe.cpp +++ b/app/node/keyframe.cpp @@ -20,7 +20,7 @@ #include "keyframe.h" -OLIVE_NAMESPACE_ENTER +namespace olive { const NodeKeyframe::Type NodeKeyframe::kDefaultType = kLinear; @@ -145,4 +145,4 @@ void NodeKeyframe::set_parent(NodeInput *parent) parent_ = parent; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/keyframe.h b/app/node/keyframe.h index f386f7fad..517defe6d 100644 --- a/app/node/keyframe.h +++ b/app/node/keyframe.h @@ -27,7 +27,7 @@ #include "common/rational.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeInput; @@ -164,8 +164,8 @@ private: }; -OLIVE_NAMESPACE_EXIT +} -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::NodeKeyframe::Type) +Q_DECLARE_METATYPE(olive::NodeKeyframe::Type) #endif // NODEKEYFRAME_H diff --git a/app/node/math/math/math.cpp b/app/node/math/math/math.cpp index 72dc8ae73..caa4d8f42 100644 --- a/app/node/math/math/math.cpp +++ b/app/node/math/math/math.cpp @@ -20,7 +20,7 @@ #include "math.h" -OLIVE_NAMESPACE_ENTER +namespace olive { MathNode::MathNode() { @@ -119,4 +119,4 @@ void MathNode::ProcessSamples(NodeValueDatabase &values, const SampleBufferPtr i return ProcessSamplesInternal(values, GetOperation(), param_a_in_, param_b_in_, input, output, index); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/math/math/math.h b/app/node/math/math/math.h index e516a8f21..5d9584d77 100644 --- a/app/node/math/math/math.h +++ b/app/node/math/math/math.h @@ -23,7 +23,7 @@ #include "mathbase.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class MathNode : public MathNodeBase { @@ -75,6 +75,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // MATHNODE_H diff --git a/app/node/math/math/mathbase.cpp b/app/node/math/math/mathbase.cpp index 66bd28788..bc83d5b5b 100644 --- a/app/node/math/math/mathbase.cpp +++ b/app/node/math/math/mathbase.cpp @@ -26,7 +26,7 @@ #include "common/tohex.h" #include "render/color.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ShaderCode MathNodeBase::GetShaderCodeInternal(const QString &shader_id, NodeInput *param_a_in, olive::NodeInput *param_b_in) const { @@ -611,4 +611,4 @@ T MathNodeBase::PerformAddSubMultDiv(Operation operation, T a, U b) return a; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/math/math/mathbase.h b/app/node/math/math/mathbase.h index 2d563c192..e54ac2f58 100644 --- a/app/node/math/math/mathbase.h +++ b/app/node/math/math/mathbase.h @@ -23,7 +23,7 @@ #include "node/node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class MathNodeBase : public Node { @@ -119,6 +119,6 @@ protected: }; -OLIVE_NAMESPACE_EXIT +} #endif // MATHNODEBASE_H diff --git a/app/node/math/merge/merge.cpp b/app/node/math/merge/merge.cpp index d837c3269..b85096458 100644 --- a/app/node/math/merge/merge.cpp +++ b/app/node/math/merge/merge.cpp @@ -20,7 +20,7 @@ #include "merge.h" -OLIVE_NAMESPACE_ENTER +namespace olive { MergeNode::MergeNode() { @@ -117,4 +117,4 @@ void MergeNode::Hash(QCryptographicHash &hash, const rational &time) const } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/math/merge/merge.h b/app/node/math/merge/merge.h index 3a7af401f..6fd205734 100644 --- a/app/node/math/merge/merge.h +++ b/app/node/math/merge/merge.h @@ -23,7 +23,7 @@ #include "node/node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class MergeNode : public Node { @@ -55,6 +55,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // MERGENODE_H diff --git a/app/node/math/trigonometry/trigonometry.cpp b/app/node/math/trigonometry/trigonometry.cpp index 6cdb24e72..89119db60 100644 --- a/app/node/math/trigonometry/trigonometry.cpp +++ b/app/node/math/trigonometry/trigonometry.cpp @@ -20,7 +20,7 @@ #include "trigonometry.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TrigonometryNode::TrigonometryNode() { @@ -118,4 +118,4 @@ NodeValueTable TrigonometryNode::Value(NodeValueDatabase &value) const return table; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/math/trigonometry/trigonometry.h b/app/node/math/trigonometry/trigonometry.h index 148a0bb40..86c74d235 100644 --- a/app/node/math/trigonometry/trigonometry.h +++ b/app/node/math/trigonometry/trigonometry.h @@ -23,7 +23,7 @@ #include "node/node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TrigonometryNode : public Node { @@ -61,6 +61,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TRIGNODE_H diff --git a/app/node/node.cpp b/app/node/node.cpp index 4d9f227c3..98727515e 100644 --- a/app/node/node.cpp +++ b/app/node/node.cpp @@ -31,7 +31,7 @@ #include "project/item/footage/videostream.h" #include "widget/nodeview/nodeviewundo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Node::Node() : can_be_deleted_(true) @@ -933,4 +933,4 @@ void Node::InputConnectionChanged(NodeEdgePtr edge) InvalidateCache(TimeRange(RATIONAL_MIN, RATIONAL_MAX), edge->input(), edge->input()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/node.h b/app/node/node.h index 308af12dd..7a47d02ff 100644 --- a/app/node/node.h +++ b/app/node/node.h @@ -41,7 +41,7 @@ #include "render/job/shaderjob.h" #include "render/shadercode.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A single processing unit that can be connected with others to create intricate processing systems @@ -444,7 +444,7 @@ protected: virtual QVector GetInputsToHash() const; protected slots: - void InputChanged(const OLIVE_NAMESPACE::TimeRange &range); + void InputChanged(const olive::TimeRange &range); void InputConnectionChanged(NodeEdgePtr edge); @@ -586,6 +586,6 @@ QVector Node::FindOutputNode() using NodePtr = std::shared_ptr; -OLIVE_NAMESPACE_EXIT +} #endif // NODE_H diff --git a/app/node/output.cpp b/app/node/output.cpp index 72bfd3340..3f9320c67 100644 --- a/app/node/output.cpp +++ b/app/node/output.cpp @@ -23,7 +23,7 @@ #include "common/xmlutils.h" #include "node/node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeOutput::NodeOutput(const QString &id) : NodeParam(id) @@ -68,4 +68,4 @@ void NodeOutput::Save(QXmlStreamWriter *writer) const writer->writeAttribute("ptr", QString::number(reinterpret_cast(this))); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/output.h b/app/node/output.h index bef01c7fe..26ad2141a 100644 --- a/app/node/output.h +++ b/app/node/output.h @@ -24,7 +24,7 @@ #include "common/timerange.h" #include "param.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A node parameter designed to serve data to the input of another node @@ -53,6 +53,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEOUTPUT_H diff --git a/app/node/output/track/track.cpp b/app/node/output/track/track.cpp index 1304ed63c..723d97003 100644 --- a/app/node/output/track/track.cpp +++ b/app/node/output/track/track.cpp @@ -27,7 +27,7 @@ #include "node/block/gap/gap.h" #include "node/graph.h" -OLIVE_NAMESPACE_ENTER +namespace olive { const double TrackOutput::kTrackHeightDefault = 3.0; const double TrackOutput::kTrackHeightMinimum = 1.5; @@ -602,4 +602,4 @@ void TrackOutput::MutedInputValueChanged() emit MutedChanged(IsMuted()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/output/track/track.h b/app/node/output/track/track.h index 047ca7588..a5dd8b112 100644 --- a/app/node/output/track/track.h +++ b/app/node/output/track/track.h @@ -25,7 +25,7 @@ #include "node/block/block.h" #include "timeline/timelinecommon.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A time traversal Node for sorting through one channel/track of Blocks @@ -304,6 +304,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // TRACKOUTPUT_H diff --git a/app/node/output/track/tracklist.cpp b/app/node/output/track/tracklist.cpp index 36178e449..d4e5ae8fe 100644 --- a/app/node/output/track/tracklist.cpp +++ b/app/node/output/track/tracklist.cpp @@ -25,7 +25,7 @@ #include "node/math/merge/merge.h" #include "node/output/viewer/viewer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TrackList::TrackList(ViewerOutput *parent, const Timeline::TrackType &type, NodeInputArray *track_input) : QObject(parent), @@ -274,4 +274,4 @@ void TrackList::TrackHeightChangedSlot(int height) emit TrackHeightChanged(static_cast(sender())->Index(), height); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/output/track/tracklist.h b/app/node/output/track/tracklist.h index 8af67abed..5dd3dbe84 100644 --- a/app/node/output/track/tracklist.h +++ b/app/node/output/track/tracklist.h @@ -27,7 +27,7 @@ #include "node/output/track/track.h" #include "timeline/timelinecommon.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ViewerOutput; @@ -114,6 +114,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // TRACKLIST_H diff --git a/app/node/output/viewer/viewer.cpp b/app/node/output/viewer/viewer.cpp index 8d26336b9..37b6529ad 100644 --- a/app/node/output/viewer/viewer.cpp +++ b/app/node/output/viewer/viewer.cpp @@ -22,7 +22,7 @@ #include "node/traverser.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ViewerOutput::ViewerOutput() : video_frame_cache_(this), @@ -345,4 +345,4 @@ void ViewerOutput::TrackHeightChangedSlot(int index, int height) emit TrackHeightChanged(static_cast(sender())->type(), index, height); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/output/viewer/viewer.h b/app/node/output/viewer/viewer.h index 886195135..66d111bd0 100644 --- a/app/node/output/viewer/viewer.h +++ b/app/node/output/viewer/viewer.h @@ -34,7 +34,7 @@ #include "timeline/timelinecommon.h" #include "timeline/trackreference.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A bridge between a node system and a ViewerPanel @@ -196,6 +196,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // VIEWER_H diff --git a/app/node/param.cpp b/app/node/param.cpp index b26df62ad..3d1ce2c17 100644 --- a/app/node/param.cpp +++ b/app/node/param.cpp @@ -31,7 +31,7 @@ #include "node/output.h" #include "render/color.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeParam::NodeParam(const QString &id) : id_(id), @@ -286,4 +286,4 @@ QByteArray NodeParam::ValueToBytesInternal(const QVariant &v) return bytes; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/param.h b/app/node/param.h index e0cffb354..0852fa7df 100644 --- a/app/node/param.h +++ b/app/node/param.h @@ -30,7 +30,7 @@ #include "common/xmlutils.h" #include "node/edge.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class Node; @@ -432,6 +432,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEPARAM_H diff --git a/app/node/traverser.cpp b/app/node/traverser.cpp index bd87ade63..92b777fbe 100644 --- a/app/node/traverser.cpp +++ b/app/node/traverser.cpp @@ -22,7 +22,7 @@ #include "node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeValueDatabase NodeTraverser::GenerateDatabase(const Node* node, const TimeRange &range) { @@ -265,4 +265,4 @@ void NodeTraverser::PostProcessTable(const Node *node, const TimeRange &range, N } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/traverser.h b/app/node/traverser.h index b4a722813..87c4019d1 100644 --- a/app/node/traverser.h +++ b/app/node/traverser.h @@ -27,7 +27,7 @@ #include "project/item/footage/stream.h" #include "value.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeTraverser : public CancelableObject { @@ -63,6 +63,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODETRAVERSER_H diff --git a/app/node/value.cpp b/app/node/value.cpp index fc994b125..3c52d3ea0 100644 --- a/app/node/value.cpp +++ b/app/node/value.cpp @@ -20,7 +20,7 @@ #include "value.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeValueTable NodeValueDatabase::Merge() const { @@ -153,4 +153,4 @@ int NodeValueTable::GetInternal(const NodeParam::DataType &type, const QString & return index; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/node/value.h b/app/node/value.h index 6d089ae8c..7ccc9c5e4 100644 --- a/app/node/value.h +++ b/app/node/value.h @@ -26,7 +26,7 @@ #include "input.h" #include "render/shadervalue.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeValue { @@ -184,10 +184,10 @@ private: }; -OLIVE_NAMESPACE_EXIT +} -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::NodeValue) -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::NodeValueTable) -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::NodeValueDatabase) +Q_DECLARE_METATYPE(olive::NodeValue) +Q_DECLARE_METATYPE(olive::NodeValueTable) +Q_DECLARE_METATYPE(olive::NodeValueDatabase) #endif // VALUE_H diff --git a/app/panel/audiomonitor/audiomonitor.cpp b/app/panel/audiomonitor/audiomonitor.cpp index 8a33e8e6b..d937a2a07 100644 --- a/app/panel/audiomonitor/audiomonitor.cpp +++ b/app/panel/audiomonitor/audiomonitor.cpp @@ -20,7 +20,7 @@ #include "audiomonitor.h" -OLIVE_NAMESPACE_ENTER +namespace olive { AudioMonitorPanel::AudioMonitorPanel(QWidget *parent) : PanelWidget(QStringLiteral("AudioMonitor"), parent) @@ -37,4 +37,4 @@ void AudioMonitorPanel::Retranslate() SetTitle(tr("Audio Monitor")); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/panel/audiomonitor/audiomonitor.h b/app/panel/audiomonitor/audiomonitor.h index 567213047..2915edfca 100644 --- a/app/panel/audiomonitor/audiomonitor.h +++ b/app/panel/audiomonitor/audiomonitor.h @@ -24,7 +24,7 @@ #include "widget/audiomonitor/audiomonitor.h" #include "widget/panel/panel.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief PanelWidget wrapper around an AudioMonitor @@ -42,6 +42,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // AUDIOMONITORPANEL_H diff --git a/app/panel/curve/curve.cpp b/app/panel/curve/curve.cpp index b81a99b0b..3357dc861 100644 --- a/app/panel/curve/curve.cpp +++ b/app/panel/curve/curve.cpp @@ -20,7 +20,7 @@ #include "curve.h" -OLIVE_NAMESPACE_ENTER +namespace olive { CurvePanel::CurvePanel(QWidget *parent) : TimeBasedPanel(QStringLiteral("CurvePanel"), parent) @@ -61,4 +61,4 @@ void CurvePanel::Retranslate() SetTitle(tr("Curve Editor")); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/panel/curve/curve.h b/app/panel/curve/curve.h index 4a5b6bb92..301e1e976 100644 --- a/app/panel/curve/curve.h +++ b/app/panel/curve/curve.h @@ -24,7 +24,7 @@ #include "panel/timebased/timebased.h" #include "widget/curvewidget/curvewidget.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class CurvePanel : public TimeBasedPanel { @@ -46,6 +46,6 @@ protected: }; -OLIVE_NAMESPACE_EXIT +} #endif // CURVEPANEL_H diff --git a/app/panel/footageviewer/footageviewer.cpp b/app/panel/footageviewer/footageviewer.cpp index e23dad1e0..90b43f6f6 100644 --- a/app/panel/footageviewer/footageviewer.cpp +++ b/app/panel/footageviewer/footageviewer.cpp @@ -22,7 +22,7 @@ #include "widget/viewer/footageviewer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { FootageViewerPanel::FootageViewerPanel(QWidget *parent) : ViewerPanelBase(QStringLiteral("FootageViewerPanel"), parent) @@ -72,4 +72,4 @@ void FootageViewerPanel::Retranslate() SetTitle(tr("Footage Viewer")); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/panel/footageviewer/footageviewer.h b/app/panel/footageviewer/footageviewer.h index b2925b8ed..d4f0d0bba 100644 --- a/app/panel/footageviewer/footageviewer.h +++ b/app/panel/footageviewer/footageviewer.h @@ -26,7 +26,7 @@ #include "panel/viewer/viewerbase.h" #include "panel/project/footagemanagementpanel.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief Dockable wrapper around a ViewerWidget @@ -45,6 +45,6 @@ protected: }; -OLIVE_NAMESPACE_EXIT +} #endif // FOOTAGE_VIEWER_PANEL_H diff --git a/app/panel/node/node.cpp b/app/panel/node/node.cpp index 5953893d8..7d4177db3 100644 --- a/app/panel/node/node.cpp +++ b/app/panel/node/node.cpp @@ -20,7 +20,7 @@ #include "node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodePanel::NodePanel(QWidget *parent) : PanelWidget(QStringLiteral("NodePanel"), parent) @@ -39,4 +39,4 @@ NodePanel::NodePanel(QWidget *parent) : Retranslate(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/panel/node/node.h b/app/panel/node/node.h index 7582073fa..b0aa5e187 100644 --- a/app/panel/node/node.h +++ b/app/panel/node/node.h @@ -24,7 +24,7 @@ #include "widget/nodeview/nodeview.h" #include "widget/panel/panel.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A PanelWidget wrapper around a NodeView @@ -111,6 +111,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEPANEL_H diff --git a/app/panel/panelmanager.cpp b/app/panel/panelmanager.cpp index a2c5d76a2..fdeff1f9d 100644 --- a/app/panel/panelmanager.cpp +++ b/app/panel/panelmanager.cpp @@ -22,7 +22,7 @@ #include "config/config.h" -OLIVE_NAMESPACE_ENTER +namespace olive { PanelManager* PanelManager::instance_ = nullptr; @@ -164,4 +164,4 @@ void PanelManager::PanelDestroyed() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/panel/panelmanager.h b/app/panel/panelmanager.h index cd73c0402..50311a4b5 100644 --- a/app/panel/panelmanager.h +++ b/app/panel/panelmanager.h @@ -26,7 +26,7 @@ #include "widget/panel/panel.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief The PanelFocusManager class @@ -232,6 +232,6 @@ QList PanelManager::GetPanelsOfType() return panels; } -OLIVE_NAMESPACE_EXIT +} #endif // PANELFOCUSMANAGER_H diff --git a/app/panel/param/param.cpp b/app/panel/param/param.cpp index 35dfba91d..068ee3aae 100644 --- a/app/panel/param/param.cpp +++ b/app/panel/param/param.cpp @@ -22,7 +22,7 @@ #include "window/mainwindow/mainwindow.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ParamPanel::ParamPanel(QWidget* parent) : TimeBasedPanel(QStringLiteral("ParamPanel"), parent) @@ -70,4 +70,4 @@ void ParamPanel::Retranslate() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/panel/param/param.h b/app/panel/param/param.h index 6f9ce30e5..a2106d812 100644 --- a/app/panel/param/param.h +++ b/app/panel/param/param.h @@ -25,7 +25,7 @@ #include "panel/timebased/timebased.h" #include "widget/nodeparamview/nodeparamview.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ParamPanel : public TimeBasedPanel { @@ -51,6 +51,6 @@ protected: }; -OLIVE_NAMESPACE_EXIT +} #endif // PARAM_H diff --git a/app/panel/pixelsampler/pixelsamplerpanel.cpp b/app/panel/pixelsampler/pixelsamplerpanel.cpp index 15281a284..d2fcc8d04 100644 --- a/app/panel/pixelsampler/pixelsamplerpanel.cpp +++ b/app/panel/pixelsampler/pixelsamplerpanel.cpp @@ -20,7 +20,7 @@ #include "pixelsamplerpanel.h" -OLIVE_NAMESPACE_ENTER +namespace olive { PixelSamplerPanel::PixelSamplerPanel(QWidget *parent) : PanelWidget(QStringLiteral("ProjectPanel"), parent) @@ -41,4 +41,4 @@ void PixelSamplerPanel::Retranslate() SetTitle(tr("Pixel Sampler")); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/panel/pixelsampler/pixelsamplerpanel.h b/app/panel/pixelsampler/pixelsamplerpanel.h index 812fec51a..0da27c12c 100644 --- a/app/panel/pixelsampler/pixelsamplerpanel.h +++ b/app/panel/pixelsampler/pixelsamplerpanel.h @@ -24,7 +24,7 @@ #include "widget/panel/panel.h" #include "widget/pixelsampler/pixelsampler.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class PixelSamplerPanel : public PanelWidget { @@ -42,6 +42,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // PIXELSAMPLERPANEL_H diff --git a/app/panel/project/footagemanagementpanel.h b/app/panel/project/footagemanagementpanel.h index c1ec1ba64..e962e22ef 100644 --- a/app/panel/project/footagemanagementpanel.h +++ b/app/panel/project/footagemanagementpanel.h @@ -25,13 +25,13 @@ #include "project/item/footage/footage.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class FootageManagementPanel { public: virtual QList GetSelectedFootage() const = 0; }; -OLIVE_NAMESPACE_EXIT +} #endif // FOOTAGEMANAGEMENTPANEL_H diff --git a/app/panel/project/project.cpp b/app/panel/project/project.cpp index 928956c60..7fbd9560f 100644 --- a/app/panel/project/project.cpp +++ b/app/panel/project/project.cpp @@ -32,7 +32,7 @@ #include "widget/projecttoolbar/projecttoolbar.h" #include "window/mainwindow/mainwindow.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ProjectPanel::ProjectPanel(QWidget *parent) : PanelWidget(QStringLiteral("ProjectPanel"), parent) @@ -243,4 +243,4 @@ QList ProjectPanel::GetSelectedFootage() const return footage; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/panel/project/project.h b/app/panel/project/project.h index 345a44d8f..5d15e50ad 100644 --- a/app/panel/project/project.h +++ b/app/panel/project/project.h @@ -26,7 +26,7 @@ #include "widget/panel/panel.h" #include "widget/projectexplorer/projectexplorer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A PanelWidget wrapper around a ProjectExplorer and a ProjectToolbar @@ -80,8 +80,8 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::ProjectPtr) +Q_DECLARE_METATYPE(olive::ProjectPtr) #endif // PROJECT_PANEL_H diff --git a/app/panel/scope/scope.cpp b/app/panel/scope/scope.cpp index 936f68f9b..753443a62 100644 --- a/app/panel/scope/scope.cpp +++ b/app/panel/scope/scope.cpp @@ -24,7 +24,7 @@ #include "panel/viewer/viewer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ScopePanel::ScopePanel(QWidget* parent) : PanelWidget(QStringLiteral("ScopePanel"), parent) @@ -105,4 +105,4 @@ void ScopePanel::Retranslate() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/panel/scope/scope.h b/app/panel/scope/scope.h index 30622fbf3..2478b5859 100644 --- a/app/panel/scope/scope.h +++ b/app/panel/scope/scope.h @@ -28,7 +28,7 @@ #include "widget/scope/histogram/histogram.h" #include "widget/scope/waveform/waveform.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ViewerPanel; @@ -70,6 +70,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // SCOPE_PANEL_H diff --git a/app/panel/sequenceviewer/sequenceviewer.cpp b/app/panel/sequenceviewer/sequenceviewer.cpp index 0292ae445..44f6910f2 100644 --- a/app/panel/sequenceviewer/sequenceviewer.cpp +++ b/app/panel/sequenceviewer/sequenceviewer.cpp @@ -20,7 +20,7 @@ #include "sequenceviewer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { SequenceViewerPanel::SequenceViewerPanel(QWidget *parent) : ViewerPanel(QStringLiteral("SequenceViewerPanel"), parent) @@ -36,4 +36,4 @@ void SequenceViewerPanel::Retranslate() SetTitle(tr("Sequence Viewer")); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/panel/sequenceviewer/sequenceviewer.h b/app/panel/sequenceviewer/sequenceviewer.h index 9c86eb156..e03d2c828 100644 --- a/app/panel/sequenceviewer/sequenceviewer.h +++ b/app/panel/sequenceviewer/sequenceviewer.h @@ -23,7 +23,7 @@ #include "panel/viewer/viewer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class SequenceViewerPanel : public ViewerPanel { @@ -36,6 +36,6 @@ protected: }; -OLIVE_NAMESPACE_EXIT +} #endif // SEQUENCEVIEWERPANEL_H diff --git a/app/panel/table/table.cpp b/app/panel/table/table.cpp index 0ee975248..a863078a9 100644 --- a/app/panel/table/table.cpp +++ b/app/panel/table/table.cpp @@ -20,7 +20,7 @@ #include "table.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeTablePanel::NodeTablePanel(QWidget* parent) : TimeBasedPanel(QStringLiteral("NodeTablePanel"), parent) @@ -35,4 +35,4 @@ void NodeTablePanel::Retranslate() SetTitle(tr("Table View")); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/panel/table/table.h b/app/panel/table/table.h index 7667f0294..d7dac3f2e 100644 --- a/app/panel/table/table.h +++ b/app/panel/table/table.h @@ -24,7 +24,7 @@ #include "panel/timebased/timebased.h" #include "widget/nodetableview/nodetablewidget.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeTablePanel : public TimeBasedPanel { @@ -48,6 +48,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODETABLEPANEL_H diff --git a/app/panel/taskmanager/taskmanager.cpp b/app/panel/taskmanager/taskmanager.cpp index f7d9309c8..e50193158 100644 --- a/app/panel/taskmanager/taskmanager.cpp +++ b/app/panel/taskmanager/taskmanager.cpp @@ -22,7 +22,7 @@ #include "task/taskmanager.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TaskManagerPanel::TaskManagerPanel(QWidget* parent) : PanelWidget(QStringLiteral("TaskManagerPanel"), parent) @@ -48,4 +48,4 @@ void TaskManagerPanel::Retranslate() SetTitle(tr("Task Manager")); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/panel/taskmanager/taskmanager.h b/app/panel/taskmanager/taskmanager.h index 6ae0daba1..af1ac8a8d 100644 --- a/app/panel/taskmanager/taskmanager.h +++ b/app/panel/taskmanager/taskmanager.h @@ -24,7 +24,7 @@ #include "widget/taskview/taskview.h" #include "widget/panel/panel.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A PanelWidget wrapper around a TaskView widget @@ -41,6 +41,6 @@ private: TaskView* view_; }; -OLIVE_NAMESPACE_EXIT +} #endif // TASKMANAGER_H diff --git a/app/panel/timebased/timebased.cpp b/app/panel/timebased/timebased.cpp index c48c111cb..be52e2ca5 100644 --- a/app/panel/timebased/timebased.cpp +++ b/app/panel/timebased/timebased.cpp @@ -20,7 +20,7 @@ #include "timebased.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TimeBasedPanel::TimeBasedPanel(const QString &object_name, QWidget *parent) : PanelWidget(object_name, parent), @@ -214,4 +214,4 @@ void TimeBasedPanel::GoToOut() GetTimeBasedWidget()->GoToOut(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/panel/timebased/timebased.h b/app/panel/timebased/timebased.h index 8e998f02d..ef0690652 100644 --- a/app/panel/timebased/timebased.h +++ b/app/panel/timebased/timebased.h @@ -24,7 +24,7 @@ #include "widget/panel/panel.h" #include "widget/timebased/timebased.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TimeBasedPanel : public PanelWidget { @@ -118,6 +118,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMEBASEDPANEL_H diff --git a/app/panel/timeline/timeline.cpp b/app/panel/timeline/timeline.cpp index 124e99a36..cdfcd13d9 100644 --- a/app/panel/timeline/timeline.cpp +++ b/app/panel/timeline/timeline.cpp @@ -23,7 +23,7 @@ #include "panel/panelmanager.h" #include "panel/project/footagemanagementpanel.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TimelinePanel::TimelinePanel(QWidget *parent) : TimeBasedPanel(QStringLiteral("TimelinePanel"), parent) @@ -182,4 +182,4 @@ void TimelinePanel::Retranslate() SetTitle(tr("Timeline")); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/panel/timeline/timeline.h b/app/panel/timeline/timeline.h index a0ea68116..5f88651d0 100644 --- a/app/panel/timeline/timeline.h +++ b/app/panel/timeline/timeline.h @@ -24,7 +24,7 @@ #include "panel/timebased/timebased.h" #include "widget/timelinewidget/timelinewidget.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief Panel container for a TimelineWidget @@ -97,6 +97,6 @@ signals: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINE_PANEL_H diff --git a/app/panel/tool/tool.cpp b/app/panel/tool/tool.cpp index 9ad5cddcd..1b95e12aa 100644 --- a/app/panel/tool/tool.cpp +++ b/app/panel/tool/tool.cpp @@ -23,7 +23,7 @@ #include "core.h" #include "widget/toolbar/toolbar.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ToolPanel::ToolPanel(QWidget *parent) : PanelWidget(QStringLiteral("ToolPanel"), parent) @@ -52,4 +52,4 @@ void ToolPanel::Retranslate() SetTitle(tr("Tools")); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/panel/tool/tool.h b/app/panel/tool/tool.h index 2e2e956cb..a4d673a7a 100644 --- a/app/panel/tool/tool.h +++ b/app/panel/tool/tool.h @@ -23,7 +23,7 @@ #include "widget/panel/panel.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A PanelWidget wrapper around a Toolbar @@ -39,6 +39,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TOOL_PANEL_H diff --git a/app/panel/viewer/viewer.cpp b/app/panel/viewer/viewer.cpp index 4a575b910..a79f09b52 100644 --- a/app/panel/viewer/viewer.cpp +++ b/app/panel/viewer/viewer.cpp @@ -20,7 +20,7 @@ #include "viewer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ViewerPanel::ViewerPanel(const QString &object_name, QWidget *parent) : ViewerPanelBase(object_name, parent) @@ -41,4 +41,4 @@ void ViewerPanel::Retranslate() SetTitle(tr("Viewer")); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/panel/viewer/viewer.h b/app/panel/viewer/viewer.h index 8309a8694..9d83e0c97 100644 --- a/app/panel/viewer/viewer.h +++ b/app/panel/viewer/viewer.h @@ -25,7 +25,7 @@ #include "viewerbase.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief Dockable wrapper around a ViewerWidget @@ -40,6 +40,6 @@ protected: }; -OLIVE_NAMESPACE_EXIT +} #endif // VIEWER_PANEL_H diff --git a/app/panel/viewer/viewerbase.cpp b/app/panel/viewer/viewerbase.cpp index 028fb484e..f58c5d11f 100644 --- a/app/panel/viewer/viewerbase.cpp +++ b/app/panel/viewer/viewerbase.cpp @@ -22,7 +22,7 @@ #include "window/mainwindow/mainwindow.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ViewerPanelBase::ViewerPanelBase(const QString& object_name, QWidget *parent) : TimeBasedPanel(object_name, parent) @@ -123,4 +123,4 @@ void ViewerPanelBase::closeEvent(QCloseEvent *e) TimeBasedPanel::closeEvent(e); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/panel/viewer/viewerbase.h b/app/panel/viewer/viewerbase.h index a8fe9c00a..536847631 100644 --- a/app/panel/viewer/viewerbase.h +++ b/app/panel/viewer/viewerbase.h @@ -25,7 +25,7 @@ #include "panel/timebased/timebased.h" #include "widget/viewer/viewer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ViewerPanelBase : public TimeBasedPanel { @@ -68,6 +68,6 @@ protected: }; -OLIVE_NAMESPACE_EXIT +} #endif // VIEWERPANELBASE_H diff --git a/app/project/item/folder/folder.cpp b/app/project/item/folder/folder.cpp index 7f3b97661..6c8ec1916 100644 --- a/app/project/item/folder/folder.cpp +++ b/app/project/item/folder/folder.cpp @@ -25,7 +25,7 @@ #include "project/item/sequence/sequence.h" #include "ui/icons/icons.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Item::Type Folder::type() const { @@ -104,4 +104,4 @@ void Folder::Save(QXmlStreamWriter *writer) const } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/project/item/folder/folder.h b/app/project/item/folder/folder.h index cec258c44..93eaa9f6c 100644 --- a/app/project/item/folder/folder.h +++ b/app/project/item/folder/folder.h @@ -25,7 +25,7 @@ #include "project/item/footage/footage.h" #include "project/item/item.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief The Folder class representing a directory in a project structure @@ -52,6 +52,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // FOLDER_H diff --git a/app/project/item/footage/audiostream.cpp b/app/project/item/footage/audiostream.cpp index 58e5b6096..70cbfbc06 100644 --- a/app/project/item/footage/audiostream.cpp +++ b/app/project/item/footage/audiostream.cpp @@ -22,7 +22,7 @@ #include "common/xmlutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { AudioStream::AudioStream() { @@ -93,4 +93,4 @@ void AudioStream::SaveCustomParameters(QXmlStreamWriter *writer) const writer->writeTextElement(QStringLiteral("rate"), QString::number(sample_rate_)); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/project/item/footage/audiostream.h b/app/project/item/footage/audiostream.h index f38b9b6c9..6941c8177 100644 --- a/app/project/item/footage/audiostream.h +++ b/app/project/item/footage/audiostream.h @@ -27,7 +27,7 @@ #include "render/audioparams.h" #include "stream.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A Stream derivative containing audio-specific information @@ -65,6 +65,6 @@ private: using AudioStreamPtr = std::shared_ptr; -OLIVE_NAMESPACE_EXIT +} #endif // AUDIOSTREAM_H diff --git a/app/project/item/footage/footage.cpp b/app/project/item/footage/footage.cpp index 5a8f03388..01da128ef 100644 --- a/app/project/item/footage/footage.cpp +++ b/app/project/item/footage/footage.cpp @@ -30,7 +30,7 @@ #include "core.h" #include "ui/icons/icons.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Footage::Footage() { @@ -345,4 +345,4 @@ void Footage::UpdateTooltip() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/project/item/footage/footage.h b/app/project/item/footage/footage.h index 3bc4a2b3a..ec59750d8 100644 --- a/app/project/item/footage/footage.h +++ b/app/project/item/footage/footage.h @@ -30,7 +30,7 @@ #include "project/item/footage/videostream.h" #include "timeline/timelinepoints.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class Footage; using FootagePtr = std::shared_ptr; @@ -250,6 +250,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // FOOTAGE_H diff --git a/app/project/item/footage/stream.cpp b/app/project/item/footage/stream.cpp index 5e8b6dd5d..fe0d5eef5 100644 --- a/app/project/item/footage/stream.cpp +++ b/app/project/item/footage/stream.cpp @@ -23,7 +23,7 @@ #include "footage.h" #include "ui/icons/icons.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Stream::Stream() : footage_(nullptr), @@ -190,4 +190,4 @@ void Stream::SaveCustomParameters(QXmlStreamWriter*) const { } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/project/item/footage/stream.h b/app/project/item/footage/stream.h index e3890c6f0..e18da0542 100644 --- a/app/project/item/footage/stream.h +++ b/app/project/item/footage/stream.h @@ -30,7 +30,7 @@ #include "common/rational.h" #include "ui/icons/icons.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class Footage; class Stream; @@ -122,9 +122,9 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #include -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::StreamPtr) +Q_DECLARE_METATYPE(olive::StreamPtr) #endif // STREAM_H diff --git a/app/project/item/footage/videostream.cpp b/app/project/item/footage/videostream.cpp index de2a846c0..2ace06129 100644 --- a/app/project/item/footage/videostream.cpp +++ b/app/project/item/footage/videostream.cpp @@ -28,7 +28,7 @@ #include "project/project.h" #include "render/colormanager.h" -OLIVE_NAMESPACE_ENTER +namespace olive { VideoStream::VideoStream() : premultiplied_alpha_(false), @@ -187,4 +187,4 @@ void VideoStream::DefaultColorSpaceChanged() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/project/item/footage/videostream.h b/app/project/item/footage/videostream.h index 9742c67f5..0377d9146 100644 --- a/app/project/item/footage/videostream.h +++ b/app/project/item/footage/videostream.h @@ -24,7 +24,7 @@ #include "render/videoparams.h" #include "stream.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A Stream derivative containing video-specific information @@ -176,6 +176,6 @@ private: using VideoStreamPtr = std::shared_ptr; -OLIVE_NAMESPACE_EXIT +} #endif // VIDEOSTREAM_H diff --git a/app/project/item/item.cpp b/app/project/item/item.cpp index cd9cf8e18..33657825e 100644 --- a/app/project/item/item.cpp +++ b/app/project/item/item.cpp @@ -20,7 +20,7 @@ #include "item.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Item::Item() : parent_(nullptr), @@ -203,4 +203,4 @@ bool Item::ChildExistsWithNameInternal(const QString &name, Item *folder) return false; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/project/item/item.h b/app/project/item/item.h index 9f67b5b1c..32ed1fb8a 100644 --- a/app/project/item/item.h +++ b/app/project/item/item.h @@ -33,7 +33,7 @@ #include "node/param.h" #include "project/item/footage/stream.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class Project; @@ -123,6 +123,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // ITEM_H diff --git a/app/project/item/sequence/sequence.cpp b/app/project/item/sequence/sequence.cpp index d85b17ff4..02440f29a 100644 --- a/app/project/item/sequence/sequence.cpp +++ b/app/project/item/sequence/sequence.cpp @@ -36,7 +36,7 @@ #include "panel/sequenceviewer/sequenceviewer.h" #include "ui/icons/icons.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Sequence::Sequence() { @@ -352,4 +352,4 @@ void Sequence::NameChangedEvent(const QString &name) viewer_output_->set_media_name(name); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/project/item/sequence/sequence.h b/app/project/item/sequence/sequence.h index c0c6db7e8..d364c298d 100644 --- a/app/project/item/sequence/sequence.h +++ b/app/project/item/sequence/sequence.h @@ -29,7 +29,7 @@ #include "project/item/item.h" #include "timeline/timelinepoints.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class Sequence; using SequencePtr = std::shared_ptr; @@ -84,6 +84,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // SEQUENCE_H diff --git a/app/project/project.cpp b/app/project/project.cpp index 9b1578ecd..839474b73 100644 --- a/app/project/project.cpp +++ b/app/project/project.cpp @@ -29,7 +29,7 @@ #include "render/diskmanager.h" #include "window/mainwindow/mainwindow.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Project::Project() : is_modified_(false), @@ -228,4 +228,4 @@ void Project::DefaultColorSpaceChanged() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/project/project.h b/app/project/project.h index bca8872c7..e4075ca5d 100644 --- a/app/project/project.h +++ b/app/project/project.h @@ -28,7 +28,7 @@ #include "project/item/folder/folder.h" #include "window/mainwindow/mainwindowlayoutinfo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A project instance containing all the data pertaining to the user's project @@ -105,6 +105,6 @@ private slots: using ProjectPtr = std::shared_ptr; -OLIVE_NAMESPACE_EXIT +} #endif // PROJECT_H diff --git a/app/project/projectviewmodel.cpp b/app/project/projectviewmodel.cpp index b27573f98..f11135e3e 100644 --- a/app/project/projectviewmodel.cpp +++ b/app/project/projectviewmodel.cpp @@ -27,7 +27,7 @@ #include "core.h" #include "node/input/media/media.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ProjectViewModel::ProjectViewModel(QObject *parent) : QAbstractItemModel(parent), @@ -604,4 +604,4 @@ void ProjectViewModel::RemoveItemCommand::undo_internal() model_->AddChild(parent_, item_); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/project/projectviewmodel.h b/app/project/projectviewmodel.h index e9f032e70..e524684ba 100644 --- a/app/project/projectviewmodel.h +++ b/app/project/projectviewmodel.h @@ -27,7 +27,7 @@ #include "undo/undocommand.h" #include "node/block/block.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief An adapter that interprets the data in a Project into a Qt item model for usage in ViewModel Views. @@ -251,6 +251,6 @@ private: QVector columns_; }; -OLIVE_NAMESPACE_EXIT +} #endif // VIEWMODEL_H diff --git a/app/render/audioparams.cpp b/app/render/audioparams.cpp index bcf4cfb3f..fa16a4838 100644 --- a/app/render/audioparams.cpp +++ b/app/render/audioparams.cpp @@ -26,7 +26,7 @@ extern "C" { #include -OLIVE_NAMESPACE_ENTER +namespace olive { const QVector AudioParams::kSupportedSampleRates = { 8000, // 8000 Hz @@ -195,4 +195,4 @@ QString AudioParams::ChannelLayoutToString(const uint64_t &layout) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/render/audioparams.h b/app/render/audioparams.h index 8cfc43c72..989fbf959 100644 --- a/app/render/audioparams.h +++ b/app/render/audioparams.h @@ -26,7 +26,7 @@ #include "common/rational.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class AudioParams { public: @@ -132,8 +132,8 @@ private: }; -OLIVE_NAMESPACE_EXIT +} -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::AudioParams) +Q_DECLARE_METATYPE(olive::AudioParams) #endif // AUDIOPARAMS_H diff --git a/app/render/audioplaybackcache.cpp b/app/render/audioplaybackcache.cpp index 7763ab603..03526672f 100644 --- a/app/render/audioplaybackcache.cpp +++ b/app/render/audioplaybackcache.cpp @@ -26,7 +26,7 @@ #include "common/filefunctions.h" -OLIVE_NAMESPACE_ENTER +namespace olive { const qint64 AudioPlaybackCache::kDefaultSegmentSize = 5242880; @@ -538,4 +538,4 @@ qint64 AudioPlaybackCache::Playlist::GetLength() const return this->last().offset() + this->last().size(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/render/audioplaybackcache.h b/app/render/audioplaybackcache.h index 6cea5fb0f..3ea9973a2 100644 --- a/app/render/audioplaybackcache.h +++ b/app/render/audioplaybackcache.h @@ -25,7 +25,7 @@ #include "codec/samplebuffer.h" #include "render/playbackcache.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A fully integrated system of storing and playing cached audio @@ -214,6 +214,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // AUDIOPLAYBACKCACHE_H diff --git a/app/render/color.cpp b/app/render/color.cpp index 2df47ed70..8167701db 100644 --- a/app/render/color.cpp +++ b/app/render/color.cpp @@ -25,7 +25,7 @@ #include "common/clamp.h" #include "common/oiioutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Color Color::fromHsv(const double &h, const double &s, const double &v) { @@ -301,9 +301,9 @@ Color Color::operator/(const double &rhs) const return c; } -OLIVE_NAMESPACE_EXIT +} -QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::Color &r) +QDebug operator<<(QDebug debug, const olive::Color &r) { debug.nospace() << "[R: " << r.red() << ", G: " << r.green() << ", B: " << r.blue() << ", A: " << r.alpha() << "]"; return debug.space(); diff --git a/app/render/color.h b/app/render/color.h index 046c88a10..70204f165 100644 --- a/app/render/color.h +++ b/app/render/color.h @@ -27,7 +27,7 @@ #include "common/define.h" #include "render/videoparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief High precision 64-bit float based RGBA color value @@ -111,10 +111,10 @@ private: }; -OLIVE_NAMESPACE_EXIT +} -QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::Color& r); +QDebug operator<<(QDebug debug, const olive::Color& r); -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::Color) +Q_DECLARE_METATYPE(olive::Color) #endif // COLOR_H diff --git a/app/render/colormanager.cpp b/app/render/colormanager.cpp index db49bee0f..b0dd6e4cd 100644 --- a/app/render/colormanager.cpp +++ b/app/render/colormanager.cpp @@ -29,7 +29,7 @@ #include "config/config.h" #include "core.h" -OLIVE_NAMESPACE_ENTER +namespace olive { OCIO::ConstConfigRcPtr ColorManager::default_config_; @@ -318,4 +318,4 @@ ColorManager::SetLocale::~SetLocale() setlocale(LC_NUMERIC, old_locale_.toUtf8()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/render/colormanager.h b/app/render/colormanager.h index 558f9816a..7c79a39c2 100644 --- a/app/render/colormanager.h +++ b/app/render/colormanager.h @@ -28,7 +28,7 @@ #define OCIO_SET_C_LOCALE_FOR_SCOPE ColorManager::SetLocale d("C") -OLIVE_NAMESPACE_ENTER +namespace olive { class ColorManager : public QObject { @@ -113,6 +113,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // COLORSERVICE_H diff --git a/app/render/colorprocessor.cpp b/app/render/colorprocessor.cpp index b9f663eaf..99aff541c 100644 --- a/app/render/colorprocessor.cpp +++ b/app/render/colorprocessor.cpp @@ -24,7 +24,7 @@ #include "common/ocioutils.h" #include "colormanager.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ColorProcessor::ColorProcessor(ColorManager *config, const QString &input, const ColorTransform &transform) { @@ -131,4 +131,4 @@ void ColorProcessor::ConvertFrame(FramePtr f) ConvertFrame(f.get()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/render/colorprocessor.h b/app/render/colorprocessor.h index daaf985fe..0704b89e0 100644 --- a/app/render/colorprocessor.h +++ b/app/render/colorprocessor.h @@ -26,7 +26,7 @@ #include "render/color.h" #include "render/colortransform.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ColorManager; @@ -72,8 +72,8 @@ private: using ColorProcessorChain = QVector; -OLIVE_NAMESPACE_EXIT +} -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::ColorProcessorPtr) +Q_DECLARE_METATYPE(olive::ColorProcessorPtr) #endif // COLORPROCESSOR_H diff --git a/app/render/colorprocessorcache.h b/app/render/colorprocessorcache.h index d9d41152d..9c9c40b6b 100644 --- a/app/render/colorprocessorcache.h +++ b/app/render/colorprocessorcache.h @@ -24,10 +24,10 @@ #include "project/item/footage/stream.h" #include "render/colorprocessor.h" -OLIVE_NAMESPACE_ENTER +namespace olive { using ColorProcessorCache = QHash; -OLIVE_NAMESPACE_EXIT +} #endif // COLORPROCESSORCACHE_H diff --git a/app/render/colortransform.h b/app/render/colortransform.h index 882e7e5ff..61a4c74ba 100644 --- a/app/render/colortransform.h +++ b/app/render/colortransform.h @@ -26,7 +26,7 @@ #include "common/define.h" #include "common/ocioutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ColorTransform { @@ -79,6 +79,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // COLORTRANSFORM_H diff --git a/app/render/diskmanager.cpp b/app/render/diskmanager.cpp index c1423d26d..40d385e76 100644 --- a/app/render/diskmanager.cpp +++ b/app/render/diskmanager.cpp @@ -33,7 +33,7 @@ #include "core.h" #include "dialog/diskcache/diskcachedialog.h" -OLIVE_NAMESPACE_ENTER +namespace olive { DiskManager* DiskManager::instance_ = nullptr; @@ -364,4 +364,4 @@ void DiskCacheFolder::SaveDiskCacheIndex() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/render/diskmanager.h b/app/render/diskmanager.h index 0a3c84819..c4073d71f 100644 --- a/app/render/diskmanager.h +++ b/app/render/diskmanager.h @@ -29,7 +29,7 @@ #include "common/define.h" #include "project/project.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class DiskCacheFolder : public QObject { @@ -165,6 +165,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // DISKMANAGER_H diff --git a/app/render/framehashcache.cpp b/app/render/framehashcache.cpp index e2c5b02b3..9328c58dd 100644 --- a/app/render/framehashcache.cpp +++ b/app/render/framehashcache.cpp @@ -32,7 +32,7 @@ #include "common/timecodefunctions.h" #include "render/diskmanager.h" -OLIVE_NAMESPACE_ENTER +namespace olive { FrameHashCache::FrameHashCache(QObject *parent) : PlaybackCache(parent) @@ -438,4 +438,4 @@ bool FrameHashCache::SaveCacheFrame(const QString &filename, char *data, const V return true; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/render/framehashcache.h b/app/render/framehashcache.h index 276c4f1d3..3ff6eb9b7 100644 --- a/app/render/framehashcache.h +++ b/app/render/framehashcache.h @@ -29,7 +29,7 @@ #include "render/playbackcache.h" #include "render/videoparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class FrameHashCache : public PlaybackCache { @@ -76,7 +76,7 @@ public: QVector GetInvalidatedFrames(const TimeRange& intersecting); public slots: - void SetHash(const OLIVE_NAMESPACE::rational& time, const QByteArray& hash, const qint64 &job_time, bool frame_exists); + void SetHash(const olive::rational& time, const QByteArray& hash, const qint64 &job_time, bool frame_exists); protected: virtual void LengthChangedEvent(const rational& old, const rational& newlen) override; @@ -97,6 +97,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // VIDEORENDERFRAMECACHE_H diff --git a/app/render/job/acceleratedjob.h b/app/render/job/acceleratedjob.h index 4bdd87d16..e4b981e21 100644 --- a/app/render/job/acceleratedjob.h +++ b/app/render/job/acceleratedjob.h @@ -26,7 +26,7 @@ #include "render/shadervalue.h" #include "node/value.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class AcceleratedJob { public: @@ -96,6 +96,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // ACCELERATEDJOB_H diff --git a/app/render/job/generatejob.h b/app/render/job/generatejob.h index 086459abc..dc71a873f 100644 --- a/app/render/job/generatejob.h +++ b/app/render/job/generatejob.h @@ -23,7 +23,7 @@ #include "acceleratedjob.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class GenerateJob : public AcceleratedJob { public: @@ -47,8 +47,8 @@ private: }; -OLIVE_NAMESPACE_EXIT +} -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::GenerateJob) +Q_DECLARE_METATYPE(olive::GenerateJob) #endif // GENERATEJOB_H diff --git a/app/render/job/samplejob.h b/app/render/job/samplejob.h index 0ce1163ef..80cf5657e 100644 --- a/app/render/job/samplejob.h +++ b/app/render/job/samplejob.h @@ -24,7 +24,7 @@ #include "acceleratedjob.h" #include "codec/samplebuffer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class SampleJob : public AcceleratedJob { public: @@ -58,8 +58,8 @@ private: }; -OLIVE_NAMESPACE_EXIT +} -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::SampleJob) +Q_DECLARE_METATYPE(olive::SampleJob) #endif // SAMPLEJOB_H diff --git a/app/render/job/shaderjob.h b/app/render/job/shaderjob.h index daa1167dd..fdb64117e 100644 --- a/app/render/job/shaderjob.h +++ b/app/render/job/shaderjob.h @@ -26,7 +26,7 @@ #include "generatejob.h" #include "render/texture.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ShaderJob : public GenerateJob { public: @@ -93,8 +93,8 @@ private: }; -OLIVE_NAMESPACE_EXIT +} -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::ShaderJob) +Q_DECLARE_METATYPE(olive::ShaderJob) #endif // SHADERJOB_H diff --git a/app/render/managedcolor.cpp b/app/render/managedcolor.cpp index 611f15054..e12e02dc9 100644 --- a/app/render/managedcolor.cpp +++ b/app/render/managedcolor.cpp @@ -20,7 +20,7 @@ #include "managedcolor.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ManagedColor::ManagedColor() { @@ -61,4 +61,4 @@ void ManagedColor::set_color_output(const ColorTransform &color_output) color_transform_ = color_output; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/render/managedcolor.h b/app/render/managedcolor.h index d63607cb7..19a475a9a 100644 --- a/app/render/managedcolor.h +++ b/app/render/managedcolor.h @@ -24,7 +24,7 @@ #include "color.h" #include "colortransform.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ManagedColor : public Color { @@ -47,6 +47,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // MANAGEDCOLOR_H diff --git a/app/render/opengl/openglrenderer.cpp b/app/render/opengl/openglrenderer.cpp index bade4e17c..050b6982e 100644 --- a/app/render/opengl/openglrenderer.cpp +++ b/app/render/opengl/openglrenderer.cpp @@ -23,7 +23,7 @@ #include #include -OLIVE_NAMESPACE_ENTER +namespace olive { const QVector blit_vertices = { -1.0f, -1.0f, 0.0f, @@ -665,4 +665,4 @@ void OpenGLRenderer::PrepareInputTexture(GLenum target, Texture::Interpolation i functions_->glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/render/opengl/openglrenderer.h b/app/render/opengl/openglrenderer.h index 6ba883398..3d78fdd54 100644 --- a/app/render/opengl/openglrenderer.h +++ b/app/render/opengl/openglrenderer.h @@ -30,7 +30,7 @@ #include "render/renderer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class OpenGLRenderer : public Renderer { @@ -51,24 +51,24 @@ public slots: virtual void ClearDestination(double r = 0.0, double g = 0.0, double b = 0.0, double a = 0.0) override; - virtual QVariant CreateNativeTexture2D(int width, int height, OLIVE_NAMESPACE::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) override; - virtual QVariant CreateNativeTexture3D(int width, int height, int depth, OLIVE_NAMESPACE::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) override; + virtual QVariant CreateNativeTexture2D(int width, int height, olive::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) override; + virtual QVariant CreateNativeTexture3D(int width, int height, int depth, olive::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) override; virtual void DestroyNativeTexture(QVariant texture) override; - virtual QVariant CreateNativeShader(OLIVE_NAMESPACE::ShaderCode code) override; + virtual QVariant CreateNativeShader(olive::ShaderCode code) override; virtual void DestroyNativeShader(QVariant shader) override; - virtual void UploadToTexture(OLIVE_NAMESPACE::Texture* texture, const void* data, int linesize) override; + virtual void UploadToTexture(olive::Texture* texture, const void* data, int linesize) override; - virtual void DownloadFromTexture(OLIVE_NAMESPACE::Texture* texture, void* data, int linesize) override; + virtual void DownloadFromTexture(olive::Texture* texture, void* data, int linesize) override; protected slots: virtual void Blit(QVariant shader, - OLIVE_NAMESPACE::ShaderJob job, - OLIVE_NAMESPACE::Texture* destination, - OLIVE_NAMESPACE::VideoParams destination_params) override; + olive::ShaderJob job, + olive::Texture* destination, + olive::VideoParams destination_params) override; private: static GLint GetInternalFormat(VideoParams::Format format, int channel_layout); @@ -77,7 +77,7 @@ private: static GLenum GetPixelFormat(int channel_count); - void AttachTextureAsDestination(OLIVE_NAMESPACE::Texture* texture); + void AttachTextureAsDestination(olive::Texture* texture); void DetachTextureAsDestination(); @@ -93,6 +93,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // OPENGLCONTEXT_H diff --git a/app/render/playbackcache.cpp b/app/render/playbackcache.cpp index 07d98eaa8..a56c106be 100644 --- a/app/render/playbackcache.cpp +++ b/app/render/playbackcache.cpp @@ -27,7 +27,7 @@ #include "project/project.h" #include "render/diskmanager.h" -OLIVE_NAMESPACE_ENTER +namespace olive { void PlaybackCache::Invalidate(const TimeRange &r) { @@ -195,4 +195,4 @@ QString PlaybackCache::GetCacheDirectory() const } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/render/playbackcache.h b/app/render/playbackcache.h index 4d254aacf..40d333526 100644 --- a/app/render/playbackcache.h +++ b/app/render/playbackcache.h @@ -26,7 +26,7 @@ #include "common/timerange.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class Project; @@ -71,13 +71,13 @@ public slots: void Shift(const rational& from, const rational& to); signals: - void Invalidated(const OLIVE_NAMESPACE::TimeRange& r); + void Invalidated(const olive::TimeRange& r); - void Validated(const OLIVE_NAMESPACE::TimeRange& r); + void Validated(const olive::TimeRange& r); - void Shifted(const OLIVE_NAMESPACE::rational& from, const OLIVE_NAMESPACE::rational& to); + void Shifted(const olive::rational& from, const olive::rational& to); - void LengthChanged(const OLIVE_NAMESPACE::rational& r); + void LengthChanged(const olive::rational& r); protected: void Validate(const TimeRange& r); @@ -106,6 +106,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // PLAYBACKCACHE_H diff --git a/app/render/previewautocacher.cpp b/app/render/previewautocacher.cpp index 9091b720b..7a309e467 100644 --- a/app/render/previewautocacher.cpp +++ b/app/render/previewautocacher.cpp @@ -8,7 +8,7 @@ #include "render/rendermanager.h" #include "render/renderprocessor.h" -OLIVE_NAMESPACE_ENTER +namespace olive { PreviewAutoCacher::PreviewAutoCacher() : viewer_node_(nullptr), @@ -771,4 +771,4 @@ void PreviewAutoCacher::SetViewerNode(ViewerOutput *viewer_node) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/render/previewautocacher.h b/app/render/previewautocacher.h index 663ee7bc2..03898c169 100644 --- a/app/render/previewautocacher.h +++ b/app/render/previewautocacher.h @@ -9,7 +9,7 @@ #include "render/colormanager.h" #include "threading/threadticketwatcher.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief Manager for dynamically caching a sequence in the background @@ -160,12 +160,12 @@ private slots: /** * @brief Handler for when the NodeGraph reports a video change over a certain time range */ - void VideoInvalidated(const OLIVE_NAMESPACE::TimeRange &range); + void VideoInvalidated(const olive::TimeRange &range); /** * @brief Handler for when the NodeGraph reports a audio change over a certain time range */ - void AudioInvalidated(const OLIVE_NAMESPACE::TimeRange &range); + void AudioInvalidated(const olive::TimeRange &range); /** * @brief Handler for when we have applied all the hashes to the FrameHashCache @@ -204,6 +204,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // AUTOCACHER_H diff --git a/app/render/rendercache.h b/app/render/rendercache.h index 5aab47f59..f27120e61 100644 --- a/app/render/rendercache.h +++ b/app/render/rendercache.h @@ -24,7 +24,7 @@ #include "codec/decoder.h" #include "project/item/footage/stream.h" -OLIVE_NAMESPACE_ENTER +namespace olive { template class RenderCache : public QHash @@ -43,6 +43,6 @@ private: using DecoderCache = RenderCache; using ShaderCache = RenderCache; -OLIVE_NAMESPACE_EXIT +} #endif // RENDERCACHE_H diff --git a/app/render/renderer.cpp b/app/render/renderer.cpp index daab11df9..beba1f5c5 100644 --- a/app/render/renderer.cpp +++ b/app/render/renderer.cpp @@ -24,7 +24,7 @@ #include "common/ocioutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Renderer::Renderer(QObject *parent) : QObject(parent) @@ -275,4 +275,4 @@ void Renderer::BlitColorManagedInternal(ColorProcessorPtr color_processor, Textu } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/render/renderer.h b/app/render/renderer.h index 50f2f9f86..3efb7c20b 100644 --- a/app/render/renderer.h +++ b/app/render/renderer.h @@ -31,7 +31,7 @@ #include "render/videoparams.h" #include "texture.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ShaderJob; @@ -47,15 +47,15 @@ public: TexturePtr CreateTexture(const VideoParams& params, const void *data = nullptr, int linesize = 0); void BlitToTexture(QVariant shader, - OLIVE_NAMESPACE::ShaderJob job, - OLIVE_NAMESPACE::Texture* destination) + olive::ShaderJob job, + olive::Texture* destination) { Blit(shader, job, destination, destination->params()); } void Blit(QVariant shader, - OLIVE_NAMESPACE::ShaderJob job, - OLIVE_NAMESPACE::VideoParams params) + olive::ShaderJob job, + olive::VideoParams params) { Blit(shader, job, nullptr, params); } @@ -72,24 +72,24 @@ public slots: virtual void ClearDestination(double r = 0.0, double g = 0.0, double b = 0.0, double a = 0.0) = 0; - virtual QVariant CreateNativeTexture2D(int width, int height, OLIVE_NAMESPACE::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) = 0; - virtual QVariant CreateNativeTexture3D(int width, int height, int depth, OLIVE_NAMESPACE::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) = 0; + virtual QVariant CreateNativeTexture2D(int width, int height, olive::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) = 0; + virtual QVariant CreateNativeTexture3D(int width, int height, int depth, olive::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) = 0; virtual void DestroyNativeTexture(QVariant texture) = 0; - virtual QVariant CreateNativeShader(OLIVE_NAMESPACE::ShaderCode code) = 0; + virtual QVariant CreateNativeShader(olive::ShaderCode code) = 0; virtual void DestroyNativeShader(QVariant shader) = 0; - virtual void UploadToTexture(OLIVE_NAMESPACE::Texture* texture, const void* data, int linesize) = 0; + virtual void UploadToTexture(olive::Texture* texture, const void* data, int linesize) = 0; - virtual void DownloadFromTexture(OLIVE_NAMESPACE::Texture* texture, void* data, int linesize) = 0; + virtual void DownloadFromTexture(olive::Texture* texture, void* data, int linesize) = 0; protected slots: virtual void Blit(QVariant shader, - OLIVE_NAMESPACE::ShaderJob job, - OLIVE_NAMESPACE::Texture* destination, - OLIVE_NAMESPACE::VideoParams destination_params) = 0; + olive::ShaderJob job, + olive::Texture* destination, + olive::VideoParams destination_params) = 0; private: struct ColorContext { @@ -121,6 +121,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // RENDERCONTEXT_H diff --git a/app/render/rendererthreadwrapper.cpp b/app/render/rendererthreadwrapper.cpp index b394a8349..ef1547d95 100644 --- a/app/render/rendererthreadwrapper.cpp +++ b/app/render/rendererthreadwrapper.cpp @@ -20,7 +20,7 @@ #include "rendererthreadwrapper.h" -OLIVE_NAMESPACE_ENTER +namespace olive { RendererThreadWrapper::RendererThreadWrapper(Renderer *inner, QObject *parent) : Renderer(parent), @@ -157,4 +157,4 @@ void RendererThreadWrapper::Blit(QVariant shader, ShaderJob job, Texture *destin OLIVE_NS_ARG(VideoParams, destination_params)); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/render/rendererthreadwrapper.h b/app/render/rendererthreadwrapper.h index 202d96e7a..9cd521b0c 100644 --- a/app/render/rendererthreadwrapper.h +++ b/app/render/rendererthreadwrapper.h @@ -25,7 +25,7 @@ #include "renderer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class RendererThreadWrapper : public Renderer { @@ -47,24 +47,24 @@ public slots: virtual void ClearDestination(double r = 0.0, double g = 0.0, double b = 0.0, double a = 0.0) override; - virtual QVariant CreateNativeTexture2D(int width, int height, OLIVE_NAMESPACE::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) override; - virtual QVariant CreateNativeTexture3D(int width, int height, int depth, OLIVE_NAMESPACE::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) override; + virtual QVariant CreateNativeTexture2D(int width, int height, olive::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) override; + virtual QVariant CreateNativeTexture3D(int width, int height, int depth, olive::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) override; virtual void DestroyNativeTexture(QVariant texture) override; - virtual QVariant CreateNativeShader(OLIVE_NAMESPACE::ShaderCode code) override; + virtual QVariant CreateNativeShader(olive::ShaderCode code) override; virtual void DestroyNativeShader(QVariant shader) override; - virtual void UploadToTexture(OLIVE_NAMESPACE::Texture* texture, const void* data, int linesize) override; + virtual void UploadToTexture(olive::Texture* texture, const void* data, int linesize) override; - virtual void DownloadFromTexture(OLIVE_NAMESPACE::Texture* texture, void* data, int linesize) override; + virtual void DownloadFromTexture(olive::Texture* texture, void* data, int linesize) override; protected slots: virtual void Blit(QVariant shader, - OLIVE_NAMESPACE::ShaderJob job, - OLIVE_NAMESPACE::Texture* destination, - OLIVE_NAMESPACE::VideoParams destination_params) override; + olive::ShaderJob job, + olive::Texture* destination, + olive::VideoParams destination_params) override; private: Renderer* inner_; @@ -73,6 +73,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // RENDERCONTEXTTHREADWRAPPER_H diff --git a/app/render/rendermanager.cpp b/app/render/rendermanager.cpp index 04fd8156f..f771502b5 100644 --- a/app/render/rendermanager.cpp +++ b/app/render/rendermanager.cpp @@ -34,7 +34,7 @@ #include "task/taskmanager.h" #include "window/mainwindow/mainwindow.h" -OLIVE_NAMESPACE_ENTER +namespace olive { RenderManager* RenderManager::instance_ = nullptr; @@ -199,4 +199,4 @@ void RenderManager::RunTicket(RenderTicketPtr ticket) const RenderProcessor::Process(ticket, context_, still_cache_, decoder_cache_, shader_cache_, default_shader_); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/render/rendermanager.h b/app/render/rendermanager.h index 0e6f5e37b..8bc580ab8 100644 --- a/app/render/rendermanager.h +++ b/app/render/rendermanager.h @@ -34,7 +34,7 @@ #include "stillimagecache.h" #include "threading/threadpool.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class RenderManager : public ThreadPool { @@ -142,8 +142,8 @@ private: }; -OLIVE_NAMESPACE_EXIT +} -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::RenderManager::TicketType) +Q_DECLARE_METATYPE(olive::RenderManager::TicketType) #endif // RENDERBACKEND_H diff --git a/app/render/rendermodes.h b/app/render/rendermodes.h index eace6428e..02f2dfda2 100644 --- a/app/render/rendermodes.h +++ b/app/render/rendermodes.h @@ -23,7 +23,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class RenderMode { public: @@ -45,6 +45,6 @@ public: }; }; -OLIVE_NAMESPACE_EXIT +} #endif // RENDERMODE_H diff --git a/app/render/renderprocessor.cpp b/app/render/renderprocessor.cpp index 227ea1cd2..f54b5d013 100644 --- a/app/render/renderprocessor.cpp +++ b/app/render/renderprocessor.cpp @@ -27,7 +27,7 @@ #include "project/project.h" #include "rendermanager.h" -OLIVE_NAMESPACE_ENTER +namespace olive { RenderProcessor::RenderProcessor(RenderTicketPtr ticket, Renderer *render_ctx, StillImageCache* still_image_cache, DecoderCache* decoder_cache, ShaderCache *shader_cache, QVariant default_shader) : ticket_(ticket), @@ -512,4 +512,4 @@ QVariant RenderProcessor::GetCachedFrame(const Node *node, const rational &time) return QVariant(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/render/renderprocessor.h b/app/render/renderprocessor.h index 3ec743981..40e522286 100644 --- a/app/render/renderprocessor.h +++ b/app/render/renderprocessor.h @@ -27,7 +27,7 @@ #include "stillimagecache.h" #include "threading/threadticket.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class RenderProcessor : public NodeTraverser { @@ -76,8 +76,8 @@ private: }; -OLIVE_NAMESPACE_EXIT +} -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::RenderProcessor::RenderedWaveform) +Q_DECLARE_METATYPE(olive::RenderProcessor::RenderedWaveform) #endif // RENDERPROCESSOR_H diff --git a/app/render/shadercode.h b/app/render/shadercode.h index 6a7a86034..12d805c43 100644 --- a/app/render/shadercode.h +++ b/app/render/shadercode.h @@ -23,7 +23,7 @@ #include "common/filefunctions.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ShaderCode { public: @@ -57,6 +57,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // SHADERCODE_H diff --git a/app/render/shadervalue.h b/app/render/shadervalue.h index 6633aef5d..0b042173b 100644 --- a/app/render/shadervalue.h +++ b/app/render/shadervalue.h @@ -23,7 +23,7 @@ #include "node/param.h" -OLIVE_NAMESPACE_ENTER +namespace olive { struct ShaderValue { @@ -50,6 +50,6 @@ struct ShaderValue using NodeValueMap = QHash; -OLIVE_NAMESPACE_EXIT +} #endif // SHADERVALUE_H diff --git a/app/render/stillimagecache.h b/app/render/stillimagecache.h index f5b4336e7..728247200 100644 --- a/app/render/stillimagecache.h +++ b/app/render/stillimagecache.h @@ -8,7 +8,7 @@ #include "project/item/footage/stream.h" #include "render/texture.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class StillImageCache { @@ -78,6 +78,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // STILLIMAGECACHE_H diff --git a/app/render/texture.cpp b/app/render/texture.cpp index 6ed5db9f7..c6ed11e6f 100644 --- a/app/render/texture.cpp +++ b/app/render/texture.cpp @@ -22,7 +22,7 @@ #include "renderer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { const Texture::Interpolation Texture::kDefaultInterpolation = Texture::kMipmappedLinear; @@ -36,4 +36,4 @@ void Texture::Upload(void *data, int linesize) renderer_->UploadToTexture(this, data, linesize); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/render/texture.h b/app/render/texture.h index ed1f1e07c..e0d9500f3 100644 --- a/app/render/texture.h +++ b/app/render/texture.h @@ -25,7 +25,7 @@ #include "render/videoparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class Renderer; @@ -115,8 +115,8 @@ private: using TexturePtr = std::shared_ptr; -OLIVE_NAMESPACE_EXIT +} -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::TexturePtr) +Q_DECLARE_METATYPE(olive::TexturePtr) #endif // RENDERTEXTURE_H diff --git a/app/render/videoparams.cpp b/app/render/videoparams.cpp index 7063d9588..02f736344 100644 --- a/app/render/videoparams.cpp +++ b/app/render/videoparams.cpp @@ -24,7 +24,7 @@ #include "core.h" -OLIVE_NAMESPACE_ENTER +namespace olive { const int VideoParams::kInternalChannelCount = kRGBAChannelCount; @@ -280,4 +280,4 @@ int VideoParams::GetScaledDimension(int dim, int divider) return dim / divider; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/render/videoparams.h b/app/render/videoparams.h index 39a4d0833..d38626491 100644 --- a/app/render/videoparams.h +++ b/app/render/videoparams.h @@ -24,7 +24,7 @@ #include "common/rational.h" #include "rendermodes.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class VideoParams { public: @@ -263,9 +263,9 @@ private: int effective_depth_; }; -OLIVE_NAMESPACE_EXIT +} -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::VideoParams) -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::VideoParams::Interlacing) +Q_DECLARE_METATYPE(olive::VideoParams) +Q_DECLARE_METATYPE(olive::VideoParams::Interlacing) #endif // VIDEOPARAMS_H diff --git a/app/task/conform/conform.cpp b/app/task/conform/conform.cpp index f30c4306a..b1e546155 100644 --- a/app/task/conform/conform.cpp +++ b/app/task/conform/conform.cpp @@ -22,7 +22,7 @@ #include "codec/decoder.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ConformTask::ConformTask(AudioStreamPtr stream, const AudioParams& params) : stream_(stream), @@ -57,4 +57,4 @@ bool ConformTask::Run() return true; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/task/conform/conform.h b/app/task/conform/conform.h index 1ebb6632f..4486cda8f 100644 --- a/app/task/conform/conform.h +++ b/app/task/conform/conform.h @@ -25,7 +25,7 @@ #include "render/audioparams.h" #include "task/task.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ConformTask : public Task { @@ -43,6 +43,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // CONFORMTASK_H diff --git a/app/task/export/export.cpp b/app/task/export/export.cpp index 9041d37e3..50bcb3554 100644 --- a/app/task/export/export.cpp +++ b/app/task/export/export.cpp @@ -23,7 +23,7 @@ #include "common/timecodefunctions.h" #include "render/colormanager.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ExportTask::ExportTask(ViewerOutput* viewer_node, ColorManager* color_manager, @@ -189,4 +189,4 @@ void ExportTask::AudioDownloaded(const TimeRange &range, SampleBufferPtr samples audio_data_.WritePCM(adjusted_range, samples, QDateTime::currentMSecsSinceEpoch()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/task/export/export.h b/app/task/export/export.h index 86e8aa011..1382d6856 100644 --- a/app/task/export/export.h +++ b/app/task/export/export.h @@ -27,7 +27,7 @@ #include "task/render/render.h" #include "task/task.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ExportTask : public RenderTask { @@ -64,6 +64,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // EXPORTTASK_H diff --git a/app/task/export/exportparams.cpp b/app/task/export/exportparams.cpp index 80c3e5acd..7b3b6a659 100644 --- a/app/task/export/exportparams.cpp +++ b/app/task/export/exportparams.cpp @@ -20,7 +20,7 @@ #include "exportparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ExportParams::ExportParams() : video_scaling_method_(kStretch), @@ -122,4 +122,4 @@ void ExportParams::Save(QXmlStreamWriter *writer) const writer->writeEndElement(); // export } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/task/export/exportparams.h b/app/task/export/exportparams.h index d76d23d4e..0fb17a4f2 100644 --- a/app/task/export/exportparams.h +++ b/app/task/export/exportparams.h @@ -27,7 +27,7 @@ #include "node/output/viewer/viewer.h" #include "render/colortransform.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ExportParams : public EncodingParams { public: @@ -70,6 +70,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // EXPORTPARAMS_H diff --git a/app/task/precache/precachetask.cpp b/app/task/precache/precachetask.cpp index a538ed199..fc033dac2 100644 --- a/app/task/precache/precachetask.cpp +++ b/app/task/precache/precachetask.cpp @@ -22,7 +22,7 @@ #include "project/project.h" -OLIVE_NAMESPACE_ENTER +namespace olive { PreCacheTask::PreCacheTask(VideoStreamPtr footage, Sequence* sequence) : RenderTask(new ViewerOutput(), sequence->video_params(), sequence->audio_params()), @@ -92,4 +92,4 @@ void PreCacheTask::AudioDownloaded(const TimeRange &range, SampleBufferPtr sampl Q_UNUSED(job_time) } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/task/precache/precachetask.h b/app/task/precache/precachetask.h index ffa4e7caa..7fb2483e7 100644 --- a/app/task/precache/precachetask.h +++ b/app/task/precache/precachetask.h @@ -26,7 +26,7 @@ #include "project/item/sequence/sequence.h" #include "task/render/render.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class PreCacheTask : public RenderTask { @@ -50,6 +50,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // PRECACHETASK_H diff --git a/app/task/project/import/import.cpp b/app/task/project/import/import.cpp index 588d2b488..66fa1de18 100644 --- a/app/task/project/import/import.cpp +++ b/app/task/project/import/import.cpp @@ -27,7 +27,7 @@ #include "core.h" #include "project/item/footage/footage.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ProjectImportTask::ProjectImportTask(ProjectViewModel *model, Folder *folder, const QStringList &filenames) : command_(nullptr), @@ -284,4 +284,4 @@ int64_t ProjectImportTask::GetImageSequenceLimit(const QString& start_fn, int64_ return start; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/task/project/import/import.h b/app/task/project/import/import.h index 10aafc99b..9dd44b65e 100644 --- a/app/task/project/import/import.h +++ b/app/task/project/import/import.h @@ -28,7 +28,7 @@ #include "project/projectviewmodel.h" #include "task/task.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ProjectImportTask : public Task { @@ -83,6 +83,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // PROJECTIMPORTMANAGER_H diff --git a/app/task/project/import/importerrordialog.cpp b/app/task/project/import/importerrordialog.cpp index 6421df455..232967cff 100644 --- a/app/task/project/import/importerrordialog.cpp +++ b/app/task/project/import/importerrordialog.cpp @@ -25,7 +25,7 @@ #include #include -OLIVE_NAMESPACE_ENTER +namespace olive { ProjectImportErrorDialog::ProjectImportErrorDialog(const QStringList& filenames, QWidget* parent) : QDialog(parent) @@ -50,4 +50,4 @@ ProjectImportErrorDialog::ProjectImportErrorDialog(const QStringList& filenames, layout->addWidget(buttons); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/task/project/import/importerrordialog.h b/app/task/project/import/importerrordialog.h index d8b1c36ee..21cc1a720 100644 --- a/app/task/project/import/importerrordialog.h +++ b/app/task/project/import/importerrordialog.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ProjectImportErrorDialog : public QDialog { @@ -35,6 +35,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // PROJECTIMPORTERRORDIALOG_H diff --git a/app/task/project/load/load.cpp b/app/task/project/load/load.cpp index bb733273e..a246abbbc 100644 --- a/app/task/project/load/load.cpp +++ b/app/task/project/load/load.cpp @@ -27,7 +27,7 @@ #include "common/xmlutils.h" #include "core.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ProjectLoadTask::ProjectLoadTask(const QString &filename) : ProjectLoadBaseTask(filename) @@ -99,4 +99,4 @@ bool ProjectLoadTask::Run() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/task/project/load/load.h b/app/task/project/load/load.h index 518f58fad..5b521324a 100644 --- a/app/task/project/load/load.h +++ b/app/task/project/load/load.h @@ -24,7 +24,7 @@ #include "loadbasetask.h" #include "window/mainwindow/mainwindowlayoutinfo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ProjectLoadTask : public ProjectLoadBaseTask { @@ -37,6 +37,6 @@ protected: }; -OLIVE_NAMESPACE_EXIT +} #endif // PROJECTLOADMANAGER_H diff --git a/app/task/project/load/loadbasetask.cpp b/app/task/project/load/loadbasetask.cpp index 2285f16be..a6fce7189 100644 --- a/app/task/project/load/loadbasetask.cpp +++ b/app/task/project/load/loadbasetask.cpp @@ -20,7 +20,7 @@ #include "loadbasetask.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ProjectLoadBaseTask::ProjectLoadBaseTask(const QString &filename) : project_(nullptr), @@ -29,4 +29,4 @@ ProjectLoadBaseTask::ProjectLoadBaseTask(const QString &filename) : SetTitle(tr("Loading '%1'").arg(filename)); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/task/project/load/loadbasetask.h b/app/task/project/load/loadbasetask.h index 933b7588d..a7dc831bf 100644 --- a/app/task/project/load/loadbasetask.h +++ b/app/task/project/load/loadbasetask.h @@ -24,7 +24,7 @@ #include "project/project.h" #include "task/task.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ProjectLoadBaseTask : public Task { @@ -69,6 +69,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // LOADBASETASK_H diff --git a/app/task/project/loadotio/loadotio.cpp b/app/task/project/loadotio/loadotio.cpp index 196b1eee9..beeb65b90 100644 --- a/app/task/project/loadotio/loadotio.cpp +++ b/app/task/project/loadotio/loadotio.cpp @@ -36,7 +36,7 @@ #define OTIO opentimelineio::v1_0 -OLIVE_NAMESPACE_ENTER +namespace olive { LoadOTIOTask::LoadOTIOTask(const QString& s) : ProjectLoadBaseTask(s) @@ -209,4 +209,4 @@ bool LoadOTIOTask::Run() return true; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/task/project/loadotio/loadotio.h b/app/task/project/loadotio/loadotio.h index cddbfabb7..bc5ef72a9 100644 --- a/app/task/project/loadotio/loadotio.h +++ b/app/task/project/loadotio/loadotio.h @@ -24,7 +24,7 @@ #include "project/project.h" #include "task/project/load/loadbasetask.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class LoadOTIOTask : public ProjectLoadBaseTask { @@ -37,6 +37,6 @@ protected: }; -OLIVE_NAMESPACE_EXIT +} #endif // OTIODECODER_H diff --git a/app/task/project/save/save.cpp b/app/task/project/save/save.cpp index 65d44b306..b233693e4 100644 --- a/app/task/project/save/save.cpp +++ b/app/task/project/save/save.cpp @@ -27,7 +27,7 @@ #include "common/filefunctions.h" #include "core.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ProjectSaveTask::ProjectSaveTask(ProjectPtr project) : project_(project) @@ -87,4 +87,4 @@ bool ProjectSaveTask::Run() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/task/project/save/save.h b/app/task/project/save/save.h index c52553b5c..23b116469 100644 --- a/app/task/project/save/save.h +++ b/app/task/project/save/save.h @@ -24,7 +24,7 @@ #include "project/project.h" #include "task/task.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ProjectSaveTask : public Task { @@ -45,6 +45,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // PROJECTSAVEMANAGER_H diff --git a/app/task/project/saveotio/saveotio.cpp b/app/task/project/saveotio/saveotio.cpp index 7def5a7cb..2a2b25092 100644 --- a/app/task/project/saveotio/saveotio.cpp +++ b/app/task/project/saveotio/saveotio.cpp @@ -29,7 +29,7 @@ #include "node/block/transition/transition.h" #include "node/input/media/media.h" -OLIVE_NAMESPACE_ENTER +namespace olive { SaveOTIOTask::SaveOTIOTask(ProjectPtr project) : project_(project) @@ -206,4 +206,4 @@ bool SaveOTIOTask::SerializeTrackList(TrackList *list, opentimelineio::v1_0::Tim return true; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/task/project/saveotio/saveotio.h b/app/task/project/saveotio/saveotio.h index 1a64d11e5..d076a2691 100644 --- a/app/task/project/saveotio/saveotio.h +++ b/app/task/project/saveotio/saveotio.h @@ -27,7 +27,7 @@ #include "project/project.h" #include "task/task.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class SaveOTIOTask : public Task { @@ -49,6 +49,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // PROJECTSAVEASOTIOTASK_H diff --git a/app/task/render/render.cpp b/app/task/render/render.cpp index ab95bb323..be5635944 100644 --- a/app/task/render/render.cpp +++ b/app/task/render/render.cpp @@ -23,7 +23,7 @@ #include "common/timecodefunctions.h" #include "render/rendermanager.h" -OLIVE_NAMESPACE_ENTER +namespace olive { RenderTask::RenderTask(ViewerOutput* viewer, const VideoParams &vparams, const AudioParams &aparams) : viewer_(viewer), @@ -238,4 +238,4 @@ void RenderTask::TicketDone(RenderTicketWatcher* watcher) finished_watcher_mutex_.unlock(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/task/render/render.h b/app/task/render/render.h index 6a0f3214b..ddb97091f 100644 --- a/app/task/render/render.h +++ b/app/task/render/render.h @@ -29,7 +29,7 @@ #include "threading/threadticket.h" #include "threading/threadticketwatcher.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class RenderTask : public Task { @@ -102,6 +102,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // RENDERTASK_H diff --git a/app/task/task.h b/app/task/task.h index d7dce0535..84f056315 100644 --- a/app/task/task.h +++ b/app/task/task.h @@ -27,7 +27,7 @@ #include "common/cancelableobject.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A base class for background tasks running in Olive. @@ -162,6 +162,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TASK_H diff --git a/app/task/taskmanager.cpp b/app/task/taskmanager.cpp index 074641b01..a4b31efb9 100644 --- a/app/task/taskmanager.cpp +++ b/app/task/taskmanager.cpp @@ -23,7 +23,7 @@ #include #include -OLIVE_NAMESPACE_ENTER +namespace olive { TaskManager* TaskManager::instance_ = nullptr; @@ -133,4 +133,4 @@ void TaskManager::TaskFinished() emit TaskListChanged(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/task/taskmanager.h b/app/task/taskmanager.h index 45e11aa21..ef3f9e127 100644 --- a/app/task/taskmanager.h +++ b/app/task/taskmanager.h @@ -27,7 +27,7 @@ #include "task/task.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief An object that manages background Task objects, handling their start and end @@ -136,6 +136,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // TASKMANAGER_H diff --git a/app/threading/threadpool.cpp b/app/threading/threadpool.cpp index 05b57eb8d..a77fbf72d 100644 --- a/app/threading/threadpool.cpp +++ b/app/threading/threadpool.cpp @@ -20,7 +20,7 @@ #include "threadpool.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ThreadPool::ThreadPool(QThread::Priority priority, int threads, QObject *parent) : QObject(parent) @@ -135,4 +135,4 @@ void ThreadPoolThread::CancelEvent() wait_cond_.wakeAll(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/threading/threadpool.h b/app/threading/threadpool.h index 377ae6d5b..8d93667d4 100644 --- a/app/threading/threadpool.h +++ b/app/threading/threadpool.h @@ -26,7 +26,7 @@ #include "common/cancelableobject.h" #include "threading/threadticket.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ThreadPoolThread; @@ -43,7 +43,7 @@ public: virtual void RunTicket(RenderTicketPtr ticket) const = 0; public slots: - void AddTicket(OLIVE_NAMESPACE::RenderTicketPtr ticket, bool prioritize = false); + void AddTicket(olive::RenderTicketPtr ticket, bool prioritize = false); private: void RunNext(); @@ -88,6 +88,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // THREADPOOL_H diff --git a/app/threading/threadticket.cpp b/app/threading/threadticket.cpp index 30ca9bc53..9a30fc37f 100644 --- a/app/threading/threadticket.cpp +++ b/app/threading/threadticket.cpp @@ -20,7 +20,7 @@ #include "threadticket.h" -OLIVE_NAMESPACE_ENTER +namespace olive { RenderTicket::RenderTicket() : started_(false), @@ -121,4 +121,4 @@ void RenderTicket::Cancel() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/threading/threadticket.h b/app/threading/threadticket.h index dca13f78d..5ead976b6 100644 --- a/app/threading/threadticket.h +++ b/app/threading/threadticket.h @@ -30,7 +30,7 @@ #include "common/timerange.h" #include "node/output/viewer/viewer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class RenderTicket : public QObject { @@ -89,8 +89,8 @@ private: using RenderTicketPtr = std::shared_ptr; -OLIVE_NAMESPACE_EXIT +} -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::RenderTicketPtr) +Q_DECLARE_METATYPE(olive::RenderTicketPtr) #endif // RENDERTICKET_H diff --git a/app/threading/threadticketwatcher.cpp b/app/threading/threadticketwatcher.cpp index a8b93ae4b..34ba594ed 100644 --- a/app/threading/threadticketwatcher.cpp +++ b/app/threading/threadticketwatcher.cpp @@ -20,7 +20,7 @@ #include "threadticketwatcher.h" -OLIVE_NAMESPACE_ENTER +namespace olive { RenderTicketWatcher::RenderTicketWatcher(QObject *parent) : QObject(parent), @@ -98,4 +98,4 @@ void RenderTicketWatcher::TicketFinished() emit Finished(this); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/threading/threadticketwatcher.h b/app/threading/threadticketwatcher.h index 9a6ebd351..a6de21e1a 100644 --- a/app/threading/threadticketwatcher.h +++ b/app/threading/threadticketwatcher.h @@ -23,7 +23,7 @@ #include "threadticket.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class RenderTicketWatcher : public QObject { @@ -58,6 +58,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // RENDERTICKETWATCHER_H diff --git a/app/timeline/timelinecommon.h b/app/timeline/timelinecommon.h index d4dbc124f..3646eb907 100644 --- a/app/timeline/timelinecommon.h +++ b/app/timeline/timelinecommon.h @@ -24,7 +24,7 @@ #include "common/define.h" #include "common/rational.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class Block; class TrackOutput; @@ -59,6 +59,6 @@ public: // FIXME: Hardcoded (but that might be okay here) #define PLAYHEAD_COLOR Qt::red -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINECOMMON_H diff --git a/app/timeline/timelinecoordinate.cpp b/app/timeline/timelinecoordinate.cpp index 031b827da..5b9882901 100644 --- a/app/timeline/timelinecoordinate.cpp +++ b/app/timeline/timelinecoordinate.cpp @@ -20,7 +20,7 @@ #include "timelinecoordinate.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TimelineCoordinate::TimelineCoordinate() : track_(Timeline::kTrackTypeNone, 0) @@ -59,4 +59,4 @@ void TimelineCoordinate::SetTrack(const TrackReference &track) track_ = track; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/timeline/timelinecoordinate.h b/app/timeline/timelinecoordinate.h index 26dc7e671..98fa8b34d 100644 --- a/app/timeline/timelinecoordinate.h +++ b/app/timeline/timelinecoordinate.h @@ -24,7 +24,7 @@ #include "common/rational.h" #include "trackreference.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TimelineCoordinate { @@ -46,6 +46,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINECOORDINATE_H diff --git a/app/timeline/timelinemarker.cpp b/app/timeline/timelinemarker.cpp index 4f3e83573..9d5632919 100644 --- a/app/timeline/timelinemarker.cpp +++ b/app/timeline/timelinemarker.cpp @@ -22,7 +22,7 @@ #include "common/xmlutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TimelineMarker::TimelineMarker(const TimeRange &time, const QString &name, QObject *parent) : QObject(parent), @@ -121,4 +121,4 @@ void TimelineMarkerList::Load(QXmlStreamReader *reader) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/timeline/timelinemarker.h b/app/timeline/timelinemarker.h index de99b2539..0466aa689 100644 --- a/app/timeline/timelinemarker.h +++ b/app/timeline/timelinemarker.h @@ -27,7 +27,7 @@ #include "common/timerange.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TimelineMarker : public QObject { @@ -80,6 +80,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINEMARKER_H diff --git a/app/timeline/timelinepoints.cpp b/app/timeline/timelinepoints.cpp index 2c11f6f94..06e87dac0 100644 --- a/app/timeline/timelinepoints.cpp +++ b/app/timeline/timelinepoints.cpp @@ -22,7 +22,7 @@ #include "common/xmlutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TimelineMarkerList *TimelinePoints::markers() { @@ -68,4 +68,4 @@ TimelineWorkArea *TimelinePoints::workarea() return &workarea_; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/timeline/timelinepoints.h b/app/timeline/timelinepoints.h index 888aee94d..437aeb493 100644 --- a/app/timeline/timelinepoints.h +++ b/app/timeline/timelinepoints.h @@ -27,7 +27,7 @@ #include "timelinemarker.h" #include "timelineworkarea.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TimelinePoints { @@ -50,6 +50,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINEPOINTS_H diff --git a/app/timeline/timelineworkarea.cpp b/app/timeline/timelineworkarea.cpp index 75320c5cd..fd57b2295 100644 --- a/app/timeline/timelineworkarea.cpp +++ b/app/timeline/timelineworkarea.cpp @@ -22,7 +22,7 @@ #include "common/xmlutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { const rational TimelineWorkArea::kResetIn = 0; const rational TimelineWorkArea::kResetOut = RATIONAL_MAX; @@ -101,4 +101,4 @@ const rational &TimelineWorkArea::length() const return workarea_range_.length(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/timeline/timelineworkarea.h b/app/timeline/timelineworkarea.h index ce0bc0e05..579bd747f 100644 --- a/app/timeline/timelineworkarea.h +++ b/app/timeline/timelineworkarea.h @@ -27,7 +27,7 @@ #include "common/timerange.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TimelineWorkArea : public QObject { @@ -62,6 +62,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINEWORKAREA_H diff --git a/app/timeline/trackreference.cpp b/app/timeline/trackreference.cpp index b77841fe1..f558ea03d 100644 --- a/app/timeline/trackreference.cpp +++ b/app/timeline/trackreference.cpp @@ -20,7 +20,7 @@ #include "trackreference.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TrackReference::TrackReference() : type_(Timeline::kTrackTypeNone), @@ -62,4 +62,4 @@ uint qHash(const TrackReference &r, uint seed) seed); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/timeline/trackreference.h b/app/timeline/trackreference.h index ffeedab54..827422fc6 100644 --- a/app/timeline/trackreference.h +++ b/app/timeline/trackreference.h @@ -23,7 +23,7 @@ #include "timeline/timelinecommon.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TrackReference { @@ -51,6 +51,6 @@ private: uint qHash(const TrackReference& r, uint seed); -OLIVE_NAMESPACE_EXIT +} #endif // TRACKREFERENCE_H diff --git a/app/tool/tool.h b/app/tool/tool.h index 0285d4073..95a745c59 100644 --- a/app/tool/tool.h +++ b/app/tool/tool.h @@ -26,7 +26,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class Tool { public: @@ -121,6 +121,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // TOOL_H diff --git a/app/ts/en_US.ts b/app/ts/en_US.ts index 15dfc47ab..ef4523a3d 100644 --- a/app/ts/en_US.ts +++ b/app/ts/en_US.ts @@ -1,58 +1,6 @@ - - AboutDialog - - - About %1 - - - - - Olive is a non-linear video editor. This software is free and protected by the GNU GPL. - - - - - Olive Team is obliged to inform users that Olive source code is available for download from its website. - - - - - ActionSearch - - - Search for action... - - - - - AudioInput - - - Audio Input - - - - - Audio - - - - - Import an audio footage stream. - - - - - AudioMonitorPanel - - - Audio Monitor - - - AudioParams @@ -92,7 +40,408 @@ - Block + Config + + + Error loading settings + + + + + Failed to load application settings. This session will use defaults. + +%1 + + + + + Error saving settings + + + + + Failed to save application settings. The application may lack write permissions to this location. + + + + + Footage + + + %1 FPS + + + + + %1 Hz + + + + + Filename: %1 + + + + + This footage is not valid for use + + + + + ImportTool + + + Don't ask me again + + + + + No Active Sequence + + + + + No sequence is currently open. Would you like to create one? + + + + + Automatically Detect Parameters From Footage + + + + + Set Parameters Manually + + + + + MoveItemCommand + + + Move Item + + + + + NodeCopyPasteWidget + + + Error pasting nodes + + + + + Failed to paste nodes: %1 + + + + + NodeFactory + + + None + + + + + NodeViewItem + + + %1... + + + + + PresetManager + + + Save Preset + + + + + Set preset name: + + + + + Invalid preset name + + + + + You must enter a preset name + + + + + Preset exists + + + + + A preset with this name already exists. Would you like to replace it? + + + + + RatioDialog + + + Enter custom ratio (e.g. "4:3", "16/9", etc.): + + + + + Invalid custom ratio + + + + + Failed to parse "%1" into an aspect ratio. Please format a rational fraction with a ':' or a '/' separator. + + + + + RenameItemCommand + + + Rename Item + + + + + Sequence + + + %1 FPS + + + + + Stream + + + %1: Audio - %2 Channels, %3Hz + + + + + %1: Unknown + + + + + %1: Image - %2x%3 + + + + + %1: Video - %2x%3 + + + + + TimelineViewBlockItem + + + %1 + +In: %2 +Out: %3 +Length: %4 + + + + + Tool + + + Empty + + + + + Bars + + + + + Solid + + + + + Title + + + + + Tone + + + + + Unknown + + + + + VideoParams + + + 8-bit + + + + + 16-bit Integer + + + + + Half-Float (16-bit) + + + + + Full-Float (32-bit) + + + + + Unknown (0x%1) + + + + + %1 FPS + + + + + Square Pixels (%1) + + + + + NTSC Standard (%1) + + + + + NTSC Widescreen (%1) + + + + + PAL Standard (%1) + + + + + PAL Widescreen (%1) + + + + + HD Anamorphic 1080 (%1) + + + + + main + + + Show this help text + + + + + Show application version + + + + + Start in full-screen mode + + + + + Export only (No GUI) + + + + + Override language with file + + + + + qm-file + + + + + Project to open on startup + + + + + olive::AboutDialog + + + About %1 + + + + + Olive is a non-linear video editor. This software is free and protected by the GNU GPL. + + + + + Olive Team is obliged to inform users that Olive source code is available for download from its website. + + + + + olive::ActionSearch + + + Search for action... + + + + + olive::AudioInput + + + Audio Input + + + + + Audio + + + + + Import an audio footage stream. + + + + + olive::AudioMonitorPanel + + + Audio Monitor + + + + + olive::Block Length @@ -115,7 +464,7 @@ - BlurFilterNode + olive::BlurFilterNode Blur @@ -168,7 +517,7 @@ - ClipBlock + olive::ClipBlock Clip @@ -186,7 +535,7 @@ - ColorDialog + olive::ColorDialog Select Color @@ -194,7 +543,7 @@ - ColorSpaceChooser + olive::ColorSpaceChooser Color Management @@ -232,7 +581,7 @@ - ColorValuesTab + olive::ColorValuesTab Red @@ -250,7 +599,7 @@ - ColorValuesWidget + olive::ColorValuesWidget Preview @@ -273,32 +622,7 @@ - Config - - - Error loading settings - - - - - Failed to load application settings. This session will use defaults. - -%1 - - - - - Error saving settings - - - - - Failed to save application settings. The application may lack write permissions to this location. - - - - - ConformTask + olive::ConformTask Conforming Audio %1:%2 @@ -306,261 +630,261 @@ - Core + olive::Core - + Import error - + Nothing to import - + Importing... - + Import footage... - + Failed to import footage - + Failed to find active Project panel - + No Active Project - + No project is currently open to set the properties for - + Failed to create new folder - - + + Failed to find active project - + New Folder - + Failed to create new sequence - + Possible image sequence detected - + The file '%1' looks like it might be part of an image sequence. Would you like to import it as such? - + You must specify a project file to export - + Specified project does not exist - + Project contains no sequences, nothing to export - + This project has multiple sequences. Which do you wish to export? - + Enter number (or %1 to cancel): - + Invalid sequence number - + Export succeeded - + Export failed: %1 - + Project failed to load: %1 - + Failed to open startup file - + The project "%1" doesn't exist. A new project will be started instead. - - + + Missing OpenTimelineIO Libraries - - + + This build was compiled without OpenTimelineIO and therefore cannot open OpenTimelineIO files. - + Save Project - - + + Error - + This Sequence is empty. There is nothing to export. - + No valid sequence detected. Make sure a sequence is loaded and it has a connected Viewer node. - + Olive Project - + OpenTimelineIO - + Save Project As - + Load Project - + Label Node - + Set node label - + Sequence %1 - + Cannot open recent project - + The project "%1" doesn't exist. Would you like to remove this file from the recent list? - + Unsaved Changes - + The project '%1' has unsaved changes. Would you like to save them? - + Save - + Save All - + Don't Save - + Don't Save All - + Failed to cache sequence - + No active viewer found with this sequence. - + Open Project - CrashHandlerDialog + olive::CrashHandlerDialog Olive @@ -618,7 +942,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - CrossDissolveTransition + olive::CrossDissolveTransition Cross Dissolve @@ -631,7 +955,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - CurvePanel + olive::CurvePanel Curve Editor @@ -639,7 +963,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - CurveView + olive::CurveView Zoom to Fit @@ -647,7 +971,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - CurveWidget + olive::CurveWidget Linear @@ -665,7 +989,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - DipToColorTransition + olive::DipToColorTransition Dip To Color @@ -678,7 +1002,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - DiskCacheDialog + olive::DiskCacheDialog Disk Cache: %1 @@ -733,7 +1057,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - DiskManager + olive::DiskManager @@ -762,7 +1086,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - ElapsedCounterWidget + olive::ElapsedCounterWidget Elapsed: %1 @@ -775,7 +1099,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - ExportAdvancedVideoDialog + olive::ExportAdvancedVideoDialog Advanced @@ -803,7 +1127,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - ExportAudioTab + olive::ExportAudioTab Codec: @@ -826,7 +1150,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - ExportCodec + olive::ExportCodec DNxHD @@ -889,7 +1213,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - ExportDialog + olive::ExportDialog Filename: @@ -1023,7 +1347,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - ExportFormat + olive::ExportFormat DNxHD @@ -1066,7 +1390,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - ExportTask + olive::ExportTask Exporting "%1" @@ -1089,7 +1413,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - ExportVideoTab + olive::ExportVideoTab Basic @@ -1167,7 +1491,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - FloatSlider + olive::FloatSlider %1 dB @@ -1180,30 +1504,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - Footage - - - %1 FPS - - - - - %1 Hz - - - - - Filename: %1 - - - - - This footage is not valid for use - - - - - FootagePropertiesDialog + olive::FootagePropertiesDialog "%1" Properties @@ -1221,7 +1522,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - FootageRelinkDialog + olive::FootageRelinkDialog Footage @@ -1259,7 +1560,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - FootageViewerPanel + olive::FootageViewerPanel Footage Viewer @@ -1267,7 +1568,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - GapBlock + olive::GapBlock Gap @@ -1280,7 +1581,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - H264BitRateSection + olive::H264BitRateSection Target Bit Rate (Mbps): @@ -1298,7 +1599,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - H264FileSizeSection + olive::H264FileSizeSection Target File Size (MB): @@ -1311,7 +1612,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - H264Section + olive::H264Section Compression Method: @@ -1334,7 +1635,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - ImageSection + olive::ImageSection Image Sequence: @@ -1342,35 +1643,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - ImportTool - - - Don't ask me again - - - - - No Active Sequence - - - - - No sequence is currently open. Would you like to create one? - - - - - Automatically Detect Parameters From Footage - - - - - Set Parameters Manually - - - - - InterlacedComboBox + olive::InterlacedComboBox None (Progressive) @@ -1388,7 +1661,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - KeyframePropertiesDialog + olive::KeyframePropertiesDialog Keyframe Properties @@ -1421,7 +1694,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - KeyframeViewBase + olive::KeyframeViewBase Linear @@ -1444,7 +1717,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - LoadOTIOTask + olive::LoadOTIOTask Failed to load OpenTimelineIO from file "%1" @@ -1462,7 +1735,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - MainMenu + olive::MainMenu &Save '%1' @@ -1860,7 +2133,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - MainStatusBar + olive::MainStatusBar Welcome to %1 %2 @@ -1873,7 +2146,7 @@ Make sure a sequence is loaded and it has a connected Viewer node. - MainWindow + olive::MainWindow Driver Warning @@ -1888,7 +2161,7 @@ This driver is known to have stability and performance issues with Olive. It is - ManagedDisplayWidget + olive::ManagedDisplayWidget Color Space @@ -1931,7 +2204,7 @@ This driver is known to have stability and performance issues with Olive. It is - ManagedPixelSamplerWidget + olive::ManagedPixelSamplerWidget Display @@ -1944,7 +2217,7 @@ This driver is known to have stability and performance issues with Olive. It is - MathNode + olive::MathNode Math @@ -1993,7 +2266,7 @@ This driver is known to have stability and performance issues with Olive. It is - MatrixGenerator + olive::MatrixGenerator Orthographic Matrix @@ -2036,7 +2309,7 @@ This driver is known to have stability and performance issues with Olive. It is - MediaInput + olive::MediaInput Footage @@ -2044,7 +2317,7 @@ This driver is known to have stability and performance issues with Olive. It is - MenuShared + olive::MenuShared &Project @@ -2172,7 +2445,7 @@ This driver is known to have stability and performance issues with Olive. It is - MergeNode + olive::MergeNode Merge @@ -2195,7 +2468,7 @@ This driver is known to have stability and performance issues with Olive. It is - Node + olive::Node Input @@ -2253,28 +2526,7 @@ This driver is known to have stability and performance issues with Olive. It is - NodeCopyPasteWidget - - - Error pasting nodes - - - - - Failed to paste nodes: %1 - - - - - NodeFactory - - - None - - - - - NodeInput + olive::NodeInput Input @@ -2282,7 +2534,7 @@ This driver is known to have stability and performance issues with Olive. It is - NodeOutput + olive::NodeOutput Output @@ -2290,7 +2542,7 @@ This driver is known to have stability and performance issues with Olive. It is - NodePanel + olive::NodePanel Node Editor @@ -2298,7 +2550,7 @@ This driver is known to have stability and performance issues with Olive. It is - NodeParam + olive::NodeParam Value @@ -2391,7 +2643,7 @@ This driver is known to have stability and performance issues with Olive. It is - NodeParamViewArrayWidget + olive::NodeParamViewArrayWidget + @@ -2404,7 +2656,7 @@ This driver is known to have stability and performance issues with Olive. It is - NodeParamViewConnectedLabel + olive::NodeParamViewConnectedLabel Connected to @@ -2422,7 +2674,7 @@ This driver is known to have stability and performance issues with Olive. It is - NodeParamViewItem + olive::NodeParamViewItem %1 (%2) @@ -2430,7 +2682,7 @@ This driver is known to have stability and performance issues with Olive. It is - NodeParamViewItemBody + olive::NodeParamViewItemBody %1: @@ -2438,7 +2690,7 @@ This driver is known to have stability and performance issues with Olive. It is - NodeParamViewKeyframeControl + olive::NodeParamViewKeyframeControl Warning @@ -2451,7 +2703,7 @@ This driver is known to have stability and performance issues with Olive. It is - NodeTablePanel + olive::NodeTablePanel Table View @@ -2459,7 +2711,7 @@ This driver is known to have stability and performance issues with Olive. It is - NodeTableView + olive::NodeTableView Type @@ -2497,7 +2749,7 @@ This driver is known to have stability and performance issues with Olive. It is - NodeTreeView + olive::NodeTreeView Nodes @@ -2505,7 +2757,7 @@ This driver is known to have stability and performance issues with Olive. It is - NodeView + olive::NodeView Label @@ -2568,15 +2820,7 @@ This driver is known to have stability and performance issues with Olive. It is - NodeViewItem - - - %1... - - - - - PanNode + olive::PanNode @@ -2595,7 +2839,7 @@ This driver is known to have stability and performance issues with Olive. It is - PanelWidget + olive::PanelWidget %1: %2 @@ -2603,7 +2847,7 @@ This driver is known to have stability and performance issues with Olive. It is - ParamPanel + olive::ParamPanel Parameter Editor @@ -2621,7 +2865,7 @@ This driver is known to have stability and performance issues with Olive. It is - PathWidget + olive::PathWidget Browse @@ -2634,7 +2878,7 @@ This driver is known to have stability and performance issues with Olive. It is - PixelAspectRatioComboBox + olive::PixelAspectRatioComboBox Set Custom Pixel Aspect Ratio @@ -2652,7 +2896,7 @@ This driver is known to have stability and performance issues with Olive. It is - PixelSamplerPanel + olive::PixelSamplerPanel Pixel Sampler @@ -2660,7 +2904,7 @@ This driver is known to have stability and performance issues with Olive. It is - PixelSamplerWidget + olive::PixelSamplerWidget Color @@ -2673,7 +2917,7 @@ This driver is known to have stability and performance issues with Olive. It is - PolygonGenerator + olive::PolygonGenerator Polygon @@ -2696,7 +2940,7 @@ This driver is known to have stability and performance issues with Olive. It is - PreCacheTask + olive::PreCacheTask Pre-caching %1:%2 @@ -2704,7 +2948,7 @@ This driver is known to have stability and performance issues with Olive. It is - PreferencesAppearanceTab + olive::PreferencesAppearanceTab Theme @@ -2717,7 +2961,7 @@ This driver is known to have stability and performance issues with Olive. It is - PreferencesAudioTab + olive::PreferencesAudioTab Output Device: @@ -2765,7 +3009,7 @@ This driver is known to have stability and performance issues with Olive. It is - PreferencesBehaviorTab + olive::PreferencesBehaviorTab Behavior @@ -2908,7 +3152,7 @@ This driver is known to have stability and performance issues with Olive. It is - PreferencesDialog + olive::PreferencesDialog Preferences @@ -2946,7 +3190,7 @@ This driver is known to have stability and performance issues with Olive. It is - PreferencesDiskTab + olive::PreferencesDiskTab Disk Management @@ -2995,55 +3239,55 @@ This driver is known to have stability and performance issues with Olive. It is - PreferencesGeneralTab + olive::PreferencesGeneralTab - + Language: - + Auto-Scroll Method: - + None - + Page Scrolling - + Smooth Scrolling - + Rectified Waveforms: - + Default Still Image Length: - + %1 seconds - + %1 (%2) - PreferencesKeyboardTab + olive::PreferencesKeyboardTab Search for action or shortcut @@ -3127,40 +3371,7 @@ This driver is known to have stability and performance issues with Olive. It is - PresetManager - - - Save Preset - - - - - Set preset name: - - - - - Invalid preset name - - - - - You must enter a preset name - - - - - Preset exists - - - - - A preset with this name already exists. Would you like to replace it? - - - - - ProgressDialog + olive::ProgressDialog Cancel @@ -3168,7 +3379,7 @@ This driver is known to have stability and performance issues with Olive. It is - Project + olive::Project @@ -3177,7 +3388,7 @@ This driver is known to have stability and performance issues with Olive. It is - ProjectExplorer + olive::ProjectExplorer &New @@ -3263,7 +3474,7 @@ What would you like to do with these clips? - ProjectExplorerNavigation + olive::ProjectExplorerNavigation Go to parent folder @@ -3271,7 +3482,7 @@ What would you like to do with these clips? - ProjectImportErrorDialog + olive::ProjectImportErrorDialog Import Error @@ -3284,7 +3495,7 @@ What would you like to do with these clips? - ProjectImportTask + olive::ProjectImportTask Importing %1 files @@ -3292,7 +3503,7 @@ What would you like to do with these clips? - ProjectLoadBaseTask + olive::ProjectLoadBaseTask Loading '%1' @@ -3300,7 +3511,7 @@ What would you like to do with these clips? - ProjectLoadTask + olive::ProjectLoadTask This project is newer than this version of Olive and cannot be opened. @@ -3319,7 +3530,7 @@ What would you like to do with these clips? - ProjectPanel + olive::ProjectPanel Folder @@ -3337,7 +3548,7 @@ What would you like to do with these clips? - ProjectPropertiesDialog + olive::ProjectPropertiesDialog Project Properties for '%1' @@ -3426,7 +3637,7 @@ What would you like to do with these clips? - ProjectSaveTask + olive::ProjectSaveTask Saving '%1' @@ -3449,7 +3660,7 @@ What would you like to do with these clips? - ProjectToolbar + olive::ProjectToolbar New... @@ -3497,7 +3708,7 @@ What would you like to do with these clips? - ProjectViewModel + olive::ProjectViewModel Name @@ -3520,41 +3731,7 @@ What would you like to do with these clips? - ProjectViewModel::MoveItemCommand - - - Move Item - - - - - ProjectViewModel::RenameItemCommand - - - Rename Item - - - - - RatioDialog - - - Enter custom ratio (e.g. "4:3", "16/9", etc.): - - - - - Invalid custom ratio - - - - - Failed to parse "%1" into an aspect ratio. Please format a rational fraction with a ':' or a '/' separator. - - - - - RenderCancelDialog + olive::RenderCancelDialog Waiting for workers to finish... @@ -3567,7 +3744,7 @@ What would you like to do with these clips? - RichTextDialog + olive::RichTextDialog B @@ -3660,7 +3837,7 @@ What would you like to do with these clips? - SaveOTIOTask + olive::SaveOTIOTask Exporting project to OpenTimelineIO @@ -3678,7 +3855,7 @@ What would you like to do with these clips? - ScopePanel + olive::ScopePanel Waveform @@ -3696,15 +3873,7 @@ What would you like to do with these clips? - Sequence - - - %1 FPS - - - - - SequenceDialog + olive::SequenceDialog Name: @@ -3732,7 +3901,7 @@ What would you like to do with these clips? - SequenceDialogParameterTab + olive::SequenceDialogParameterTab Video @@ -3805,7 +3974,7 @@ What would you like to do with these clips? - SequenceDialogPresetTab + olive::SequenceDialogPresetTab Preset @@ -3883,7 +4052,7 @@ What would you like to do with these clips? - SequenceViewerPanel + olive::SequenceViewerPanel Sequence Viewer @@ -3891,7 +4060,7 @@ What would you like to do with these clips? - SliderBase + olive::SliderBase Invalid Value @@ -3904,7 +4073,7 @@ What would you like to do with these clips? - SolidGenerator + olive::SolidGenerator Solid @@ -3922,30 +4091,7 @@ What would you like to do with these clips? - Stream - - - %1: Audio - %2 Channels, %3Hz - - - - - %1: Unknown - - - - - %1: Image - %2x%3 - - - - - %1: Video - %2x%3 - - - - - StringSlider + olive::StringSlider (none) @@ -3953,7 +4099,7 @@ What would you like to do with these clips? - StrokeFilterNode + olive::StrokeFilterNode Stroke @@ -3991,7 +4137,7 @@ What would you like to do with these clips? - Task + olive::Task Task @@ -4004,7 +4150,7 @@ What would you like to do with these clips? - TaskDialog + olive::TaskDialog Task Failed @@ -4012,7 +4158,7 @@ What would you like to do with these clips? - TaskManagerPanel + olive::TaskManagerPanel Task Manager @@ -4020,7 +4166,7 @@ What would you like to do with these clips? - TaskViewItem + olive::TaskViewItem Error: %1 @@ -4028,7 +4174,7 @@ What would you like to do with these clips? - TextGenerator + olive::TextGenerator Sample Text @@ -4082,7 +4228,7 @@ What would you like to do with these clips? - TimeBasedPanel + olive::TimeBasedPanel (none) @@ -4090,7 +4236,7 @@ What would you like to do with these clips? - TimeBasedWidget + olive::TimeBasedWidget Set Marker @@ -4103,7 +4249,7 @@ What would you like to do with these clips? - TimeInput + olive::TimeInput Time @@ -4116,7 +4262,7 @@ What would you like to do with these clips? - TimelinePanel + olive::TimelinePanel Timeline @@ -4124,19 +4270,7 @@ What would you like to do with these clips? - TimelineViewBlockItem - - - %1 - -In: %2 -Out: %3 -Length: %4 - - - - - TimelineWidget + olive::TimelineWidget @@ -4150,40 +4284,7 @@ Length: %4 - Tool - - - Empty - - - - - Bars - - - - - Solid - - - - - Title - - - - - Tone - - - - - Unknown - - - - - ToolPanel + olive::ToolPanel Tools @@ -4191,7 +4292,7 @@ Length: %4 - Toolbar + olive::Toolbar Pointer Tool @@ -4259,7 +4360,7 @@ Length: %4 - TrackOutput + olive::TrackOutput Track @@ -4302,7 +4403,7 @@ Length: %4 - TrackViewItem + olive::TrackViewItem M @@ -4315,7 +4416,7 @@ Length: %4 - TransitionBlock + olive::TransitionBlock From @@ -4348,7 +4449,7 @@ Length: %4 - TrigonometryNode + olive::TrigonometryNode Trigonometry @@ -4411,7 +4512,7 @@ Length: %4 - VideoDividerComboBox + olive::VideoDividerComboBox Full @@ -4424,7 +4525,7 @@ Length: %4 - VideoInput + olive::VideoInput Video Input @@ -4442,128 +4543,65 @@ Length: %4 - VideoParams + olive::VideoStreamProperties - - 8-bit - - - - - 16-bit Integer - - - - - Half-Float (16-bit) - - - - - Full-Float (32-bit) - - - - - Unknown (0x%1) - - - - - %1 FPS - - - - - Square Pixels (%1) - - - - - NTSC Standard (%1) - - - - - NTSC Widescreen (%1) - - - - - PAL Standard (%1) - - - - - PAL Widescreen (%1) - - - - - HD Anamorphic 1080 (%1) - - - - - VideoStreamProperties - - + Pixel Aspect: - + Interlacing: - + Color Space: - + Default (%1) - + Premultiplied Alpha - + Image Sequence - + Start Index: - + End Index: - + Frame Rate: - + Invalid Configuration - + Image sequence end index must be a value higher than the start index. - ViewerOutput + olive::ViewerOutput Viewer @@ -4601,7 +4639,7 @@ Length: %4 - ViewerPanel + olive::ViewerPanel Viewer @@ -4609,7 +4647,7 @@ Length: %4 - ViewerWidget + olive::ViewerWidget Error @@ -4708,7 +4746,7 @@ Length: %4 - VolumeNode + olive::VolumeNode @@ -4726,37 +4764,4 @@ Length: %4 - - main - - - Show this help text - - - - - Show application version - - - - - Start in full-screen mode - - - - - Export only (No GUI) - - - - - Override language with file - - - - - Project to open on startup - - - diff --git a/app/ui/icons/icons.cpp b/app/ui/icons/icons.cpp index 5cd7ee9d0..f5ccd421d 100644 --- a/app/ui/icons/icons.cpp +++ b/app/ui/icons/icons.cpp @@ -20,7 +20,7 @@ #include "icons.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /// Works in conjunction with `genicons.sh` to generate and utilize icons of specific sizes const int ICON_SIZE_COUNT = 4; @@ -140,4 +140,4 @@ QIcon icon::Create(const QString& theme, const QString &name) return icon; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/ui/icons/icons.h b/app/ui/icons/icons.h index a11df8778..ea8bc4e6d 100644 --- a/app/ui/icons/icons.h +++ b/app/ui/icons/icons.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { namespace icon { @@ -125,6 +125,6 @@ void LoadAll(const QString &theme); } -OLIVE_NAMESPACE_EXIT +} #endif // ICONS_H diff --git a/app/ui/style/style.cpp b/app/ui/style/style.cpp index 7b5b43fea..e4fa53722 100644 --- a/app/ui/style/style.cpp +++ b/app/ui/style/style.cpp @@ -31,7 +31,7 @@ #include "config/config.h" #include "ui/icons/icons.h" -OLIVE_NAMESPACE_ENTER +namespace olive { const char* StyleManager::kDefaultStyle = "olive-dark"; QString StyleManager::current_style_; @@ -192,4 +192,4 @@ void StyleManager::SetStyle(const QString &style_path) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/ui/style/style.h b/app/ui/style/style.h index edb07de79..be77dce06 100644 --- a/app/ui/style/style.h +++ b/app/ui/style/style.h @@ -26,7 +26,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class StyleManager : public QObject { public: @@ -58,6 +58,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // STYLEMANAGER_H diff --git a/app/undo/undocommand.cpp b/app/undo/undocommand.cpp index ad880b9ca..db8318c3e 100644 --- a/app/undo/undocommand.cpp +++ b/app/undo/undocommand.cpp @@ -22,7 +22,7 @@ #include "core.h" -OLIVE_NAMESPACE_ENTER +namespace olive { UndoCommand::UndoCommand(QUndoCommand *parent) : QUndoCommand(parent) @@ -54,4 +54,4 @@ void UndoCommand::undo_internal() QUndoCommand::undo(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/undo/undocommand.h b/app/undo/undocommand.h index 3257d7ed9..ff71174d1 100644 --- a/app/undo/undocommand.h +++ b/app/undo/undocommand.h @@ -26,7 +26,7 @@ #include "common/define.h" #include "project/project.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class UndoCommand : public QUndoCommand { @@ -47,6 +47,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // UNDOCOMMAND_H diff --git a/app/undo/undostack.cpp b/app/undo/undostack.cpp index 9a8ae4c53..299f6f695 100644 --- a/app/undo/undostack.cpp +++ b/app/undo/undostack.cpp @@ -20,7 +20,7 @@ #include "undostack.h" -OLIVE_NAMESPACE_ENTER +namespace olive { void UndoStack::pushIfHasChildren(QUndoCommand *command) { @@ -31,4 +31,4 @@ void UndoStack::pushIfHasChildren(QUndoCommand *command) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/undo/undostack.h b/app/undo/undostack.h index 486cac0d8..f19e98969 100644 --- a/app/undo/undostack.h +++ b/app/undo/undostack.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class UndoStack : public QUndoStack { public: @@ -37,6 +37,6 @@ public: void pushIfHasChildren(QUndoCommand* command); }; -OLIVE_NAMESPACE_EXIT +} #endif // UNDOSTACK_H diff --git a/app/widget/audiomonitor/audiomonitor.cpp b/app/widget/audiomonitor/audiomonitor.cpp index e41354d3c..22ba0eb58 100644 --- a/app/widget/audiomonitor/audiomonitor.cpp +++ b/app/widget/audiomonitor/audiomonitor.cpp @@ -27,7 +27,7 @@ #include "audio/audiomanager.h" #include "common/qtutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { const int kDecibelStep = 6; const int kDecibelMinimum = -200; @@ -357,4 +357,4 @@ QVector AudioMonitor::GetAverages() const return v; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/audiomonitor/audiomonitor.h b/app/widget/audiomonitor/audiomonitor.h index 2fd782179..e9189b3d8 100644 --- a/app/widget/audiomonitor/audiomonitor.h +++ b/app/widget/audiomonitor/audiomonitor.h @@ -29,7 +29,7 @@ #include "render/audioparams.h" #include "render/audioplaybackcache.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class AudioMonitor : public QOpenGLWidget { @@ -78,6 +78,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // AUDIOMONITORWIDGET_H diff --git a/app/widget/clickablelabel/clickablelabel.cpp b/app/widget/clickablelabel/clickablelabel.cpp index 3b5c6bdff..a55837dbd 100644 --- a/app/widget/clickablelabel/clickablelabel.cpp +++ b/app/widget/clickablelabel/clickablelabel.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { ClickableLabel::ClickableLabel(const QString &text, QWidget *parent) : QLabel(text, parent) @@ -48,4 +48,4 @@ void ClickableLabel::mouseDoubleClickEvent(QMouseEvent *event) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/clickablelabel/clickablelabel.h b/app/widget/clickablelabel/clickablelabel.h index 5e13ff605..3897097ce 100644 --- a/app/widget/clickablelabel/clickablelabel.h +++ b/app/widget/clickablelabel/clickablelabel.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ClickableLabel : public QLabel { @@ -44,6 +44,6 @@ signals: }; -OLIVE_NAMESPACE_EXIT +} #endif // CLICKABLELABEL_H diff --git a/app/widget/collapsebutton/collapsebutton.cpp b/app/widget/collapsebutton/collapsebutton.cpp index 9d09738b6..2d31330b8 100644 --- a/app/widget/collapsebutton/collapsebutton.cpp +++ b/app/widget/collapsebutton/collapsebutton.cpp @@ -22,7 +22,7 @@ #include "ui/icons/icons.h" -OLIVE_NAMESPACE_ENTER +namespace olive { CollapseButton::CollapseButton(QWidget *parent) : QPushButton(parent) @@ -47,4 +47,4 @@ void CollapseButton::UpdateIcon(bool e) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/collapsebutton/collapsebutton.h b/app/widget/collapsebutton/collapsebutton.h index 7b57505f2..ab3a6ff18 100644 --- a/app/widget/collapsebutton/collapsebutton.h +++ b/app/widget/collapsebutton/collapsebutton.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class CollapseButton : public QPushButton { @@ -38,6 +38,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // COLLAPSEBUTTON_H diff --git a/app/widget/colorbutton/colorbutton.cpp b/app/widget/colorbutton/colorbutton.cpp index 23b2f11f4..716d7f906 100644 --- a/app/widget/colorbutton/colorbutton.cpp +++ b/app/widget/colorbutton/colorbutton.cpp @@ -22,7 +22,7 @@ #include "dialog/color/colordialog.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ColorButton::ColorButton(ColorManager* color_manager, QWidget *parent) : QPushButton(parent), @@ -72,7 +72,7 @@ void ColorButton::UpdateColor() QColor managed = color_processor_->ConvertColor(color_).toQColor(); - setStyleSheet(QStringLiteral("%1--ColorButton {background: %2;}").arg(MACRO_VAL_AS_STR(OLIVE_NAMESPACE), managed.name())); + setStyleSheet(QStringLiteral("%1--ColorButton {background: %2;}").arg(MACRO_VAL_AS_STR(olive), managed.name())); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/colorbutton/colorbutton.h b/app/widget/colorbutton/colorbutton.h index 4b3dcef3f..9d3a7e46c 100644 --- a/app/widget/colorbutton/colorbutton.h +++ b/app/widget/colorbutton/colorbutton.h @@ -26,7 +26,7 @@ #include "render/colormanager.h" #include "render/managedcolor.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ColorButton : public QPushButton { @@ -56,6 +56,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // COLORBUTTON_H diff --git a/app/widget/colorwheel/colorgradientwidget.cpp b/app/widget/colorwheel/colorgradientwidget.cpp index 686b924d5..56a166342 100644 --- a/app/widget/colorwheel/colorgradientwidget.cpp +++ b/app/widget/colorwheel/colorgradientwidget.cpp @@ -26,7 +26,7 @@ #include "common/lerp.h" #include "node/node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ColorGradientWidget::ColorGradientWidget(Qt::Orientation orientation, QWidget *parent) : ColorSwatchWidget(parent), @@ -106,4 +106,4 @@ Color ColorGradientWidget::LerpColor(const Color &a, const Color &b, int i, int lerp(a.blue(), b.blue(), t)); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/colorwheel/colorgradientwidget.h b/app/widget/colorwheel/colorgradientwidget.h index d59fe95be..ae972408e 100644 --- a/app/widget/colorwheel/colorgradientwidget.h +++ b/app/widget/colorwheel/colorgradientwidget.h @@ -24,7 +24,7 @@ #include "colorswatchwidget.h" #include "render/color.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ColorGradientWidget : public ColorSwatchWidget { @@ -54,6 +54,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // COLORGRADIENTGLWIDGET_H diff --git a/app/widget/colorwheel/colorpreviewbox.cpp b/app/widget/colorwheel/colorpreviewbox.cpp index 1ff67e206..ad8360649 100644 --- a/app/widget/colorwheel/colorpreviewbox.cpp +++ b/app/widget/colorwheel/colorpreviewbox.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { ColorPreviewBox::ColorPreviewBox(QWidget *parent) : QWidget(parent), @@ -66,4 +66,4 @@ void ColorPreviewBox::paintEvent(QPaintEvent *e) p.drawRect(rect().adjusted(0, 0, -1, -1)); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/colorwheel/colorpreviewbox.h b/app/widget/colorwheel/colorpreviewbox.h index e8fe9266b..88d50335d 100644 --- a/app/widget/colorwheel/colorpreviewbox.h +++ b/app/widget/colorwheel/colorpreviewbox.h @@ -26,7 +26,7 @@ #include "render/color.h" #include "render/colorprocessor.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ColorPreviewBox : public QWidget { @@ -51,6 +51,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // COLORPREVIEWBOX_H diff --git a/app/widget/colorwheel/colorspacechooser.cpp b/app/widget/colorwheel/colorspacechooser.cpp index 39a668d5a..46e98d125 100644 --- a/app/widget/colorwheel/colorspacechooser.cpp +++ b/app/widget/colorwheel/colorspacechooser.cpp @@ -23,7 +23,7 @@ #include #include -OLIVE_NAMESPACE_ENTER +namespace olive { ColorSpaceChooser::ColorSpaceChooser(ColorManager* color_manager, bool enable_input_field, bool enable_display_fields, QWidget *parent): QGroupBox(parent), @@ -200,4 +200,4 @@ void ColorSpaceChooser::ComboBoxChanged() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/colorwheel/colorspacechooser.h b/app/widget/colorwheel/colorspacechooser.h index ae3bcb4ce..221dca934 100644 --- a/app/widget/colorwheel/colorspacechooser.h +++ b/app/widget/colorwheel/colorspacechooser.h @@ -26,7 +26,7 @@ #include "render/colormanager.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ColorSpaceChooser : public QGroupBox { @@ -66,6 +66,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // COLORSPACECHOOSER_H diff --git a/app/widget/colorwheel/colorswatchwidget.cpp b/app/widget/colorwheel/colorswatchwidget.cpp index 163b493fb..d0d030b38 100644 --- a/app/widget/colorwheel/colorswatchwidget.cpp +++ b/app/widget/colorwheel/colorswatchwidget.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { ColorSwatchWidget::ColorSwatchWidget(QWidget *parent) : QWidget(parent), @@ -98,4 +98,4 @@ void ColorSwatchWidget::SetSelectedColorInternal(const Color &c, bool external) update(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/colorwheel/colorswatchwidget.h b/app/widget/colorwheel/colorswatchwidget.h index 9d20895a0..ee1d8526e 100644 --- a/app/widget/colorwheel/colorswatchwidget.h +++ b/app/widget/colorwheel/colorswatchwidget.h @@ -26,7 +26,7 @@ #include "render/color.h" #include "render/colorprocessor.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ColorSwatchWidget : public QWidget { @@ -68,6 +68,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // COLORSWATCHWIDGET_H diff --git a/app/widget/colorwheel/colorvalueswidget.cpp b/app/widget/colorwheel/colorvalueswidget.cpp index 62703b5e6..cdb13f5e3 100644 --- a/app/widget/colorwheel/colorvalueswidget.cpp +++ b/app/widget/colorwheel/colorvalueswidget.cpp @@ -23,7 +23,7 @@ #include #include -OLIVE_NAMESPACE_ENTER +namespace olive { ColorValuesWidget::ColorValuesWidget(ColorManager *manager, QWidget *parent) : QWidget(parent), @@ -213,4 +213,4 @@ void ColorValuesTab::SliderChanged() emit ColorChanged(GetColor()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/colorwheel/colorvalueswidget.h b/app/widget/colorwheel/colorvalueswidget.h index 3af8d9e95..371cbb392 100644 --- a/app/widget/colorwheel/colorvalueswidget.h +++ b/app/widget/colorwheel/colorvalueswidget.h @@ -28,7 +28,7 @@ #include "render/colormanager.h" #include "widget/slider/floatslider.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ColorValuesTab : public QWidget { @@ -110,6 +110,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // COLORVALUESWIDGET_H diff --git a/app/widget/colorwheel/colorwheelwidget.cpp b/app/widget/colorwheel/colorwheelwidget.cpp index 6d9ce2fc5..2e2aa31f4 100644 --- a/app/widget/colorwheel/colorwheelwidget.cpp +++ b/app/widget/colorwheel/colorwheelwidget.cpp @@ -26,7 +26,7 @@ #include "common/clamp.h" #include "node/node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { #define M_180_OVER_PI 57.295791433133264917914229473464 #define M_RADIAN_TO_0_1 0.15915497620314795810531730409296 @@ -177,4 +177,4 @@ QPoint ColorWheelWidget::GetCoordsFromColor(const Color &c) const return pos; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/colorwheel/colorwheelwidget.h b/app/widget/colorwheel/colorwheelwidget.h index 15c6d1a61..c0d5fc776 100644 --- a/app/widget/colorwheel/colorwheelwidget.h +++ b/app/widget/colorwheel/colorwheelwidget.h @@ -26,7 +26,7 @@ #include "colorswatchwidget.h" #include "render/color.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ColorWheelWidget : public ColorSwatchWidget { @@ -71,6 +71,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // COLORWHEELWIDGET_H diff --git a/app/widget/columnedgridlayout/columnedgridlayout.cpp b/app/widget/columnedgridlayout/columnedgridlayout.cpp index aff4e5a37..5db3b0844 100644 --- a/app/widget/columnedgridlayout/columnedgridlayout.cpp +++ b/app/widget/columnedgridlayout/columnedgridlayout.cpp @@ -20,7 +20,7 @@ #include "columnedgridlayout.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ColumnedGridLayout::ColumnedGridLayout(QWidget* parent, int maximum_columns) : @@ -55,4 +55,4 @@ void ColumnedGridLayout::SetMaximumColumns(int maximum_columns) maximum_columns_ = maximum_columns; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/columnedgridlayout/columnedgridlayout.h b/app/widget/columnedgridlayout/columnedgridlayout.h index e6afb6444..87b50c014 100644 --- a/app/widget/columnedgridlayout/columnedgridlayout.h +++ b/app/widget/columnedgridlayout/columnedgridlayout.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief The ColumnedGridLayout class @@ -48,6 +48,6 @@ private: int maximum_columns_; }; -OLIVE_NAMESPACE_EXIT +} #endif // COLUMNEDGRIDLAYOUT_H diff --git a/app/widget/curvewidget/beziercontrolpointitem.cpp b/app/widget/curvewidget/beziercontrolpointitem.cpp index f40496252..207a92e3e 100644 --- a/app/widget/curvewidget/beziercontrolpointitem.cpp +++ b/app/widget/curvewidget/beziercontrolpointitem.cpp @@ -27,7 +27,7 @@ #include "common/qtutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { BezierControlPointItem::BezierControlPointItem(NodeKeyframePtr key, NodeKeyframe::BezierType mode, QGraphicsItem *parent) : QGraphicsRectItem(parent), @@ -103,4 +103,4 @@ void BezierControlPointItem::UpdatePos() setPos(handle_offset - rect().center()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/curvewidget/beziercontrolpointitem.h b/app/widget/curvewidget/beziercontrolpointitem.h index 720f7fe06..6cca33d5a 100644 --- a/app/widget/curvewidget/beziercontrolpointitem.h +++ b/app/widget/curvewidget/beziercontrolpointitem.h @@ -25,7 +25,7 @@ #include "node/keyframe.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class BezierControlPointItem : public QObject, public QGraphicsRectItem { @@ -63,6 +63,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // BEZIERCONTROLPOINTITEM_H diff --git a/app/widget/curvewidget/curveview.cpp b/app/widget/curvewidget/curveview.cpp index cdc749c45..e93a8fd3d 100644 --- a/app/widget/curvewidget/curveview.cpp +++ b/app/widget/curvewidget/curveview.cpp @@ -27,7 +27,7 @@ #include "common/qtutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { CurveView::CurveView(QWidget *parent) : KeyframeViewBase(parent) @@ -431,4 +431,4 @@ void CurveView::AddKeyframe(NodeKeyframePtr key) connect(key.get(), &NodeKeyframe::TypeChanged, this, &CurveView::KeyframeTypeChanged); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/curvewidget/curveview.h b/app/widget/curvewidget/curveview.h index 4ac8d740c..65a82ed52 100644 --- a/app/widget/curvewidget/curveview.h +++ b/app/widget/curvewidget/curveview.h @@ -26,7 +26,7 @@ #include "widget/keyframeview/keyframeview.h" #include "widget/keyframeview/keyframeviewitem.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class CurveView : public KeyframeViewBase { @@ -97,6 +97,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // CURVEVIEW_H diff --git a/app/widget/curvewidget/curvewidget.cpp b/app/widget/curvewidget/curvewidget.cpp index 05138b7e0..75d481ad9 100644 --- a/app/widget/curvewidget/curvewidget.cpp +++ b/app/widget/curvewidget/curvewidget.cpp @@ -32,7 +32,7 @@ #include "node/node.h" #include "widget/keyframeview/keyframeviewundo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { CurveWidget::CurveWidget(QWidget *parent) : TimeBasedWidget(parent) @@ -322,4 +322,4 @@ void CurveWidget::InputEnabledChanged(NodeInput *i, bool e) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/curvewidget/curvewidget.h b/app/widget/curvewidget/curvewidget.h index a65f8c805..127987289 100644 --- a/app/widget/curvewidget/curvewidget.h +++ b/app/widget/curvewidget/curvewidget.h @@ -33,7 +33,7 @@ #include "widget/nodetreeview/nodetreeview.h" #include "widget/timebased/timebased.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class CurveWidget : public TimeBasedWidget, public TimeTargetObject { @@ -100,6 +100,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // CURVEWIDGET_H diff --git a/app/widget/focusablelineedit/focusablelineedit.cpp b/app/widget/focusablelineedit/focusablelineedit.cpp index cb1f0059b..ea9c00efe 100644 --- a/app/widget/focusablelineedit/focusablelineedit.cpp +++ b/app/widget/focusablelineedit/focusablelineedit.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { FocusableLineEdit::FocusableLineEdit(QWidget *parent) : QLineEdit(parent) @@ -52,4 +52,4 @@ void FocusableLineEdit::focusOutEvent(QFocusEvent *e) emit Confirmed(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/focusablelineedit/focusablelineedit.h b/app/widget/focusablelineedit/focusablelineedit.h index 6dfd21214..a6c2a82b8 100644 --- a/app/widget/focusablelineedit/focusablelineedit.h +++ b/app/widget/focusablelineedit/focusablelineedit.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class FocusableLineEdit : public QLineEdit { @@ -46,6 +46,6 @@ protected: }; -OLIVE_NAMESPACE_EXIT +} #endif // SLIDERLINEEDIT_H diff --git a/app/widget/footagecombobox/footagecombobox.cpp b/app/widget/footagecombobox/footagecombobox.cpp index 7a9ddf42e..684eeeca2 100644 --- a/app/widget/footagecombobox/footagecombobox.cpp +++ b/app/widget/footagecombobox/footagecombobox.cpp @@ -26,7 +26,7 @@ #include "ui/icons/icons.h" #include "widget/menu/menu.h" -OLIVE_NAMESPACE_ENTER +namespace olive { FootageComboBox::FootageComboBox(QWidget *parent) : QComboBox(parent), @@ -128,4 +128,4 @@ QString FootageComboBox::FootageToString(Stream *f) return f->description(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/footagecombobox/footagecombobox.h b/app/widget/footagecombobox/footagecombobox.h index 01eab6653..2d96f4a6f 100644 --- a/app/widget/footagecombobox/footagecombobox.h +++ b/app/widget/footagecombobox/footagecombobox.h @@ -27,7 +27,7 @@ #include "project/item/footage/footage.h" #include "project/project.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class FootageComboBox : public QComboBox { @@ -63,6 +63,6 @@ private: bool only_show_ready_footage_; }; -OLIVE_NAMESPACE_EXIT +} #endif // FOOTAGECOMBOBOX_H diff --git a/app/widget/keyframeview/keyframeview.cpp b/app/widget/keyframeview/keyframeview.cpp index 99782b24f..dddf30c62 100644 --- a/app/widget/keyframeview/keyframeview.cpp +++ b/app/widget/keyframeview/keyframeview.cpp @@ -20,7 +20,7 @@ #include "keyframeview.h" -OLIVE_NAMESPACE_ENTER +namespace olive { KeyframeView::KeyframeView(QWidget *parent) : KeyframeViewBase(parent), @@ -52,4 +52,4 @@ void KeyframeView::AddKeyframe(NodeKeyframePtr key, int y) item->SetOverrideY(scene_pt.y()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/keyframeview/keyframeview.h b/app/widget/keyframeview/keyframeview.h index b21c1e5a0..5eef3934c 100644 --- a/app/widget/keyframeview/keyframeview.h +++ b/app/widget/keyframeview/keyframeview.h @@ -23,7 +23,7 @@ #include "keyframeviewbase.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class KeyframeView : public KeyframeViewBase { @@ -49,6 +49,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // KEYFRAMEVIEW_H diff --git a/app/widget/keyframeview/keyframeviewbase.cpp b/app/widget/keyframeview/keyframeviewbase.cpp index dde824e56..7850ada79 100644 --- a/app/widget/keyframeview/keyframeviewbase.cpp +++ b/app/widget/keyframeview/keyframeviewbase.cpp @@ -30,7 +30,7 @@ #include "widget/menu/menushared.h" #include "widget/nodeparamview/nodeparamviewundo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { KeyframeViewBase::KeyframeViewBase(QWidget *parent) : TimelineViewBase(parent), @@ -538,4 +538,4 @@ void KeyframeViewBase::AutoSelectKeyTimeNeighbors() currently_autoselecting_ = false; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/keyframeview/keyframeviewbase.h b/app/widget/keyframeview/keyframeviewbase.h index ecb7df990..113a14895 100644 --- a/app/widget/keyframeview/keyframeviewbase.h +++ b/app/widget/keyframeview/keyframeviewbase.h @@ -28,7 +28,7 @@ #include "widget/timelinewidget/view/timelineviewbase.h" #include "widget/timetarget/timetarget.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class KeyframeViewBase : public TimelineViewBase, public TimeTargetObject { @@ -105,6 +105,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // KEYFRAMEVIEWBASE_H diff --git a/app/widget/keyframeview/keyframeviewitem.cpp b/app/widget/keyframeview/keyframeviewitem.cpp index 8acde3ee7..783d94544 100644 --- a/app/widget/keyframeview/keyframeviewitem.cpp +++ b/app/widget/keyframeview/keyframeviewitem.cpp @@ -28,7 +28,7 @@ #include "common/qtutils.h" #include "node/input.h" -OLIVE_NAMESPACE_ENTER +namespace olive { KeyframeViewItem::KeyframeViewItem(NodeKeyframePtr key, QGraphicsItem *parent) : QGraphicsRectItem(parent), @@ -127,4 +127,4 @@ void KeyframeViewItem::Redraw() QGraphicsItem::update(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/keyframeview/keyframeviewitem.h b/app/widget/keyframeview/keyframeviewitem.h index d0e974920..102da3b61 100644 --- a/app/widget/keyframeview/keyframeviewitem.h +++ b/app/widget/keyframeview/keyframeviewitem.h @@ -26,7 +26,7 @@ #include "node/keyframe.h" #include "widget/timetarget/timetarget.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class KeyframeViewItem : public QObject, public QGraphicsRectItem, public TimeTargetObject { @@ -63,6 +63,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // KEYFRAMEVIEWITEM_H diff --git a/app/widget/keyframeview/keyframeviewundo.cpp b/app/widget/keyframeview/keyframeviewundo.cpp index 1a0d16690..6e286768e 100644 --- a/app/widget/keyframeview/keyframeviewundo.cpp +++ b/app/widget/keyframeview/keyframeviewundo.cpp @@ -24,7 +24,7 @@ #include "node/node.h" #include "project/item/sequence/sequence.h" -OLIVE_NAMESPACE_ENTER +namespace olive { KeyframeSetTypeCommand::KeyframeSetTypeCommand(NodeKeyframePtr key, NodeKeyframe::Type type, QUndoCommand *parent) : UndoCommand(parent), @@ -82,4 +82,4 @@ void KeyframeSetBezierControlPoint::undo_internal() key_->set_bezier_control(mode_, old_point_); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/keyframeview/keyframeviewundo.h b/app/widget/keyframeview/keyframeviewundo.h index 89e0799ac..a6aa322b1 100644 --- a/app/widget/keyframeview/keyframeviewundo.h +++ b/app/widget/keyframeview/keyframeviewundo.h @@ -24,7 +24,7 @@ #include "node/keyframe.h" #include "undo/undocommand.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class KeyframeSetTypeCommand : public UndoCommand { public: @@ -67,6 +67,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // KEYFRAMEVIEWUNDO_H diff --git a/app/widget/manageddisplay/manageddisplay.cpp b/app/widget/manageddisplay/manageddisplay.cpp index e69731846..0ffc6401b 100644 --- a/app/widget/manageddisplay/manageddisplay.cpp +++ b/app/widget/manageddisplay/manageddisplay.cpp @@ -26,7 +26,7 @@ #include "render/opengl/openglrenderer.h" #include "render/rendermanager.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ManagedDisplayWidget::ManagedDisplayWidget(QWidget *parent) : QWidget(parent), @@ -345,4 +345,4 @@ void ManagedDisplayWidget::SetupColorProcessor() emit ColorProcessorChanged(color_service_); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/manageddisplay/manageddisplay.h b/app/widget/manageddisplay/manageddisplay.h index 100dff95f..7cab3bd38 100644 --- a/app/widget/manageddisplay/manageddisplay.h +++ b/app/widget/manageddisplay/manageddisplay.h @@ -28,7 +28,7 @@ #include "render/renderer.h" #include "widget/menu/menu.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ManagedDisplayWidgetOpenGL : public QOpenGLWidget { @@ -261,6 +261,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // MANAGEDDISPLAYOBJECT_H diff --git a/app/widget/menu/menu.cpp b/app/widget/menu/menu.cpp index c58d806ef..55e4c762d 100644 --- a/app/widget/menu/menu.cpp +++ b/app/widget/menu/menu.cpp @@ -22,7 +22,7 @@ #include "ui/style/style.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Menu::Menu(QMenuBar *bar) { @@ -111,4 +111,4 @@ void Menu::Init() StyleManager::UseOSNativeStyling(this); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/menu/menu.h b/app/widget/menu/menu.h index af9e6d119..6dafb99f1 100644 --- a/app/widget/menu/menu.h +++ b/app/widget/menu/menu.h @@ -27,7 +27,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A menu widget for context menus and menu bars @@ -237,6 +237,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // WIDGETMENU_H diff --git a/app/widget/menu/menushared.cpp b/app/widget/menu/menushared.cpp index b6c201924..9701ec9a6 100644 --- a/app/widget/menu/menushared.cpp +++ b/app/widget/menu/menushared.cpp @@ -24,7 +24,7 @@ #include "panel/panelmanager.h" #include "panel/timeline/timeline.h" -OLIVE_NAMESPACE_ENTER +namespace olive { MenuShared* MenuShared::instance_ = nullptr; @@ -309,4 +309,4 @@ void MenuShared::Retranslate() view_timecode_view_seconds_item_->setText(tr("Seconds")); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/menu/menushared.h b/app/widget/menu/menushared.h index 69d26ba93..60d0b6989 100644 --- a/app/widget/menu/menushared.h +++ b/app/widget/menu/menushared.h @@ -23,7 +23,7 @@ #include "widget/menu/menu.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A static object that provides various "stock" menus for use throughout the application @@ -132,6 +132,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // MENUSHARED_H diff --git a/app/widget/nodecombobox/nodecombobox.cpp b/app/widget/nodecombobox/nodecombobox.cpp index d2a16f011..d8d23c91a 100644 --- a/app/widget/nodecombobox/nodecombobox.cpp +++ b/app/widget/nodecombobox/nodecombobox.cpp @@ -27,7 +27,7 @@ #include "ui/icons/icons.h" #include "widget/menu/menu.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeComboBox::NodeComboBox(QWidget *parent) : QComboBox(parent) @@ -90,4 +90,4 @@ void NodeComboBox::SetNodeInternal(const QString &id, bool emit_signal) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/nodecombobox/nodecombobox.h b/app/widget/nodecombobox/nodecombobox.h index 06f16df90..dbdb8cf16 100644 --- a/app/widget/nodecombobox/nodecombobox.h +++ b/app/widget/nodecombobox/nodecombobox.h @@ -25,7 +25,7 @@ #include "node/node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeComboBox : public QComboBox { @@ -55,6 +55,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // FOOTAGECOMBOBOX_H diff --git a/app/widget/nodecopypaste/nodecopypaste.cpp b/app/widget/nodecopypaste/nodecopypaste.cpp index d25b0b151..ccc6c235a 100644 --- a/app/widget/nodecopypaste/nodecopypaste.cpp +++ b/app/widget/nodecopypaste/nodecopypaste.cpp @@ -27,7 +27,7 @@ #include "widget/nodeview/nodeviewundo.h" #include "window/mainwindow/mainwindow.h" -OLIVE_NAMESPACE_ENTER +namespace olive { void NodeCopyPasteWidget::CopyNodesToClipboard(const QVector &nodes, void *userdata) { @@ -177,4 +177,4 @@ void NodeCopyPasteWidget::PasteNodesFromClipboardInternal(QXmlStreamReader* read reader->skipCurrentElement(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/nodecopypaste/nodecopypaste.h b/app/widget/nodecopypaste/nodecopypaste.h index a960c9d25..00b7c30a0 100644 --- a/app/widget/nodecopypaste/nodecopypaste.h +++ b/app/widget/nodecopypaste/nodecopypaste.h @@ -27,7 +27,7 @@ #include "node/node.h" #include "project/item/sequence/sequence.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeCopyPasteWidget { @@ -45,6 +45,6 @@ protected: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODECOPYPASTEWIDGET_H diff --git a/app/widget/nodeparamview/nodeparamview.cpp b/app/widget/nodeparamview/nodeparamview.cpp index 7b0bd36de..2a734a718 100644 --- a/app/widget/nodeparamview/nodeparamview.cpp +++ b/app/widget/nodeparamview/nodeparamview.cpp @@ -28,7 +28,7 @@ #include "common/timecodefunctions.h" #include "node/output/viewer/viewer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeParamView::NodeParamView(QWidget *parent) : TimeBasedWidget(true, false, parent), @@ -389,4 +389,4 @@ void NodeParamView::FocusChanged(QWidget* old, QWidget* now) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/nodeparamview/nodeparamview.h b/app/widget/nodeparamview/nodeparamview.h index c8f0352a4..1bbefbf52 100644 --- a/app/widget/nodeparamview/nodeparamview.h +++ b/app/widget/nodeparamview/nodeparamview.h @@ -30,7 +30,7 @@ #include "widget/keyframeview/keyframeview.h" #include "widget/timebased/timebased.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeParamViewParamContainer : public QWidget { @@ -134,6 +134,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEPARAMVIEW_H diff --git a/app/widget/nodeparamview/nodeparamviewarraywidget.cpp b/app/widget/nodeparamview/nodeparamviewarraywidget.cpp index dc8cf1714..46b04caba 100644 --- a/app/widget/nodeparamview/nodeparamviewarraywidget.cpp +++ b/app/widget/nodeparamview/nodeparamviewarraywidget.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { NodeParamViewArrayWidget::NodeParamViewArrayWidget(NodeInputArray* array, QWidget* parent) : QWidget(parent), @@ -55,4 +55,4 @@ void NodeParamViewArrayWidget::AddElement() array_->Append(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/nodeparamview/nodeparamviewarraywidget.h b/app/widget/nodeparamview/nodeparamviewarraywidget.h index 83f9bad67..1582f497d 100644 --- a/app/widget/nodeparamview/nodeparamviewarraywidget.h +++ b/app/widget/nodeparamview/nodeparamviewarraywidget.h @@ -27,7 +27,7 @@ #include "node/inputarray.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeParamViewArrayWidget : public QWidget { @@ -49,6 +49,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEPARAMVIEWARRAYWIDGET_H diff --git a/app/widget/nodeparamview/nodeparamviewconnectedlabel.cpp b/app/widget/nodeparamview/nodeparamviewconnectedlabel.cpp index bdcfcdb4e..fba601f93 100644 --- a/app/widget/nodeparamview/nodeparamviewconnectedlabel.cpp +++ b/app/widget/nodeparamview/nodeparamviewconnectedlabel.cpp @@ -28,7 +28,7 @@ #include "widget/menu/menu.h" #include "widget/nodeview/nodeviewundo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeParamViewConnectedLabel::NodeParamViewConnectedLabel(NodeInput *input, QWidget *parent) : QWidget(parent), @@ -86,4 +86,4 @@ void NodeParamViewConnectedLabel::ShowLabelContextMenu() m.exec(QCursor::pos()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/nodeparamview/nodeparamviewconnectedlabel.h b/app/widget/nodeparamview/nodeparamviewconnectedlabel.h index 7e5b99580..ffec58ecc 100644 --- a/app/widget/nodeparamview/nodeparamviewconnectedlabel.h +++ b/app/widget/nodeparamview/nodeparamviewconnectedlabel.h @@ -24,7 +24,7 @@ #include "node/input.h" #include "widget/clickablelabel/clickablelabel.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeParamViewConnectedLabel : public QWidget { Q_OBJECT @@ -46,6 +46,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEPARAMVIEWCONNECTEDLABEL_H diff --git a/app/widget/nodeparamview/nodeparamviewitem.cpp b/app/widget/nodeparamview/nodeparamviewitem.cpp index 7b0e558d8..8261d3720 100644 --- a/app/widget/nodeparamview/nodeparamviewitem.cpp +++ b/app/widget/nodeparamview/nodeparamviewitem.cpp @@ -29,7 +29,7 @@ #include "nodeparamviewundo.h" #include "project/item/sequence/sequence.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeParamViewItem::NodeParamViewItem(Node *node, QWidget *parent) : QDockWidget(parent), @@ -459,4 +459,4 @@ NodeParamViewItemBody::InputUI::InputUI() : { } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/nodeparamview/nodeparamviewitem.h b/app/widget/nodeparamview/nodeparamviewitem.h index 9bc1fef6c..a71b46359 100644 --- a/app/widget/nodeparamview/nodeparamviewitem.h +++ b/app/widget/nodeparamview/nodeparamviewitem.h @@ -35,7 +35,7 @@ #include "widget/clickablelabel/clickablelabel.h" #include "widget/collapsebutton/collapsebutton.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeParamViewItemTitleBar : public QWidget { @@ -186,6 +186,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEPARAMVIEWITEM_H diff --git a/app/widget/nodeparamview/nodeparamviewkeyframecontrol.cpp b/app/widget/nodeparamview/nodeparamviewkeyframecontrol.cpp index a41b0ff2e..6e5e3e7ab 100644 --- a/app/widget/nodeparamview/nodeparamviewkeyframecontrol.cpp +++ b/app/widget/nodeparamview/nodeparamviewkeyframecontrol.cpp @@ -27,7 +27,7 @@ #include "nodeparamviewundo.h" #include "ui/icons/icons.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeParamViewKeyframeControl::NodeParamViewKeyframeControl(bool right_align, QWidget *parent) : QWidget(parent), @@ -277,4 +277,4 @@ void NodeParamViewKeyframeControl::KeyframeEnableChanged(bool e) Core::instance()->undo_stack()->pushIfHasChildren(command); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/nodeparamview/nodeparamviewkeyframecontrol.h b/app/widget/nodeparamview/nodeparamviewkeyframecontrol.h index c27276236..1a22a24c3 100644 --- a/app/widget/nodeparamview/nodeparamviewkeyframecontrol.h +++ b/app/widget/nodeparamview/nodeparamviewkeyframecontrol.h @@ -27,7 +27,7 @@ #include "node/input.h" #include "widget/timetarget/timetarget.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeParamViewKeyframeControl : public QWidget, public TimeTargetObject { @@ -77,6 +77,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEPARAMVIEWKEYFRAMECONTROL_H diff --git a/app/widget/nodeparamview/nodeparamviewrichtext.cpp b/app/widget/nodeparamview/nodeparamviewrichtext.cpp index 4ff1a9da2..b6545dfaa 100644 --- a/app/widget/nodeparamview/nodeparamviewrichtext.cpp +++ b/app/widget/nodeparamview/nodeparamviewrichtext.cpp @@ -26,7 +26,7 @@ #include "dialog/richtext/richtext.h" #include "ui/icons/icons.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeParamViewRichText::NodeParamViewRichText(QWidget *parent) : QWidget(parent) @@ -61,4 +61,4 @@ void NodeParamViewRichText::InnerWidgetTextChanged() emit textEdited(this->text()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/nodeparamview/nodeparamviewrichtext.h b/app/widget/nodeparamview/nodeparamviewrichtext.h index 90555111e..28cae7200 100644 --- a/app/widget/nodeparamview/nodeparamviewrichtext.h +++ b/app/widget/nodeparamview/nodeparamviewrichtext.h @@ -26,7 +26,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeParamViewRichText : public QWidget { @@ -74,6 +74,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEPARAMVIEWRICHTEXT_H diff --git a/app/widget/nodeparamview/nodeparamviewundo.cpp b/app/widget/nodeparamview/nodeparamviewundo.cpp index 397ffb85f..7a02391af 100644 --- a/app/widget/nodeparamview/nodeparamviewundo.cpp +++ b/app/widget/nodeparamview/nodeparamviewundo.cpp @@ -23,7 +23,7 @@ #include "node/node.h" #include "project/item/sequence/sequence.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeParamSetKeyframingCommand::NodeParamSetKeyframingCommand(NodeInput *input, bool setting, QUndoCommand *parent) : UndoCommand(parent), @@ -200,4 +200,4 @@ void NodeParamSetStandardValueCommand::undo_internal() input_->set_standard_value(old_value_, track_); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/nodeparamview/nodeparamviewundo.h b/app/widget/nodeparamview/nodeparamviewundo.h index da531bc4d..07d190a83 100644 --- a/app/widget/nodeparamview/nodeparamviewundo.h +++ b/app/widget/nodeparamview/nodeparamviewundo.h @@ -24,7 +24,7 @@ #include "node/input.h" #include "undo/undocommand.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeParamSetKeyframingCommand : public UndoCommand { public: @@ -136,6 +136,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEPARAMVIEWUNDO_H diff --git a/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp b/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp index b4a1c6492..e04cc9949 100644 --- a/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp +++ b/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp @@ -38,7 +38,7 @@ #include "widget/slider/floatslider.h" #include "widget/slider/integerslider.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeParamViewWidgetBridge::NodeParamViewWidgetBridge(NodeInput *input, QObject *parent) : QObject(parent), @@ -671,4 +671,4 @@ void NodeParamViewWidgetBridge::PropertyChanged(const QString &key, const QVaria } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/nodeparamview/nodeparamviewwidgetbridge.h b/app/widget/nodeparamview/nodeparamviewwidgetbridge.h index 71ea4969d..a4698e001 100644 --- a/app/widget/nodeparamview/nodeparamviewwidgetbridge.h +++ b/app/widget/nodeparamview/nodeparamviewwidgetbridge.h @@ -28,7 +28,7 @@ #include "widget/slider/sliderbase.h" #include "widget/timetarget/timetarget.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeParamViewWidgetBridge : public QObject, public TimeTargetObject { @@ -72,6 +72,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEPARAMVIEWWIDGETBRIDGE_H diff --git a/app/widget/nodetableview/nodetabletraverser.cpp b/app/widget/nodetableview/nodetabletraverser.cpp index 59864c9df..cd94ee5f8 100644 --- a/app/widget/nodetableview/nodetabletraverser.cpp +++ b/app/widget/nodetableview/nodetabletraverser.cpp @@ -20,7 +20,7 @@ #include "nodetabletraverser.h" -OLIVE_NAMESPACE_ENTER +namespace olive { QVariant NodeTableTraverser::ProcessVideoFootage(StreamPtr stream, const rational &input_time) { @@ -43,4 +43,4 @@ QVariant NodeTableTraverser::ProcessAudioFootage(StreamPtr stream, const TimeRan AudioParams::kInternalFormat)); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/nodetableview/nodetabletraverser.h b/app/widget/nodetableview/nodetabletraverser.h index 5eaa8b415..dbfc531cd 100644 --- a/app/widget/nodetableview/nodetabletraverser.h +++ b/app/widget/nodetableview/nodetabletraverser.h @@ -23,7 +23,7 @@ #include "node/traverser.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeTableTraverser : public NodeTraverser { @@ -37,6 +37,6 @@ protected: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODETABLETRAVERSER_H diff --git a/app/widget/nodetableview/nodetableview.cpp b/app/widget/nodetableview/nodetableview.cpp index 972032f55..90afc94af 100644 --- a/app/widget/nodetableview/nodetableview.cpp +++ b/app/widget/nodetableview/nodetableview.cpp @@ -26,7 +26,7 @@ #include "node/param.h" #include "nodetabletraverser.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeTableView::NodeTableView(QWidget* parent) : QTreeWidget(parent) @@ -260,4 +260,4 @@ void NodeTableView::SetNode(Node *n, const rational &time) } */ -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/nodetableview/nodetableview.h b/app/widget/nodetableview/nodetableview.h index f2bbf6ca4..49e768740 100644 --- a/app/widget/nodetableview/nodetableview.h +++ b/app/widget/nodetableview/nodetableview.h @@ -25,7 +25,7 @@ #include "node/node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeTableView : public QTreeWidget { @@ -46,6 +46,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODETABLEVIEW_H diff --git a/app/widget/nodetableview/nodetablewidget.cpp b/app/widget/nodetableview/nodetablewidget.cpp index 890899ff8..1146e954b 100644 --- a/app/widget/nodetableview/nodetablewidget.cpp +++ b/app/widget/nodetableview/nodetablewidget.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { NodeTableWidget::NodeTableWidget(QWidget* parent) : TimeBasedWidget(parent) @@ -35,4 +35,4 @@ NodeTableWidget::NodeTableWidget(QWidget* parent) : layout->addWidget(view_); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/nodetableview/nodetablewidget.h b/app/widget/nodetableview/nodetablewidget.h index ebe892f64..b2e39210a 100644 --- a/app/widget/nodetableview/nodetablewidget.h +++ b/app/widget/nodetableview/nodetablewidget.h @@ -24,7 +24,7 @@ #include "nodetableview.h" #include "widget/timebased/timebased.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeTableWidget : public TimeBasedWidget { @@ -57,6 +57,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODETABLEWIDGET_H diff --git a/app/widget/nodetreeview/nodetreeview.cpp b/app/widget/nodetreeview/nodetreeview.cpp index 324dd78c8..8d4dfa4c3 100644 --- a/app/widget/nodetreeview/nodetreeview.cpp +++ b/app/widget/nodetreeview/nodetreeview.cpp @@ -1,6 +1,6 @@ #include "nodetreeview.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeTreeView::NodeTreeView(QWidget *parent) : QTreeWidget(parent), @@ -108,4 +108,4 @@ void NodeTreeView::ItemCheckStateChanged(QTreeWidgetItem *item, int column) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/nodetreeview/nodetreeview.h b/app/widget/nodetreeview/nodetreeview.h index 65d87bbda..0984bcde4 100644 --- a/app/widget/nodetreeview/nodetreeview.h +++ b/app/widget/nodetreeview/nodetreeview.h @@ -5,7 +5,7 @@ #include "node/node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeTreeView : public QTreeWidget { @@ -57,6 +57,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODETREEVIEW_H diff --git a/app/widget/nodeview/nodeview.cpp b/app/widget/nodeview/nodeview.cpp index c3a79f83c..8948c98ce 100644 --- a/app/widget/nodeview/nodeview.cpp +++ b/app/widget/nodeview/nodeview.cpp @@ -30,7 +30,7 @@ #define super HandMovableView -OLIVE_NAMESPACE_ENTER +namespace olive { NodeView::NodeView(QWidget *parent) : HandMovableView(parent), @@ -903,4 +903,4 @@ void NodeView::GraphEdgeRemoved(NodeEdgePtr edge) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/nodeview/nodeview.h b/app/widget/nodeview/nodeview.h index afd6fe297..09c255468 100644 --- a/app/widget/nodeview/nodeview.h +++ b/app/widget/nodeview/nodeview.h @@ -29,7 +29,7 @@ #include "widget/timelinewidget/view/handmovableview.h" #include "widget/nodecopypaste/nodecopypaste.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A widget for viewing and editing node graphs @@ -190,6 +190,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEVIEW_H diff --git a/app/widget/nodeview/nodeviewcommon.h b/app/widget/nodeview/nodeviewcommon.h index be731eee0..648229b28 100644 --- a/app/widget/nodeview/nodeviewcommon.h +++ b/app/widget/nodeview/nodeviewcommon.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeViewCommon { public: @@ -53,6 +53,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEVIEWCOMMON_H diff --git a/app/widget/nodeview/nodeviewedge.cpp b/app/widget/nodeview/nodeviewedge.cpp index e783e3584..c48c2af46 100644 --- a/app/widget/nodeview/nodeviewedge.cpp +++ b/app/widget/nodeview/nodeviewedge.cpp @@ -30,7 +30,7 @@ #include "nodeview.h" #include "nodeviewscene.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeViewEdge::NodeViewEdge(QGraphicsItem *parent) : QGraphicsPathItem(parent), @@ -170,4 +170,4 @@ void NodeViewEdge::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti painter->drawPath(path()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/nodeview/nodeviewedge.h b/app/widget/nodeview/nodeviewedge.h index c29ea8fc4..07f2c3298 100644 --- a/app/widget/nodeview/nodeviewedge.h +++ b/app/widget/nodeview/nodeviewedge.h @@ -27,7 +27,7 @@ #include "node/edge.h" #include "nodeviewcommon.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A graphical representation of a NodeEdge to be used in NodeView @@ -112,6 +112,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEEDGEITEM_H diff --git a/app/widget/nodeview/nodeviewitem.cpp b/app/widget/nodeview/nodeviewitem.cpp index c1f030899..596024897 100644 --- a/app/widget/nodeview/nodeviewitem.cpp +++ b/app/widget/nodeview/nodeviewitem.cpp @@ -36,7 +36,7 @@ #include "ui/icons/icons.h" #include "window/mainwindow/mainwindow.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeViewItem::NodeViewItem(QGraphicsItem *parent) : QGraphicsRectItem(parent), @@ -699,4 +699,4 @@ QPointF NodeViewItem::GetInputPoint(int index, const QPointF& source_pos) const } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/nodeview/nodeviewitem.h b/app/widget/nodeview/nodeviewitem.h index e33968785..845f0d652 100644 --- a/app/widget/nodeview/nodeviewitem.h +++ b/app/widget/nodeview/nodeviewitem.h @@ -32,7 +32,7 @@ #include "nodeviewedge.h" #include "nodeviewitemwidgetproxy.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A visual widget representation of a Node object to be used in a NodeView @@ -174,6 +174,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEVIEWITEM_H diff --git a/app/widget/nodeview/nodeviewscene.cpp b/app/widget/nodeview/nodeviewscene.cpp index 45c1b6934..f326c100c 100644 --- a/app/widget/nodeview/nodeviewscene.cpp +++ b/app/widget/nodeview/nodeviewscene.cpp @@ -25,7 +25,7 @@ #include "nodeviewitem.h" #include "project/item/sequence/sequence.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeViewScene::NodeViewScene(QObject *parent) : QGraphicsScene(parent), @@ -310,4 +310,4 @@ void NodeViewScene::NodeLabelChanged() item_map_.value(static_cast(sender()))->update(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/nodeview/nodeviewscene.h b/app/widget/nodeview/nodeviewscene.h index b5ffa7e93..51064c965 100644 --- a/app/widget/nodeview/nodeviewscene.h +++ b/app/widget/nodeview/nodeviewscene.h @@ -28,7 +28,7 @@ #include "nodeviewedge.h" #include "nodeviewitem.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class NodeViewScene : public QGraphicsScene { @@ -146,6 +146,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEVIEWSCENE_H diff --git a/app/widget/nodeview/nodeviewundo.cpp b/app/widget/nodeview/nodeviewundo.cpp index 1f2bd8c7e..66416c158 100644 --- a/app/widget/nodeview/nodeviewundo.cpp +++ b/app/widget/nodeview/nodeviewundo.cpp @@ -22,7 +22,7 @@ #include "project/item/sequence/sequence.h" -OLIVE_NAMESPACE_ENTER +namespace olive { NodeEdgeAddCommand::NodeEdgeAddCommand(NodeOutput *output, NodeInput *input, QUndoCommand *parent) : UndoCommand(parent), @@ -230,4 +230,4 @@ void NodeCopyInputsCommand::redo() Node::CopyInputs(src_, dest_, include_connections_); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/nodeview/nodeviewundo.h b/app/widget/nodeview/nodeviewundo.h index c59cba83e..03f9f4bcd 100644 --- a/app/widget/nodeview/nodeviewundo.h +++ b/app/widget/nodeview/nodeviewundo.h @@ -29,7 +29,7 @@ #include "undo/undocommand.h" #include "widget/timelinewidget/undo/undo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief An undoable command for connecting two NodeParams together @@ -209,6 +209,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // NODEVIEWUNDO_H diff --git a/app/widget/panel/panel.cpp b/app/widget/panel/panel.cpp index f9ac502d5..49aef76cf 100644 --- a/app/widget/panel/panel.cpp +++ b/app/widget/panel/panel.cpp @@ -28,7 +28,7 @@ #include #include -OLIVE_NAMESPACE_ENTER +namespace olive { PanelWidget::PanelWidget(const QString &object_name, QWidget *parent) : QDockWidget(parent), @@ -154,4 +154,4 @@ void PanelWidget::SetWidgetWithPadding(QWidget *widget) setWidget(wrapper); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/panel/panel.h b/app/widget/panel/panel.h index fba6a60cc..939baa2af 100644 --- a/app/widget/panel/panel.h +++ b/app/widget/panel/panel.h @@ -26,7 +26,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A widget that is always dockable within the MainWindow. @@ -236,6 +236,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // PANEL_WIDGET_H diff --git a/app/widget/path/pathwidget.cpp b/app/widget/path/pathwidget.cpp index 255ecb7ad..f0ffeeb57 100644 --- a/app/widget/path/pathwidget.cpp +++ b/app/widget/path/pathwidget.cpp @@ -26,7 +26,7 @@ #include "common/filefunctions.h" -OLIVE_NAMESPACE_ENTER +namespace olive { PathWidget::PathWidget(const QString &path, QWidget *parent) : QWidget(parent) @@ -65,4 +65,4 @@ void PathWidget::LineEditChanged() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/path/pathwidget.h b/app/widget/path/pathwidget.h index f6273e96b..74a0da99f 100644 --- a/app/widget/path/pathwidget.h +++ b/app/widget/path/pathwidget.h @@ -26,7 +26,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class PathWidget : public QWidget { @@ -52,6 +52,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // PATHWIDGET_H diff --git a/app/widget/pixelsampler/pixelsampler.cpp b/app/widget/pixelsampler/pixelsampler.cpp index c110283a4..cd0ddf92f 100644 --- a/app/widget/pixelsampler/pixelsampler.cpp +++ b/app/widget/pixelsampler/pixelsampler.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { PixelSamplerWidget::PixelSamplerWidget(QWidget *parent) : QGroupBox(parent) @@ -77,4 +77,4 @@ void ManagedPixelSamplerWidget::SetValues(const Color &reference, const Color &d display_view_->SetValues(display); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/pixelsampler/pixelsampler.h b/app/widget/pixelsampler/pixelsampler.h index 19109105d..a2f6ada6f 100644 --- a/app/widget/pixelsampler/pixelsampler.h +++ b/app/widget/pixelsampler/pixelsampler.h @@ -27,7 +27,7 @@ #include "render/color.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class PixelSamplerWidget : public QGroupBox { @@ -63,6 +63,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // PIXELSAMPLERWIDGET_H diff --git a/app/widget/playbackcontrols/dragbutton.cpp b/app/widget/playbackcontrols/dragbutton.cpp index 345ed3f27..644f1c1bc 100644 --- a/app/widget/playbackcontrols/dragbutton.cpp +++ b/app/widget/playbackcontrols/dragbutton.cpp @@ -20,7 +20,7 @@ #include "dragbutton.h" -OLIVE_NAMESPACE_ENTER +namespace olive { DragButton::DragButton(QWidget *parent) : QPushButton(parent) @@ -33,4 +33,4 @@ void DragButton::mousePressEvent(QMouseEvent *event) { emit MousePressed(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/playbackcontrols/dragbutton.h b/app/widget/playbackcontrols/dragbutton.h index 8e6d9ac19..c0bb2f2a5 100644 --- a/app/widget/playbackcontrols/dragbutton.h +++ b/app/widget/playbackcontrols/dragbutton.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class DragButton : public QPushButton { @@ -41,6 +41,6 @@ protected: }; -OLIVE_NAMESPACE_EXIT +} #endif // DRAGBUTTON_H diff --git a/app/widget/playbackcontrols/playbackcontrols.cpp b/app/widget/playbackcontrols/playbackcontrols.cpp index 7ae497a98..692e20a91 100644 --- a/app/widget/playbackcontrols/playbackcontrols.cpp +++ b/app/widget/playbackcontrols/playbackcontrols.cpp @@ -28,7 +28,7 @@ #include "config/config.h" #include "ui/icons/icons.h" -OLIVE_NAMESPACE_ENTER +namespace olive { PlaybackControls::PlaybackControls(QWidget *parent) : QWidget(parent), @@ -229,4 +229,4 @@ void PlaybackControls::TimecodeChanged() SetEndTime(end_time_); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/playbackcontrols/playbackcontrols.h b/app/widget/playbackcontrols/playbackcontrols.h index c61b08eba..a77563ac2 100644 --- a/app/widget/playbackcontrols/playbackcontrols.h +++ b/app/widget/playbackcontrols/playbackcontrols.h @@ -30,7 +30,7 @@ #include "dragbutton.h" #include "widget/slider/timeslider.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A playback controls widget providing buttons for navigating media @@ -134,6 +134,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // PLAYBACKCONTROLS_H diff --git a/app/widget/projectexplorer/projectexplorer.cpp b/app/widget/projectexplorer/projectexplorer.cpp index 6a261895c..a9c38820e 100644 --- a/app/widget/projectexplorer/projectexplorer.cpp +++ b/app/widget/projectexplorer/projectexplorer.cpp @@ -41,7 +41,7 @@ #include "widget/timelinewidget/timelinewidget.h" #include "widget/nodeview/nodeviewundo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ProjectExplorer::ProjectExplorer(QWidget *parent) : QWidget(parent), @@ -683,4 +683,4 @@ void ProjectExplorer::DeleteSelected() Core::instance()->undo_stack()->pushIfHasChildren(command); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/projectexplorer/projectexplorer.h b/app/widget/projectexplorer/projectexplorer.h index 93cbb8814..e935b9084 100644 --- a/app/widget/projectexplorer/projectexplorer.h +++ b/app/widget/projectexplorer/projectexplorer.h @@ -34,7 +34,7 @@ #include "widget/projectexplorer/projectexplorernavigation.h" #include "widget/projecttoolbar/projecttoolbar.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A widget for browsing through a Project structure. @@ -186,6 +186,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // PROJECTEXPLORER_H diff --git a/app/widget/projectexplorer/projectexplorericonview.cpp b/app/widget/projectexplorer/projectexplorericonview.cpp index ece2a47d5..ac2bd7561 100644 --- a/app/widget/projectexplorer/projectexplorericonview.cpp +++ b/app/widget/projectexplorer/projectexplorericonview.cpp @@ -20,7 +20,7 @@ #include "projectexplorericonview.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ProjectExplorerIconView::ProjectExplorerIconView(QWidget *parent) : ProjectExplorerListViewBase(parent) @@ -30,4 +30,4 @@ ProjectExplorerIconView::ProjectExplorerIconView(QWidget *parent) : setItemDelegate(&delegate_); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/projectexplorer/projectexplorericonview.h b/app/widget/projectexplorer/projectexplorericonview.h index 9cb67a113..68e7f25e9 100644 --- a/app/widget/projectexplorer/projectexplorericonview.h +++ b/app/widget/projectexplorer/projectexplorericonview.h @@ -24,7 +24,7 @@ #include "projectexplorerlistviewbase.h" #include "projectexplorericonviewitemdelegate.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief The view widget used when ProjectExplorer is in Icon View @@ -39,6 +39,6 @@ private: ProjectExplorerIconViewItemDelegate delegate_; }; -OLIVE_NAMESPACE_EXIT +} #endif // PROJECTEXPLORERICONVIEW_H diff --git a/app/widget/projectexplorer/projectexplorericonviewitemdelegate.cpp b/app/widget/projectexplorer/projectexplorericonviewitemdelegate.cpp index 9073da4e7..3690576bf 100644 --- a/app/widget/projectexplorer/projectexplorericonviewitemdelegate.cpp +++ b/app/widget/projectexplorer/projectexplorericonviewitemdelegate.cpp @@ -24,7 +24,7 @@ #include "common/qtutils.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ProjectExplorerIconViewItemDelegate::ProjectExplorerIconViewItemDelegate(QObject *parent) : QStyledItemDelegate (parent) @@ -99,4 +99,4 @@ void ProjectExplorerIconViewItemDelegate::paint(QPainter *painter, const QStyleO } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/projectexplorer/projectexplorericonviewitemdelegate.h b/app/widget/projectexplorer/projectexplorericonviewitemdelegate.h index 4e4b930c7..69da53e64 100644 --- a/app/widget/projectexplorer/projectexplorericonviewitemdelegate.h +++ b/app/widget/projectexplorer/projectexplorericonviewitemdelegate.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief The delegate that's used to draw items when ProjectExplorer is in Icon view @@ -38,6 +38,6 @@ public: virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; }; -OLIVE_NAMESPACE_EXIT +} #endif // PROJECTEXPLORERICONVIEWITEMDELEGATE_H diff --git a/app/widget/projectexplorer/projectexplorerlistview.cpp b/app/widget/projectexplorer/projectexplorerlistview.cpp index ac5c7885f..340107c54 100644 --- a/app/widget/projectexplorer/projectexplorerlistview.cpp +++ b/app/widget/projectexplorer/projectexplorerlistview.cpp @@ -20,7 +20,7 @@ #include "projectexplorerlistview.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ProjectExplorerListView::ProjectExplorerListView(QWidget *parent) : ProjectExplorerListViewBase(parent) @@ -30,4 +30,4 @@ ProjectExplorerListView::ProjectExplorerListView(QWidget *parent) : setItemDelegate(&delegate_); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/projectexplorer/projectexplorerlistview.h b/app/widget/projectexplorer/projectexplorerlistview.h index 6d3695337..5d15941c4 100644 --- a/app/widget/projectexplorer/projectexplorerlistview.h +++ b/app/widget/projectexplorer/projectexplorerlistview.h @@ -24,7 +24,7 @@ #include "projectexplorerlistviewbase.h" #include "projectexplorerlistviewitemdelegate.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief The view widget used when ProjectExplorer is in List View @@ -39,6 +39,6 @@ private: ProjectExplorerListViewItemDelegate delegate_; }; -OLIVE_NAMESPACE_EXIT +} #endif // PROJECTEXPLORERLISTVIEW_H diff --git a/app/widget/projectexplorer/projectexplorerlistviewbase.cpp b/app/widget/projectexplorer/projectexplorerlistviewbase.cpp index b305cb067..79cb6e9db 100644 --- a/app/widget/projectexplorer/projectexplorerlistviewbase.cpp +++ b/app/widget/projectexplorer/projectexplorerlistviewbase.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { ProjectExplorerListViewBase::ProjectExplorerListViewBase(QWidget *parent) : QListView(parent) @@ -51,4 +51,4 @@ void ProjectExplorerListViewBase::mouseDoubleClickEvent(QMouseEvent *event) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/projectexplorer/projectexplorerlistviewbase.h b/app/widget/projectexplorer/projectexplorerlistviewbase.h index f71c598a2..f3b397b8a 100644 --- a/app/widget/projectexplorer/projectexplorerlistviewbase.h +++ b/app/widget/projectexplorer/projectexplorerlistviewbase.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A QListView derivative that contains functionality used by both List view and Icon view (which are both based @@ -57,6 +57,6 @@ signals: void DoubleClickedEmptyArea(); }; -OLIVE_NAMESPACE_EXIT +} #endif // PROJECTEXPLORERLISTVIEWBASE_H diff --git a/app/widget/projectexplorer/projectexplorerlistviewitemdelegate.cpp b/app/widget/projectexplorer/projectexplorerlistviewitemdelegate.cpp index 2cb01d9a5..465b3aee9 100644 --- a/app/widget/projectexplorer/projectexplorerlistviewitemdelegate.cpp +++ b/app/widget/projectexplorer/projectexplorerlistviewitemdelegate.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { ProjectExplorerListViewItemDelegate::ProjectExplorerListViewItemDelegate(QObject *parent) : QStyledItemDelegate(parent) @@ -80,4 +80,4 @@ void ProjectExplorerListViewItemDelegate::paint(QPainter *painter, const QStyleO painter->drawText(text_rect, static_cast(Qt::AlignLeft | Qt::AlignVCenter), text); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/projectexplorer/projectexplorerlistviewitemdelegate.h b/app/widget/projectexplorer/projectexplorerlistviewitemdelegate.h index 152f40a4a..780b153b4 100644 --- a/app/widget/projectexplorer/projectexplorerlistviewitemdelegate.h +++ b/app/widget/projectexplorer/projectexplorerlistviewitemdelegate.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief The delegate that's used to draw items when ProjectExplorer is in List view @@ -39,6 +39,6 @@ public: virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; }; -OLIVE_NAMESPACE_EXIT +} #endif // PROJECTEXPLORERLISTVIEWITEMDELEGATE_H diff --git a/app/widget/projectexplorer/projectexplorernavigation.cpp b/app/widget/projectexplorer/projectexplorernavigation.cpp index e595a2a7b..6f23ee6d8 100644 --- a/app/widget/projectexplorer/projectexplorernavigation.cpp +++ b/app/widget/projectexplorer/projectexplorernavigation.cpp @@ -26,7 +26,7 @@ #include "common/define.h" #include "ui/icons/icons.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ProjectExplorerNavigation::ProjectExplorerNavigation(QWidget *parent) : QWidget(parent) @@ -96,4 +96,4 @@ void ProjectExplorerNavigation::UpdateIcons() size_slider_->setValue(kProjectIconSizeDefault); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/projectexplorer/projectexplorernavigation.h b/app/widget/projectexplorer/projectexplorernavigation.h index 412c98d6f..4edb93ac4 100644 --- a/app/widget/projectexplorer/projectexplorernavigation.h +++ b/app/widget/projectexplorer/projectexplorernavigation.h @@ -28,7 +28,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A navigation bar widget for ProjectExplorer's Icon and List views @@ -112,6 +112,6 @@ private: QSlider* size_slider_; }; -OLIVE_NAMESPACE_EXIT +} #endif // PROJECTEXPLORERLISTVIEWTOOLBAR_H diff --git a/app/widget/projectexplorer/projectexplorertreeview.cpp b/app/widget/projectexplorer/projectexplorertreeview.cpp index 40ed01ad8..0b7a95514 100644 --- a/app/widget/projectexplorer/projectexplorertreeview.cpp +++ b/app/widget/projectexplorer/projectexplorertreeview.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { ProjectExplorerTreeView::ProjectExplorerTreeView(QWidget *parent) : QTreeView(parent) @@ -54,4 +54,4 @@ void ProjectExplorerTreeView::mouseDoubleClickEvent(QMouseEvent *event) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/projectexplorer/projectexplorertreeview.h b/app/widget/projectexplorer/projectexplorertreeview.h index 74eeb3d5e..0d1c562e7 100644 --- a/app/widget/projectexplorer/projectexplorertreeview.h +++ b/app/widget/projectexplorer/projectexplorertreeview.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief The view widget used when ProjectExplorer is in Tree View @@ -59,6 +59,6 @@ signals: void DoubleClickedEmptyArea(); }; -OLIVE_NAMESPACE_EXIT +} #endif // PROJECTEXPLORERTREEVIEW_H diff --git a/app/widget/projectexplorer/projectexplorerundo.cpp b/app/widget/projectexplorer/projectexplorerundo.cpp index 303029187..3bb2753d7 100644 --- a/app/widget/projectexplorer/projectexplorerundo.cpp +++ b/app/widget/projectexplorer/projectexplorerundo.cpp @@ -20,7 +20,7 @@ #include "projectexplorerundo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { OfflineFootageCommand::OfflineFootageCommand(const QList &media, QUndoCommand* parent) : UndoCommand(parent) @@ -51,4 +51,4 @@ void OfflineFootageCommand::undo_internal() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/projectexplorer/projectexplorerundo.h b/app/widget/projectexplorer/projectexplorerundo.h index 4203fbe26..fbab93992 100644 --- a/app/widget/projectexplorer/projectexplorerundo.h +++ b/app/widget/projectexplorer/projectexplorerundo.h @@ -24,7 +24,7 @@ #include "node/input/media/media.h" #include "undo/undocommand.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief An undo command for offlining footage when it is deleted from the project explorer @@ -47,6 +47,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // PROJECTEXPLORERUNDO_H diff --git a/app/widget/projecttoolbar/projecttoolbar.cpp b/app/widget/projecttoolbar/projecttoolbar.cpp index d53a2ed51..a7049d207 100644 --- a/app/widget/projecttoolbar/projecttoolbar.cpp +++ b/app/widget/projecttoolbar/projecttoolbar.cpp @@ -26,7 +26,7 @@ #include "ui/icons/icons.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ProjectToolbar::ProjectToolbar(QWidget *parent) : QWidget(parent) @@ -153,4 +153,4 @@ void ProjectToolbar::ViewButtonClicked() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/projecttoolbar/projecttoolbar.h b/app/widget/projecttoolbar/projecttoolbar.h index cc084e0aa..35abec4de 100644 --- a/app/widget/projecttoolbar/projecttoolbar.h +++ b/app/widget/projecttoolbar/projecttoolbar.h @@ -27,7 +27,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief The ProjectToolbar class @@ -87,6 +87,6 @@ private slots: void ViewButtonClicked(); }; -OLIVE_NAMESPACE_EXIT +} #endif // PROJECTTOOLBAR_H diff --git a/app/widget/resizablescrollbar/resizablescrollbar.cpp b/app/widget/resizablescrollbar/resizablescrollbar.cpp index ffee074a2..d7cbfb8e8 100644 --- a/app/widget/resizablescrollbar/resizablescrollbar.cpp +++ b/app/widget/resizablescrollbar/resizablescrollbar.cpp @@ -27,7 +27,7 @@ #include "common/range.h" -OLIVE_NAMESPACE_ENTER +namespace olive { const int ResizableScrollBar::kHandleWidth = 10; @@ -159,4 +159,4 @@ int ResizableScrollBar::GetActiveMousePos(QMouseEvent *event) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/resizablescrollbar/resizablescrollbar.h b/app/widget/resizablescrollbar/resizablescrollbar.h index cba125d95..1e0d21f13 100644 --- a/app/widget/resizablescrollbar/resizablescrollbar.h +++ b/app/widget/resizablescrollbar/resizablescrollbar.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ResizableScrollBar : public QScrollBar { @@ -65,6 +65,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // RESIZABLESCROLLBAR_H diff --git a/app/widget/scope/histogram/histogram.cpp b/app/widget/scope/histogram/histogram.cpp index 1f032a3de..54211a066 100644 --- a/app/widget/scope/histogram/histogram.cpp +++ b/app/widget/scope/histogram/histogram.cpp @@ -27,7 +27,7 @@ #include "common/qtutils.h" #include "node/node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { HistogramScope::HistogramScope(QWidget* parent) : ScopeBase(parent) @@ -146,4 +146,4 @@ void HistogramScope::DrawScope(TexturePtr managed_tex, QVariant pipeline) p.drawLines(histogram_lines); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/scope/histogram/histogram.h b/app/widget/scope/histogram/histogram.h index eefaefc18..756a40d54 100644 --- a/app/widget/scope/histogram/histogram.h +++ b/app/widget/scope/histogram/histogram.h @@ -23,7 +23,7 @@ #include "widget/scope/scopebase/scopebase.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class HistogramScope : public ScopeBase { @@ -50,6 +50,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // HISTOGRAMSCOPE_H diff --git a/app/widget/scope/scopebase/scopebase.cpp b/app/widget/scope/scopebase/scopebase.cpp index fc1a227b9..3f9c4cd68 100644 --- a/app/widget/scope/scopebase/scopebase.cpp +++ b/app/widget/scope/scopebase/scopebase.cpp @@ -22,7 +22,7 @@ #include "config/config.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ScopeBase::ScopeBase(QWidget* parent) : ManagedDisplayWidget(parent), @@ -121,4 +121,4 @@ void ScopeBase::OnDestroy() pipeline_.clear(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/scope/scopebase/scopebase.h b/app/widget/scope/scopebase/scopebase.h index 2433f6a2f..4e7d852f9 100644 --- a/app/widget/scope/scopebase/scopebase.h +++ b/app/widget/scope/scopebase/scopebase.h @@ -25,7 +25,7 @@ #include "render/colorprocessor.h" #include "widget/manageddisplay/manageddisplay.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ScopeBase : public ManagedDisplayWidget { @@ -69,6 +69,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // SCOPEBASE_H diff --git a/app/widget/scope/waveform/waveform.cpp b/app/widget/scope/waveform/waveform.cpp index ce0751f66..c92a7158a 100644 --- a/app/widget/scope/waveform/waveform.cpp +++ b/app/widget/scope/waveform/waveform.cpp @@ -31,7 +31,7 @@ #include "config/config.h" #include "node/node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { WaveformScope::WaveformScope(QWidget* parent) : ScopeBase(parent) @@ -122,4 +122,4 @@ void WaveformScope::DrawScope(TexturePtr managed_tex, QVariant pipeline) p.drawLines(ire_lines); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/scope/waveform/waveform.h b/app/widget/scope/waveform/waveform.h index 6656d3df1..743d3de5c 100644 --- a/app/widget/scope/waveform/waveform.h +++ b/app/widget/scope/waveform/waveform.h @@ -23,7 +23,7 @@ #include "widget/scope/scopebase/scopebase.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class WaveformScope : public ScopeBase { @@ -40,6 +40,6 @@ protected: }; -OLIVE_NAMESPACE_EXIT +} #endif // WAVEFORMSCOPE_H diff --git a/app/widget/slider/floatslider.cpp b/app/widget/slider/floatslider.cpp index 58a741b23..4c30e7d0b 100644 --- a/app/widget/slider/floatslider.cpp +++ b/app/widget/slider/floatslider.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { FloatSlider::FloatSlider(QWidget *parent) : SliderBase(kFloat, parent), @@ -184,4 +184,4 @@ void FloatSlider::ConvertValue(QVariant v) emit ValueChanged(v.toDouble()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/slider/floatslider.h b/app/widget/slider/floatslider.h index 246ab6982..51b806fce 100644 --- a/app/widget/slider/floatslider.h +++ b/app/widget/slider/floatslider.h @@ -23,7 +23,7 @@ #include "sliderbase.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class FloatSlider : public SliderBase { @@ -73,6 +73,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // FLOATSLIDER_H diff --git a/app/widget/slider/integerslider.cpp b/app/widget/slider/integerslider.cpp index 08404e108..2c2973cd1 100644 --- a/app/widget/slider/integerslider.cpp +++ b/app/widget/slider/integerslider.cpp @@ -20,7 +20,7 @@ #include "integerslider.h" -OLIVE_NAMESPACE_ENTER +namespace olive { IntegerSlider::IntegerSlider(QWidget* parent) : SliderBase(kInteger, parent) @@ -72,4 +72,4 @@ void IntegerSlider::ConvertValue(QVariant v) emit ValueChanged(v.toInt()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/slider/integerslider.h b/app/widget/slider/integerslider.h index 9a6db1860..bb4236366 100644 --- a/app/widget/slider/integerslider.h +++ b/app/widget/slider/integerslider.h @@ -23,7 +23,7 @@ #include "sliderbase.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class IntegerSlider : public SliderBase { @@ -49,6 +49,6 @@ private slots: void ConvertValue(QVariant v); }; -OLIVE_NAMESPACE_EXIT +} #endif // INTEGERSLIDER_H diff --git a/app/widget/slider/sliderbase.cpp b/app/widget/slider/sliderbase.cpp index 66c12a1ac..b3e6ce6ee 100644 --- a/app/widget/slider/sliderbase.cpp +++ b/app/widget/slider/sliderbase.cpp @@ -28,7 +28,7 @@ #include "core.h" #include "window/mainwindow/mainwindow.h" -OLIVE_NAMESPACE_ENTER +namespace olive { SliderBase::SliderBase(Mode mode, QWidget *parent) : QStackedWidget(parent), @@ -395,4 +395,4 @@ void SliderBase::ResetValue() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/slider/sliderbase.h b/app/widget/slider/sliderbase.h index 7788ddd2c..31c6d31c4 100644 --- a/app/widget/slider/sliderbase.h +++ b/app/widget/slider/sliderbase.h @@ -27,7 +27,7 @@ #include "sliderladder.h" #include "widget/focusablelineedit/focusablelineedit.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class SliderBase : public QStackedWidget { Q_OBJECT @@ -141,6 +141,6 @@ private slots: void ResetValue(); }; -OLIVE_NAMESPACE_EXIT +} #endif // SLIDERBASE_H diff --git a/app/widget/slider/sliderlabel.cpp b/app/widget/slider/sliderlabel.cpp index 1e25177dd..11048658f 100644 --- a/app/widget/slider/sliderlabel.cpp +++ b/app/widget/slider/sliderlabel.cpp @@ -24,7 +24,7 @@ #include #include -OLIVE_NAMESPACE_ENTER +namespace olive { SliderLabel::SliderLabel(QWidget *parent) : QLabel(parent) @@ -69,4 +69,4 @@ void SliderLabel::focusInEvent(QFocusEvent *event) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/slider/sliderlabel.h b/app/widget/slider/sliderlabel.h index 749fba621..2f698eb2c 100644 --- a/app/widget/slider/sliderlabel.h +++ b/app/widget/slider/sliderlabel.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class SliderLabel : public QLabel { @@ -47,6 +47,6 @@ signals: }; -OLIVE_NAMESPACE_EXIT +} #endif // SLIDERLABEL_H diff --git a/app/widget/slider/sliderladder.cpp b/app/widget/slider/sliderladder.cpp index 4646c4d70..3412f7d5f 100644 --- a/app/widget/slider/sliderladder.cpp +++ b/app/widget/slider/sliderladder.cpp @@ -33,7 +33,7 @@ #include "common/clamp.h" #include "common/lerp.h" -OLIVE_NAMESPACE_ENTER +namespace olive { SliderLadder::SliderLadder(double drag_multiplier, int nb_outer_values, QWidget* parent) : QFrame(parent, Qt::Popup), @@ -241,4 +241,4 @@ void SliderLadderElement::UpdateLabel() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/slider/sliderladder.h b/app/widget/slider/sliderladder.h index 6bad59941..aac5c1bd3 100644 --- a/app/widget/slider/sliderladder.h +++ b/app/widget/slider/sliderladder.h @@ -27,7 +27,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class SliderLadderElement : public QWidget { @@ -98,6 +98,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // SLIDERLADDER_H diff --git a/app/widget/slider/stringslider.cpp b/app/widget/slider/stringslider.cpp index 68b12609c..33db4d8f5 100644 --- a/app/widget/slider/stringslider.cpp +++ b/app/widget/slider/stringslider.cpp @@ -20,7 +20,7 @@ #include "stringslider.h" -OLIVE_NAMESPACE_ENTER +namespace olive { StringSlider::StringSlider(QWidget* parent) : SliderBase(kString, parent) @@ -49,4 +49,4 @@ void StringSlider::ConvertValue(QVariant v) emit ValueChanged(v.toString()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/slider/stringslider.h b/app/widget/slider/stringslider.h index 939191ec4..232df2480 100644 --- a/app/widget/slider/stringslider.h +++ b/app/widget/slider/stringslider.h @@ -23,7 +23,7 @@ #include "sliderbase.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class StringSlider : public SliderBase { @@ -47,6 +47,6 @@ private slots: void ConvertValue(QVariant v); }; -OLIVE_NAMESPACE_EXIT +} #endif // STRINGSLIDER_H diff --git a/app/widget/slider/timeslider.cpp b/app/widget/slider/timeslider.cpp index 911b59dcf..146d5750a 100644 --- a/app/widget/slider/timeslider.cpp +++ b/app/widget/slider/timeslider.cpp @@ -23,7 +23,7 @@ #include "common/timecodefunctions.h" #include "core.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TimeSlider::TimeSlider(QWidget *parent) : IntegerSlider(parent) @@ -63,4 +63,4 @@ void TimeSlider::TimecodeDisplayChanged() UpdateLabel(Value()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/slider/timeslider.h b/app/widget/slider/timeslider.h index 8083b7f1c..a8e6d977c 100644 --- a/app/widget/slider/timeslider.h +++ b/app/widget/slider/timeslider.h @@ -24,7 +24,7 @@ #include "common/rational.h" #include "integerslider.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TimeSlider : public IntegerSlider { @@ -47,6 +47,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMESLIDER_H diff --git a/app/widget/standardcombos/channellayoutcombobox.h b/app/widget/standardcombos/channellayoutcombobox.h index 8cd2e1ac6..0ff814ed8 100644 --- a/app/widget/standardcombos/channellayoutcombobox.h +++ b/app/widget/standardcombos/channellayoutcombobox.h @@ -25,7 +25,7 @@ #include "render/audioparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ChannelLayoutComboBox : public QComboBox { @@ -57,6 +57,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // CHANNELLAYOUTCOMBOBOX_H diff --git a/app/widget/standardcombos/frameratecombobox.h b/app/widget/standardcombos/frameratecombobox.h index 21b39dfba..d4482d7c1 100644 --- a/app/widget/standardcombos/frameratecombobox.h +++ b/app/widget/standardcombos/frameratecombobox.h @@ -26,7 +26,7 @@ #include "common/rational.h" #include "render/videoparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class FrameRateComboBox : public QComboBox { @@ -57,6 +57,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // FRAMERATECOMBOBOX_H diff --git a/app/widget/standardcombos/interlacedcombobox.h b/app/widget/standardcombos/interlacedcombobox.h index d745e4da5..9c8599562 100644 --- a/app/widget/standardcombos/interlacedcombobox.h +++ b/app/widget/standardcombos/interlacedcombobox.h @@ -25,7 +25,7 @@ #include "render/videoparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class InterlacedComboBox : public QComboBox { @@ -52,6 +52,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // INTERLACEDCOMBOBOX_H diff --git a/app/widget/standardcombos/pixelaspectratiocombobox.h b/app/widget/standardcombos/pixelaspectratiocombobox.h index b433dd9d6..a78aae0b3 100644 --- a/app/widget/standardcombos/pixelaspectratiocombobox.h +++ b/app/widget/standardcombos/pixelaspectratiocombobox.h @@ -26,7 +26,7 @@ #include "common/ratiodialog.h" #include "render/videoparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class PixelAspectRatioComboBox : public QComboBox { @@ -122,6 +122,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // PIXELASPECTRATIOCOMBOBOX_H diff --git a/app/widget/standardcombos/pixelformatcombobox.h b/app/widget/standardcombos/pixelformatcombobox.h index a6a399c38..3614a7f35 100644 --- a/app/widget/standardcombos/pixelformatcombobox.h +++ b/app/widget/standardcombos/pixelformatcombobox.h @@ -25,7 +25,7 @@ #include "render/videoparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class PixelFormatComboBox : public QComboBox { @@ -61,6 +61,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // PIXELFORMATCOMBOBOX_H diff --git a/app/widget/standardcombos/sampleratecombobox.h b/app/widget/standardcombos/sampleratecombobox.h index c3a9bd2cc..f1689126f 100644 --- a/app/widget/standardcombos/sampleratecombobox.h +++ b/app/widget/standardcombos/sampleratecombobox.h @@ -25,7 +25,7 @@ #include "render/audioparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class SampleRateComboBox : public QComboBox { @@ -56,6 +56,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // SAMPLERATECOMBOBOX_H diff --git a/app/widget/standardcombos/videodividercombobox.h b/app/widget/standardcombos/videodividercombobox.h index 359e467ae..e7924cbb2 100644 --- a/app/widget/standardcombos/videodividercombobox.h +++ b/app/widget/standardcombos/videodividercombobox.h @@ -25,7 +25,7 @@ #include "render/videoparams.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class VideoDividerComboBox : public QComboBox { @@ -64,6 +64,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // VIDEODIVIDERCOMBOBOX_H diff --git a/app/widget/taskview/elapsedcounterwidget.cpp b/app/widget/taskview/elapsedcounterwidget.cpp index 6b82f2945..d8cc976d0 100644 --- a/app/widget/taskview/elapsedcounterwidget.cpp +++ b/app/widget/taskview/elapsedcounterwidget.cpp @@ -25,7 +25,7 @@ #include "common/timecodefunctions.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ElapsedCounterWidget::ElapsedCounterWidget(QWidget* parent) : QWidget(parent), @@ -85,4 +85,4 @@ void ElapsedCounterWidget::UpdateTimers() remaining_lbl_->setText(tr("Remaining: %1").arg(Timecode::TimeToString(remaining_ms))); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/taskview/elapsedcounterwidget.h b/app/widget/taskview/elapsedcounterwidget.h index e11ded5e1..902b11fd4 100644 --- a/app/widget/taskview/elapsedcounterwidget.h +++ b/app/widget/taskview/elapsedcounterwidget.h @@ -27,7 +27,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ElapsedCounterWidget : public QWidget { @@ -56,6 +56,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // ELAPSEDCOUNTERWIDGET_H diff --git a/app/widget/taskview/taskview.cpp b/app/widget/taskview/taskview.cpp index 5803cf05f..ef1c83c8c 100644 --- a/app/widget/taskview/taskview.cpp +++ b/app/widget/taskview/taskview.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { TaskView::TaskView(QWidget* parent) : QScrollArea(parent) @@ -63,4 +63,4 @@ void TaskView::RemoveTask(Task *t) items_.remove(t); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/taskview/taskview.h b/app/widget/taskview/taskview.h index a0c214c96..17dd23d66 100644 --- a/app/widget/taskview/taskview.h +++ b/app/widget/taskview/taskview.h @@ -26,7 +26,7 @@ #include "widget/taskview/taskviewitem.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A widget that shows a list of Tasks @@ -66,6 +66,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TASKVIEW_H diff --git a/app/widget/taskview/taskviewitem.cpp b/app/widget/taskview/taskviewitem.cpp index 3d28ec077..0a3d15c56 100644 --- a/app/widget/taskview/taskviewitem.cpp +++ b/app/widget/taskview/taskviewitem.cpp @@ -26,7 +26,7 @@ #include "common/timecodefunctions.h" #include "ui/icons/icons.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TaskViewItem::TaskViewItem(Task* task, QWidget *parent) : QFrame(parent), @@ -92,4 +92,4 @@ void TaskViewItem::UpdateProgress(double d) elapsed_timer_lbl_->SetProgress(d); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/taskview/taskviewitem.h b/app/widget/taskview/taskviewitem.h index 49378aff7..75cf766f0 100644 --- a/app/widget/taskview/taskviewitem.h +++ b/app/widget/taskview/taskviewitem.h @@ -30,7 +30,7 @@ #include "elapsedcounterwidget.h" #include "task/task.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A widget that visually represents the status of a Task @@ -68,6 +68,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // TASKVIEWITEM_H diff --git a/app/widget/timebased/timebased.cpp b/app/widget/timebased/timebased.cpp index 6c39865e4..ea894768e 100644 --- a/app/widget/timebased/timebased.cpp +++ b/app/widget/timebased/timebased.cpp @@ -29,7 +29,7 @@ #include "project/item/sequence/sequence.h" #include "widget/timelinewidget/undo/undo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TimeBasedWidget::TimeBasedWidget(bool ruler_text_visible, bool ruler_cache_status_visible, QWidget *parent) : TimelineScaledWidget(parent), @@ -541,4 +541,4 @@ void TimeBasedWidget::MarkerAddCommand::undo_internal() marker_list_->RemoveMarker(added_marker_); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timebased/timebased.h b/app/widget/timebased/timebased.h index 24bf5c851..6fdfad8e0 100644 --- a/app/widget/timebased/timebased.h +++ b/app/widget/timebased/timebased.h @@ -30,7 +30,7 @@ #include "widget/timelinewidget/view/timelineview.h" #include "widget/timeruler/timeruler.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TimeBasedWidget : public TimelineScaledWidget { @@ -206,6 +206,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMEBASEDWIDGET_H diff --git a/app/widget/timelinewidget/snapservice.h b/app/widget/timelinewidget/snapservice.h index ad7b09834..c9c6a601c 100644 --- a/app/widget/timelinewidget/snapservice.h +++ b/app/widget/timelinewidget/snapservice.h @@ -3,7 +3,7 @@ #include "common/rational.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class SnapService { @@ -26,6 +26,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // SNAPSERVICE_H diff --git a/app/widget/timelinewidget/timelineandtrackview.cpp b/app/widget/timelinewidget/timelineandtrackview.cpp index bf5291fe2..233a00c79 100644 --- a/app/widget/timelinewidget/timelineandtrackview.cpp +++ b/app/widget/timelinewidget/timelineandtrackview.cpp @@ -23,7 +23,7 @@ #include #include -OLIVE_NAMESPACE_ENTER +namespace olive { TimelineAndTrackView::TimelineAndTrackView(Qt::Alignment vertical_alignment, QWidget *parent) : QWidget(parent) @@ -73,4 +73,4 @@ void TimelineAndTrackView::TracksValueChanged(int v) view_->verticalScrollBar()->setValue(view_->verticalScrollBar()->minimum() + v); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/timelineandtrackview.h b/app/widget/timelinewidget/timelineandtrackview.h index 7f8952d7f..cc4331556 100644 --- a/app/widget/timelinewidget/timelineandtrackview.h +++ b/app/widget/timelinewidget/timelineandtrackview.h @@ -27,7 +27,7 @@ #include "view/timelineview.h" #include "trackview/trackview.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TimelineAndTrackView : public QWidget { @@ -55,6 +55,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINEANDTRACKVIEW_H diff --git a/app/widget/timelinewidget/timelinescaledobject.cpp b/app/widget/timelinewidget/timelinescaledobject.cpp index daa5b84b6..28453c391 100644 --- a/app/widget/timelinewidget/timelinescaledobject.cpp +++ b/app/widget/timelinewidget/timelinescaledobject.cpp @@ -25,7 +25,7 @@ #include "common/clamp.h" -OLIVE_NAMESPACE_ENTER +namespace olive { const int TimelineScaledObject::kCalculateDimensionsPadding = 10; @@ -134,4 +134,4 @@ TimelineScaledWidget::TimelineScaledWidget(QWidget *parent) : { } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/timelinescaledobject.h b/app/widget/timelinewidget/timelinescaledobject.h index 2f061b692..8e96ec122 100644 --- a/app/widget/timelinewidget/timelinescaledobject.h +++ b/app/widget/timelinewidget/timelinescaledobject.h @@ -25,7 +25,7 @@ #include "common/rational.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TimelineScaledObject { @@ -82,6 +82,6 @@ public: TimelineScaledWidget(QWidget* parent = nullptr); }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINESCALEDOBJECT_H diff --git a/app/widget/timelinewidget/timelinewidget.cpp b/app/widget/timelinewidget/timelinewidget.cpp index f836dc8fa..a574f7a0c 100644 --- a/app/widget/timelinewidget/timelinewidget.cpp +++ b/app/widget/timelinewidget/timelinewidget.cpp @@ -47,7 +47,7 @@ #include "widget/menu/menushared.h" #include "widget/nodeview/nodeviewundo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TimelineWidget::TimelineWidget(QWidget *parent) : TimeBasedWidget(true, true, parent), @@ -84,20 +84,20 @@ TimelineWidget::TimelineWidget(QWidget *parent) : views_.append(new TimelineAndTrackView(Qt::AlignTop)); // Create tools - tools_.resize(OLIVE_NAMESPACE::Tool::kCount); + tools_.resize(olive::Tool::kCount); tools_.fill(nullptr); - tools_.replace(OLIVE_NAMESPACE::Tool::kPointer, new PointerTool(this)); - tools_.replace(OLIVE_NAMESPACE::Tool::kEdit, new EditTool(this)); - tools_.replace(OLIVE_NAMESPACE::Tool::kRipple, new RippleTool(this)); - tools_.replace(OLIVE_NAMESPACE::Tool::kRolling, new RollingTool(this)); - tools_.replace(OLIVE_NAMESPACE::Tool::kRazor, new RazorTool(this)); - tools_.replace(OLIVE_NAMESPACE::Tool::kSlip, new SlipTool(this)); - tools_.replace(OLIVE_NAMESPACE::Tool::kSlide, new SlideTool(this)); - tools_.replace(OLIVE_NAMESPACE::Tool::kZoom, new ZoomTool(this)); - tools_.replace(OLIVE_NAMESPACE::Tool::kTransition, new TransitionTool(this)); - //tools_.replace(OLIVE_NAMESPACE::Tool::kRecord, new PointerTool(this)); FIXME: Implement - tools_.replace(OLIVE_NAMESPACE::Tool::kAdd, new AddTool(this)); + tools_.replace(olive::Tool::kPointer, new PointerTool(this)); + tools_.replace(olive::Tool::kEdit, new EditTool(this)); + tools_.replace(olive::Tool::kRipple, new RippleTool(this)); + tools_.replace(olive::Tool::kRolling, new RollingTool(this)); + tools_.replace(olive::Tool::kRazor, new RazorTool(this)); + tools_.replace(olive::Tool::kSlip, new SlipTool(this)); + tools_.replace(olive::Tool::kSlide, new SlideTool(this)); + tools_.replace(olive::Tool::kZoom, new ZoomTool(this)); + tools_.replace(olive::Tool::kTransition, new TransitionTool(this)); + //tools_.replace(olive::Tool::kRecord, new PointerTool(this)); FIXME: Implement + tools_.replace(olive::Tool::kAdd, new AddTool(this)); import_tool_ = new ImportTool(this); @@ -1655,4 +1655,4 @@ bool TimelineWidget::SnapPoint(QList start_times, rational* movement, return true; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/timelinewidget.h b/app/widget/timelinewidget/timelinewidget.h index 54beb5db8..3eb0d94d4 100644 --- a/app/widget/timelinewidget/timelinewidget.h +++ b/app/widget/timelinewidget/timelinewidget.h @@ -38,7 +38,7 @@ #include "widget/timelinewidget/tool/import.h" #include "widget/timelinewidget/tool/tool.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief Full widget for working with TimelineOutput nodes @@ -321,6 +321,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINEWIDGET_H diff --git a/app/widget/timelinewidget/timelinewidgetselections.cpp b/app/widget/timelinewidget/timelinewidgetselections.cpp index 570713f51..5c082fe52 100644 --- a/app/widget/timelinewidget/timelinewidgetselections.cpp +++ b/app/widget/timelinewidget/timelinewidgetselections.cpp @@ -20,7 +20,7 @@ #include "timelinewidgetselections.h" -OLIVE_NAMESPACE_ENTER +namespace olive { void TimelineWidgetSelections::ShiftTime(const rational &diff) { @@ -68,4 +68,4 @@ void TimelineWidgetSelections::TrimOut(const rational &diff) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/timelinewidgetselections.h b/app/widget/timelinewidget/timelinewidgetselections.h index 3d92122fc..ce866ba1f 100644 --- a/app/widget/timelinewidget/timelinewidgetselections.h +++ b/app/widget/timelinewidget/timelinewidgetselections.h @@ -26,7 +26,7 @@ #include "common/timerange.h" #include "timeline/trackreference.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TimelineWidgetSelections : public QHash { @@ -43,6 +43,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINEWIDGETSELECTIONS_H diff --git a/app/widget/timelinewidget/tool/add.cpp b/app/widget/timelinewidget/tool/add.cpp index 360cde603..738e2af19 100644 --- a/app/widget/timelinewidget/tool/add.cpp +++ b/app/widget/timelinewidget/tool/add.cpp @@ -27,7 +27,7 @@ #include "node/generator/text/text.h" #include "widget/nodeview/nodeviewundo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { AddTool::AddTool(TimelineWidget *parent) : BeamTool(parent), @@ -48,18 +48,18 @@ void AddTool::MousePress(TimelineViewMouseEvent *event) Timeline::TrackType add_type = Timeline::kTrackTypeNone; switch (Core::instance()->GetSelectedAddableObject()) { - case OLIVE_NAMESPACE::Tool::kAddableBars: - case OLIVE_NAMESPACE::Tool::kAddableSolid: - case OLIVE_NAMESPACE::Tool::kAddableTitle: + case olive::Tool::kAddableBars: + case olive::Tool::kAddableSolid: + case olive::Tool::kAddableTitle: add_type = Timeline::kTrackTypeVideo; break; - case OLIVE_NAMESPACE::Tool::kAddableTone: + case olive::Tool::kAddableTone: add_type = Timeline::kTrackTypeAudio; break; - case OLIVE_NAMESPACE::Tool::kAddableEmpty: + case olive::Tool::kAddableEmpty: // Leave as "none", which means this block can be placed on any track break; - case OLIVE_NAMESPACE::Tool::kAddableCount: + case olive::Tool::kAddableCount: // Return so we do nothing return; } @@ -97,7 +97,7 @@ void AddTool::MouseRelease(TimelineViewMouseEvent *event) ClipBlock* clip = new ClipBlock(); clip->set_length_and_media_out(ghost_->GetAdjustedLength()); - clip->SetLabel(OLIVE_NAMESPACE::Tool::GetAddableObjectName(Core::instance()->GetSelectedAddableObject())); + clip->SetLabel(olive::Tool::GetAddableObjectName(Core::instance()->GetSelectedAddableObject())); NodeGraph* graph = static_cast(parent()->GetConnectedNode()->parent()); @@ -112,10 +112,10 @@ void AddTool::MouseRelease(TimelineViewMouseEvent *event) command); switch (Core::instance()->GetSelectedAddableObject()) { - case OLIVE_NAMESPACE::Tool::kAddableEmpty: + case olive::Tool::kAddableEmpty: // Empty, nothing to be done break; - case OLIVE_NAMESPACE::Tool::kAddableSolid: + case olive::Tool::kAddableSolid: { Node* solid = new SolidGenerator(); @@ -126,7 +126,7 @@ void AddTool::MouseRelease(TimelineViewMouseEvent *event) new NodeEdgeAddCommand(solid->output(), clip->texture_input(), command); break; } - case OLIVE_NAMESPACE::Tool::kAddableTitle: + case olive::Tool::kAddableTitle: { Node* text = new TextGenerator(); @@ -137,12 +137,12 @@ void AddTool::MouseRelease(TimelineViewMouseEvent *event) new NodeEdgeAddCommand(text->output(), clip->texture_input(), command); break; } - case OLIVE_NAMESPACE::Tool::kAddableBars: - case OLIVE_NAMESPACE::Tool::kAddableTone: + case olive::Tool::kAddableBars: + case olive::Tool::kAddableTone: // Not implemented yet qWarning() << "Unimplemented add object:" << Core::instance()->GetSelectedAddableObject(); break; - case OLIVE_NAMESPACE::Tool::kAddableCount: + case olive::Tool::kAddableCount: // Invalid value, do nothing break; } @@ -190,4 +190,4 @@ void AddTool::MouseMoveInternal(const rational &cursor_frame, bool outwards) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/tool/add.h b/app/widget/timelinewidget/tool/add.h index 83f83d03f..9e655756e 100644 --- a/app/widget/timelinewidget/tool/add.h +++ b/app/widget/timelinewidget/tool/add.h @@ -23,7 +23,7 @@ #include "beam.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class AddTool : public BeamTool { @@ -42,6 +42,6 @@ protected: rational drag_start_point_; }; -OLIVE_NAMESPACE_EXIT +} #endif // ADDTIMELINETOOL_H diff --git a/app/widget/timelinewidget/tool/beam.cpp b/app/widget/timelinewidget/tool/beam.cpp index 2350eadf0..ec57b4122 100644 --- a/app/widget/timelinewidget/tool/beam.cpp +++ b/app/widget/timelinewidget/tool/beam.cpp @@ -21,7 +21,7 @@ #include "beam.h" #include "widget/timelinewidget/timelinewidget.h" -OLIVE_NAMESPACE_ENTER +namespace olive { BeamTool::BeamTool(TimelineWidget *parent) : TimelineTool(parent) @@ -46,4 +46,4 @@ TimelineCoordinate BeamTool::ValidatedCoordinate(TimelineCoordinate coord) return coord; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/tool/beam.h b/app/widget/timelinewidget/tool/beam.h index 651d82e98..dc4f89f9d 100644 --- a/app/widget/timelinewidget/tool/beam.h +++ b/app/widget/timelinewidget/tool/beam.h @@ -23,7 +23,7 @@ #include "tool.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class BeamTool : public TimelineTool { @@ -37,6 +37,6 @@ protected: }; -OLIVE_NAMESPACE_EXIT +} #endif // BEAMTIMELINETOOL_H diff --git a/app/widget/timelinewidget/tool/edit.cpp b/app/widget/timelinewidget/tool/edit.cpp index dc1b381d8..231997e5e 100644 --- a/app/widget/timelinewidget/tool/edit.cpp +++ b/app/widget/timelinewidget/tool/edit.cpp @@ -21,7 +21,7 @@ #include "edit.h" #include "widget/timelinewidget/timelinewidget.h" -OLIVE_NAMESPACE_ENTER +namespace olive { EditTool::EditTool(TimelineWidget* parent) : BeamTool(parent) @@ -85,4 +85,4 @@ void EditTool::MouseDoubleClick(TimelineViewMouseEvent *event) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/tool/edit.h b/app/widget/timelinewidget/tool/edit.h index c83312dc0..5a2f61519 100644 --- a/app/widget/timelinewidget/tool/edit.h +++ b/app/widget/timelinewidget/tool/edit.h @@ -25,7 +25,7 @@ #include "tool.h" #include "widget/timelinewidget/timelinewidgetselections.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class EditTool : public BeamTool { @@ -44,6 +44,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // EDITTIMELINETOOL_H diff --git a/app/widget/timelinewidget/tool/import.cpp b/app/widget/timelinewidget/tool/import.cpp index 4d2a50cb7..80d610bad 100644 --- a/app/widget/timelinewidget/tool/import.cpp +++ b/app/widget/timelinewidget/tool/import.cpp @@ -38,7 +38,7 @@ #include "widget/nodeview/nodeviewundo.h" #include "window/mainwindow/mainwindow.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Timeline::TrackType TrackTypeFromStreamType(Stream::Type stream_type) { @@ -498,4 +498,4 @@ QList ImportTool::FootageToDraggedFootage(QList split_tracks_; }; -OLIVE_NAMESPACE_EXIT +} #endif // RAZORTIMELINETOOL_H diff --git a/app/widget/timelinewidget/tool/ripple.cpp b/app/widget/timelinewidget/tool/ripple.cpp index ad269353f..06e094451 100644 --- a/app/widget/timelinewidget/tool/ripple.cpp +++ b/app/widget/timelinewidget/tool/ripple.cpp @@ -24,7 +24,7 @@ #include "ripple.h" #include "widget/nodeview/nodeviewundo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { RippleTool::RippleTool(TimelineWidget* parent) : PointerTool(parent) @@ -147,4 +147,4 @@ void RippleTool::FinishDrag(TimelineViewMouseEvent *event) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/tool/ripple.h b/app/widget/timelinewidget/tool/ripple.h index 0067e4cc4..c51436dae 100644 --- a/app/widget/timelinewidget/tool/ripple.h +++ b/app/widget/timelinewidget/tool/ripple.h @@ -23,7 +23,7 @@ #include "pointer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class RippleTool : public PointerTool { @@ -36,6 +36,6 @@ protected: Timeline::MovementMode trim_mode) override; }; -OLIVE_NAMESPACE_EXIT +} #endif // RIPPLETIMELINETOOL_H diff --git a/app/widget/timelinewidget/tool/rolling.cpp b/app/widget/timelinewidget/tool/rolling.cpp index d89f7670d..4baa8a8fc 100644 --- a/app/widget/timelinewidget/tool/rolling.cpp +++ b/app/widget/timelinewidget/tool/rolling.cpp @@ -24,7 +24,7 @@ #include "rolling.h" #include "widget/nodeview/nodeviewundo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { RollingTool::RollingTool(TimelineWidget* parent) : PointerTool(parent) @@ -39,4 +39,4 @@ void RollingTool::InitiateDrag(TimelineViewBlockItem *clicked_item, InitiateDragInternal(clicked_item, trim_mode, false, true, false); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/tool/rolling.h b/app/widget/timelinewidget/tool/rolling.h index 812536f65..3e8bb9940 100644 --- a/app/widget/timelinewidget/tool/rolling.h +++ b/app/widget/timelinewidget/tool/rolling.h @@ -23,7 +23,7 @@ #include "pointer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class RollingTool : public PointerTool { @@ -35,6 +35,6 @@ protected: Timeline::MovementMode trim_mode) override; }; -OLIVE_NAMESPACE_EXIT +} #endif // ROLLINGTIMELINETOOL_H diff --git a/app/widget/timelinewidget/tool/slide.cpp b/app/widget/timelinewidget/tool/slide.cpp index 926ec71ab..e5e9b3b04 100644 --- a/app/widget/timelinewidget/tool/slide.cpp +++ b/app/widget/timelinewidget/tool/slide.cpp @@ -24,7 +24,7 @@ #include "slide.h" #include "widget/nodeview/nodeviewundo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { SlideTool::SlideTool(TimelineWidget* parent) : PointerTool(parent) @@ -40,4 +40,4 @@ void SlideTool::InitiateDrag(TimelineViewBlockItem *clicked_item, InitiateDragInternal(clicked_item, trim_mode, false, true, true); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/tool/slide.h b/app/widget/timelinewidget/tool/slide.h index 95a04d066..904e0f8ca 100644 --- a/app/widget/timelinewidget/tool/slide.h +++ b/app/widget/timelinewidget/tool/slide.h @@ -23,7 +23,7 @@ #include "pointer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class SlideTool : public PointerTool { @@ -36,6 +36,6 @@ protected: }; -OLIVE_NAMESPACE_EXIT +} #endif // SLIDETIMELINETOOL_H diff --git a/app/widget/timelinewidget/tool/slip.cpp b/app/widget/timelinewidget/tool/slip.cpp index daa93cf7b..edf788138 100644 --- a/app/widget/timelinewidget/tool/slip.cpp +++ b/app/widget/timelinewidget/tool/slip.cpp @@ -26,7 +26,7 @@ #include "config/config.h" #include "slip.h" -OLIVE_NAMESPACE_ENTER +namespace olive { SlipTool::SlipTool(TimelineWidget *parent) : PointerTool(parent) @@ -79,4 +79,4 @@ void SlipTool::FinishDrag(TimelineViewMouseEvent *event) Core::instance()->undo_stack()->pushIfHasChildren(command); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/tool/slip.h b/app/widget/timelinewidget/tool/slip.h index 2d80df367..8de6bfb69 100644 --- a/app/widget/timelinewidget/tool/slip.h +++ b/app/widget/timelinewidget/tool/slip.h @@ -23,7 +23,7 @@ #include "pointer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class SlipTool : public PointerTool { @@ -35,6 +35,6 @@ protected: virtual void FinishDrag(TimelineViewMouseEvent *event) override; }; -OLIVE_NAMESPACE_EXIT +} #endif // SLIPTIMELINETOOL_H diff --git a/app/widget/timelinewidget/tool/tool.cpp b/app/widget/timelinewidget/tool/tool.cpp index dcba3a1ab..633bd5c5b 100644 --- a/app/widget/timelinewidget/tool/tool.cpp +++ b/app/widget/timelinewidget/tool/tool.cpp @@ -23,7 +23,7 @@ #include "node/block/transition/transition.h" #include "widget/nodeview/nodeviewundo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TimelineTool::TimelineTool(TimelineWidget *parent) : dragging_(false), @@ -119,4 +119,4 @@ void TimelineTool::InsertGapsAtGhostDestination(QUndoCommand *command) parent()->InsertGapsAt(earliest_point, latest_point - earliest_point, command); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/tool/tool.h b/app/widget/timelinewidget/tool/tool.h index e0e036ef0..544fe7be9 100644 --- a/app/widget/timelinewidget/tool/tool.h +++ b/app/widget/timelinewidget/tool/tool.h @@ -27,7 +27,7 @@ #include "widget/timelinewidget/view/timelineviewghostitem.h" #include "widget/timelinewidget/view/timelineviewmouseevent.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TimelineWidget; @@ -84,6 +84,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINETOOL_H diff --git a/app/widget/timelinewidget/tool/transition.cpp b/app/widget/timelinewidget/tool/transition.cpp index bf89eb922..335d6652f 100644 --- a/app/widget/timelinewidget/tool/transition.cpp +++ b/app/widget/timelinewidget/tool/transition.cpp @@ -26,7 +26,7 @@ #include "transition.h" #include "widget/nodeview/nodeviewundo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TransitionTool::TransitionTool(TimelineWidget *parent) : AddTool(parent) @@ -181,4 +181,4 @@ void TransitionTool::MouseRelease(TimelineViewMouseEvent *event) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/tool/transition.h b/app/widget/timelinewidget/tool/transition.h index 6dee39d17..70ac8de08 100644 --- a/app/widget/timelinewidget/tool/transition.h +++ b/app/widget/timelinewidget/tool/transition.h @@ -23,7 +23,7 @@ #include "add.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TransitionTool : public AddTool { @@ -37,6 +37,6 @@ private: bool dual_transition_; }; -OLIVE_NAMESPACE_EXIT +} #endif // TRANSITIONTIMELINETOOL_H diff --git a/app/widget/timelinewidget/tool/zoom.cpp b/app/widget/timelinewidget/tool/zoom.cpp index 4eda48a9f..350e98560 100644 --- a/app/widget/timelinewidget/tool/zoom.cpp +++ b/app/widget/timelinewidget/tool/zoom.cpp @@ -21,7 +21,7 @@ #include "widget/timelinewidget/timelinewidget.h" #include "zoom.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ZoomTool::ZoomTool(TimelineWidget *parent) : TimelineTool(parent) @@ -96,4 +96,4 @@ void ZoomTool::MouseRelease(TimelineViewMouseEvent *event) parent()->QueueScroll(scroll_value); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/tool/zoom.h b/app/widget/timelinewidget/tool/zoom.h index f52316a43..26940d8d0 100644 --- a/app/widget/timelinewidget/tool/zoom.h +++ b/app/widget/timelinewidget/tool/zoom.h @@ -23,7 +23,7 @@ #include "tool.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ZoomTool : public TimelineTool { @@ -36,6 +36,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // ZOOMTIMELINETOOL_H diff --git a/app/widget/timelinewidget/trackview/trackview.cpp b/app/widget/timelinewidget/trackview/trackview.cpp index 03fbadfd3..d594787ad 100644 --- a/app/widget/timelinewidget/trackview/trackview.cpp +++ b/app/widget/timelinewidget/trackview/trackview.cpp @@ -28,7 +28,7 @@ #include "trackviewitem.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TrackView::TrackView(Qt::Alignment vertical_alignment, QWidget *parent) : QScrollArea(parent), @@ -132,4 +132,4 @@ void TrackView::RemoveTrack(TrackOutput *track) splitter_->Remove(track->Index()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/trackview/trackview.h b/app/widget/timelinewidget/trackview/trackview.h index 0801dfeac..1ee2e3aab 100644 --- a/app/widget/timelinewidget/trackview/trackview.h +++ b/app/widget/timelinewidget/trackview/trackview.h @@ -28,7 +28,7 @@ #include "trackviewitem.h" #include "trackviewsplitter.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TrackView : public QScrollArea { @@ -63,6 +63,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // TRACKVIEW_H diff --git a/app/widget/timelinewidget/trackview/trackviewitem.cpp b/app/widget/timelinewidget/trackview/trackviewitem.cpp index d2e65c77c..9d2b68904 100644 --- a/app/widget/timelinewidget/trackview/trackviewitem.cpp +++ b/app/widget/timelinewidget/trackview/trackviewitem.cpp @@ -26,7 +26,7 @@ #include #include -OLIVE_NAMESPACE_ENTER +namespace olive { TrackViewItem::TrackViewItem(TrackOutput* track, QWidget *parent) : QWidget(parent), @@ -117,4 +117,4 @@ void TrackViewItem::UpdateLabel() } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/trackview/trackviewitem.h b/app/widget/timelinewidget/trackview/trackviewitem.h index 258656ecf..01a237f2d 100644 --- a/app/widget/timelinewidget/trackview/trackviewitem.h +++ b/app/widget/timelinewidget/trackview/trackviewitem.h @@ -29,7 +29,7 @@ #include "widget/clickablelabel/clickablelabel.h" #include "widget/focusablelineedit/focusablelineedit.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TrackViewItem : public QWidget { @@ -63,6 +63,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // TRACKVIEWITEM_H diff --git a/app/widget/timelinewidget/trackview/trackviewsplitter.cpp b/app/widget/timelinewidget/trackview/trackviewsplitter.cpp index 0ee10f53e..e0226016b 100644 --- a/app/widget/timelinewidget/trackview/trackviewsplitter.cpp +++ b/app/widget/timelinewidget/trackview/trackviewsplitter.cpp @@ -25,7 +25,7 @@ #include "node/output/track/track.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TrackViewSplitter::TrackViewSplitter(Qt::Alignment vertical_alignment, QWidget* parent) : QSplitter(Qt::Vertical, parent), @@ -192,4 +192,4 @@ void TrackViewSplitterHandle::paintEvent(QPaintEvent *) p.fillRect(rect(), palette().base()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/trackview/trackviewsplitter.h b/app/widget/timelinewidget/trackview/trackviewsplitter.h index f0fb5435c..b478159ac 100644 --- a/app/widget/timelinewidget/trackview/trackviewsplitter.h +++ b/app/widget/timelinewidget/trackview/trackviewsplitter.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TrackViewSplitterHandle : public QSplitterHandle { @@ -77,6 +77,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TRACKVIEWSPLITTER_H diff --git a/app/widget/timelinewidget/undo/undo.cpp b/app/widget/timelinewidget/undo/undo.cpp index 97f7b8624..6de8941d2 100644 --- a/app/widget/timelinewidget/undo/undo.cpp +++ b/app/widget/timelinewidget/undo/undo.cpp @@ -28,7 +28,7 @@ #include "widget/nodeview/nodeviewundo.h" #include "widget/timelinewidget/timelinewidget.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Node* TakeNodeFromParentGraph(Node* n, QObject* new_parent = nullptr) { @@ -1751,4 +1751,4 @@ void TimelineSetSelectionsCommand::undo() timeline_->SetSelections(old_); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/undo/undo.h b/app/widget/timelinewidget/undo/undo.h index 377fabb38..adb670e99 100644 --- a/app/widget/timelinewidget/undo/undo.h +++ b/app/widget/timelinewidget/undo/undo.h @@ -32,7 +32,7 @@ #include "undo/undocommand.h" #include "widget/timelinewidget/timelinewidgetselections.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class BlockResizeCommand : public UndoCommand { public: @@ -633,6 +633,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINEUNDOABLE_H diff --git a/app/widget/timelinewidget/view/handmovableview.cpp b/app/widget/timelinewidget/view/handmovableview.cpp index ae06c6bc7..6c3362e3c 100644 --- a/app/widget/timelinewidget/view/handmovableview.cpp +++ b/app/widget/timelinewidget/view/handmovableview.cpp @@ -24,7 +24,7 @@ #include "core.h" -OLIVE_NAMESPACE_ENTER +namespace olive { HandMovableView::HandMovableView(QWidget* parent) : QGraphicsView(parent), @@ -115,4 +115,4 @@ const QGraphicsView::DragMode &HandMovableView::GetDefaultDragMode() const return default_drag_mode_; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/view/handmovableview.h b/app/widget/timelinewidget/view/handmovableview.h index 26562e00a..c39f20730 100644 --- a/app/widget/timelinewidget/view/handmovableview.h +++ b/app/widget/timelinewidget/view/handmovableview.h @@ -25,7 +25,7 @@ #include "tool/tool.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class HandMovableView : public QGraphicsView { @@ -54,6 +54,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // HANDMOVABLEVIEW_H diff --git a/app/widget/timelinewidget/view/timelineview.cpp b/app/widget/timelinewidget/view/timelineview.cpp index e914f55d3..d9cd2ced8 100644 --- a/app/widget/timelinewidget/view/timelineview.cpp +++ b/app/widget/timelinewidget/view/timelineview.cpp @@ -33,7 +33,7 @@ #include "node/input/media/media.h" #include "project/item/footage/footage.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TimelineView::TimelineView(Qt::Alignment vertical_alignment, QWidget *parent) : TimelineViewBase(parent), @@ -480,4 +480,4 @@ void TimelineView::UserSetTime(const int64_t &time) emit TimeChanged(time); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/view/timelineview.h b/app/widget/timelinewidget/view/timelineview.h index 0096f8d88..71d6eb1d8 100644 --- a/app/widget/timelinewidget/view/timelineview.h +++ b/app/widget/timelinewidget/view/timelineview.h @@ -35,7 +35,7 @@ #include "widget/timelinewidget/undo/undo.h" #include "undo/undostack.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A widget for viewing and interacting Sequences @@ -130,6 +130,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINEVIEW_H diff --git a/app/widget/timelinewidget/view/timelineviewbase.cpp b/app/widget/timelinewidget/view/timelineviewbase.cpp index 06a8f3dc8..45a836b64 100644 --- a/app/widget/timelinewidget/view/timelineviewbase.cpp +++ b/app/widget/timelinewidget/view/timelineviewbase.cpp @@ -29,7 +29,7 @@ #include "common/timecodefunctions.h" #include "config/config.h" -OLIVE_NAMESPACE_ENTER +namespace olive { const double TimelineViewBase::kMaximumScale = 8192; @@ -359,4 +359,4 @@ bool TimelineViewBase::WheelEventIsAZoomEvent(QWheelEvent *event) return (static_cast(event->modifiers() & Qt::ControlModifier) == !Config::Current()["ScrollZooms"].toBool()); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/view/timelineviewbase.h b/app/widget/timelinewidget/view/timelineviewbase.h index ac9b198c6..1b14744e3 100644 --- a/app/widget/timelinewidget/view/timelineviewbase.h +++ b/app/widget/timelinewidget/view/timelineviewbase.h @@ -28,7 +28,7 @@ #include "widget/timelinewidget/snapservice.h" #include "widget/timelinewidget/timelinescaledobject.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TimelineViewBase : public HandMovableView, public TimelineScaledObject { @@ -134,6 +134,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINEVIEWBASE_H diff --git a/app/widget/timelinewidget/view/timelineviewblockitem.cpp b/app/widget/timelinewidget/view/timelineviewblockitem.cpp index 6313e5d14..20efa28fe 100644 --- a/app/widget/timelinewidget/view/timelineviewblockitem.cpp +++ b/app/widget/timelinewidget/view/timelineviewblockitem.cpp @@ -35,7 +35,7 @@ #include "node/block/transition/transition.h" #include "widget/viewer/audiowaveformview.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TimelineViewBlockItem::TimelineViewBlockItem(Block *block, QGraphicsItem* parent) : TimelineViewRect(parent), @@ -192,4 +192,4 @@ void TimelineViewBlockItem::paint(QPainter *painter, const QStyleOptionGraphicsI } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/view/timelineviewblockitem.h b/app/widget/timelinewidget/view/timelineviewblockitem.h index a9315cab8..83cef5c0d 100644 --- a/app/widget/timelinewidget/view/timelineviewblockitem.h +++ b/app/widget/timelinewidget/view/timelineviewblockitem.h @@ -24,7 +24,7 @@ #include "timelineviewrect.h" #include "node/block/clip/clip.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A graphical representation of a ClipBlock @@ -46,6 +46,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINEVIEWCLIPITEM_H diff --git a/app/widget/timelinewidget/view/timelineviewghostitem.cpp b/app/widget/timelinewidget/view/timelineviewghostitem.cpp index 335c15e0c..e816094d8 100644 --- a/app/widget/timelinewidget/view/timelineviewghostitem.cpp +++ b/app/widget/timelinewidget/view/timelineviewghostitem.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { TimelineViewGhostItem::TimelineViewGhostItem() : track_adj_(0), @@ -203,4 +203,4 @@ bool TimelineViewGhostItem::HasBeenAdjusted() const || GetTrackAdjustment() != 0; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/view/timelineviewghostitem.h b/app/widget/timelinewidget/view/timelineviewghostitem.h index dbab4e782..9f734e45f 100644 --- a/app/widget/timelinewidget/view/timelineviewghostitem.h +++ b/app/widget/timelinewidget/view/timelineviewghostitem.h @@ -28,7 +28,7 @@ #include "timelineviewblockitem.h" #include "timelineviewrect.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A graphical representation of changes the user is making before they apply it */ @@ -142,6 +142,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINEVIEWGHOSTITEM_H diff --git a/app/widget/timelinewidget/view/timelineviewmouseevent.cpp b/app/widget/timelinewidget/view/timelineviewmouseevent.cpp index 47ae0d477..61e697d63 100644 --- a/app/widget/timelinewidget/view/timelineviewmouseevent.cpp +++ b/app/widget/timelinewidget/view/timelineviewmouseevent.cpp @@ -24,7 +24,7 @@ #include "widget/timelinewidget/timelinescaledobject.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TimelineViewMouseEvent::TimelineViewMouseEvent(const qreal &scene_x, const double &scale_x, @@ -100,4 +100,4 @@ void TimelineViewMouseEvent::ignore() source_event_->ignore(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/view/timelineviewmouseevent.h b/app/widget/timelinewidget/view/timelineviewmouseevent.h index 4fc2654f3..f4371660e 100644 --- a/app/widget/timelinewidget/view/timelineviewmouseevent.h +++ b/app/widget/timelinewidget/view/timelineviewmouseevent.h @@ -27,7 +27,7 @@ #include "timeline/timelinecoordinate.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TimelineViewMouseEvent { @@ -84,6 +84,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINEVIEWMOUSEEVENT_H diff --git a/app/widget/timelinewidget/view/timelineviewrect.cpp b/app/widget/timelinewidget/view/timelineviewrect.cpp index 64e38a9eb..1145671ea 100644 --- a/app/widget/timelinewidget/view/timelineviewrect.cpp +++ b/app/widget/timelinewidget/view/timelineviewrect.cpp @@ -20,7 +20,7 @@ #include "timelineviewrect.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TimelineViewRect::TimelineViewRect(QGraphicsItem* parent) : QGraphicsRectItem(parent), @@ -62,4 +62,4 @@ void TimelineViewRect::TimebaseChangedEvent(const rational &tb) UpdateRect(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timelinewidget/view/timelineviewrect.h b/app/widget/timelinewidget/view/timelineviewrect.h index c56432ec1..14311264a 100644 --- a/app/widget/timelinewidget/view/timelineviewrect.h +++ b/app/widget/timelinewidget/view/timelineviewrect.h @@ -26,7 +26,7 @@ #include "timeline/timelinecoordinate.h" #include "../timelinescaledobject.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A base class for graphical representations of Block nodes @@ -55,6 +55,6 @@ protected: TrackReference track_; }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMELINEVIEWRECT_H diff --git a/app/widget/timeruler/seekablewidget.cpp b/app/widget/timeruler/seekablewidget.cpp index 3bacf4ee5..dd13e1d90 100644 --- a/app/widget/timeruler/seekablewidget.cpp +++ b/app/widget/timeruler/seekablewidget.cpp @@ -27,7 +27,7 @@ #include "common/qtutils.h" #include "core.h" -OLIVE_NAMESPACE_ENTER +namespace olive { SeekableWidget::SeekableWidget(QWidget* parent) : TimelineScaledWidget(parent), @@ -260,4 +260,4 @@ void SeekableWidget::DrawPlayhead(QPainter *p, int x, int y) p->setRenderHint(QPainter::Antialiasing, false); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timeruler/seekablewidget.h b/app/widget/timeruler/seekablewidget.h index a9712b05f..d34b47bac 100644 --- a/app/widget/timeruler/seekablewidget.h +++ b/app/widget/timeruler/seekablewidget.h @@ -26,7 +26,7 @@ #include "widget/timelinewidget/snapservice.h" #include "widget/timelinewidget/timelinescaledobject.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class SeekableWidget : public TimelineScaledWidget { @@ -100,6 +100,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // SEEKABLEWIDGET_H diff --git a/app/widget/timeruler/timeruler.cpp b/app/widget/timeruler/timeruler.cpp index 98236ce39..3b3f92635 100644 --- a/app/widget/timeruler/timeruler.cpp +++ b/app/widget/timeruler/timeruler.cpp @@ -30,7 +30,7 @@ #include "widget/menu/menu.h" #include "widget/menu/menushared.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TimeRuler::TimeRuler(bool text_visible, bool cache_status_visible, QWidget* parent) : SeekableWidget(parent), @@ -332,4 +332,4 @@ void TimeRuler::UpdateHeight() setFixedHeight(height); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timeruler/timeruler.h b/app/widget/timeruler/timeruler.h index 7d0d6f0d9..400bd640f 100644 --- a/app/widget/timeruler/timeruler.h +++ b/app/widget/timeruler/timeruler.h @@ -28,7 +28,7 @@ #include "seekablewidget.h" #include "render/playbackcache.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TimeRuler : public SeekableWidget { @@ -69,6 +69,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMERULER_H diff --git a/app/widget/timetarget/timetarget.cpp b/app/widget/timetarget/timetarget.cpp index cebce4296..eb8830bd6 100644 --- a/app/widget/timetarget/timetarget.cpp +++ b/app/widget/timetarget/timetarget.cpp @@ -20,7 +20,7 @@ #include "timetarget.h" -OLIVE_NAMESPACE_ENTER +namespace olive { TimeTargetObject::TimeTargetObject() : time_target_(nullptr), @@ -80,4 +80,4 @@ TimeRange TimeTargetObject::GetAdjustedTime(Node* from, Node* to, const TimeRang return adjusted.size(); }*/ -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/timetarget/timetarget.h b/app/widget/timetarget/timetarget.h index 3a4b4d0c6..5826bfd61 100644 --- a/app/widget/timetarget/timetarget.h +++ b/app/widget/timetarget/timetarget.h @@ -23,7 +23,7 @@ #include "node/node.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class TimeTargetObject { @@ -50,6 +50,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // TIMETARGETOBJECT_H diff --git a/app/widget/toolbar/toolbar.cpp b/app/widget/toolbar/toolbar.cpp index 2c5078561..2a6aaac39 100644 --- a/app/widget/toolbar/toolbar.cpp +++ b/app/widget/toolbar/toolbar.cpp @@ -29,7 +29,7 @@ #include "ui/icons/icons.h" #include "widget/menu/menu.h" -OLIVE_NAMESPACE_ENTER +namespace olive { Toolbar::Toolbar(QWidget *parent) : QWidget(parent) @@ -206,4 +206,4 @@ void Toolbar::TransitionMenuItemTriggered(QAction *a) emit SelectedTransitionChanged(NodeFactory::GetIDFromMenuAction(a)); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/toolbar/toolbar.h b/app/widget/toolbar/toolbar.h index 338ef6b5d..076a7850e 100644 --- a/app/widget/toolbar/toolbar.h +++ b/app/widget/toolbar/toolbar.h @@ -27,7 +27,7 @@ #include "widget/toolbar/toolbarbutton.h" #include "tool/tool.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A widget containing buttons for all of Olive's application-wide tools. @@ -234,6 +234,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // TOOLBAR_H diff --git a/app/widget/toolbar/toolbarbutton.cpp b/app/widget/toolbar/toolbarbutton.cpp index de9e5d17c..df65826c3 100644 --- a/app/widget/toolbar/toolbarbutton.cpp +++ b/app/widget/toolbar/toolbarbutton.cpp @@ -20,7 +20,7 @@ #include "toolbarbutton.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ToolbarButton::ToolbarButton(QWidget *parent, const Tool::Item &tool) : QPushButton(parent), @@ -34,4 +34,4 @@ const Tool::Item &ToolbarButton::tool() return tool_; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/toolbar/toolbarbutton.h b/app/widget/toolbar/toolbarbutton.h index 6cd51a606..a8ca88dd4 100644 --- a/app/widget/toolbar/toolbarbutton.h +++ b/app/widget/toolbar/toolbarbutton.h @@ -25,7 +25,7 @@ #include "tool/tool.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief Simple derived class of QPushButton to contain an Tool ID. Used as the main widget through Toolbar. @@ -59,6 +59,6 @@ private: Tool::Item tool_; }; -OLIVE_NAMESPACE_EXIT +} #endif // TOOLBARBUTTON_H diff --git a/app/widget/viewer/audiowaveformview.cpp b/app/widget/viewer/audiowaveformview.cpp index 5b24d87f1..2dce75fbd 100644 --- a/app/widget/viewer/audiowaveformview.cpp +++ b/app/widget/viewer/audiowaveformview.cpp @@ -28,7 +28,7 @@ #include "config/config.h" #include "timeline/timelinecommon.h" -OLIVE_NAMESPACE_ENTER +namespace olive { AudioWaveformView::AudioWaveformView(QWidget *parent) : SeekableWidget(parent), @@ -152,4 +152,4 @@ void AudioWaveformView::ForceUpdate() update(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/viewer/audiowaveformview.h b/app/widget/viewer/audiowaveformview.h index afa2a0dbf..94ab95ab5 100644 --- a/app/widget/viewer/audiowaveformview.h +++ b/app/widget/viewer/audiowaveformview.h @@ -28,7 +28,7 @@ #include "render/audioplaybackcache.h" #include "widget/timeruler/seekablewidget.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class AudioWaveformView : public SeekableWidget { @@ -58,6 +58,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // AUDIOWAVEFORMVIEW_H diff --git a/app/widget/viewer/footageviewer.cpp b/app/widget/viewer/footageviewer.cpp index 51a17bf94..0cc0ef2c9 100644 --- a/app/widget/viewer/footageviewer.cpp +++ b/app/widget/viewer/footageviewer.cpp @@ -26,7 +26,7 @@ #include "config/config.h" #include "project/project.h" -OLIVE_NAMESPACE_ENTER +namespace olive { FootageViewerWidget::FootageViewerWidget(QWidget *parent) : ViewerWidget(parent), @@ -175,4 +175,4 @@ void FootageViewerWidget::StartAudioDrag() StartFootageDragInternal(false, true); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/viewer/footageviewer.h b/app/widget/viewer/footageviewer.h index fc014ec49..9b76b6000 100644 --- a/app/widget/viewer/footageviewer.h +++ b/app/widget/viewer/footageviewer.h @@ -26,7 +26,7 @@ #include "node/output/viewer/viewer.h" #include "viewer.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class FootageViewerWidget : public ViewerWidget { @@ -64,6 +64,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // FOOTAGEVIEWERWIDGET_H diff --git a/app/widget/viewer/gizmotraverser.cpp b/app/widget/viewer/gizmotraverser.cpp index a01d61378..e9938d9e8 100644 --- a/app/widget/viewer/gizmotraverser.cpp +++ b/app/widget/viewer/gizmotraverser.cpp @@ -20,7 +20,7 @@ #include "gizmotraverser.h" -OLIVE_NAMESPACE_ENTER +namespace olive { QVariant GizmoTraverser::ProcessVideoFootage(StreamPtr stream, const rational &input_time) { @@ -40,4 +40,4 @@ QVariant GizmoTraverser::ProcessShader(const Node *node, const TimeRange &range, return size_; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/viewer/gizmotraverser.h b/app/widget/viewer/gizmotraverser.h index fbd8e44aa..576019855 100644 --- a/app/widget/viewer/gizmotraverser.h +++ b/app/widget/viewer/gizmotraverser.h @@ -23,7 +23,7 @@ #include "node/traverser.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class GizmoTraverser : public NodeTraverser { @@ -45,6 +45,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // GIZMOTRAVERSER_H diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp index eafb0ac3d..00757f925 100644 --- a/app/widget/viewer/viewer.cpp +++ b/app/widget/viewer/viewer.cpp @@ -42,7 +42,7 @@ #include "widget/menu/menu.h" #include "window/mainwindow/mainwindow.h" -OLIVE_NAMESPACE_ENTER +namespace olive { QVector ViewerWidget::instances_; @@ -1199,4 +1199,4 @@ void ViewerWidget::ViewerShiftedRange(const rational &from, const rational &to) } } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/viewer/viewer.h b/app/widget/viewer/viewer.h index 4133d7bd1..40bdc7053 100644 --- a/app/widget/viewer/viewer.h +++ b/app/widget/viewer/viewer.h @@ -42,7 +42,7 @@ #include "widget/playbackcontrols/playbackcontrols.h" #include "widget/timebased/timebased.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief An OpenGL-based viewer widget with playback controls (a PlaybackControls widget). @@ -266,7 +266,7 @@ private slots: void SetZoomFromMenu(QAction* action); - void ViewerShiftedRange(const OLIVE_NAMESPACE::rational& from, const OLIVE_NAMESPACE::rational& to); + void ViewerShiftedRange(const olive::rational& from, const olive::rational& to); void UpdateStack(); @@ -286,7 +286,7 @@ private slots: void RendererGeneratedFrameForQueue(); - void ViewerInvalidatedVideoRange(const OLIVE_NAMESPACE::TimeRange &range); + void ViewerInvalidatedVideoRange(const olive::TimeRange &range); void ManualSwitchToWaveform(bool e); @@ -294,6 +294,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // VIEWER_WIDGET_H diff --git a/app/widget/viewer/viewerdisplay.cpp b/app/widget/viewer/viewerdisplay.cpp index 79326f8a3..c688a1234 100644 --- a/app/widget/viewer/viewerdisplay.cpp +++ b/app/widget/viewer/viewerdisplay.cpp @@ -35,7 +35,7 @@ #include "core.h" #include "gizmotraverser.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ViewerDisplayWidget::ViewerDisplayWidget(QWidget *parent) : ManagedDisplayWidget(parent), @@ -421,4 +421,4 @@ QTransform ViewerDisplayWidget::GenerateWorldTransform() return world; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/viewer/viewerdisplay.h b/app/widget/viewer/viewerdisplay.h index fcf140cf1..5c6fa164a 100644 --- a/app/widget/viewer/viewerdisplay.h +++ b/app/widget/viewer/viewerdisplay.h @@ -32,7 +32,7 @@ #include "widget/manageddisplay/manageddisplay.h" #include "widget/timetarget/timetarget.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief The inner display/rendering widget of a Viewer class. @@ -252,6 +252,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // VIEWERGLWIDGET_H diff --git a/app/widget/viewer/viewerplaybacktimer.cpp b/app/widget/viewer/viewerplaybacktimer.cpp index a1abed086..d2de65c77 100644 --- a/app/widget/viewer/viewerplaybacktimer.cpp +++ b/app/widget/viewer/viewerplaybacktimer.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { void ViewerPlaybackTimer::Start(const int64_t &start_timestamp, const int &playback_speed, const double &timebase) { @@ -41,4 +41,4 @@ int64_t ViewerPlaybackTimer::GetTimestampNow() const return start_timestamp_ + frames_since_start * playback_speed_; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/viewer/viewerplaybacktimer.h b/app/widget/viewer/viewerplaybacktimer.h index 4df1031dc..bd613d687 100644 --- a/app/widget/viewer/viewerplaybacktimer.h +++ b/app/widget/viewer/viewerplaybacktimer.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ViewerPlaybackTimer { public: @@ -43,6 +43,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // VIEWERPLAYBACKTIMER_H diff --git a/app/widget/viewer/viewerqueue.h b/app/widget/viewer/viewerqueue.h index 19fb8d908..3e0ddfdd8 100644 --- a/app/widget/viewer/viewerqueue.h +++ b/app/widget/viewer/viewerqueue.h @@ -25,7 +25,7 @@ #include "codec/frame.h" -OLIVE_NAMESPACE_ENTER +namespace olive { struct ViewerPlaybackFrame { rational timestamp; @@ -52,6 +52,6 @@ public: }; -OLIVE_NAMESPACE_EXIT +} #endif // VIEWERQUEUE_H diff --git a/app/widget/viewer/viewersafemargininfo.h b/app/widget/viewer/viewersafemargininfo.h index a71a0b2d7..73add3bea 100644 --- a/app/widget/viewer/viewersafemargininfo.h +++ b/app/widget/viewer/viewersafemargininfo.h @@ -25,7 +25,7 @@ #include "common/define.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ViewerSafeMarginInfo { public: @@ -70,6 +70,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // VIEWERSAFEMARGININFO_H diff --git a/app/widget/viewer/viewersizer.cpp b/app/widget/viewer/viewersizer.cpp index 9bc685f1a..2db30c9d4 100644 --- a/app/widget/viewer/viewersizer.cpp +++ b/app/widget/viewer/viewersizer.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { ViewerSizer::ViewerSizer(QWidget *parent) : QWidget(parent), @@ -255,4 +255,4 @@ void ViewerSizer::ScrollBarMoved() emit RequestTranslate(mat); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/viewer/viewersizer.h b/app/widget/viewer/viewersizer.h index 43adc0277..8833e9735 100644 --- a/app/widget/viewer/viewersizer.h +++ b/app/widget/viewer/viewersizer.h @@ -27,7 +27,7 @@ #include "common/define.h" #include "common/rational.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief A container widget that enforces the aspect ratio of a child widget @@ -120,6 +120,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif // VIEWERSIZER_H diff --git a/app/widget/viewer/viewerwindow.cpp b/app/widget/viewer/viewerwindow.cpp index ae79e6373..57484da23 100644 --- a/app/widget/viewer/viewerwindow.cpp +++ b/app/widget/viewer/viewerwindow.cpp @@ -25,7 +25,7 @@ #include "common/timecodefunctions.h" -OLIVE_NAMESPACE_ENTER +namespace olive { ViewerWindow::ViewerWindow(QWidget *parent) : QWidget(parent, Qt::Window | Qt::WindowStaysOnTopHint), @@ -140,4 +140,4 @@ void ViewerWindow::UpdateMatrix() display_widget_->SetMatrixZoom(mat); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/widget/viewer/viewerwindow.h b/app/widget/viewer/viewerwindow.h index bc883eafa..a2cbc76ce 100644 --- a/app/widget/viewer/viewerwindow.h +++ b/app/widget/viewer/viewerwindow.h @@ -27,7 +27,7 @@ #include "viewerplaybacktimer.h" #include "viewerqueue.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class ViewerWindow : public QWidget { @@ -89,6 +89,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // VIEWERWINDOW_H diff --git a/app/window/mainwindow/mainmenu.cpp b/app/window/mainwindow/mainmenu.cpp index 89e5b2b00..21de51cb7 100644 --- a/app/window/mainwindow/mainmenu.cpp +++ b/app/window/mainwindow/mainmenu.cpp @@ -36,7 +36,7 @@ #include "widget/menu/menushared.h" #include "mainwindow.h" -OLIVE_NAMESPACE_ENTER +namespace olive { MainMenu::MainMenu(MainWindow *parent) : QMenuBar(parent) @@ -692,4 +692,4 @@ void MainMenu::Retranslate() help_about_item_->setText(tr("&About...")); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/window/mainwindow/mainmenu.h b/app/window/mainwindow/mainmenu.h index d1c5e046d..b2e7c0546 100644 --- a/app/window/mainwindow/mainmenu.h +++ b/app/window/mainwindow/mainmenu.h @@ -27,7 +27,7 @@ #include "dialog/actionsearch/actionsearch.h" #include "widget/menu/menu.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class MainWindow; @@ -272,6 +272,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // MAINMENU_H diff --git a/app/window/mainwindow/mainstatusbar.cpp b/app/window/mainwindow/mainstatusbar.cpp index bbc8ee455..6bdd530a4 100644 --- a/app/window/mainwindow/mainstatusbar.cpp +++ b/app/window/mainwindow/mainstatusbar.cpp @@ -22,7 +22,7 @@ #include -OLIVE_NAMESPACE_ENTER +namespace olive { MainStatusBar::MainStatusBar(QWidget *parent) : QStatusBar(parent), @@ -104,4 +104,4 @@ void MainStatusBar::mouseDoubleClickEvent(QMouseEvent* e) emit DoubleClicked(); } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/window/mainwindow/mainstatusbar.h b/app/window/mainwindow/mainstatusbar.h index 4f744c4c7..dad53115d 100644 --- a/app/window/mainwindow/mainstatusbar.h +++ b/app/window/mainwindow/mainstatusbar.h @@ -26,7 +26,7 @@ #include "task/taskmanager.h" -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief Shows abbreviated information from a TaskManager object @@ -61,6 +61,6 @@ private: }; -OLIVE_NAMESPACE_EXIT +} #endif // MAINSTATUSBAR_H diff --git a/app/window/mainwindow/mainwindow.cpp b/app/window/mainwindow/mainwindow.cpp index d9faaf66b..8426fa8cf 100644 --- a/app/window/mainwindow/mainwindow.cpp +++ b/app/window/mainwindow/mainwindow.cpp @@ -32,7 +32,7 @@ #include "mainmenu.h" #include "mainstatusbar.h" -OLIVE_NAMESPACE_ENTER +namespace olive { MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) @@ -697,4 +697,4 @@ T *MainWindow::AppendFloatingPanelInternal(QList &list) return panel; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/window/mainwindow/mainwindow.h b/app/window/mainwindow/mainwindow.h index 3d0e03772..3b543880b 100644 --- a/app/window/mainwindow/mainwindow.h +++ b/app/window/mainwindow/mainwindow.h @@ -44,7 +44,7 @@ #include #endif -OLIVE_NAMESPACE_ENTER +namespace olive { /** * @brief Olive's main window responsible for docking widgets and the main menu bar. @@ -175,6 +175,6 @@ private slots: }; -OLIVE_NAMESPACE_EXIT +} #endif diff --git a/app/window/mainwindow/mainwindowlayoutinfo.cpp b/app/window/mainwindow/mainwindowlayoutinfo.cpp index 0b75a957f..3466f26ea 100644 --- a/app/window/mainwindow/mainwindowlayoutinfo.cpp +++ b/app/window/mainwindow/mainwindowlayoutinfo.cpp @@ -1,6 +1,6 @@ #include "mainwindowlayoutinfo.h" -OLIVE_NAMESPACE_ENTER +namespace olive { void MainWindowLayoutInfo::toXml(QXmlStreamWriter *writer) const { @@ -101,4 +101,4 @@ void MainWindowLayoutInfo::set_state(const QByteArray &layout) state_ = layout; } -OLIVE_NAMESPACE_EXIT +} diff --git a/app/window/mainwindow/mainwindowlayoutinfo.h b/app/window/mainwindow/mainwindowlayoutinfo.h index 59f357935..bb14ab66e 100644 --- a/app/window/mainwindow/mainwindowlayoutinfo.h +++ b/app/window/mainwindow/mainwindowlayoutinfo.h @@ -4,7 +4,7 @@ #include "project/item/folder/folder.h" #include "project/item/sequence/sequence.h" -OLIVE_NAMESPACE_ENTER +namespace olive { class MainWindowLayoutInfo { @@ -50,8 +50,8 @@ private: }; -OLIVE_NAMESPACE_EXIT +} -Q_DECLARE_METATYPE(OLIVE_NAMESPACE::MainWindowLayoutInfo) +Q_DECLARE_METATYPE(olive::MainWindowLayoutInfo) #endif // MAINWINDOWLAYOUTINFO_H