summaryrefslogtreecommitdiffstats
path: root/kolourpaint/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'kolourpaint/widgets')
-rw-r--r--kolourpaint/widgets/kpcolortoolbar.cpp36
-rw-r--r--kolourpaint/widgets/kpcolortoolbar.h20
-rw-r--r--kolourpaint/widgets/kptooltoolbar.cpp16
-rw-r--r--kolourpaint/widgets/kptooltoolbar.h6
-rw-r--r--kolourpaint/widgets/kptoolwidgetbase.cpp2
-rw-r--r--kolourpaint/widgets/kptoolwidgetfillstyle.cpp12
6 files changed, 46 insertions, 46 deletions
diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp
index 6160c166..b60f70ed 100644
--- a/kolourpaint/widgets/kpcolortoolbar.cpp
+++ b/kolourpaint/widgets/kpcolortoolbar.cpp
@@ -462,7 +462,7 @@ static bool ownColorsInitialised = false;
#define rows 2
#define cols 11
kpColorCells::kpColorCells (TQWidget *parent,
- Qt::Orientation o,
+ TQt::Orientation o,
const char *name)
: KColorCells (parent, rows, cols),
m_mouseButton (-1)
@@ -514,16 +514,16 @@ kpColorCells::~kpColorCells ()
{
}
-Qt::Orientation kpColorCells::orientation () const
+TQt::Orientation kpColorCells::orientation () const
{
return m_orientation;
}
-void kpColorCells::setOrientation (Qt::Orientation o)
+void kpColorCells::setOrientation (TQt::Orientation o)
{
int c, r;
- if (o == Qt::Horizontal)
+ if (o == TQt::Horizontal)
{
c = cols;
r = rows;
@@ -588,7 +588,7 @@ void kpColorCells::setOrientation (Qt::Orientation o)
int y, x;
int pos;
- if (o == Qt::Horizontal)
+ if (o == TQt::Horizontal)
{
y = i / cols;
x = i % cols;
@@ -660,17 +660,17 @@ void kpColorCells::mouseReleaseEvent (TQMouseEvent *e)
TQt::ButtonState button = e->button ();
#if DEBUG_KP_COLOR_TOOL_BAR
kdDebug () << "kpColorCells::mouseReleaseEvent(left="
- << (button & Qt::LeftButton)
+ << (button & TQt::LeftButton)
<< ",right="
- << (button & Qt::RightButton)
+ << (button & TQt::RightButton)
<< ")"
<< endl;
#endif
- if (!((button & Qt::LeftButton) && (button & Qt::RightButton)))
+ if (!((button & TQt::LeftButton) && (button & TQt::RightButton)))
{
- if (button & Qt::LeftButton)
+ if (button & TQt::LeftButton)
m_mouseButton = 0;
- else if (button & Qt::RightButton)
+ else if (button & TQt::RightButton)
m_mouseButton = 1;
}
@@ -785,12 +785,12 @@ void kpTransparentColorCell::mouseReleaseEvent (TQMouseEvent *e)
{
if (rect ().contains (e->pos ()))
{
- if (e->button () == Qt::LeftButton)
+ if (e->button () == TQt::LeftButton)
{
emit transparentColorSelected (0);
emit foregroundColorChanged (kpColor::transparent);
}
- else if (e->button () == Qt::RightButton)
+ else if (e->button () == TQt::RightButton)
{
emit transparentColorSelected (1);
emit backgroundColorChanged (kpColor::transparent);
@@ -819,7 +819,7 @@ void kpTransparentColorCell::drawContents (TQPainter *p)
*/
kpColorPalette::kpColorPalette (TQWidget *parent,
- Qt::Orientation o,
+ TQt::Orientation o,
const char *name)
: TQWidget (parent, name),
m_boxLayout (0)
@@ -849,18 +849,18 @@ kpColorPalette::~kpColorPalette ()
}
// public
-Qt::Orientation kpColorPalette::orientation () const
+TQt::Orientation kpColorPalette::orientation () const
{
return m_orientation;
}
-void kpColorPalette::setOrientation (Qt::Orientation o)
+void kpColorPalette::setOrientation (TQt::Orientation o)
{
m_colorCells->setOrientation (o);
delete m_boxLayout;
- if (o == Qt::Horizontal)
+ if (o == TQt::Horizontal)
{
m_boxLayout = new TQBoxLayout (this, TQBoxLayout::LeftToRight, 0/*margin*/, 5/*spacing*/);
m_boxLayout->addWidget (m_transparentColorCell, 0/*stretch*/, TQt::AlignVCenter);
@@ -997,7 +997,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow,
}
// virtual
-void kpColorToolBar::setOrientation (Qt::Orientation o)
+void kpColorToolBar::setOrientation (TQt::Orientation o)
{
// (TQDockWindow::undock() calls us)
bool isOutsideDock = (place () == TQDockWindow::OutsideDock);
@@ -1014,7 +1014,7 @@ void kpColorToolBar::setOrientation (Qt::Orientation o)
o = m_lastDockedOrientation;
}
- if (o == Qt::Horizontal)
+ if (o == TQt::Horizontal)
{
m_boxLayout->setDirection (TQBoxLayout::LeftToRight);
}
diff --git a/kolourpaint/widgets/kpcolortoolbar.h b/kolourpaint/widgets/kpcolortoolbar.h
index ef3faf3f..d3bff1e3 100644
--- a/kolourpaint/widgets/kpcolortoolbar.h
+++ b/kolourpaint/widgets/kpcolortoolbar.h
@@ -123,12 +123,12 @@ TQ_OBJECT
public:
kpColorCells (TQWidget *parent,
- Qt::Orientation o = Qt::Horizontal,
+ TQt::Orientation o = TQt::Horizontal,
const char *name = 0);
virtual ~kpColorCells ();
- Qt::Orientation orientation () const;
- void setOrientation (Qt::Orientation o);
+ TQt::Orientation orientation () const;
+ void setOrientation (TQt::Orientation o);
signals:
void foregroundColorChanged (const TQColor &color);
@@ -139,7 +139,7 @@ signals:
void backgroundColorChanged (const kpColor &color);
protected:
- Qt::Orientation m_orientation;
+ TQt::Orientation m_orientation;
virtual void dropEvent (TQDropEvent *e);
virtual void paintCell (TQPainter *painter, int row, int col);
@@ -189,19 +189,19 @@ TQ_OBJECT
public:
kpColorPalette (TQWidget *parent,
- Qt::Orientation o = Qt::Horizontal,
+ TQt::Orientation o = TQt::Horizontal,
const char *name = 0);
virtual ~kpColorPalette ();
- Qt::Orientation orientation () const;
- void setOrientation (Qt::Orientation o);
+ TQt::Orientation orientation () const;
+ void setOrientation (TQt::Orientation o);
signals:
void foregroundColorChanged (const kpColor &color);
void backgroundColorChanged (const kpColor &color);
protected:
- Qt::Orientation m_orientation;
+ TQt::Orientation m_orientation;
TQBoxLayout *m_boxLayout;
kpTransparentColorCell *m_transparentColorCell;
@@ -290,9 +290,9 @@ public slots:
private:
kpMainWindow *m_mainWindow;
- Qt::Orientation m_lastDockedOrientation;
+ TQt::Orientation m_lastDockedOrientation;
bool m_lastDockedOrientationSet;
- virtual void setOrientation (Qt::Orientation o);
+ virtual void setOrientation (TQt::Orientation o);
TQBoxLayout *m_boxLayout;
kpDualColorButton *m_dualColorButton;
diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp
index 6e559fa8..dcd79e77 100644
--- a/kolourpaint/widgets/kptooltoolbar.cpp
+++ b/kolourpaint/widgets/kptooltoolbar.cpp
@@ -72,7 +72,7 @@ protected:
// virtual [base TQWidget]
void mouseDoubleClickEvent (TQMouseEvent *e)
{
- if (e->button () == Qt::LeftButton && m_tool)
+ if (e->button () == TQt::LeftButton && m_tool)
m_tool->globalDraw ();
}
@@ -548,11 +548,11 @@ void kpToolToolBar::slotToolActionToolTipChanged ()
// public slot virtual [base TQDockWindow]
-void kpToolToolBar::setOrientation (Qt::Orientation o)
+void kpToolToolBar::setOrientation (TQt::Orientation o)
{
#if DEBUG_KP_TOOL_TOOL_BAR
kdDebug () << "kpToolToolBar::setOrientation("
- << (o == Qt::Vertical ? "vertical" : "horizontal")
+ << (o == TQt::Vertical ? "vertical" : "horizontal")
<< ") called!" << endl;
#endif
@@ -575,7 +575,7 @@ void kpToolToolBar::setOrientation (Qt::Orientation o)
delete m_toolLayout;
delete m_baseLayout;
- if (o == Qt::Vertical)
+ if (o == TQt::Vertical)
{
m_baseLayout = new TQBoxLayout (m_baseWidget, TQBoxLayout::TopToBottom,
5/*margin*/,
@@ -586,7 +586,7 @@ void kpToolToolBar::setOrientation (Qt::Orientation o)
0/*margin*/,
0/*spacing*/);
}
- else // if (o == Qt::Horizontal)
+ else // if (o == TQt::Horizontal)
{
m_baseLayout = new TQBoxLayout (m_baseWidget, TQBoxLayout::LeftToRight,
5/*margin*/,
@@ -616,7 +616,7 @@ void kpToolToolBar::setOrientation (Qt::Orientation o)
{
m_baseLayout->addWidget (*it,
0/*stretch*/,
- o == Qt::Vertical ? TQt::AlignHCenter : TQt::AlignVCenter);
+ o == TQt::Vertical ? TQt::AlignHCenter : TQt::AlignVCenter);
}
}
@@ -624,9 +624,9 @@ void kpToolToolBar::setOrientation (Qt::Orientation o)
}
// private
-void kpToolToolBar::addButton (TQButton *button, Qt::Orientation o, int num)
+void kpToolToolBar::addButton (TQButton *button, TQt::Orientation o, int num)
{
- if (o == Qt::Vertical)
+ if (o == TQt::Vertical)
m_toolLayout->addWidget (button, num / m_vertCols, num % m_vertCols);
else
{
diff --git a/kolourpaint/widgets/kptooltoolbar.h b/kolourpaint/widgets/kptooltoolbar.h
index e556d6cb..ae7de140 100644
--- a/kolourpaint/widgets/kptooltoolbar.h
+++ b/kolourpaint/widgets/kptooltoolbar.h
@@ -100,12 +100,12 @@ private slots:
void slotToolActionToolTipChanged ();
public slots:
- virtual void setOrientation (Qt::Orientation o);
+ virtual void setOrientation (TQt::Orientation o);
private:
- void addButton (TQButton *button, Qt::Orientation o, int num);
+ void addButton (TQButton *button, TQt::Orientation o, int num);
- Qt::Orientation m_lastDockedOrientation;
+ TQt::Orientation m_lastDockedOrientation;
bool m_lastDockedOrientationSet;
int m_vertCols;
diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp
index e70be6db..bb74cafc 100644
--- a/kolourpaint/widgets/kptoolwidgetbase.cpp
+++ b/kolourpaint/widgets/kptoolwidgetbase.cpp
@@ -541,7 +541,7 @@ void kpToolWidgetBase::mousePressEvent (TQMouseEvent *e)
{
e->ignore ();
- if (e->button () != Qt::LeftButton)
+ if (e->button () != TQt::LeftButton)
return;
diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
index d13ae932..9cd5c42d 100644
--- a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
+++ b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
@@ -149,7 +149,7 @@ TQBrush kpToolWidgetFillStyle::maskBrushForFillStyle (FillStyle fs,
switch (fs)
{
case NoFill:
- return Qt::NoBrush;
+ return TQt::NoBrush;
break;
case FillWithBackground:
return TQBrush (backgroundColor.maskColor ());
@@ -158,7 +158,7 @@ TQBrush kpToolWidgetFillStyle::maskBrushForFillStyle (FillStyle fs,
return TQBrush (foregroundColor.maskColor ());
break;
default:
- return Qt::NoBrush;
+ return TQt::NoBrush;
break;
}
}
@@ -182,22 +182,22 @@ TQBrush kpToolWidgetFillStyle::brushForFillStyle (FillStyle fs,
switch (fs)
{
case NoFill:
- return Qt::NoBrush;
+ return TQt::NoBrush;
break;
case FillWithBackground:
if (backgroundColor.isOpaque ())
return TQBrush (backgroundColor.toTQColor ());
else
- return Qt::NoBrush;
+ return TQt::NoBrush;
break;
case FillWithForeground:
if (foregroundColor.isOpaque ())
return TQBrush (foregroundColor.toTQColor ());
else
- return Qt::NoBrush;
+ return TQt::NoBrush;
break;
default:
- return Qt::NoBrush;
+ return TQt::NoBrush;
break;
}
}