From 74c05bbf9d92e43a6cf3799355b5f3598884409e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:56:05 -0600 Subject: Remove additional unneeded tq method conversions --- .../dependencies/poppler-tqt/poppler-page-transition.cc | 2 +- .../dependencies/poppler-tqt/poppler-page-transition.h | 4 ++-- kfile-plugins/dependencies/poppler-tqt/poppler-private.cc | 10 +++++----- kfile-plugins/exr/kfile_exr.cpp | 14 +++++++------- kfile-plugins/jpeg/exif.cpp | 2 +- kfile-plugins/pdf/kfile_pdf.cpp | 10 +++++----- kfile-plugins/rgb/kfile_rgb.cpp | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) (limited to 'kfile-plugins') diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc index 9998f738..cde8818d 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::tqalignment() const +PageTransition::Alignment PageTransition::alignment() 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 f33a014c..53002ff9 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 tqalignment of the transition effect that shall be used + /** \brief alignment 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 tqalignment() const; + Alignment alignment() 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 445417a2..9ba0fb9d 100644 --- a/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc +++ b/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc @@ -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.tqat(i).tqunicode(); + cstring[i] = s.at(i).tqunicode(); GooString *ret = new GooString(cstring, len); gfree(cstring); return ret; @@ -136,11 +136,11 @@ void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, G } } - // 3. recursively descend over tqchildren + // 3. recursively descend over children outlineItem->open(); - GooList * tqchildren = outlineItem->getKids(); - if ( tqchildren ) - addTocChildren( docSyn, &item, tqchildren ); + GooList * children = outlineItem->getKids(); + if ( children ) + addTocChildren( docSyn, &item, children ); } } diff --git a/kfile-plugins/exr/kfile_exr.cpp b/kfile-plugins/exr/kfile_exr.cpp index 0a85a728..639ac0df 100644 --- a/kfile-plugins/exr/kfile_exr.cpp +++ b/kfile-plugins/exr/kfile_exr.cpp @@ -237,10 +237,10 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what) #endif TQString UTCOffset; if (utcOffset(h)>0.0) { - UTCOffset.append(TQString("%1").tqarg(utcOffset(h)/3600, 0, 'f', 1)); + UTCOffset.append(TQString("%1").arg(utcOffset(h)/3600, 0, 'f', 1)); UTCOffset.append(" hours behind UTC"); } else { - UTCOffset.append(TQString("%1").tqarg(-1.0*utcOffset(h)/3600, 0, 'f', 1)); + UTCOffset.append(TQString("%1").arg(-1.0*utcOffset(h)/3600, 0, 'f', 1)); UTCOffset.append(" hours ahead of UTC"); } appendItem( stdgroup, "UTC Offset", UTCOffset); @@ -264,10 +264,10 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what) if ( hasLongitude(h) ) { TQString Longitude; if (longitude(h)<0.0) { - Longitude.append(TQString("%1").tqarg(-1.0*longitude(h),0,'f',3)); + Longitude.append(TQString("%1").arg(-1.0*longitude(h),0,'f',3)); Longitude.append(" deg West"); } else { - Longitude.append(TQString("%1").tqarg(longitude(h),0,'f',3)); + Longitude.append(TQString("%1").arg(longitude(h),0,'f',3)); Longitude.append(" deg East"); } appendItem( stdgroup, "Longitude", Longitude); @@ -275,17 +275,17 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what) if ( hasLatitude(h) ) { TQString Latitude; if (latitude(h)<0.0) { - Latitude.append(TQString("%1").tqarg(-1.0*latitude(h),0,'f',3)); + Latitude.append(TQString("%1").arg(-1.0*latitude(h),0,'f',3)); Latitude.append(" deg South"); } else { - Latitude.append(TQString("%1").tqarg(latitude(h),0,'f',3)); + Latitude.append(TQString("%1").arg(latitude(h),0,'f',3)); Latitude.append(" deg North"); } appendItem( stdgroup, "Latitude", Latitude ); } if ( hasAltitude(h) ) { double Altitude = altitude(h); - appendItem( stdgroup, "Altitude", TQString("%1").tqarg(Altitude,0,'f',1) ); + appendItem( stdgroup, "Altitude", TQString("%1").arg(Altitude,0,'f',1) ); } if ( hasIsoSpeed(h) ) { double IsoSpeed = isoSpeed(h); diff --git a/kfile-plugins/jpeg/exif.cpp b/kfile-plugins/jpeg/exif.cpp index 5a023dc4..f4803705 100644 --- a/kfile-plugins/jpeg/exif.cpp +++ b/kfile-plugins/jpeg/exif.cpp @@ -803,7 +803,7 @@ void ExifData::process_EXIF(unsigned char * CharBuf, unsigned int length) // printf("Exif section in Motorola order\n"); MotorolaOrder = 1; }else{ - throw FatalError("Invalid Exif tqalignment marker."); + throw FatalError("Invalid Exif alignment marker."); } } diff --git a/kfile-plugins/pdf/kfile_pdf.cpp b/kfile-plugins/pdf/kfile_pdf.cpp index 89e46297..a3dcbde7 100644 --- a/kfile-plugins/pdf/kfile_pdf.cpp +++ b/kfile-plugins/pdf/kfile_pdf.cpp @@ -83,16 +83,16 @@ bool KPdfPlugin::readInfo( KFileMetaInfo& info, uint /* what */) if (doc->isEncrypted()) { enc = i18n("Yes (Can Print:%1 Can Copy:%2 Can Change:%3 Can Add notes:%4)") - .tqarg(doc->okToPrint() ? i18n("Yes") : i18n("No")) - .tqarg(doc->okToCopy() ? i18n("Yes") : i18n("No")) - .tqarg(doc->okToChange() ? i18n("Yes") : i18n("No")) - .tqarg(doc->okToAddNotes() ? i18n("Yes") : i18n("No")); + .arg(doc->okToPrint() ? i18n("Yes") : i18n("No")) + .arg(doc->okToCopy() ? i18n("Yes") : i18n("No")) + .arg(doc->okToChange() ? i18n("Yes") : i18n("No")) + .arg(doc->okToAddNotes() ? i18n("Yes") : i18n("No")); } else enc = i18n("No"); appendItem(generalGroup, "Protected", enc ); appendItem(generalGroup, "Linearized", doc->isLinearized() ? i18n("Yes") : i18n("No") ); - TQString versionString = TQString("%1").tqarg( doc->getPDFVersion(), 0, 'f', 1 ); + TQString versionString = TQString("%1").arg( doc->getPDFVersion(), 0, 'f', 1 ); appendItem(generalGroup, "Version", versionString ); delete doc; diff --git a/kfile-plugins/rgb/kfile_rgb.cpp b/kfile-plugins/rgb/kfile_rgb.cpp index 41bd8c28..ffcad0b5 100644 --- a/kfile-plugins/rgb/kfile_rgb.cpp +++ b/kfile-plugins/rgb/kfile_rgb.cpp @@ -134,7 +134,7 @@ bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/) long compressed = file.size() - 512; long verbatim = xsize * ysize * zsize; appendItem(group, "Compression", i18n("Runlength Encoded") - + TQString(", %1%").tqarg(compressed * 100.0 / verbatim, 0, 'f', 1)); + + TQString(", %1%").arg(compressed * 100.0 / verbatim, 0, 'f', 1)); long k; TQ_UINT32 offs; @@ -152,7 +152,7 @@ bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/) k += it.data(); if (k) - appendItem(group, "SharedRows", TQString("%1%").tqarg(k * 100.0 + appendItem(group, "SharedRows", TQString("%1%").arg(k * 100.0 / (ysize * zsize), 0, 'f', 1)); else appendItem(group, "SharedRows", i18n("None")); -- cgit v1.2.1