mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

The AssEntry::Clone() function ought to have been const all the time... make it. (Ugh, I had to make a const_cast in AssStyle::Clone().)

Browse source 
Originally committed to SVN as r3028.
This commit is contained in:
Niels Martin Hansen 2009-06-07 00:22:36 +00:00
parent 1e4ec69f7f
commit a1677d3a2c
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/src/ass_dialogue.cpp
View file

@ -784,7 +784,7 @@ wxString AssDialogue::GetStrippedText() const {
} }
///////// /////////
// Clone // Clone
AssEntry *AssDialogue::Clone() { AssEntry *AssDialogue::Clone() const {
// Create clone // Create clone
AssDialogue *final = new AssDialogue(); AssDialogue *final = new AssDialogue();

2
aegisub/src/ass_dialogue.h
View file

@ -196,7 +196,7 @@ public:
wxString GetSSAText(); wxString GetSSAText();
bool CollidesWith(AssDialogue *target); // Checks if two lines collide bool CollidesWith(AssDialogue *target); // Checks if two lines collide
AssEntry *Clone(); AssEntry *Clone() const;
AssDialogue(); AssDialogue();
AssDialogue(wxString data,int version=1); AssDialogue(wxString data,int version=1);

2
aegisub/src/ass_entry.cpp
View file

@ -119,7 +119,7 @@ wxString AssEntry::GetSSAText() {
///////// /////////
// Clone // Clone
AssEntry *AssEntry::Clone() { AssEntry *AssEntry::Clone() const {
// Create clone // Create clone
AssEntry *final = new AssEntry(); AssEntry *final = new AssEntry();

2
aegisub/src/ass_entry.h
View file

@ -75,7 +75,7 @@ public:
AssEntry(wxString data); AssEntry(wxString data);
virtual ~AssEntry(); virtual ~AssEntry();
virtual AssEntry *Clone(); virtual AssEntry *Clone() const;
virtual int GetStartMS() const { return StartMS; } virtual int GetStartMS() const { return StartMS; }
virtual int GetEndMS() const { return StartMS; } virtual int GetEndMS() const { return StartMS; }

4
aegisub/src/ass_style.cpp
View file

@ -493,7 +493,7 @@ wxString AssStyle::GetSSAText() {
///////// /////////
// Clone // Clone
AssEntry *AssStyle::Clone() { AssEntry *AssStyle::Clone() const {
// Create clone // Create clone
AssStyle *final = new AssStyle(); AssStyle *final = new AssStyle();
@ -526,7 +526,7 @@ AssEntry *AssStyle::Clone() {
final->strikeout = strikeout; final->strikeout = strikeout;
final->underline = underline; final->underline = underline;
final->relativeTo = relativeTo; final->relativeTo = relativeTo;
final->SetEntryData(GetEntryData()); final->SetEntryData(const_cast<AssStyle*>(this)->GetEntryData());
// Return // Return
return final; return final;

2
aegisub/src/ass_style.h
View file

@ -105,7 +105,7 @@ public:
void SetMarginString(const wxString value,int which); // Sets margin value from a string (0 = left, 1 = right, 2 = vertical/top, 3 = bottom) void SetMarginString(const wxString value,int which); // Sets margin value from a string (0 = left, 1 = right, 2 = vertical/top, 3 = bottom)
static void GetEncodings(wxArrayString &encodingStrings); static void GetEncodings(wxArrayString &encodingStrings);
AssEntry *Clone(); AssEntry *Clone() const;
bool IsEqualTo(AssStyle *style); bool IsEqualTo(AssStyle *style);
AssStyle(); AssStyle();