summaryrefslogtreecommitdiffstats
path: root/kolourpaint/tools
diff options
context:
space:
mode:
Diffstat (limited to 'kolourpaint/tools')
-rw-r--r--kolourpaint/tools/kptoolautocrop.cpp10
-rw-r--r--kolourpaint/tools/kptoolautocrop.h2
-rw-r--r--kolourpaint/tools/kptoolbrush.cpp2
-rw-r--r--kolourpaint/tools/kptoolpolygon.cpp4
-rw-r--r--kolourpaint/tools/kptoolpolygon.h2
-rw-r--r--kolourpaint/tools/kptoolpreviewdialog.cpp4
-rw-r--r--kolourpaint/tools/kptoolrectangle.cpp2
-rw-r--r--kolourpaint/tools/kptoolrectangle.h4
-rw-r--r--kolourpaint/tools/kptoolresizescale.cpp18
-rw-r--r--kolourpaint/tools/kptoolrotate.cpp2
-rw-r--r--kolourpaint/tools/kptoolskew.cpp2
11 files changed, 26 insertions, 26 deletions
diff --git a/kolourpaint/tools/kptoolautocrop.cpp b/kolourpaint/tools/kptoolautocrop.cpp
index 41aeb398..c294b1d0 100644
--- a/kolourpaint/tools/kptoolautocrop.cpp
+++ b/kolourpaint/tools/kptoolautocrop.cpp
@@ -70,7 +70,7 @@ kpToolAutoCropBorder::kpToolAutoCropBorder (const TQPixmap *pixmapPtr,
: m_pixmapPtr (pixmapPtr),
m_processedColorSimilarity (processedColorSimilarity)
{
- tqinvalidate ();
+ invalidate ();
}
@@ -280,7 +280,7 @@ bool kpToolAutoCropBorder::exists () const
}
// public
-void kpToolAutoCropBorder::tqinvalidate ()
+void kpToolAutoCropBorder::invalidate ()
{
m_rect = TQRect ();
m_referenceColor = kpColor::invalid;
@@ -374,7 +374,7 @@ bool kpToolAutoCrop (kpMainWindow *mainWindow)
// and regression testing.
//
// TODO: e.g. When the top fills entire rect but bot doesn't we could
- // tqinvalidate top and continue autocrop.
+ // invalidate top and continue autocrop.
int numRegions = 0;
if (!leftBorder.calculate (true/*x*/, +1/*going right*/) ||
leftBorder.fillsEntirePixmap () ||
@@ -439,7 +439,7 @@ bool kpToolAutoCrop (kpMainWindow *mainWindow)
#if DEBUG_KP_TOOL_AUTO_CROP
kdDebug () << "\tignoring left border" << endl;
#endif
- leftBorder.tqinvalidate ();
+ leftBorder.invalidate ();
}
}
@@ -454,7 +454,7 @@ bool kpToolAutoCrop (kpMainWindow *mainWindow)
#if DEBUG_KP_TOOL_AUTO_CROP
kdDebug () << "\tignoring top border" << endl;
#endif
- topBorder.tqinvalidate ();
+ topBorder.invalidate ();
}
}
diff --git a/kolourpaint/tools/kptoolautocrop.h b/kolourpaint/tools/kptoolautocrop.h
index 886b4223..bb1a5d4a 100644
--- a/kolourpaint/tools/kptoolautocrop.h
+++ b/kolourpaint/tools/kptoolautocrop.h
@@ -69,7 +69,7 @@ public:
bool fillsEntirePixmap () const;
bool exists () const;
- void tqinvalidate ();
+ void invalidate ();
private:
const TQPixmap *m_pixmapPtr;
diff --git a/kolourpaint/tools/kptoolbrush.cpp b/kolourpaint/tools/kptoolbrush.cpp
index 30c68aee..a5122805 100644
--- a/kolourpaint/tools/kptoolbrush.cpp
+++ b/kolourpaint/tools/kptoolbrush.cpp
@@ -32,7 +32,7 @@
kpToolBrush::kpToolBrush (kpMainWindow *mainWindow)
: kpToolPen (kpToolPen::Brush,
i18n ("Brush"),
- i18n ("Draw using brushes of different tqshapes and sizes"),
+ i18n ("Draw using brushes of different shapes and sizes"),
TQt::Key_B,
mainWindow, "tool_brush")
{
diff --git a/kolourpaint/tools/kptoolpolygon.cpp b/kolourpaint/tools/kptoolpolygon.cpp
index eade158b..158bd339 100644
--- a/kolourpaint/tools/kptoolpolygon.cpp
+++ b/kolourpaint/tools/kptoolpolygon.cpp
@@ -35,7 +35,7 @@
#include <tqbitmap.h>
#include <tqcursor.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpainter.h>
#include <tqpoint.h>
#include <tqpushbutton.h>
@@ -479,7 +479,7 @@ void kpToolPolygon::beginDraw ()
break;
default:
- kdError () << "kpToolPolygon::beginDraw() tqshape" << endl;
+ kdError () << "kpToolPolygon::beginDraw() shape" << endl;
break;
}
}
diff --git a/kolourpaint/tools/kptoolpolygon.h b/kolourpaint/tools/kptoolpolygon.h
index 50129be3..4478157e 100644
--- a/kolourpaint/tools/kptoolpolygon.h
+++ b/kolourpaint/tools/kptoolpolygon.h
@@ -29,7 +29,7 @@
#ifndef __kptoolpolygon_h__
#define __kptoolpolygon_h__
-#include <tqbrush.h>
+#include <brush.h>
#include <tqpen.h>
#include <tqobject.h>
#include <tqpixmap.h>
diff --git a/kolourpaint/tools/kptoolpreviewdialog.cpp b/kolourpaint/tools/kptoolpreviewdialog.cpp
index 2136e02d..6212d7af 100644
--- a/kolourpaint/tools/kptoolpreviewdialog.cpp
+++ b/kolourpaint/tools/kptoolpreviewdialog.cpp
@@ -30,7 +30,7 @@
#include <kptoolpreviewdialog.h>
#include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
@@ -389,7 +389,7 @@ void kpToolPreviewDialog::updatePreview ()
m_previewPixmapLabel->setPixmap (previewPixmap);
// immediate update esp. for expensive previews
- m_previewPixmapLabel->tqrepaint (false/*no erase*/);
+ m_previewPixmapLabel->repaint (false/*no erase*/);
#if DEBUG_KP_TOOL_PREVIEW_DIALOG
kdDebug () << "\tafter TQLabel::setPixmap() previewPixmapLabel: w="
diff --git a/kolourpaint/tools/kptoolrectangle.cpp b/kolourpaint/tools/kptoolrectangle.cpp
index df560ea2..a0699d7b 100644
--- a/kolourpaint/tools/kptoolrectangle.cpp
+++ b/kolourpaint/tools/kptoolrectangle.cpp
@@ -108,7 +108,7 @@ static TQPixmap pixmap (const kpToolRectangle::Mode mode,
if (startPoint != endPoint)
{
#if DEBUG_KP_TOOL_RECTANGLE && 1
- kdDebug () << "\tdraw tqshape" << endl;
+ kdDebug () << "\tdraw shape" << endl;
#endif
// TODO: Rectangle of pen width 1, height 1 and width X is rendered
diff --git a/kolourpaint/tools/kptoolrectangle.h b/kolourpaint/tools/kptoolrectangle.h
index e41b5d47..dc147fc9 100644
--- a/kolourpaint/tools/kptoolrectangle.h
+++ b/kolourpaint/tools/kptoolrectangle.h
@@ -29,7 +29,7 @@
#ifndef __kptoolrectangle_h__
#define __kptoolrectangle_h__
-#include <tqbrush.h>
+#include <brush.h>
#include <tqpen.h>
#include <tqpixmap.h>
#include <tqpoint.h>
@@ -53,7 +53,7 @@ Q_OBJECT
TQ_OBJECT
public:
- // it turns out that these tqshapes are all really the same thing
+ // it turns out that these shapes are all really the same thing
// (same options, same feel) - the only real difference is the
// drawing functions (a one line change)
enum Mode {Rectangle, RoundedRectangle, Ellipse};
diff --git a/kolourpaint/tools/kptoolresizescale.cpp b/kolourpaint/tools/kptoolresizescale.cpp
index 40270e1f..3a59ed75 100644
--- a/kolourpaint/tools/kptoolresizescale.cpp
+++ b/kolourpaint/tools/kptoolresizescale.cpp
@@ -40,7 +40,7 @@
#include <tqgroupbox.h>
#include <tqhbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpoint.h>
#include <tqpointarray.h>
#include <tqpushbutton.h>
@@ -665,17 +665,17 @@ void kpToolResizeScaleDialog::createOperationGroupBox (TQWidget *baseWidget)
// TODO: ALT+R doesn't select the button.
m_resizeButton = new TQToolButton (m_operationGroupBox);
toolButtonSetLook (m_resizeButton,
- TQString::tqfromLatin1 ("resize"),
+ TQString::fromLatin1 ("resize"),
i18n ("&Resize"));
m_scaleButton = new TQToolButton (m_operationGroupBox);
toolButtonSetLook (m_scaleButton,
- TQString::tqfromLatin1 ("scale"),
+ TQString::fromLatin1 ("scale"),
i18n ("&Scale"));
m_smoothScaleButton = new TQToolButton (m_operationGroupBox);
toolButtonSetLook (m_smoothScaleButton,
- TQString::tqfromLatin1 ("smooth_scale"),
+ TQString::fromLatin1 ("smooth_scale"),
i18n ("S&mooth Scale"));
@@ -684,9 +684,9 @@ void kpToolResizeScaleDialog::createOperationGroupBox (TQWidget *baseWidget)
//m_smoothScaleLabel = new TQLabel (i18n ("S&mooth scale"), m_operationGroupBox);
- //m_resizeLabel->tqsetAlignment (m_resizeLabel->tqalignment () | TQt::ShowPrefix);
- //m_scaleLabel->tqsetAlignment (m_scaleLabel->tqalignment () | TQt::ShowPrefix);
- //m_smoothScaleLabel->tqsetAlignment (m_smoothScaleLabel->tqalignment () | TQt::ShowPrefix);
+ //m_resizeLabel->setAlignment (m_resizeLabel->alignment () | TQt::ShowPrefix);
+ //m_scaleLabel->setAlignment (m_scaleLabel->alignment () | TQt::ShowPrefix);
+ //m_smoothScaleLabel->setAlignment (m_smoothScaleLabel->alignment () | TQt::ShowPrefix);
TQButtonGroup *resizeScaleButtonGroup = new TQButtonGroup (baseWidget);
@@ -727,9 +727,9 @@ void kpToolResizeScaleDialog::createDimensionsGroupBox (TQWidget *baseWidget)
m_dimensionsGroupBox = new TQGroupBox (i18n ("Dimensions"), baseWidget);
TQLabel *widthLabel = new TQLabel (i18n ("Width:"), m_dimensionsGroupBox);
- widthLabel->tqsetAlignment (widthLabel->tqalignment () | TQt::AlignHCenter);
+ widthLabel->setAlignment (widthLabel->alignment () | TQt::AlignHCenter);
TQLabel *heightLabel = new TQLabel (i18n ("Height:"), m_dimensionsGroupBox);
- heightLabel->tqsetAlignment (heightLabel->tqalignment () | TQt::AlignHCenter);
+ heightLabel->setAlignment (heightLabel->alignment () | TQt::AlignHCenter);
TQLabel *originalLabel = new TQLabel (i18n ("Original:"), m_dimensionsGroupBox);
m_originalWidthInput = new KIntNumInput (
diff --git a/kolourpaint/tools/kptoolrotate.cpp b/kolourpaint/tools/kptoolrotate.cpp
index 5def33ca..4b015916 100644
--- a/kolourpaint/tools/kptoolrotate.cpp
+++ b/kolourpaint/tools/kptoolrotate.cpp
@@ -34,7 +34,7 @@
#include <tqbuttongroup.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqradiobutton.h>
#include <tqwmatrix.h>
diff --git a/kolourpaint/tools/kptoolskew.cpp b/kolourpaint/tools/kptoolskew.cpp
index eec804d7..e2c0deae 100644
--- a/kolourpaint/tools/kptoolskew.cpp
+++ b/kolourpaint/tools/kptoolskew.cpp
@@ -34,7 +34,7 @@
#include <tqapplication.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqwmatrix.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 04:19:02 +0000