summaryrefslogtreecommitdiffstats
path: root/kig/objects
diff options
context:
space:
mode:
Diffstat (limited to 'kig/objects')
-rw-r--r--kig/objects/object_calcer.cpp14
-rw-r--r--kig/objects/object_drawer.cpp24
-rw-r--r--kig/objects/object_drawer.h10
-rw-r--r--kig/objects/object_factory.cpp2
-rw-r--r--kig/objects/text_type.cpp2
5 files changed, 26 insertions, 26 deletions
diff --git a/kig/objects/object_calcer.cpp b/kig/objects/object_calcer.cpp
index 40545ed1..b15766bc 100644
--- a/kig/objects/object_calcer.cpp
+++ b/kig/objects/object_calcer.cpp
@@ -31,7 +31,7 @@ void ObjectTypeCalcer::calc( const KigDocument& doc )
Args a;
a.reserve( mparents.size() );
std::transform( mparents.begin(), mparents.end(),
- std::back_inserter( a ), std::mem_fun( &ObjectCalcer::imp ) );
+ std::back_inserter( a ), std::mem_fn( &ObjectCalcer::imp ) );
ObjectImp* n = mtype->calc( a, doc );
delete mimp;
mimp = n;
@@ -42,7 +42,7 @@ ObjectTypeCalcer::ObjectTypeCalcer( const ObjectType* type,
: mparents( ( sort )?type->sortArgs( parents ):parents ), mtype( type ), mimp( 0 )
{
std::for_each( mparents.begin(), mparents.end(),
- std::bind2nd( std::mem_fun( &ObjectCalcer::addChild ), this ) );
+ std::bind( std::mem_fn( &ObjectCalcer::addChild ), std::placeholders::_1, this ) );
}
ObjectCalcer::~ObjectCalcer()
@@ -122,7 +122,7 @@ void ObjectCalcer::delChild( ObjectCalcer* c )
ObjectTypeCalcer::~ObjectTypeCalcer()
{
std::for_each( mparents.begin(), mparents.end(),
- std::bind2nd( std::mem_fun( &ObjectCalcer::delChild ), this ) );
+ std::bind( std::mem_fn( &ObjectCalcer::delChild ), std::placeholders::_1, this ) );
delete mimp;
}
@@ -201,7 +201,7 @@ const ObjectImpType* ObjectTypeCalcer::impRequirement(
std::transform(
os.begin(), os.end(),
std::back_inserter( args ),
- std::mem_fun( &ObjectCalcer::imp ) );
+ std::mem_fn( &ObjectCalcer::imp ) );
assert( std::find( args.begin(), args.end(), o->imp() ) != args.end() );
return mtype->impRequirement( o->imp(), args );
}
@@ -219,9 +219,9 @@ void ObjectConstCalcer::setImp( ObjectImp* newimp )
void ObjectTypeCalcer::setParents( const std::vector<ObjectCalcer*> np )
{
std::for_each( np.begin(), np.end(),
- std::bind2nd( std::mem_fun( &ObjectCalcer::addChild ), this ) );
+ std::bind( std::mem_fn( &ObjectCalcer::addChild ), std::placeholders::_1, this ) );
std::for_each( mparents.begin(), mparents.end(),
- std::bind2nd( std::mem_fun( &ObjectCalcer::delChild ), this ) );
+ std::bind( std::mem_fn( &ObjectCalcer::delChild ), std::placeholders::_1, this ) );
mparents = np;
}
@@ -314,7 +314,7 @@ bool ObjectTypeCalcer::isDefinedOnOrThrough( const ObjectCalcer* o ) const
std::transform(
mparents.begin(), mparents.end(),
std::back_inserter( args ),
- std::mem_fun( &ObjectCalcer::imp ) );
+ std::mem_fn( &ObjectCalcer::imp ) );
if ( std::find( args.begin(), args.end(), o->imp() ) == args.end() )
return false;
diff --git a/kig/objects/object_drawer.cpp b/kig/objects/object_drawer.cpp
index d6e41144..f1541f66 100644
--- a/kig/objects/object_drawer.cpp
+++ b/kig/objects/object_drawer.cpp
@@ -31,7 +31,7 @@ void ObjectDrawer::draw( const ObjectImp& imp, KigPainter& p, bool sel ) const
bool nv = p.getNightVision( );
if ( mshown || nv )
{
- p.setBrushStyle( Qt::NoBrush );
+ p.setBrushStyle( TQt::NoBrush );
p.setBrushColor( sel ? TQt::red : ( mshown?mcolor:TQt::gray ) );
p.setPen( TQPen ( sel ? TQt::red : ( mshown?mcolor:TQt::gray ), 1) );
p.setWidth( mwidth );
@@ -90,7 +90,7 @@ ObjectDrawer* ObjectDrawer::getCopyWidth( int w ) const
return ret;
}
-ObjectDrawer* ObjectDrawer::getCopyStyle( Qt::PenStyle s ) const
+ObjectDrawer* ObjectDrawer::getCopyStyle( TQt::PenStyle s ) const
{
ObjectDrawer* ret = new ObjectDrawer;
ret->mcolor = mcolor;
@@ -117,7 +117,7 @@ int ObjectDrawer::width() const
return mwidth;
}
-Qt::PenStyle ObjectDrawer::style() const
+TQt::PenStyle ObjectDrawer::style() const
{
return mstyle;
}
@@ -127,13 +127,13 @@ int ObjectDrawer::pointStyle() const
return mpointstyle;
}
-ObjectDrawer::ObjectDrawer( const TQColor& color, int width, bool shown, Qt::PenStyle style, int pointStyle )
+ObjectDrawer::ObjectDrawer( const TQColor& color, int width, bool shown, TQt::PenStyle style, int pointStyle )
: mcolor( color ), mshown( shown ), mwidth( width ), mstyle( style ), mpointstyle( pointStyle )
{
}
ObjectDrawer::ObjectDrawer()
- : mcolor( TQt::blue ), mshown( true ), mwidth( -1 ), mstyle( Qt::SolidLine ), mpointstyle( 0 )
+ : mcolor( TQt::blue ), mshown( true ), mwidth( -1 ), mstyle( TQt::SolidLine ), mpointstyle( 0 )
{
}
@@ -173,19 +173,19 @@ TQString ObjectDrawer::pointStyleToString() const
return TQString();
}
-Qt::PenStyle ObjectDrawer::styleFromString( const TQString& style )
+TQt::PenStyle ObjectDrawer::styleFromString( const TQString& style )
{
if ( style == "SolidLine" )
- return Qt::SolidLine;
+ return TQt::SolidLine;
else if ( style == "DashLine" )
- return Qt::DashLine;
+ return TQt::DashLine;
else if ( style == "DotLine" )
- return Qt::DotLine;
+ return TQt::DotLine;
else if ( style == "DashDotLine" )
- return Qt::DashDotLine;
+ return TQt::DashDotLine;
else if ( style == "DashDotDotLine" )
- return Qt::DashDotDotLine;
- else return Qt::SolidLine;
+ return TQt::DashDotDotLine;
+ else return TQt::SolidLine;
}
TQString ObjectDrawer::styleToString() const
diff --git a/kig/objects/object_drawer.h b/kig/objects/object_drawer.h
index cbd1374a..b5336a06 100644
--- a/kig/objects/object_drawer.h
+++ b/kig/objects/object_drawer.h
@@ -48,7 +48,7 @@ class ObjectDrawer
TQColor mcolor;
bool mshown;
int mwidth;
- Qt::PenStyle mstyle;
+ TQt::PenStyle mstyle;
int mpointstyle;
public:
/**
@@ -57,7 +57,7 @@ public:
* and pointstyle ( 0 )
*/
ObjectDrawer();
- ObjectDrawer( const TQColor& color, int width = -1, bool shown = true, Qt::PenStyle = Qt::SolidLine, int pointStyle = 0 );
+ ObjectDrawer( const TQColor& color, int width = -1, bool shown = true, TQt::PenStyle = TQt::SolidLine, int pointStyle = 0 );
/**
* Draw the object \p imp on kigpainter \p p . If \p selected is true, it is
* drawn in red, otherwise in its normal color.
@@ -91,7 +91,7 @@ public:
/**
* return PenStyle for all objects except points
*/
- Qt::PenStyle style() const;
+ TQt::PenStyle style() const;
/**
* return pointStyle for points
*/
@@ -123,7 +123,7 @@ public:
* returns a new ObjectDrawer that is identical to this one.. except
* that the PenStyle state is set to \p s ..
*/
- ObjectDrawer* getCopyStyle( Qt::PenStyle s ) const;
+ ObjectDrawer* getCopyStyle( TQt::PenStyle s ) const;
/**
* returns a new ObjectDrawer that is identical to this one.. except
* that the pointStyle state is set to \p p ..
@@ -140,7 +140,7 @@ public:
* given \p style string is unknown. In that case it returns a default
* value.
*/
- static Qt::PenStyle styleFromString( const TQString& style );
+ static TQt::PenStyle styleFromString( const TQString& style );
};
#endif
diff --git a/kig/objects/object_factory.cpp b/kig/objects/object_factory.cpp
index bf333094..7235e834 100644
--- a/kig/objects/object_factory.cpp
+++ b/kig/objects/object_factory.cpp
@@ -296,7 +296,7 @@ void ObjectFactory::redefinePoint(
std::vector<ObjectCalcer*> os;
ObjectCalcer* (ObjectHolder::*calcmeth)() = &ObjectHolder::calcer;
std::transform( hos.begin(), hos.end(), std::back_inserter( os ),
- std::mem_fun( calcmeth ) );
+ std::mem_fn( calcmeth ) );
ObjectCalcer* v = 0;
// we don't want one of our children as a parent...
diff --git a/kig/objects/text_type.cpp b/kig/objects/text_type.cpp
index c82c2047..05d564ff 100644
--- a/kig/objects/text_type.cpp
+++ b/kig/objects/text_type.cpp
@@ -144,7 +144,7 @@ void TextType::executeAction( int i, ObjectHolder& o, ObjectTypeCalcer& c,
if ( i == 0 )
{
- TQClipboard* cb = kapp->clipboard();
+ TQClipboard* cb = tdeApp->clipboard();
// copy the text into the clipboard
const TextImp* ti = static_cast<const TextImp*>( c.imp() );
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-17 20:29:11 +0000