benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed some timeline widget helper class files to avoid file name

Browse source 
collisions with the Model
This commit is contained in:
Joel Holdsworth 2008-11-25 21:31:45 +00:00
parent b9d62c9be9
commit 4470baf8f5
11 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gui/Makefile.am
View file

@ -70,14 +70,14 @@ lumigui_SOURCES = \
$(lumigui_srcdir)/widgets/timeline/timeline-arrow-tool.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-ibeam-tool.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-ibeam-tool.hpp \
$(lumigui_srcdir)/widgets/timeline/track.cpp \
$(lumigui_srcdir)/widgets/timeline/track.hpp \
$(lumigui_srcdir)/widgets/timeline/clip-track.cpp \
$(lumigui_srcdir)/widgets/timeline/clip-track.hpp \
$(lumigui_srcdir)/widgets/timeline/group-track.cpp \
$(lumigui_srcdir)/widgets/timeline/group-track.hpp \
$(lumigui_srcdir)/widgets/timeline/clip.cpp \
$(lumigui_srcdir)/widgets/timeline/clip.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-track.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-track.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-clip-track.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-clip-track.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-group-track.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-group-track.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-clip.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-clip.hpp \
$(lumigui_srcdir)/model/project.cpp \
$(lumigui_srcdir)/model/project.hpp \
$(lumigui_srcdir)/model/sequence.cpp \

4
src/gui/widgets/timeline-widget.hpp
View file

@ -33,8 +33,8 @@
#include "timeline/timeline-tool.hpp"
#include "timeline/timeline-arrow-tool.hpp"
#include "timeline/timeline-ibeam-tool.hpp"
#include "timeline/group-track.hpp"
#include "timeline/clip-track.hpp"
#include "timeline/timeline-group-track.hpp"
#include "timeline/timeline-clip-track.hpp"
namespace gui {
namespace widgets {

4
src/gui/widgets/timeline/clip-track.cpp → src/gui/widgets/timeline/timeline-clip-track.cpp
View file

@ -1,5 +1,5 @@
/*
clip-track.cpp - Implementation of the timeline clip track object
timeline-clip-track.cpp - Implementation of the timeline clip track object
Copyright (C) Lumiera.org
2008, Joel Holdsworth <joel@airwebreathe.org.uk>
@ -20,7 +20,7 @@
* *****************************************************/
#include "clip-track.hpp"
#include "timeline-clip-track.hpp"
#include "timeline-view-window.hpp"
using namespace Gtk;

12
src/gui/widgets/timeline/clip-track.hpp → src/gui/widgets/timeline/timeline-clip-track.hpp
View file

@ -1,5 +1,5 @@
/*
clip-track.hpp - Declaration of the timeline clip track object
timeline-clip-track.hpp - Declaration of the timeline clip track object
Copyright (C) Lumiera.org
2008, Joel Holdsworth <joel@airwebreathe.org.uk>
@ -20,15 +20,15 @@
*/
/**
* @file widgets/timeline/clip-track.hpp
* @file widgets/timeline/timeline-clip-track.hpp
* This file contains the definition of timeline track objects which
* contain clips.
*/
#ifndef CLIP_TRACK_HPP
#define CLIP_TRACK_HPP
#ifndef TIMELINE_CLIP_TRACK_HPP
#define TIMELINE_CLIP_TRACK_HPP
#include "track.hpp"
#include "timeline-track.hpp"
namespace gui {
namespace widgets {
@ -55,4 +55,4 @@ private:
} // namespace widgets
} // namespace gui
#endif // CLIP_TRACK_HPP
#endif // TIMELINE_CLIP_TRACK_HPP

4
src/gui/widgets/timeline/clip.cpp → src/gui/widgets/timeline/timeline-clip.cpp
View file

@ -1,5 +1,5 @@
/*
track.cpp - Implementation of the timeline clip object
timeline-track.cpp - Implementation of the timeline clip object
Copyright (C) Lumiera.org
2008, Joel Holdsworth <joel@airwebreathe.org.uk>
@ -20,7 +20,7 @@
* *****************************************************/
#include "clip.hpp"
#include "timeline-clip.hpp"
namespace gui {
namespace widgets {

10
src/gui/widgets/timeline/clip.hpp → src/gui/widgets/timeline/timeline-clip.hpp
View file

@ -1,5 +1,5 @@
/*
clip.hpp - Declaration of the timeline clip object
timeline-clip.hpp - Declaration of the timeline clip object
Copyright (C) Lumiera.org
2008, Joel Holdsworth <joel@airwebreathe.org.uk>
@ -19,12 +19,12 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/** @file widgets/timeline/clip.hpp
/** @file widgets/timeline/timeline-clip.hpp
** This file contains the definition of timeline clip object
*/
#ifndef CLIP_HPP
#define CLIP_HPP
#ifndef TIMELINE_CLIP_HPP
#define TIMELINE_CLIP_HPP
namespace gui {
namespace widgets {
@ -42,4 +42,4 @@ public:
} // namespace widgets
} // namespace gui
#endif // CLIP_HPP
#endif // TIMELINE_CLIP_HPP

4
src/gui/widgets/timeline/group-track.cpp → src/gui/widgets/timeline/timeline-group-track.cpp
View file

@ -1,5 +1,5 @@
/*
group-track.cpp - Implementation of the timeline group track object
timeline-group-track.cpp - Implementation of the timeline group track object
Copyright (C) Lumiera.org
2008, Joel Holdsworth <joel@airwebreathe.org.uk>
@ -20,7 +20,7 @@
* *****************************************************/
#include "group-track.hpp"
#include "timeline-group-track.hpp"
using namespace Gtk;

12
src/gui/widgets/timeline/group-track.hpp → src/gui/widgets/timeline/timeline-group-track.hpp
View file

@ -1,5 +1,5 @@
/*
group-track.hpp - Declaration of the timeline group track object
timeline-group-track.hpp - Declaration of the timeline group track object
Copyright (C) Lumiera.org
2008, Joel Holdsworth <joel@airwebreathe.org.uk>
@ -19,14 +19,14 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/** @file widgets/timeline/group-track.hpp
/** @file widgets/timeline/timeline-group-track.hpp
** This file contains the definition of group track timeline objects
*/
#ifndef GROUP_TRACK_HPP
#define GROUP_TRACK_HPP
#ifndef TIMELINE_GROUP_TRACK_HPP
#define TIMELINE_GROUP_TRACK_HPP
#include "track.hpp"
#include "timeline-track.hpp"
namespace gui {
namespace widgets {
@ -54,4 +54,4 @@ private:
} // namespace widgets
} // namespace gui
#endif // GROUP_TRACK_HPP
#endif // TIMELINE_GROUP_TRACK_HPP

2
src/gui/widgets/timeline/timeline-header-container.cpp
View file

@ -24,7 +24,7 @@
#include <boost/foreach.hpp>
#include "timeline-header-container.hpp"
#include "track.hpp"
#include "timeline-track.hpp"
#include "../timeline-widget.hpp"
using namespace Gtk;

4
src/gui/widgets/timeline/track.cpp → src/gui/widgets/timeline/timeline-track.cpp
View file

@ -1,5 +1,5 @@
/*
track.cpp - Implementation of the timeline track object
timeline-track.cpp - Implementation of the timeline track object
Copyright (C) Lumiera.org
2008, Joel Holdsworth <joel@airwebreathe.org.uk>
@ -20,7 +20,7 @@
* *****************************************************/
#include "track.hpp"
#include "timeline-track.hpp"
#include "../../window-manager.hpp"
using namespace Gtk;

10
src/gui/widgets/timeline/track.hpp → src/gui/widgets/timeline/timeline-track.hpp
View file

@ -1,5 +1,5 @@
/*
track.hpp - Declaration of the timeline group track object
timeline-track.hpp - Declaration of the timeline group track object
Copyright (C) Lumiera.org
2008, Joel Holdsworth <joel@airwebreathe.org.uk>
@ -19,12 +19,12 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/** @file widgets/timeline/track.hpp
/** @file widgets/timeline/timeline-track.hpp
** This file contains the definition of timeline track object
*/
#ifndef TRACK_HPP
#define TRACK_HPP
#ifndef TIMELINE_TRACK_HPP
#define TIMELINE_TRACK_HPP
#include "../../gtk-lumiera.hpp"
@ -80,4 +80,4 @@ private:
} // namespace widgets
} // namespace gui
#endif // TRACK_HPP
#endif // TIMELINE_TRACK_HPP