From d7693ead7f118ef1b57e536f0f1afd0452451a5e Mon Sep 17 00:00:00 2001
From: Michael Pfeiffer <michael.w.pfeiffer@gmail.com>
Date: Sat, 14 Jun 2008 09:19:54 +0000
Subject: [PATCH] Closed ticket #2281. Method Link in class LocalLink shadowed
 destructor of parent class Link.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25953 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/print/drivers/pdf/source/XReferences.cpp | 12 ++++++------
 src/add-ons/print/drivers/pdf/source/XReferences.h   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/add-ons/print/drivers/pdf/source/XReferences.cpp b/src/add-ons/print/drivers/pdf/source/XReferences.cpp
index 0e75de994d..1e6e1c0e97 100644
--- a/src/add-ons/print/drivers/pdf/source/XReferences.cpp
+++ b/src/add-ons/print/drivers/pdf/source/XReferences.cpp
@@ -179,9 +179,9 @@ void XRefDefs::Matches(const char* s, XMatchResult* r, bool all) {
 			bool cont;
 			ASSERT(found); (void)found;
 			if (pat1->IsLink()) {
-				cont = r->Link(def1, &match);
+				cont = r->MatchLink(def1, &match);
 			} else {
-				cont = r->Dest(def1, &match);
+				cont = r->MatchDest(def1, &match);
 			}
 			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;
 }
 
 
-bool RecordDests::Dest(XRefDef* def, MatchResult* result) {
+bool RecordDests::MatchDest(XRefDef* def, MatchResult* result) {
 	if (result->CountResults() >= 2) {
 		BString s;
 		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) {
 		BString 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;
 }
 
diff --git a/src/add-ons/print/drivers/pdf/source/XReferences.h b/src/add-ons/print/drivers/pdf/source/XReferences.h
index 4e3e919cd0..383f102843 100644
--- a/src/add-ons/print/drivers/pdf/source/XReferences.h
+++ b/src/add-ons/print/drivers/pdf/source/XReferences.h
@@ -141,8 +141,8 @@ public:
 class XMatchResult {
 public:
 	virtual ~XMatchResult() { };
-	virtual bool Link(XRefDef* def, MatchResult* result) = 0;
-	virtual bool Dest(XRefDef* def, MatchResult* result) = 0;
+	virtual bool MatchLink(XRefDef* def, MatchResult* result) = 0;
+	virtual bool MatchDest(XRefDef* def, MatchResult* result) = 0;
 };
 
 
@@ -210,8 +210,8 @@ class RecordDests : public XMatchResult {
 		
 public:
 	RecordDests(XRefDests* dests, TextLine* line, int32 page);
-	bool Link(XRefDef* def, MatchResult* result);
-	bool Dest(XRefDef* def, MatchResult* result);	
+	bool MatchLink(XRefDef* def, MatchResult* result);
+	bool MatchDest(XRefDef* def, MatchResult* result);	
 };
 
 
@@ -231,8 +231,8 @@ protected:
 
 public:
 	LocalLink(XRefDefs* defs, XRefDests* dests, PDFWriter* writer, BString* utf8, int32 page);
-	bool Link(XRefDef* def, MatchResult* result);
-	bool Dest(XRefDef* def, MatchResult* result);
+	bool MatchLink(XRefDef* def, MatchResult* result);
+	bool MatchDest(XRefDef* def, MatchResult* result);
 };