From c2637a0da6d9a1c8626ca39f8451ab3b7cda487a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:47:59 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kpdf/core/document.cpp | 18 +++++++++--------- kpdf/core/generator_pdf/generator_pdf.cpp | 26 +++++++++++++------------- kpdf/core/link.cpp | 4 ++-- kpdf/core/page.cpp | 6 +++--- kpdf/core/page.h | 2 +- kpdf/core/pagetransition.cpp | 2 +- kpdf/core/pagetransition.h | 6 +++--- 7 files changed, 32 insertions(+), 32 deletions(-) (limited to 'kpdf/core') diff --git a/kpdf/core/document.cpp b/kpdf/core/document.cpp index 2074789d..c85dcea9 100644 --- a/kpdf/core/document.cpp +++ b/kpdf/core/document.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -118,7 +118,7 @@ KPDFDocument::KPDFDocument(TQWidget *widget) TQStringList::Iterator it = list.begin(); while( it != list.end() ) { - d->kimgioMimes << KMimeType::findByPath(TQString("foo.%1").tqarg(*it), 0, true)->name(); + d->kimgioMimes << KMimeType::findByPath(TQString("foo.%1").arg(*it), 0, true)->name(); ++it; } } @@ -331,7 +331,7 @@ void KPDFDocument::reparseConfig() // reparse generator config and if something changed clear KPDFPages if ( generator && generator->reparseConfig() ) { - // tqinvalidate pixmaps + // invalidate pixmaps TQValueVector::iterator it = pages_vector.begin(), end = pages_vector.end(); for ( ; it != end; ++it ) (*it)->deletePixmapsAndRects(); @@ -712,7 +712,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta } } - // reset cursor to previous tqshape + // reset cursor to previous shape TQApplication::restoreOverrideCursor(); // send page lists if found anything new @@ -764,7 +764,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta } } - // reset cursor to previous tqshape + // reset cursor to previous shape TQApplication::restoreOverrideCursor(); // if a match has been found.. @@ -793,7 +793,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta } } else if ( !noDialogs ) - KMessageBox::information( widget(), i18n("No matches found for '%1'.").tqarg( text ) ); + KMessageBox::information( widget(), i18n("No matches found for '%1'.").arg( text ) ); } // 3. PREVMATCH //TODO else if ( type == PrevMatch ) @@ -865,7 +865,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta } } - // reset cursor to previous tqshape + // reset cursor to previous shape TQApplication::restoreOverrideCursor(); // send page lists to update observers (since some filter on bookmarks) @@ -1016,7 +1016,7 @@ void KPDFDocument::processLink( const KPDFLink * link ) KRun::run( *ptr, lst ); } else - KMessageBox::information( widget(), i18n( "No application found for opening file of mimetype %1." ).tqarg( mime->name() ) ); + KMessageBox::information( widget(), i18n( "No application found for opening file of mimetype %1." ).arg( mime->name() ) ); } break; case KPDFLink::Action: { @@ -1067,7 +1067,7 @@ void KPDFDocument::processLink( const KPDFLink * link ) case KPDFLink::Browse: { const KPDFLinkBrowse * browse = static_cast< const KPDFLinkBrowse * >( link ); // if the url is a mailto one, invoke mailer - if ( browse->url().tqstartsWith( "mailto:", false ) ) + if ( browse->url().startsWith( "mailto:", false ) ) kapp->invokeMailer( browse->url() ); else { diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp index 6550a543..65e3a55a 100644 --- a/kpdf/core/generator_pdf/generator_pdf.cpp +++ b/kpdf/core/generator_pdf/generator_pdf.cpp @@ -209,7 +209,7 @@ const DocumentInfo * PDFGenerator::generateDocumentInfo() if ( pdfdoc ) { docInfo.set( "format", i18n( "PDF v. ", "PDF v. %1" ) - .tqarg( TQString::number( pdfdoc->getPDFVersion() ) ), i18n( "Format" ) ); + .arg( TQString::number( pdfdoc->getPDFVersion() ) ), i18n( "Format" ) ); docInfo.set( "encryption", pdfdoc->isEncrypted() ? i18n( "Encrypted" ) : i18n( "Unencrypted" ), i18n("Security") ); docInfo.set( "optimization", pdfdoc->isLinearized() ? i18n( "Yes" ) : i18n( "No" ), @@ -457,7 +457,7 @@ bool PDFGenerator::print( KPrinter& printer ) { pstitle = m_document->currentDocument().fileName( false ); } - // this looks non-tqunicode-safe and it is. anything other than ASCII is not specified + // this looks non-unicode-safe and it is. anything other than ASCII is not specified // and some printers actually stop printing when they encounter non-ASCII characters in the // Postscript %%Title tag TQCString pstitle8Bit = pstitle.latin1(); @@ -528,14 +528,14 @@ static GString *TQStringToGString(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.tqat(i).tqunicode(); + cstring[i] = s.at(i).unicode(); return new GString(cstring, len); } -static TQString tqunicodeToTQString(Unicode* u, int len) { +static TQString unicodeToTQString(Unicode* u, int len) { TQString ret; ret.setLength(len); - TQChar* qch = (TQChar*) ret.tqunicode(); + TQChar* qch = (TQChar*) ret.unicode(); for (;len;--len) *qch++ = (TQChar) *u++; return ret; @@ -568,7 +568,7 @@ static TQString UnicodeParsedString(GString *s1) { u = s1->getChar(i) & 0xff; ++i; } - result += tqunicodeToTQString( &u, 1 ); + result += unicodeToTQString( &u, 1 ); } return result; } @@ -868,7 +868,7 @@ void PDFGenerator::addSynopsisChildren( TQDomNode * parent, GList * items ) TQString name; Unicode * uniChar = outlineItem->getTitle(); int titleLength = outlineItem->getTitleLength(); - name = tqunicodeToTQString(uniChar, titleLength); + name = unicodeToTQString(uniChar, titleLength); if ( name.isEmpty() ) continue; TQDomElement item = docSyn.createElement( name ); @@ -909,11 +909,11 @@ void PDFGenerator::addSynopsisChildren( TQDomNode * parent, GList * items ) item.setAttribute( "Open", TQVariant( (bool)outlineItem->isOpen() ).toString() ); - // 3. recursively descend over tqchildren + // 3. recursively descend over children outlineItem->open(); - GList * tqchildren = outlineItem->getKids(); - if ( tqchildren ) - addSynopsisChildren( &item, tqchildren ); + GList * children = outlineItem->getKids(); + if ( children ) + addSynopsisChildren( &item, children ); } } @@ -1017,10 +1017,10 @@ void PDFGenerator::addTransition( int pageNumber, KPDFPage * page ) switch ( pdfTransition->getAlignment() ) { case PageTransition::Horizontal: - transition->tqsetAlignment( KPDFPageTransition::Horizontal ); + transition->setAlignment( KPDFPageTransition::Horizontal ); break; case PageTransition::Vertical: - transition->tqsetAlignment( KPDFPageTransition::Vertical ); + transition->setAlignment( KPDFPageTransition::Vertical ); break; } diff --git a/kpdf/core/link.cpp b/kpdf/core/link.cpp index a872ba60..fd4aa141 100644 --- a/kpdf/core/link.cpp +++ b/kpdf/core/link.cpp @@ -18,12 +18,12 @@ KPDFLink::~KPDFLink() TQString KPDFLinkGoto::linkTip() const { - return m_extFileName.isEmpty() ? ( m_vp.pageNumber != -1 ? i18n( "Go to page %1" ).tqarg( m_vp.pageNumber + 1 ) : TQString() ) : i18n("Open external file"); + return m_extFileName.isEmpty() ? ( m_vp.pageNumber != -1 ? i18n( "Go to page %1" ).arg( m_vp.pageNumber + 1 ) : TQString() ) : i18n("Open external file"); } TQString KPDFLinkExecute::linkTip() const { - return i18n( "Execute '%1'..." ).tqarg( m_fileName ); + return i18n( "Execute '%1'..." ).arg( m_fileName ); } TQString KPDFLinkBrowse::linkTip() const diff --git a/kpdf/core/page.cpp b/kpdf/core/page.cpp index 269cab2e..cadaacf3 100644 --- a/kpdf/core/page.cpp +++ b/kpdf/core/page.cpp @@ -131,11 +131,11 @@ NormalizedRect * KPDFPage::findText( const TQString & text, bool strictCase, Nor return 0; // create a xpf's Unicode (unsigned int) array for the given text - const TQChar * str = text.tqunicode(); + const TQChar * str = text.unicode(); int len = text.length(); TQMemArray u(len); for (int i = 0; i < len; ++i) - u[i] = str[i].tqunicode(); + u[i] = str[i].unicode(); // find out the direction of search enum SearchDir { FromTop, NextMatch, PrevMatch } dir = lastRect ? NextMatch : FromTop; @@ -319,7 +319,7 @@ bool NormalizedRect::intersects( double l, double t, double r, double b ) const return (l < right) && (r > left) && (t < bottom) && (b > top); } -TQRect NormalizedRect::tqgeometry( int xScale, int yScale ) const +TQRect NormalizedRect::geometry( int xScale, int yScale ) const { int l = (int)( left * xScale ), t = (int)( top * yScale ), diff --git a/kpdf/core/page.h b/kpdf/core/page.h index 1ec5add0..2de7aceb 100644 --- a/kpdf/core/page.h +++ b/kpdf/core/page.h @@ -36,7 +36,7 @@ class NormalizedRect bool intersects( const NormalizedRect & normRect ) const; bool intersects( double l, double t, double r, double b ) const; - TQRect tqgeometry( int xScale, int yScale ) const; + TQRect geometry( int xScale, int yScale ) const; }; /** diff --git a/kpdf/core/pagetransition.cpp b/kpdf/core/pagetransition.cpp index 41d743c6..c43da45a 100644 --- a/kpdf/core/pagetransition.cpp +++ b/kpdf/core/pagetransition.cpp @@ -15,7 +15,7 @@ KPDFPageTransition::KPDFPageTransition( Type type ) : m_type( type ), m_duration( 1 ), - m_tqalignment(Horizontal ), + m_alignment(Horizontal ), m_direction( Inward ), m_angle( 0 ), m_scale( 1.0 ), diff --git a/kpdf/core/pagetransition.h b/kpdf/core/pagetransition.h index 25280437..70792355 100644 --- a/kpdf/core/pagetransition.h +++ b/kpdf/core/pagetransition.h @@ -51,7 +51,7 @@ class KPDFPageTransition inline int duration() const { return m_duration; } // Get dimension in which the transition effect occurs. - inline Alignment tqalignment() const { return m_tqalignment; } + inline Alignment alignment() const { return m_alignment; } // Get direction of motion of the transition effect. inline Direction direction() const { return m_direction; } @@ -67,7 +67,7 @@ class KPDFPageTransition inline void setType( Type type ) { m_type = type; } inline void setDuration( int duration ) { m_duration = duration; } - inline void tqsetAlignment( Alignment tqalignment ) { m_tqalignment = tqalignment; } + inline void setAlignment( Alignment alignment ) { m_alignment = alignment; } inline void setDirection( Direction direction ) { m_direction = direction; } inline void setAngle( int angle ) { m_angle = angle; } inline void setScale( double scale ) { m_scale = scale; } @@ -76,7 +76,7 @@ class KPDFPageTransition private: Type m_type; int m_duration; - Alignment m_tqalignment; + Alignment m_alignment; Direction m_direction; int m_angle; double m_scale; -- cgit v1.2.3