Rename TimelineTextContentView -> ContentTimelineTextView.

4 files changed, 13 insertions, 13 deletions

diff --git a/src/wx/content_timeline.cc b/src/wx/content_timeline.cc
index 5e104f3b7..7257f3587 100644
--- a/src/wx/content_timeline.cc
+++ b/src/wx/content_timeline.cc
@@ -24,10 +24,10 @@
 #include "film_viewer.h"
 #include "content_timeline_atmos_view.h"
 #include "content_timeline_audio_view.h"
+#include "content_timeline_text_view.h"
 #include "content_timeline_video_view.h"
 #include "timeline_labels_view.h"
 #include "timeline_reels_view.h"
-#include "timeline_text_content_view.h"
 #include "timeline_time_axis_view.h"
 #include "wx_util.h"
 #include "lib/atmos_mxf_content.h"
@@ -311,7 +311,7 @@ ContentTimeline::recreate_views()
 		}
 
 		for (auto j: i->text) {
-			_views.push_back (make_shared<TimelineTextContentView>(*this, i, j));
+			_views.push_back(make_shared<ContentTimelineTextView>(*this, i, j));
 		}
 
 		if (i->atmos) {
@@ -451,7 +451,7 @@ ContentTimeline::assign_tracks()
 	}
 
 	int const video_tracks = place<ContentTimelineVideoView>(film, _views, _tracks);
-	int const text_tracks = place<TimelineTextContentView> (film, _views, _tracks);
+	int const text_tracks = place<ContentTimelineTextView>(film, _views, _tracks);
 
 	/* Atmos */
 
diff --git a/src/wx/timeline_text_content_view.cc b/src/wx/content_timeline_text_view.cc
index bc099d4d6..3b7eeebce 100644
--- a/src/wx/timeline_text_content_view.cc
+++ b/src/wx/content_timeline_text_view.cc
@@ -19,7 +19,7 @@
 */
 
 
-#include "timeline_text_content_view.h"
+#include "content_timeline_text_view.h"
 #include "lib/text_content.h"
 #include "lib/content.h"
 
@@ -27,7 +27,7 @@
 using std::shared_ptr;
 
 
-TimelineTextContentView::TimelineTextContentView(ContentTimeline& tl, shared_ptr<Content> c, shared_ptr<TextContent> caption)
+ContentTimelineTextView::ContentTimelineTextView(ContentTimeline& tl, shared_ptr<Content> c, shared_ptr<TextContent> caption)
 	: TimelineContentView (tl, c)
 	, _caption (caption)
 {
@@ -35,7 +35,7 @@ TimelineTextContentView::TimelineTextContentView(ContentTimeline& tl, shared_ptr
 }
 
 wxColour
-TimelineTextContentView::background_colour () const
+ContentTimelineTextView::background_colour() const
 {
 	if (!active ()) {
 		return wxColour (210, 210, 210, 128);
@@ -45,7 +45,7 @@ TimelineTextContentView::background_colour () const
 }
 
 wxColour
-TimelineTextContentView::foreground_colour () const
+ContentTimelineTextView::foreground_colour() const
 {
 	if (!active ()) {
 		return wxColour (180, 180, 180, 128);
@@ -55,7 +55,7 @@ TimelineTextContentView::foreground_colour () const
 }
 
 bool
-TimelineTextContentView::active () const
+ContentTimelineTextView::active() const
 {
 	return _caption->use();
 }
diff --git a/src/wx/timeline_text_content_view.h b/src/wx/content_timeline_text_view.h
index c33c2662e..8d37ad489 100644
--- a/src/wx/timeline_text_content_view.h
+++ b/src/wx/content_timeline_text_view.h
@@ -25,13 +25,13 @@
 class TextContent;
 
 
-/** @class TimelineTextContentView
- *  @brief Timeline view for TextContent.
+/** @class ContentTimelineTextView
+ *  @brief Content timeline view for TextContent.
  */
-class TimelineTextContentView : public TimelineContentView
+class ContentTimelineTextView : public TimelineContentView
 {
 public:
-	TimelineTextContentView(ContentTimeline& tl, std::shared_ptr<Content>, std::shared_ptr<TextContent>);
+	ContentTimelineTextView(ContentTimeline& tl, std::shared_ptr<Content>, std::shared_ptr<TextContent>);
 
 private:
 	bool active () const override;
diff --git a/src/wx/wscript b/src/wx/wscript
index a3e3c06ed..c644af96c 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -52,6 +52,7 @@ sources = """
           content_timeline_atmos_view.cc
           content_timeline_audio_view.cc
           content_timeline_dialog.cc
+          content_timeline_text_view.cc
           content_timeline_video_view.cc
           content_timeline_view.cc
           content_version_dialog.cc
@@ -169,7 +170,6 @@ sources = """
           timeline.cc
           timeline_content_view.cc
           timeline_labels_view.cc
-          timeline_text_content_view.cc
           timeline_reels_view.cc
           timeline_time_axis_view.cc
           timing_panel.cc