diff options
Diffstat (limited to 'chalk/plugins/tools/defaulttools')
8 files changed, 20 insertions, 20 deletions
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc index 61e485a5..384e4e26 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc @@ -19,7 +19,7 @@ */ #include <tqevent.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwidget.h> #include <tqtimer.h> #include <tqpushbutton.h> diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc index c5c9d324..6aff68c8 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc @@ -19,7 +19,7 @@ #include <string.h> #include <tqpoint.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqlistview.h> @@ -180,7 +180,7 @@ void KisToolColorPicker::buttonPress(KisButtonPressEvent *e) palette->add(ent); if (!palette->save()) { - KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.").arg(palette->filename()), i18n("Palette")); + KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.").tqarg(palette->filename()), i18n("Palette")); } } } @@ -197,7 +197,7 @@ void KisToolColorPicker::displayPickedColor() TQString channelValueText; if (m_normaliseValues) { - channelValueText = i18n("%1%").arg(m_pickedColor.colorSpace()->normalisedChannelValueText(m_pickedColor.data(), i)); + channelValueText = i18n("%1%").tqarg(m_pickedColor.colorSpace()->normalisedChannelValueText(m_pickedColor.data(), i)); } else { channelValueText = m_pickedColor.colorSpace()->channelValueText(m_pickedColor.data(), i); } diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc index 4fcf642b..f15bf778 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc @@ -25,7 +25,7 @@ #include <klocale.h> #include <kcommand.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcheckbox.h> #include <tqcolor.h> diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc index 0f0305e5..6df9f8da 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc @@ -23,7 +23,7 @@ #include <tqpainter.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcheckbox.h> #include <kdebug.h> @@ -58,7 +58,7 @@ KisToolGradient::KisToolGradient() m_endPos = KisPoint(0, 0); m_reverse = false; - m_shape = KisGradientPainter::GradientShapeLinear; + m_tqshape = KisGradientPainter::GradientShapeLinear; m_repeat = KisGradientPainter::GradientRepeatNone; m_antiAliasThreshold = 0.2; } @@ -157,7 +157,7 @@ void KisToolGradient::buttonRelease(KisButtonReleaseEvent *e) progress->setSubject(&painter, true, true); } - bool painted = painter.paintGradient(m_startPos, m_endPos, m_shape, m_repeat, m_antiAliasThreshold, m_reverse, 0, 0, m_subject->currentImg()->width(), m_subject->currentImg()->height()); + bool painted = painter.paintGradient(m_startPos, m_endPos, m_tqshape, m_repeat, m_antiAliasThreshold, m_reverse, 0, 0, m_subject->currentImg()->width(), m_subject->currentImg()->height()); if (painted) { // does whole thing at moment @@ -237,7 +237,7 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent) m_ckReverse = new TQCheckBox(i18n("Reverse"), widget, "reverse_check"); connect(m_ckReverse, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetReverse(bool))); - m_cmbShape = new TQComboBox(false, widget, "shape_combo"); + m_cmbShape = new TQComboBox(false, widget, "tqshape_combo"); connect(m_cmbShape, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetShape(int))); m_cmbShape->insertItem(i18n("Linear")); m_cmbShape->insertItem(i18n("Bi-Linear")); @@ -270,9 +270,9 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent) return widget; } -void KisToolGradient::slotSetShape(int shape) +void KisToolGradient::slotSetShape(int tqshape) { - m_shape = static_cast<KisGradientPainter::enumGradientShape>(shape); + m_tqshape = static_cast<KisGradientPainter::enumGradientShape>(tqshape); } void KisToolGradient::slotSetRepeat(int repeat) diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h index 08ab06ab..29df8bf7 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h @@ -88,7 +88,7 @@ private: KisCanvasSubject *m_subject; - KisGradientPainter::enumGradientShape m_shape; + KisGradientPainter::enumGradientShape m_tqshape; KisGradientPainter::enumGradientRepeat m_repeat; bool m_reverse; diff --git a/chalk/plugins/tools/defaulttools/kis_tool_line.cc b/chalk/plugins/tools/defaulttools/kis_tool_line.cc index 7b1df85b..243052cf 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_line.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_line.cc @@ -21,7 +21,7 @@ */ #include <tqpainter.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwidget.h> #include <kdebug.h> diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cc index c624d30a..bf23b441 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_text.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cc @@ -19,7 +19,7 @@ #include <tqfont.h> #include <tqrect.h> #include <tqimage.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwidget.h> #include <tqstring.h> #include <tqpixmap.h> @@ -156,7 +156,7 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e) void KisToolText::setFont() { KFontDialog::getFont( m_font, false/*, TQWidget* parent! */ ); - m_lbFontName->setText(TQString(m_font.family() + ", %1").arg(m_font.pointSize())); + m_lbFontName->setText(TQString(m_font.family() + ", %1").tqarg(m_font.pointSize())); } TQWidget* KisToolText::createOptionWidget(TQWidget* parent) @@ -167,7 +167,7 @@ TQWidget* KisToolText::createOptionWidget(TQWidget* parent) TQHBox *fontBox = new TQHBox(widget); m_lbFontName = new KSqueezedTextLabel(TQString(m_font.family() + ", %1") - .arg(m_font.pointSize()), fontBox); + .tqarg(m_font.pointSize()), fontBox); m_btnMoreFonts = new TQPushButton("...", fontBox); connect(m_btnMoreFonts, TQT_SIGNAL(released()), this, TQT_SLOT(setFont())); diff --git a/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui index 5463d3e3..7675b875 100644 --- a/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui +++ b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui @@ -47,13 +47,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>200</width> <height>32767</height> @@ -70,7 +70,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -101,7 +101,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> |