diff options
Diffstat (limited to 'languages')
104 files changed, 241 insertions, 241 deletions
diff --git a/languages/ada/AdaParser.cpp b/languages/ada/AdaParser.cpp index 3656446e..bea6de16 100644 --- a/languages/ada/AdaParser.cpp +++ b/languages/ada/AdaParser.cpp @@ -1954,10 +1954,10 @@ void AdaParser::value_s() { returnAST = value_s_AST; } -void AdaParser::tqparenth_values() { +void AdaParser::parenth_values() { returnAST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); ANTLR_USE_NAMESPACE(antlr)ASTPair currentAST; - RefAdaAST tqparenth_values_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); + RefAdaAST parenth_values_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); match(LPAREN); value(); @@ -1981,8 +1981,8 @@ void AdaParser::tqparenth_values() { _loop46:; } // ( ... )* match(RPAREN); - tqparenth_values_AST = RefAdaAST(currentAST.root); - returnAST = tqparenth_values_AST; + parenth_values_AST = RefAdaAST(currentAST.root); + returnAST = parenth_values_AST; } void AdaParser::value() { @@ -2869,10 +2869,10 @@ RefAdaAST AdaParser::is_operator() { return d; } -void AdaParser::tqparenthesized_primary() { +void AdaParser::parenthesized_primary() { returnAST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); ANTLR_USE_NAMESPACE(antlr)ASTPair currentAST; - RefAdaAST tqparenthesized_primary_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); + RefAdaAST parenthesized_primary_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); ANTLR_USE_NAMESPACE(antlr)RefToken pp = ANTLR_USE_NAMESPACE(antlr)nullToken; RefAdaAST pp_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); @@ -2913,8 +2913,8 @@ void AdaParser::tqparenthesized_primary() { Set(pp_AST, PARENTHESIZED_PRIMARY); #line 2915 "AdaParser.cpp" } - tqparenthesized_primary_AST = RefAdaAST(currentAST.root); - returnAST = tqparenthesized_primary_AST; + parenthesized_primary_AST = RefAdaAST(currentAST.root); + returnAST = parenthesized_primary_AST; } void AdaParser::extension_opt() { @@ -5643,7 +5643,7 @@ void AdaParser::enumeration_aggregate() { ANTLR_USE_NAMESPACE(antlr)ASTPair currentAST; RefAdaAST enumeration_aggregate_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); - tqparenth_values(); + parenth_values(); if (inputState->guessing==0) { astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST)); } @@ -11401,7 +11401,7 @@ void AdaParser::primary() { } case LPAREN: { - tqparenthesized_primary(); + parenthesized_primary(); if (inputState->guessing==0) { astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST)); } @@ -11623,7 +11623,7 @@ void AdaParser::name_or_qualified() { switch ( LA(1)) { case LPAREN: { - tqparenthesized_primary(); + parenthesized_primary(); if (inputState->guessing==0) { astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST)); } diff --git a/languages/ada/AdaParser.hpp b/languages/ada/AdaParser.hpp index cf9fec9b..0074c820 100644 --- a/languages/ada/AdaParser.hpp +++ b/languages/ada/AdaParser.hpp @@ -97,7 +97,7 @@ public: public: void function_tail(); public: void generic_inst(); public: void value_s(); - public: void tqparenth_values(); + public: void parenth_values(); public: void value(); public: void ranged_expr_s(); public: void ranged_expr(); @@ -115,7 +115,7 @@ public: public: void name(); public: RefAdaAST definable_operator_symbol(); public: RefAdaAST is_operator(); - public: void tqparenthesized_primary(); + public: void parenthesized_primary(); public: void extension_opt(); public: void separate_or_abstract( RefAdaAST t diff --git a/languages/ada/AdaStoreWalker.cpp b/languages/ada/AdaStoreWalker.cpp index 1561277f..a15692b6 100644 --- a/languages/ada/AdaStoreWalker.cpp +++ b/languages/ada/AdaStoreWalker.cpp @@ -3223,8 +3223,8 @@ void AdaStoreWalker::name(RefAdaAST _t) { _retTree = _t; } -void AdaStoreWalker::tqparenthesized_primary(RefAdaAST _t) { - RefAdaAST tqparenthesized_primary_AST_in = (_t == RefAdaAST(ASTNULL)) ? RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; +void AdaStoreWalker::parenthesized_primary(RefAdaAST _t) { + RefAdaAST parenthesized_primary_AST_in = (_t == RefAdaAST(ASTNULL)) ? RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; try { // for error handling RefAdaAST __t129 = _t; @@ -8809,7 +8809,7 @@ void AdaStoreWalker::primary(RefAdaAST _t) { } case PARENTHESIZED_PRIMARY: { - tqparenthesized_primary(_t); + parenthesized_primary(_t); _t = _retTree; break; } @@ -8960,7 +8960,7 @@ void AdaStoreWalker::name_or_qualified(RefAdaAST _t) { switch ( _t->getType()) { case PARENTHESIZED_PRIMARY: { - tqparenthesized_primary(_t); + parenthesized_primary(_t); _t = _retTree; break; } diff --git a/languages/ada/AdaStoreWalker.hpp b/languages/ada/AdaStoreWalker.hpp index bf661ea2..c18f5dcd 100644 --- a/languages/ada/AdaStoreWalker.hpp +++ b/languages/ada/AdaStoreWalker.hpp @@ -185,7 +185,7 @@ public: public: void defining_identifier_list(RefAdaAST _t); public: void init_opt(RefAdaAST _t); public: void name(RefAdaAST _t); - public: void tqparenthesized_primary(RefAdaAST _t); + public: void parenthesized_primary(RefAdaAST _t); public: void extension_opt(RefAdaAST _t); public: void task_type_or_single_decl(RefAdaAST _t); public: void prot_type_or_single_decl(RefAdaAST _t); diff --git a/languages/ada/AdaTreeParserSuper.cpp b/languages/ada/AdaTreeParserSuper.cpp index f6c122b5..76722b3e 100644 --- a/languages/ada/AdaTreeParserSuper.cpp +++ b/languages/ada/AdaTreeParserSuper.cpp @@ -2404,8 +2404,8 @@ void AdaTreeParserSuper::definable_operator_symbol(ANTLR_USE_NAMESPACE(antlr)Ref _retTree = _t; } -void AdaTreeParserSuper::tqparenthesized_primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t) { - ANTLR_USE_NAMESPACE(antlr)RefAST tqparenthesized_primary_AST_in = (_t == ANTLR_USE_NAMESPACE(antlr)RefAST(ASTNULL)) ? ANTLR_USE_NAMESPACE(antlr)nullAST : _t; +void AdaTreeParserSuper::parenthesized_primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t) { + ANTLR_USE_NAMESPACE(antlr)RefAST parenthesized_primary_AST_in = (_t == ANTLR_USE_NAMESPACE(antlr)RefAST(ASTNULL)) ? ANTLR_USE_NAMESPACE(antlr)nullAST : _t; try { // for error handling ANTLR_USE_NAMESPACE(antlr)RefAST __t101 = _t; @@ -8397,7 +8397,7 @@ void AdaTreeParserSuper::primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t) { } case PARENTHESIZED_PRIMARY: { - tqparenthesized_primary(_t); + parenthesized_primary(_t); _t = _retTree; break; } @@ -8548,7 +8548,7 @@ void AdaTreeParserSuper::name_or_qualified(ANTLR_USE_NAMESPACE(antlr)RefAST _t) switch ( _t->getType()) { case PARENTHESIZED_PRIMARY: { - tqparenthesized_primary(_t); + parenthesized_primary(_t); _t = _retTree; break; } diff --git a/languages/ada/AdaTreeParserSuper.hpp b/languages/ada/AdaTreeParserSuper.hpp index 01833993..a4d164f0 100644 --- a/languages/ada/AdaTreeParserSuper.hpp +++ b/languages/ada/AdaTreeParserSuper.hpp @@ -67,7 +67,7 @@ public: public: void init_opt(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void name(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void definable_operator_symbol(ANTLR_USE_NAMESPACE(antlr)RefAST _t); - public: void tqparenthesized_primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t); + public: void parenthesized_primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void extension_opt(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void spec_decl_part(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void basic_declarative_items_opt(ANTLR_USE_NAMESPACE(antlr)RefAST _t); diff --git a/languages/ada/ada.g b/languages/ada/ada.g index 876255f5..8c073e23 100644 --- a/languages/ada/ada.g +++ b/languages/ada/ada.g @@ -179,7 +179,7 @@ generic_inst : NEW! compound_name ( LPAREN! value_s RPAREN! )? { pop_def_id(); } ; -tqparenth_values : LPAREN! value ( COMMA! value )* RPAREN! +parenth_values : LPAREN! value ( COMMA! value )* RPAREN! ; value : ( OTHERS^ RIGHT_SHAFT! expression @@ -287,7 +287,7 @@ definable_operator_symbol returns [RefAdaAST d] op:CHAR_STRING { #op->setType(OPERATOR_SYMBOL); d=#op; } ; -tqparenthesized_primary : pp:LPAREN^ +parenthesized_primary : pp:LPAREN^ ( NuLL RECORD! | value_s extension_opt ) @@ -851,7 +851,7 @@ abstract_tagged_limited_opt local_enum_name : IDENTIFIER // to be refined: do a symbol table lookup ; -enumeration_aggregate : tqparenth_values +enumeration_aggregate : parenth_values ; aliased_constant_opt : ( ALIASED )? ( CONSTANT )? @@ -1267,7 +1267,7 @@ accept_stmt : a:ACCEPT^ def_id[false] entry_index_opt formal_part_opt ; entry_index_opt : ( (LPAREN expression RPAREN) => LPAREN! expression RPAREN! - // Looks alot like tqparenthesized_expr_opt, but it's not. + // Looks alot like parenthesized_expr_opt, but it's not. // We need the syn pred for the usage context in accept_stmt. // The formal_part_opt that follows the entry_index_opt there // creates ambiguity (due to the opening LPAREN.) @@ -1463,7 +1463,7 @@ factor : ( NOT^ primary ; primary : ( name_or_qualified - | tqparenthesized_primary + | parenthesized_primary | allocator | NuLL | NUMERIC_LIT @@ -1485,7 +1485,7 @@ name_or_qualified { RefAdaAST dummy; } ) | p:LPAREN^ value_s RPAREN! { Set(#p, INDEXED_COMPONENT); } - | TIC^ ( tqparenthesized_primary | attribute_id ) + | TIC^ ( parenthesized_primary | attribute_id ) )* ; diff --git a/languages/ada/ada.store.g b/languages/ada/ada.store.g index a9a6fbde..dbca7312 100644 --- a/languages/ada/ada.store.g +++ b/languages/ada/ada.store.g @@ -582,7 +582,7 @@ name_or_qualified ) | #(INDEXED_COMPONENT name_or_qualified value_s) | #(TIC name_or_qualified - ( tqparenthesized_primary + ( parenthesized_primary | attribute_id ) ) diff --git a/languages/ada/ada.tree.g b/languages/ada/ada.tree.g index 6f343f97..df167dcd 100644 --- a/languages/ada/ada.tree.g +++ b/languages/ada/ada.tree.g @@ -189,7 +189,7 @@ name : IDENTIFIER definable_operator_symbol : OPERATOR_SYMBOL ; -tqparenthesized_primary +parenthesized_primary : #(PARENTHESIZED_PRIMARY ( NuLL | value_s extension_opt ) ) ; @@ -901,7 +901,7 @@ factor : #(NOT primary) primary : ( name_or_qualified - | tqparenthesized_primary + | parenthesized_primary | allocator | NuLL | NUMERIC_LIT @@ -926,7 +926,7 @@ name_or_qualified ) | #(INDEXED_COMPONENT name_or_qualified value_s) | #(TIC name_or_qualified - ( tqparenthesized_primary + ( parenthesized_primary | attribute_id ) ) diff --git a/languages/ada/addclassdlg.ui b/languages/ada/addclassdlg.ui index 80f466be..046b06ab 100644 --- a/languages/ada/addclassdlg.ui +++ b/languages/ada/addclassdlg.ui @@ -429,6 +429,6 @@ <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/ada/configproblemreporter.ui b/languages/ada/configproblemreporter.ui index 86bb221d..32ca9e54 100644 --- a/languages/ada/configproblemreporter.ui +++ b/languages/ada/configproblemreporter.ui @@ -84,6 +84,6 @@ <slot>accept()</slot> <slot>bgParserCheckbox_toggled( bool b )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/addattributedialogbase.ui b/languages/cpp/addattributedialogbase.ui index 27ad6d5a..0ad0f62e 100644 --- a/languages/cpp/addattributedialogbase.ui +++ b/languages/cpp/addattributedialogbase.ui @@ -370,6 +370,6 @@ <slot>currentChanged(TQListViewItem*)</slot> <slot>updateGUI()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/addmethoddialogbase.ui b/languages/cpp/addmethoddialogbase.ui index 3518b3a0..a3887be6 100644 --- a/languages/cpp/addmethoddialogbase.ui +++ b/languages/cpp/addmethoddialogbase.ui @@ -454,6 +454,6 @@ <slot>updateGUI()</slot> <slot>browseImplementationFile()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index 9ee7b8b5..1670f252 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -114,8 +114,8 @@ void KatePlugin%{APPNAME}::slotApplyConfig( %{APPNAME}ConfigPage* p ) /** * %{APPNAME}ConfigPage */ -%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* tqparent /*= 0L*/, TQWidget *tqparentWidget /*= 0L*/) - : Kate::PluginConfigPage( tqparentWidget ) +%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* tqparent /*= 0L*/, TQWidget *parentWidget /*= 0L*/) + : Kate::PluginConfigPage( parentWidget ) { TQVBoxLayout* lo = new TQVBoxLayout( this, 0, 0, "config_page_layout" ); lo->setSpacing(KDialogBase::spacingHint()); diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h index 3082884e..3550a344 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h @@ -71,7 +71,7 @@ class %{APPNAME}ConfigPage : public Kate::PluginConfigPage friend class KatePlugin%{APPNAME}; public: - %{APPNAME}ConfigPage (TQObject* tqparent = 0L, TQWidget *tqparentWidget = 0L); + %{APPNAME}ConfigPage (TQObject* tqparent = 0L, TQWidget *parentWidget = 0L); ~%{APPNAME}ConfigPage (); /** Reimplemented from Kate::PluginConfigPage; just emits configPageApplyRequest( this ). */ diff --git a/languages/cpp/app_templates/kconfig35/appview_base.ui b/languages/cpp/app_templates/kconfig35/appview_base.ui index 5852f806..3ee8d513 100644 --- a/languages/cpp/app_templates/kconfig35/appview_base.ui +++ b/languages/cpp/app_templates/kconfig35/appview_base.ui @@ -29,5 +29,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kconfig35/prefs-base.ui b/languages/cpp/app_templates/kconfig35/prefs-base.ui index 8c8b9012..46a35473 100644 --- a/languages/cpp/app_templates/kconfig35/prefs-base.ui +++ b/languages/cpp/app_templates/kconfig35/prefs-base.ui @@ -120,7 +120,7 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/languages/cpp/app_templates/kde4app/kapp4view_base.ui b/languages/cpp/app_templates/kde4app/kapp4view_base.ui index 92a83f43..c3780092 100644 --- a/languages/cpp/app_templates/kde4app/kapp4view_base.ui +++ b/languages/cpp/app_templates/kde4app/kapp4view_base.ui @@ -206,7 +206,7 @@ </item> </tqlayout> </widget> - <tqlayoutdefault spacing="6" margin="11" /> + <layoutdefault spacing="6" margin="11" /> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <resources/> <connections/> diff --git a/languages/cpp/app_templates/kde4app/prefs_base.ui b/languages/cpp/app_templates/kde4app/prefs_base.ui index 98bf5f19..f1e5fdfb 100644 --- a/languages/cpp/app_templates/kde4app/prefs_base.ui +++ b/languages/cpp/app_templates/kde4app/prefs_base.ui @@ -138,7 +138,7 @@ p, li { white-space: pre-wrap; } </item> </tqlayout> </widget> - <tqlayoutdefault spacing="6" margin="11" /> + <layoutdefault spacing="6" margin="11" /> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <customwidgets> <customwidget> diff --git a/languages/cpp/app_templates/kdevpart/globalconfigbase.ui b/languages/cpp/app_templates/kdevpart/globalconfigbase.ui index 7cba9a36..588f9dc9 100644 --- a/languages/cpp/app_templates/kdevpart/globalconfigbase.ui +++ b/languages/cpp/app_templates/kdevpart/globalconfigbase.ui @@ -16,5 +16,5 @@ <string>%{APPNAME}</string> </property> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kdevpart/projectconfigbase.ui b/languages/cpp/app_templates/kdevpart/projectconfigbase.ui index 140e8df4..30849e54 100644 --- a/languages/cpp/app_templates/kdevpart/projectconfigbase.ui +++ b/languages/cpp/app_templates/kdevpart/projectconfigbase.ui @@ -16,5 +16,5 @@ <string>%{APPNAME}</string> </property> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui b/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui index 7cba9a36..588f9dc9 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui +++ b/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui @@ -16,5 +16,5 @@ <string>%{APPNAME}</string> </property> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui b/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui index 140e8df4..30849e54 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui +++ b/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui @@ -16,5 +16,5 @@ <string>%{APPNAME}</string> </property> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/khello2/widgetbase.ui b/languages/cpp/app_templates/khello2/widgetbase.ui index 4540c922..365f4cf2 100644 --- a/languages/cpp/app_templates/khello2/widgetbase.ui +++ b/languages/cpp/app_templates/khello2/widgetbase.ui @@ -48,5 +48,5 @@ <Q_SLOTS> <slot>button_clicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kmake/mainview.ui b/languages/cpp/app_templates/kmake/mainview.ui index 2aefef82..94fb52fa 100644 --- a/languages/cpp/app_templates/kmake/mainview.ui +++ b/languages/cpp/app_templates/kmake/mainview.ui @@ -72,5 +72,5 @@ <Q_SLOTS> <slot>slotHelloButtonClicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp index 034e2fb3..d020ed5e 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp @@ -37,14 +37,14 @@ KAboutData* %{APPNAME}Factory::s_aboutData = 0L; s_global = 0L; } -KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & ) +KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & ) { // If classname is "KoDocument", our host is a koffice application // otherwise, the host wants us as a simple part, so switch to readonly and single view. bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 ); - // tqparentWidget and widgetName are used by KoDocument for the "readonly+singleView" case. - %{APPNAME}Part *part = new %{APPNAME}Part( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument ); + // parentWidget and widgetName are used by KoDocument for the "readonly+singleView" case. + %{APPNAME}Part *part = new %{APPNAME}Part( parentWidget, widgetName, tqparent, name, !bWantKoDocument ); if ( !bWantKoDocument ) part->setReadWrite( false ); diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.h b/languages/cpp/app_templates/kofficepart/kopart_factory.h index 149b4b50..b0f934d9 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.h +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.h @@ -19,7 +19,7 @@ public: %{APPNAME}Factory( TQObject* tqparent = 0, const char* name = 0 ); ~%{APPNAME}Factory(); - virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); + virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); static KInstance* global(); diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.cpp b/languages/cpp/app_templates/kofficepart/kopart_part.cpp index 389fb431..fe8c0cca 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_part.cpp @@ -8,12 +8,12 @@ #include <tqpainter.h> -%{APPNAME}Part::%{APPNAME}Part( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode ) - : KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode ) +%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode ) + : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode ) { } -bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* tqparentWidget ) +bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* parentWidget ) { // If nothing is loaded, do initialize here return TRUE; diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.h b/languages/cpp/app_templates/kofficepart/kopart_part.h index 0ec011ae..fc67a523 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.h +++ b/languages/cpp/app_templates/kofficepart/kopart_part.h @@ -13,11 +13,11 @@ class %{APPNAME}Part : public KoDocument Q_OBJECT TQ_OBJECT public: - %{APPNAME}Part( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false ); + %{APPNAME}Part( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false ); virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 ); - virtual bool initDoc( InitDocFlags flags, TQWidget* tqparentWidget = 0 ); + virtual bool initDoc( InitDocFlags flags, TQWidget* parentWidget = 0 ); virtual bool loadOasis( const TQDomDocument & doc, KoOasisStyles& oasisStyles, const TQDomDocument & settings, KoStore* store ); virtual bool loadXML( TQIODevice *, const TQDomDocument & ); diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index 45a8116a..479a6782 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -12,7 +12,7 @@ #include <tqtextstream.h> #include <tqmultilineedit.h> -%{APPNAME}Part::%{APPNAME}Part( TQWidget *tqparentWidget, const char *widgetName, +%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name ) : KParts::ReadWritePart(tqparent, name) { @@ -20,7 +20,7 @@ setInstance( %{APPNAME}PartFactory::instance() ); // this should be your custom internal widget - m_widget = new TQMultiLineEdit( tqparentWidget, widgetName ); + m_widget = new TQMultiLineEdit( parentWidget, widgetName ); // notify the part that this is our internal widget setWidget(m_widget); @@ -164,12 +164,12 @@ KAboutData* %{APPNAME}PartFactory::s_about = 0L; s_instance = 0L; } -KParts::Part* %{APPNAME}PartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, +KParts::Part* %{APPNAME}PartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const char *classname, const TQStringList &args ) { // Create an instance of our Part - %{APPNAME}Part* obj = new %{APPNAME}Part( tqparentWidget, widgetName, tqparent, name ); + %{APPNAME}Part* obj = new %{APPNAME}Part( parentWidget, widgetName, tqparent, name ); // See if we are to be read-write or not if (TQCString(classname) == "KParts::ReadOnlyPart") diff --git a/languages/cpp/app_templates/kpartapp/app_part.h b/languages/cpp/app_templates/kpartapp/app_part.h index 8d5417ad..3a481c5c 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.h +++ b/languages/cpp/app_templates/kpartapp/app_part.h @@ -26,7 +26,7 @@ public: /** * Default constructor */ - %{APPNAME}Part(TQWidget *tqparentWidget, const char *widgetName, + %{APPNAME}Part(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name); /** @@ -75,7 +75,7 @@ class %{APPNAME}PartFactory : public KParts::Factory public: %{APPNAME}PartFactory(); virtual ~%{APPNAME}PartFactory(); - virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const char *classname, const TQStringList &args ); static KInstance* instance(); diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp index 1f27cee4..0818d856 100644 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp @@ -17,7 +17,7 @@ typedef KParts::GenericFactory<%{APPNAMELC}Part> %{APPNAMELC}PartFactory; K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory ); -%{APPNAMELC}Part::%{APPNAMELC}Part( TQWidget *tqparentWidget, const char *widgetName, +%{APPNAMELC}Part::%{APPNAMELC}Part( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList & /*args*/) : KParts::ReadWritePart(tqparent) { @@ -25,7 +25,7 @@ K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory ); setInstance( %{APPNAMELC}PartFactory::instance() ); // this should be your custom internal widget - m_widget = new TQMultiLineEdit( tqparentWidget, widgetName ); + m_widget = new TQMultiLineEdit( parentWidget, widgetName ); // notify the part that this is our internal widget setWidget(m_widget); diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.h b/languages/cpp/app_templates/kscons_kmdi/app_part.h index 39509adf..fabeedbc 100644 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.h +++ b/languages/cpp/app_templates/kscons_kmdi/app_part.h @@ -28,7 +28,7 @@ public: /** * Default constructor */ - %{APPNAMELC}Part(TQWidget *tqparentWidget, const char *widgetName, + %{APPNAMELC}Part(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList & /*args*/); /** diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp index 232d6b44..006b844e 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp @@ -13,8 +13,8 @@ #include "%{APPNAMELC}kmdiView.h" - %{APPNAMELC}kmdiView::%{APPNAMELC}kmdiView( TQWidget *tqparentWidget, const char *name ) -: KMdiChildView( tqparentWidget, name ) + %{APPNAMELC}kmdiView::%{APPNAMELC}kmdiView( TQWidget *parentWidget, const char *name ) +: KMdiChildView( parentWidget, name ) { m_part = NULL; diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h index 31167035..8890fb59 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h @@ -17,7 +17,7 @@ class %{APPNAMELC}kmdiView : public KMdiChildView Q_OBJECT TQ_OBJECT public: - %{APPNAMELC}kmdiView( TQWidget *tqparentWidget=0L, const char *name=0L ); + %{APPNAMELC}kmdiView( TQWidget *parentWidget=0L, const char *name=0L ); virtual ~%{APPNAMELC}kmdiView(); KParts::ReadWritePart *part() { return m_part; } diff --git a/languages/cpp/app_templates/kscons_kmdi/prefs.ui b/languages/cpp/app_templates/kscons_kmdi/prefs.ui index 8b3346de..7830280b 100644 --- a/languages/cpp/app_templates/kscons_kmdi/prefs.ui +++ b/languages/cpp/app_templates/kscons_kmdi/prefs.ui @@ -26,5 +26,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kscons_kxt/appview_base.ui b/languages/cpp/app_templates/kscons_kxt/appview_base.ui index 4604ca4b..41096b1b 100644 --- a/languages/cpp/app_templates/kscons_kxt/appview_base.ui +++ b/languages/cpp/app_templates/kscons_kxt/appview_base.ui @@ -31,5 +31,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui index 59403c40..a343c6cf 100644 --- a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui +++ b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui @@ -122,7 +122,7 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui b/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui index da84ab28..e83bcda9 100644 --- a/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui +++ b/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui @@ -74,6 +74,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/app_templates/kxt/appview_base.ui b/languages/cpp/app_templates/kxt/appview_base.ui index 5852f806..3ee8d513 100644 --- a/languages/cpp/app_templates/kxt/appview_base.ui +++ b/languages/cpp/app_templates/kxt/appview_base.ui @@ -29,5 +29,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kxt/prefs-base.ui b/languages/cpp/app_templates/kxt/prefs-base.ui index 8c8b9012..46a35473 100644 --- a/languages/cpp/app_templates/kxt/prefs-base.ui +++ b/languages/cpp/app_templates/kxt/prefs-base.ui @@ -120,7 +120,7 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/languages/cpp/app_templates/opieapp/examplebase.ui b/languages/cpp/app_templates/opieapp/examplebase.ui index 1243c341..90d39d17 100644 --- a/languages/cpp/app_templates/opieapp/examplebase.ui +++ b/languages/cpp/app_templates/opieapp/examplebase.ui @@ -45,5 +45,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/qtopiaapp/examplebase.ui b/languages/cpp/app_templates/qtopiaapp/examplebase.ui index 1243c341..90d39d17 100644 --- a/languages/cpp/app_templates/qtopiaapp/examplebase.ui +++ b/languages/cpp/app_templates/qtopiaapp/examplebase.ui @@ -45,5 +45,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui index 5b7e5aa5..441d1bb1 100644 --- a/languages/cpp/ccconfigwidgetbase.ui +++ b/languages/cpp/ccconfigwidgetbase.ui @@ -1780,8 +1780,8 @@ you right click on a variable in a header file.</string> <slot>isValidQtDir(const QString&)</slot> <slot>openPluginPaths()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/languages/cpp/classgeneratorconfigbase.ui b/languages/cpp/classgeneratorconfigbase.ui index 1bb25fe6..a047fca3 100644 --- a/languages/cpp/classgeneratorconfigbase.ui +++ b/languages/cpp/classgeneratorconfigbase.ui @@ -256,6 +256,6 @@ <Q_SLOTS> <slot access="protected">templateTypeChanged(int type)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/codeinformationrepository.h b/languages/cpp/codeinformationrepository.h index e7e2c649..2c5f4cb2 100644 --- a/languages/cpp/codeinformationrepository.h +++ b/languages/cpp/codeinformationrepository.h @@ -20,7 +20,7 @@ struct TypeProcessor { virtual TQString processType( const TQString& type ) = 0; - virtual TQString tqparentType() = 0; + virtual TQString parentType() = 0; }; class KDevCodeRepository; diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp index 3d7ff152..0c287beb 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp @@ -366,7 +366,7 @@ Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *tqparent, con new FlagListItem( wallBox, "-Wmissing-braces", i18n( "<qt>Warn if an aggregate or union initializer is not fully bracketed</qt>" ) ); new FlagListItem( wallBox, - "-Wtqparentheses", i18n( "<qt>Warn when tqparentheses are omitted in certain contexts</qt>" ) ); + "-Wparentheses", i18n( "<qt>Warn when parentheses are omitted in certain contexts</qt>" ) ); new FlagListItem( wallBox, "-Wsequence-point", i18n( "<qt>Warn about code that may have undefined semantics because of\n" "violations of sequence point rules in the C standard</qt>" ) ); diff --git a/languages/cpp/configproblemreporter.ui b/languages/cpp/configproblemreporter.ui index 6a2ab252..fc47d3b2 100644 --- a/languages/cpp/configproblemreporter.ui +++ b/languages/cpp/configproblemreporter.ui @@ -184,6 +184,6 @@ If disabled, the parser will typically only run when the file is saved.</string> <slot>bgParserCheckbox_toggled( bool b )</slot> <slot access="protected">setDelayLabel( int delay )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index 08f6aa1e..3d9fcb73 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -828,7 +828,7 @@ struct CompTypeProcessor : public TypeProcessor { CompTypeProcessor( SimpleType scope, bool processArguments ) : m_scope( scope ), m_processArguments( processArguments ) {} - virtual TQString tqparentType() { + virtual TQString parentType() { return m_scope->fullType(); } @@ -1904,18 +1904,18 @@ SimpleContext* CppCodeCompletion::computeFunctionContext( FunctionDom f, int lin if ( !scope.isEmpty() ) { - SimpleType tqparentType; + SimpleType parentType; /* if( !m_cachedFromContext ) { TypePointer t = SimpleType(TQStringList())->locateDecType( scope.join("") ).desc().resolved();; if( t ) - tqparentType = SimpleType( t.data() ); + parentType = SimpleType( t.data() ); else - tqparentType = SimpleType( scope ); + parentType = SimpleType( scope ); } else {*/ - tqparentType = SimpleType( scope, getIncludeFiles() ); + parentType = SimpleType( scope, getIncludeFiles() ); //} - tqparentType->descForEdit().setTotalPointerDepth( 1 ); - ctx->setContainer( tqparentType ); + parentType->descForEdit().setTotalPointerDepth( 1 ); + ctx->setContainer( parentType ); } SimpleType global = ctx->global(); @@ -2564,7 +2564,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { } if ( !scope.isEmpty() ) { - SimpleType tqparentType; + SimpleType parentType; /*if( !m_cachedFromContext ) { TypePointer t = createGlobalNamespace(); @@ -2584,14 +2584,14 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { d.setIncludeFiles( getIncludeFiles() ); SimpleTypeImpl * i = SimpleType( TQStringList(), getIncludeFiles() ) ->locateDecType( d ).desc().resolved().data(); if ( i ) { - tqparentType = i; + parentType = i; } else { - tqparentType = SimpleType( scope, getIncludeFiles() ); + parentType = SimpleType( scope, getIncludeFiles() ); } } else { - tqparentType = SimpleType( scope, getIncludeFiles() ); + parentType = SimpleType( scope, getIncludeFiles() ); } - this_type = tqparentType; + this_type = parentType; this_type->descForEdit().setTotalPointerDepth( 1 ); ctx->setContainer( this_type ); } @@ -3687,8 +3687,8 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, TQValueLis args << Catalog::QueryArgument( "name", fullname ); - TQValueList<LocateResult> tqparents = typeR->getBases( ); - for ( TQValueList<LocateResult>::Iterator it = tqparents.begin(); it != tqparents.end(); ++it ) { + TQValueList<LocateResult> parents = typeR->getBases( ); + for ( TQValueList<LocateResult>::Iterator it = parents.begin(); it != parents.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; SimpleType tp = SimpleType( ( *it ) ->resolved() ); @@ -3812,9 +3812,9 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList if ( m_completionMode != SignalCompletion ) { if ( !type->isNamespace() ) { if ( num == 1 ) - e.postfix += "; (protected)"; // in " + proc.tqparentType() + ")"; + e.postfix += "; (protected)"; // in " + proc.parentType() + ")"; if ( num == 2 ) - e.postfix += "; (private)"; // in " + proc.tqparentType() + ")"; + e.postfix += "; (private)"; // in " + proc.parentType() + ")"; } } @@ -3930,9 +3930,9 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList computeCompletionEntryList( klass->name(), type, entryList, klass->typeAliasList(), isInstance, depth ); } - TQValueList<LocateResult> tqparents = type->getBases( ); + TQValueList<LocateResult> parents = type->getBases( ); - for ( TQValueList<LocateResult>::Iterator it = tqparents.begin(); it != tqparents.end(); ++it ) { + for ( TQValueList<LocateResult>::Iterator it = parents.begin(); it != parents.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; diff --git a/languages/cpp/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui index 5d1580e4..31d25e2c 100644 --- a/languages/cpp/cppnewclassdlgbase.ui +++ b/languages/cpp/cppnewclassdlgbase.ui @@ -1282,8 +1282,8 @@ Namespace1::Namespace2::...::NamespaceN</string> <slot access="protected">classNamespaceChanged( const QString & )</slot> <slot access="protected">headeronly_box_stateChanged(int val)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>classgeneratorconfig.h</includehint> </includehints> diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index e58d3a86..384ba03e 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -871,7 +871,7 @@ TQStringList CppSupportPart::reorder( const TQStringList &list ) for ( it = list.begin(); it != list.end(); ++it ) { TQString filePath = *it; - // brilliant stuff.. this method is aptqparently called both with + // brilliant stuff.. this method is apparently called both with // relative and absolute paths.. if ( !filePath.startsWith("/") ) { diff --git a/languages/cpp/creategettersetter.ui b/languages/cpp/creategettersetter.ui index b9a9bca5..fd4feaf6 100644 --- a/languages/cpp/creategettersetter.ui +++ b/languages/cpp/creategettersetter.ui @@ -222,7 +222,7 @@ <Q_SLOTS> <slot access="protected">slotInlineChanged()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/languages/cpp/createpcsdialogbase.ui b/languages/cpp/createpcsdialogbase.ui index 54857eae..acc7a9ca 100644 --- a/languages/cpp/createpcsdialogbase.ui +++ b/languages/cpp/createpcsdialogbase.ui @@ -160,7 +160,7 @@ <slot>slotSelected(const QString&)</slot> <slot>slotSelectionChanged(TQListViewItem*)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>klineedit.h</includehint> diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp index aaf4476b..088aff77 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -117,7 +117,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) menu->popup(e->globalPos()); } else { moving_ = true; - offset_ = tqparentWidget()->pos() - e->globalPos(); + offset_ = parentWidget()->pos() - e->globalPos(); setFrameStyle(TQFrame::Panel|TQFrame::Sunken); TQApplication::setOverrideCursor(TQCursor(sizeAllCursor)); setPalette(TQPalette(tqcolorGroup().background())); diff --git a/languages/cpp/debugger/debuggerconfigwidgetbase.ui b/languages/cpp/debugger/debuggerconfigwidgetbase.ui index 38048f18..a3a1e321 100644 --- a/languages/cpp/debugger/debuggerconfigwidgetbase.ui +++ b/languages/cpp/debugger/debuggerconfigwidgetbase.ui @@ -431,8 +431,8 @@ or if your executable contains the gdb stub <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/languages/cpp/debugger/debuggertracingdialogbase.ui b/languages/cpp/debugger/debuggertracingdialogbase.ui index 17321999..51cfe410 100644 --- a/languages/cpp/debugger/debuggertracingdialogbase.ui +++ b/languages/cpp/debugger/debuggertracingdialogbase.ui @@ -133,7 +133,7 @@ If custom format string is not enabled, names and values of all expressions will <Q_SLOTS> <slot>enableOrDisable()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>keditlistbox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp index 7877a92c..ba51e871 100644 --- a/languages/cpp/debugger/gdboutputwidget.cpp +++ b/languages/cpp/debugger/gdboutputwidget.cpp @@ -327,7 +327,7 @@ TQPopupMenu* OutputText::createPopupMenu(const TQPoint&) this, TQT_SLOT(toggleShowInternalCommands())); - popup->setItemChecked(id, tqparent_->showInternalCommands_); + popup->setItemChecked(id, parent_->showInternalCommands_); popup->tqsetWhatsThis( id, i18n( @@ -348,8 +348,8 @@ void OutputText::copyAll() { /* See comments for allCommandRaw_ for explanations of this complex logic, as opposed to calling text(). */ - TQStringList& raw = tqparent_->showInternalCommands_ ? - tqparent_->allCommandsRaw_ : tqparent_->userCommandsRaw_; + TQStringList& raw = parent_->showInternalCommands_ ? + parent_->allCommandsRaw_ : parent_->userCommandsRaw_; TQString text; for (unsigned i = 0; i < raw.size(); ++i) text += raw[i]; @@ -362,7 +362,7 @@ void OutputText::copyAll() void OutputText::toggleShowInternalCommands() { - tqparent_->setShowInternalCommands(!tqparent_->showInternalCommands_); + parent_->setShowInternalCommands(!parent_->showInternalCommands_); } diff --git a/languages/cpp/debugger/gdboutputwidget.h b/languages/cpp/debugger/gdboutputwidget.h index ace1c00d..171fdb86 100644 --- a/languages/cpp/debugger/gdboutputwidget.h +++ b/languages/cpp/debugger/gdboutputwidget.h @@ -121,7 +121,7 @@ class OutputText : public TQTextEdit public: OutputText(GDBOutputWidget* tqparent) : TQTextEdit(tqparent), - tqparent_(tqparent) + parent_(tqparent) {} TQPopupMenu* createPopupMenu(const TQPoint& pos); @@ -131,7 +131,7 @@ private slots: void toggleShowInternalCommands(); private: - GDBOutputWidget* tqparent_; + GDBOutputWidget* parent_; }; } diff --git a/languages/cpp/debugger/gdbparser.cpp b/languages/cpp/debugger/gdbparser.cpp index d8ae62b8..46f5251b 100644 --- a/languages/cpp/debugger/gdbparser.cpp +++ b/languages/cpp/debugger/gdbparser.cpp @@ -97,7 +97,7 @@ TQString GDBParser::undecorateValue(DataType type, const TQString& s) // - composites (arrays and structures) // - pointers to functions. In this case type is // enclosed in "{}". Not sure why it's so, as - // when printing pointer, type is in tqparenthesis. + // when printing pointer, type is in parenthesis. if (type == typePointer) { // Looks like type in braces at the beginning. Strip it. @@ -126,7 +126,7 @@ TQString GDBParser::undecorateValue(DataType type, const TQString& s) // We can't find the first ')', because type can contain '(' and ')' // characters if its function pointer. So count opening and closing - // tqparentheses. + // parentheses. start = skipDelim(start, '(', ')'); } diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc index 2b1b33b5..00141e92 100644 --- a/languages/cpp/doc/kde2book.toc +++ b/languages/cpp/doc/kde2book.toc @@ -762,9 +762,9 @@ <entry name="dialog boxes, KSpellConfig configuration dialog" url="ch10lev1sec3.html"/> <entry name="dialog boxes, tqlayout, CGotoDialog example" url="ch08lev1sec2.html"/> <entry name="dialog boxes, tqlayout, design issues" url="ch08lev1sec2.html"/> -<entry name="dialog boxes, tqlayout, hierarchies of tqlayouts" url="ch08lev1sec2.html"/> +<entry name="dialog boxes, tqlayout, hierarchies of layouts" url="ch08lev1sec2.html"/> <entry name="dialog boxes, tqlayout, manual placement" url="ch08lev1sec2.html"/> -<entry name="dialog boxes, tqlayout, nested tqlayouts" url="ch08lev1sec2.html"/> +<entry name="dialog boxes, tqlayout, nested layouts" url="ch08lev1sec2.html"/> <entry name="dialog boxes, tqlayout, QLayout classes" url="ch08lev1sec2.html"/> <entry name="dialog boxes, tqlayout, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> <entry name="dialog boxes, modal, advantages/disadvantages" url="ch08lev1sec3.html"/> @@ -1082,9 +1082,9 @@ <entry name="gdb (GNU debugger)" url="ch02.html"/> <entry name="tqgeometry management (widgets), dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/> <entry name="tqgeometry management (widgets), dialog boxes, design issues" url="ch08lev1sec2.html"/> -<entry name="tqgeometry management (widgets), dialog boxes, hierarchies of tqlayouts" url="ch08lev1sec2.html"/> +<entry name="tqgeometry management (widgets), dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/> <entry name="tqgeometry management (widgets), dialog boxes, manual placement" url="ch08lev1sec2.html"/> -<entry name="tqgeometry management (widgets), dialog boxes, nested tqlayouts" url="ch08lev1sec2.html"/> +<entry name="tqgeometry management (widgets), dialog boxes, nested layouts" url="ch08lev1sec2.html"/> <entry name="tqgeometry management (widgets), dialog boxes, QLayout classes" url="ch08lev1sec2.html"/> <entry name="tqgeometry management (widgets), dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> <entry name="tqgeometry management (widgets), QBoxLayout manager" url="ch04lev1sec3.html"/> @@ -1594,9 +1594,9 @@ <entry name="tqlayout, dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/> <entry name="tqlayout, dialog boxes, design guidelines" url="ch08lev1sec7.html"/> <entry name="tqlayout, dialog boxes, design issues" url="ch08lev1sec2.html"/> -<entry name="tqlayout, dialog boxes, hierarchies of tqlayouts" url="ch08lev1sec2.html"/> +<entry name="tqlayout, dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/> <entry name="tqlayout, dialog boxes, manual placement" url="ch08lev1sec2.html"/> -<entry name="tqlayout, dialog boxes, nested tqlayouts" url="ch08lev1sec2.html"/> +<entry name="tqlayout, dialog boxes, nested layouts" url="ch08lev1sec2.html"/> <entry name="tqlayout, dialog boxes, QLayout classes" url="ch08lev1sec2.html"/> <entry name="tqlayout, dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> <entry name="tqlayout managers, creating internally, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> @@ -2032,7 +2032,7 @@ <entry name="navigation, drag and drop" url="ch07.html"/> <entry name="navigation, menubars, creating" url="ch02lev1sec4.html"/> <entry name="navigation, toolbars" url="ch02lev1sec4.html"/> -<entry name="nested tqlayouts (dialog boxes)" url="ch08lev1sec2.html"/> +<entry name="nested layouts (dialog boxes)" url="ch08lev1sec2.html"/> <entry name="network transparency, applications, classes" url="ch06lev1sec8.html"/> <entry name="network transparency, applications" url="ch06lev1sec8.html"/> <entry name="network transparency" url="ch01lev1sec2.html"/> diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui index a7678844..df22cab6 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui @@ -58,5 +58,5 @@ <Q_SIGNALS> <signal>enabled(int)</signal> </Q_SIGNALS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui index de905d40..b631bfc9 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui @@ -121,7 +121,7 @@ Only the selected entry will be used</string> <Q_SLOTS> <slot>slotSelectionChanged(TQListBoxItem*)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui index d3314b40..67178a73 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui @@ -69,7 +69,7 @@ Only the selected entry will be used</string> <Q_SLOTS> <slot>slotSelectionChanged(TQListBoxItem*)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui index fc28b901..222c7e71 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui @@ -128,7 +128,7 @@ Only the selected entry will be used</string> <Q_SLOTS> <slot>slotSelectionChanged(TQListBoxItem*)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kurlrequester.h</includehint> diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp index b496b96a..9e9d6113 100644 --- a/languages/cpp/simpletype.cpp +++ b/languages/cpp/simpletype.cpp @@ -793,7 +793,7 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d } } - ///Ask tqparentsc + ///Ask parentsc if ( !scope().isEmpty() && dir != 1 && ! ( mode & ExcludeParents ) ) { LocateResult rett = tqparent() ->locateType( resolveTemplateParams( name, mode & ExcludeBases ? ExcludeBases : mode ), mode & ForgetModeUpwards ? Normal : mode ); if ( rett->resolved() ) @@ -803,7 +803,7 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d ret = rett.increaseDepth(); } - ///Ask the bases and allow them to search in their tqparents. + ///Ask the bases and allow them to search in their parents. if ( ! ( mode & ExcludeBases ) ) { TypeDesc baseName = resolveTemplateParams( name, LocateBase ); ///Resolve all template-params that are at least visible in the scope of the base-declaration TQValueList<LocateResult> bases = getBases(); @@ -832,7 +832,7 @@ void SimpleTypeImpl::breakReferences() { m_desc.resetResolved(); // m_trace.clear(); m_masterProxy = 0; - tqinvalidateCache(); + invalidateCache(); } TypePointer SimpleTypeImpl::bigContainer() { @@ -848,7 +848,7 @@ SimpleType SimpleTypeImpl::tqparent() { return SimpleType( m_parent ); } else { ifVerbose( dbg() << "\"" << str() << "\": locating tqparent" << endl ); - tqinvalidateSecondaryCache(); + invalidateSecondaryCache(); TQStringList sc = scope(); if ( !sc.isEmpty() ) { @@ -876,7 +876,7 @@ const TypeDesc& SimpleTypeImpl::desc() { TypeDesc& SimpleTypeImpl::descForEdit() { desc(); - tqinvalidateCache(); + invalidateCache(); return m_desc; } @@ -942,7 +942,7 @@ TQString SimpleTypeImpl::fullTypeResolvedWithScope( int depth ) { } void SimpleTypeImpl::checkTemplateParams () { - tqinvalidateCache(); + invalidateCache(); if ( ! m_scope.isEmpty() ) { TQString str = m_scope.back(); m_desc = str; @@ -956,7 +956,7 @@ void SimpleTypeImpl::checkTemplateParams () { } void SimpleTypeImpl::setScope( const TQStringList& scope ) { - tqinvalidateCache(); + invalidateCache(); m_scope = scope; if ( m_scope.count() == 1 && m_scope.front().isEmpty() ) { //kdDebug() << "bad scope set " << kdBacktrace() << endl; @@ -965,8 +965,8 @@ void SimpleTypeImpl::setScope( const TQStringList& scope ) { } SimpleTypeImpl::TypeOfResult SimpleTypeImpl::searchBases ( const TypeDesc& name /*option!!*/ ) { - TQValueList<LocateResult> tqparents = getBases(); - for ( TQValueList<LocateResult>::iterator it = tqparents.begin(); it != tqparents.end(); ++it ) { + TQValueList<LocateResult> parents = getBases(); + for ( TQValueList<LocateResult>::iterator it = parents.begin(); it != parents.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; TypeOfResult type = ( *it ) ->resolved() ->typeOf( name ); @@ -985,13 +985,13 @@ void SimpleTypeImpl::setSlaveParent( SimpleTypeImpl& slave ) { } void SimpleTypeImpl::parseParams( TypeDesc desc ) { - tqinvalidateCache(); + invalidateCache(); m_desc = desc; m_desc.clearInstanceInfo(); } void SimpleTypeImpl::takeTemplateParams( TypeDesc desc ) { - tqinvalidateCache(); + invalidateCache(); m_desc.templateParams() = desc.templateParams(); } diff --git a/languages/cpp/simpletype.h b/languages/cpp/simpletype.h index 49b01ee0..d3b288c0 100644 --- a/languages/cpp/simpletype.h +++ b/languages/cpp/simpletype.h @@ -410,11 +410,11 @@ class SimpleTypeImpl : public KShared { } protected: - virtual void tqinvalidateCache() {} + virtual void invalidateCache() {} ; ///Secondary cache also depends on the surrounding - virtual void tqinvalidateSecondaryCache() {} + virtual void invalidateSecondaryCache() {} virtual void setSecondaryCacheActive( bool active ) { Q_UNUSED( active ); @@ -422,7 +422,7 @@ class SimpleTypeImpl : public KShared { ///Primary cache is the one associated only with this object. It must only be cleared ///when the object pointed to changes - virtual void tqinvalidatePrimaryCache( bool onlyNegative = false ) {} + virtual void invalidatePrimaryCache( bool onlyNegative = false ) {} static TQString operatorToString( Operator op ); @@ -483,7 +483,7 @@ class SimpleTypeImpl : public KShared { ///sets the tqparent-type(type this one is nested in) void setParent( TypePointer tqparent ) { if( tqparent == m_parent ) return; - tqinvalidateSecondaryCache(); + invalidateSecondaryCache(); if ( &( *tqparent ) == this ) { kdDebug( 9007 ) << "setSlaveParent error\n" << kdBacktrace() << endl; return ; diff --git a/languages/cpp/simpletypecachebinder.h b/languages/cpp/simpletypecachebinder.h index 6744d5d8..9d6ed77a 100644 --- a/languages/cpp/simpletypecachebinder.h +++ b/languages/cpp/simpletypecachebinder.h @@ -293,7 +293,7 @@ class SimpleTypeCacheBinder : public Base { return new SimpleTypeCacheBinder<Base>( this ); } - virtual void tqinvalidatePrimaryCache( bool onlyNegative ) { + virtual void invalidatePrimaryCache( bool onlyNegative ) { //if( !m_memberCache.isEmpty() ) dbg() << "\"" << Base::str() << "\" primary caches cleared" << endl; if ( !onlyNegative) m_memberCache.clear(); @@ -307,7 +307,7 @@ class SimpleTypeCacheBinder : public Base { } m_classListCache.clear(); } - virtual void tqinvalidateSecondaryCache() { + virtual void invalidateSecondaryCache() { //if( !m_locateCache.isEmpty() ) dbg() << "\"" << Base::str() << "\" secondary caches cleared" << endl; m_locateCache.clear(); m_haveBasesCache = false; @@ -322,9 +322,9 @@ class SimpleTypeCacheBinder : public Base { primaryActive = active; } - virtual void tqinvalidateCache() { - tqinvalidatePrimaryCache( false ); - tqinvalidateSecondaryCache(); + virtual void invalidateCache() { + invalidatePrimaryCache( false ); + invalidateSecondaryCache(); }; }; diff --git a/languages/cpp/simpletypecatalog.cpp b/languages/cpp/simpletypecatalog.cpp index 9afdea75..f662acc5 100644 --- a/languages/cpp/simpletypecatalog.cpp +++ b/languages/cpp/simpletypecatalog.cpp @@ -279,13 +279,13 @@ TQStringList SimpleTypeCatalog::getBaseStrings() { TQStringList ret; TQMap<TQString, bool> bases; -// try with tqparentsc +// try with parentsc TQTime t; t.restart(); - TQValueList<Tag> tqparents( getBaseClassList() ); + TQValueList<Tag> parents( getBaseClassList() ); - TQValueList<Tag>::Iterator it = tqparents.begin(); - while ( it != tqparents.end() ) { + TQValueList<Tag>::Iterator it = parents.begin(); + while ( it != parents.end() ) { Tag & tag = *it; ++it; diff --git a/languages/cpp/simpletypefunction.cpp b/languages/cpp/simpletypefunction.cpp index d0c2c2af..4edaddba 100644 --- a/languages/cpp/simpletypefunction.cpp +++ b/languages/cpp/simpletypefunction.cpp @@ -455,7 +455,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeCodeModel::findMember( TypeDesc name , Memb if ( ret.memberType == MemberInfo::Function || ret.memberType == MemberInfo::Variable || ret.memberType == MemberInfo::Template || ret.memberType == MemberInfo::Typedef || ret.memberType == MemberInfo::NestedType ) { //For redirected types it is necessary to add the include-files of the context they were searched in. //That is not quite correct, but it makes sure that at least the same namespace-aliases will be activated while the search for the type, - //Which is necessary because the alias is tqparented by exactly this class. + //Which is necessary because the alias is parented by exactly this class. ret.type->addIncludeFiles( name.includeFiles() ); } @@ -553,8 +553,8 @@ TQStringList SimpleTypeCodeModel::getBaseStrings() { if ( !m_item || ( klass = dynamic_cast<ClassModel*>( & ( *m_item ) ) ) == 0 ) return ret; - TQStringList tqparents = klass->baseClassList(); - for ( TQStringList::Iterator it = tqparents.begin(); it != tqparents.end(); ++it ) { + TQStringList parents = klass->baseClassList(); + for ( TQStringList::Iterator it = parents.begin(); it != parents.end(); ++it ) { ret << *it; } diff --git a/languages/cpp/simpletypenamespace.cpp b/languages/cpp/simpletypenamespace.cpp index 048eb9ad..cbd128eb 100644 --- a/languages/cpp/simpletypenamespace.cpp +++ b/languages/cpp/simpletypenamespace.cpp @@ -224,8 +224,8 @@ void SimpleTypeNamespace::addAliasMap( const TypeDesc& name, const TypeDesc& ali if ( symmetric ) addAliasMap( alias, name, files, recurse, false ); - tqinvalidateSecondaryCache(); - tqinvalidatePrimaryCache( true ); //Only not-found items are cleared updated here for performance-reasons(found items will stay cached) + invalidateSecondaryCache(); + invalidatePrimaryCache( true ); //Only not-found items are cleared updated here for performance-reasons(found items will stay cached) AliasMap::iterator it = m_aliases.tqfind( name.name() ); if ( it == m_aliases.end() ) @@ -302,7 +302,7 @@ std::set<size_t> SimpleTypeNamespace::updateAliases( const IncludeFiles& files/* #ifdef PHYSICALLY_IMPORT_NAMESPACES if ( desc.resolved()->masterProxy().data() != this ) { desc.setResolved( desc.resolved()->clone() ); //expensive, cache is not shared - desc.resolved()->setMasterProxy( this ); //Possible solution: don't use this, simply set the tqparents of all found members correctly + desc.resolved()->setMasterProxy( this ); //Possible solution: don't use this, simply set the parents of all found members correctly } #endif d.first.first = desc; @@ -344,15 +344,15 @@ void SimpleTypeNamespace::addAliases( TQString map, const IncludeFiles& files ) } } -void SimpleTypeNamespace::tqinvalidatePrimaryCache( bool onlyNegative ) { +void SimpleTypeNamespace::invalidatePrimaryCache( bool onlyNegative ) { //m_slavesCache.clear(); - SimpleTypeImpl::tqinvalidatePrimaryCache( onlyNegative ); + SimpleTypeImpl::invalidatePrimaryCache( onlyNegative ); } void SimpleTypeNamespace::addImport( const TypeDesc& import, const IncludeFiles& files, TypePointer perspective ) { //ifVerbose( dbg() << " if ( !perspective ) perspective = this; - tqinvalidateCache(); + invalidateCache(); TypeDesc d = import; if ( d.resolved() ) { #ifdef PHYSICALLY_IMPORT_NAMESPACES diff --git a/languages/cpp/simpletypenamespace.h b/languages/cpp/simpletypenamespace.h index ab5131c7..b465cfb6 100644 --- a/languages/cpp/simpletypenamespace.h +++ b/languages/cpp/simpletypenamespace.h @@ -135,7 +135,7 @@ class SimpleTypeNamespace : public SimpleTypeImpl { return true; } - virtual void tqinvalidatePrimaryCache( bool onlyNegative = false ); + virtual void invalidatePrimaryCache( bool onlyNegative = false ); virtual MemberInfo findMember( TypeDesc name, MemberInfo::MemberType type = MemberInfo::AllTypes ); diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp index 62b154da..27b08f27 100644 --- a/languages/cpp/subclassingdlg.cpp +++ b/languages/cpp/subclassingdlg.cpp @@ -144,7 +144,7 @@ m_newFileNames(dummy), m_cppSupport( cppSupport ) for (ClassList::const_iterator classIt = myClasses.begin(); classIt != myClasses.end(); ++classIt) { kdDebug() << "base class " << baseClass << " class " << (*classIt)->name() - << " tqparents " << (*classIt)->baseClassList().join(",") << endl; + << " parents " << (*classIt)->baseClassList().join(",") << endl; if ( (*classIt)->baseClassList().tqfindIndex(baseClass) != -1 ) { kdDebug() << "base class matched " << endl; diff --git a/languages/cpp/subclassingdlgbase.ui b/languages/cpp/subclassingdlgbase.ui index a43beb05..6984dcf6 100644 --- a/languages/cpp/subclassingdlgbase.ui +++ b/languages/cpp/subclassingdlgbase.ui @@ -239,6 +239,6 @@ <Q_SLOTS> <slot>onChangedClassName()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/typedesc.cpp b/languages/cpp/typedesc.cpp index b238b734..757b4eae 100644 --- a/languages/cpp/typedesc.cpp +++ b/languages/cpp/typedesc.cpp @@ -590,7 +590,7 @@ void TypeDesc::makeDataPrivate() { if ( m_data.count() > 1 ) { m_data = new TypeDescData( *m_data ); } - m_data->tqinvalidateKey(); + m_data->invalidateKey(); } TypeDesc& TypeDesc::makePrivate() { diff --git a/languages/cpp/typedesc.h b/languages/cpp/typedesc.h index 0759b74e..ddb072d2 100644 --- a/languages/cpp/typedesc.h +++ b/languages/cpp/typedesc.h @@ -158,7 +158,7 @@ struct TypeDescData : public KShared { TypeDescData() : m_hashValid( false ), m_hash2Valid( false ) { } - void tqinvalidateKey() { + void invalidateKey() { m_hashValid = false; m_hash2Valid = false; } diff --git a/languages/csharp/csharpconfigwidgetbase.ui b/languages/csharp/csharpconfigwidgetbase.ui index 1b7dd060..5ec36259 100644 --- a/languages/csharp/csharpconfigwidgetbase.ui +++ b/languages/csharp/csharpconfigwidgetbase.ui @@ -96,6 +96,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/fortran/ftnchekconfigwidget.cpp b/languages/fortran/ftnchekconfigwidget.cpp index eaef8434..c359f78d 100644 --- a/languages/fortran/ftnchekconfigwidget.cpp +++ b/languages/fortran/ftnchekconfigwidget.cpp @@ -79,7 +79,7 @@ public: protected: void maybeTip(const TQPoint &pos) { - TQListView *listview = static_cast<TQListView*>(tqparentWidget()); + TQListView *listview = static_cast<TQListView*>(parentWidget()); TQListViewItem *item = listview->itemAt(pos); FtnchekItem *flitem = static_cast<FtnchekItem*>(item); diff --git a/languages/fortran/ftnchekconfigwidgetbase.ui b/languages/fortran/ftnchekconfigwidgetbase.ui index d7180514..ca20da82 100644 --- a/languages/fortran/ftnchekconfigwidgetbase.ui +++ b/languages/fortran/ftnchekconfigwidgetbase.ui @@ -579,6 +579,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/java/configproblemreporter.ui b/languages/java/configproblemreporter.ui index 1e6a7f1a..bf0333ef 100644 --- a/languages/java/configproblemreporter.ui +++ b/languages/java/configproblemreporter.ui @@ -249,8 +249,8 @@ <slot>moveUpSpecialHeader()</slot> <slot>moveDownSpecialHeader()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/languages/java/java.g b/languages/java/java.g index 59f7e0cd..64902409 100644 --- a/languages/java/java.g +++ b/languages/java/java.g @@ -698,7 +698,7 @@ handler // ( 2) * / % // ( 1) ++ -- +(unary) -(unary) ~ ! (type) // [] () (method call) . (dot -- identifier qualification) -// new () (explicit tqparenthesis) +// new () (explicit parenthesis) // // the last two are not usually on a precedence chart; I put them in // to point out that new has a higher precedence than '.', so you diff --git a/languages/kjssupport/subclassingdlg.cpp b/languages/kjssupport/subclassingdlg.cpp index c9393f00..a74b1e00 100644 --- a/languages/kjssupport/subclassingdlg.cpp +++ b/languages/kjssupport/subclassingdlg.cpp @@ -143,7 +143,7 @@ m_newFileNames(dummy), m_kjsSupport( kjsSupport ) for (ClassList::const_iterator classIt = myClasses.begin(); classIt != myClasses.end(); ++classIt) { kdDebug() << "base class " << baseClass << " class " << (*classIt)->name() - << " tqparents " << (*classIt)->baseClassList().join(",") << endl; + << " parents " << (*classIt)->baseClassList().join(",") << endl; if ( (*classIt)->baseClassList().findIndex(baseClass) != -1 ) { kdDebug() << "base class matched " << endl; diff --git a/languages/kjssupport/subclassingdlgbase.ui b/languages/kjssupport/subclassingdlgbase.ui index 711250bd..4ac1d94b 100644 --- a/languages/kjssupport/subclassingdlgbase.ui +++ b/languages/kjssupport/subclassingdlgbase.ui @@ -248,6 +248,6 @@ <Q_SLOTS> <slot>onChangedClassName()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/lib/designer_integration/implementationwidgetbase.ui b/languages/lib/designer_integration/implementationwidgetbase.ui index fece6815..7f4148a9 100644 --- a/languages/lib/designer_integration/implementationwidgetbase.ui +++ b/languages/lib/designer_integration/implementationwidgetbase.ui @@ -260,7 +260,7 @@ <Q_SLOTS> <slot access="protected">classNameChanged(const QString &)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/languages/pascal/configproblemreporter.ui b/languages/pascal/configproblemreporter.ui index 7fd5275e..b7c62665 100644 --- a/languages/pascal/configproblemreporter.ui +++ b/languages/pascal/configproblemreporter.ui @@ -83,6 +83,6 @@ <slot>accept()</slot> <slot>bgParserCheckbox_toggled( bool b )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/perl/perlconfigwidgetbase.ui b/languages/perl/perlconfigwidgetbase.ui index 521531fd..b518ea91 100644 --- a/languages/perl/perlconfigwidgetbase.ui +++ b/languages/perl/perlconfigwidgetbase.ui @@ -96,6 +96,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/perl/perlparser.h b/languages/perl/perlparser.h index e2ec4d7e..6a68165e 100644 --- a/languages/perl/perlparser.h +++ b/languages/perl/perlparser.h @@ -59,7 +59,7 @@ class perlparser { bool m_inclass; TQString m_lastsub; - TQString m_lasttqparentclass; + TQString m_lastparentclass; TQString m_lastattr; TQString m_lastpackagename; TQString m_lastscriptname; diff --git a/languages/php/data/phpfunctions b/languages/php/data/phpfunctions index d43bcb72..d5b80245 100644 --- a/languages/php/data/phpfunctions +++ b/languages/php/data/phpfunctions @@ -345,7 +345,7 @@ hw:[array|int] hw_getremotetqchildren(int link, string objrec) hw:void hw_setlinkroot(int link, int rootid) hw:hwdoc hw_pipedocument(int link, int objid) hw:hwdoc hw_pipecgi(int link, int objid) -hw:void hw_insertdocument(int link, int tqparentid, hwdoc doc) +hw:void hw_insertdocument(int link, int parentid, hwdoc doc) hw:hwdoc hw_new_document(string objrec, string data, int size) hw:void hw_free_document(hwdoc doc) hw:void hw_outputdocument(hwdoc doc) @@ -358,8 +358,8 @@ hw:int hw_documentsize(hwdoc doc) hw:int hw_document_size(hwdoc doc) hw:string hw_documentattributes(hwdoc doc) hw:string hw_document_attributes(hwdoc doc) -hw:array hw_gettqparentsobj(int link, int objid) -hw:array hw_gettqparents(int link, int objid) +hw:array hw_getparentsobj(int link, int objid) +hw:array hw_getparents(int link, int objid) hw:array hw_tqchildren(int link, int objid) hw:array hw_tqchildrenobj(int link, int objid) hw:array hw_getchildcoll(int link, int objid) @@ -379,8 +379,8 @@ hw:void hw_identify(int link, string username, string password) hw:array hw_objrec2array(string objrec, [array format]) hw:string hw_array2objrec(array objarr) hw:array hw_incollections(int link, array objids, array collids, int para) -hw:void hw_inscoll(int link, int tqparentid, array objarr) -hw:void hw_insdoc(int link, int tqparentid, string objrec [, string text]) +hw:void hw_inscoll(int link, int parentid, array objarr) +hw:void hw_insdoc(int link, int parentid, string objrec [, string text]) hw:int hw_getsrcbydestobj(int link, int destid) hw:int hw_mapid(int link, int serverid, int destid) hw:string hw_getrellink(int link, int rootid, int sourceid, int destid) diff --git a/languages/php/doc/php.toc b/languages/php/doc/php.toc index f3feeef8..57a096d2 100644 --- a/languages/php/doc/php.toc +++ b/languages/php/doc/php.toc @@ -806,7 +806,7 @@ <tocsect2 name="DirectoryIterator" url="class.directoryiterator.php"/> <tocsect2 name="FilterIterator" url="class.filteriterator.php"/> <tocsect2 name="LimitIterator" url="class.limititerator.php"/> - <tocsect2 name="ParentIterator" url="class.tqparentiterator.php"/> + <tocsect2 name="ParentIterator" url="class.parentiterator.php"/> <tocsect2 name="RecursiveDirectoryIterator" url="class.recursivedirectoryiterator.php"/> <tocsect2 name="RecursiveIteratorIterator" url="class.recursiveiteratoriterator.php"/> <tocsect2 name="SimpleXMLIterator" url="class.simplexmliterator.php"/> @@ -4026,7 +4026,7 @@ <entry name="Imagick::transverseImage" url="function.imagick-transverseimage.php"/> <entry name="Imagick::trimImage" url="function.imagick-trimimage.php"/> <entry name="Imagick::uniqueImageColors" url="function.imagick-uniqueimagecolors.php"/> -<entry name="Imagick::unsharpMaskImage" url="function.imagick-unsharptqmaskimage.php"/> +<entry name="Imagick::unsharpMaskImage" url="function.imagick-unsharpmaskimage.php"/> <entry name="Imagick::valid" url="function.imagick-valid.php"/> <entry name="Imagick::vignetteImage" url="function.imagick-vignetteimage.php"/> <entry name="Imagick::waveImage" url="function.imagick-waveimage.php"/> @@ -4648,7 +4648,7 @@ <entry name="HaruImage::getSize" url="function.haruimage-getsize.php"/> <entry name="HaruImage::getWidth" url="function.haruimage-getwidth.php"/> <entry name="HaruImage::setColorMask" url="function.haruimage-setcolortqmask.php"/> -<entry name="HaruImage::setMaskImage" url="function.haruimage-settqmaskimage.php"/> +<entry name="HaruImage::setMaskImage" url="function.haruimage-setmaskimage.php"/> <entry name="HaruEncoder::getByteType" url="function.haruencoder-getbytetype.php"/> <entry name="HaruEncoder::getType" url="function.haruencoder-gettype.php"/> <entry name="HaruEncoder::getUnicode" url="function.haruencoder-gettqunicode.php"/> @@ -4706,7 +4706,7 @@ <entry name="SWFDisplayItem->scale()" url="function.swfdisplayitem.scale.php"/> <entry name="SWFDisplayItem->scaleTo()" url="function.swfdisplayitem.scaleto.php"/> <entry name="SWFDisplayItem->setDepth()" url="function.swfdisplayitem.setdepth.php"/> -<entry name="SWFDisplayItem->setMaskLevel()" url="function.swfdisplayitem.settqmasklevel.php"/> +<entry name="SWFDisplayItem->setMaskLevel()" url="function.swfdisplayitem.setmasklevel.php"/> <entry name="SWFDisplayItem->setMatrix()" url="function.swfdisplayitem.setmatrix.php"/> <entry name="SWFDisplayItem->setName()" url="function.swfdisplayitem.setname.php"/> <entry name="SWFDisplayItem->setRatio()" url="function.swfdisplayitem.setratio.php"/> @@ -5288,7 +5288,7 @@ <entry name="parsekit_compile_string" url="function.parsekit-compile-string.php"/> <entry name="parsekit_func_arginfo" url="function.parsekit-func-arginfo.php"/> <entry name="class_implements" url="function.class-implements.php"/> -<entry name="class_parents" url="function.class-tqparents.php"/> +<entry name="class_parents" url="function.class-parents.php"/> <entry name="iterator_count" url="function.iterator-count.php"/> <entry name="iterator_to_array" url="function.iterator-to-array.php"/> <entry name="spl_autoload_call" url="function.spl-autoload-call.php"/> @@ -5356,10 +5356,10 @@ <entry name="LimitIterator::rewind" url="limititerator.rewind.php"/> <entry name="LimitIterator::seek" url="limititerator.seek.php"/> <entry name="LimitIterator::valid" url="limititerator.valid.php"/> -<entry name="ParentIterator::getChildren" url="tqparentiterator.gettqchildren.php"/> -<entry name="ParentIterator::hasChildren" url="tqparentiterator.hastqchildren.php"/> -<entry name="ParentIterator::next" url="tqparentiterator.next.php"/> -<entry name="ParentIterator::rewind" url="tqparentiterator.rewind.php"/> +<entry name="ParentIterator::getChildren" url="parentiterator.gettqchildren.php"/> +<entry name="ParentIterator::hasChildren" url="parentiterator.hastqchildren.php"/> +<entry name="ParentIterator::next" url="parentiterator.next.php"/> +<entry name="ParentIterator::rewind" url="parentiterator.rewind.php"/> <entry name="RecursiveDirectoryIterator::getChildren" url="recursivedirectoryiterator.gettqchildren.php"/> <entry name="RecursiveDirectoryIterator::hasChildren" url="recursivedirectoryiterator.hastqchildren.php"/> <entry name="RecursiveDirectoryIterator::key" url="recursivedirectoryiterator.key.php"/> @@ -5625,8 +5625,8 @@ <entry name="hw_GetObjectByQueryColl" url="function.hw-getobjectbyquerycoll.php"/> <entry name="hw_GetObjectByQueryCollObj" url="function.hw-getobjectbyquerycollobj.php"/> <entry name="hw_GetObjectByQueryObj" url="function.hw-getobjectbyqueryobj.php"/> -<entry name="hw_GetParents" url="function.hw-gettqparents.php"/> -<entry name="hw_GetParentsObj" url="function.hw-gettqparentsobj.php"/> +<entry name="hw_GetParents" url="function.hw-getparents.php"/> +<entry name="hw_GetParentsObj" url="function.hw-getparentsobj.php"/> <entry name="hw_getrellink" url="function.hw-getrellink.php"/> <entry name="hw_GetRemote" url="function.hw-getremote.php"/> <entry name="hw_getremotetqchildren" url="function.hw-getremotetqchildren.php"/> @@ -5696,7 +5696,7 @@ <entry name="hw_api_object->value" url="function.hwapi-object-value.php"/> <entry name="hw_api->object" url="function.hwapi-object.php"/> <entry name="hw_api->objectbyanchor" url="function.hwapi-objectbyanchor.php"/> -<entry name="hw_api->tqparents" url="function.hwapi-tqparents.php"/> +<entry name="hw_api->parents" url="function.hwapi-parents.php"/> <entry name="hw_api_reason->description" url="function.hwapi-reason-description.php"/> <entry name="hw_api_reason->type" url="function.hwapi-reason-type.php"/> <entry name="hw_api->remove" url="function.hwapi-remove.php"/> @@ -5727,7 +5727,7 @@ <entry name="HttpMessage::getHeader" url="function.httpmessage-getheader.php"/> <entry name="HttpMessage::getHeaders" url="function.httpmessage-getheaders.php"/> <entry name="HttpMessage::getHttpVersion" url="function.httpmessage-gethttpversion.php"/> -<entry name="HttpMessage::getParentMessage" url="function.httpmessage-gettqparentmessage.php"/> +<entry name="HttpMessage::getParentMessage" url="function.httpmessage-getparentmessage.php"/> <entry name="HttpMessage::getRequestMethod" url="function.httpmessage-getrequestmethod.php"/> <entry name="HttpMessage::getRequestUrl" url="function.httpmessage-getrequesturl.php"/> <entry name="HttpMessage::getResponseCode" url="function.httpmessage-getresponsecode.php"/> @@ -6856,7 +6856,7 @@ <entry name="DomNode->node_type" url="function.domnode-node-type.php"/> <entry name="DomNode->node_value" url="function.domnode-node-value.php"/> <entry name="DomNode->owner_document" url="function.domnode-owner-document.php"/> -<entry name="DomNode->tqparent_node" url="function.domnode-tqparent-node.php"/> +<entry name="DomNode->parent_node" url="function.domnode-tqparent-node.php"/> <entry name="DomNode->prefix" url="function.domnode-prefix.php"/> <entry name="DomNode->previous_sibling" url="function.domnode-previous-sibling.php"/> <entry name="DomNode->remove_child" url="function.domnode-remove-child.php"/> diff --git a/languages/php/phpconfigwidgetbase.ui b/languages/php/phpconfigwidgetbase.ui index 0c926873..962ac2a9 100644 --- a/languages/php/phpconfigwidgetbase.ui +++ b/languages/php/phpconfigwidgetbase.ui @@ -556,6 +556,6 @@ the internal web browser. Please make sure that the webserver was compiled with <slot>slotPHPIniButtonClicked()</slot> <slot>slotZendButtonClicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/php/phpinfodlg.ui b/languages/php/phpinfodlg.ui index 5d048211..c4f26dfb 100644 --- a/languages/php/phpinfodlg.ui +++ b/languages/php/phpinfodlg.ui @@ -82,6 +82,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/php/phpnewclassdlgbase.ui b/languages/php/phpnewclassdlgbase.ui index 5084fb51..5ddb336a 100644 --- a/languages/php/phpnewclassdlgbase.ui +++ b/languages/php/phpnewclassdlgbase.ui @@ -193,8 +193,8 @@ class CLASSNAME extends BASECLASS { <include location="global" impldecl="in declaration">klineedit.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/languages/python/app_templates/pyqt/documentdetails.ui b/languages/python/app_templates/pyqt/documentdetails.ui index f1298465..104f106a 100644 --- a/languages/python/app_templates/pyqt/documentdetails.ui +++ b/languages/python/app_templates/pyqt/documentdetails.ui @@ -76,5 +76,5 @@ </widget> <includes> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/python/app_templates/pyqt/templates-ui-dialog b/languages/python/app_templates/pyqt/templates-ui-dialog index 4b0c8bb2..92e9bfff 100644 --- a/languages/python/app_templates/pyqt/templates-ui-dialog +++ b/languages/python/app_templates/pyqt/templates-ui-dialog @@ -16,5 +16,5 @@ <string>Form1</string> </property> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/python/app_templates/pyqt/templates-ui-mainwin b/languages/python/app_templates/pyqt/templates-ui-mainwin index 4e0a093b..fd24b2f5 100644 --- a/languages/python/app_templates/pyqt/templates-ui-mainwin +++ b/languages/python/app_templates/pyqt/templates-ui-mainwin @@ -432,5 +432,5 @@ <slot>helpContents()</slot> <slot>helpAbout()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/python/doc/python.toc b/languages/python/doc/python.toc index a4604a97..08f3b21d 100644 --- a/languages/python/doc/python.toc +++ b/languages/python/doc/python.toc @@ -162,7 +162,7 @@ <tocsect3 name="5.2 Atoms" url="ref/atoms.html"> <tocsect4 name="5.2.1 Identifiers (Names)" url="ref/atom-identifiers.html"/> <tocsect4 name="5.2.2 Literals" url="ref/atom-literals.html"/> -<tocsect4 name="5.2.3 Parenthesized forms" url="ref/tqparenthesized.html"/> +<tocsect4 name="5.2.3 Parenthesized forms" url="ref/parenthesized.html"/> <tocsect4 name="5.2.4 List displays" url="ref/lists.html"/> <tocsect4 name="5.2.5 Dictionary displays" url="ref/dict.html"/> <tocsect4 name="5.2.6 String conversions" url="ref/string-conversions.html"/> @@ -1031,7 +1031,7 @@ <entry name="code, block" url="ref/execframes.html#l2h-238"/> <entry name="code block" url="ref/execframes.html#l2h-232"/> <entry name="code object" url="ref/types.html#l2h-124"/> -<entry name="comma" url="ref/tqparenthesized.html#l2h-270"/> +<entry name="comma" url="ref/parenthesized.html#l2h-270"/> <entry name="trailing" url="ref/exprlists.html#l2h-331"/> <entry name="command line" url="ref/programs.html#l2h-439"/> <entry name="comment" url="ref/comments.html#l2h-6"/> @@ -1077,7 +1077,7 @@ <entry name="dictionary object" url="ref/types.html#l2h-96"/> <entry name="display, dictionary" url="ref/dict.html#l2h-274"/> <entry name="display, list" url="ref/lists.html#l2h-271"/> -<entry name="display, tuple" url="ref/tqparenthesized.html#l2h-270"/> +<entry name="display, tuple" url="ref/parenthesized.html#l2h-270"/> <entry name="division" url="ref/binary.html#l2h-309"/> <entry name="divmod() (built-in function)" url="ref/numeric-types.html#l2h-218"/> <entry name="documentation string" url="ref/types.html#l2h-125"/> @@ -1394,7 +1394,7 @@ <entry name="OverflowError (built-in exception)" url="ref/types.html#l2h-33"/> <entry name="packages" url="ref/import.html#l2h-392"/> <entry name="parameter, value, default" url="ref/function.html#l2h-430"/> -<entry name="tqparenthesized form" url="ref/tqparenthesized.html#l2h-268"/> +<entry name="parenthesized form" url="ref/parenthesized.html#l2h-268"/> <entry name="parser" url="ref/lexical.html#l2h-3"/> <entry name="Pascal, language" url="ref/for.html#l2h-416"/> <entry name="pass statement" url="ref/pass.html#l2h-355"/> @@ -1527,7 +1527,7 @@ <entry name="trailing, comma" url="ref/exprlists.html#l2h-331"/> <entry name="triple-quoted string" url="ref/strings.html#l2h-16"/> <entry name="try statement" url="ref/types.html#l2h-129"/> -<entry name="tuple, display" url="ref/tqparenthesized.html#l2h-270"/> +<entry name="tuple, display" url="ref/parenthesized.html#l2h-270"/> <entry name="tuple, empty" url="ref/types.html#l2h-91"/> <entry name="tuple, singleton" url="ref/types.html#l2h-91"/> <entry name="tuple object" url="ref/types.html#l2h-91"/> diff --git a/languages/python/pythonconfigwidgetbase.ui b/languages/python/pythonconfigwidgetbase.ui index 0aa9a5bd..af04041b 100644 --- a/languages/python/pythonconfigwidgetbase.ui +++ b/languages/python/pythonconfigwidgetbase.ui @@ -113,8 +113,8 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp index 3ecc2109..a9efa3e6 100644 --- a/languages/python/pythonsupportpart.cpp +++ b/languages/python/pythonsupportpart.cpp @@ -264,9 +264,9 @@ void PythonSupportPart::parse(const TQString &fileName) lastClass->setFileName( fileName ); lastClass->setStartPosition( lineNo, 0 ); - TQStringList tqparentList = TQStringList::split(",", classre.cap(3)); + TQStringList parentList = TQStringList::split(",", classre.cap(3)); TQStringList::ConstIterator it; - for (it = tqparentList.begin(); it != tqparentList.end(); ++it) { + for (it = parentList.begin(); it != parentList.end(); ++it) { TQString baseName = (*it).stripWhiteSpace(); kdDebug(9014) << "Add tqparent" << baseName << endl; lastClass->addBaseClass( baseName ); diff --git a/languages/ruby/app_templates/kxt/appview_base.ui b/languages/ruby/app_templates/kxt/appview_base.ui index db29d6eb..2249c434 100644 --- a/languages/ruby/app_templates/kxt/appview_base.ui +++ b/languages/ruby/app_templates/kxt/appview_base.ui @@ -29,5 +29,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/ruby/app_templates/kxt/prefs-base.ui b/languages/ruby/app_templates/kxt/prefs-base.ui index 8c8b9012..46a35473 100644 --- a/languages/ruby/app_templates/kxt/prefs-base.ui +++ b/languages/ruby/app_templates/kxt/prefs-base.ui @@ -120,7 +120,7 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp index 706b6284..a11d1c02 100644 --- a/languages/ruby/debugger/dbgtoolbar.cpp +++ b/languages/ruby/debugger/dbgtoolbar.cpp @@ -123,7 +123,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) menu->popup(e->globalPos()); } else { moving_ = true; - offset_ = tqparentWidget()->pos() - e->globalPos(); + offset_ = parentWidget()->pos() - e->globalPos(); setFrameStyle(TQFrame::Panel|TQFrame::Sunken); TQApplication::setOverrideCursor(TQCursor(sizeAllCursor)); setPalette(TQPalette(tqcolorGroup().background())); diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp index 7c987289..b448cbb4 100644 --- a/languages/ruby/debugger/rdbbreakpointwidget.cpp +++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp @@ -460,7 +460,7 @@ void RDBBreakpointWidget::slotSetPendingBPs() /***************************************************************************/ // The debugger is having trouble with this bp - probably because a library -// was unloaded and tqinvalidated a bp that was previously set in the library +// was unloaded and invalidated a bp that was previously set in the library // code. Reset the bp so that we can try again later. void RDBBreakpointWidget::slotUnableToSetBPNow(int BPid) { diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp index 32b5d1ef..fc562baa 100644 --- a/languages/ruby/debugger/variablewidget.cpp +++ b/languages/ruby/debugger/variablewidget.cpp @@ -81,8 +81,8 @@ VariableWidget::VariableWidget(TQWidget *tqparent, const char *name) void VariableWidget::setEnabled(bool bEnabled) { TQWidget::setEnabled(bEnabled); - if (bEnabled && tqparentWidget() != 0) { - varTree_->setColumnWidth(0, tqparentWidget()->width()/2); + if (bEnabled && parentWidget() != 0) { + varTree_->setColumnWidth(0, parentWidget()->width()/2); } } // ************************************************************************** diff --git a/languages/ruby/rubyconfigwidgetbase.ui b/languages/ruby/rubyconfigwidgetbase.ui index 93d020aa..bbddef8c 100644 --- a/languages/ruby/rubyconfigwidgetbase.ui +++ b/languages/ruby/rubyconfigwidgetbase.ui @@ -349,8 +349,8 @@ def cd(dir) Dir.chdir dir end</string> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/languages/sql/sqlconfigwidget.ui b/languages/sql/sqlconfigwidget.ui index 98be3606..e8be196f 100644 --- a/languages/sql/sqlconfigwidget.ui +++ b/languages/sql/sqlconfigwidget.ui @@ -180,8 +180,8 @@ <slot>setProjectDom( TQDomDocument * doc )</slot> <slot>loadConfig()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> |