diff options
| author | Timothy Pearson <[email protected]> | 2011-12-16 09:58:12 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-16 09:58:12 -0600 |
| commit | 6b45a7b7b2a804ccb2d522eb9ba6423fedb59b8f (patch) | |
| tree | a08b27e3f4fde1ed82a5f061a2725998e8012f93 /kicker-applets/kolourpicker/kolourpicker.cpp | |
| parent | ca82971624269719d487c6f7980d7237f9420036 (diff) | |
| download | tdeaddons-6b45a7b7b2a804ccb2d522eb9ba6423fedb59b8f.tar.gz tdeaddons-6b45a7b7b2a804ccb2d522eb9ba6423fedb59b8f.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit ca82971624269719d487c6f7980d7237f9420036.
Diffstat (limited to 'kicker-applets/kolourpicker/kolourpicker.cpp')
| -rw-r--r-- | kicker-applets/kolourpicker/kolourpicker.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp index 5f36ea8..fbce8cf 100644 --- a/kicker-applets/kolourpicker/kolourpicker.cpp +++ b/kicker-applets/kolourpicker/kolourpicker.cpp @@ -20,10 +20,10 @@ $Id$ */ #include <tqfile.h> -#include <textstream.h> -#include <layout.h> +#include <tqtextstream.h> +#include <tqlayout.h> #include <tqimage.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqregexp.h> #include <tqbitmap.h> #include <tqpainter.h> @@ -140,7 +140,7 @@ void KolourPicker::slotHistory() TQPopupMenu *sub = copyPopup(*it, false); subMenus.append(sub); popup.insertItem(colorPixmap(*it), - TQString("%1, %2, %3").arg((*it).red()).arg((*it).green()).arg((*it).blue()), + TQString("%1, %2, %3").tqarg((*it).red()).tqarg((*it).green()).tqarg((*it).blue()), sub); } popup.insertSeparator(); @@ -208,7 +208,7 @@ void KolourPicker::mouseReleaseEvent(TQMouseEvent *e) // set both clipboard and selection void KolourPicker::setClipboard(const TQString& text) { - TQClipboard *clip = TQApplication::clipboard(); + TQClipboard *clip = TQApplication::tqclipboard(); bool oldMode = clip->selectionModeEnabled(); clip->setSelectionMode(true); clip->setText(text); @@ -247,14 +247,14 @@ void KolourPicker::arrangeButtons() h = height(); if (h > 40) { - // vertical layout + // vertical tqlayout p = (h - 40)/3; m_colourButton->setGeometry(2, p, 20, 20); m_historyButton->setGeometry(2, 2*p+20, 20, 20); } else { - // horizontal layout + // horizontal tqlayout p = (h - 20)/2; m_colourButton->setGeometry(2, p, 20, 20); m_historyButton->setGeometry(24, p, 20, 20); @@ -265,14 +265,14 @@ void KolourPicker::arrangeButtons() w = width(); if (w > 40) { - // horizontal layout + // horizontal tqlayout p = (w - 40)/3; m_colourButton->setGeometry(p, 2, 20, 20); m_historyButton->setGeometry(2*p+20, 2, 20, 20); } else { - // vertical layout + // vertical tqlayout p = (w - 20)/2; m_colourButton->setGeometry(p, 2, 20, 20); m_historyButton->setGeometry(p, 24, 20, 20); |