i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closed ticket #2281. Method Link in class LocalLink shadowed destructor of parent class Link.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25953 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Pfeiffer
2008-06-14 09:19:54 +00:00
parent e13a79e005
commit d7693ead7f
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/print/drivers/pdf/source/XReferences.cpp
+6 -6
View File
@@ -179,9 +179,9 @@ void XRefDefs::Matches(const char* s, XMatchResult* r, bool all) {
bool cont; bool cont;
ASSERT(found); (void)found; ASSERT(found); (void)found;
if (pat1->IsLink()) { if (pat1->IsLink()) {
cont = r->Link(def1, &match); cont = r->MatchLink(def1, &match);
} else { } else {
cont = r->Dest(def1, &match); cont = r->MatchDest(def1, &match);
} }
if (!cont) break; if (!cont) break;
@@ -370,12 +370,12 @@ RecordDests::RecordDests(XRefDests* dests, TextLine* line, int32 page)
{ {
} }
bool RecordDests::Link(XRefDef* def, MatchResult* result) { bool RecordDests::MatchLink(XRefDef* def, MatchResult* result) {
return true; return true;
} }
bool RecordDests::Dest(XRefDef* def, MatchResult* result) { bool RecordDests::MatchDest(XRefDef* def, MatchResult* result) {
if (result->CountResults() >= 2) { if (result->CountResults() >= 2) {
BString s; BString s;
BRect b; BRect b;
@@ -399,7 +399,7 @@ LocalLink::LocalLink(XRefDefs* defs, XRefDests* dests, PDFWriter* writer, BStrin
} }
bool LocalLink::Link(XRefDef* def, MatchResult* result) { bool LocalLink::MatchLink(XRefDef* def, MatchResult* result) {
if (result->CountResults() >= 2) { if (result->CountResults() >= 2) {
BString label; BString label;
result->GetString(1, &label); result->GetString(1, &label);
@@ -421,7 +421,7 @@ bool LocalLink::Link(XRefDef* def, MatchResult* result) {
} }
bool LocalLink::Dest(XRefDef* def, MatchResult* result) { bool LocalLink::MatchDest(XRefDef* def, MatchResult* result) {
return true; return true;
} }
src/add-ons/print/drivers/pdf/source/XReferences.h
+6 -6
View File
@@ -141,8 +141,8 @@ public:
class XMatchResult { class XMatchResult {
public: public:
virtual ~XMatchResult() { }; virtual ~XMatchResult() { };
virtual bool Link(XRefDef* def, MatchResult* result) = 0; virtual bool MatchLink(XRefDef* def, MatchResult* result) = 0;
virtual bool Dest(XRefDef* def, MatchResult* result) = 0; virtual bool MatchDest(XRefDef* def, MatchResult* result) = 0;
}; };
@@ -210,8 +210,8 @@ class RecordDests : public XMatchResult {
public: public:
RecordDests(XRefDests* dests, TextLine* line, int32 page); RecordDests(XRefDests* dests, TextLine* line, int32 page);
bool Link(XRefDef* def, MatchResult* result); bool MatchLink(XRefDef* def, MatchResult* result);
bool Dest(XRefDef* def, MatchResult* result); bool MatchDest(XRefDef* def, MatchResult* result);
}; };
@@ -231,8 +231,8 @@ protected:
public: public:
LocalLink(XRefDefs* defs, XRefDests* dests, PDFWriter* writer, BString* utf8, int32 page); LocalLink(XRefDefs* defs, XRefDests* dests, PDFWriter* writer, BString* utf8, int32 page);
bool Link(XRefDef* def, MatchResult* result); bool MatchLink(XRefDef* def, MatchResult* result);
bool Dest(XRefDef* def, MatchResult* result); bool MatchDest(XRefDef* def, MatchResult* result);
}; };