diff options
| author | Timothy Pearson <[email protected]> | 2011-12-21 14:03:41 -0600 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2012-06-25 03:21:34 +0200 |
| commit | 97ccef8ebcb1c875f41e70c58d29214f1838b5a2 (patch) | |
| tree | dfcfb66458fa70190bf7ddcb9437e21702d495d2 /src/kcolorcombo2.cpp | |
| parent | 4432e0a1145b0ef95d741fea6d04b565f36fa626 (diff) | |
| download | basket-97ccef8ebcb1c875f41e70c58d29214f1838b5a2.tar.gz basket-97ccef8ebcb1c875f41e70c58d29214f1838b5a2.zip | |
Rename obsolete tq methods to standard names
(cherry picked from commit 17678d65de293ae9a8b077b5c0bc3f493c617f8b)
Diffstat (limited to 'src/kcolorcombo2.cpp')
| -rw-r--r-- | src/kcolorcombo2.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/kcolorcombo2.cpp b/src/kcolorcombo2.cpp index f85dce3..fb650ad 100644 --- a/src/kcolorcombo2.cpp +++ b/src/kcolorcombo2.cpp @@ -68,7 +68,7 @@ KColorPopup::~KColorPopup() #include <tqcursor.h> -void KColorPopup::retqlayout() // FIXME: retqlayout should NOT redraw the pixmap! +void KColorPopup::relayout() // FIXME: relayout should NOT redraw the pixmap! { int columnCount = m_selector->columnCount(); int rowCount = m_selector->rowCount(); @@ -240,7 +240,7 @@ void KColorPopup::mouseMoveEvent(TQMouseEvent *event) m_selectedColumn = (x - FRAME_WIDTH - MARGIN + 2) / (colorWidth + MARGIN); m_selectedRow = (y - FRAME_WIDTH - MARGIN + 2) / (colorHeight + MARGIN); - retqlayout(); + relayout(); update(); } @@ -288,7 +288,7 @@ void KColorPopup::keyPressEvent(TQKeyEvent *event) if (row != m_selectedRow || column != m_selectedColumn) { m_selectedRow = row; m_selectedColumn = column; - retqlayout(); + relayout(); update(); } } @@ -491,7 +491,7 @@ void KColorCombo2::newColorArray(int columnCount, int rowCount) for (int i = 0; i < columnCount; ++i) m_colorArray[i] = new TQColor[rowCount]; - m_popup->retqlayout(); + m_popup->relayout(); } void KColorCombo2::setColorAt(int column, int row, const TQColor &color) @@ -654,7 +654,7 @@ void KColorCombo2::popup() m_popup->move(popupPoint); //m_popup->setColor(m_color); m_popup->doSelection(); - m_popup->retqlayout(); // FIXME: In aboutToShow() ? + m_popup->relayout(); // FIXME: In aboutToShow() ? #if 0 //#ifndef TQT_NO_EFFECTS if (TQApplication::isEffectEnabled(UI_AnimateCombo)) { @@ -745,10 +745,10 @@ void KColorCombo2::keyPressEvent(TQKeyEvent *event) if (KStdAccel::copy().contains(key)) { TQMimeSource *mime = new KColorDrag(effectiveColor()); - TQApplication::tqclipboard()->setData(mime, TQClipboard::Clipboard); + TQApplication::clipboard()->setData(mime, TQClipboard::Clipboard); } else if (KStdAccel::paste().contains(key)) { TQColor color; - KColorDrag::decode(TQApplication::tqclipboard()->data(TQClipboard::Clipboard), color); + KColorDrag::decode(TQApplication::clipboard()->data(TQClipboard::Clipboard), color); setColor(color); } else TQComboBox::keyPressEvent(event); |