summaryrefslogtreecommitdiffstats
path: root/kolourpaint
diff options
context:
space:
mode:
Diffstat (limited to 'kolourpaint')
-rw-r--r--kolourpaint/kpdocument.cpp8
-rw-r--r--kolourpaint/widgets/kpsqueezedtextlabel.cpp26
2 files changed, 17 insertions, 17 deletions
diff --git a/kolourpaint/kpdocument.cpp b/kolourpaint/kpdocument.cpp
index d427b598..48eb6641 100644
--- a/kolourpaint/kpdocument.cpp
+++ b/kolourpaint/kpdocument.cpp
@@ -452,7 +452,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap,
kdDebug () << "kpDocument::lossyPromptContinue()" << endl;
#endif
-#define TQUIT_IF_CANCEL(messageBoxCommand) \
+#define QUIT_IF_CANCEL(messageBoxCommand) \
{ \
if (messageBoxCommand != KMessageBox::Continue) \
{ \
@@ -464,7 +464,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap,
if (lossyType & (kpDocumentSaveOptions::MimeTypeMaximumColorDepthLow |
kpDocumentSaveOptions::Quality))
{
- TQUIT_IF_CANCEL (
+ QUIT_IF_CANCEL (
KMessageBox::warningContinueCancel (parent,
i18n ("<qt><p>The <b>%1</b> format may not be able"
" to preserve all of the image's color information.</p>"
@@ -479,7 +479,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap,
}
else if (lossyType & kpDocumentSaveOptions::ColorDepthLow)
{
- TQUIT_IF_CANCEL (
+ QUIT_IF_CANCEL (
KMessageBox::warningContinueCancel (parent,
i18n ("<qt><p>Saving the image at the low color depth of %1-bit"
" may result in the loss of color information."
@@ -492,7 +492,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap,
KStdGuiItem::save (),
TQString::fromLatin1 ("SaveAtLowColorDepthDontAskAgain")));
}
-#undef TQUIT_IF_CANCEL
+#undef QUIT_IF_CANCEL
return true;
}
diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.cpp b/kolourpaint/widgets/kpsqueezedtextlabel.cpp
index dc500b12..0aaea034 100644
--- a/kolourpaint/widgets/kpsqueezedtextlabel.cpp
+++ b/kolourpaint/widgets/kpsqueezedtextlabel.cpp
@@ -25,7 +25,7 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#define DEBUG_KP_STQUEEZED_TEXT_LABEL 0
+#define DEBUG_KP_SQUEEZED_TEXT_LABEL 0
#include <kpsqueezedtextlabel.h>
@@ -55,7 +55,7 @@ kpSqueezedTextLabel::kpSqueezedTextLabel (const TQString &text, TQWidget *parent
// public virtual
TQSize kpSqueezedTextLabel::minimumSizeHint () const
{
-#if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1
+#if DEBUG_KP_SQUEEZED_TEXT_LABEL && 1
kdDebug () << "kpSqueezedTextLabel::minimumSizeHint() qLabel prefers"
<< TQLabel::minimumSizeHint () << endl;
#endif
@@ -99,7 +99,7 @@ void kpSqueezedTextLabel::setText (const TQString &text)
// protected virtual [base TQWidget]
void kpSqueezedTextLabel::resizeEvent (TQResizeEvent *e)
{
-#if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1
+#if DEBUG_KP_SQUEEZED_TEXT_LABEL && 1
kdDebug () << "kpSqueezedTextLabeL::resizeEvent() size=" << e->size ()
<< " oldSize=" << e->oldSize ()
<< endl;
@@ -117,13 +117,13 @@ TQString kpSqueezedTextLabel::ellipsisText () const
// protected
void kpSqueezedTextLabel::squeezeText ()
{
-#if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1
+#if DEBUG_KP_SQUEEZED_TEXT_LABEL && 1
kdDebug () << "kpSqueezedTextLabeL::squeezeText" << endl;
#endif
TQFontMetrics fontMetrics (font ());
int fullTextWidth = fontMetrics.width (m_fullText);
-#if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1
+#if DEBUG_KP_SQUEEZED_TEXT_LABEL && 1
kdDebug () << "\tfullText=" << m_fullText
<< " fullTextWidth=" << fullTextWidth
<< " labelWidth=" << width ()
@@ -132,14 +132,14 @@ void kpSqueezedTextLabel::squeezeText ()
if (fullTextWidth <= width ())
{
- #if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1
+ #if DEBUG_KP_SQUEEZED_TEXT_LABEL && 1
kdDebug () << "\tfullText will fit - display" << endl;
#endif
TQLabel::setText (m_fullText);
}
else
{
- #if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1
+ #if DEBUG_KP_SQUEEZED_TEXT_LABEL && 1
kdDebug () << "\tfullText won't fit :( - squeeze" << endl;
kdDebug () << "\t\twidth of \"...\"="
<< fontMetrics.width (ellipsisText ())
@@ -148,7 +148,7 @@ void kpSqueezedTextLabel::squeezeText ()
#endif
if (fontMetrics.width (ellipsisText ()) > width ())
{
- #if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1
+ #if DEBUG_KP_SQUEEZED_TEXT_LABEL && 1
kdDebug () << "\t\t\tcan't even fit \"...\" - forget it" << endl;
#endif
TQLabel::setText (TQString());
@@ -164,7 +164,7 @@ void kpSqueezedTextLabel::squeezeText ()
{
int numLettersToUseMid = (numLettersToUseLo + numLettersToUseHi) / 2;
int squeezedWidth = fontMetrics.width (m_fullText.left (numLettersToUseMid) + ellipsisText ());
- #if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1
+ #if DEBUG_KP_SQUEEZED_TEXT_LABEL && 1
kdDebug () << "\tbsearch: lo=" << numLettersToUseLo
<< " hi=" << numLettersToUseHi
<< " mid=" << numLettersToUseMid
@@ -175,7 +175,7 @@ void kpSqueezedTextLabel::squeezeText ()
if (squeezedWidth == width ())
{
- #if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1
+ #if DEBUG_KP_SQUEEZED_TEXT_LABEL && 1
kdDebug () << "\t\tperfect match!" << endl;
#endif
numLettersToUse = numLettersToUseMid;
@@ -183,14 +183,14 @@ void kpSqueezedTextLabel::squeezeText ()
}
else if (squeezedWidth < width ())
{
- #if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1
+ #if DEBUG_KP_SQUEEZED_TEXT_LABEL && 1
kdDebug () << "\t\tsmall enough - numLettersToUse="
<< numLettersToUse << endl;
#endif
if (numLettersToUseMid > numLettersToUse)
{
numLettersToUse = numLettersToUseMid;
- #if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1
+ #if DEBUG_KP_SQUEEZED_TEXT_LABEL && 1
kdDebug () << "\t\t\tset numLettersToUse="
<< numLettersToUse
<< endl;
@@ -201,7 +201,7 @@ void kpSqueezedTextLabel::squeezeText ()
}
else
{
- #if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1
+ #if DEBUG_KP_SQUEEZED_TEXT_LABEL && 1
kdDebug () << "\t\ttoo big" << endl;
#endif
numLettersToUseHi = numLettersToUseMid - 1;