diff options
Diffstat (limited to 'kfile-plugins/dependencies')
5 files changed, 14 insertions, 14 deletions
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc index a13fd99a..5fe6ea28 100644 --- a/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc +++ b/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc @@ -190,7 +190,7 @@ TQString Document::getInfo( const TQString & type ) const u = s1->getChar(i) & 0xff; ++i; } - result += unicodeToTQString( &u, 1 ); + result += tqunicodeToTQString( &u, 1 ); } obj.free(); info.free(); diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc index cde8818d..9998f738 100644 --- a/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc +++ b/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc @@ -68,7 +68,7 @@ int PageTransition::duration() const return data->pt->getDuration(); } -PageTransition::Alignment PageTransition::alignment() const +PageTransition::Alignment PageTransition::tqalignment() const { return (Poppler::PageTransition::Alignment)data->pt->getAlignment(); } diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h b/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h index 53002ff9..f33a014c 100644 --- a/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h +++ b/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h @@ -60,7 +60,7 @@ class PageTransition { Fade }; - /** \brief alignment of the transition effect that shall be used + /** \brief tqalignment of the transition effect that shall be used */ // if changed remember to keep in sync with PageTransition.h enum enum Alignment { @@ -114,7 +114,7 @@ class PageTransition { /** \brief Get dimension in which the transition effect occurs. */ - Alignment alignment() const; + Alignment tqalignment() const; /** \brief Get direction of motion of the transition effect. diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc index 7e366014..445417a2 100644 --- a/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc +++ b/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc @@ -31,11 +31,11 @@ namespace Poppler { /* borrowed from kpdf */ -TQString unicodeToTQString(Unicode* u, int len) +TQString tqunicodeToTQString(Unicode* u, int len) { TQString ret; ret.setLength(len); - TQChar* qch = (TQChar*) ret.unicode(); + TQChar* qch = (TQChar*) ret.tqunicode(); for (;len;--len) *qch++ = (TQChar) *u++; return ret; @@ -69,7 +69,7 @@ TQString UnicodeParsedString(GooString *s1) u = s1->getChar(i) & 0xff; ++i; } - result += unicodeToTQString( &u, 1 ); + result += tqunicodeToTQString( &u, 1 ); } return result; } @@ -79,7 +79,7 @@ GooString *TQStringToGooString(const TQString &s) int len = s.length(); char *cstring = (char *)gmallocn(s.length(), sizeof(char)); for (int i = 0; i < len; ++i) - cstring[i] = s.at(i).unicode(); + cstring[i] = s.tqat(i).tqunicode(); GooString *ret = new GooString(cstring, len); gfree(cstring); return ret; @@ -98,7 +98,7 @@ void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, G TQString name; Unicode * uniChar = outlineItem->getTitle(); int titleLength = outlineItem->getTitleLength(); - name = unicodeToTQString(uniChar, titleLength); + name = tqunicodeToTQString(uniChar, titleLength); if ( name.isEmpty() ) continue; @@ -136,11 +136,11 @@ void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, G } } - // 3. recursively descend over children + // 3. recursively descend over tqchildren outlineItem->open(); - GooList * children = outlineItem->getKids(); - if ( children ) - addTocChildren( docSyn, &item, children ); + GooList * tqchildren = outlineItem->getKids(); + if ( tqchildren ) + addTocChildren( docSyn, &item, tqchildren ); } } diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-private.h b/kfile-plugins/dependencies/poppler-tqt/poppler-private.h index 9e9e3292..8152ffd8 100644 --- a/kfile-plugins/dependencies/poppler-tqt/poppler-private.h +++ b/kfile-plugins/dependencies/poppler-tqt/poppler-private.h @@ -39,7 +39,7 @@ namespace Poppler { class DocumentData; -TQString unicodeToTQString(Unicode* u, int len); +TQString tqunicodeToTQString(Unicode* u, int len); TQString UnicodeParsedString(GooString *s1); |