1 files changed, 11 insertions, 11 deletions
diff --git a/kig/objects/object_drawer.cc b/kig/objects/object_drawer.cc
index f92fabe7..1fc0f2e0 100644
--- a/kig/objects/object_drawer.cc
+++ b/kig/objects/object_drawer.cc
@@ -32,8 +32,8 @@ void ObjectDrawer::draw( const ObjectImp& imp, KigPainter& p, bool sel ) const
   if ( mshown || nv )
   {
     p.setBrushStyle( Qt::NoBrush );
-    p.setBrushColor( sel ? Qt::red : ( mshown?mcolor:Qt::gray ) );
-    p.setPen( TQPen ( sel ? Qt::red : ( mshown?mcolor:Qt::gray ),  1) );
+    p.setBrushColor( sel ? TQt::red : ( mshown?mcolor:TQt::gray ) );
+    p.setPen( TQPen ( sel ? TQt::red : ( mshown?mcolor:TQt::gray ),  1) );
     p.setWidth( mwidth );
     p.setStyle( mstyle );
     p.setPointStyle( mpointstyle );
@@ -41,10 +41,10 @@ void ObjectDrawer::draw( const ObjectImp& imp, KigPainter& p, bool sel ) const
   }
 }
 
-bool ObjectDrawer::contains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv ) const
+bool ObjectDrawer::tqcontains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv ) const
 {
   bool shownornv = mshown || nv;
-  return shownornv && imp.contains( pt, mwidth, w );
+  return shownornv && imp.tqcontains( pt, mwidth, w );
 }
 
 bool ObjectDrawer::shown( ) const
@@ -133,7 +133,7 @@ ObjectDrawer::ObjectDrawer( const TQColor& color, int width, bool shown, Qt::Pen
 }
 
 ObjectDrawer::ObjectDrawer()
-  : mcolor( Qt::blue ), mshown( true ), mwidth( -1 ), mstyle( Qt::SolidLine ), mpointstyle( 0 )
+  : mcolor( TQt::blue ), mshown( true ), mwidth( -1 ), mstyle( Qt::SolidLine ), mpointstyle( 0 )
 {
 }
 
@@ -170,7 +170,7 @@ TQString ObjectDrawer::pointStyleToString() const
   else if ( mpointstyle == 4 )
     return "Cross";
   assert( false );
-  return TQString::null;
+  return TQString();
 }
 
 Qt::PenStyle ObjectDrawer::styleFromString( const TQString& style )
@@ -190,15 +190,15 @@ Qt::PenStyle ObjectDrawer::styleFromString( const TQString& style )
 
 TQString ObjectDrawer::styleToString() const
 {
-  if ( mstyle == Qt::SolidLine )
+  if ( mstyle == TQt::SolidLine )
     return "SolidLine";
-  else if ( mstyle == Qt::DashLine )
+  else if ( mstyle == TQt::DashLine )
     return "DashLine";
-  else if ( mstyle == Qt::DotLine )
+  else if ( mstyle == TQt::DotLine )
     return "DotLine";
-  else if ( mstyle == Qt::DashDotLine )
+  else if ( mstyle == TQt::DashDotLine )
     return "DashDotLine";
-  else if ( mstyle == Qt::DashDotDotLine )
+  else if ( mstyle == TQt::DashDotDotLine )
     return "DashDotDotLine";
   return "SolidLine";
 }