diff options
author | Albert Astals Cid <aacid@kde.org> | 2010-04-24 13:07:02 +0100 |
---|---|---|
committer | Albert Astals Cid <aacid@kde.org> | 2010-04-24 13:07:02 +0100 |
commit | 07864c9e2a7a32b48bdbab92c8b2f79bce1d9f5b (patch) | |
tree | be33bbe4b27f67a83266a8d4abaf0825dd27c98c | |
parent | e501eabb2f0775444a2bf64005a3a3f1ffa281b4 (diff) |
minor cleanups
-rw-r--r-- | utils/HtmlLinks.cc | 15 | ||||
-rw-r--r-- | utils/HtmlLinks.h | 16 |
2 files changed, 16 insertions, 15 deletions
diff --git a/utils/HtmlLinks.cc b/utils/HtmlLinks.cc index 0fd093c5..c0ca89a5 100644 --- a/utils/HtmlLinks.cc +++ b/utils/HtmlLinks.cc @@ -18,6 +18,7 @@ // under GPL version 2 or later // // Copyright (C) 2008 Boris Toloknov <tlknv@yandex.ru> +// Copyright (C) 2010 Albert Astals Cid <aacid@kde.org> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -56,7 +57,7 @@ HtmlLink::HtmlLink(double xmin,double ymin,double xmax,double ymax,GooString * _ } HtmlLink::~HtmlLink(){ - if (dest) delete dest; + delete dest; } GBool HtmlLink::isEqualDest(const HtmlLink& x) const{ @@ -69,18 +70,6 @@ GBool HtmlLink::inLink(double xmin,double ymin,double xmax,double ymax) const { return (y>Ymin)&&(xmin<Xmax)&&(xmax>Xmin); } - -HtmlLink& HtmlLink::operator=(const HtmlLink& x){ - if (this==&x) return *this; - if (dest) {delete dest;dest=NULL;} - Xmin=x.Xmin; - Ymin=x.Ymin; - Xmax=x.Xmax; - Ymax=x.Ymax; - dest=new GooString(x.dest); - return *this; -} - static GooString* EscapeSpecialChars( GooString* s ) { GooString* tmp = NULL; diff --git a/utils/HtmlLinks.h b/utils/HtmlLinks.h index 571c2a70..12128446 100644 --- a/utils/HtmlLinks.h +++ b/utils/HtmlLinks.h @@ -10,6 +10,20 @@ // //======================================================================== +//======================================================================== +// +// Modified under the Poppler project - http://poppler.freedesktop.org +// +// All changes made under the Poppler project to this file are licensed +// under GPL version 2 or later +// +// Copyright (C) 2010 Albert Astals Cid <aacid@kde.org> +// +// To see a description of the changes please see the Changelog file that +// came with your tarball or type make ChangeLog if you are building from git +// +//======================================================================== + #ifndef _HTML_LINKS #define _HTML_LINKS @@ -28,9 +42,7 @@ private: GooString* dest; public: - HtmlLink(){dest=NULL;} HtmlLink(const HtmlLink& x); - HtmlLink& operator=(const HtmlLink& x); HtmlLink(double xmin,double ymin,double xmax,double ymax,GooString *_dest); ~HtmlLink(); GBool isEqualDest(const HtmlLink& x) const; |