1 files changed, 20 insertions, 20 deletions

diff --git a/tdeio/tdeio/ktraderparse.cpp b/tdeio/tdeio/ktraderparse.cpp
index 627791c00..242bd1762 100644
--- a/tdeio/tdeio/ktraderparse.cpp
+++ b/tdeio/tdeio/ktraderparse.cpp
@@ -39,7 +39,7 @@ ParseTreeBase::Ptr TDEIO::parseConstraints( const TQString& _constr )
 {
   TQCString str = _constr.utf8();
   sCode = str.data();
-  KTraderParse_mainParse( sCode );
+  TDETraderParse_mainParse( sCode );
   sCode = 0;
   assert( pTree );
   return *pTree;
@@ -49,13 +49,13 @@ ParseTreeBase::Ptr TDEIO::parsePreferences( const TQString& _prefs )
 {
   TQCString str = _prefs.utf8();
   sCode = str.data();
-  KTraderParse_mainParse( sCode );
+  TDETraderParse_mainParse( sCode );
   sCode = 0;
   assert( pTree );
   return *pTree;
 }
 
-void KTraderParse_setParseTree( void *_ptr1 )
+void TDETraderParse_setParseTree( void *_ptr1 )
 {
   if ( !pTree )
     pTree = new ParseTreeBase::Ptr; // ### leak; should use KStaticDeleter
@@ -63,95 +63,95 @@ void KTraderParse_setParseTree( void *_ptr1 )
 }
 
 
-void KTraderParse_error( const char* err )
+void TDETraderParse_error( const char* err )
 {
   kdWarning(7014) << "Parsing '" << sCode << "' gave " << err << endl;
 }
 
-void* KTraderParse_newOR( void *_ptr1, void *_ptr2 )
+void* TDETraderParse_newOR( void *_ptr1, void *_ptr2 )
 {
   return new ParseTreeOR( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2 );
 }
 
-void* KTraderParse_newAND( void *_ptr1, void *_ptr2 )
+void* TDETraderParse_newAND( void *_ptr1, void *_ptr2 )
 {
   return new ParseTreeAND( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2 );
 }
 
-void* KTraderParse_newCMP( void *_ptr1, void *_ptr2, int _i )
+void* TDETraderParse_newCMP( void *_ptr1, void *_ptr2, int _i )
 {
   return new ParseTreeCMP( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2, _i );
 }
 
-void* KTraderParse_newIN( void *_ptr1, void *_ptr2 )
+void* TDETraderParse_newIN( void *_ptr1, void *_ptr2 )
 {
   return new ParseTreeIN( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2 );
 }
 
-void* KTraderParse_newMATCH( void *_ptr1, void *_ptr2 )
+void* TDETraderParse_newMATCH( void *_ptr1, void *_ptr2 )
 {
   return new ParseTreeMATCH( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2 );
 }
 
-void* KTraderParse_newCALC( void *_ptr1, void *_ptr2, int _i )
+void* TDETraderParse_newCALC( void *_ptr1, void *_ptr2, int _i )
 {
   return new ParseTreeCALC( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2, _i );
 }
 
-void* KTraderParse_newBRACKETS( void *_ptr1 )
+void* TDETraderParse_newBRACKETS( void *_ptr1 )
 {
   return new ParseTreeBRACKETS( (ParseTreeBase*)_ptr1 );
 }
 
-void* KTraderParse_newNOT( void *_ptr1 )
+void* TDETraderParse_newNOT( void *_ptr1 )
 {
   return new ParseTreeNOT( (ParseTreeBase*)_ptr1 );
 }
 
-void* KTraderParse_newEXIST( char *_ptr1 )
+void* TDETraderParse_newEXIST( char *_ptr1 )
 {
   ParseTreeEXIST *t = new ParseTreeEXIST( _ptr1 );
   free(_ptr1);
   return t;
 }
 
-void* KTraderParse_newID( char *_ptr1 )
+void* TDETraderParse_newID( char *_ptr1 )
 {
   ParseTreeID *t = new ParseTreeID( _ptr1 );
   free(_ptr1);
   return t;
 }
 
-void* KTraderParse_newSTRING( char *_ptr1 )
+void* TDETraderParse_newSTRING( char *_ptr1 )
 {
   ParseTreeSTRING *t = new ParseTreeSTRING( _ptr1 );
   free(_ptr1);
   return t;
 }
 
-void* KTraderParse_newNUM( int _i )
+void* TDETraderParse_newNUM( int _i )
 {
   return new ParseTreeNUM( _i );
 }
 
-void* KTraderParse_newFLOAT( float _f )
+void* TDETraderParse_newFLOAT( float _f )
 {
   return new ParseTreeDOUBLE( _f );
 }
 
-void* KTraderParse_newBOOL( char _b )
+void* TDETraderParse_newBOOL( char _b )
 {
   return new ParseTreeBOOL( (bool)_b );
 }
 
-void* KTraderParse_newMAX2( char *_id )
+void* TDETraderParse_newMAX2( char *_id )
 {
   ParseTreeMAX2 *t = new ParseTreeMAX2( _id );
   free(_id);
   return t;
 }
 
-void* KTraderParse_newMIN2( char *_id )
+void* TDETraderParse_newMIN2( char *_id )
 {
   ParseTreeMIN2 *t = new ParseTreeMIN2( _id );
   free(_id);