diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-13 13:15:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-13 13:15:14 -0600 |
| commit | 735d75d6ce19269dc5faa00abc8f88ff30ce2f23 (patch) | |
| tree | 4e85ad9cc0479892232125234c6b71c4f17ac611 /chalk | |
| parent | b180811d9a814c638032f77aaf02e84a3126328c (diff) | |
| download | koffice-735d75d6ce19269dc5faa00abc8f88ff30ce2f23.tar.gz koffice-735d75d6ce19269dc5faa00abc8f88ff30ce2f23.zip | |
Fix inadvertent TQt string conversions
This closes Bug 782
Diffstat (limited to 'chalk')
| -rw-r--r-- | chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc | 6 | ||||
| -rw-r--r-- | chalk/core/tiles/kis_tileddatamanager.cc | 2 | ||||
| -rw-r--r-- | chalk/ui/squeezedcombobox.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc index 22badb9c..ad13eb91 100644 --- a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc +++ b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc @@ -48,7 +48,7 @@ enum WetStickyChannelIndex { HUE_CHANNEL_INDEX, SATURATION_CHANNEL_INDEX, LIGHTNESS_CHANNEL_INDEX, - LITQUID_CONTENT_CHANNEL_INDEX, + LIQUID_CONTENT_CHANNEL_INDEX, DRYING_RATE_CHANNEL_INDEX, MISCIBILITY_CHANNEL_INDEX, GRAVITATIONAL_DIRECTION_INDEX, @@ -513,7 +513,7 @@ TQString KisWetStickyColorSpace::channelValueText(const TQ_UINT8 *U8_pixel, TQ_U return TQString().setNum(pixel -> saturation); case LIGHTNESS_CHANNEL_INDEX: return TQString().setNum(pixel -> lightness); - case LITQUID_CONTENT_CHANNEL_INDEX: + case LIQUID_CONTENT_CHANNEL_INDEX: return TQString().setNum(pixel -> liquid_content); case DRYING_RATE_CHANNEL_INDEX: return TQString().setNum(pixel -> drying_rate); @@ -569,7 +569,7 @@ TQString KisWetStickyColorSpace::normalisedChannelValueText(const TQ_UINT8 *U8_p return TQString().setNum(pixel -> saturation); case LIGHTNESS_CHANNEL_INDEX: return TQString().setNum(pixel -> lightness); - case LITQUID_CONTENT_CHANNEL_INDEX: + case LIQUID_CONTENT_CHANNEL_INDEX: return TQString().setNum(static_cast<float>(pixel -> liquid_content) / UINT8_MAX); case DRYING_RATE_CHANNEL_INDEX: return TQString().setNum(static_cast<float>(pixel -> drying_rate) / UINT8_MAX); diff --git a/chalk/core/tiles/kis_tileddatamanager.cc b/chalk/core/tiles/kis_tileddatamanager.cc index 2dd633fd..d4b957d9 100644 --- a/chalk/core/tiles/kis_tileddatamanager.cc +++ b/chalk/core/tiles/kis_tileddatamanager.cc @@ -837,7 +837,7 @@ TQ_UINT8* KisTiledDataManager::pixelPtr(TQ_INT32 x, TQ_INT32 y, bool writable) { // Ahem, this is a bit not as good. The point is, this function needs the tile data, // but it might be swapped out. This code swaps it in, but at function exit it might - // be swapped out again! THIS MAKES THE RETURNED POINTER TQUITE VOLATILE + // be swapped out again! THIS MAKES THE RETURNED POINTER QUITE VOLATILE return pixelPtrSafe(x, y, writable) -> data(); } diff --git a/chalk/ui/squeezedcombobox.h b/chalk/ui/squeezedcombobox.h index 50f4bc77..9103b4f9 100644 --- a/chalk/ui/squeezedcombobox.h +++ b/chalk/ui/squeezedcombobox.h @@ -20,8 +20,8 @@ /** @file squeezedcombobox.h */ -#ifndef STQUEEZEDCOMBOBOX_H -#define STQUEEZEDCOMBOBOX_H +#ifndef SQUEEZEDCOMBOBOX_H +#define SQUEEZEDCOMBOBOX_H class TQTimer; @@ -134,4 +134,4 @@ private: SqueezedComboBoxTip* m_tooltip; }; -#endif // STQUEEZEDCOMBOBOX_H +#endif // SQUEEZEDCOMBOBOX_H |