summaryrefslogtreecommitdiffstats
path: root/kig/misc
diff options
context:
space:
mode:
Diffstat (limited to 'kig/misc')
-rw-r--r--kig/misc/boost_intrusive_pointer.h1
-rw-r--r--kig/misc/guiaction.h2
-rw-r--r--kig/misc/kigfiledialog.h2
-rw-r--r--kig/misc/kiginputdialog.cpp18
-rw-r--r--kig/misc/kiginputdialog.h2
-rw-r--r--kig/misc/kigpainter.cpp20
-rw-r--r--kig/misc/kigpainter.h8
-rw-r--r--kig/misc/object_constructor.cpp16
-rw-r--r--kig/misc/special_constructors.cpp14
9 files changed, 41 insertions, 42 deletions
diff --git a/kig/misc/boost_intrusive_pointer.h b/kig/misc/boost_intrusive_pointer.h
index 1dd2dd81..292a73c9 100644
--- a/kig/misc/boost_intrusive_pointer.h
+++ b/kig/misc/boost_intrusive_pointer.h
@@ -141,7 +141,6 @@ public:
return p_ == 0? 0: &intrusive_ptr::get;
}
- // operator! is a Borland-specific workaround
bool operator! () const
{
return p_ == 0;
diff --git a/kig/misc/guiaction.h b/kig/misc/guiaction.h
index 56ab6f73..7837f6a6 100644
--- a/kig/misc/guiaction.h
+++ b/kig/misc/guiaction.h
@@ -34,7 +34,7 @@ class KigPart;
class KigGUIAction
: public TDEAction
{
- Q_OBJECT
+ TQ_OBJECT
GUIAction* mact;
KigPart& mdoc;
diff --git a/kig/misc/kigfiledialog.h b/kig/misc/kigfiledialog.h
index 14c53a2d..a96b8c81 100644
--- a/kig/misc/kigfiledialog.h
+++ b/kig/misc/kigfiledialog.h
@@ -27,7 +27,7 @@
class KigFileDialog
: public KFileDialog
{
- Q_OBJECT
+ TQ_OBJECT
private:
diff --git a/kig/misc/kiginputdialog.cpp b/kig/misc/kiginputdialog.cpp
index a596c87c..24c659cf 100644
--- a/kig/misc/kiginputdialog.cpp
+++ b/kig/misc/kiginputdialog.cpp
@@ -84,7 +84,7 @@ KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label,
d->m_textEdit = new KTextEdit( frame );
d->m_textEdit->setText( label );
d->m_textEdit->setReadOnly( true );
- d->m_textEdit->setFocusPolicy( TQ_NoFocus );
+ d->m_textEdit->setFocusPolicy( TQWidget::NoFocus );
// d->m_textEdit->setAlignment( d->m_textEdit->alignment() | TQt::WordBreak );
d->m_textEdit->setFrameStyle( TQFrame::NoFrame );
mainlay->addWidget( d->m_textEdit );
@@ -98,8 +98,8 @@ KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label,
}
mainlay->addWidget( d->m_lineEditFirst );
- connect( d->m_lineEditFirst, TQT_SIGNAL(textChanged(const TQString&)),
- this, TQT_SLOT(slotCoordsChanged(const TQString&)) );
+ connect( d->m_lineEditFirst, TQ_SIGNAL(textChanged(const TQString&)),
+ this, TQ_SLOT(slotCoordsChanged(const TQString&)) );
if ( d->m_coord2.valid() )
{
@@ -108,8 +108,8 @@ KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label,
d->m_lineEditSecond->setText( d->m_doc.coordinateSystem().fromScreen( d->m_coord2, d->m_doc ) );
mainlay->addWidget( d->m_lineEditSecond );
- connect( d->m_lineEditSecond, TQT_SIGNAL(textChanged(const TQString&)),
- this, TQT_SLOT(slotCoordsChanged(const TQString&)) );
+ connect( d->m_lineEditSecond, TQ_SIGNAL(textChanged(const TQString&)),
+ this, TQ_SLOT(slotCoordsChanged(const TQString&)) );
deltay += d->m_lineEditSecond->height() + spacingHint();
}
@@ -159,10 +159,10 @@ KigInputDialog::KigInputDialog( TQWidget* parent, const Goniometry& g )
mainlay->addLayout( horlay );
- connect( d->m_lineEditFirst, TQT_SIGNAL(textChanged(const TQString&)),
- this, TQT_SLOT(slotGonioTextChanged(const TQString&)) );
- connect( d->m_comboBox, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotGonioSystemChanged(int)) );
+ connect( d->m_lineEditFirst, TQ_SIGNAL(textChanged(const TQString&)),
+ this, TQ_SLOT(slotGonioTextChanged(const TQString&)) );
+ connect( d->m_comboBox, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotGonioSystemChanged(int)) );
resize( 350, 100 );
diff --git a/kig/misc/kiginputdialog.h b/kig/misc/kiginputdialog.h
index c9f4be7d..ecde4cbd 100644
--- a/kig/misc/kiginputdialog.h
+++ b/kig/misc/kiginputdialog.h
@@ -40,7 +40,7 @@ class KigInputDialogPrivate;
class KigInputDialog
: KDialogBase
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/kig/misc/kigpainter.cpp b/kig/misc/kigpainter.cpp
index 4b3ede2e..cbaf57be 100644
--- a/kig/misc/kigpainter.cpp
+++ b/kig/misc/kigpainter.cpp
@@ -43,10 +43,10 @@ KigPainter::KigPainter( const ScreenInfo& si, TQPaintDevice* device,
const KigDocument& doc, bool no )
: mP ( device ),
color( TQt::blue ),
- style( Qt::SolidLine ),
+ style( TQt::SolidLine ),
pointstyle( 0 ),
width( -1 ),
- brushStyle( Qt::NoBrush ),
+ brushStyle( TQt::NoBrush ),
brushColor( TQt::blue ),
mdoc( doc ),
msi( si ),
@@ -101,7 +101,7 @@ void KigPainter::drawFatPoint( const Coordinate& p )
case 0:
{
double radius = twidth * pixelWidth();
- setBrushStyle( Qt::SolidPattern );
+ setBrushStyle( TQt::SolidPattern );
Coordinate rad( radius, radius );
rad /= 2;
Coordinate tl = p - rad;
@@ -115,7 +115,7 @@ void KigPainter::drawFatPoint( const Coordinate& p )
case 1:
{
double radius = twidth * pixelWidth();
- setBrushStyle( Qt::NoBrush );
+ setBrushStyle( TQt::NoBrush );
Coordinate rad( radius, radius );
rad /= 2;
Coordinate tl = p - rad;
@@ -218,7 +218,7 @@ void KigPainter::setColor( const TQColor& c )
mP.setPen( TQPen( color, width == -1 ? 1 : width, style ) );
}
-void KigPainter::setStyle( const Qt::PenStyle c )
+void KigPainter::setStyle( const TQt::PenStyle c )
{
style = c;
mP.setPen( TQPen( color, width == -1 ? 1 : width, style ) );
@@ -251,7 +251,7 @@ void KigPainter::setBrush( const TQBrush& b )
mP.setBrush( b );
}
-void KigPainter::setBrushStyle( const Qt::BrushStyle c )
+void KigPainter::setBrushStyle( const TQt::BrushStyle c )
{
brushStyle = c;
mP.setBrush( TQBrush( brushColor, brushStyle ) );
@@ -291,7 +291,7 @@ void KigPainter::drawPolygon( const std::vector<TQPoint>& pts,
TQPen oldpen = mP.pen();
TQBrush oldbrush = mP.brush();
setBrush( TQBrush( color, Dense4Pattern ) );
- setPen( Qt::NoPen );
+ setPen( TQt::NoPen );
// i know this isn't really fast, but i blame it all on TQt with its
// stupid container classes... what's wrong with the STL ?
TQPointArray t( pts.size() );
@@ -314,7 +314,7 @@ void KigPainter::drawArea( const std::vector<Coordinate>& pts, bool border )
if ( border )
setPen( TQPen( color, width == -1 ? 1 : width ) );
else
- setPen( Qt::NoPen );
+ setPen( TQt::NoPen );
TQPointArray t( pts.size() );
int c = 0;
for( std::vector<Coordinate>::const_iterator i = pts.begin(); i != pts.end(); ++i )
@@ -512,7 +512,7 @@ void KigPainter::drawTextStd( const TQPoint& p, const TQString& s )
int tf = AlignLeft | AlignTop | DontClip | WordBreak;
// we need the rect where we're going to paint text
setPen(TQPen(TQt::blue, 1, SolidLine));
- setBrush(Qt::NoBrush);
+ setBrush(TQt::NoBrush);
drawText( Rect(
msi.fromScreen(p), window().bottomRight()
).normalized(), s, tf );
@@ -643,7 +643,7 @@ void KigPainter::drawAngle( const Coordinate& cpoint, const double dstartangle,
// arrow.push_back( end + orthvect + vect );
// arrow.push_back( end + orthvect - vect );
- setBrushStyle( Qt::SolidPattern );
+ setBrushStyle( TQt::SolidPattern );
// drawPolygon( arrow );
mP.drawPolygon( arrow, false, 0, -1 );
diff --git a/kig/misc/kigpainter.h b/kig/misc/kigpainter.h
index ee3b14c1..60ce119f 100644
--- a/kig/misc/kigpainter.h
+++ b/kig/misc/kigpainter.h
@@ -59,10 +59,10 @@ protected:
mutable TQPainter mP;
TQColor color;
- Qt::PenStyle style;
+ TQt::PenStyle style;
int pointstyle;
int width;
- Qt::BrushStyle brushStyle;
+ TQt::BrushStyle brushStyle;
TQColor brushColor;
const KigDocument& mdoc;
@@ -94,7 +94,7 @@ public:
Rect fromScreen( const TQRect& r ) const;
// colors and stuff...
- void setStyle( const Qt::PenStyle c );
+ void setStyle( const TQt::PenStyle c );
void setColor( const TQColor& c );
/**
* setting this to -1 means to use the default width for the object
@@ -103,7 +103,7 @@ public:
void setWidth( const int c );
void setPointStyle( const int p );
void setPen( const TQPen& p );
- void setBrushStyle( const Qt::BrushStyle c );
+ void setBrushStyle( const TQt::BrushStyle c );
void setBrush( const TQBrush& b );
void setBrushColor( const TQColor& c );
diff --git a/kig/misc/object_constructor.cpp b/kig/misc/object_constructor.cpp
index ae2a37d0..6db3d802 100644
--- a/kig/misc/object_constructor.cpp
+++ b/kig/misc/object_constructor.cpp
@@ -101,7 +101,7 @@ void StandardConstructorBase::handlePrelim(
{
assert ( margsparser.check( os ) != ArgsParser::Invalid );
std::vector<ObjectCalcer*> args = margsparser.parse( os );
- p.setBrushStyle( Qt::NoBrush );
+ p.setBrushStyle( TQt::NoBrush );
p.setBrushColor( TQt::red );
p.setPen( TQPen ( TQt::red, 1) );
p.setWidth( -1 ); // -1 means the default width for the object being
@@ -130,7 +130,7 @@ void SimpleObjectTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPai
Args args;
using namespace std;
transform( parents.begin(), parents.end(),
- back_inserter( args ), mem_fun( &ObjectCalcer::imp ) );
+ back_inserter( args ), mem_fn( &ObjectCalcer::imp ) );
ObjectImp* data = mtype->calc( args, doc );
drawer.draw( *data, p, true );
delete data;
@@ -184,7 +184,7 @@ void MultiObjectTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPain
Args args;
using namespace std;
transform( parents.begin(), parents.end(),
- back_inserter( args ), mem_fun( &ObjectCalcer::imp ) );
+ back_inserter( args ), mem_fn( &ObjectCalcer::imp ) );
for ( vector<int>::const_iterator i = mparams.begin(); i != mparams.end(); ++i )
{
@@ -302,7 +302,7 @@ TQString StandardConstructorBase::useText( const ObjectCalcer& o, const std::vec
{
using namespace std;
Args args;
- transform( sel.begin(), sel.end(), back_inserter( args ), mem_fun( &ObjectCalcer::imp ) );
+ transform( sel.begin(), sel.end(), back_inserter( args ), mem_fn( &ObjectCalcer::imp ) );
std::string ret = margsparser.usetext( o.imp(), args );
if ( ret.empty() ) return TQString();
@@ -315,7 +315,7 @@ TQString StandardConstructorBase::selectStatement(
{
using namespace std;
Args args;
- transform( sel.begin(), sel.end(), back_inserter( args ), mem_fun( &ObjectCalcer::imp ) );
+ transform( sel.begin(), sel.end(), back_inserter( args ), mem_fn( &ObjectCalcer::imp ) );
std::string ret = margsparser.selectStatement( args );
if ( ret.empty() ) return TQString();
@@ -419,7 +419,7 @@ TQString MacroConstructor::selectStatement(
using namespace std;
Args args;
transform( sel.begin(), sel.end(), back_inserter( args ),
- mem_fun( &ObjectCalcer::imp ) );
+ mem_fn( &ObjectCalcer::imp ) );
std::string ret = mparser.selectStatement( args );
if ( ret.empty() ) return TQString();
else return i18n( ret.c_str() );
@@ -432,7 +432,7 @@ TQString MacroConstructor::useText( const ObjectCalcer& o, const std::vector<Obj
using namespace std;
Args args;
transform( sel.begin(), sel.end(), back_inserter( args ),
- mem_fun( &ObjectCalcer::imp ) );
+ mem_fn( &ObjectCalcer::imp ) );
std::string ret = mparser.usetext( o.imp(), args );
if ( ret.empty() ) return TQString();
else return i18n( ret.c_str() );
@@ -447,7 +447,7 @@ void MacroConstructor::handlePrelim( KigPainter& p, const std::vector<ObjectCalc
using namespace std;
Args args;
transform( sel.begin(), sel.end(), back_inserter( args ),
- mem_fun( &ObjectCalcer::imp ) );
+ mem_fn( &ObjectCalcer::imp ) );
args = mparser.parse( args );
std::vector<ObjectImp*> ret = mhier.calc( args, doc );
for ( uint i = 0; i < ret.size(); ++i )
diff --git a/kig/misc/special_constructors.cpp b/kig/misc/special_constructors.cpp
index 9618bc90..c8137966 100644
--- a/kig/misc/special_constructors.cpp
+++ b/kig/misc/special_constructors.cpp
@@ -116,7 +116,7 @@ void ConicRadicalConstructor::drawprelim(
{
Args args;
std::transform( parents.begin(), parents.end(),
- std::back_inserter( args ), std::mem_fun( &ObjectCalcer::imp ) );
+ std::back_inserter( args ), std::mem_fn( &ObjectCalcer::imp ) );
for ( int i = -1; i < 2; i += 2 )
{
IntImp root( i );
@@ -349,7 +349,7 @@ void PolygonBNPTypeConstructor::handlePrelim(
}
std::vector<ObjectCalcer*> args = os;
- p.setBrushStyle( Qt::NoBrush );
+ p.setBrushStyle( TQt::NoBrush );
p.setBrushColor( TQt::red );
p.setPen( TQPen ( TQt::red, 1) );
p.setWidth( -1 ); // -1 means the default width for the object being
@@ -658,7 +658,7 @@ void PolygonBCVConstructor::handlePrelim(
args.push_back( ns );
}
- p.setBrushStyle( Qt::NoBrush );
+ p.setBrushStyle( TQt::NoBrush );
p.setBrushColor( TQt::red );
p.setPen( TQPen ( TQt::red, 1) );
p.setWidth( -1 ); // -1 means the default width for the object being
@@ -685,7 +685,7 @@ void PolygonBCVConstructor::handlePrelim(
text = TextImp( TQString( "(%1)" ).arg(i), where, false );
text.draw( p );
}
- p.setStyle( Qt::DotLine );
+ p.setStyle( TQt::DotLine );
p.setWidth( 1 );
double radius = ( v - c ).length();
CircleImp circle = CircleImp( c, radius );
@@ -803,7 +803,7 @@ void PolygonBCVConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter&
Args args;
std::transform( parents.begin(), parents.end(),
- std::back_inserter( args ), std::mem_fun( &ObjectCalcer::imp ) );
+ std::back_inserter( args ), std::mem_fn( &ObjectCalcer::imp ) );
ObjectImp* data = mtype->calc( args, doc );
drawer.draw( *data, p, true );
@@ -1178,7 +1178,7 @@ void MeasureTransportConstructor::handlePrelim(
const KigDocument& d, const KigWidget&
) const
{
- p.setBrushStyle( Qt::NoBrush );
+ p.setBrushStyle( TQt::NoBrush );
p.setBrushColor( TQt::red );
p.setPen( TQPen ( TQt::red, 1) );
p.setWidth( -1 ); // -1 means the default width for the object being
@@ -1196,7 +1196,7 @@ void MeasureTransportConstructor::drawprelim( const ObjectDrawer& drawer,
Args args;
using namespace std;
transform( parents.begin(), parents.end(),
- back_inserter( args ), mem_fun( &ObjectCalcer::imp ) );
+ back_inserter( args ), mem_fn( &ObjectCalcer::imp ) );
ObjectImp* data = mtype->calc( args, doc );
drawer.draw( *data, p, true );
delete data;
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-17 05:11:47 +0000