summaryrefslogtreecommitdiffstats
path: root/chalk/chalkcolor
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:32:11 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:32:11 -0600
commit94844816550ad672ccfcdc25659c625546239998 (patch)
treee35fc60fd736c645d59f6408af032774ad8023d3 /chalk/chalkcolor
parent2a811c38c74c03648ecf857e566c44483cbad706 (diff)
downloadkoffice-94844816550ad672ccfcdc25659c625546239998.tar.gz
koffice-94844816550ad672ccfcdc25659c625546239998.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'chalk/chalkcolor')
-rw-r--r--chalk/chalkcolor/kis_basic_histogram_producers.cc12
-rw-r--r--chalk/chalkcolor/kis_basic_histogram_producers.h2
-rw-r--r--chalk/chalkcolor/kis_colorspace_factory_registry.cc4
-rw-r--r--chalk/chalkcolor/kis_profile.cc4
4 files changed, 11 insertions, 11 deletions
diff --git a/chalk/chalkcolor/kis_basic_histogram_producers.cc b/chalk/chalkcolor/kis_basic_histogram_producers.cc
index b769a3d3..a67652f7 100644
--- a/chalk/chalkcolor/kis_basic_histogram_producers.cc
+++ b/chalk/chalkcolor/kis_basic_histogram_producers.cc
@@ -89,7 +89,7 @@ KisBasicU8HistogramProducer::KisBasicU8HistogramProducer(const KisID& id, KisCol
}
TQString KisBasicU8HistogramProducer::positionToString(double pos) const {
- return TQString("%1").tqarg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
+ return TQString("%1").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
}
void KisBasicU8HistogramProducer::addRegionToBin(TQ_UINT8 * pixels, TQ_UINT8 * selectionMask, TQ_UINT32 nPixels, KisColorSpace *cs)
@@ -142,7 +142,7 @@ KisBasicU16HistogramProducer::KisBasicU16HistogramProducer(const KisID& id, KisC
TQString KisBasicU16HistogramProducer::positionToString(double pos) const
{
- return TQString("%1").tqarg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
+ return TQString("%1").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
}
double KisBasicU16HistogramProducer::maximalZoom() const
@@ -210,7 +210,7 @@ KisBasicF32HistogramProducer::KisBasicF32HistogramProducer(const KisID& id, KisC
}
TQString KisBasicF32HistogramProducer::positionToString(double pos) const {
- return TQString("%1").tqarg(static_cast<float>(pos)); // XXX I doubt this is correct!
+ return TQString("%1").arg(static_cast<float>(pos)); // XXX I doubt this is correct!
}
double KisBasicF32HistogramProducer::maximalZoom() const {
@@ -282,7 +282,7 @@ KisBasicF16HalfHistogramProducer::KisBasicF16HalfHistogramProducer(const KisID&
}
TQString KisBasicF16HalfHistogramProducer::positionToString(double pos) const {
- return TQString("%1").tqarg(static_cast<float>(pos)); // XXX I doubt this is correct!
+ return TQString("%1").arg(static_cast<float>(pos)); // XXX I doubt this is correct!
}
double KisBasicF16HalfHistogramProducer::maximalZoom() const {
@@ -356,7 +356,7 @@ TQValueVector<KisChannelInfo *> KisGenericRGBHistogramProducer::channels() {
}
TQString KisGenericRGBHistogramProducer::positionToString(double pos) const {
- return TQString("%1").tqarg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
+ return TQString("%1").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
}
double KisGenericRGBHistogramProducer::maximalZoom() const {
@@ -433,7 +433,7 @@ TQValueVector<KisChannelInfo *> KisGenericLabHistogramProducer::channels() {
}
TQString KisGenericLabHistogramProducer::positionToString(double pos) const {
- return TQString("%1").tqarg(static_cast<TQ_UINT16>(pos * UINT16_MAX));
+ return TQString("%1").arg(static_cast<TQ_UINT16>(pos * UINT16_MAX));
}
double KisGenericLabHistogramProducer::maximalZoom() const {
diff --git a/chalk/chalkcolor/kis_basic_histogram_producers.h b/chalk/chalkcolor/kis_basic_histogram_producers.h
index 8b913ece..83222765 100644
--- a/chalk/chalkcolor/kis_basic_histogram_producers.h
+++ b/chalk/chalkcolor/kis_basic_histogram_producers.h
@@ -60,7 +60,7 @@ protected:
/**
* The order in which channels() returns is not the same as the internal representation,
* that of the pixel internally. This method converts external usage to internal usage.
- * This method uses some basic assumtpions about the tqlayout of the pixel, so _extremely_
+ * This method uses some basic assumtpions about the layout of the pixel, so _extremely_
* exotic spaces might want to override this (see makeExternalToInternal source for
* those assumptions)
**/
diff --git a/chalk/chalkcolor/kis_colorspace_factory_registry.cc b/chalk/chalkcolor/kis_colorspace_factory_registry.cc
index 424e346d..c0219836 100644
--- a/chalk/chalkcolor/kis_colorspace_factory_registry.cc
+++ b/chalk/chalkcolor/kis_colorspace_factory_registry.cc
@@ -62,8 +62,8 @@ KisColorSpaceFactoryRegistry::KisColorSpaceFactoryRegistry(TQStringList profileF
*/
// Load all colorspace modules
- KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/ColorSpace"),
- TQString::tqfromLatin1("(Type == 'Service') and "
+ KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/ColorSpace"),
+ TQString::fromLatin1("(Type == 'Service') and "
"([X-Chalk-Version] == 2)"));
if (offers.empty()) {
diff --git a/chalk/chalkcolor/kis_profile.cc b/chalk/chalkcolor/kis_profile.cc
index 2d0ad98f..ae4c07cb 100644
--- a/chalk/chalkcolor/kis_profile.cc
+++ b/chalk/chalkcolor/kis_profile.cc
@@ -25,7 +25,7 @@
#include LCMS_HEADER
#include <tqimage.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqfile.h>
#include <kdebug.h>
@@ -65,7 +65,7 @@ KisProfile::KisProfile(const cmsHPROFILE profile)
// Make a raw data image ready for saving
_cmsSaveProfileToMem(m_profile, 0, &bytesNeeded); // calc size
- if(m_rawData.tqresize(bytesNeeded))
+ if(m_rawData.resize(bytesNeeded))
{
_cmsSaveProfileToMem(m_profile, m_rawData.data(), &bytesNeeded); // fill buffer
cmsHPROFILE newprofile = cmsOpenProfileFromMem(m_rawData.data(), (DWORD) bytesNeeded);