Rename STL -> STLText

5 files changed, 15 insertions, 15 deletions

diff --git a/src/stl_reader.cc b/src/stl_text_reader.cc
index 0ed66c0..f9e9b65 100644
--- a/src/stl_reader.cc
+++ b/src/stl_text_reader.cc
@@ -17,7 +17,7 @@
 
 */
 
-#include "stl_reader.h"
+#include "stl_text_reader.h"
 #include "compose.hpp"
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
@@ -36,7 +36,7 @@ using boost::optional;
 using boost::lexical_cast;
 using namespace sub;
 
-STLReader::STLReader (istream& in)
+STLTextReader::STLTextReader (istream& in)
 {
 	while (in.good ()) {
 		string line;
@@ -128,7 +128,7 @@ STLReader::STLReader (istream& in)
 }
 
 optional<FrameTime>
-STLReader::time (string t) const
+STLTextReader::time (string t) const
 {
 	vector<string> b;
 	split (b, t, is_any_of (":"));
@@ -141,7 +141,7 @@ STLReader::time (string t) const
 }
 
 void
-STLReader::set (string name, string value)
+STLTextReader::set (string name, string value)
 {
 	if (name == "$FontName") {
 		_current.font = value;
@@ -157,7 +157,7 @@ STLReader::set (string name, string value)
 }
 
 void
-STLReader::maybe_push ()
+STLTextReader::maybe_push ()
 {
 	if (!_current.text.empty ()) {
 		_subs.push_back (_current);
diff --git a/src/stl_reader.h b/src/stl_text_reader.h
index 891bc6d..c48a8e5 100644
--- a/src/stl_reader.h
+++ b/src/stl_text_reader.h
@@ -22,10 +22,10 @@
 
 namespace sub {
 
-class STLReader : public Reader
+class STLTextReader : public Reader
 {
 public:
-	STLReader (std::istream &);
+	STLTextReader (std::istream &);
 
 private:
 	void set (std::string name, std::string value);
diff --git a/src/stl_writer.cc b/src/stl_text_writer.cc
index 126ad76..3b43fc1 100644
--- a/src/stl_writer.cc
+++ b/src/stl_text_writer.cc
@@ -17,7 +17,7 @@
 
 */
 
-#include "stl_writer.h"
+#include "stl_text_writer.h"
 #include <boost/optional.hpp>
 
 using std::list;
@@ -26,7 +26,7 @@ using std::string;
 using boost::optional;
 using namespace sub;
 
-STLWriter::STLWriter (list<Subtitle> subtitles, int screen_height_in_points, float frames_per_second, ostream& out)
+STLTextWriter::STLTextWriter (list<Subtitle> subtitles, int screen_height_in_points, float frames_per_second, ostream& out)
 	: Writer (subtitles, screen_height_in_points, frames_per_second)
 {
 	optional<string> font;
diff --git a/src/stl_writer.h b/src/stl_text_writer.h
index 7e37f16..a3020f6 100644
--- a/src/stl_writer.h
+++ b/src/stl_text_writer.h
@@ -22,10 +22,10 @@
 
 namespace sub {
 
-class STLWriter : public Writer
+class STLTextWriter : public Writer
 {
 public:
-	STLWriter (std::list<Subtitle> subtitles, int screen_height_in_points, float frames_per_second, std::ostream &);
+	STLTextWriter (std::list<Subtitle> subtitles, int screen_height_in_points, float frames_per_second, std::ostream &);
 };
 
 }
diff --git a/src/wscript b/src/wscript
index 7e91edb..4b54b41 100644
--- a/src/wscript
+++ b/src/wscript
@@ -18,8 +18,8 @@ def build(bld):
                  frame_time.cc
                  metric_time.cc
                  reader.cc
-                 stl_reader.cc
-                 stl_writer.cc
+                 stl_text_reader.cc
+                 stl_text_writer.cc
                  subtitle.cc
                  vertical_reference.cc
                  """
@@ -32,8 +32,8 @@ def build(bld):
               frame_time.h
               metric_time.h
               reader.h
-              stl_reader.h
-              stl_writer.h
+              stl_text_reader.h
+              stl_text_writer.h
               subtitle.h
               vertical_reference.h
               writer.h