From c2637a0da6d9a1c8626ca39f8451ab3b7cda487a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:47:59 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kolourpaint/widgets/kpcolorsimilaritycube.cpp | 10 ++++---- kolourpaint/widgets/kpcolorsimilaritycube.h | 2 +- kolourpaint/widgets/kpcolorsimilaritydialog.cpp | 2 +- kolourpaint/widgets/kpcolortoolbar.cpp | 24 +++++++++--------- kolourpaint/widgets/kpcolortoolbar.h | 4 +-- kolourpaint/widgets/kpsqueezedtextlabel.cpp | 6 ++--- kolourpaint/widgets/kpsqueezedtextlabel.h | 2 +- kolourpaint/widgets/kptooltoolbar.cpp | 6 ++--- kolourpaint/widgets/kptoolwidgetbase.cpp | 12 ++++----- kolourpaint/widgets/kptoolwidgetbrush.cpp | 32 ++++++++++++------------ kolourpaint/widgets/kptoolwidgetbrush.h | 2 +- kolourpaint/widgets/kptoolwidgeterasersize.cpp | 2 +- kolourpaint/widgets/kptoolwidgetfillstyle.cpp | 2 +- kolourpaint/widgets/kptoolwidgetspraycansize.cpp | 2 +- 14 files changed, 54 insertions(+), 54 deletions(-) (limited to 'kolourpaint/widgets') diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.cpp b/kolourpaint/widgets/kpcolorsimilaritycube.cpp index b2f3441a..4d06d46e 100644 --- a/kolourpaint/widgets/kpcolorsimilaritycube.cpp +++ b/kolourpaint/widgets/kpcolorsimilaritycube.cpp @@ -133,12 +133,12 @@ void kpColorSimilarityCube::setColorSimilarity (double similarity) m_colorSimilarity = similarity; - tqrepaint (false/*no erase*/); + repaint (false/*no erase*/); } // protected virtual [base TQWidget] -TQSize kpColorSimilarityCube::tqsizeHint () const +TQSize kpColorSimilarityCube::sizeHint () const { return TQSize (52, 52); } @@ -247,8 +247,8 @@ void kpColorSimilarityCube::drawFace (TQPainter *p, #if DEBUG_KP_COLOR_SIMILARITY_CUBE kdDebug () << "\tnot enabled - making us grey" << endl; #endif - colors [0] = tqcolorGroup ().background (); - colors [1] = tqcolorGroup ().background (); + colors [0] = colorGroup ().background (); + colors [1] = colorGroup ().background (); } #if DEBUG_KP_COLOR_SIMILARITY_CUBE @@ -274,7 +274,7 @@ void kpColorSimilarityCube::drawContents (TQPainter *p) TQRect cr (contentsRect ()); TQPixmap backBuffer (cr.width (), cr.height ()); - backBuffer.fill (tqcolorGroup ().background ()); + backBuffer.fill (colorGroup ().background ()); TQPainter backBufferPainter (&backBuffer); diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.h b/kolourpaint/widgets/kpcolorsimilaritycube.h index 0cf9f92a..a5f1db9f 100644 --- a/kolourpaint/widgets/kpcolorsimilaritycube.h +++ b/kolourpaint/widgets/kpcolorsimilaritycube.h @@ -55,7 +55,7 @@ public: double colorSimilarity () const; void setColorSimilarity (double similarity); - virtual TQSize tqsizeHint () const; + virtual TQSize sizeHint () const; protected: TQColor color (int redOrGreenOrBlue, int baseBrightness, int similarityDirection) const; diff --git a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp index d71ac501..7f0f621d 100644 --- a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp +++ b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp index cfdb6820..7510d87c 100644 --- a/kolourpaint/widgets/kpcolortoolbar.cpp +++ b/kolourpaint/widgets/kpcolortoolbar.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include @@ -150,7 +150,7 @@ kpColor kpDualColorButton::oldBackgroundColor () const // public virtual [base TQWidget] -TQSize kpDualColorButton::tqsizeHint () const +TQSize kpDualColorButton::sizeHint () const { return TQSize (52, 52); } @@ -318,14 +318,14 @@ void kpDualColorButton::drawContents (TQPainter *p) else { backBufferPainter.fillRect (m_backBuffer->rect (), - tqcolorGroup ().color (TQColorGroup::Background)); + colorGroup ().color (TQColorGroup::Background)); } TQPixmap swapPixmap = UserIcon ("colorbutton_swap_16x16"); if (!isEnabled ()) { // swapPixmap has a mask after all - swapPixmap.fill (tqcolorGroup ().color (TQColorGroup::Dark)); + swapPixmap.fill (colorGroup ().color (TQColorGroup::Dark)); } backBufferPainter.drawPixmap (swapPixmapRect ().topLeft (), swapPixmap); @@ -346,8 +346,8 @@ void kpDualColorButton::drawContents (TQPainter *p) backBufferPainter.drawPixmap (bgRectInside, UserIcon ("color_transparent_26x26")); } else - backBufferPainter.fillRect (bgRectInside, tqcolorGroup ().color (TQColorGroup::Button)); - qDrawShadePanel (&backBufferPainter, bgRect, tqcolorGroup (), + backBufferPainter.fillRect (bgRectInside, colorGroup ().color (TQColorGroup::Button)); + qDrawShadePanel (&backBufferPainter, bgRect, colorGroup (), false/*not sunken*/, 2/*lineWidth*/, 0/*never fill*/); @@ -366,8 +366,8 @@ void kpDualColorButton::drawContents (TQPainter *p) backBufferPainter.drawPixmap (fgRectInside, UserIcon ("color_transparent_26x26")); } else - backBufferPainter.fillRect (fgRectInside, tqcolorGroup ().color (TQColorGroup::Button)); - qDrawShadePanel (&backBufferPainter, fgRect, tqcolorGroup (), + backBufferPainter.fillRect (fgRectInside, colorGroup ().color (TQColorGroup::Button)); + qDrawShadePanel (&backBufferPainter, fgRect, colorGroup (), false/*not sunken*/, 2/*lineWidth*/, 0/*never fill*/); @@ -768,7 +768,7 @@ kpTransparentColorCell::~kpTransparentColorCell () // public virtual [base TQWidget] -TQSize kpTransparentColorCell::tqsizeHint () const +TQSize kpTransparentColorCell::sizeHint () const { return TQSize (m_pixmap.width () + frameWidth () * 2, m_pixmap.height () + frameWidth () * 2); @@ -829,7 +829,7 @@ kpColorPalette::kpColorPalette (TQWidget *parent, #endif m_transparentColorCell = new kpTransparentColorCell (this); - m_transparentColorCell->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_transparentColorCell->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed); connect (m_transparentColorCell, TQT_SIGNAL (foregroundColorChanged (const kpColor &)), this, TQT_SIGNAL (foregroundColorChanged (const kpColor &))); connect (m_transparentColorCell, TQT_SIGNAL (backgroundColorChanged (const kpColor &)), @@ -964,7 +964,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow, 5/*margin*/, (10 * 4)/*spacing*/); m_dualColorButton = new kpDualColorButton (mainWindow, base); - m_dualColorButton->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_dualColorButton->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed); connect (m_dualColorButton, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)), this, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &))); connect (m_dualColorButton, TQT_SIGNAL (foregroundColorChanged (const kpColor &)), @@ -981,7 +981,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow, m_boxLayout->addWidget (m_colorPalette, 0/*stretch*/); m_colorSimilarityToolBarItem = new kpColorSimilarityToolBarItem (mainWindow, base); - m_colorSimilarityToolBarItem->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_colorSimilarityToolBarItem->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed); connect (m_colorSimilarityToolBarItem, TQT_SIGNAL (colorSimilarityChanged (double, int)), this, TQT_SIGNAL (colorSimilarityChanged (double, int))); m_boxLayout->addWidget (m_colorSimilarityToolBarItem, 0/*stretch*/); diff --git a/kolourpaint/widgets/kpcolortoolbar.h b/kolourpaint/widgets/kpcolortoolbar.h index 59f13fb7..7c005441 100644 --- a/kolourpaint/widgets/kpcolortoolbar.h +++ b/kolourpaint/widgets/kpcolortoolbar.h @@ -91,7 +91,7 @@ public: kpColor oldBackgroundColor () const; public: - virtual TQSize tqsizeHint () const; + virtual TQSize sizeHint () const; protected: TQRect swapPixmapRect () const; @@ -163,7 +163,7 @@ public: kpTransparentColorCell (TQWidget *parent, const char *name = 0); virtual ~kpTransparentColorCell (); - virtual TQSize tqsizeHint () const; + virtual TQSize sizeHint () const; signals: void transparentColorSelected (int mouseButton); diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.cpp b/kolourpaint/widgets/kpsqueezedtextlabel.cpp index 6e7386ec..dc500b12 100644 --- a/kolourpaint/widgets/kpsqueezedtextlabel.cpp +++ b/kolourpaint/widgets/kpsqueezedtextlabel.cpp @@ -53,11 +53,11 @@ kpSqueezedTextLabel::kpSqueezedTextLabel (const TQString &text, TQWidget *parent // public virtual -TQSize kpSqueezedTextLabel::tqminimumSizeHint () const +TQSize kpSqueezedTextLabel::minimumSizeHint () const { #if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1 - kdDebug () << "kpSqueezedTextLabel::tqminimumSizeHint() qLabel prefers" - << TQLabel::tqminimumSizeHint () << endl; + kdDebug () << "kpSqueezedTextLabel::minimumSizeHint() qLabel prefers" + << TQLabel::minimumSizeHint () << endl; #endif return TQSize (-1/*no minimum width*/, TQLabel::minimumHeight ()); } diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.h b/kolourpaint/widgets/kpsqueezedtextlabel.h index 4697af8a..e4828b54 100644 --- a/kolourpaint/widgets/kpsqueezedtextlabel.h +++ b/kolourpaint/widgets/kpsqueezedtextlabel.h @@ -43,7 +43,7 @@ public: kpSqueezedTextLabel (TQWidget *parent, const char *name = 0); kpSqueezedTextLabel (const TQString &text, TQWidget *parent, const char *name = 0); - virtual TQSize tqminimumSizeHint () const; + virtual TQSize minimumSizeHint () const; // TODO: maybe text() should return the full text? TQString fullText () const; diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp index ba048d5c..c1f73ea5 100644 --- a/kolourpaint/widgets/kptooltoolbar.cpp +++ b/kolourpaint/widgets/kptooltoolbar.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include @@ -144,7 +144,7 @@ kpToolToolBar::kpToolToolBar (const TQString &label, kpMainWindow *mainWindow, i setOrientation (orientation ()); #if DEBUG_KP_TOOL_TOOL_BAR - kdDebug () << "kpToolToolBar:: tqlayout tool widgets msec=" + kdDebug () << "kpToolToolBar:: layout tool widgets msec=" << timer.elapsed () << endl; #endif @@ -199,7 +199,7 @@ int kpToolToolBar::defaultIconSize () if (m_defaultIconSize <= 0) { - // Adapt according to screen tqgeometry + // Adapt according to screen geometry const TQRect desktopSize = KGlobalSettings::desktopGeometry (this); #if DEBUG_KP_TOOL_TOOL_BAR kdDebug () << "\tadapting to screen size=" << desktopSize << endl; diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp index 3d1d3cff..18177804 100644 --- a/kolourpaint/widgets/kptoolwidgetbase.cpp +++ b/kolourpaint/widgets/kptoolwidgetbase.cpp @@ -175,10 +175,10 @@ TQPair kpToolWidgetBase::defaultSelectedRowAndCol () const KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools); KConfigBase *cfg = cfgGroupSaver.config (); - TQString nameString = TQString::tqfromLatin1 (name ()); + TQString nameString = TQString::fromLatin1 (name ()); - row = cfg->readNumEntry (nameString + TQString::tqfromLatin1 (" Row"), -1); - col = cfg->readNumEntry (nameString + TQString::tqfromLatin1 (" Col"), -1); + row = cfg->readNumEntry (nameString + TQString::fromLatin1 (" Row"), -1); + col = cfg->readNumEntry (nameString + TQString::fromLatin1 (" Col"), -1); } #if DEBUG_KP_TOOL_WIDGET_BASE @@ -218,9 +218,9 @@ void kpToolWidgetBase::saveSelectedAsDefault () const KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools); KConfigBase *cfg = cfgGroupSaver.config (); - TQString nameString = TQString::tqfromLatin1 (name ()); - cfg->writeEntry (nameString + TQString::tqfromLatin1 (" Row"), m_selectedRow); - cfg->writeEntry (nameString + TQString::tqfromLatin1 (" Col"), m_selectedCol); + TQString nameString = TQString::fromLatin1 (name ()); + cfg->writeEntry (nameString + TQString::fromLatin1 (" Row"), m_selectedRow); + cfg->writeEntry (nameString + TQString::fromLatin1 (" Col"), m_selectedCol); cfg->sync (); } diff --git a/kolourpaint/widgets/kptoolwidgetbrush.cpp b/kolourpaint/widgets/kptoolwidgetbrush.cpp index 0c583126..57986b63 100644 --- a/kolourpaint/widgets/kptoolwidgetbrush.cpp +++ b/kolourpaint/widgets/kptoolwidgetbrush.cpp @@ -59,7 +59,7 @@ kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name) TQPixmap *pm = m_brushBitmaps; - for (int tqshape = 0; tqshape < BRUSH_SIZE_NUM_ROWS; tqshape++) + for (int shape = 0; shape < BRUSH_SIZE_NUM_ROWS; shape++) { for (int i = 0; i < BRUSH_SIZE_NUM_COLS; i++) { @@ -68,7 +68,7 @@ kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name) pm->resize ((w <= 0 ? width () : w), (h <= 0 ? height () : h)); - const int s = brushSize [tqshape][i]; + const int s = brushSize [shape][i]; TQRect rect; if (s >= pm->width () || s >= pm->height ()) @@ -92,7 +92,7 @@ kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name) painter.setBrush (TQt::black); // sync: - switch (tqshape) + switch (shape) { case 0: painter.drawEllipse (rect); @@ -110,7 +110,7 @@ kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name) painter.end (); pm->setMask (pm->createHeuristicMask ()); - addOption (*pm, brushName (tqshape, i)/*tooltip*/); + addOption (*pm, brushName (shape, i)/*tooltip*/); pm++; } @@ -127,38 +127,38 @@ kpToolWidgetBrush::~kpToolWidgetBrush () // private -TQString kpToolWidgetBrush::brushName (int tqshape, int whichSize) +TQString kpToolWidgetBrush::brushName (int shape, int whichSize) { - int s = brushSize [tqshape][whichSize]; + int s = brushSize [shape][whichSize]; if (s == 1) return i18n ("1x1"); - TQString tqshapeName; + TQString shapeName; // sync: - switch (tqshape) + switch (shape) { case 0: - tqshapeName = i18n ("Circle"); + shapeName = i18n ("Circle"); break; case 1: - tqshapeName = i18n ("Square"); + shapeName = i18n ("Square"); break; case 2: - // TODO: is this really the name of a tqshape? :) - tqshapeName = i18n ("Slash"); + // TODO: is this really the name of a shape? :) + shapeName = i18n ("Slash"); break; case 3: - // TODO: is this really the name of a tqshape? :) - tqshapeName = i18n ("Backslash"); + // TODO: is this really the name of a shape? :) + shapeName = i18n ("Backslash"); break; } - if (tqshapeName.isEmpty ()) + if (shapeName.isEmpty ()) return TQString(); - return i18n ("%1x%2 %3").arg (s).arg (s).arg (tqshapeName); + return i18n ("%1x%2 %3").arg (s).arg (s).arg (shapeName); } TQPixmap kpToolWidgetBrush::brush () const diff --git a/kolourpaint/widgets/kptoolwidgetbrush.h b/kolourpaint/widgets/kptoolwidgetbrush.h index 0fd2f46a..c67db05e 100644 --- a/kolourpaint/widgets/kptoolwidgetbrush.h +++ b/kolourpaint/widgets/kptoolwidgetbrush.h @@ -43,7 +43,7 @@ public: virtual ~kpToolWidgetBrush (); private: - TQString brushName (int tqshape, int whichSize); + TQString brushName (int shape, int whichSize); public: TQPixmap brush () const; diff --git a/kolourpaint/widgets/kptoolwidgeterasersize.cpp b/kolourpaint/widgets/kptoolwidgeterasersize.cpp index d27965a6..90167fd2 100644 --- a/kolourpaint/widgets/kptoolwidgeterasersize.cpp +++ b/kolourpaint/widgets/kptoolwidgeterasersize.cpp @@ -66,7 +66,7 @@ kpToolWidgetEraserSize::kpToolWidgetEraserSize (TQWidget *parent, const char *na TQPixmap previewPixmap (s, s); if (i < 3) { - // HACK: kpToolWidgetBase's tqlayout code sucks and gives uneven spacing + // HACK: kpToolWidgetBase's layout code sucks and gives uneven spacing previewPixmap.resize ((width () - 4) / 3, 9); } diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp index a87714c5..f3d2cd2e 100644 --- a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp +++ b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include diff --git a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp index 503cecd2..24569a21 100644 --- a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp +++ b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp @@ -54,7 +54,7 @@ kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *parent, const char for (int i = 0; i < int (sizeof (spraycanSizes) / sizeof (spraycanSizes [0])); i++) { int s = spraycanSizes [i]; - TQString iconName = TQString ("tool_spraycan_%1x%1").tqarg (s).tqarg(s); + TQString iconName = TQString ("tool_spraycan_%1x%1").arg (s).arg(s); #if DEBUG_KP_TOOL_WIDGET_SPRAYCAN_SIZE kdDebug () << "\ticonName=" << iconName << endl; -- cgit v1.2.1