diff options
Diffstat (limited to 'buildtools/custommakefiles')
6 files changed, 12 insertions, 12 deletions
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> |