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 --- kcoloredit/colorselector.cpp | 14 +++++++------- kcoloredit/gradientselection.cpp | 10 +++++----- kcoloredit/kcoloredit.h | 2 +- kcoloredit/kcoloreditdoc.cpp | 6 +++--- kcoloredit/kcoloreditview.cpp | 12 ++++++------ kcoloredit/kxycolorselector.cpp | 2 +- kcoloredit/kzcolorselector.cpp | 2 +- kcoloredit/loadpalettedlg.cpp | 2 +- kcoloredit/palette.cpp | 2 +- kcoloredit/palette.h | 2 +- kcoloredit/paletteview.cpp | 2 +- kcoloredit/paletteviewscrolledarea.cpp | 16 ++++++++-------- kcoloredit/texteditselection.cpp | 6 +++--- kcoloredit/texteditselection.h | 4 ++-- 14 files changed, 41 insertions(+), 41 deletions(-) (limited to 'kcoloredit') diff --git a/kcoloredit/colorselector.cpp b/kcoloredit/colorselector.cpp index acf1fd06..117259ab 100644 --- a/kcoloredit/colorselector.cpp +++ b/kcoloredit/colorselector.cpp @@ -17,7 +17,7 @@ #include -#include +#include /* #include */ #include #include @@ -53,7 +53,7 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par topLayout->addWidget(gradientSelection, 10); KSeparator* hLine = new KSeparator(KSeparator::HLine, this); topLayout->addWidget(hLine); - TQHBoxLayout* tqlayout = new TQHBoxLayout(); + TQHBoxLayout* layout = new TQHBoxLayout(); TextEditSelection* textEditSelection = new TextEditSelection(this); connect(textEditSelection, TQT_SIGNAL( valueChanged(Color*) ), TQT_SLOT( slotSetColor(Color*) )); connect(this, TQT_SIGNAL( valueChanged(Color*) ), textEditSelection, TQT_SLOT( slotSetValue(Color*) )); @@ -88,17 +88,17 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par colorChangeLayout->addStretch(10); colorChangeLayout->addWidget(colorChangeSliderWidget); colorChangeLayout->addStretch(10); - tqlayout->addLayout(colorChangeLayout, 10); + layout->addLayout(colorChangeLayout, 10); m_color.setComponents(RGB_MAX_COMPONENT_VALUE, RGB_MAX_COMPONENT_VALUE, RGB_MAX_COMPONENT_VALUE); slotColorReplace(); KSeparator* vLine = new KSeparator(KSeparator::VLine, this); - tqlayout->addWidget(vLine); - tqlayout->addWidget(textEditSelection, 1); + layout->addWidget(vLine); + layout->addWidget(textEditSelection, 1); colorPatch = new KColorPatch(this); connect(colorPatch, TQT_SIGNAL( colorChanged(const TQColor&) ), TQT_SLOT( slotSetColor(const TQColor&) )); colorPatch->setMinimumSize(80, 64); - tqlayout->addWidget(colorPatch, 10); - topLayout->addLayout(tqlayout); + layout->addWidget(colorPatch, 10); + topLayout->addLayout(layout); } ColorSelector::~ColorSelector() { } diff --git a/kcoloredit/gradientselection.cpp b/kcoloredit/gradientselection.cpp index fd1b7a87..749c5464 100644 --- a/kcoloredit/gradientselection.cpp +++ b/kcoloredit/gradientselection.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include +#include #include #include #include @@ -26,13 +26,13 @@ GradientSelection::GradientSelection(TQWidget *parent, const char *name ) : TQWidget(parent,name) { TQGridLayout* topLayout = new TQGridLayout(this, 2, 2, 0); - TQHBoxLayout* tqlayout = new TQHBoxLayout(0); - tqlayout->setMargin(3); + TQHBoxLayout* layout = new TQHBoxLayout(0); + layout->setMargin(3); xyColorSelector = new KXYColorSelector(this); connect(xyColorSelector, TQT_SIGNAL( valueChanged(int, int) ), TQT_SLOT( slotXyColorSelectorPosChanged(int, int) )); - tqlayout->addWidget(xyColorSelector); - topLayout->addLayout(tqlayout, 0, 0); + layout->addWidget(xyColorSelector); + topLayout->addLayout(layout, 0, 0); topLayout->setRowStretch(0, 10); topLayout->setRowStretch(1, 0); TQVBoxLayout* xyColorSelectorLayout = new TQVBoxLayout(); diff --git a/kcoloredit/kcoloredit.h b/kcoloredit/kcoloredit.h index e09fd415..675cddb0 100644 --- a/kcoloredit/kcoloredit.h +++ b/kcoloredit/kcoloredit.h @@ -74,7 +74,7 @@ class KColorEditApp : public KMainWindow KColorEditDoc *document() const; protected: - /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration + /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration * file */ void saveOptions(); diff --git a/kcoloredit/kcoloreditdoc.cpp b/kcoloredit/kcoloreditdoc.cpp index 0669380b..f4c2f1e9 100644 --- a/kcoloredit/kcoloreditdoc.cpp +++ b/kcoloredit/kcoloreditdoc.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include // include files for KDE #include @@ -235,7 +235,7 @@ void KColorEditDoc::copyToClipboard(Palette& palette) { TQString text; TQTextOStream stream(&text); palette.save(stream, 0, false); - KApplication::tqclipboard()->setText(text); + KApplication::clipboard()->setText(text); emit clipboardChanged(); } @@ -260,7 +260,7 @@ void KColorEditDoc::paste() { Palette palettePaste; TQString text; TQTextIStream stream(&text); - text = KApplication::tqclipboard()->text(); + text = KApplication::clipboard()->text(); if(palettePaste.load( stream, false )) { m_paletteHistory.paste(paletteCursorPos(), palettePaste); setPaletteSelection(paletteCursorPos(), paletteCursorPos() + diff --git a/kcoloredit/kcoloreditview.cpp b/kcoloredit/kcoloreditview.cpp index 32e61a06..89b84e6f 100644 --- a/kcoloredit/kcoloreditview.cpp +++ b/kcoloredit/kcoloreditview.cpp @@ -17,7 +17,7 @@ // include files for TQt #include -#include +#include #include #include #include @@ -43,7 +43,7 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter( TQVBoxLayout* paletteLayout = new TQVBoxLayout(paletteViewArea); paletteView = new PaletteView(16, 16, 2, this, paletteViewArea); paletteLayout->addWidget(paletteView, 10); - TQHBoxLayout* tqlayout = new TQHBoxLayout(); + TQHBoxLayout* layout = new TQHBoxLayout(); TQVBoxLayout* addColorLayout = new TQVBoxLayout(4); addColorLayout->setMargin(8); TQHBoxLayout* buttonsLayout = new TQHBoxLayout(4); @@ -70,7 +70,7 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter( // paletteView, TQT_SLOT( slotCursorFollowsChosenColor(bool) )); //cursorFollowsChosenColor->toggle(); paletteView->slotCursorFollowsChosenColor(true); - tqlayout->addLayout(addColorLayout, 0); + layout->addLayout(addColorLayout, 0); TQVGroupBox* colorAtCursorFrame = new TQVGroupBox(i18n("Color at Cursor"), paletteViewArea); TQWidget* colorAtCursorFrameArea = new TQWidget(colorAtCursorFrame); TQVBoxLayout* colorAtCursorLayout = new TQVBoxLayout(colorAtCursorFrameArea, 4); @@ -127,10 +127,10 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter( colorAtCursorRgbStringLayout->addWidget(colorAtCursorRgbStringValueLabel); colorAtCursorRgbStringLayout->addStretch(); colorAtCursorLayout->addLayout(colorAtCursorRgbStringLayout); - tqlayout->addWidget(colorAtCursorFrame, 10); - tqlayout->addSpacing(8); + layout->addWidget(colorAtCursorFrame, 10); + layout->addSpacing(8); paletteLayout->addSpacing(4); - paletteLayout->addLayout(tqlayout); + paletteLayout->addLayout(layout); paletteLayout->addSpacing(4); inColorNameChanging = false; doNotUpdateColorLabels = false; diff --git a/kcoloredit/kxycolorselector.cpp b/kcoloredit/kxycolorselector.cpp index 68df676d..e6c0e6ef 100644 --- a/kcoloredit/kxycolorselector.cpp +++ b/kcoloredit/kxycolorselector.cpp @@ -42,7 +42,7 @@ void KXYColorSelector::setType(const int type) { void KXYColorSelector::updateContents() { drawPalette(&pixmap); - tqrepaint(); + repaint(); } void KXYColorSelector::resizeEvent(TQResizeEvent*) { diff --git a/kcoloredit/kzcolorselector.cpp b/kcoloredit/kzcolorselector.cpp index c705cad0..bb4a3c23 100644 --- a/kcoloredit/kzcolorselector.cpp +++ b/kcoloredit/kzcolorselector.cpp @@ -53,7 +53,7 @@ void KZColorSelector::setType(const int type) { void KZColorSelector::updateContents() { drawPalette(&pixmap); - tqrepaint(false); + repaint(false); } void KZColorSelector::resizeEvent(TQResizeEvent*) { diff --git a/kcoloredit/loadpalettedlg.cpp b/kcoloredit/loadpalettedlg.cpp index 23def4d5..d7ac54aa 100644 --- a/kcoloredit/loadpalettedlg.cpp +++ b/kcoloredit/loadpalettedlg.cpp @@ -17,7 +17,7 @@ #include -#include +#include #include #include #include diff --git a/kcoloredit/palette.cpp b/kcoloredit/palette.cpp index 42758b41..5745d824 100644 --- a/kcoloredit/palette.cpp +++ b/kcoloredit/palette.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcoloredit/palette.h b/kcoloredit/palette.h index a363ada4..ccba9a6f 100644 --- a/kcoloredit/palette.h +++ b/kcoloredit/palette.h @@ -19,7 +19,7 @@ #define PALETTE_H #include -#include +#include #include #include "color.h" diff --git a/kcoloredit/paletteview.cpp b/kcoloredit/paletteview.cpp index 52e8b4be..7d932c4f 100644 --- a/kcoloredit/paletteview.cpp +++ b/kcoloredit/paletteview.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include +#include #include "kcoloreditview.h" #include "paletteview.h" diff --git a/kcoloredit/paletteviewscrolledarea.cpp b/kcoloredit/paletteviewscrolledarea.cpp index 63cb3f9b..23bd280c 100644 --- a/kcoloredit/paletteviewscrolledarea.cpp +++ b/kcoloredit/paletteviewscrolledarea.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include @@ -77,7 +77,7 @@ void PaletteViewScrolledArea::redraw() { } void PaletteViewScrolledArea::repaintPalette() { - tqrepaint(false); + repaint(false); } void PaletteViewScrolledArea::checkSelectionAutoScroll(const int mousePosY) { @@ -220,7 +220,7 @@ void PaletteViewScrolledArea::paintEvent(TQPaintEvent* /*event*/) { setCellsSizes(); TQPixmap pixmap(size()); TQPainter painter; - painter.tqbegin(TQT_TQPAINTDEVICE(&pixmap), this); + painter.begin(TQT_TQPAINTDEVICE(&pixmap), this); TQFontMetrics fontMetrics = painter.fontMetrics(); int maxLineWidth; if(viewColorNames) { @@ -249,12 +249,12 @@ void PaletteViewScrolledArea::paintEvent(TQPaintEvent* /*event*/) { int lastRow = (posY + height() - 1 + rowHeight - 1)/rowHeight; if(viewColorNames) painter.fillRect(0, 0, rowWidth, height(), - TQBrush( TQFrame::tqpalette().active().base() )); - TQBrush normalBackgroundBrush(TQFrame::tqpalette().active().background()); - TQBrush selectedBackgroundBrush(TQFrame::tqpalette().active().highlight()); + TQBrush( TQFrame::palette().active().base() )); + TQBrush normalBackgroundBrush(TQFrame::palette().active().background()); + TQBrush selectedBackgroundBrush(TQFrame::palette().active().highlight()); TQBrush foregroundBrush; - TQBrush cursorBrush(TQFrame::tqpalette().active().foreground()); - TQPen backgroundPen(TQFrame::tqpalette().active().foreground()); + TQBrush cursorBrush(TQFrame::palette().active().foreground()); + TQPen backgroundPen(TQFrame::palette().active().foreground()); int min = selectionMin(); int max = selectionMax(); int fontAscent = fontMetrics.ascent(); diff --git a/kcoloredit/texteditselection.cpp b/kcoloredit/texteditselection.cpp index 1b49ec6a..d32e054e 100644 --- a/kcoloredit/texteditselection.cpp +++ b/kcoloredit/texteditselection.cpp @@ -59,14 +59,14 @@ TextEditSelection::~TextEditSelection(){ } void TextEditSelection::addComponent(const int index, TQLineEdit* lineEdit, const int maxValue, - const TQString& labelString, const int row, const int column, TQGridLayout* tqlayout) { + const TQString& labelString, const int row, const int column, TQGridLayout* layout) { TQLabel* label = new TQLabel(labelString, this); lineEdit->setValidator(new TQIntValidator( 0, maxValue, TQT_TQOBJECT(lineEdit) )); lineEditTable[index] = lineEdit; lineEdit->setMinimumWidth(lineEdit->fontMetrics().width( TQString("8888") )); lineEdit->setMaximumWidth(lineEdit->fontMetrics().width( TQString("8888888") )); - tqlayout->addWidget(label, row, column*3); - tqlayout->addWidget(lineEdit, row, column*3 + 1); + layout->addWidget(label, row, column*3); + layout->addWidget(lineEdit, row, column*3 + 1); } void TextEditSelection::setRgbString(const int red, const int green, const int blue) { diff --git a/kcoloredit/texteditselection.h b/kcoloredit/texteditselection.h index e0ef91f5..776b81f3 100644 --- a/kcoloredit/texteditselection.h +++ b/kcoloredit/texteditselection.h @@ -20,7 +20,7 @@ #include #include -#include +#include #include "color.h" @@ -48,7 +48,7 @@ public slots: protected: /** Adds a component line edit */ void addComponent(const int index, TQLineEdit* lineEdit, const int maxValue, const TQString& labelString, - const int row, const int column, TQGridLayout* tqlayout); + const int row, const int column, TQGridLayout* layout); /** sets RGB string in rgbStringLineEdit */ void setRgbString(const int red, const int green, const int blue); -- cgit v1.2.3