TQt4 port kdeedu

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 10 insertions, 10 deletions

diff --git a/kig/misc/guiaction.cc b/kig/misc/guiaction.cc
index c9435d2b..d17501c2 100644
--- a/kig/misc/guiaction.cc
+++ b/kig/misc/guiaction.cc
@@ -81,19 +81,19 @@ void ConstructibleAction::act( KigPart& d )
 
 KigGUIAction::KigGUIAction( GUIAction* act,
                             KigPart& doc,
-                            TQObject* parent )
+                            TQObject* tqparent )
   : KAction( act->descriptiveName(),
              doc.instance()->iconLoader()->loadIcon(
                act->iconFileName(), KIcon::Toolbar, 0, KIcon::DefaultState, 0L, true ),
              act->shortcut(),
              0, 0,              // no slot connection
-             parent, act->actionName() ),
+             tqparent, act->actionName() ),
   mact( act ),
   mdoc( doc )
 {
   setWhatsThis( act->description() );
   TQString tooltip = act->descriptiveName();
-  tooltip.replace( TQRegExp( "&&" ), "&" );
+  tooltip.tqreplace( TQRegExp( "&&" ), "&" );
   setToolTip( tooltip );
 }
 
@@ -136,7 +136,7 @@ const char* ConstructPointAction::actionName() const
 
 int ConstructPointAction::shortcut() const
 {
-  return Qt::Key_P;
+  return TQt::Key_P;
 }
 
 void ConstructPointAction::act( KigPart& d )
@@ -223,7 +223,7 @@ void AddFixedPointAction::act( KigPart& doc )
   KigInputDialog::getCoordinate(
     i18n( "Fixed Point" ),
     i18n( "Enter the coordinates for the new point." ) +
-    TQString::fromLatin1( "<br>" ) +
+    TQString::tqfromLatin1( "<br>" ) +
     doc.document().coordinateSystem().coordinateFormatNoticeMarkup(),
     doc.widget(), &ok, doc.document(), &c );
   if ( ! ok ) return;
@@ -252,12 +252,12 @@ int ConstructibleAction::shortcut() const
 
 int ConstructTextLabelAction::shortcut() const
 {
-  return Qt::Key_B;
+  return TQt::Key_B;
 }
 
 int AddFixedPointAction::shortcut() const
 {
-  return Qt::Key_F;
+  return TQt::Key_F;
 }
 
 #if 0
@@ -272,7 +272,7 @@ TestAction::~TestAction()
 
 TQString TestAction::description() const
 {
-  return TQString::fromLatin1( "Test stuff !!!" );
+  return TQString::tqfromLatin1( "Test stuff !!!" );
 }
 
 TQCString TestAction::iconFileName() const
@@ -282,7 +282,7 @@ TQCString TestAction::iconFileName() const
 
 TQString TestAction::descriptiveName() const
 {
-  return TQString::fromLatin1( "Test stuff !!!" );
+  return TQString::tqfromLatin1( "Test stuff !!!" );
 }
 
 const char* TestAction::actionName() const
@@ -297,7 +297,7 @@ void TestAction::act( KigPart& doc )
   Object* constantpoint = ObjectFactory::instance()->fixedPoint( Coordinate( -1, -1 ) );
   constantpoint->calc( doc );
 
-  Object* codeobject = new DataObject( new StringImp( TQString::fromLatin1( script ) ) );
+  Object* codeobject = new DataObject( new StringImp( TQString::tqfromLatin1( script ) ) );
   Object* compiledcode = new RealObject( PythonCompileType::instance(), Objects( codeobject ) );
   compiledcode->calc( doc );