From ec1fddcd0d6663ad273af85357f04abbc5689468 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:00 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a. --- kolourpaint/kpdocumentsaveoptions.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'kolourpaint/kpdocumentsaveoptions.cpp') diff --git a/kolourpaint/kpdocumentsaveoptions.cpp b/kolourpaint/kpdocumentsaveoptions.cpp index 6bbb81d4..3c312e42 100644 --- a/kolourpaint/kpdocumentsaveoptions.cpp +++ b/kolourpaint/kpdocumentsaveoptions.cpp @@ -114,7 +114,7 @@ kpDocumentSaveOptions &kpDocumentSaveOptions::operator= (const kpDocumentSaveOpt void kpDocumentSaveOptions::printDebug (const TQString &prefix) const { const TQString usedPrefix = !prefix.isEmpty () ? - prefix + TQString::fromLatin1 (": ") : + prefix + TQString::tqfromLatin1 (": ") : TQString(); kdDebug () << usedPrefix @@ -246,7 +246,7 @@ bool kpDocumentSaveOptions::qualityIsInvalid () const TQString kpDocumentSaveOptions::defaultMimeType (KConfigBase *config) { return config->readEntry (kpSettingForcedMimeType, - TQString::fromLatin1 ("image/png")); + TQString::tqfromLatin1 ("image/png")); } // public static @@ -445,19 +445,19 @@ int kpDocumentSaveOptions::mimeTypeMaximumColorDepth (const TQString &mimeType) // SYNC: update mime info here // Greyscale actually (unenforced since depth not set to configurable) - defaultList << TQString::fromLatin1 ("image/x-eps:32"); + defaultList << TQString::tqfromLatin1 ("image/x-eps:32"); - defaultList << TQString::fromLatin1 ("image/x-portable-bitmap:1"); + defaultList << TQString::tqfromLatin1 ("image/x-portable-bitmap:1"); // Greyscale actually (unenforced since depth not set to configurable) - defaultList << TQString::fromLatin1 ("image/x-portable-greymap:8"); + defaultList << TQString::tqfromLatin1 ("image/x-portable-greymap:8"); - defaultList << TQString::fromLatin1 ("image/x-xbm:1"); + defaultList << TQString::tqfromLatin1 ("image/x-xbm:1"); const TQStringList mimeTypeList = mimeTypesSupportingProperty ( kpSettingMimeTypeMaximumColorDepth, defaultList); - const TQString mimeTypeColon = mimeType + TQString::fromLatin1 (":"); + const TQString mimeTypeColon = mimeType + TQString::tqfromLatin1 (":"); for (TQStringList::const_iterator it = mimeTypeList.begin (); it != mimeTypeList.end (); it++) @@ -488,16 +488,16 @@ bool kpDocumentSaveOptions::mimeTypeHasConfigurableColorDepth (const TQString &m TQStringList defaultMimeTypes; // SYNC: update mime info here - defaultMimeTypes << TQString::fromLatin1 ("image/png"); - defaultMimeTypes << TQString::fromLatin1 ("image/x-bmp"); - defaultMimeTypes << TQString::fromLatin1 ("image/x-pcx"); + defaultMimeTypes << TQString::tqfromLatin1 ("image/png"); + defaultMimeTypes << TQString::tqfromLatin1 ("image/x-bmp"); + defaultMimeTypes << TQString::tqfromLatin1 ("image/x-pcx"); // TODO: Only 1, 24 not 8; TQt only sees 32 but "file" cmd realises // it's either 1 or 24. - defaultMimeTypes << TQString::fromLatin1 ("image/x-rgb"); + defaultMimeTypes << TQString::tqfromLatin1 ("image/x-rgb"); // TODO: Only 8 and 24 - no 1. - defaultMimeTypes << TQString::fromLatin1 ("image/x-xpm"); + defaultMimeTypes << TQString::tqfromLatin1 ("image/x-xpm"); return mimeTypeSupportsProperty (mimeType, kpSettingMimeTypeHasConfigurableColorDepth, @@ -517,8 +517,8 @@ bool kpDocumentSaveOptions::mimeTypeHasConfigurableQuality (const TQString &mime TQStringList defaultMimeTypes; // SYNC: update mime info here - defaultMimeTypes << TQString::fromLatin1 ("image/jp2"); - defaultMimeTypes << TQString::fromLatin1 ("image/jpeg"); + defaultMimeTypes << TQString::tqfromLatin1 ("image/jp2"); + defaultMimeTypes << TQString::tqfromLatin1 ("image/jpeg"); return mimeTypeSupportsProperty (mimeType, kpSettingMimeTypeHasConfigurableQuality, -- cgit v1.2.1