diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
commit | 96698e12d1d6ba8072e9365334277438c3cf0e4a (patch) | |
tree | 81e81a49226aab2570d5fe8464576a6c960f1782 /kig/scripting | |
parent | dcb06497ea70d050554422eec10b0756d926a5c0 (diff) | |
download | tdeedu-96698e12d1d6ba8072e9365334277438c3cf0e4a.tar.gz tdeedu-96698e12d1d6ba8072e9365334277438c3cf0e4a.zip |
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kig/scripting')
-rw-r--r-- | kig/scripting/newscriptwizardbase.ui | 2 | ||||
-rw-r--r-- | kig/scripting/python_type.cc | 22 | ||||
-rw-r--r-- | kig/scripting/python_type.h | 12 | ||||
-rw-r--r-- | kig/scripting/script_mode.cc | 4 |
4 files changed, 20 insertions, 20 deletions
diff --git a/kig/scripting/newscriptwizardbase.ui b/kig/scripting/newscriptwizardbase.ui index c3020c00..8c58bd2e 100644 --- a/kig/scripting/newscriptwizardbase.ui +++ b/kig/scripting/newscriptwizardbase.ui @@ -74,7 +74,7 @@ in the Kig window and press "Next".</string> </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextedit.h</includehint> </includehints> diff --git a/kig/scripting/python_type.cc b/kig/scripting/python_type.cc index 0b73cda4..cc5a00ea 100644 --- a/kig/scripting/python_type.cc +++ b/kig/scripting/python_type.cc @@ -108,12 +108,12 @@ const ObjectImpType* PythonCompileType::resultId() const return PythonCompiledScriptImp::stype(); } -ObjectImp* PythonCompileType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* PythonCompileType::calc( const Args& parents, const KigDocument& ) const { - assert( tqparents.size() == 1 ); - if ( !tqparents[0]->inherits( StringImp::stype() ) ) return new InvalidImp; + assert( parents.size() == 1 ); + if ( !parents[0]->inherits( StringImp::stype() ) ) return new InvalidImp; - const StringImp* si = static_cast<const StringImp*>( tqparents[0] ); + const StringImp* si = static_cast<const StringImp*>( parents[0] ); TQString s = si->data(); CompiledPythonScript cs = PythonScripter::instance()->compile( s.latin1() ); @@ -141,20 +141,20 @@ const PythonExecuteType* PythonExecuteType::instance() return &t; } -ObjectImp* PythonExecuteType::calc( const Args& tqparents, const KigDocument& d ) const +ObjectImp* PythonExecuteType::calc( const Args& parents, const KigDocument& d ) const { - assert( tqparents.size() >= 1 ); - if( !tqparents[0]->inherits( PythonCompiledScriptImp::stype() ) ) return new InvalidImp; + assert( parents.size() >= 1 ); + if( !parents[0]->inherits( PythonCompiledScriptImp::stype() ) ) return new InvalidImp; - CompiledPythonScript& script = static_cast<const PythonCompiledScriptImp*>( tqparents[0] )->data(); + CompiledPythonScript& script = static_cast<const PythonCompiledScriptImp*>( parents[0] )->data(); - Args args( tqparents.begin() + 1, tqparents.end() ); + Args args( parents.begin() + 1, parents.end() ); return script.calc( args, d ); } -const ObjectImpType* PythonExecuteType::impRequirement( const ObjectImp* o, const Args& tqparents ) const +const ObjectImpType* PythonExecuteType::impRequirement( const ObjectImp* o, const Args& parents ) const { - if ( o == tqparents[0] ) return PythonCompiledScriptImp::stype(); + if ( o == parents[0] ) return PythonCompiledScriptImp::stype(); else return ObjectImp::stype(); } diff --git a/kig/scripting/python_type.h b/kig/scripting/python_type.h index 871cfc17..db623ab6 100644 --- a/kig/scripting/python_type.h +++ b/kig/scripting/python_type.h @@ -28,10 +28,10 @@ class PythonCompileType public: static const PythonCompileType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& d ) const; + ObjectImp* calc( const Args& parents, const KigDocument& d ) const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; const ObjectImpType* resultId() const; std::vector<ObjectCalcer*> sortArgs( const std::vector<ObjectCalcer*>& args ) const; @@ -46,10 +46,10 @@ class PythonExecuteType public: static const PythonExecuteType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& d ) const; + ObjectImp* calc( const Args& parents, const KigDocument& d ) const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; const ObjectImpType* resultId() const; std::vector<ObjectCalcer*> sortArgs( const std::vector<ObjectCalcer*>& args ) const; diff --git a/kig/scripting/script_mode.cc b/kig/scripting/script_mode.cc index 2c6f4d80..945ad62f 100644 --- a/kig/scripting/script_mode.cc +++ b/kig/scripting/script_mode.cc @@ -275,10 +275,10 @@ ScriptEditMode::ScriptEditMode( ObjectTypeCalcer* exec_calc, KigPart& doc ) { mwawd = EnteringCode; - mexecargs = mexecuted->tqparents(); + mexecargs = mexecuted->parents(); assert( mexecargs.size() >= 1 ); - mcompiledargs = mexecargs[0]->tqparents(); + mcompiledargs = mexecargs[0]->parents(); assert( mcompiledargs.size() == 1 ); const ObjectImp* imp = static_cast<ObjectConstCalcer*>( mcompiledargs[0] )->imp(); |