diff options
Diffstat (limited to 'buildtools')
44 files changed, 94 insertions, 94 deletions
diff --git a/buildtools/ada/adaproject_optionsdlgbase.ui b/buildtools/ada/adaproject_optionsdlgbase.ui index d6219031..7804c9c3 100644 --- a/buildtools/ada/adaproject_optionsdlgbase.ui +++ b/buildtools/ada/adaproject_optionsdlgbase.ui @@ -461,8 +461,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>tqwidget.h</includehint> <includehint>kurlrequester.h</includehint> diff --git a/buildtools/ant/antoptionswidget.ui b/buildtools/ant/antoptionswidget.ui index e7ba954d..d5dea45a 100644 --- a/buildtools/ant/antoptionswidget.ui +++ b/buildtools/ant/antoptionswidget.ui @@ -162,8 +162,8 @@ <include location="global" impldecl="in implementation">kpushbutton.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>kcombobox.h</includehint> <includehint>kurlrequester.h</includehint> diff --git a/buildtools/ant/classpathwidget.ui b/buildtools/ant/classpathwidget.ui index 52ef6fc5..61c8f305 100644 --- a/buildtools/ant/classpathwidget.ui +++ b/buildtools/ant/classpathwidget.ui @@ -30,8 +30,8 @@ <include location="global" impldecl="in implementation">keditlistbox.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>keditlistbox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/autotools/addapplicationdlgbase.ui b/buildtools/autotools/addapplicationdlgbase.ui index 3380dc4c..234fa8b3 100644 --- a/buildtools/autotools/addapplicationdlgbase.ui +++ b/buildtools/autotools/addapplicationdlgbase.ui @@ -547,6 +547,6 @@ <slot access="protected">iconClicked()</slot> <slot access="protected">removeTypeClicked()</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/buildtools/autotools/addexistingdlgbase.ui b/buildtools/autotools/addexistingdlgbase.ui index e70d5479..47c8dcef 100644 --- a/buildtools/autotools/addexistingdlgbase.ui +++ b/buildtools/autotools/addexistingdlgbase.ui @@ -450,8 +450,8 @@ <include location="global" impldecl="in implementation">kprogress.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>kprogress.h</includehint> <includehint>ksqueezedtextlabel.h</includehint> diff --git a/buildtools/autotools/addfiledlgbase.ui b/buildtools/autotools/addfiledlgbase.ui index 2c73254d..79029915 100644 --- a/buildtools/autotools/addfiledlgbase.ui +++ b/buildtools/autotools/addfiledlgbase.ui @@ -280,8 +280,8 @@ <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"/> <includehints> <includehint>ksqueezedtextlabel.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/autotools/addicondlgbase.ui b/buildtools/autotools/addicondlgbase.ui index ad087c56..14947fe2 100644 --- a/buildtools/autotools/addicondlgbase.ui +++ b/buildtools/autotools/addicondlgbase.ui @@ -266,8 +266,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"/> </UI> diff --git a/buildtools/autotools/addservicedlgbase.ui b/buildtools/autotools/addservicedlgbase.ui index 99370d6e..82b7ee9d 100644 --- a/buildtools/autotools/addservicedlgbase.ui +++ b/buildtools/autotools/addservicedlgbase.ui @@ -539,6 +539,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/buildtools/autotools/addsubprojectdlgbase.ui b/buildtools/autotools/addsubprojectdlgbase.ui index 73851ee4..7505f390 100644 --- a/buildtools/autotools/addsubprojectdlgbase.ui +++ b/buildtools/autotools/addsubprojectdlgbase.ui @@ -190,8 +190,8 @@ <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"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/buildtools/autotools/addtargetdlgbase.ui b/buildtools/autotools/addtargetdlgbase.ui index f8b8d689..763d5984 100644 --- a/buildtools/autotools/addtargetdlgbase.ui +++ b/buildtools/autotools/addtargetdlgbase.ui @@ -340,8 +340,8 @@ <Q_SLOTS> <slot access="protected">primaryChanged()</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>ksqueezedtextlabel.h</includehint> </includehints> diff --git a/buildtools/autotools/autoprojectviewbase.ui b/buildtools/autotools/autoprojectviewbase.ui index 0285c110..625ab370 100644 --- a/buildtools/autotools/autoprojectviewbase.ui +++ b/buildtools/autotools/autoprojectviewbase.ui @@ -116,7 +116,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/buildtools/autotools/choosetargetdlgbase.ui b/buildtools/autotools/choosetargetdlgbase.ui index f41433cd..b754d1f7 100644 --- a/buildtools/autotools/choosetargetdlgbase.ui +++ b/buildtools/autotools/choosetargetdlgbase.ui @@ -211,7 +211,7 @@ <slot access="private">slotSubprojectChanged(const QString&)</slot> <slot access="private">slotTargetChanged(const QString&)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/autotools/configureoptionswidgetbase.ui b/buildtools/autotools/configureoptionswidgetbase.ui index c8374366..35315f76 100644 --- a/buildtools/autotools/configureoptionswidgetbase.ui +++ b/buildtools/autotools/configureoptionswidgetbase.ui @@ -1032,8 +1032,8 @@ headers in a nonstandard directory <include dir></string> <slot access="protected">setDirty()</slot> <slot access="protected">topsourcedirClicked()</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>klineedit.h</includehint> </includehints> diff --git a/buildtools/autotools/managecustomcommandsbase.ui b/buildtools/autotools/managecustomcommandsbase.ui index 47c018ea..3690fa32 100644 --- a/buildtools/autotools/managecustomcommandsbase.ui +++ b/buildtools/autotools/managecustomcommandsbase.ui @@ -121,5 +121,5 @@ <slot>addButton_clicked()</slot> <slot>removeButton_clicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/buildtools/autotools/removefiledlgbase.ui b/buildtools/autotools/removefiledlgbase.ui index 6aaab95e..606d7e0f 100644 --- a/buildtools/autotools/removefiledlgbase.ui +++ b/buildtools/autotools/removefiledlgbase.ui @@ -228,6 +228,6 @@ <include location="global" impldecl="in implementation">ksqueezedtextlabel.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/buildtools/autotools/removetargetdlgbase.ui b/buildtools/autotools/removetargetdlgbase.ui index 860dfb4a..4f8fb286 100644 --- a/buildtools/autotools/removetargetdlgbase.ui +++ b/buildtools/autotools/removetargetdlgbase.ui @@ -254,8 +254,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>ksqueezedtextlabel.h</includehint> <includehint>klistbox.h</includehint> diff --git a/buildtools/autotools/subprojectoptionsdlgbase.ui b/buildtools/autotools/subprojectoptionsdlgbase.ui index 89f5b4f3..be60569f 100644 --- a/buildtools/autotools/subprojectoptionsdlgbase.ui +++ b/buildtools/autotools/subprojectoptionsdlgbase.ui @@ -984,6 +984,6 @@ <slot access="private">addPrefixClicked()</slot> <slot access="private">editPrefixClicked()</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/buildtools/autotools/targetoptionsdlgbase.ui b/buildtools/autotools/targetoptionsdlgbase.ui index 5da3e0b5..4b883535 100644 --- a/buildtools/autotools/targetoptionsdlgbase.ui +++ b/buildtools/autotools/targetoptionsdlgbase.ui @@ -712,8 +712,8 @@ <slot access="protected">outsideMoveUpClicked()</slot> <slot access="protected">outsideRemoveClicked()</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>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui index 619a653b..4858696b 100644 --- a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui +++ b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui @@ -154,8 +154,8 @@ <slot access="protected">makeToggled(bool)</slot> <slot access="protected">otherToggled(bool)</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>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui index 085724c1..ece262fe 100644 --- a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui +++ b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui @@ -385,8 +385,8 @@ <slot access="protected">envRemoved()</slot> <slot access="protected">envCopied()</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>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/custommakefiles/custommanagerwidgetbase.ui b/buildtools/custommakefiles/custommanagerwidgetbase.ui index 4b6c0c92..c74ef412 100644 --- a/buildtools/custommakefiles/custommanagerwidgetbase.ui +++ b/buildtools/custommakefiles/custommanagerwidgetbase.ui @@ -66,7 +66,7 @@ This will be used when adding/removing files in directories and re-populating th </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>keditlistbox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/custommakefiles/customotherconfigwidgetbase.ui b/buildtools/custommakefiles/customotherconfigwidgetbase.ui index 37c1b1ea..ffba0357 100644 --- a/buildtools/custommakefiles/customotherconfigwidgetbase.ui +++ b/buildtools/custommakefiles/customotherconfigwidgetbase.ui @@ -283,6 +283,6 @@ <slot access="protected">envRemoved()</slot> <slot access="protected">envCopied()</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/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index da6ce3cd..4511769b 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -1558,13 +1558,13 @@ bool CustomProjectPart::isInBlacklist( const TQString& path ) const if ( blacklist.tqfind( relpath ) != blacklist.end() ) return true; TQStringList paths = TQStringList::split( "/", relpath ); - TQString tqparentpath; + TQString parentpath; for ( TQStringList::const_iterator it = paths.begin(); it != paths.end(); ++it ) { - tqparentpath += *it; - if ( blacklist.tqfind( tqparentpath ) != blacklist.end() ) + parentpath += *it; + if ( blacklist.tqfind( parentpath ) != blacklist.end() ) return true; - tqparentpath = tqparentpath + "/"; + parentpath = parentpath + "/"; } return false; } diff --git a/buildtools/custommakefiles/selectnewfilesdialogbase.ui b/buildtools/custommakefiles/selectnewfilesdialogbase.ui index 43c3280c..baaa3012 100644 --- a/buildtools/custommakefiles/selectnewfilesdialogbase.ui +++ b/buildtools/custommakefiles/selectnewfilesdialogbase.ui @@ -43,7 +43,7 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/buildtools/lib/parsers/autotools/tests/viewer.cpp b/buildtools/lib/parsers/autotools/tests/viewer.cpp index 66401c2c..293c5817 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer.cpp +++ b/buildtools/lib/parsers/autotools/tests/viewer.cpp @@ -46,7 +46,7 @@ Viewer::Viewer(TQWidget *tqparent, const char *name) files->insertItem(str.readLine()); } ast->setSorting(-1); - tqparentProject.push((TQListViewItem*)0); + parentProject.push((TQListViewItem*)0); } void Viewer::addAll_clicked() @@ -99,12 +99,12 @@ void Viewer::tabWidget2_selected(const TQString& text) void Viewer::processAST(ProjectAST *projectAST, TQListViewItem *globAfter) { TQListViewItem *projectIt; - if (!tqparentProject.top()) + if (!parentProject.top()) projectIt = new TQListViewItem(ast, "Project"); else { if ( projectAST->isConditionalScope() || projectAST->isRule() ) - projectIt = new TQListViewItem(tqparentProject.top(), globAfter, projectAST->scopedID); + projectIt = new TQListViewItem(parentProject.top(), globAfter, projectAST->scopedID); } projectIt->setOpen(true); @@ -150,9 +150,9 @@ void Viewer::processAST(ProjectAST *projectAST, TQListViewItem *globAfter) } case AST::ProjectAST: { ProjectAST *projectAST = static_cast<ProjectAST*>(ast); - tqparentProject.push(projectIt); + parentProject.push(projectIt); processAST(projectAST, after); - tqparentProject.pop(); } + parentProject.pop(); } break; } } diff --git a/buildtools/lib/parsers/autotools/tests/viewer.h b/buildtools/lib/parsers/autotools/tests/viewer.h index c0653020..7665368e 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer.h +++ b/buildtools/lib/parsers/autotools/tests/viewer.h @@ -41,7 +41,7 @@ public slots: virtual void addAll_clicked(); private: AutoTools::ProjectAST *projectAST; - TQValueStack<TQListViewItem *> tqparentProject; + TQValueStack<TQListViewItem *> parentProject; }; #endif diff --git a/buildtools/lib/parsers/autotools/tests/viewerbase.ui b/buildtools/lib/parsers/autotools/tests/viewerbase.ui index 75ed7559..e319e2b4 100644 --- a/buildtools/lib/parsers/autotools/tests/viewerbase.ui +++ b/buildtools/lib/parsers/autotools/tests/viewerbase.ui @@ -216,5 +216,5 @@ <slot>files_currentChanged(QListBoxItem*)</slot> <slot>tabWidget2_selected(const QString&)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/buildtools/lib/parsers/qmake/tests/viewer.cpp b/buildtools/lib/parsers/qmake/tests/viewer.cpp index 6f1e5f25..a10df338 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer.cpp +++ b/buildtools/lib/parsers/qmake/tests/viewer.cpp @@ -47,7 +47,7 @@ Viewer::Viewer(TQWidget *tqparent, const char *name) files->insertItem(str.readLine()); } ast->setSorting(-1); -// tqparentProject.push((TQListViewItem*)0); +// parentProject.push((TQListViewItem*)0); } void Viewer::addAll_clicked() @@ -102,7 +102,7 @@ public: ViewerVisitor(Viewer *v): ASTVisitor() { this->v = v; - tqparentProject.push((TQListViewItem*)0); + parentProject.push((TQListViewItem*)0); } virtual void processProject(ProjectAST *project) @@ -113,39 +113,39 @@ public: virtual void enterRealProject(ProjectAST *project) { TQListViewItem *projectIt; - if (!tqparentProject.top()) + if (!parentProject.top()) { projectIt = new TQListViewItem(v->ast, "Project"); projectIt->setOpen(true); - tqparentProject.push(projectIt); + parentProject.push(projectIt); } ASTVisitor::enterRealProject(project); } virtual void enterScope(ProjectAST *scope) { - TQListViewItem *projectIt = new TQListViewItem(tqparentProject.top(), scope->scopedID, "scope"); - tqparentProject.push(projectIt); + TQListViewItem *projectIt = new TQListViewItem(parentProject.top(), scope->scopedID, "scope"); + parentProject.push(projectIt); ASTVisitor::enterScope(scope); } virtual void leaveScope(ProjectAST *scope) { - tqparentProject.pop(); + parentProject.pop(); } virtual void enterFunctionScope(ProjectAST *fscope) { - TQListViewItem *projectIt = new TQListViewItem(tqparentProject.top(), + TQListViewItem *projectIt = new TQListViewItem(parentProject.top(), fscope->scopedID + "(" + fscope->args + ")", "function scope"); - tqparentProject.push(projectIt); + parentProject.push(projectIt); ASTVisitor::enterFunctionScope(fscope); } virtual void leaveFunctionScope(ProjectAST *fscope) { - tqparentProject.pop(); + parentProject.pop(); } virtual void processAssignment(AssignmentAST *assignment) { - TQListViewItem *item = new TQListViewItem(tqparentProject.top(), + TQListViewItem *item = new TQListViewItem(parentProject.top(), assignment->scopedID, assignment->op, assignment->values.join("|"), "assignment"); item->setMultiLinesEnabled(true); @@ -154,22 +154,22 @@ public: } virtual void processNewLine(NewLineAST *newline) { - new TQListViewItem(tqparentProject.top(), "<newline>"); + new TQListViewItem(parentProject.top(), "<newline>"); ASTVisitor::processNewLine(newline); } virtual void processComment(CommentAST *comment) { - new TQListViewItem(tqparentProject.top(), "<comment>"); + new TQListViewItem(parentProject.top(), "<comment>"); ASTVisitor::processComment(comment); } virtual void processInclude(IncludeAST *include) { - new TQListViewItem(tqparentProject.top(), "<include>", include->projectName); + new TQListViewItem(parentProject.top(), "<include>", include->projectName); TQMake::ASTVisitor::processInclude(include); } Viewer *v; - TQValueStack<TQListViewItem *> tqparentProject; + TQValueStack<TQListViewItem *> parentProject; }; diff --git a/buildtools/lib/parsers/qmake/tests/viewerbase.ui b/buildtools/lib/parsers/qmake/tests/viewerbase.ui index c37f41bf..1308cc1d 100644 --- a/buildtools/lib/parsers/qmake/tests/viewerbase.ui +++ b/buildtools/lib/parsers/qmake/tests/viewerbase.ui @@ -246,5 +246,5 @@ <slot>files_currentChanged( QListBoxItem * )</slot> <slot>tabWidget2_selected( const QString & )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/buildtools/lib/widgets/environmentdisplaydialogbase.ui b/buildtools/lib/widgets/environmentdisplaydialogbase.ui index 41d8d4e6..e19d27a0 100644 --- a/buildtools/lib/widgets/environmentdisplaydialogbase.ui +++ b/buildtools/lib/widgets/environmentdisplaydialogbase.ui @@ -104,7 +104,7 @@ <slot>accept()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/buildtools/lib/widgets/environmentvariableswidgetbase.ui b/buildtools/lib/widgets/environmentvariableswidgetbase.ui index 9c8f9077..c06239f7 100644 --- a/buildtools/lib/widgets/environmentvariableswidgetbase.ui +++ b/buildtools/lib/widgets/environmentvariableswidgetbase.ui @@ -195,6 +195,6 @@ <slot>editVarClicked()</slot> <slot>environmentClicked()</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/buildtools/lib/widgets/makeoptionswidgetbase.ui b/buildtools/lib/widgets/makeoptionswidgetbase.ui index 91e77362..4f0829ae 100644 --- a/buildtools/lib/widgets/makeoptionswidgetbase.ui +++ b/buildtools/lib/widgets/makeoptionswidgetbase.ui @@ -189,6 +189,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/buildtools/lib/widgets/removesubprojectdlgbase.ui b/buildtools/lib/widgets/removesubprojectdlgbase.ui index a89b9107..e891ff07 100644 --- a/buildtools/lib/widgets/removesubprojectdlgbase.ui +++ b/buildtools/lib/widgets/removesubprojectdlgbase.ui @@ -149,6 +149,6 @@ <slot>accept()</slot> <slot>reject()</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/buildtools/lib/widgets/runoptionswidgetbase.ui b/buildtools/lib/widgets/runoptionswidgetbase.ui index 3dbb74ca..8134aead 100644 --- a/buildtools/lib/widgets/runoptionswidgetbase.ui +++ b/buildtools/lib/widgets/runoptionswidgetbase.ui @@ -242,8 +242,8 @@ <Q_SLOTS> <slot>mainProgramChanged()</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>klineedit.h</includehint> <includehint>kurlrequester.h</includehint> diff --git a/buildtools/lib/widgets/subclassesdlgbase.ui b/buildtools/lib/widgets/subclassesdlgbase.ui index ebe62880..100100cb 100644 --- a/buildtools/lib/widgets/subclassesdlgbase.ui +++ b/buildtools/lib/widgets/subclassesdlgbase.ui @@ -214,8 +214,8 @@ <slot access="protected">newRelation()</slot> <slot access="protected">currentRelationChanged(TQListBoxItem *item)</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>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/pascal/pascalproject_optionsdlgbase.ui b/buildtools/pascal/pascalproject_optionsdlgbase.ui index a00c026f..f3ffb8c2 100644 --- a/buildtools/pascal/pascalproject_optionsdlgbase.ui +++ b/buildtools/pascal/pascalproject_optionsdlgbase.ui @@ -464,8 +464,8 @@ <slot access="protected">setDirty()</slot> <slot access="protected">setDefaultOptions()</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>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/qmake/choosesubprojectdlgbase.ui b/buildtools/qmake/choosesubprojectdlgbase.ui index fa8051e6..df01a06c 100644 --- a/buildtools/qmake/choosesubprojectdlgbase.ui +++ b/buildtools/qmake/choosesubprojectdlgbase.ui @@ -126,7 +126,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/buildtools/qmake/createscopedlgbase.ui b/buildtools/qmake/createscopedlgbase.ui index 1c6cde9e..4ba7212e 100644 --- a/buildtools/qmake/createscopedlgbase.ui +++ b/buildtools/qmake/createscopedlgbase.ui @@ -316,7 +316,7 @@ <tabstop>incUrl</tabstop> <tabstop>checkNotInc</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/qmake/disablesubprojectdlgbase.ui b/buildtools/qmake/disablesubprojectdlgbase.ui index edc2856c..d7b78289 100644 --- a/buildtools/qmake/disablesubprojectdlgbase.ui +++ b/buildtools/qmake/disablesubprojectdlgbase.ui @@ -117,7 +117,7 @@ <slot>accept()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/buildtools/qmake/newwidgetdlgbase.ui b/buildtools/qmake/newwidgetdlgbase.ui index 404fa7d3..178fa761 100644 --- a/buildtools/qmake/newwidgetdlgbase.ui +++ b/buildtools/qmake/newwidgetdlgbase.ui @@ -224,6 +224,6 @@ <slot>subclassingPressed()</slot> <slot>templateSelChanged()</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/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui index 0ce31c82..2df4d131 100644 --- a/buildtools/qmake/projectconfigurationdlgbase.ui +++ b/buildtools/qmake/projectconfigurationdlgbase.ui @@ -2836,8 +2836,8 @@ <slot>activateApply( TQListViewItem * )</slot> <slot>customVarChanged()</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> diff --git a/buildtools/qmake/qmakeoptionswidgetbase.ui b/buildtools/qmake/qmakeoptionswidgetbase.ui index 0f3d52d1..312536bc 100644 --- a/buildtools/qmake/qmakeoptionswidgetbase.ui +++ b/buildtools/qmake/qmakeoptionswidgetbase.ui @@ -208,7 +208,7 @@ This disables the reading of any .qmake.cache files or mkspecs.</string> </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp index c49bbe79..f3cebef2 100644 --- a/buildtools/qmake/qmakescopeitem.cpp +++ b/buildtools/qmake/qmakescopeitem.cpp @@ -807,9 +807,9 @@ QMakeScopeItem* QMakeScopeItem::projectFileItem() { if( scope->scopeType() != Scope::ProjectScope ) { - QMakeScopeItem* tqparentitem = dynamic_cast<QMakeScopeItem*>(tqparent()); - if( tqparentitem ) - return tqparentitem->projectFileItem(); + QMakeScopeItem* parentitem = dynamic_cast<QMakeScopeItem*>(tqparent()); + if( parentitem ) + return parentitem->projectFileItem(); } return this; } diff --git a/buildtools/script/scriptoptionswidgetbase.ui b/buildtools/script/scriptoptionswidgetbase.ui index a73c8683..7ac003f4 100644 --- a/buildtools/script/scriptoptionswidgetbase.ui +++ b/buildtools/script/scriptoptionswidgetbase.ui @@ -150,6 +150,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> |