summaryrefslogtreecommitdiffstats
path: root/src/drawparts
diff options
context:
space:
mode:
Diffstat (limited to 'src/drawparts')
-rw-r--r--src/drawparts/dpline.cpp64
-rw-r--r--src/drawparts/dpline.h4
-rw-r--r--src/drawparts/dptext.cpp24
-rw-r--r--src/drawparts/dptext.h12
-rw-r--r--src/drawparts/drawpart.cpp38
-rw-r--r--src/drawparts/drawpart.h26
-rw-r--r--src/drawparts/solidshape.cpp48
-rw-r--r--src/drawparts/solidshape.h8
8 files changed, 112 insertions, 112 deletions
diff --git a/src/drawparts/dpline.cpp b/src/drawparts/dpline.cpp
index 59fa789..4d17b01 100644
--- a/src/drawparts/dpline.cpp
+++ b/src/drawparts/dpline.cpp
@@ -16,7 +16,7 @@
#include <cmath>
#include <kiconloader.h>
#include <klocale.h>
-#include <qpainter.h>
+#include <tqpainter.h>
//BEGIN class DPLine
@@ -28,7 +28,7 @@ Item* DPLine::construct( ItemDocument *itemDocument, bool newItem, const char *i
LibraryItem* DPLine::libraryItem()
{
return new LibraryItem(
- QString("dp/line"),
+ TQString("dp/line"),
i18n("Line"),
i18n("Other"),
KGlobal::iconLoader()->loadIcon( "text", KIcon::Small ),
@@ -45,7 +45,7 @@ DPLine::DPLine( ItemDocument *itemDocument, bool newItem, const char *id )
createProperty( "line-color", Variant::Type::Color );
property("line-color")->setCaption( i18n("Line Color") );
- property("line-color")->setValue(Qt::black);
+ property("line-color")->setValue(TQt::black);
createProperty( "line-width", Variant::Type::Int );
property("line-width")->setCaption( i18n("Line Width") );
@@ -80,7 +80,7 @@ void DPLine::setSelected( bool yes )
void DPLine::dataChanged()
{
- setPen( QPen( dataColor("line-color"),
+ setPen( TQPen( dataColor("line-color"),
unsigned( dataInt("line-width") ),
getDataPenStyle("line-style"),
getDataPenCapStyle("cap-style"),
@@ -98,44 +98,44 @@ void DPLine::postResize()
int x2 = x1+width();
int y2 = y1+height();
- QPointArray p(4);
+ TQPointArray p(4);
int pw = pen().width();
- int dx = QABS(x1-x2);
- int dy = QABS(y1-y2);
+ int dx = TQABS(x1-x2);
+ int dy = TQABS(y1-y2);
pw = pw*4/3+2; // approx pw*sqrt(2)
int px = x1<x2 ? -pw : pw ;
int py = y1<y2 ? -pw : pw ;
if ( dx && dy && (dx > dy ? (dx*2/dy <= 2) : (dy*2/dx <= 2)) ) {
// steep
if ( px == py ) {
- p[0] = QPoint(x1 ,y1+py);
- p[1] = QPoint(x2-px,y2 );
- p[2] = QPoint(x2 ,y2-py);
- p[3] = QPoint(x1+px,y1 );
+ p[0] = TQPoint(x1 ,y1+py);
+ p[1] = TQPoint(x2-px,y2 );
+ p[2] = TQPoint(x2 ,y2-py);
+ p[3] = TQPoint(x1+px,y1 );
} else {
- p[0] = QPoint(x1+px,y1 );
- p[1] = QPoint(x2 ,y2-py);
- p[2] = QPoint(x2-px,y2 );
- p[3] = QPoint(x1 ,y1+py);
+ p[0] = TQPoint(x1+px,y1 );
+ p[1] = TQPoint(x2 ,y2-py);
+ p[2] = TQPoint(x2-px,y2 );
+ p[3] = TQPoint(x1 ,y1+py);
}
} else if ( dx > dy ) {
// horizontal
- p[0] = QPoint(x1+px,y1+py);
- p[1] = QPoint(x2-px,y2+py);
- p[2] = QPoint(x2-px,y2-py);
- p[3] = QPoint(x1+px,y1-py);
+ p[0] = TQPoint(x1+px,y1+py);
+ p[1] = TQPoint(x2-px,y2+py);
+ p[2] = TQPoint(x2-px,y2-py);
+ p[3] = TQPoint(x1+px,y1-py);
} else {
// vertical
- p[0] = QPoint(x1+px,y1+py);
- p[1] = QPoint(x2+px,y2-py);
- p[2] = QPoint(x2-px,y2-py);
- p[3] = QPoint(x1-px,y1+py);
+ p[0] = TQPoint(x1+px,y1+py);
+ p[1] = TQPoint(x2+px,y2-py);
+ p[2] = TQPoint(x2-px,y2-py);
+ p[3] = TQPoint(x1-px,y1+py);
}
setItemPoints( p, false );
}
-void DPLine::drawShape( QPainter & p )
+void DPLine::drawShape( TQPainter & p )
{
int x1 = int(x()+offsetX());
int y1 = int(y()+offsetY());
@@ -156,7 +156,7 @@ Item* DPArrow::construct( ItemDocument *itemDocument, bool newItem, const char *
LibraryItem* DPArrow::libraryItem()
{
return new LibraryItem(
- QString("dp/arrow"),
+ TQString("dp/arrow"),
i18n("Arrow"),
i18n("Other"),
KGlobal::iconLoader()->loadIcon( "text", KIcon::Small ),
@@ -170,7 +170,7 @@ DPArrow::DPArrow( ItemDocument *itemDocument, bool newItem, const char *id )
m_name = i18n("Arrow");
// We don't want to use the square cap style as it screws up drawing our arrow head
- QStringList allowed = property("cap-style")->allowed();
+ TQStringList allowed = property("cap-style")->allowed();
allowed.remove( DrawPart::penCapStyleToName( Qt::SquareCap ) );
property("cap-style")->setAllowed(allowed);
}
@@ -180,7 +180,7 @@ DPArrow::~DPArrow()
}
-void DPArrow::drawShape( QPainter & p )
+void DPArrow::drawShape( TQPainter & p )
{
int x1 = int(x()+offsetX());
int y1 = int(y()+offsetY());
@@ -210,14 +210,14 @@ void DPArrow::drawShape( QPainter & p )
int y4 = int( y2 + head_length*std::sin( pi + arrow_angle + head_angle ) );
// Draw arrowhead
- QPen pen = p.pen();
+ TQPen pen = p.pen();
pen.setCapStyle( Qt::RoundCap );
p.setPen(pen);
p.setBrush(pen.color());
- QPointArray pa(3);
- pa[0] = QPoint( x2, y2 );
- pa[1] = QPoint( x3, y3 );
- pa[2] = QPoint( x4, y4 );
+ TQPointArray pa(3);
+ pa[0] = TQPoint( x2, y2 );
+ pa[1] = TQPoint( x3, y3 );
+ pa[2] = TQPoint( x4, y4 );
p.drawPolygon(pa);
p.drawPolyline(pa);
// p.drawLine( x2, y2, x3, y3 );
diff --git a/src/drawparts/dpline.h b/src/drawparts/dpline.h
index e47aca8..20e3f9e 100644
--- a/src/drawparts/dpline.h
+++ b/src/drawparts/dpline.h
@@ -32,7 +32,7 @@ class DPLine : public DrawPart
protected:
virtual void postResize();
virtual void dataChanged();
- virtual void drawShape( QPainter &p );
+ virtual void drawShape( TQPainter &p );
LineOverlay * m_pLineOverlay;
};
@@ -50,7 +50,7 @@ class DPArrow : public DPLine
static LibraryItem *libraryItem();
protected:
- virtual void drawShape( QPainter &p );
+ virtual void drawShape( TQPainter &p );
};
#endif
diff --git a/src/drawparts/dptext.cpp b/src/drawparts/dptext.cpp
index ebb239a..e2d1060 100644
--- a/src/drawparts/dptext.cpp
+++ b/src/drawparts/dptext.cpp
@@ -15,7 +15,7 @@
#include <kiconloader.h>
#include <klocale.h>
-#include <qpainter.h>
+#include <tqpainter.h>
Item* DPText::construct( ItemDocument *itemDocument, bool newItem, const char *id )
{
@@ -24,7 +24,7 @@ Item* DPText::construct( ItemDocument *itemDocument, bool newItem, const char *i
LibraryItem* DPText::libraryItem()
{
- QStringList idList;
+ TQStringList idList;
idList << "dp/text" << "dp/canvas_text" << "canvas_text";
return new LibraryItem(
@@ -52,17 +52,17 @@ DPText::DPText( ItemDocument *itemDocument, bool newItem, const char *id )
property("background")->setAdvanced(true);
createProperty( "background-color", Variant::Type::Color );
- property("background-color")->setValue(Qt::white);
+ property("background-color")->setValue(TQt::white);
property("background-color")->setCaption( i18n("Background Color") );
property("background-color")->setAdvanced(true);
createProperty( "frame-color", Variant::Type::Color );
- property("frame-color")->setValue(Qt::black);
+ property("frame-color")->setValue(TQt::black);
property("frame-color")->setCaption( i18n("Frame Color") );
property("frame-color")->setAdvanced(true);
createProperty( "text-color", Variant::Type::Color );
- property("text-color")->setValue(Qt::black);
+ property("text-color")->setValue(TQt::black);
property("text-color")->setCaption( i18n("Text Color") );
}
@@ -93,19 +93,19 @@ void DPText::dataChanged()
void DPText::postResize()
{
- setItemPoints( QPointArray(m_sizeRect), false );
+ setItemPoints( TQPointArray(m_sizeRect), false );
}
-QSize DPText::minimumSize() const
+TQSize DPText::tqminimumSize() const
{
- return QSize( 48, 24 );
+ return TQSize( 48, 24 );
}
-void DPText::drawShape( QPainter &p )
+void DPText::drawShape( TQPainter &p )
{
- QRect bound = m_sizeRect;
+ TQRect bound = m_sizeRect;
bound.setWidth( bound.width()-2 );
bound.setHeight( bound.height()-2 );
bound.moveBy( int(x()+1), int(y()+1) );
@@ -113,7 +113,7 @@ void DPText::drawShape( QPainter &p )
if (b_displayBackground)
{
p.save();
- p.setPen( QPen( m_frameColor, 1, Qt::DotLine) );
+ p.setPen( TQPen( m_frameColor, 1, TQt::DotLine) );
p.setBrush(m_backgroundColor);
p.drawRect(bound);
p.restore();
@@ -128,6 +128,6 @@ void DPText::drawShape( QPainter &p )
p.setPen(m_textColor);
p.setFont( font() );
- p.drawText( bound, (Qt::WordBreak | Qt::AlignHCenter | Qt::AlignVCenter), m_caption );
+ p.drawText( bound, (TQt::WordBreak | TQt::AlignHCenter | TQt::AlignVCenter), m_caption );
}
diff --git a/src/drawparts/dptext.h b/src/drawparts/dptext.h
index a6f5a4a..4cbc821 100644
--- a/src/drawparts/dptext.h
+++ b/src/drawparts/dptext.h
@@ -29,19 +29,19 @@ public:
virtual void setSelected( bool yes );
- virtual QSize minimumSize() const;
+ virtual TQSize tqminimumSize() const;
protected:
virtual void postResize();
private:
- virtual void drawShape( QPainter &p );
+ virtual void drawShape( TQPainter &p );
void dataChanged();
- QString m_caption;
+ TQString m_caption;
bool b_displayBackground;
- QColor m_textColor;
- QColor m_backgroundColor;
- QColor m_frameColor;
+ TQColor m_textColor;
+ TQColor m_backgroundColor;
+ TQColor m_frameColor;
RectangularOverlay *m_rectangularOverlay;
};
diff --git a/src/drawparts/drawpart.cpp b/src/drawparts/drawpart.cpp
index 6d9708d..d16e669 100644
--- a/src/drawparts/drawpart.cpp
+++ b/src/drawparts/drawpart.cpp
@@ -14,7 +14,7 @@
#include "variant.h"
#include <klocale.h>
-#include <qbitarray.h>
+#include <tqbitarray.h>
DrawPart::DrawPart( ItemDocument *itemDocument, bool newItem, const char *id )
: Item( itemDocument, newItem, id )
@@ -34,11 +34,11 @@ int DrawPart::rtti() const
}
-Variant * DrawPart::createProperty( const QString & id, Variant::Type::Value type )
+Variant * DrawPart::createProperty( const TQString & id, Variant::Type::Value type )
{
if ( type == Variant::Type::PenStyle )
{
- QStringList penStyles;
+ TQStringList penStyles;
penStyles << DrawPart::penStyleToName(Qt::SolidLine) << DrawPart::penStyleToName(Qt::DashLine)
<< DrawPart::penStyleToName(Qt::DotLine) << DrawPart::penStyleToName(Qt::DashDotLine)
<< DrawPart::penStyleToName(Qt::DashDotDotLine);
@@ -51,7 +51,7 @@ Variant * DrawPart::createProperty( const QString & id, Variant::Type::Value typ
if ( type == Variant::Type::PenCapStyle )
{
- QStringList penCapStyles;
+ TQStringList penCapStyles;
penCapStyles << DrawPart::penCapStyleToName(Qt::FlatCap) << DrawPart::penCapStyleToName(Qt::SquareCap)
<< DrawPart::penCapStyleToName(Qt::RoundCap);
@@ -65,19 +65,19 @@ Variant * DrawPart::createProperty( const QString & id, Variant::Type::Value typ
}
-Qt::PenStyle DrawPart::getDataPenStyle( const QString & id )
+Qt::PenStyle DrawPart::getDataPenStyle( const TQString & id )
{
return nameToPenStyle( dataString(id) );
}
-Qt::PenCapStyle DrawPart::getDataPenCapStyle( const QString & id )
+Qt::PenCapStyle DrawPart::getDataPenCapStyle( const TQString & id )
{
return nameToPenCapStyle( dataString(id) );
}
-void DrawPart::setDataPenStyle( const QString & id, Qt::PenStyle value )
+void DrawPart::setDataPenStyle( const TQString & id, Qt::PenStyle value )
{
property(id)->setValue( penStyleToName(value) );
}
-void DrawPart::setDataPenCapStyle( const QString & id, Qt::PenCapStyle value )
+void DrawPart::setDataPenCapStyle( const TQString & id, Qt::PenCapStyle value )
{
property(id)->setValue( penCapStyleToName(value) );
}
@@ -127,10 +127,10 @@ void DrawPart::restoreFromItemData( const ItemData &itemData )
{
Item::restoreFromItemData(itemData);
- const QStringMap::const_iterator stringEnd = itemData.dataString.end();
- for ( QStringMap::const_iterator it = itemData.dataString.begin(); it != stringEnd; ++it )
+ const TQStringMap::const_iterator stringEnd = itemData.dataString.end();
+ for ( TQStringMap::const_iterator it = itemData.dataString.begin(); it != stringEnd; ++it )
{
- VariantDataMap::iterator vit = m_variantData.find(it.key());
+ VariantDataMap::iterator vit = m_variantData.tqfind(it.key());
if ( vit == m_variantData.end() )
continue;
@@ -144,7 +144,7 @@ void DrawPart::restoreFromItemData( const ItemData &itemData )
-QString DrawPart::penStyleToID( Qt::PenStyle style )
+TQString DrawPart::penStyleToID( Qt::PenStyle style )
{
switch (style)
{
@@ -165,7 +165,7 @@ QString DrawPart::penStyleToID( Qt::PenStyle style )
return ""; // ?!
}
}
-Qt::PenStyle DrawPart::idToPenStyle( const QString & id )
+Qt::PenStyle DrawPart::idToPenStyle( const TQString & id )
{
if ( id == "NoPen" )
return Qt::NoPen;
@@ -179,7 +179,7 @@ Qt::PenStyle DrawPart::idToPenStyle( const QString & id )
return Qt::DashDotDotLine;
return Qt::SolidLine;
}
-QString DrawPart::penCapStyleToID( Qt::PenCapStyle style )
+TQString DrawPart::penCapStyleToID( Qt::PenCapStyle style )
{
switch (style)
{
@@ -194,7 +194,7 @@ QString DrawPart::penCapStyleToID( Qt::PenCapStyle style )
return ""; // ?!
}
}
-Qt::PenCapStyle DrawPart::idToPenCapStyle( const QString & id )
+Qt::PenCapStyle DrawPart::idToPenCapStyle( const TQString & id )
{
if ( id == "SquareCap" )
return Qt::SquareCap;
@@ -203,7 +203,7 @@ Qt::PenCapStyle DrawPart::idToPenCapStyle( const QString & id )
return Qt::FlatCap;
}
-QString DrawPart::penStyleToName( Qt::PenStyle style )
+TQString DrawPart::penStyleToName( Qt::PenStyle style )
{
switch (style)
{
@@ -224,7 +224,7 @@ QString DrawPart::penStyleToName( Qt::PenStyle style )
return ""; // ?!
}
}
-Qt::PenStyle DrawPart::nameToPenStyle( const QString & name )
+Qt::PenStyle DrawPart::nameToPenStyle( const TQString & name )
{
if ( name == i18n("None") )
return Qt::NoPen;
@@ -238,7 +238,7 @@ Qt::PenStyle DrawPart::nameToPenStyle( const QString & name )
return Qt::DashDotDotLine;
return Qt::SolidLine;
}
-QString DrawPart::penCapStyleToName( Qt::PenCapStyle style )
+TQString DrawPart::penCapStyleToName( Qt::PenCapStyle style )
{
switch (style)
{
@@ -253,7 +253,7 @@ QString DrawPart::penCapStyleToName( Qt::PenCapStyle style )
return ""; // ?!
}
}
-Qt::PenCapStyle DrawPart::nameToPenCapStyle( const QString & name )
+Qt::PenCapStyle DrawPart::nameToPenCapStyle( const TQString & name )
{
if ( name == i18n("Square") )
return Qt::SquareCap;
diff --git a/src/drawparts/drawpart.h b/src/drawparts/drawpart.h
index 8dc9f50..e2b046e 100644
--- a/src/drawparts/drawpart.h
+++ b/src/drawparts/drawpart.h
@@ -41,28 +41,28 @@ class DrawPart : public Item
virtual bool canResize() const { return true; }
- virtual Variant * createProperty( const QString & id, Variant::Type::Value type );
+ virtual Variant * createProperty( const TQString & id, Variant::Type::Value type );
- Qt::PenStyle getDataPenStyle( const QString & id );
- Qt::PenCapStyle getDataPenCapStyle( const QString & id );
+ Qt::PenStyle getDataPenStyle( const TQString & id );
+ Qt::PenCapStyle getDataPenCapStyle( const TQString & id );
- void setDataPenStyle( const QString & id, Qt::PenStyle value );
- void setDataPenCapStyle( const QString & id, Qt::PenCapStyle value );
+ void setDataPenStyle( const TQString & id, Qt::PenStyle value );
+ void setDataPenCapStyle( const TQString & id, Qt::PenCapStyle value );
virtual ItemData itemData() const;
virtual void restoreFromItemData( const ItemData &itemData );
// Convention for following functions: name is i18n'd name of style, id is the english one
- static QString penStyleToID( Qt::PenStyle style );
- static Qt::PenStyle idToPenStyle( const QString & id );
- static QString penCapStyleToID( Qt::PenCapStyle style );
- static Qt::PenCapStyle idToPenCapStyle( const QString & id );
+ static TQString penStyleToID( Qt::PenStyle style );
+ static Qt::PenStyle idToPenStyle( const TQString & id );
+ static TQString penCapStyleToID( Qt::PenCapStyle style );
+ static Qt::PenCapStyle idToPenCapStyle( const TQString & id );
- static QString penStyleToName( Qt::PenStyle style );
- static Qt::PenStyle nameToPenStyle( const QString & name );
- static QString penCapStyleToName( Qt::PenCapStyle style );
- static Qt::PenCapStyle nameToPenCapStyle( const QString & name );
+ static TQString penStyleToName( Qt::PenStyle style );
+ static Qt::PenStyle nameToPenStyle( const TQString & name );
+ static TQString penCapStyleToName( Qt::PenCapStyle style );
+ static Qt::PenCapStyle nameToPenCapStyle( const TQString & name );
};
#endif
diff --git a/src/drawparts/solidshape.cpp b/src/drawparts/solidshape.cpp
index e60efef..1760db9 100644
--- a/src/drawparts/solidshape.cpp
+++ b/src/drawparts/solidshape.cpp
@@ -15,7 +15,7 @@
#include <cmath>
#include <kiconloader.h>
#include <klocale.h>
-#include <qpainter.h>
+#include <tqpainter.h>
//BEGIN class DPRectangle
@@ -27,7 +27,7 @@ Item * DPRectangle::construct( ItemDocument *itemDocument, bool newItem, const c
LibraryItem* DPRectangle::libraryItem()
{
return new LibraryItem(
- QString("dp/rectangle"),
+ TQString("dp/rectangle"),
i18n("Rectangle"),
i18n("Other"),
KGlobal::iconLoader()->loadIcon( "text", KIcon::Small ),
@@ -47,12 +47,12 @@ DPRectangle::DPRectangle( ItemDocument *itemDocument, bool newItem, const char *
property("background")->setAdvanced(true);
createProperty( "background-color", Variant::Type::Color );
- property("background-color")->setValue(Qt::white);
+ property("background-color")->setValue(TQt::white);
property("background-color")->setCaption( i18n("Background Color") );
property("background-color")->setAdvanced(true);
createProperty( "line-color", Variant::Type::Color );
- property("line-color")->setValue(Qt::black);
+ property("line-color")->setValue(TQt::black);
property("line-color")->setCaption( i18n("Line Color") );
property("line-color")->setAdvanced(true);
@@ -85,11 +85,11 @@ void DPRectangle::setSelected( bool yes )
void DPRectangle::dataChanged()
{
bool displayBackground = dataBool("background");
- QColor line_color = dataColor("line-color");
+ TQColor line_color = dataColor("line-color");
unsigned width = unsigned( dataInt("line-width") );
Qt::PenStyle style = getDataPenStyle("line-style");
- setPen( QPen( line_color, width, style ) );
+ setPen( TQPen( line_color, width, style ) );
if (displayBackground)
setBrush( dataColor("background-color") );
@@ -101,10 +101,10 @@ void DPRectangle::dataChanged()
}
-QSize DPRectangle::minimumSize() const
+TQSize DPRectangle::tqminimumSize() const
{
- int side = QMAX(16, pen().width()+2);
- return QSize( side, side );
+ int side = TQMAX(16, pen().width()+2);
+ return TQSize( side, side );
}
@@ -114,7 +114,7 @@ void DPRectangle::postResize()
}
-QRect DPRectangle::drawRect() const
+TQRect DPRectangle::drawRect() const
{
int lw = pen().width();
@@ -124,12 +124,12 @@ QRect DPRectangle::drawRect() const
if ( lw > m_sizeRect.height() )
lw = m_sizeRect.height();
- return QRect( int(x() + m_sizeRect.x()+lw/2), int(y() + m_sizeRect.y()+lw/2),
+ return TQRect( int(x() + m_sizeRect.x()+lw/2), int(y() + m_sizeRect.y()+lw/2),
m_sizeRect.width()-lw, m_sizeRect.height()-lw );
}
-void DPRectangle::drawShape( QPainter & p )
+void DPRectangle::drawShape( TQPainter & p )
{
p.drawRect(drawRect());
}
@@ -145,7 +145,7 @@ Item * DPEllipse::construct( ItemDocument *itemDocument, bool newItem, const cha
LibraryItem* DPEllipse::libraryItem()
{
return new LibraryItem(
- QString("dp/ellipse"),
+ TQString("dp/ellipse"),
i18n("Ellipse"),
i18n("Other"),
KGlobal::iconLoader()->loadIcon( "text", KIcon::Small ),
@@ -166,24 +166,24 @@ DPEllipse::~DPEllipse()
void DPEllipse::postResize()
{
- QRect br = m_sizeRect;
+ TQRect br = m_sizeRect;
// Make octagon that roughly covers ellipse
- QPointArray pa(8);
- pa[0] = QPoint( br.x() + br.width()/4, br.y() );
- pa[1] = QPoint( br.x() + 3*br.width()/4, br.y() );
- pa[2] = QPoint( br.x() + br.width(), br.y() + br.height()/4 );
- pa[3] = QPoint( br.x() + br.width(), br.y() + 3*br.height()/4 );
- pa[4] = QPoint( br.x() + 3*br.width()/4, br.y() + br.height() );
- pa[5] = QPoint( br.x() + br.width()/4, br.y() + br.height() );
- pa[6] = QPoint( br.x(), br.y() + 3*br.height()/4 );
- pa[7] = QPoint( br.x(), br.y() + br.height()/4 );
+ TQPointArray pa(8);
+ pa[0] = TQPoint( br.x() + br.width()/4, br.y() );
+ pa[1] = TQPoint( br.x() + 3*br.width()/4, br.y() );
+ pa[2] = TQPoint( br.x() + br.width(), br.y() + br.height()/4 );
+ pa[3] = TQPoint( br.x() + br.width(), br.y() + 3*br.height()/4 );
+ pa[4] = TQPoint( br.x() + 3*br.width()/4, br.y() + br.height() );
+ pa[5] = TQPoint( br.x() + br.width()/4, br.y() + br.height() );
+ pa[6] = TQPoint( br.x(), br.y() + 3*br.height()/4 );
+ pa[7] = TQPoint( br.x(), br.y() + br.height()/4 );
setItemPoints( pa, false );
}
-void DPEllipse::drawShape( QPainter & p )
+void DPEllipse::drawShape( TQPainter & p )
{
p.drawEllipse(drawRect());
}
diff --git a/src/drawparts/solidshape.h b/src/drawparts/solidshape.h
index 317f417..02bb49e 100644
--- a/src/drawparts/solidshape.h
+++ b/src/drawparts/solidshape.h
@@ -30,16 +30,16 @@ class DPRectangle : public DrawPart
virtual void setSelected( bool yes );
- virtual QSize minimumSize() const;
+ virtual TQSize tqminimumSize() const;
protected:
- virtual void drawShape( QPainter &p );
+ virtual void drawShape( TQPainter &p );
void dataChanged();
virtual void postResize();
/** Returns the rectangle to draw in, taking into account the line
* width */
- QRect drawRect() const;
+ TQRect drawRect() const;
private:
RectangularOverlay *m_pRectangularOverlay;
@@ -62,7 +62,7 @@ class DPEllipse : public DPRectangle
virtual void postResize();
private:
- virtual void drawShape( QPainter &p );
+ virtual void drawShape( TQPainter &p );
};
#endif
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 09:21:53 +0000