summaryrefslogtreecommitdiffstats
path: root/chalk/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chalk/ui')
-rw-r--r--chalk/ui/imageviewer.cpp4
-rw-r--r--chalk/ui/kcurve.cpp4
-rw-r--r--chalk/ui/kis_canvas.cpp30
-rw-r--r--chalk/ui/kis_canvas_painter.cpp16
-rw-r--r--chalk/ui/kis_canvas_painter.h12
-rw-r--r--chalk/ui/kis_dlg_adjustment_layer.cpp2
-rw-r--r--chalk/ui/kis_double_widget.cpp2
-rw-r--r--chalk/ui/kis_gradient_slider_widget.cpp2
-rw-r--r--chalk/ui/kis_grid_drawer.cpp14
-rw-r--r--chalk/ui/kis_grid_drawer.h2
-rw-r--r--chalk/ui/kis_histogram_view.cpp2
-rw-r--r--chalk/ui/kis_int_spinbox.cpp4
-rw-r--r--chalk/ui/kis_int_spinbox.h2
-rw-r--r--chalk/ui/kis_opengl_canvas_painter.cpp10
-rw-r--r--chalk/ui/kis_opengl_canvas_painter.h8
-rw-r--r--chalk/ui/kis_qpaintdevice_canvas_painter.cpp6
-rw-r--r--chalk/ui/kis_qpaintdevice_canvas_painter.h6
-rw-r--r--chalk/ui/kis_ruler.cpp16
-rw-r--r--chalk/ui/kis_ruler.h4
-rw-r--r--chalk/ui/kis_tool_dummy.cpp4
-rw-r--r--chalk/ui/kis_tool_freehand.cpp4
-rw-r--r--chalk/ui/kis_tool_paint.cpp2
-rw-r--r--chalk/ui/kis_view.cpp24
-rw-r--r--chalk/ui/kobirdeyepanel.cpp4
-rw-r--r--chalk/ui/layerlist.cpp4
25 files changed, 94 insertions, 94 deletions
diff --git a/chalk/ui/imageviewer.cpp b/chalk/ui/imageviewer.cpp
index 5e74c8fe..fe632dcc 100644
--- a/chalk/ui/imageviewer.cpp
+++ b/chalk/ui/imageviewer.cpp
@@ -50,7 +50,7 @@ void ImageViewer::setImage(TQImage & image)
void ImageViewer::contentsMousePressEvent(TQMouseEvent *event)
{
- if(Qt::LeftButton == event->button()) {
+ if(TQt::LeftButton == event->button()) {
setCursor(KisCursor::closedHandCursor());
m_currentPos = event->globalPos();
m_isDragging = true;
@@ -59,7 +59,7 @@ void ImageViewer::contentsMousePressEvent(TQMouseEvent *event)
void ImageViewer::contentsMouseReleaseEvent(TQMouseEvent *event)
{
- if(Qt::LeftButton == event->button()) {
+ if(TQt::LeftButton == event->button()) {
setCursor(KisCursor::handCursor());
m_currentPos = event->globalPos();
m_isDragging = false;
diff --git a/chalk/ui/kcurve.cpp b/chalk/ui/kcurve.cpp
index 086bcb55..a69b7846 100644
--- a/chalk/ui/kcurve.cpp
+++ b/chalk/ui/kcurve.cpp
@@ -211,7 +211,7 @@ void KCurve::mousePressEvent ( TQMouseEvent * e )
TQPair<double,double> *closest_point=NULL;
double distance;
- if (e->button() != Qt::LeftButton)
+ if (e->button() != TQt::LeftButton)
return;
double x = e->pos().x() / (float)width();
@@ -288,7 +288,7 @@ void KCurve::mouseReleaseEvent ( TQMouseEvent * e )
{
if (m_readOnlyMode) return;
- if (e->button() != Qt::LeftButton)
+ if (e->button() != TQt::LeftButton)
return;
setCursor( KCursor::arrowCursor() );
diff --git a/chalk/ui/kis_canvas.cpp b/chalk/ui/kis_canvas.cpp
index f001c5bd..1128d9f2 100644
--- a/chalk/ui/kis_canvas.cpp
+++ b/chalk/ui/kis_canvas.cpp
@@ -169,16 +169,16 @@ void KisCanvasWidget::widgetGotTabletEvent(TQTabletEvent *e)
double pressure = e->pressure() / 255.0;
if (e->type() == TQEvent::TabletPress) {
- KisButtonPressEvent ke(device, KisPoint(e->pos()), KisPoint(e->globalPos()), pressure, e->xTilt(), e->yTilt(), Qt::LeftButton, Qt::NoButton);
+ KisButtonPressEvent ke(device, KisPoint(e->pos()), KisPoint(e->globalPos()), pressure, e->xTilt(), e->yTilt(), TQt::LeftButton, TQt::NoButton);
translateTabletEvent(&ke);
}
else
if (e->type() == TQEvent::TabletRelease) {
- KisButtonReleaseEvent ke(device, KisPoint(e->pos()), KisPoint(e->globalPos()), pressure, e->xTilt(), e->yTilt(), Qt::LeftButton, Qt::NoButton);
+ KisButtonReleaseEvent ke(device, KisPoint(e->pos()), KisPoint(e->globalPos()), pressure, e->xTilt(), e->yTilt(), TQt::LeftButton, TQt::NoButton);
translateTabletEvent(&ke);
}
else {
- KisMoveEvent ke(device, KisPoint(e->pos()), KisPoint(e->globalPos()), pressure, e->xTilt(), e->yTilt(), Qt::NoButton);
+ KisMoveEvent ke(device, KisPoint(e->pos()), KisPoint(e->globalPos()), pressure, e->xTilt(), e->yTilt(), TQt::NoButton);
translateTabletEvent(&ke);
#ifdef Q_WS_X11
// Fix the problem that when you change from using a tablet device to the mouse,
@@ -263,7 +263,7 @@ void KisCanvasWidget::translateTabletEvent(KisEvent *e)
if (e->type() == KisEvent::ButtonPressEvent || e->type() == KisEvent::ButtonReleaseEvent) {
KisButtonEvent *b = static_cast<KisButtonEvent *>(e);
- if (b->button() == Qt::MidButton || b->button() == Qt::RightButton) {
+ if (b->button() == TQt::MidButton || b->button() == TQt::RightButton) {
if (e->type() == KisEvent::ButtonPressEvent) {
buttonPressEvent(static_cast<KisButtonPressEvent *>(e));
@@ -277,10 +277,10 @@ void KisCanvasWidget::translateTabletEvent(KisEvent *e)
// Use pressure threshold to detect 'left button' press/release
if (e->pressure() >= PRESSURE_THRESHOLD && m_lastPressure < PRESSURE_THRESHOLD) {
- KisButtonPressEvent ke(e->device(), e->pos(), e->globalPos(), e->pressure(), e->xTilt(), e->yTilt(), Qt::LeftButton, e->state());
+ KisButtonPressEvent ke(e->device(), e->pos(), e->globalPos(), e->pressure(), e->xTilt(), e->yTilt(), TQt::LeftButton, e->state());
buttonPressEvent(&ke);
} else if (e->pressure() < PRESSURE_THRESHOLD && m_lastPressure >= PRESSURE_THRESHOLD) {
- KisButtonReleaseEvent ke(e->device(), e->pos(), e->globalPos(), e->pressure(), e->xTilt(), e->yTilt(), Qt::LeftButton, e->state());
+ KisButtonReleaseEvent ke(e->device(), e->pos(), e->globalPos(), e->pressure(), e->xTilt(), e->yTilt(), TQt::LeftButton, e->state());
buttonReleaseEvent(&ke);
} else {
if (!checkThresholdOnly) {
@@ -417,11 +417,11 @@ TQt::ButtonState KisCanvasWidget::translateX11ButtonState(int state)
int buttonState = 0;
if (state & Button1Mask)
- buttonState |= Qt::LeftButton;
+ buttonState |= TQt::LeftButton;
if (state & Button2Mask)
- buttonState |= Qt::MidButton;
+ buttonState |= TQt::MidButton;
if (state & Button3Mask)
- buttonState |= Qt::RightButton;
+ buttonState |= TQt::RightButton;
if (state & ShiftMask)
buttonState |= TQt::ShiftButton;
if (state & ControlMask)
@@ -440,16 +440,16 @@ TQt::ButtonState KisCanvasWidget::translateX11Button(unsigned int X11Button)
switch (X11Button) {
case Button1:
- qtButton = Qt::LeftButton;
+ qtButton = TQt::LeftButton;
break;
case Button2:
- qtButton = Qt::MidButton;
+ qtButton = TQt::MidButton;
break;
case Button3:
- qtButton = Qt::RightButton;
+ qtButton = TQt::RightButton;
break;
default:
- qtButton = Qt::NoButton;
+ qtButton = TQt::NoButton;
}
return qtButton;
@@ -853,7 +853,7 @@ bool KisCanvasWidget::x11Event(XEvent *event, Display *x11Display, WId winId, TQ
int state = translateX11ButtonState(motion.state);
TQPoint pos(motion.x, motion.y);
- TQMouseEvent e(TQEvent::MouseMove, pos, globalPos, Qt::NoButton, state);
+ TQMouseEvent e(TQEvent::MouseMove, pos, globalPos, TQt::NoButton, state);
widgetGotMouseMoveEvent(&e);
}
@@ -911,7 +911,7 @@ bool KisCanvasWidget::x11Event(XEvent *event, Display *x11Display, WId winId, TQ
deviceId = motion->deviceid;
axisData = motion->axis_data;
- button = Qt::NoButton;
+ button = TQt::NoButton;
buttonState = translateX11ButtonState(motion->state);
}
else
diff --git a/chalk/ui/kis_canvas_painter.cpp b/chalk/ui/kis_canvas_painter.cpp
index 9b3666e8..438f990a 100644
--- a/chalk/ui/kis_canvas_painter.cpp
+++ b/chalk/ui/kis_canvas_painter.cpp
@@ -69,7 +69,7 @@ void KisCanvasWidgetPainter::setPen(const TQPen& /*pen*/)
{
}
-void KisCanvasWidgetPainter::setPen(Qt::PenStyle /*penStyle*/)
+void KisCanvasWidgetPainter::setPen(TQt::PenStyle /*penStyle*/)
{
}
@@ -108,12 +108,12 @@ void KisCanvasWidgetPainter::setBackgroundColor(const TQColor& /*color*/)
{
}
-Qt::BGMode KisCanvasWidgetPainter::backgroundMode() const
+TQt::BGMode KisCanvasWidgetPainter::backgroundMode() const
{
- return Qt::TransparentMode;
+ return TQt::TransparentMode;
}
-void KisCanvasWidgetPainter::setBackgroundMode(Qt::BGMode /*bgMode*/)
+void KisCanvasWidgetPainter::setBackgroundMode(TQt::BGMode /*bgMode*/)
{
}
@@ -641,7 +641,7 @@ void KisCanvasPainter::setPen(const TQPen& pen)
}
}
-void KisCanvasPainter::setPen(Qt::PenStyle penStyle)
+void KisCanvasPainter::setPen(TQt::PenStyle penStyle)
{
if (m_canvasWidgetPainter != 0) {
m_canvasWidgetPainter->setPen(penStyle);
@@ -707,15 +707,15 @@ void KisCanvasPainter::setBackgroundColor(const TQColor& color)
}
}
-Qt::BGMode KisCanvasPainter::backgroundMode() const
+TQt::BGMode KisCanvasPainter::backgroundMode() const
{
if (m_canvasWidgetPainter != 0) {
return m_canvasWidgetPainter->backgroundMode();
}
- return Qt::TransparentMode;
+ return TQt::TransparentMode;
}
-void KisCanvasPainter::setBackgroundMode(Qt::BGMode bgMode)
+void KisCanvasPainter::setBackgroundMode(TQt::BGMode bgMode)
{
if (m_canvasWidgetPainter != 0) {
m_canvasWidgetPainter->setBackgroundMode(bgMode);
diff --git a/chalk/ui/kis_canvas_painter.h b/chalk/ui/kis_canvas_painter.h
index a5ad2d84..00a197fd 100644
--- a/chalk/ui/kis_canvas_painter.h
+++ b/chalk/ui/kis_canvas_painter.h
@@ -48,7 +48,7 @@ public:
virtual void setFont(const TQFont&);
virtual const TQPen& pen() const;
virtual void setPen(const TQPen&);
- virtual void setPen(Qt::PenStyle);
+ virtual void setPen(TQt::PenStyle);
virtual void setPen(const TQColor&);
virtual const TQBrush&brush() const;
virtual void setBrush(const TQBrush&);
@@ -58,8 +58,8 @@ public:
virtual const TQColor&backgroundColor() const;
virtual void setBackgroundColor(const TQColor&);
- virtual Qt::BGMode backgroundMode() const;
- virtual void setBackgroundMode(Qt::BGMode);
+ virtual TQt::BGMode backgroundMode() const;
+ virtual void setBackgroundMode(TQt::BGMode);
virtual TQt::RasterOp rasterOp() const;
virtual void setRasterOp(TQt::RasterOp);
virtual const TQPoint&brushOrigin() const;
@@ -211,7 +211,7 @@ public:
void setFont(const TQFont&);
const TQPen& pen() const;
void setPen(const TQPen&);
- void setPen(Qt::PenStyle);
+ void setPen(TQt::PenStyle);
void setPen(const TQColor&);
const TQBrush&brush() const;
void setBrush(const TQBrush&);
@@ -221,8 +221,8 @@ public:
const TQColor&backgroundColor() const;
void setBackgroundColor(const TQColor&);
- Qt::BGMode backgroundMode() const;
- void setBackgroundMode(Qt::BGMode);
+ TQt::BGMode backgroundMode() const;
+ void setBackgroundMode(TQt::BGMode);
TQt::RasterOp rasterOp() const;
void setRasterOp(TQt::RasterOp);
const TQPoint&brushOrigin() const;
diff --git a/chalk/ui/kis_dlg_adjustment_layer.cpp b/chalk/ui/kis_dlg_adjustment_layer.cpp
index 997887f0..34374356 100644
--- a/chalk/ui/kis_dlg_adjustment_layer.cpp
+++ b/chalk/ui/kis_dlg_adjustment_layer.cpp
@@ -97,7 +97,7 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img,
grid->addWidget(m_preview, 1, 1);
m_configWidgetHolder = new TQGroupBox(i18n("Configuration"), page, "currentConfigWidget");
- m_configWidgetHolder->setColumnLayout(0, Qt::Horizontal);
+ m_configWidgetHolder->setColumnLayout(0, TQt::Horizontal);
grid->addWidget(m_configWidgetHolder, 2, 1);
m_labelNoConfigWidget = new TQLabel(i18n("No configuration options are available for this filter"),
diff --git a/chalk/ui/kis_double_widget.cpp b/chalk/ui/kis_double_widget.cpp
index 3325f07b..37f2b862 100644
--- a/chalk/ui/kis_double_widget.cpp
+++ b/chalk/ui/kis_double_widget.cpp
@@ -48,7 +48,7 @@ void KisDoubleWidget::init(double min, double max)
m_spinBox = new KDoubleSpinBox(min, max, 0.05, 0, 2, this, "spinbox");
connect(m_spinBox, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(setSliderValue(double)));
- m_slider = new TQSlider(static_cast<int>(min * 100 + 0.5), static_cast<int>(max * 100 + 0.5), 1, 0, Qt::Horizontal, this, "sld");
+ m_slider = new TQSlider(static_cast<int>(min * 100 + 0.5), static_cast<int>(max * 100 + 0.5), 1, 0, TQt::Horizontal, this, "sld");
connect(m_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(sliderValueChanged(int)));
connect(m_slider, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed()));
connect(m_slider, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased()));
diff --git a/chalk/ui/kis_gradient_slider_widget.cpp b/chalk/ui/kis_gradient_slider_widget.cpp
index 255d3847..939c654e 100644
--- a/chalk/ui/kis_gradient_slider_widget.cpp
+++ b/chalk/ui/kis_gradient_slider_widget.cpp
@@ -109,7 +109,7 @@ void KisGradientSliderWidget::paintEvent ( TQPaintEvent* pe )
void KisGradientSliderWidget::mousePressEvent( TQMouseEvent * e )
{
TQWidget::mousePressEvent( e );
- if( ( e->y() < MARGIN || e->y() > height() - MARGIN ) || ( e->x() < MARGIN || e->x() > width() - MARGIN ) || e-> button() != Qt::LeftButton )
+ if( ( e->y() < MARGIN || e->y() > height() - MARGIN ) || ( e->x() < MARGIN || e->x() > width() - MARGIN ) || e-> button() != TQt::LeftButton )
return;
double t = (double)(e->x() - MARGIN) / (double)(width() - 2 * MARGIN);
KisGradientSegment* segment = 0;
diff --git a/chalk/ui/kis_grid_drawer.cpp b/chalk/ui/kis_grid_drawer.cpp
index f0d0e5f8..a03ad22f 100644
--- a/chalk/ui/kis_grid_drawer.cpp
+++ b/chalk/ui/kis_grid_drawer.cpp
@@ -33,20 +33,20 @@
#include "kis_perspective_grid.h"
#include "kis_perspective_grid_manager.h"
-Qt::PenStyle GridDrawer::gs2style(TQ_UINT32 s)
+TQt::PenStyle GridDrawer::gs2style(TQ_UINT32 s)
{
switch(s)
{
case 1:
- return Qt::DashLine;
+ return TQt::DashLine;
case 2:
- return Qt::DotLine;
+ return TQt::DotLine;
case 3:
- return Qt::DashDotLine;
+ return TQt::DashDotLine;
case 4:
- return Qt::DashDotDotLine;
+ return TQt::DashDotDotLine;
default:
- return Qt::SolidLine;
+ return TQt::SolidLine;
}
}
@@ -166,7 +166,7 @@ OpenGLGridDrawer::~OpenGLGridDrawer()
void OpenGLGridDrawer::setPen(const TQPen& pen)
{
#ifdef HAVE_GL
- Qt::PenStyle penStyle = pen.style();
+ TQt::PenStyle penStyle = pen.style();
if (penStyle == TQt::SolidLine) {
glDisable(GL_LINE_STIPPLE);
diff --git a/chalk/ui/kis_grid_drawer.h b/chalk/ui/kis_grid_drawer.h
index a37fd69e..5a659a97 100644
--- a/chalk/ui/kis_grid_drawer.h
+++ b/chalk/ui/kis_grid_drawer.h
@@ -45,7 +45,7 @@ class GridDrawer {
inline void drawLine(const TQPoint& p1, const TQPoint& p2) { drawLine(p1.x(), p1.y(), p2.x(), p2.y() ); }
inline void drawLine(const KisPoint* p1, const KisPoint* p2) { drawLine( p1->roundTQPoint(), p2->roundTQPoint()); }
private:
- Qt::PenStyle gs2style(TQ_UINT32 s);
+ TQt::PenStyle gs2style(TQ_UINT32 s);
};
class TQPainterGridDrawer : public GridDrawer {
diff --git a/chalk/ui/kis_histogram_view.cpp b/chalk/ui/kis_histogram_view.cpp
index 3b94db61..2f14fa52 100644
--- a/chalk/ui/kis_histogram_view.cpp
+++ b/chalk/ui/kis_histogram_view.cpp
@@ -344,7 +344,7 @@ void KisHistogramView::updateHistogram()
}
void KisHistogramView::mousePressEvent(TQMouseEvent * e) {
- if (e->button() == Qt::RightButton)
+ if (e->button() == TQt::RightButton)
emit rightClicked(e->globalPos());
else
TQLabel::mousePressEvent(e);
diff --git a/chalk/ui/kis_int_spinbox.cpp b/chalk/ui/kis_int_spinbox.cpp
index cb1b6938..9e561287 100644
--- a/chalk/ui/kis_int_spinbox.cpp
+++ b/chalk/ui/kis_int_spinbox.cpp
@@ -85,10 +85,10 @@ void KisIntSpinbox::init(int val)
d->m_numinput->setSuffix("%");
l->addWidget( d->m_numinput );
- d->m_slider = new KisPopupSlider(0, 100, 10, val, Qt::Horizontal, this);
+ d->m_slider = new KisPopupSlider(0, 100, 10, val, TQt::Horizontal, this);
d->m_slider->setFrameStyle(TQFrame::Panel|TQFrame::Raised);
- d->m_arrow = new KArrowButton(this, Qt::DownArrow);
+ d->m_arrow = new KArrowButton(this, TQt::DownArrow);
d->m_arrow->setPopup(d->m_slider);
d->m_arrow->setMaximumHeight( fontMetrics().height() + 4);
d->m_arrow->setEnabled(true); // Why is the arrow still gray?
diff --git a/chalk/ui/kis_int_spinbox.h b/chalk/ui/kis_int_spinbox.h
index 12aa5abb..939312fa 100644
--- a/chalk/ui/kis_int_spinbox.h
+++ b/chalk/ui/kis_int_spinbox.h
@@ -38,7 +38,7 @@ class KisPopupSlider : public TQPopupMenu {
public:
- KisPopupSlider(int minValue, int maxValue, int pageStep, int value, Qt::Orientation orientation, TQWidget * parent, const char * name = 0)
+ KisPopupSlider(int minValue, int maxValue, int pageStep, int value, TQt::Orientation orientation, TQWidget * parent, const char * name = 0)
: TQPopupMenu(parent, name)
{
m_slider = new TQSlider(minValue, maxValue, pageStep, value, orientation, this, name);
diff --git a/chalk/ui/kis_opengl_canvas_painter.cpp b/chalk/ui/kis_opengl_canvas_painter.cpp
index e6551f81..91c4c870 100644
--- a/chalk/ui/kis_opengl_canvas_painter.cpp
+++ b/chalk/ui/kis_opengl_canvas_painter.cpp
@@ -136,7 +136,7 @@ void KisOpenGLCanvasPainter::restore()
glPopMatrix();
}
-void KisOpenGLCanvasPainter::setPenStyle(Qt::PenStyle penStyle)
+void KisOpenGLCanvasPainter::setPenStyle(TQt::PenStyle penStyle)
{
if (penStyle == TQt::SolidLine) {
glDisable(GL_LINE_STIPPLE);
@@ -196,7 +196,7 @@ void KisOpenGLCanvasPainter::setPen(const TQPen& pen)
setPenStyle(pen.style());
}
-void KisOpenGLCanvasPainter::setPen(Qt::PenStyle penStyle)
+void KisOpenGLCanvasPainter::setPen(TQt::PenStyle penStyle)
{
setPenStyle(penStyle);
}
@@ -236,12 +236,12 @@ void KisOpenGLCanvasPainter::setBackgroundColor(const TQColor& /*color*/)
{
}
-Qt::BGMode KisOpenGLCanvasPainter::backgroundMode() const
+TQt::BGMode KisOpenGLCanvasPainter::backgroundMode() const
{
- return Qt::TransparentMode;
+ return TQt::TransparentMode;
}
-void KisOpenGLCanvasPainter::setBackgroundMode(Qt::BGMode /*bgMode*/)
+void KisOpenGLCanvasPainter::setBackgroundMode(TQt::BGMode /*bgMode*/)
{
}
diff --git a/chalk/ui/kis_opengl_canvas_painter.h b/chalk/ui/kis_opengl_canvas_painter.h
index 24f2e2e2..ff7c841c 100644
--- a/chalk/ui/kis_opengl_canvas_painter.h
+++ b/chalk/ui/kis_opengl_canvas_painter.h
@@ -55,7 +55,7 @@ public:
virtual void setFont(const TQFont&);
virtual const TQPen& pen() const;
virtual void setPen(const TQPen&);
- virtual void setPen(Qt::PenStyle);
+ virtual void setPen(TQt::PenStyle);
virtual void setPen(const TQColor&);
virtual const TQBrush&brush() const;
virtual void setBrush(const TQBrush&);
@@ -65,8 +65,8 @@ public:
virtual const TQColor& backgroundColor() const;
virtual void setBackgroundColor(const TQColor&);
- virtual Qt::BGMode backgroundMode() const;
- virtual void setBackgroundMode(Qt::BGMode);
+ virtual TQt::BGMode backgroundMode() const;
+ virtual void setBackgroundMode(TQt::BGMode);
virtual TQt::RasterOp rasterOp() const;
virtual void setRasterOp(TQt::RasterOp);
virtual const TQPoint& brushOrigin() const;
@@ -189,7 +189,7 @@ public:
protected:
void prepareForDrawing();
void updateViewTransformation();
- void setPenStyle(Qt::PenStyle penStyle);
+ void setPenStyle(TQt::PenStyle penStyle);
protected:
TQFont m_defaultFont;
diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.cpp b/chalk/ui/kis_qpaintdevice_canvas_painter.cpp
index e0836bf6..cc598ef2 100644
--- a/chalk/ui/kis_qpaintdevice_canvas_painter.cpp
+++ b/chalk/ui/kis_qpaintdevice_canvas_painter.cpp
@@ -94,7 +94,7 @@ void KisTQPaintDeviceCanvasPainter::setPen(const TQPen& pen)
m_painter.setPen(pen);
}
-void KisTQPaintDeviceCanvasPainter::setPen(Qt::PenStyle penStyle)
+void KisTQPaintDeviceCanvasPainter::setPen(TQt::PenStyle penStyle)
{
m_painter.setPen(penStyle);
}
@@ -139,12 +139,12 @@ void KisTQPaintDeviceCanvasPainter::setBackgroundColor(const TQColor& color)
m_painter.setBackgroundColor(color);
}
-Qt::BGMode KisTQPaintDeviceCanvasPainter::backgroundMode() const
+TQt::BGMode KisTQPaintDeviceCanvasPainter::backgroundMode() const
{
return m_painter.backgroundMode();
}
-void KisTQPaintDeviceCanvasPainter::setBackgroundMode(Qt::BGMode bgMode)
+void KisTQPaintDeviceCanvasPainter::setBackgroundMode(TQt::BGMode bgMode)
{
m_painter.setBackgroundMode(bgMode);
}
diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.h b/chalk/ui/kis_qpaintdevice_canvas_painter.h
index cef260b4..704cbfff 100644
--- a/chalk/ui/kis_qpaintdevice_canvas_painter.h
+++ b/chalk/ui/kis_qpaintdevice_canvas_painter.h
@@ -50,7 +50,7 @@ public:
virtual void setFont(const TQFont&);
virtual const TQPen& pen() const;
virtual void setPen(const TQPen&);
- virtual void setPen(Qt::PenStyle);
+ virtual void setPen(TQt::PenStyle);
virtual void setPen(const TQColor&);
virtual const TQBrush&brush() const;
virtual void setBrush(const TQBrush&);
@@ -60,8 +60,8 @@ public:
virtual const TQColor&backgroundColor() const;
virtual void setBackgroundColor(const TQColor&);
- virtual Qt::BGMode backgroundMode() const;
- virtual void setBackgroundMode(Qt::BGMode);
+ virtual TQt::BGMode backgroundMode() const;
+ virtual void setBackgroundMode(TQt::BGMode);
virtual TQt::RasterOp rasterOp() const;
virtual void setRasterOp(TQt::RasterOp);
virtual const TQPoint&brushOrigin() const;
diff --git a/chalk/ui/kis_ruler.cpp b/chalk/ui/kis_ruler.cpp
index 23426922..dde306d6 100644
--- a/chalk/ui/kis_ruler.cpp
+++ b/chalk/ui/kis_ruler.cpp
@@ -40,7 +40,7 @@ const char *KisRuler::m_nums[] = {
"XX XXXXXX XXX XXX XXXXXX XXX XXXX XXXXX XXXXX XXXX XXX"
};
-KisRuler::KisRuler(Qt::Orientation o, TQWidget *parent, const char *name) : super(parent, name, WRepaintNoErase | WResizeNoErase), m_pixmapNums(m_nums)
+KisRuler::KisRuler(TQt::Orientation o, TQWidget *parent, const char *name) : super(parent, name, WRepaintNoErase | WResizeNoErase), m_pixmapNums(m_nums)
{
setBackgroundMode(NoBackground);
setFrameStyle(Box | Sunken);
@@ -53,7 +53,7 @@ KisRuler::KisRuler(Qt::Orientation o, TQWidget *parent, const char *name) : supe
m_pixmapBuffer = 0;
m_currentPosition = -1;
- if (m_orientation == Qt::Horizontal) {
+ if (m_orientation == TQt::Horizontal) {
setFixedHeight(RULER_THICKNESS);
initMarker(MARKER_WIDTH, MARKER_HEIGHT);
} else {
@@ -89,7 +89,7 @@ void KisRuler::recalculateSize()
m_pixmapBuffer = 0;
}
- if (m_orientation == Qt::Horizontal) {
+ if (m_orientation == TQt::Horizontal) {
w = width();
h = RULER_THICKNESS;
} else {
@@ -129,7 +129,7 @@ void KisRuler::setZoom(double zoom)
void KisRuler::updatePointer(TQ_INT32 x, TQ_INT32 y)
{
if (m_pixmapBuffer) {
- if (m_orientation == Qt::Horizontal) {
+ if (m_orientation == TQt::Horizontal) {
if (m_currentPosition != -1)
repaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT);
@@ -151,7 +151,7 @@ void KisRuler::updatePointer(TQ_INT32 x, TQ_INT32 y)
void KisRuler::updateVisibleArea(TQ_INT32 xpos, TQ_INT32 ypos)
{
- if (m_orientation == Qt::Horizontal)
+ if (m_orientation == TQt::Horizontal)
m_firstVisible = xpos;
else
m_firstVisible = ypos;
@@ -251,7 +251,7 @@ void KisRuler::drawRuler()
TQ_INT32 start = (TQ_INT32)(KoUnit::fromUserValue(m_firstVisible, m_unit) / m_zoom);
TQ_INT32 pos = 0;
- if (m_orientation == Qt::Horizontal) {
+ if (m_orientation == TQt::Horizontal) {
do {
pos = (TQ_INT32)(KoUnit::fromUserValue(start, m_unit) * m_zoom - m_firstVisible);
@@ -322,7 +322,7 @@ void KisRuler::paletteChange(const TQPalette& oldPalette)
void KisRuler::show()
{
- if (m_orientation == Qt::Horizontal) {
+ if (m_orientation == TQt::Horizontal) {
setFixedHeight(RULER_THICKNESS);
initMarker(MARKER_WIDTH, MARKER_HEIGHT);
} else {
@@ -336,7 +336,7 @@ void KisRuler::show()
void KisRuler::hide()
{
/*
- if (m_orientation == Qt::Horizontal)
+ if (m_orientation == TQt::Horizontal)
setFixedHeight(1);
else
setFixedWidth(1);
diff --git a/chalk/ui/kis_ruler.h b/chalk/ui/kis_ruler.h
index d0ee1451..90d61690 100644
--- a/chalk/ui/kis_ruler.h
+++ b/chalk/ui/kis_ruler.h
@@ -38,7 +38,7 @@ class KisRuler : public TQFrame {
typedef TQFrame super;
public:
- KisRuler(Qt::Orientation, TQWidget *parent = 0, const char *name = 0);
+ KisRuler(TQt::Orientation, TQWidget *parent = 0, const char *name = 0);
virtual ~KisRuler();
public:
@@ -65,7 +65,7 @@ protected:
private:
KoUnit::Unit m_unit;
- Qt::Orientation m_orientation;
+ TQt::Orientation m_orientation;
TQ_INT32 m_firstVisible;
TQ_INT32 m_currentPosition;
TQPixmap *m_pixmapBuffer;
diff --git a/chalk/ui/kis_tool_dummy.cpp b/chalk/ui/kis_tool_dummy.cpp
index 759136f4..de4ac080 100644
--- a/chalk/ui/kis_tool_dummy.cpp
+++ b/chalk/ui/kis_tool_dummy.cpp
@@ -54,7 +54,7 @@ void KisToolDummy::update(KisCanvasSubject *subject)
void KisToolDummy::buttonPress(KisButtonPressEvent *e)
{
- if (m_subject && !m_dragging && e->button() == Qt::LeftButton) {
+ if (m_subject && !m_dragging && e->button() == TQt::LeftButton) {
KisCanvasController *controller = m_subject->canvasController();
m_origScrollX = controller->horzValue();
@@ -77,7 +77,7 @@ void KisToolDummy::move(KisMoveEvent *e)
void KisToolDummy::buttonRelease(KisButtonReleaseEvent *e)
{
- if (m_subject && m_dragging && e->button() == Qt::LeftButton) {
+ if (m_subject && m_dragging && e->button() == TQt::LeftButton) {
m_dragging = false;
}
}
diff --git a/chalk/ui/kis_tool_freehand.cpp b/chalk/ui/kis_tool_freehand.cpp
index 74eec406..56821849 100644
--- a/chalk/ui/kis_tool_freehand.cpp
+++ b/chalk/ui/kis_tool_freehand.cpp
@@ -79,7 +79,7 @@ void KisToolFreehand::buttonPress(KisButtonPressEvent *e)
if (!m_currentImage || !m_currentImage->activeDevice()) return;
- if (e->button() == Qt::LeftButton) {
+ if (e->button() == TQt::LeftButton) {
m_currentImage->activeDevice()->lock( true );
kdDebug() << ">>>>>>>>>>>>>>>>>>>Locking paint device\n";
@@ -116,7 +116,7 @@ void KisToolFreehand::buttonPress(KisButtonPressEvent *e)
void KisToolFreehand::buttonRelease(KisButtonReleaseEvent* e)
{
- if (e->button() == Qt::LeftButton && m_mode == PAINT) {
+ if (e->button() == TQt::LeftButton && m_mode == PAINT) {
endPaint();
m_currentImage->activeDevice()->lock( false );
kdDebug() << ">>>>>>>>>>>>>>>>>>>UNLocking paint device\n";
diff --git a/chalk/ui/kis_tool_paint.cpp b/chalk/ui/kis_tool_paint.cpp
index 143bd675..34fc7730 100644
--- a/chalk/ui/kis_tool_paint.cpp
+++ b/chalk/ui/kis_tool_paint.cpp
@@ -94,7 +94,7 @@ void KisToolPaint::move(KisMoveEvent *)
void KisToolPaint::buttonRelease(KisButtonReleaseEvent * e)
{
kdDebug() << "buttonRelease" << endl;
- if(e->button() == Qt::MidButton)
+ if(e->button() == TQt::MidButton)
{
kdDebug() << "switch" << endl;
KisColor bg = m_subject->bgColor();
diff --git a/chalk/ui/kis_view.cpp b/chalk/ui/kis_view.cpp
index 439423c7..2e123f5d 100644
--- a/chalk/ui/kis_view.cpp
+++ b/chalk/ui/kis_view.cpp
@@ -458,10 +458,10 @@ void KisView::setupScrollBars()
{
m_scrollX = 0;
m_scrollY = 0;
- m_vScroll = new TQScrollBar(Qt::Vertical, this);
+ m_vScroll = new TQScrollBar(TQt::Vertical, this);
TQ_CHECK_PTR(m_vScroll);
- m_hScroll = new TQScrollBar(Qt::Horizontal, this);
+ m_hScroll = new TQScrollBar(TQt::Horizontal, this);
TQ_CHECK_PTR(m_hScroll);
m_vScroll->setGeometry(width() - 16, 20, 16, height() - 36);
@@ -474,10 +474,10 @@ void KisView::setupScrollBars()
void KisView::setupRulers()
{
- m_hRuler = new KisRuler(Qt::Horizontal, this);
+ m_hRuler = new KisRuler(TQt::Horizontal, this);
TQ_CHECK_PTR(m_hRuler);
- m_vRuler = new KisRuler(Qt::Vertical, this);
+ m_vRuler = new KisRuler(TQt::Vertical, this);
TQ_CHECK_PTR(m_vRuler);
m_hRuler->setGeometry(20, 0, width() - 20, 20);
@@ -2280,13 +2280,13 @@ void KisView::canvasGotButtonPressEvent(KisButtonPressEvent *e)
// m_lastGuidePoint = mapToScreen(e->pos().floorTQPoint());
// m_currentGuide = 0;
//
-// if ((e->state() & ~TQt::ShiftButton) == Qt::NoButton) {
+// if ((e->state() & ~TQt::ShiftButton) == TQt::NoButton) {
// KisGuideSP gd = mgr->find(static_cast<TQ_INT32>(pt.x() / zoom()), static_cast<TQ_INT32>(pt.y() / zoom()), TQMAX(2.0, 2.0 / zoom()));
//
// if (gd) {
// m_currentGuide = gd;
//
-// if ((e->button() == Qt::RightButton) || ((e->button() & TQt::ShiftButton) == TQt::ShiftButton)) {
+// if ((e->button() == TQt::RightButton) || ((e->button() & TQt::ShiftButton) == TQt::ShiftButton)) {
// if (gd->isSelected())
// mgr->unselect(gd);
// else
@@ -2303,7 +2303,7 @@ void KisView::canvasGotButtonPressEvent(KisButtonPressEvent *e)
// }
// }
// }
- if (e->button() == Qt::RightButton) {
+ if (e->button() == TQt::RightButton) {
TQPopupMenu * m_popup = 0;
if (factory()) {
Q_ASSERT(factory());
@@ -2360,7 +2360,7 @@ void KisView::canvasGotMoveEvent(KisMoveEvent *e)
TQPoint p = mapToScreen(e->pos().floorTQPoint());
KisGuideMgr *mgr = img->guides();
- if (((e->state() & Qt::LeftButton) == Qt::LeftButton) && mgr->hasSelected()) {
+ if (((e->state() & TQt::LeftButton) == TQt::LeftButton) && mgr->hasSelected()) {
eraseGuides();
p -= m_lastGuidePoint;
@@ -3543,7 +3543,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e)
mgr = img->guides();
- if (e->type() == TQEvent::MouseMove && (me->state() & Qt::LeftButton)) {
+ if (e->type() == TQEvent::MouseMove && (me->state() & TQt::LeftButton)) {
bool flag = geometry().contains(pt);
KisGuideSP gd;
@@ -3555,9 +3555,9 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e)
mgr->unselectAll();
if (o == m_vRuler)
- gd = mgr->add((pt.x() - m_vRuler->width() + horzValue()) / zoom(), Qt::Vertical);
+ gd = mgr->add((pt.x() - m_vRuler->width() + horzValue()) / zoom(), TQt::Vertical);
else
- gd = mgr->add((pt.y() - m_hRuler->height() + vertValue()) / zoom(), Qt::Horizontal);
+ gd = mgr->add((pt.y() - m_hRuler->height() + vertValue()) / zoom(), TQt::Horizontal);
m_currentGuide = gd;
mgr->select(gd);
@@ -3582,7 +3582,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e)
paintGuides();
m_currentGuide = 0;
enterEvent(0);
- KisMoveEvent kme(currentInputDevice(), pt, me->globalPos(), PRESSURE_DEFAULT, 0, 0, Qt::NoButton);
+ KisMoveEvent kme(currentInputDevice(), pt, me->globalPos(), PRESSURE_DEFAULT, 0, 0, TQt::NoButton);
canvasGotMoveEvent(&kme);
}
}
diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp
index ee784efa..5cc9799e 100644
--- a/chalk/ui/kobirdeyepanel.cpp
+++ b/chalk/ui/kobirdeyepanel.cpp
@@ -334,7 +334,7 @@ bool KoBirdEyePanel::eventFilter(TQObject* o, TQEvent* ev)
TQMouseEvent* me = (TQMouseEvent*)ev;
TQPoint thumbnailPos = viewToThumbnail(me->pos());
- if (me->button() == Qt::LeftButton) {
+ if (me->button() == TQt::LeftButton) {
handleMousePress(thumbnailPos);
}
@@ -345,7 +345,7 @@ bool KoBirdEyePanel::eventFilter(TQObject* o, TQEvent* ev)
TQMouseEvent* me = (TQMouseEvent*)ev;
- if (me->button() == Qt::LeftButton) {
+ if (me->button() == TQt::LeftButton) {
m_dragging = false;
}
diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp
index c15c6d5e..9bcf12ce 100644
--- a/chalk/ui/layerlist.cpp
+++ b/chalk/ui/layerlist.cpp
@@ -671,7 +671,7 @@ void LayerList::contentsMousePressEvent( TQMouseEvent *e )
else
{
super::contentsMousePressEvent( e );
- if( e->button() == Qt::RightButton )
+ if( e->button() == TQt::RightButton )
showContextMenu();
}
}
@@ -1170,7 +1170,7 @@ TQFontMetrics LayerItem::fontMetrics() const
bool LayerItem::mousePressEvent( TQMouseEvent *e )
{
- if( e->button() == Qt::RightButton )
+ if( e->button() == TQt::RightButton )
{
if ( !(e->state() & TQt::ControlButton) && !(e->state() & TQt::ShiftButton) )
setActive();
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-17 20:13:38 +0000