TDE
/
tdevelop
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdevelop
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove the tq in front of these incorrectly TQt4-converted methods/data members:

Browse Source 
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 82324bf130
commit 539a1fd1ae
330 changed files with 1198 additions and 1198 deletions
Show Stats Download Patch File Download Diff File

4
buildtools/ada/adaproject_optionsdlgbase.ui
Unescape View File

@ -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>

4
buildtools/ant/antoptionswidget.ui
Unescape View File

@ -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>

4
buildtools/ant/classpathwidget.ui
Unescape View File

@ -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>

4
buildtools/autotools/addapplicationdlgbase.ui
Unescape View File

@ -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>

4
buildtools/autotools/addexistingdlgbase.ui
Unescape View File

@ -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>

4
buildtools/autotools/addfiledlgbase.ui
Unescape View File

@ -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>

4
buildtools/autotools/addicondlgbase.ui
Unescape View File

@ -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>

4
buildtools/autotools/addservicedlgbase.ui
Unescape View File

@ -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>

4
buildtools/autotools/addsubprojectdlgbase.ui
Unescape View File

@ -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>

4
buildtools/autotools/addtargetdlgbase.ui
Unescape View File

@ -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>

2
buildtools/autotools/autoprojectviewbase.ui
Unescape View File

@ -116,7 +116,7 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>

2
buildtools/autotools/choosetargetdlgbase.ui
Unescape View File

@ -211,7 +211,7 @@
<slot access="private">slotSubprojectChanged(const QString&amp;)</slot>
<slot access="private">slotTargetChanged(const QString&amp;)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>

4
buildtools/autotools/configureoptionswidgetbase.ui
Unescape View File

@ -1032,8 +1032,8 @@ headers in a nonstandard directory &lt;include dir&gt;</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>

2
buildtools/autotools/managecustomcommandsbase.ui
Unescape View File

@ -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>

4
buildtools/autotools/removefiledlgbase.ui
Unescape View File

@ -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>

4
buildtools/autotools/removetargetdlgbase.ui
Unescape View File

@ -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>

4
buildtools/autotools/subprojectoptionsdlgbase.ui
Unescape View File

@ -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>

4
buildtools/autotools/targetoptionsdlgbase.ui
Unescape View File

@ -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>

4
buildtools/custommakefiles/custombuildoptionswidgetbase.ui
Unescape View File

@ -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>

4
buildtools/custommakefiles/custommakeconfigwidgetbase.ui
Unescape View File

@ -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>

2
buildtools/custommakefiles/custommanagerwidgetbase.ui
Unescape View File

@ -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>

4
buildtools/custommakefiles/customotherconfigwidgetbase.ui
Unescape View File

@ -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>

8
buildtools/custommakefiles/customprojectpart.cpp
Unescape View File

@ -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;
}

2
buildtools/custommakefiles/selectnewfilesdialogbase.ui
Unescape View File

@ -43,7 +43,7 @@
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>

10
buildtools/lib/parsers/autotools/tests/viewer.cpp
Unescape View File

@ -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;
}
}

2
buildtools/lib/parsers/autotools/tests/viewer.h
Unescape View File

@ -41,7 +41,7 @@ public slots:
virtual void addAll_clicked();
private:
AutoTools::ProjectAST *projectAST;
TQValueStack<TQListViewItem *> tqparentProject;
TQValueStack<TQListViewItem *> parentProject;
};
#endif

2
buildtools/lib/parsers/autotools/tests/viewerbase.ui
Unescape View File

@ -216,5 +216,5 @@
<slot>files_currentChanged(QListBoxItem*)</slot>
<slot>tabWidget2_selected(const QString&amp;)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

30
buildtools/lib/parsers/qmake/tests/viewer.cpp
Unescape View File

@ -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;
};

2
buildtools/lib/parsers/qmake/tests/viewerbase.ui
Unescape View File

@ -246,5 +246,5 @@
<slot>files_currentChanged( QListBoxItem * )</slot>
<slot>tabWidget2_selected( const QString &amp; )</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
buildtools/lib/widgets/environmentdisplaydialogbase.ui
Unescape View File

@ -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>

4
buildtools/lib/widgets/environmentvariableswidgetbase.ui
Unescape View File

@ -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>

4
buildtools/lib/widgets/makeoptionswidgetbase.ui
Unescape View File

@ -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>

4
buildtools/lib/widgets/removesubprojectdlgbase.ui
Unescape View File

@ -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>

4
buildtools/lib/widgets/runoptionswidgetbase.ui
Unescape View File

@ -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>

4
buildtools/lib/widgets/subclassesdlgbase.ui
Unescape View File

@ -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>

4
buildtools/pascal/pascalproject_optionsdlgbase.ui
Unescape View File

@ -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>

2
buildtools/qmake/choosesubprojectdlgbase.ui
Unescape View File

@ -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>

2
buildtools/qmake/createscopedlgbase.ui
Unescape View File

@ -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>

2
buildtools/qmake/disablesubprojectdlgbase.ui
Unescape View File

@ -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>

4
buildtools/qmake/newwidgetdlgbase.ui
Unescape View File

@ -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>

4
buildtools/qmake/projectconfigurationdlgbase.ui
Unescape View File

@ -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>

2
buildtools/qmake/qmakeoptionswidgetbase.ui
Unescape View File

@ -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>

6
buildtools/qmake/qmakescopeitem.cpp
Unescape View File

@ -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;
}

4
buildtools/script/scriptoptionswidgetbase.ui
Unescape View File

@ -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>

4
editors/editor-chooser/editchooser.ui
Unescape View File

@ -125,6 +125,6 @@ already open files.</string>
<Q_SLOTS>
<slot>slotEditPartChanged(const QString &amp;)</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>

4
embedded/visualboyadvance/vbaconfigwidgetbase.ui
Unescape View File

@ -243,7 +243,7 @@
<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>

2
kdevdesigner/designer/about.ui
Unescape View File

@ -215,5 +215,5 @@
</includes>
<pixmapfunction>BarIcon2</pixmapfunction>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kdevdesigner/designer/actiondnd.cpp
Unescape View File

@ -253,7 +253,7 @@ void QDesignerToolBar::findFormWindow()
formWindow = ::tqqt_cast<FormWindow*>(w);
if ( formWindow )
break;
w = w->tqparentWidget();
w = w->parentWidget();
}
}

4
kdevdesigner/designer/actioneditor.ui
Unescape View File

@ -40,7 +40,7 @@
<property name="caption">
<string>Edit Actions</string>
</property>
<property name="tqlayoutMargin" stdset="0">
<property name="layoutMargin" stdset="0">
</property>
<vbox>
<property name="name">
@ -223,5 +223,5 @@
</includes>
<pixmapfunction>BarIcon2</pixmapfunction>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

50
kdevdesigner/designer/command.cpp
Unescape View File

@ -244,7 +244,7 @@ void ResizeCommand::execute()
widget->setGeometry( newRect );
formWindow()->updateSelection( widget );
formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) );
if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout )
if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout )
formWindow()->updateChildSelections( widget );
}
@ -253,7 +253,7 @@ void ResizeCommand::unexecute()
widget->setGeometry( oldRect );
formWindow()->updateSelection( widget );
formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) );
if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout )
if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout )
formWindow()->updateChildSelections( widget );
}
@ -320,7 +320,7 @@ bool MoveCommand::canMerge( Command *c )
void MoveCommand::execute()
{
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout ) {
if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) {
if ( newParent && oldParent && newParent != oldParent ) {
TQPoint pos = newParent->mapFromGlobal( w->mapToGlobal( TQPoint( 0,0 ) ) );
w->reparent( newParent, pos, TRUE );
@ -341,7 +341,7 @@ void MoveCommand::execute()
void MoveCommand::unexecute()
{
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout ) {
if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) {
if ( newParent && oldParent && newParent != oldParent ) {
TQPoint pos = oldParent->mapFromGlobal( w->mapToGlobal( TQPoint( 0,0 ) ) );
w->reparent( oldParent, pos, TRUE );
@ -546,7 +546,7 @@ bool SetPropertyCommand::checkProperty()
}
if ( ::tqqt_cast<FormWindow*>(widget->tqparent()) )
formWindow()->mainWindow()->formNameChanged( (FormWindow*)((TQWidget*)(TQObject*)widget)->tqparentWidget() );
formWindow()->mainWindow()->formNameChanged( (FormWindow*)((TQWidget*)(TQObject*)widget)->parentWidget() );
}
return TRUE;
}
@ -583,12 +583,12 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
if ( v.toBool() )
align |= WordBreak;
widget->setProperty( "tqalignment", TQVariant( align ) );
} else if ( propName == "tqlayoutSpacing" ) {
} else if ( propName == "layoutSpacing" ) {
TQVariant val = v;
if ( val.toString() == "default" )
val = -1;
MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), val.toInt() );
} else if ( propName == "tqlayoutMargin" ) {
} else if ( propName == "layoutMargin" ) {
TQVariant val = v;
if ( val.toString() == "default" )
val = -1;
@ -672,9 +672,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
// ------------------------------------------------------------
LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl )
: Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase )
: Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase )
{
}
@ -695,9 +695,9 @@ void LayoutHorizontalCommand::unexecute()
// ------------------------------------------------------------
LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl )
: Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, TRUE, TRUE )
: Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, TRUE, TRUE )
{
}
@ -718,9 +718,9 @@ void LayoutHorizontalSplitCommand::unexecute()
// ------------------------------------------------------------
LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl )
: Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase )
: Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase )
{
}
@ -741,9 +741,9 @@ void LayoutVerticalCommand::unexecute()
// ------------------------------------------------------------
LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl )
: Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, TRUE, TRUE )
: Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, TRUE, TRUE )
{
}
@ -764,9 +764,9 @@ void LayoutVerticalSplitCommand::unexecute()
// ------------------------------------------------------------
LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl, int xres, int yres )
: Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) )
: Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) )
{
}
@ -787,19 +787,19 @@ void LayoutGridCommand::unexecute()
// ------------------------------------------------------------
BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw,
TQWidget *tqlayoutBase, const TQWidgetList &wl )
: Command( n, fw ), lb( tqlayoutBase ), widgets( wl )
TQWidget *layoutBase, const TQWidgetList &wl )
: Command( n, fw ), lb( layoutBase ), widgets( wl )
{
WidgetFactory::LayoutType lay = WidgetFactory::tqlayoutType( tqlayoutBase );
spacing = MetaDataBase::spacing( TQT_TQOBJECT(tqlayoutBase) );
margin = MetaDataBase::margin( TQT_TQOBJECT(tqlayoutBase) );
WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase );
spacing = MetaDataBase::spacing( TQT_TQOBJECT(layoutBase) );
margin = MetaDataBase::margin( TQT_TQOBJECT(layoutBase) );
tqlayout = 0;
if ( lay == WidgetFactory::HBox )
tqlayout = new HorizontalLayout( wl, tqlayoutBase, fw, tqlayoutBase, FALSE, ::tqqt_cast<TQSplitter*>(tqlayoutBase) != 0 );
tqlayout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 );
else if ( lay == WidgetFactory::VBox )
tqlayout = new VerticalLayout( wl, tqlayoutBase, fw, tqlayoutBase, FALSE, ::tqqt_cast<TQSplitter*>(tqlayoutBase) != 0 );
tqlayout = new VerticalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 );
else if ( lay == WidgetFactory::Grid )
tqlayout = new GridLayout( wl, tqlayoutBase, fw, tqlayoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), FALSE );
tqlayout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), FALSE );
}
void BreakLayoutCommand::execute()

12
kdevdesigner/designer/command.h
Unescape View File

@ -282,7 +282,7 @@ class LayoutHorizontalCommand : public Command
{
public:
LayoutHorizontalCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl );
void execute();
@ -298,7 +298,7 @@ class LayoutHorizontalSplitCommand : public Command
{
public:
LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl );
void execute();
@ -314,7 +314,7 @@ class LayoutVerticalCommand : public Command
{
public:
LayoutVerticalCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl );
void execute();
@ -330,7 +330,7 @@ class LayoutVerticalSplitCommand : public Command
{
public:
LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl );
void execute();
@ -346,7 +346,7 @@ class LayoutGridCommand : public Command
{
public:
LayoutGridCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl, int xres, int yres );
void execute();
@ -362,7 +362,7 @@ class BreakLayoutCommand : public Command
{
public:
BreakLayoutCommand( const TQString &n, FormWindow *fw,
TQWidget *tqlayoutBase, const TQWidgetList &wl );
TQWidget *layoutBase, const TQWidgetList &wl );
void execute();
void unexecute();

2
kdevdesigner/designer/configtoolboxdialog.ui
Unescape View File

@ -322,5 +322,5 @@
</includes>
<pixmapfunction>BarIcon2</pixmapfunction>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kdevdesigner/designer/connectiondialog.ui
Unescape View File

@ -215,5 +215,5 @@
<slot>updateConnectionContainers()</slot>
<slot>ensureConnectionVisible()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kdevdesigner/designer/createtemplate.ui
Unescape View File

@ -188,7 +188,7 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
</includehints>

2
kdevdesigner/designer/dbconnection.ui
Unescape View File

@ -218,5 +218,5 @@
<slot access="protected">init()</slot>
<slot access="protected">destroy()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

26
kdevdesigner/designer/designerappiface.cpp
Unescape View File

@ -631,41 +631,41 @@ void DesignerFormWindowImpl::checkAccels()
{
}
void DesignerFormWindowImpl::tqlayoutH()
void DesignerFormWindowImpl::layoutH()
{
formWindow->tqlayoutHorizontal();
formWindow->layoutHorizontal();
}
void DesignerFormWindowImpl::tqlayoutV()
void DesignerFormWindowImpl::layoutV()
{
}
void DesignerFormWindowImpl::tqlayoutHSplit()
void DesignerFormWindowImpl::layoutHSplit()
{
}
void DesignerFormWindowImpl::tqlayoutVSplit()
void DesignerFormWindowImpl::layoutVSplit()
{
}
void DesignerFormWindowImpl::tqlayoutG()
void DesignerFormWindowImpl::layoutG()
{
formWindow->tqlayoutGrid();
formWindow->layoutGrid();
}
void DesignerFormWindowImpl::tqlayoutHContainer( TQWidget* w )
void DesignerFormWindowImpl::layoutHContainer( TQWidget* w )
{
formWindow->tqlayoutHorizontalContainer( w );
formWindow->layoutHorizontalContainer( w );
}
void DesignerFormWindowImpl::tqlayoutVContainer( TQWidget* w )
void DesignerFormWindowImpl::layoutVContainer( TQWidget* w )
{
formWindow->tqlayoutVerticalContainer( w );
formWindow->layoutVerticalContainer( w );
}
void DesignerFormWindowImpl::tqlayoutGContainer( TQWidget* w )
void DesignerFormWindowImpl::layoutGContainer( TQWidget* w )
{
formWindow->tqlayoutGridContainer( w );
formWindow->layoutGridContainer( w );
}
void DesignerFormWindowImpl::breakLayout()

16
kdevdesigner/designer/designerappiface.h
Unescape View File

@ -186,14 +186,14 @@ public:
void adjustSize();
void editConnections();
void checkAccels();
void tqlayoutH();
void tqlayoutV();
void tqlayoutHSplit();
void tqlayoutVSplit();
void tqlayoutG();
void tqlayoutHContainer( TQWidget* w );
void tqlayoutVContainer( TQWidget* w );
void tqlayoutGContainer( TQWidget* w );
void layoutH();
void layoutV();
void layoutHSplit();
void layoutVSplit();
void layoutG();
void layoutHContainer( TQWidget* w );
void layoutVContainer( TQWidget* w );
void layoutGContainer( TQWidget* w );
void breakLayout();
void selectWidget( TQWidget * );
void selectAll();

2
kdevdesigner/designer/editfunctions.ui
Unescape View File

@ -710,5 +710,5 @@
<slot access="protected">functionRemove()</slot>
<slot access="protected">displaySlots( bool )</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kdevdesigner/designer/finddialog.ui
Unescape View File

@ -270,5 +270,5 @@
<slot>doFind()</slot>
<slot>setEditor( EditorInterface * e, TQObject * fw )</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

14
kdevdesigner/designer/formsettings.ui
Unescape View File

@ -113,10 +113,10 @@
<bool>false</bool>
</property>
<property name="toolTip" stdset="0">
<string>Specify Pixmap-Loader function (only the function's name, no tqparentheses.)</string>
<string>Specify Pixmap-Loader function (only the function's name, no parentheses.)</string>
</property>
<property name="whatsThis" stdset="0">
<string>&lt;b&gt;Specify Pixmap-Loader function&lt;/b&gt;&lt;p&gt;Specify the function which should be used for loading a pixmap in the generated code. &lt;em&gt;Only enter the function's name, without tqparentheses.&lt;/em&gt;</string>
<string>&lt;b&gt;Specify Pixmap-Loader function&lt;/b&gt;&lt;p&gt;Specify the function which should be used for loading a pixmap in the generated code. &lt;em&gt;Only enter the function's name, without parentheses.&lt;/em&gt;</string>
</property>
</widget>
<widget class="TQRadioButton" row="1" column="0">
@ -380,10 +380,10 @@
<bool>false</bool>
</property>
<property name="toolTip" stdset="0">
<string>Specify spacing function (only the function's name, no tqparentheses.)</string>
<string>Specify spacing function (only the function's name, no parentheses.)</string>
</property>
<property name="whatsThis" stdset="0">
<string>&lt;b&gt;Specify spacing function&lt;/b&gt;&lt;p&gt;Specify the function which should be used for getting the spacing in the generated code. &lt;em&gt;Only enter the function's name, without tqparentheses.&lt;/em&gt;</string>
<string>&lt;b&gt;Specify spacing function&lt;/b&gt;&lt;p&gt;Specify the function which should be used for getting the spacing in the generated code. &lt;em&gt;Only enter the function's name, without parentheses.&lt;/em&gt;</string>
</property>
</widget>
<widget class="KLineEdit" row="3" column="1" rowspan="1" colspan="3">
@ -402,10 +402,10 @@
</sizepolicy>
</property>
<property name="toolTip" stdset="0">
<string>Specify margin function (only the function's name, no tqparentheses.)</string>
<string>Specify margin function (only the function's name, no parentheses.)</string>
</property>
<property name="whatsThis" stdset="0">
<string>&lt;b&gt;Specify margin function&lt;/b&gt;&lt;p&gt;Specify the function which should be used for getting the margin in the generated code. &lt;em&gt;Only enter the function's name, without tqparentheses.&lt;/em&gt;</string>
<string>&lt;b&gt;Specify margin function&lt;/b&gt;&lt;p&gt;Specify the function which should be used for getting the margin in the generated code. &lt;em&gt;Only enter the function's name, without parentheses.&lt;/em&gt;</string>
</property>
</widget>
</grid>
@ -545,5 +545,5 @@
<Q_SLOTS>
<slot>okClicked()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

4
kdevdesigner/designer/formsettingsimpl.cpp
Unescape View File

@ -63,8 +63,8 @@ FormSettings::FormSettings( TQWidget *tqparent, FormWindow *fw )
radioPixmapFunction->setChecked( TRUE );
editPixmapFunction->setText( formwindow->pixmapLoaderFunction() );
radioProjectImageFile->setEnabled( !fw->project()->isDummy() );
spinSpacing->setValue( formwindow->tqlayoutDefaultSpacing() );
spinMargin->setValue( formwindow->tqlayoutDefaultMargin() );
spinSpacing->setValue( formwindow->layoutDefaultSpacing() );
spinMargin->setValue( formwindow->layoutDefaultMargin() );
editSpacingFunction->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editSpacingFunction) ) );
editMarginFunction->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editMarginFunction) ) );
checkLayoutFunctions->setChecked( formwindow->hasLayoutFunctions() );

120
kdevdesigner/designer/formwindow.cpp
Unescape View File

@ -540,10 +540,10 @@ void FormWindow::handleContextMenu( TQContextMenuEvent *e, TQWidget *w )
selectWidget( TQT_TQOBJECT(w) );
// if widget is laid out, find the first non-laid out super-widget
TQWidget *realWidget = w; // but store the original one
while ( w->tqparentWidget() &&
( WidgetFactory::tqlayoutType( w->tqparentWidget()) != WidgetFactory::NoLayout ||
while ( w->parentWidget() &&
( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout ||
!insertedWidgets.tqfind(w) ) )
w = w->tqparentWidget();
w = w->parentWidget();
if ( ::tqqt_cast<TQMainWindow*>(mainContainer()) && ((TQMainWindow*)mainContainer())->centralWidget() == realWidget ) {
e->accept();
mainwindow->popupFormWindowMenu( e->globalPos(), this );
@ -578,7 +578,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
case POINTER_TOOL:
if ( !isMainContainer( TQT_TQOBJECT(w) ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget
// if the clicked widget is not in a tqlayout, raise it
if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout )
if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout )
w->raise();
if ( ( e->state() & ControlButton ) ) { // with control pressed, always start rubber band selection
drawRubber = TRUE;
@ -593,7 +593,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
clearSelection( FALSE );
} else { // ...widget selected
// only if widget has a tqlayout (it is a tqlayout meta widget or a laid out container!), unselect its childs
if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout ) {
if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ) {
TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
setPropertyShowingBlocked( TRUE );
for ( TQObject *o = l->first(); o; o = l->next() ) {
@ -618,9 +618,9 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
selectWidget( TQT_TQOBJECT(w) );
// if widget is laid out, find the first non-laid out super-widget
while ( w->tqparentWidget() &&
( WidgetFactory::tqlayoutType( w->tqparentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.tqfind(w) ) )
w = w->tqparentWidget();
while ( w->parentWidget() &&
( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.tqfind(w) ) )
w = w->parentWidget();
if ( e->button() == Qt::LeftButton ) { // left button: store original tqgeometry and more as the widget might start moving
widgetPressed = TRUE;
@ -629,10 +629,10 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
origPressPos = oldPressPos;
checkedSelectionsForMove = FALSE;
moving.clear();
if ( w->tqparentWidget() && !isMainContainer( TQT_TQOBJECT(w->tqparentWidget()) ) && !isCentralWidget( TQT_TQOBJECT(w->tqparentWidget()) ) ) {
targetContainer = w->tqparentWidget();
hadOwnPalette = w->tqparentWidget()->ownPalette();
restorePalette = w->tqparentWidget()->palette();
if ( w->parentWidget() && !isMainContainer( TQT_TQOBJECT(w->parentWidget()) ) && !isCentralWidget( TQT_TQOBJECT(w->parentWidget()) ) ) {
targetContainer = w->parentWidget();
hadOwnPalette = w->parentWidget()->ownPalette();
restorePalette = w->parentWidget()->palette();
}
}
} else { // press was on the formwindow
@ -702,7 +702,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
insertParent = WidgetFactory::containerOfWidget( wid ); // found another tqparent, store it
break;
} else {
wid = wid->tqparentWidget();
wid = wid->parentWidget();
if ( !wid )
break;
}
@ -756,9 +756,9 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
if ( widgetPressed && allowMove( w ) ) { // we are prepated for a move
// if widget is laid out, find the first non-laid out super-widget
while ( w->tqparentWidget() &&
( WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout || !insertedWidgets.tqfind(w ) ) )
w = w->tqparentWidget();
while ( w->parentWidget() &&
( WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout || !insertedWidgets.tqfind(w ) ) )
w = w->parentWidget();
// calc correct position
TQPoint pos = w->mapFromGlobal( e->globalPos() );
@ -770,10 +770,10 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
pos.setX( w->mapFromParent( TQPoint( 0, mpos.y() ) ).x() );
if ( mpos.y() < 0 )
pos.setY( w->mapFromParent( TQPoint( mpos.x(), 0 ) ).y() );
if ( mpos.x() > w->tqparentWidget()->width() )
pos.setX( w->mapFromParent( TQPoint( w->tqparentWidget()->width(), mpos.y() ) ).x() );
if ( mpos.y() > w->tqparentWidget()->height() )
pos.setY( w->mapFromParent( TQPoint( mpos.x(), w->tqparentWidget()->height() ) ).y() );
if ( mpos.x() > w->parentWidget()->width() )
pos.setX( w->mapFromParent( TQPoint( w->parentWidget()->width(), mpos.y() ) ).x() );
if ( mpos.y() > w->parentWidget()->height() )
pos.setY( w->mapFromParent( TQPoint( mpos.x(), w->parentWidget()->height() ) ).y() );
#endif
// calc move distance and store it
@ -876,7 +876,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
currentPos = mapFromGlobal( e->globalPos() );
tqApp->processEvents();
if ( drawRecRect )
restoreRect( TQRect( mapToForm( ( (TQWidget*)oldendWidget )->tqparentWidget(), ( (TQWidget*)oldendWidget )->pos() ),
restoreRect( TQRect( mapToForm( ( (TQWidget*)oldendWidget )->parentWidget(), ( (TQWidget*)oldendWidget )->pos() ),
( (TQWidget*)oldendWidget )->size() ) );
drawConnectionLine();
break;
@ -906,7 +906,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
currentPos = mapFromGlobal( e->globalPos() );
tqApp->processEvents();
if ( drawRecRect && oldendWidget )
restoreRect( TQRect( mapToForm( ( (TQWidget*)oldendWidget )->tqparentWidget(), ( (TQWidget*)oldendWidget )->pos() ),
restoreRect( TQRect( mapToForm( ( (TQWidget*)oldendWidget )->parentWidget(), ( (TQWidget*)oldendWidget )->pos() ),
( (TQWidget*)oldendWidget )->size() ) );
drawConnectionLine();
break;
@ -946,7 +946,7 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
emitUpdateProperties( propertyWidget );
TQMapConstIterator<TQWidget*,TQPoint> it = moving.begin();
TQWidget *oldParent = it.key()->tqparentWidget();
TQWidget *oldParent = it.key()->parentWidget();
TQWidget *newParent = oldParent;
// check whether we have to reparent the selection
TQWidget* wa = containerAt( e->globalPos(), it.key() );
@ -954,12 +954,12 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
wa = WidgetFactory::containerOfWidget( wa );
// ok, looks like we moved onto a container
// check whether we really have different tqparents.
if ( wa == it.key()->tqparentWidget() )
// check whether we really have different parents.
if ( wa == it.key()->parentWidget() )
goto make_move_command;
// break tqlayout if necessary
if ( WidgetFactory::tqlayoutType( wa ) != WidgetFactory::NoLayout ) {
if ( WidgetFactory::layoutType( wa ) != WidgetFactory::NoLayout ) {
if ( TQMessageBox::information( mainWindow(), i18n( "Inserting Widget" ),
i18n( "You tried to insert a widget into the "
"tqlayout Container Widget '%1'.\n"
@ -978,12 +978,12 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
for ( TQMap<TQWidget*, TQPoint>::Iterator it = moving.begin(); it != moving.end(); ++it ) {
TQWidget *i = it.key();
if ( !emitSelChanged && ::tqqt_cast<TQButton*>(i) ) {
if ( ::tqqt_cast<TQButtonGroup*>(i->tqparentWidget()) || ::tqqt_cast<TQButtonGroup*>(wa) )
if ( ::tqqt_cast<TQButtonGroup*>(i->parentWidget()) || ::tqqt_cast<TQButtonGroup*>(wa) )
emitSelChanged = TRUE;
if ( !::tqqt_cast<TQButtonGroup*>(wa) ) {
MetaDataBase::setPropertyChanged( TQT_TQOBJECT(i), "buttonGroupId", FALSE );
if ( ::tqqt_cast<TQButtonGroup*>(i->tqparentWidget()) )
( (TQButtonGroup*)i->tqparentWidget() )->remove( (TQButton*)i );
if ( ::tqqt_cast<TQButtonGroup*>(i->parentWidget()) )
( (TQButtonGroup*)i->parentWidget() )->remove( (TQButton*)i );
}
}
TQPoint pos = wa->mapFromGlobal( i->mapToGlobal( TQPoint(0,0) ) );
@ -1027,11 +1027,11 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
case BUDDY_TOOL:
restoreConnectionLine();
if ( startWidget )
restoreRect( TQRect( mapToForm( ( (TQWidget*)startWidget )->tqparentWidget(),
restoreRect( TQRect( mapToForm( ( (TQWidget*)startWidget )->parentWidget(),
( (TQWidget*)startWidget )->pos() ),
((TQWidget*)startWidget )->size() ) );
if ( endWidget )
restoreRect( TQRect( mapToForm( ( (TQWidget*)endWidget )->tqparentWidget(),
restoreRect( TQRect( mapToForm( ( (TQWidget*)endWidget )->parentWidget(),
( (TQWidget*)endWidget )->pos() ),
( (TQWidget*)endWidget )->size() ) );
endUnclippedPainter();
@ -1064,7 +1064,7 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
default: // any insert widget tool is active
if ( insertParent ) { // we should insert the new widget now
endRectDraw();
if ( WidgetFactory::tqlayoutType( insertParent ) != WidgetFactory::NoLayout ) {
if ( WidgetFactory::layoutType( insertParent ) != WidgetFactory::NoLayout ) {
if ( TQMessageBox::information( mainWindow(), i18n( "Inserting Widget" ),
i18n( "You tried to insert a widget into the "
"tqlayout Container Widget '%1'.\n"
@ -1395,7 +1395,7 @@ void FormWindow::moveSelectedWidgets( int dx, int dy )
for ( ; it.current(); ++it ) {
WidgetSelection *s = it.current();
TQWidget *w = s->widget();
if ( w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout )
if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
continue;
w->move( w->x() + dx, w->y() + dy );
s->updateGeometry();
@ -1451,7 +1451,7 @@ void FormWindow::checkSelectionsForMove( TQWidget *w )
{
checkedSelectionsForMove = TRUE;
TQObjectList *l = w->tqparentWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, FALSE, FALSE );
TQObjectList *l = w->parentWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, FALSE, FALSE );
moving.clear();
if ( l ) {
TQPtrDictIterator<WidgetSelection> it( usedSelections );
@ -1461,10 +1461,10 @@ void FormWindow::checkSelectionsForMove( TQWidget *w )
continue;
++it;
if ( l->tqfind( TQT_TQOBJECT(sel->widget()) ) == -1 ) {
if ( WidgetFactory::tqlayoutType( w ) == WidgetFactory::NoLayout )
if ( WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout )
sel->setWidget( 0 );
} else {
if ( WidgetFactory::tqlayoutType( sel->widget()->tqparentWidget() ) == WidgetFactory::NoLayout ) {
if ( WidgetFactory::layoutType( sel->widget()->parentWidget() ) == WidgetFactory::NoLayout ) {
moving.insert( sel->widget(), sel->widget()->pos() );
sel->widget()->raise();
raiseChildSelections( sel->widget() );
@ -1516,7 +1516,7 @@ void FormWindow::editAdjustSize()
return;
}
for ( TQWidget* w = widgets.first(); w; w = widgets.next() ) {
if ( w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout )
if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
continue;
TQRect oldr = w->tqgeometry();
w->adjustSize();
@ -1700,11 +1700,11 @@ void FormWindow::currentToolChanged()
case BUDDY_TOOL:
restoreConnectionLine();
if ( startWidget )
restoreRect( TQRect( mapToForm( ( (TQWidget*)startWidget )->tqparentWidget(),
restoreRect( TQRect( mapToForm( ( (TQWidget*)startWidget )->parentWidget(),
( (TQWidget*)startWidget )->pos() ),
( (TQWidget*)startWidget )->size() ) );
if ( endWidget )
restoreRect( TQRect( mapToForm( ( (TQWidget*)endWidget )->tqparentWidget(),
restoreRect( TQRect( mapToForm( ( (TQWidget*)endWidget )->parentWidget(),
( (TQWidget*)endWidget )->pos() ),
( (TQWidget*)endWidget )->size() ) );
endUnclippedPainter();
@ -1996,7 +1996,7 @@ void FormWindow::selectAll()
emitSelectionChanged();
}
void FormWindow::tqlayoutHorizontal()
void FormWindow::layoutHorizontal()
{
TQWidgetList widgets( selectedWidgets() );
LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( i18n( "Lay OutQt::Horizontally" ),
@ -2006,7 +2006,7 @@ void FormWindow::tqlayoutHorizontal()
cmd->execute();
}
void FormWindow::tqlayoutVertical()
void FormWindow::layoutVertical()
{
TQWidgetList widgets( selectedWidgets() );
LayoutVerticalCommand *cmd = new LayoutVerticalCommand( i18n( "Lay OutQt::Vertically" ),
@ -2016,7 +2016,7 @@ void FormWindow::tqlayoutVertical()
cmd->execute();
}
void FormWindow::tqlayoutHorizontalSplit()
void FormWindow::layoutHorizontalSplit()
{
TQWidgetList widgets( selectedWidgets() );
LayoutHorizontalSplitCommand *cmd = new LayoutHorizontalSplitCommand( i18n( "Lay OutQt::Horizontally (in splitter)" ),
@ -2026,7 +2026,7 @@ void FormWindow::tqlayoutHorizontalSplit()
cmd->execute();
}
void FormWindow::tqlayoutVerticalSplit()
void FormWindow::layoutVerticalSplit()
{
TQWidgetList widgets( selectedWidgets() );
LayoutVerticalSplitCommand *cmd = new LayoutVerticalSplitCommand( i18n( "Lay OutQt::Vertically (in splitter)" ),
@ -2036,7 +2036,7 @@ void FormWindow::tqlayoutVerticalSplit()
cmd->execute();
}
void FormWindow::tqlayoutGrid()
void FormWindow::layoutGrid()
{
int xres = grid().x();
int yres = grid().y();
@ -2049,7 +2049,7 @@ void FormWindow::tqlayoutGrid()
cmd->execute();
}
void FormWindow::tqlayoutHorizontalContainer( TQWidget *w )
void FormWindow::layoutHorizontalContainer( TQWidget *w )
{
if ( w == this )
w = mainContainer();
@ -2070,7 +2070,7 @@ void FormWindow::tqlayoutHorizontalContainer( TQWidget *w )
cmd->execute();
}
void FormWindow::tqlayoutVerticalContainer( TQWidget *w )
void FormWindow::layoutVerticalContainer( TQWidget *w )
{
if ( w == this )
w = mainContainer();
@ -2091,7 +2091,7 @@ void FormWindow::tqlayoutVerticalContainer( TQWidget *w )
cmd->execute();
}
void FormWindow::tqlayoutGridContainer( TQWidget *w )
void FormWindow::layoutGridContainer( TQWidget *w )
{
if ( w == this )
w = mainContainer();
@ -2125,7 +2125,7 @@ void FormWindow::breakLayout( TQWidget *w )
for (;;) {
if ( !w || w == this )
break;
if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout &&
if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout &&
WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) {
Command *cmd = breakLayoutCommand( w );
if ( cmd )
@ -2133,7 +2133,7 @@ void FormWindow::breakLayout( TQWidget *w )
if ( !::tqqt_cast<TQLayoutWidget*>(w) && !::tqqt_cast<TQSplitter*>(w) )
break;
}
w = w->tqparentWidget();
w = w->parentWidget();
}
if ( commands.isEmpty() )
@ -2202,11 +2202,11 @@ bool FormWindow::hasInsertedChildren( TQWidget *w ) const
bool FormWindow::allowMove( TQWidget *w )
{
w = w->tqparentWidget();
w = w->parentWidget();
while ( w ) {
if ( ( isMainContainer( TQT_TQOBJECT(w) ) || insertedWidgets.tqfind( w ) ) && WidgetFactory::tqlayoutType( w ) == WidgetFactory::NoLayout )
if ( ( isMainContainer( TQT_TQOBJECT(w) ) || insertedWidgets.tqfind( w ) ) && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout )
return TRUE;
w = w->tqparentWidget();
w = w->parentWidget();
}
return FALSE;
}
@ -2493,7 +2493,7 @@ TQPoint FormWindow::mapToForm( const TQWidget* w, const TQPoint& pos ) const
const TQWidget* i = w;
while ( i && !i->isTopLevel() && !isMainContainer( TQT_TQOBJECT(const_cast<TQWidget*>(i)) ) ) {
p = i->mapToParent( p );
i = i->tqparentWidget();
i = i->parentWidget();
}
return mapFromGlobal( w->mapToGlobal( pos ) );
}
@ -2503,7 +2503,7 @@ static int widgetDepth( TQWidget *w )
int d = -1;
while ( w && !w->isTopLevel() ) {
d++;
w = w->tqparentWidget();
w = w->parentWidget();
}
return d;
@ -2514,7 +2514,7 @@ static bool isChildOf( TQWidget *c, TQWidget *p )
while ( c && !c->isTopLevel() ) {
if ( c == p )
return TRUE;
c = c->tqparentWidget();
c = c->parentWidget();
}
return FALSE;
}
@ -2547,14 +2547,14 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf )
while ( w && !w->isTopLevel() ) {
if ( !TQT_TQRECT_OBJECT(w->rect()).tqcontains( ( w->mapFromGlobal( pos ) ) ) )
break;
w = w->tqparentWidget();
w = w->parentWidget();
}
if ( !( w == 0 || w->isTopLevel() ) ) continue; // we did not get through the full while loop
int wd = widgetDepth( it.current() );
if ( wd == depth && container ) {
if ( ( it.current()->tqparentWidget()->childrenListObject() ).tqfind( TQT_TQOBJECT(it.current()) ) >
( container->tqparentWidget()->childrenListObject() ).tqfind( TQT_TQOBJECT(container) ) )
if ( ( it.current()->parentWidget()->childrenListObject() ).tqfind( TQT_TQOBJECT(it.current()) ) >
( container->parentWidget()->childrenListObject() ).tqfind( TQT_TQOBJECT(container) ) )
wd++;
}
if ( wd > depth && !isChildOf( it.current(), notParentOf ) ) {
@ -2694,12 +2694,12 @@ bool FormWindow::isCentralWidget( TQObject *w ) const
return TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(( (TQMainWindow*)mainContainer() )->centralWidget());
}
int FormWindow::tqlayoutDefaultSpacing() const
int FormWindow::layoutDefaultSpacing() const
{
return defSpacing;
}
int FormWindow::tqlayoutDefaultMargin() const
int FormWindow::layoutDefaultMargin() const
{
return defMargin;
}

20
kdevdesigner/designer/formwindow.h
Unescape View File

@ -92,15 +92,15 @@ public:
virtual void raiseWidgets();
virtual void checkAccels();
virtual void tqlayoutHorizontal();
virtual void tqlayoutVertical();
virtual void tqlayoutHorizontalSplit();
virtual void tqlayoutVerticalSplit();
virtual void tqlayoutGrid();
virtual void layoutHorizontal();
virtual void layoutVertical();
virtual void layoutHorizontalSplit();
virtual void layoutVerticalSplit();
virtual void layoutGrid();
virtual void tqlayoutHorizontalContainer( TQWidget *w );
virtual void tqlayoutVerticalContainer( TQWidget *w );
virtual void tqlayoutGridContainer( TQWidget *w );
virtual void layoutHorizontalContainer( TQWidget *w );
virtual void layoutVerticalContainer( TQWidget *w );
virtual void layoutGridContainer( TQWidget *w );
virtual void breakLayout( TQWidget *w );
@ -192,8 +192,8 @@ public:
DesignerFormWindow *iFace();
int tqlayoutDefaultSpacing() const;
int tqlayoutDefaultMargin() const;
int layoutDefaultSpacing() const;
int layoutDefaultMargin() const;
void setLayoutDefaultSpacing( int s );
void setLayoutDefaultMargin( int s );
TQString spacingFunction() const;

2
kdevdesigner/designer/gotolinedialog.ui
Unescape View File

@ -29,7 +29,7 @@
<include location="local" implDecl="in declaration">gotolinedialog.ui.h</include>
<forward>struct EditorInterface;</forward>
<variable>EditorInterface *editor;</variable>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<widget class="TQDialog">
<property name="name">
<cstring>GotoLineDialog</cstring>

6
kdevdesigner/designer/hierarchyview.cpp
Unescape View File

@ -300,8 +300,8 @@ void HierarchyList::objectDoubleClicked( TQListViewItem *i )
return;
if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( formWindow ) ) {
TQWidget *w = (TQWidget*)o;
if ( !w->tqparentWidget() ||
WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout )
if ( !w->parentWidget() ||
WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout )
w->raise();
formWindow->selectWidget( TQT_TQOBJECT(w), TRUE );
}
@ -412,7 +412,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent )
TQListViewItem *item = 0;
TQString className = WidgetFactory::classNameOf( o );
if ( ::tqqt_cast<TQLayoutWidget*>(o) ) {
switch ( WidgetFactory::tqlayoutType( (TQWidget*)o ) ) {
switch ( WidgetFactory::layoutType( (TQWidget*)o ) ) {
case WidgetFactory::HBox:
className = "HBox";
break;

2
kdevdesigner/designer/iconvieweditor.ui
Unescape View File

@ -457,5 +457,5 @@
</includes>
<pixmapfunction>BarIcon2</pixmapfunction>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

40
kdevdesigner/designer/kdevdesigner_part.cpp
Unescape View File

@ -40,7 +40,7 @@
#include "designeraction.h"
#include "formwindow.h"
KDevDesignerPart::KDevDesignerPart( TQWidget *tqparentWidget, const char *// widgetName
KDevDesignerPart::KDevDesignerPart( TQWidget *parentWidget, const char *// widgetName
,
TQObject *tqparent, const char *name, const TQStringList &args )
: KInterfaceDesigner::Designer(tqparent, name)
@ -48,7 +48,7 @@ KDevDesignerPart::KDevDesignerPart( TQWidget *tqparentWidget, const char *// wid
setInstance( KDevDesignerPartFactory::instance() );
m_widget = new MainWindow( this, true );
m_widget->reparent(tqparentWidget, TQPoint(0,0));
m_widget->reparent(parentWidget, TQPoint(0,0));
setupDesignerWindow();
setWidget(m_widget);
@ -68,7 +68,7 @@ KDevDesignerPart::KDevDesignerPart( TQWidget *tqparentWidget, const char *// wid
void KDevDesignerPart::setupDesignerWindow()
{
m_widget->menuBar()->hide();
m_widget->tqlayoutToolBar->hide();
m_widget->layoutToolBar->hide();
m_widget->projectToolBar->hide();
m_widget->toolsToolBar->hide();
m_widget->statusBar()->hide();
@ -144,21 +144,21 @@ void KDevDesignerPart::setupActions( )
new KAction(i18n("Configure Toolbox..."), 0, this, TQT_SLOT(toolsConfigureToolbox()), actionCollection(), "tools_toolbox");
new KAction(i18n("Edit &Custom Widgets..."), 0, this, TQT_SLOT(toolsEditCustomWidgets()), actionCollection(), "tools_editcustomwidgets");
action = new KAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(tqlayoutAdjustSize()), actionCollection(), "tqlayout_adjustsize");
action = new KAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize");
stateSync(action, m_widget->actionEditAdjustSize);
action = new KAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithtqlayout.png"), CTRL + Key_H, this, TQT_SLOT(tqlayoutHLayout()), actionCollection(), "tqlayout_h");
action = new KAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithtqlayout.png"), CTRL + Key_H, this, TQT_SLOT(layoutHLayout()), actionCollection(), "layout_h");
stateSync(action, m_widget->actionEditHLayout);
action = new KAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvtqlayout.png"), CTRL + Key_V, this, TQT_SLOT(tqlayoutVLayout()), actionCollection(), "tqlayout_v");
action = new KAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvtqlayout.png"), CTRL + Key_V, this, TQT_SLOT(layoutVLayout()), actionCollection(), "layout_v");
stateSync(action, m_widget->actionEditVLayout);
action = new KAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(tqlayoutGridLayout()), actionCollection(), "tqlayout_grid");
action = new KAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(layoutGridLayout()), actionCollection(), "layout_grid");
stateSync(action, m_widget->actionEditGridLayout);
action = new KAction(i18n("Lay OutQt::Horizontally (in S&plitter)"), createPartIconSet("designer_editvtqlayoutsplit.png"), 0, this, TQT_SLOT(tqlayoutSplitHLayout()), actionCollection(), "tqlayout_splith");
action = new KAction(i18n("Lay OutQt::Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith");
stateSync(action, m_widget->actionEditSplitHorizontal);
action = new KAction(i18n("Lay OutQt::Vertically (in Sp&litter)"), createPartIconSet("designer_edithtqlayoutsplit.png"), 0, this, TQT_SLOT(tqlayoutSplitVLayout()), actionCollection(), "tqlayout_splitv");
action = new KAction(i18n("Lay OutQt::Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv");
stateSync(action, m_widget->actionEditSplitVertical);
action = new KAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQT_SLOT(tqlayoutBreak()), actionCollection(), "tqlayout_break");
action = new KAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQT_SLOT(layoutBreak()), actionCollection(), "layout_break");
stateSync(action, m_widget->actionEditBreakLayout);
toggle = new KRadioAction(i18n("Add Spacer"), createPartIconSet("designer_spacer.png"), 0, actionCollection(), "tqlayout_spacer");
toggle = new KRadioAction(i18n("Add Spacer"), createPartIconSet("designer_spacer.png"), 0, actionCollection(), "layout_spacer");
setupToolsAction(toggle, m_widget->actionInsertSpacer);
action = new KAction(i18n("Preview &Form"), CTRL + Key_T, this, TQT_SLOT(windowPreview()), actionCollection(), "window_preview");
@ -256,12 +256,12 @@ KDevDesignerPartFactory::~KDevDesignerPartFactory()
s_instance = 0L;
}
KParts::Part* KDevDesignerPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
KParts::Part* KDevDesignerPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const char *classname, const TQStringList &args )
{
// Create an instance of our Part
KDevDesignerPart* obj = new KDevDesignerPart( tqparentWidget, widgetName, tqparent, name, args );
KDevDesignerPart* obj = new KDevDesignerPart( parentWidget, widgetName, tqparent, name, args );
// See if we are to be read-write or not
if (TQCString(classname) == "KParts::ReadOnlyPart")
@ -407,37 +407,37 @@ void KDevDesignerPart::toolsConfigureToolbox( )
m_widget->toolsConfigure();
}
void KDevDesignerPart::tqlayoutAdjustSize( )
void KDevDesignerPart::layoutAdjustSize( )
{
m_widget->actionEditAdjustSize->activate();
}
void KDevDesignerPart::tqlayoutHLayout( )
void KDevDesignerPart::layoutHLayout( )
{
m_widget->actionEditHLayout->activate();
}
void KDevDesignerPart::tqlayoutVLayout( )
void KDevDesignerPart::layoutVLayout( )
{
m_widget->actionEditVLayout->activate();
}
void KDevDesignerPart::tqlayoutGridLayout( )
void KDevDesignerPart::layoutGridLayout( )
{
m_widget->actionEditGridLayout->activate();
}
void KDevDesignerPart::tqlayoutSplitHLayout( )
void KDevDesignerPart::layoutSplitHLayout( )
{
m_widget->actionEditSplitHorizontal->activate();
}
void KDevDesignerPart::tqlayoutSplitVLayout( )
void KDevDesignerPart::layoutSplitVLayout( )
{
m_widget->actionEditSplitVertical->activate();
}
void KDevDesignerPart::tqlayoutBreak( )
void KDevDesignerPart::layoutBreak( )
{
m_widget->actionEditBreakLayout->activate();
}

18
kdevdesigner/designer/kdevdesigner_part.h
Unescape View File

@ -41,7 +41,7 @@ class KDevDesignerPart : public KInterfaceDesigner::Designer
Q_OBJECT
TQ_OBJECT
public:
KDevDesignerPart(TQWidget *tqparentWidget, const char *widgetName,
KDevDesignerPart(TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name, const TQStringList &args);
virtual ~KDevDesignerPart();
@ -104,13 +104,13 @@ protected slots:
void toolsConfigureToolbox();
void toolsEditCustomWidgets();
void tqlayoutAdjustSize();
void tqlayoutHLayout();
void tqlayoutVLayout();
void tqlayoutGridLayout();
void tqlayoutSplitHLayout();
void tqlayoutSplitVLayout();
void tqlayoutBreak();
void layoutAdjustSize();
void layoutHLayout();
void layoutVLayout();
void layoutGridLayout();
void layoutSplitHLayout();
void layoutSplitVLayout();
void layoutBreak();
void windowPreview();
void windowNext();
@ -135,7 +135,7 @@ class KDevDesignerPartFactory : public KParts::Factory
public:
KDevDesignerPartFactory();
virtual ~KDevDesignerPartFactory();
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();

142
kdevdesigner/designer/layout.cpp
Unescape View File

@ -45,18 +45,18 @@ bool operator<( const TQGuardedPtr<TQWidget> &p1, const TQGuardedPtr<TQWidget> &
/*!
\class Layout tqlayout.h
\brief Baseclass for tqlayouting widgets in the Designer
\brief Baseclass for layouting widgets in the Designer
Classes derived from this abstract base class are used for tqlayouting
Classes derived from this abstract base class are used for layouting
operations in the Designer.
*/
/*! \a p specifies the tqparent of the tqlayoutBase \a lb. The tqparent
might be changed in setup(). If the tqlayoutBase is a
container, the tqparent and the tqlayoutBase are the same. Also they
/*! \a p specifies the tqparent of the layoutBase \a lb. The tqparent
might be changed in setup(). If the layoutBase is a
container, the tqparent and the layoutBase are the same. Also they
always have to be a widget known to the designer (e.g. in the case
of the tabwidget tqparent and tqlayoutBase are the tabwidget and not the
of the tabwidget tqparent and layoutBase are the tabwidget and not the
page which actually gets laid out. For actual usage the correct
widget is found later by Layout.)
*/
@ -65,13 +65,13 @@ Layout::Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *l
: widgets( wl ), tqparent( p ), formWindow( fw ), isBreak( !doSetup ), useSplitter( splitter )
{
widgets.setAutoDelete( FALSE );
tqlayoutBase = lb;
if ( !doSetup && tqlayoutBase )
oldGeometry = tqlayoutBase->tqgeometry();
layoutBase = lb;
if ( !doSetup && layoutBase )
oldGeometry = layoutBase->tqgeometry();
}
/*! The widget list we got in the constructor might contain too much
widgets (like widgets with different tqparents, already laid out
widgets (like widgets with different parents, already laid out
widgets, etc.). Here we set up the list and so the only the "best"
widgets get laid out.
*/
@ -91,14 +91,14 @@ void Layout::setup()
// childs which has the most entries.
// Widgets which are already laid out are thrown away here too
for ( w = widgets.first(); w; w = widgets.next() ) {
if ( w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout )
if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
continue;
if ( lastParent != w->tqparentWidget() ) {
if ( lastParent != w->parentWidget() ) {
lastList = 0;
lastParent = w->tqparentWidget();
lastParent = w->parentWidget();
TQValueList<TQWidgetList>::Iterator it = lists.begin();
for ( ; it != lists.end(); ++it ) {
if ( ( *it ).first()->tqparentWidget() == w->tqparentWidget() )
if ( ( *it ).first()->parentWidget() == w->parentWidget() )
lastList = &( *it );
}
if ( !lastList ) {
@ -123,9 +123,9 @@ void Layout::setup()
// best list has only one entry and we do not tqlayout a container,
// we leave here.
if ( !lastList || ( lastList->count() < 2 &&
( !tqlayoutBase ||
( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(tqlayoutBase) ) ) ) &&
tqlayoutBase != formWindow->mainContainer() ) )
( !layoutBase ||
( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(layoutBase) ) ) ) &&
layoutBase != formWindow->mainContainer() ) )
) ) {
widgets.clear();
startPoint = TQPoint( 0, 0 );
@ -136,7 +136,7 @@ void Layout::setup()
// to tqlayout
widgets = *lastList;
// Also use the only correct tqparent later, so store it
tqparent = WidgetFactory::widgetOfContainer( widgets.first()->tqparentWidget() );
tqparent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() );
// Now calculate the position where the tqlayout-meta-widget should
// be placed and connect to widgetDestroyed() signals of the
// widgets to get informed if one gets deleted to be able to
@ -166,17 +166,17 @@ bool Layout::prepareLayout( bool &needMove, bool &needRetqparent )
return FALSE;
for ( TQWidget *w = widgets.first(); w; w = widgets.next() )
w->raise();
needMove = !tqlayoutBase;
needRetqparent = needMove || ::tqqt_cast<TQLayoutWidget*>(tqlayoutBase) || ::tqqt_cast<TQSplitter*>(tqlayoutBase);
if ( !tqlayoutBase ) {
needMove = !layoutBase;
needRetqparent = needMove || ::tqqt_cast<TQLayoutWidget*>(layoutBase) || ::tqqt_cast<TQSplitter*>(layoutBase);
if ( !layoutBase ) {
if ( !useSplitter )
tqlayoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ),
layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ),
WidgetFactory::containerOfWidget( tqparent ) );
else
tqlayoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ),
layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ),
WidgetFactory::containerOfWidget( tqparent ) );
} else {
WidgetFactory::deleteLayout( tqlayoutBase );
WidgetFactory::deleteLayout( layoutBase );
}
return TRUE;
@ -185,21 +185,21 @@ bool Layout::prepareLayout( bool &needMove, bool &needRetqparent )
void Layout::finishLayout( bool needMove, TQLayout *tqlayout )
{
if ( needMove )
tqlayoutBase->move( startPoint );
TQRect g( TQRect( tqlayoutBase->pos(), tqlayoutBase->size() ) );
if ( WidgetFactory::tqlayoutType( tqlayoutBase->tqparentWidget() ) == WidgetFactory::NoLayout && !isBreak )
tqlayoutBase->adjustSize();
layoutBase->move( startPoint );
TQRect g( TQRect( layoutBase->pos(), layoutBase->size() ) );
if ( WidgetFactory::layoutType( layoutBase->parentWidget() ) == WidgetFactory::NoLayout && !isBreak )
layoutBase->adjustSize();
else if ( isBreak )
tqlayoutBase->setGeometry( oldGeometry );
layoutBase->setGeometry( oldGeometry );
oldGeometry = g;
tqlayoutBase->show();
layoutBase->show();
tqlayout->activate();
formWindow->insertWidget( tqlayoutBase );
formWindow->selectWidget( TQT_TQOBJECT(tqlayoutBase) );
TQString n = tqlayoutBase->name();
formWindow->insertWidget( layoutBase );
formWindow->selectWidget( TQT_TQOBJECT(layoutBase) );
TQString n = layoutBase->name();
if ( n.tqfind( "qt_dead_widget_" ) != -1 ) {
n.remove( 0, TQString( "qt_dead_widget_" ).length() );
tqlayoutBase->setName( n );
layoutBase->setName( n );
}
}
@ -214,15 +214,15 @@ void Layout::undoLayout()
it.key()->reparent( WidgetFactory::containerOfWidget( tqparent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) );
it.key()->resize( ( *it ).size() );
}
formWindow->selectWidget( TQT_TQOBJECT(tqlayoutBase), FALSE );
WidgetFactory::deleteLayout( tqlayoutBase );
if ( tqparent != tqlayoutBase && !::tqqt_cast<TQMainWindow*>(tqlayoutBase) ) {
tqlayoutBase->hide();
TQString n = tqlayoutBase->name();
formWindow->selectWidget( TQT_TQOBJECT(layoutBase), FALSE );
WidgetFactory::deleteLayout( layoutBase );
if ( tqparent != layoutBase && !::tqqt_cast<TQMainWindow*>(layoutBase) ) {
layoutBase->hide();
TQString n = layoutBase->name();
n.prepend( "qt_dead_widget_" );
tqlayoutBase->setName( n );
layoutBase->setName( n );
} else {
tqlayoutBase->setGeometry( oldGeometry );
layoutBase->setGeometry( oldGeometry );
}
if ( widgets.first() )
formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) );
@ -238,33 +238,33 @@ void Layout::breakLayout()
for ( w = widgets.first(); w; w = widgets.next() )
rects.insert( w, w->tqgeometry() );
}
WidgetFactory::deleteLayout( tqlayoutBase );
bool needRetqparent = qstrcmp( tqlayoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 ||
qstrcmp( tqlayoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 ||
( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(tqlayoutBase) ) ) ) &&
tqlayoutBase != formWindow->mainContainer() );
bool needResize = qstrcmp( tqlayoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0;
WidgetFactory::deleteLayout( layoutBase );
bool needRetqparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 ||
qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 ||
( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(layoutBase) ) ) ) &&
layoutBase != formWindow->mainContainer() );
bool needResize = qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0;
bool add = geometries.isEmpty();
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
if ( needRetqparent )
w->reparent( tqlayoutBase->tqparentWidget(), 0,
tqlayoutBase->pos() + w->pos(), TRUE );
w->reparent( layoutBase->parentWidget(), 0,
layoutBase->pos() + w->pos(), TRUE );
if ( needResize ) {
TQMap<TQWidget*, TQRect>::Iterator it = rects.tqfind( w );
if ( it != rects.end() )
w->setGeometry( TQRect( tqlayoutBase->pos() + (*it).topLeft(), (*it).size() ) );
w->setGeometry( TQRect( layoutBase->pos() + (*it).topLeft(), (*it).size() ) );
}
if ( add )
geometries.insert( w, TQRect( w->pos(), w->size() ) );
}
if ( needRetqparent ) {
tqlayoutBase->hide();
tqparent = tqlayoutBase->tqparentWidget();
TQString n = tqlayoutBase->name();
layoutBase->hide();
tqparent = layoutBase->parentWidget();
TQString n = layoutBase->name();
n.prepend( "qt_dead_widget_" );
tqlayoutBase->setName( n );
layoutBase->setName( n );
} else {
tqparent = tqlayoutBase;
tqparent = layoutBase;
}
if ( widgets.first() && widgets.first()->isVisibleTo( formWindow ) )
formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) );
@ -311,11 +311,11 @@ void HorizontalLayout::doLayout()
if ( !prepareLayout( needMove, needRetqparent ) )
return;
TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::HBox );
TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox );
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(tqlayoutBase) )
w->reparent( tqlayoutBase, 0, TQPoint( 0, 0 ), FALSE );
if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(layoutBase) )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
if ( !useSplitter ) {
if ( qstrcmp( w->className(), "Spacer" ) == 0 )
tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() );
@ -327,8 +327,8 @@ void HorizontalLayout::doLayout()
w->show();
}
if ( ::tqqt_cast<TQSplitter*>(tqlayoutBase) )
( (TQSplitter*)tqlayoutBase )->setOrientation( Qt::Horizontal );
if ( ::tqqt_cast<TQSplitter*>(layoutBase) )
( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal );
finishLayout( needMove, tqlayout );
}
@ -375,11 +375,11 @@ void VerticalLayout::doLayout()
if ( !prepareLayout( needMove, needRetqparent ) )
return;
TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::VBox );
TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox );
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(tqlayoutBase) )
w->reparent( tqlayoutBase, 0, TQPoint( 0, 0 ), FALSE );
if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(layoutBase) )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
if ( !useSplitter ) {
if ( qstrcmp( w->className(), "Spacer" ) == 0 )
tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() );
@ -391,8 +391,8 @@ void VerticalLayout::doLayout()
w->show();
}
if ( ::tqqt_cast<TQSplitter*>(tqlayoutBase) )
( (TQSplitter*)tqlayoutBase )->setOrientation( Qt::Vertical );
if ( ::tqqt_cast<TQSplitter*>(layoutBase) )
( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical );
finishLayout( needMove, tqlayout );
}
@ -747,7 +747,7 @@ void GridLayout::doLayout()
if ( !prepareLayout( needMove, needRetqparent ) )
return;
QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::Grid );
QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid );
if ( !grid )
buildGrid();
@ -756,8 +756,8 @@ void GridLayout::doLayout()
int r, c, rs, cs;
for ( w = widgets.first(); w; w = widgets.next() ) {
if ( grid->locateWidget( w, r, c, rs, cs) ) {
if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(tqlayoutBase) )
w->reparent( tqlayoutBase, 0, TQPoint( 0, 0 ), FALSE );
if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(layoutBase) )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
if ( rs * cs == 1 ) {
tqlayout->addWidget( w, r, c, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->tqalignment() : 0 );
} else {
@ -908,7 +908,7 @@ void Spacer::paintEvent( TQPaintEvent * )
void Spacer::resizeEvent( TQResizeEvent* e)
{
TQWidget::resizeEvent( e );
if ( !tqparentWidget() || WidgetFactory::tqlayoutType( tqparentWidget() ) == WidgetFactory::NoLayout )
if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
sh = size();
}
@ -974,7 +974,7 @@ TQSize Spacer::tqsizeHint() const
void Spacer::setSizeHint( const TQSize &s )
{
sh = s;
if ( !tqparentWidget() || WidgetFactory::tqlayoutType( tqparentWidget() ) == WidgetFactory::NoLayout )
if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
resize( tqsizeHint() );
updateGeometry();
}
@ -994,7 +994,7 @@ void Spacer::setOrientation( Qt::Orientation o )
setSizeType( st );
if ( interactive ) {
sh = TQSize( sh.height(), sh.width() );
if (!tqparentWidget() || WidgetFactory::tqlayoutType( tqparentWidget() ) == WidgetFactory::NoLayout )
if (!parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
resize( height(), width() );
}
updateMask();

4
kdevdesigner/designer/layout.h
Unescape View File

@ -58,7 +58,7 @@ protected:
TQWidget *tqparent;
TQPoint startPoint;
TQMap<TQGuardedPtr<TQWidget>, TQRect> geometries;
TQWidget *tqlayoutBase;
TQWidget *layoutBase;
FormWindow *formWindow;
TQRect oldGeometry;
bool isBreak;
@ -167,7 +167,7 @@ class QDesignerGridLayout : public TQGridLayout
TQ_OBJECT
public:
QDesignerGridLayout( TQWidget *tqparent ) : TQGridLayout( tqparent ){};
QDesignerGridLayout( TQLayout *tqparentLayout ) : TQGridLayout( tqparentLayout ){};
QDesignerGridLayout( TQLayout *parentLayout ) : TQGridLayout( parentLayout ){};
void addWidget( TQWidget *, int row, int col, int align = 0 );
void addMultiCellWidget( TQWidget *, int fromRow, int toRow,

2
kdevdesigner/designer/listboxeditor.ui
Unescape View File

@ -453,5 +453,5 @@
<include location="local" impldecl="in implementation">myiconloader.h</include>
</includes>
<pixmapfunction>BarIcon2</pixmapfunction>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kdevdesigner/designer/listeditor.ui
Unescape View File

@ -175,5 +175,5 @@
</includes>
<pixmapfunction>BarIcon2</pixmapfunction>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kdevdesigner/designer/listvieweditor.ui
Unescape View File

@ -931,5 +931,5 @@
</includes>
<pixmapfunction>BarIcon2</pixmapfunction>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

128
kdevdesigner/designer/mainwindow.cpp
Unescape View File

@ -219,9 +219,9 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons
setupEditActions();
setupProjectActions();
setupSearchActions();
tqlayoutToolBar = new TQToolBar( this, "Layout" );
tqlayoutToolBar->setCloseMode( TQDockWindow::Undocked );
addToolBar( tqlayoutToolBar, i18n( "Layout" ) );
layoutToolBar = new TQToolBar( this, "Layout" );
layoutToolBar->setCloseMode( TQDockWindow::Undocked );
addToolBar( layoutToolBar, i18n( "Layout" ) );
interpreterPluginManager = 0;
setupToolActions();
setupLayoutActions();
@ -255,8 +255,8 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons
connect( tqApp->clipboard(), TQT_SIGNAL( dataChanged() ),
this, TQT_SLOT( clipboardChanged() ) );
clipboardChanged();
tqlayoutChilds = FALSE;
tqlayoutSelected = FALSE;
layoutChilds = FALSE;
layoutSelected = FALSE;
breakLayout = FALSE;
backPix = TRUE;
@ -273,8 +273,8 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons
delete w;
w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQFRAME_OBJECT_NAME_STRING ), this, 0, FALSE );
delete w;
setAppropriate( (TQDockWindow*)actionEditor->tqparentWidget(), FALSE );
actionEditor->tqparentWidget()->hide();
setAppropriate( (TQDockWindow*)actionEditor->parentWidget(), FALSE );
actionEditor->parentWidget()->hide();
assistant = new TQAssistantClient( assistantPath(), TQT_TQOBJECT(this) );
@ -408,7 +408,7 @@ void MainWindow::setupHierarchyView()
"<p>The Object Explorer provides an overview of the relationships "
"between the widgets in a form. You can use the clipboard functions using "
"a context menu for each item in the view. It is also useful for selecting widgets "
"in forms that have complex tqlayouts.</p>"
"in forms that have complex layouts.</p>"
"<p>The columns can be resized by dragging the separator in the list's header.</p>"
"<p>The second tab shows all the form's slots, class variables, includes, etc.</p>") );
dw->show();
@ -742,7 +742,7 @@ void MainWindow::helpContents()
showClassDocu = FALSE;
break;
}
tqfocusWidget = tqfocusWidget->tqparentWidget();
tqfocusWidget = tqfocusWidget->parentWidget();
}
TQString source = "designer-manual.html";
@ -770,9 +770,9 @@ void MainWindow::helpContents()
TQMetaObject* mo = propertyEditor->tqmetaObjectOfCurrentProperty();
TQString s;
TQString cp = propertyEditor->currentProperty();
if ( cp == "tqlayoutMargin" ) {
if ( cp == "layoutMargin" ) {
source = propertyDocumentation[ "TQLayout/margin" ];
} else if ( cp == "tqlayoutSpacing" ) {
} else if ( cp == "layoutSpacing" ) {
source = propertyDocumentation[ "TQLayout/spacing" ];
} else if ( cp == "toolTip" ) {
source = "tqtooltip.html#details";
@ -964,7 +964,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
while ( w ) {
if ( ::tqqt_cast<PropertyList*>(w) )
break;
w = w->tqparentWidget( TRUE );
w = w->parentWidget( TRUE );
}
if ( w ) {
propertyEditor->propertyList()->showCurrentWhatsThis();
@ -1001,8 +1001,8 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
::tqqt_cast<TQComboBox*>(w) ||
::tqqt_cast<PopupMenuEditor*>(w) ||
::tqqt_cast<QDesignerToolBarSeparator*>(w) )
w = w->tqparentWidget();
TQWidget *pw = w->tqparentWidget();
w = w->parentWidget();
TQWidget *pw = w->parentWidget();
while ( pw ) {
if ( ::tqqt_cast<FormWindow*>(pw) ) {
( (FormWindow*)pw )->emitShowProperties( TQT_TQOBJECT(w) );
@ -1012,7 +1012,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
!::tqqt_cast<TQComboBox*>(o) &&
!::tqqt_cast<QDesignerToolBarSeparator*>(o) );
}
pw = pw->tqparentWidget();
pw = pw->parentWidget();
}
}
if ( o && ( ::tqqt_cast<QDesignerToolBar*>(o) || o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) )
@ -1151,7 +1151,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
::tqqt_cast<SizeHandle*>(o) ||
::tqqt_cast<OrderIndicator*>(o) )
break;
if ( WidgetFactory::tqlayoutType( (TQWidget*)o->tqparent() ) != WidgetFactory::NoLayout ) {
if ( WidgetFactory::layoutType( (TQWidget*)o->tqparent() ) != WidgetFactory::NoLayout ) {
( (FormWindow*)w )->updateSelection( (TQWidget*)o );
if ( e->type() != TQEvent::Resize )
( (FormWindow*)w )->updateChildSelections( (TQWidget*)o );
@ -1210,7 +1210,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
while ( w ) {
if ( ::tqqt_cast<SourceEditor*>(w) )
break;
w = w->tqparentWidget( TRUE );
w = w->parentWidget( TRUE );
}
if ( ::tqqt_cast<SourceEditor*>(w) )
( (SourceEditor*)w )->checkTimeStamp();
@ -1362,7 +1362,7 @@ bool MainWindow::unregisterClient( FormWindow *w )
if ( actionEditor->form() == w ) {
actionEditor->setFormWindow( 0 );
actionEditor->tqparentWidget()->hide();
actionEditor->parentWidget()->hide();
}
return TRUE;
@ -1384,16 +1384,16 @@ void MainWindow::activeWindowChanged( TQWidget *w )
formWindow()->clearSelection();
}
workspace()->activeFormChanged( fw );
setAppropriate( (TQDockWindow*)actionEditor->tqparentWidget(),
setAppropriate( (TQDockWindow*)actionEditor->parentWidget(),
::tqqt_cast<TQMainWindow*>(lastActiveFormWindow->mainContainer()) );
if ( appropriate( (TQDockWindow*)actionEditor->tqparentWidget() ) ) {
if ( appropriate( (TQDockWindow*)actionEditor->parentWidget() ) ) {
if ( actionEditor->wantToBeShown() )
actionEditor->tqparentWidget()->show();
actionEditor->parentWidget()->show();
} else {
TQWidget *mc = 0;
if ( ofw && (mc = ofw->mainContainer()) && ::tqqt_cast<TQMainWindow*>(mc) )
actionEditor->setWantToBeShown( !actionEditor->tqparentWidget()->isHidden() );
actionEditor->tqparentWidget()->hide();
actionEditor->setWantToBeShown( !actionEditor->parentWidget()->isHidden() );
actionEditor->parentWidget()->hide();
}
actionEditor->setFormWindow( lastActiveFormWindow );
@ -2003,8 +2003,8 @@ void MainWindow::clipboardChanged()
void MainWindow::selectionChanged()
{
tqlayoutChilds = FALSE;
tqlayoutSelected = FALSE;
layoutChilds = FALSE;
layoutSelected = FALSE;
breakLayout = FALSE;
if ( !formWindow() ) {
actionEditCut->setEnabled( FALSE );
@ -2041,7 +2041,7 @@ void MainWindow::selectionChanged()
int unlaidout = 0;
int laidout = 0;
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout )
if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout )
unlaidout++;
else
laidout++;
@ -2053,27 +2053,27 @@ void MainWindow::selectionChanged()
actionEditGridLayout->setEnabled( unlaidout > 1 );
actionEditBreakLayout->setEnabled( laidout > 0 );
actionEditAdjustSize->setEnabled( laidout > 0 );
tqlayoutSelected = unlaidout > 1;
layoutSelected = unlaidout > 1;
breakLayout = laidout > 0;
} else if ( selectedWidgets == 1 ) {
TQWidget *w = widgets.first();
bool isContainer = WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ||
w == formWindow()->mainContainer();
actionEditAdjustSize->setEnabled( !w->tqparentWidget() ||
WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout );
actionEditAdjustSize->setEnabled( !w->parentWidget() ||
WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout );
if ( !isContainer ) {
actionEditHLayout->setEnabled( FALSE );
actionEditVLayout->setEnabled( FALSE );
actionEditGridLayout->setEnabled( FALSE );
if ( w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout ) {
if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) {
actionEditBreakLayout->setEnabled( !isAToolBarChild( TQT_TQOBJECT(w) ) );
breakLayout = TRUE;
} else {
actionEditBreakLayout->setEnabled( FALSE );
}
} else {
if ( WidgetFactory::tqlayoutType( w ) == WidgetFactory::NoLayout ) {
if ( WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) {
if ( !formWindow()->hasInsertedChildren( w ) ) {
actionEditHLayout->setEnabled( FALSE );
actionEditVLayout->setEnabled( FALSE );
@ -2084,9 +2084,9 @@ void MainWindow::selectionChanged()
actionEditVLayout->setEnabled( TRUE );
actionEditGridLayout->setEnabled( TRUE );
actionEditBreakLayout->setEnabled( FALSE );
tqlayoutChilds = TRUE;
layoutChilds = TRUE;
}
if ( w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout ) {
if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) {
actionEditBreakLayout->setEnabled( !isAToolBarChild( TQT_TQOBJECT(w) ) );
breakLayout = TRUE;
}
@ -2101,7 +2101,7 @@ void MainWindow::selectionChanged()
} else if ( selectedWidgets == 0 ) {
actionEditAdjustSize->setEnabled( TRUE );
TQWidget *w = formWindow()->mainContainer();
if ( WidgetFactory::tqlayoutType( w ) == WidgetFactory::NoLayout ) {
if ( WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) {
if ( !formWindow()->hasInsertedChildren( w ) ) {
actionEditHLayout->setEnabled( FALSE );
actionEditVLayout->setEnabled( FALSE );
@ -2112,7 +2112,7 @@ void MainWindow::selectionChanged()
actionEditVLayout->setEnabled( TRUE );
actionEditGridLayout->setEnabled( TRUE );
actionEditBreakLayout->setEnabled( FALSE );
tqlayoutChilds = TRUE;
layoutChilds = TRUE;
}
} else {
actionEditHLayout->setEnabled( FALSE );
@ -2177,18 +2177,18 @@ void MainWindow::writeConfig()
config.writeEntry( keybase + "Geometries/MainwindowWidth", width() );
config.writeEntry( keybase + "Geometries/MainwindowHeight", height() );
config.writeEntry( keybase + "Geometries/MainwindowMaximized", isMaximized() );
config.writeEntry( keybase + "Geometries/PropertyEditorX", propertyEditor->tqparentWidget()->x() );
config.writeEntry( keybase + "Geometries/PropertyEditorY", propertyEditor->tqparentWidget()->y() );
config.writeEntry( keybase + "Geometries/PropertyEditorWidth", propertyEditor->tqparentWidget()->width() );
config.writeEntry( keybase + "Geometries/PropertyEditorHeight", propertyEditor->tqparentWidget()->height() );
config.writeEntry( keybase + "Geometries/HierarchyViewX", hierarchyView->tqparentWidget()->x() );
config.writeEntry( keybase + "Geometries/HierarchyViewY", hierarchyView->tqparentWidget()->y() );
config.writeEntry( keybase + "Geometries/HierarchyViewWidth", hierarchyView->tqparentWidget()->width() );
config.writeEntry( keybase + "Geometries/HierarchyViewHeight", hierarchyView->tqparentWidget()->height() );
config.writeEntry( keybase + "Geometries/WorkspaceX", wspace->tqparentWidget()->x() );
config.writeEntry( keybase + "Geometries/WorkspaceY", wspace->tqparentWidget()->y() );
config.writeEntry( keybase + "Geometries/WorkspaceWidth", wspace->tqparentWidget()->width() );
config.writeEntry( keybase + "Geometries/WorkspaceHeight", wspace->tqparentWidget()->height() );
config.writeEntry( keybase + "Geometries/PropertyEditorX", propertyEditor->parentWidget()->x() );
config.writeEntry( keybase + "Geometries/PropertyEditorY", propertyEditor->parentWidget()->y() );
config.writeEntry( keybase + "Geometries/PropertyEditorWidth", propertyEditor->parentWidget()->width() );
config.writeEntry( keybase + "Geometries/PropertyEditorHeight", propertyEditor->parentWidget()->height() );
config.writeEntry( keybase + "Geometries/HierarchyViewX", hierarchyView->parentWidget()->x() );
config.writeEntry( keybase + "Geometries/HierarchyViewY", hierarchyView->parentWidget()->y() );
config.writeEntry( keybase + "Geometries/HierarchyViewWidth", hierarchyView->parentWidget()->width() );
config.writeEntry( keybase + "Geometries/HierarchyViewHeight", hierarchyView->parentWidget()->height() );
config.writeEntry( keybase + "Geometries/WorkspaceX", wspace->parentWidget()->x() );
config.writeEntry( keybase + "Geometries/WorkspaceY", wspace->parentWidget()->y() );
config.writeEntry( keybase + "Geometries/WorkspaceWidth", wspace->parentWidget()->width() );
config.writeEntry( keybase + "Geometries/WorkspaceHeight", wspace->parentWidget()->height() );
config.writeEntry( keybase + "View/TextLabels", usesTextLabel() );
config.writeEntry( keybase + "View/BigIcons", usesBigPixmaps() );
@ -3204,7 +3204,7 @@ void MainWindow::setModified( bool b, TQWidget *window )
}
return;
}
w = w->tqparentWidget( TRUE );
w = w->parentWidget( TRUE );
}
}
@ -3300,9 +3300,9 @@ void MainWindow::enableAll( bool enable )
menuBar()->setEnabled( enable );
TQObjectList *l = queryList( TQDOCKWINDOW_OBJECT_NAME_STRING );
for ( TQObject *o = l->first(); o; o = l->next() ) {
if ( TQT_BASE_OBJECT(o) == wspace->tqparentWidget() ||
TQT_BASE_OBJECT(o) == oWindow->tqparentWidget() ||
TQT_BASE_OBJECT(o) == hierarchyView->tqparentWidget() )
if ( TQT_BASE_OBJECT(o) == wspace->parentWidget() ||
TQT_BASE_OBJECT(o) == oWindow->parentWidget() ||
TQT_BASE_OBJECT(o) == hierarchyView->parentWidget() )
continue;
( (TQWidget*)o )->setEnabled( enable );
}
@ -3520,14 +3520,14 @@ void MainWindow::breakPointsChanged()
int MainWindow::currentLayoutDefaultSpacing() const
{
if ( ( (MainWindow*)this )->formWindow() )
return ( (MainWindow*)this )->formWindow()->tqlayoutDefaultSpacing();
return ( (MainWindow*)this )->formWindow()->layoutDefaultSpacing();
return BOXLAYOUT_DEFAULT_SPACING;
}
int MainWindow::currentLayoutDefaultMargin() const
{
if ( ( (MainWindow*)this )->formWindow() )
return ( (MainWindow*)this )->formWindow()->tqlayoutDefaultMargin();
return ( (MainWindow*)this )->formWindow()->layoutDefaultMargin();
return BOXLAYOUT_DEFAULT_MARGIN;
}
@ -3682,15 +3682,15 @@ void MainWindow::showGUIStuff( bool b )
return;
guiStuffVisible = b;
if ( !b ) {
setAppropriate( (TQDockWindow*)toolBox->tqparentWidget(), FALSE );
toolBox->tqparentWidget()->hide();
setAppropriate( (TQDockWindow*)toolBox->parentWidget(), FALSE );
toolBox->parentWidget()->hide();
for ( TQToolBar *tb = widgetToolBars.first(); tb; tb = widgetToolBars.next() ) {
tb->hide();
setAppropriate( tb, FALSE );
}
propertyEditor->setPropertyEditorEnabled( FALSE );
setAppropriate( tqlayoutToolBar, FALSE );
tqlayoutToolBar->hide();
setAppropriate( layoutToolBar, FALSE );
layoutToolBar->hide();
setAppropriate( toolsToolBar, FALSE );
toolsToolBar->hide();
menubar->removeItem( toolsMenuId );
@ -3706,7 +3706,7 @@ void MainWindow::showGUIStuff( bool b )
actionEditConnections->setEnabled( FALSE );
actionEditFunctions->setEnabled( FALSE );
actionEditAccels->setEnabled( FALSE );
( (TQDockWindow*)propertyEditor->tqparentWidget() )->
( (TQDockWindow*)propertyEditor->parentWidget() )->
setCaption( i18n( "Signal Handlers" ) );
actionGroupNew->removeFrom( fileMenu );
actionGroupNew->removeFrom( projectToolBar );
@ -3719,19 +3719,19 @@ void MainWindow::showGUIStuff( bool b )
actionFileSave->addTo( projectToolBar );
actionFileExit->addTo( fileMenu );
} else {
setAppropriate( (TQDockWindow*)toolBox->tqparentWidget(), TRUE );
toolBox->tqparentWidget()->show();
setAppropriate( (TQDockWindow*)toolBox->parentWidget(), TRUE );
toolBox->parentWidget()->show();
for ( TQToolBar *tb = widgetToolBars.first(); tb; tb = widgetToolBars.next() ) {
setAppropriate( tb, TRUE );
tb->hide();
}
propertyEditor->setPropertyEditorEnabled( TRUE );
setAppropriate( tqlayoutToolBar, TRUE );
tqlayoutToolBar->show();
setAppropriate( layoutToolBar, TRUE );
layoutToolBar->show();
setAppropriate( toolsToolBar, TRUE );
toolsToolBar->show();
menubar->insertItem( i18n( "&Tools" ), toolsMenu, toolsMenuId, toolsMenuIndex );
menubar->insertItem( i18n( "&Layout" ), tqlayoutMenu, toolsMenuId + 1, toolsMenuIndex + 1 );
menubar->insertItem( i18n( "&Layout" ), layoutMenu, toolsMenuId + 1, toolsMenuIndex + 1 );
menubar->insertItem( i18n( "&Preview" ), previewMenu, toolsMenuId + 2, toolsMenuIndex + 2 );
connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQT_SLOT( setEnabled(bool) ) );
connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQT_SLOT( setEnabled(bool) ) );
@ -3743,7 +3743,7 @@ void MainWindow::showGUIStuff( bool b )
actionEditConnections->setEnabled( TRUE );
actionEditFunctions->setEnabled( TRUE );
actionEditAccels->setEnabled( TRUE );
( (TQDockWindow*)propertyEditor->tqparentWidget() )->
( (TQDockWindow*)propertyEditor->parentWidget() )->
setCaption( i18n( "Property Editor/Signal Handlers" ) );
actionFileSave->removeFrom( fileMenu );
actionFileSave->removeFrom( projectToolBar );

6
kdevdesigner/designer/mainwindow.h
Unescape View File

@ -386,7 +386,7 @@ private:
TQWorkspace *qworkspace;
TQMenuBar *menubar;
TQGuardedPtr<FormWindow> lastActiveFormWindow;
bool breakLayout, tqlayoutChilds, tqlayoutSelected;
bool breakLayout, layoutChilds, layoutSelected;
TQPoint grd;
bool sGrid, snGrid;
bool restoreConfig;
@ -425,8 +425,8 @@ private:
TQPopupMenu *rmbWidgets;
TQPopupMenu *rmbFormWindow;
TQPopupMenu *customWidgetMenu, *windowMenu, *fileMenu, *recentlyFilesMenu, *recentlyProjectsMenu;
TQPopupMenu *toolsMenu, *tqlayoutMenu, *previewMenu;
TQToolBar *customWidgetToolBar, *tqlayoutToolBar, *projectToolBar, *customWidgetToolBar2, *toolsToolBar;
TQPopupMenu *toolsMenu, *layoutMenu, *previewMenu;
TQToolBar *customWidgetToolBar, *layoutToolBar, *projectToolBar, *customWidgetToolBar2, *toolsToolBar;
TQToolBar *commonWidgetsToolBar;
TQPtrList<TQToolBar> widgetToolBars;

82
kdevdesigner/designer/mainwindowactions.cpp
Unescape View File

@ -351,14 +351,14 @@ void MainWindow::setupLayoutActions()
connect( actionEditGridLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutGrid() ) );
actionEditGridLayout->setEnabled( FALSE );
actionEditSplitHorizontal = new DesignerAction( i18n( "Lay OutQt::Horizontally (in Splitter)" ), createIconSet("designer_editvtqlayoutsplit.png"),
actionEditSplitHorizontal = new DesignerAction( i18n( "Lay OutQt::Horizontally (in Splitter)" ), createIconSet("designer_editvlayoutsplit.png"),
i18n( "Lay OutQt::Horizontally (in S&plitter)" ), 0, TQT_TQOBJECT(this), 0 );
actionEditSplitHorizontal->setStatusTip(i18n("Lays out the selected widgets horizontally in a splitter") );
actionEditSplitHorizontal->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Horizontally (in Splitter)" ) );
connect( actionEditSplitHorizontal, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutHorizontalSplit() ) );
actionEditSplitHorizontal->setEnabled( FALSE );
actionEditSplitVertical = new DesignerAction( i18n( "Lay OutQt::Vertically (in Splitter)" ), createIconSet("designer_edithtqlayoutsplit.png"),
actionEditSplitVertical = new DesignerAction( i18n( "Lay OutQt::Vertically (in Splitter)" ), createIconSet("designer_edithlayoutsplit.png"),
i18n( "Lay OutQt::Vertically (in Sp&litter)" ), 0, TQT_TQOBJECT(this), 0 );
actionEditSplitVertical->setStatusTip(i18n("Lays out the selected widgets vertically in a splitter") );
actionEditSplitVertical->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Vertically (in Splitter)" ) );
@ -392,20 +392,20 @@ void MainWindow::setupLayoutActions()
TQWidget *w;
commonWidgetsToolBar->setStretchableWidget( ( w = new TQWidget( commonWidgetsToolBar ) ) );
w->setBackgroundMode( commonWidgetsToolBar->backgroundMode() );
TQWhatsThis::add( tqlayoutToolBar, i18n( "<b>The Layout toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) );
actionEditAdjustSize->addTo( tqlayoutToolBar );
tqlayoutToolBar->addSeparator();
actionEditHLayout->addTo( tqlayoutToolBar );
actionEditVLayout->addTo( tqlayoutToolBar );
actionEditGridLayout->addTo( tqlayoutToolBar );
actionEditSplitHorizontal->addTo( tqlayoutToolBar );
actionEditSplitVertical->addTo( tqlayoutToolBar );
actionEditBreakLayout->addTo( tqlayoutToolBar );
tqlayoutToolBar->addSeparator();
actionInsertSpacer->addTo( tqlayoutToolBar );
TQWhatsThis::add( layoutToolBar, i18n( "<b>The Layout toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) );
actionEditAdjustSize->addTo( layoutToolBar );
layoutToolBar->addSeparator();
actionEditHLayout->addTo( layoutToolBar );
actionEditVLayout->addTo( layoutToolBar );
actionEditGridLayout->addTo( layoutToolBar );
actionEditSplitHorizontal->addTo( layoutToolBar );
actionEditSplitVertical->addTo( layoutToolBar );
actionEditBreakLayout->addTo( layoutToolBar );
layoutToolBar->addSeparator();
actionInsertSpacer->addTo( layoutToolBar );
TQPopupMenu *menu = new TQPopupMenu( this, "Layout" );
tqlayoutMenu = menu;
layoutMenu = menu;
menubar->insertItem( i18n( "&Layout" ), menu, toolsMenuId + 1 );
actionEditAdjustSize->addTo( menu );
menu->insertSeparator();
@ -851,7 +851,7 @@ void MainWindow::setupPreviewActions()
{
DesignerAction* a = 0;
TQPopupMenu *menu = new TQPopupMenu( this, "Preview" );
tqlayoutMenu = menu;
layoutMenu = menu;
menubar->insertItem( i18n( "&Preview" ), menu, toolsMenuId + 2 );
a = new DesignerAction( i18n( "Preview Form" ), TQPixmap(), i18n( "Preview &Form" ), 0, TQT_TQOBJECT(this), 0 );
@ -1554,13 +1554,13 @@ void MainWindow::editPaste()
TQWidgetList l( formWindow()->selectedWidgets() );
if ( l.count() == 1 ) {
w = l.first();
if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout ||
if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ||
( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) &&
w != formWindow()->mainContainer() ) )
w = formWindow()->mainContainer();
}
if ( w && WidgetFactory::tqlayoutType( w ) == WidgetFactory::NoLayout ) {
if ( w && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) {
formWindow()->paste( tqApp->clipboard()->text(), WidgetFactory::containerOfWidget( w ) );
hierarchyView->widgetInserted( 0 );
formWindow()->commandHistory()->setModified( TRUE );
@ -1611,42 +1611,42 @@ void MainWindow::editAdjustSize()
void MainWindow::editLayoutHorizontal()
{
if ( tqlayoutChilds )
if ( layoutChilds )
editLayoutContainerHorizontal();
else if ( tqlayoutSelected && formWindow() )
formWindow()->tqlayoutHorizontal();
else if ( layoutSelected && formWindow() )
formWindow()->layoutHorizontal();
}
void MainWindow::editLayoutVertical()
{
if ( tqlayoutChilds )
if ( layoutChilds )
editLayoutContainerVertical();
else if ( tqlayoutSelected && formWindow() )
formWindow()->tqlayoutVertical();
else if ( layoutSelected && formWindow() )
formWindow()->layoutVertical();
}
void MainWindow::editLayoutHorizontalSplit()
{
if ( tqlayoutChilds )
if ( layoutChilds )
; // no way to do that
else if ( tqlayoutSelected && formWindow() )
formWindow()->tqlayoutHorizontalSplit();
else if ( layoutSelected && formWindow() )
formWindow()->layoutHorizontalSplit();
}
void MainWindow::editLayoutVerticalSplit()
{
if ( tqlayoutChilds )
if ( layoutChilds )
; // no way to do that
else if ( tqlayoutSelected && formWindow() )
formWindow()->tqlayoutVerticalSplit();
else if ( layoutSelected && formWindow() )
formWindow()->layoutVerticalSplit();
}
void MainWindow::editLayoutGrid()
{
if ( tqlayoutChilds )
if ( layoutChilds )
editLayoutContainerGrid();
else if ( tqlayoutSelected && formWindow() )
formWindow()->tqlayoutGrid();
else if ( layoutSelected && formWindow() )
formWindow()->layoutGrid();
}
void MainWindow::editLayoutContainerVertical()
@ -1658,7 +1658,7 @@ void MainWindow::editLayoutContainerVertical()
if ( l.count() == 1 )
w = l.first();
if ( w )
formWindow()->tqlayoutVerticalContainer( w );
formWindow()->layoutVerticalContainer( w );
}
void MainWindow::editLayoutContainerHorizontal()
@ -1670,7 +1670,7 @@ void MainWindow::editLayoutContainerHorizontal()
if ( l.count() == 1 )
w = l.first();
if ( w )
formWindow()->tqlayoutHorizontalContainer( w );
formWindow()->layoutHorizontalContainer( w );
}
void MainWindow::editLayoutContainerGrid()
@ -1682,7 +1682,7 @@ void MainWindow::editLayoutContainerGrid()
if ( l.count() == 1 )
w = l.first();
if ( w )
formWindow()->tqlayoutGridContainer( w );
formWindow()->layoutGridContainer( w );
}
void MainWindow::editBreakLayout()
@ -1692,15 +1692,15 @@ void MainWindow::editBreakLayout()
TQWidget *w = formWindow()->mainContainer();
if ( formWindow()->currentWidget() )
w = formWindow()->currentWidget();
if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout ||
w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout ) {
if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ||
w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) {
formWindow()->breakLayout( w );
return;
} else {
TQWidgetList widgets = formWindow()->selectedWidgets();
for ( w = widgets.first(); w; w = widgets.next() ) {
if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout ||
w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout )
if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ||
w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
break;
}
if ( w ) {
@ -1710,8 +1710,8 @@ void MainWindow::editBreakLayout()
}
w = formWindow()->mainContainer();
if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout ||
w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout )
if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ||
w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
formWindow()->breakLayout( w );
}

8
kdevdesigner/designer/menubareditor.cpp
Unescape View File

@ -199,7 +199,7 @@ MenuBarEditorItem * MenuBarEditor::createItem( int index, bool addToCmdStack )
void MenuBarEditor::insertItem( MenuBarEditorItem * item, int index )
{
item->menu()->tqparentMenu = this;
item->menu()->parentMenu = this;
if ( index != -1 )
itemList.insert( index, item );
@ -504,7 +504,7 @@ void MenuBarEditor::deleteItem( int index )
TQSize MenuBarEditor::tqsizeHint() const
{
return TQSize( tqparentWidget()->width(), heightForWidth( tqparentWidget()->width() ) );
return TQSize( parentWidget()->width(), heightForWidth( parentWidget()->width() ) );
}
int MenuBarEditor::heightForWidth( int max_width ) const
@ -534,8 +534,8 @@ void MenuBarEditor::show()
TQWidget::show();
resizeInternals();
TQResizeEvent e( tqparentWidget()->size(), tqparentWidget()->size() );
TQApplication::sendEvent( tqparentWidget(), &e );
TQResizeEvent e( parentWidget()->size(), parentWidget()->size() );
TQApplication::sendEvent( parentWidget(), &e );
}
void MenuBarEditor::checkAccels( TQMap<TQChar, TQWidgetList > &accels )

10
kdevdesigner/designer/metadatabase.cpp
Unescape View File

@ -304,11 +304,11 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing )
r->spacing = spacing;
TQLayout * tqlayout = 0;
WidgetFactory::tqlayoutType( (TQWidget*)o, tqlayout );
WidgetFactory::layoutType( (TQWidget*)o, tqlayout );
if ( tqlayout ) {
int spadef = 6;
if ( MainWindow::self->formWindow() )
spadef = MainWindow::self->formWindow()->tqlayoutDefaultSpacing();
spadef = MainWindow::self->formWindow()->layoutDefaultSpacing();
if ( spacing == -1 )
tqlayout->setSpacing( spadef );
else
@ -347,21 +347,21 @@ void MetaDataBase::setMargin( TQObject *o, int margin )
r->margin = margin;
TQLayout * tqlayout = 0;
WidgetFactory::tqlayoutType( (TQWidget*)o, tqlayout );
WidgetFactory::layoutType( (TQWidget*)o, tqlayout );
bool isInnerLayout = TRUE;
TQWidget *widget = (TQWidget*)o;
if ( widget && !::tqqt_cast<TQLayoutWidget*>(widget) &&
( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) ||
widget && widget->tqparentWidget() && ::tqqt_cast<FormWindow*>(widget->tqparentWidget()) ) )
widget && widget->parentWidget() && ::tqqt_cast<FormWindow*>(widget->parentWidget()) ) )
isInnerLayout = FALSE;
if ( tqlayout ) {
int mardef = 11;
if ( MainWindow::self->formWindow() )
mardef = MainWindow::self->formWindow()->tqlayoutDefaultMargin();
mardef = MainWindow::self->formWindow()->layoutDefaultMargin();
if ( margin == -1 ) {
if ( isInnerLayout )
tqlayout->setMargin( 1 );

2
kdevdesigner/designer/multilineeditor.ui
Unescape View File

@ -177,5 +177,5 @@
<slot>okClicked()</slot>
<slot>cancelClicked()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

18
kdevdesigner/designer/multilineeditorimpl.cpp
Unescape View File

@ -126,45 +126,45 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget
basicToolBar->addSeparator();
TQPopupMenu *tqlayoutMenu = new TQPopupMenu( this );
menuBar->insertItem( i18n( "&Layout" ), tqlayoutMenu );
TQPopupMenu *layoutMenu = new TQPopupMenu( this );
menuBar->insertItem( i18n( "&Layout" ), layoutMenu );
TQAction *brAction = new TQAction( this );
brAction->setIconSet( BarIcon( "designer_textlinebreak.png", KDevDesignerPartFactory::instance() ) );
brAction->setText( i18n("Break" ) );
brAction->addTo( basicToolBar );
brAction->addTo( tqlayoutMenu );
brAction->addTo( layoutMenu );
connect( brAction, TQT_SIGNAL( activated() ) , this, TQT_SLOT( insertBR() ) );
ToolBarItem *p = new ToolBarItem( this, basicToolBar, i18n( "Paragraph" ),
"p", BarIcon( "designer_textparagraph.png", KDevDesignerPartFactory::instance() ) );
p->addTo( tqlayoutMenu );
p->addTo( layoutMenu );
connect( p, TQT_SIGNAL( clicked( const TQString& ) ),
this, TQT_SLOT( insertTags( const TQString& )));
tqlayoutMenu->insertSeparator();
layoutMenu->insertSeparator();
basicToolBar->addSeparator();
ToolBarItem *al = new ToolBarItem( this, basicToolBar, i18n( "Align left" ),
"p align=\"left\"", BarIcon( "designer_textleft.png", KDevDesignerPartFactory::instance() ) );
al->addTo( tqlayoutMenu );
al->addTo( layoutMenu );
connect( al, TQT_SIGNAL( clicked( const TQString& ) ),
this, TQT_SLOT( insertTags( const TQString& )));
ToolBarItem *ac = new ToolBarItem( this, basicToolBar, i18n( "Align center" ),
"p align=\"center\"", BarIcon( "designer_textcenter.png", KDevDesignerPartFactory::instance() ) );
ac->addTo( tqlayoutMenu );
ac->addTo( layoutMenu );
connect( ac, TQT_SIGNAL( clicked( const TQString& ) ),
this, TQT_SLOT( insertTags( const TQString& )));
ToolBarItem *ar = new ToolBarItem( this, basicToolBar, i18n( "Align right" ),
"p align=\"right\"", BarIcon( "designer_textright.png", KDevDesignerPartFactory::instance() ) );
ar->addTo( tqlayoutMenu );
ar->addTo( layoutMenu );
connect( ar, TQT_SIGNAL( clicked( const TQString& ) ),
this, TQT_SLOT( insertTags( const TQString& )));
ToolBarItem *block = new ToolBarItem( this, basicToolBar, i18n( "Blockquote" ),
"blockquote", BarIcon( "designer_textjustify.png", KDevDesignerPartFactory::instance() ) );
block->addTo( tqlayoutMenu );
block->addTo( layoutMenu );
connect( block, TQT_SIGNAL( clicked( const TQString& ) ),
this, TQT_SLOT( insertTags( const TQString& )));

2
kdevdesigner/designer/newform.ui
Unescape View File

@ -234,5 +234,5 @@
<slot access="protected">itemChanged( TQIconViewItem * )</slot>
<slot access="protected">projectChanged( const TQString &amp; )</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kdevdesigner/designer/orderindicator.cpp
Unescape View File

@ -78,7 +78,7 @@ void OrderIndicator::setOrder( int i, TQWidget* wid )
void OrderIndicator::reposition()
{
TQPoint p =tqparentWidget()->mapFromGlobal( widget->mapToGlobal( widget->rect().topLeft() ) );
TQPoint p =parentWidget()->mapFromGlobal( widget->mapToGlobal( widget->rect().topLeft() ) );
move( p - TQPoint( width()/3, height()/3 ) );
}

2
kdevdesigner/designer/paletteeditoradvanced.ui
Unescape View File

@ -47,7 +47,7 @@
<bool>true</bool>
</property>
<property name="whatsThis" stdset="0">
<string>&lt;b&gt;Edit Palette&lt;/b&gt;&lt;p&gt;Change the current widget or form's palette.&lt;/p&gt;&lt;p&gt;Use a generated palette or select colors for each color group and each color role.&lt;/p&gt;&lt;p&gt;The palette can be tested with different widget tqlayouts in the preview section.&lt;/p&gt;</string>
<string>&lt;b&gt;Edit Palette&lt;/b&gt;&lt;p&gt;Change the current widget or form's palette.&lt;/p&gt;&lt;p&gt;Use a generated palette or select colors for each color group and each color role.&lt;/p&gt;&lt;p&gt;The palette can be tested with different widget layouts in the preview section.&lt;/p&gt;</string>
</property>
<vbox>
<property name="name">

2
kdevdesigner/designer/pixmapcollectioneditor.ui
Unescape View File

@ -214,5 +214,5 @@
<slot>setProject(Project * pro)</slot>
<slot returnType="TQPixmap">scaledPixmap(const TQPixmap &amp; p)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

6
kdevdesigner/designer/pixmapfunction.ui
Unescape View File

@ -77,9 +77,9 @@
<property name="lineWidth">
<number>2</number>
</property>
<property name="tqlayoutMargin" stdset="0">
<property name="layoutMargin" stdset="0">
</property>
<property name="tqlayoutSpacing" stdset="0">
<property name="layoutSpacing" stdset="0">
</property>
<hbox>
<property name="name">
@ -969,7 +969,7 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
</includehints>

34
kdevdesigner/designer/popupmenueditor.cpp
Unescape View File

@ -258,7 +258,7 @@ PopupMenuEditorItem * PopupMenuEditor::clipboardItem = 0;
PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * tqparent, const char * name )
: TQWidget( 0, name, WStyle_Customize | WStyle_NoBorder | WRepaintNoErase | WResizeNoErase ),
formWnd( fw ),
tqparentMenu( tqparent ),
parentMenu( tqparent ),
iconWidth( 0 ),
textWidth( 0 ),
accelWidth( 0 ),
@ -274,7 +274,7 @@ PopupMenuEditor::PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu,
TQWidget * tqparent, const char * name )
: TQWidget( 0, name, WStyle_Customize | WStyle_NoBorder | WRepaintNoErase ),
formWnd( fw ),
tqparentMenu( tqparent ),
parentMenu( tqparent ),
iconWidth( menu->iconWidth ),
textWidth( menu->textWidth ),
accelWidth( menu->accelWidth ),
@ -335,10 +335,10 @@ void PopupMenuEditor::insert( PopupMenuEditorItem * item, int index )
currentIndex = index;
}
item->m = this;
item->s->tqparentMenu = this;
item->s->parentMenu = this;
resizeToContents();
if ( isVisible() && tqparentMenu )
tqparentMenu->update(); // draw arrow in tqparent menu
if ( isVisible() && parentMenu )
parentMenu->update(); // draw arrow in tqparent menu
emit inserted( item->action() );
}
@ -644,8 +644,8 @@ void PopupMenuEditor::removeItem( int index )
idx );
formWnd->commandHistory()->addCommand( cmd );
cmd->execute();
if ( itemList.count() == 0 && tqparentMenu )
tqparentMenu->update();
if ( itemList.count() == 0 && parentMenu )
parentMenu->update();
resizeToContents();
}
}
@ -1006,7 +1006,7 @@ void PopupMenuEditor::focusInEvent( TQFocusEvent * )
{
showSubMenu();
update();
tqparentMenu->update();
parentMenu->update();
}
void PopupMenuEditor::focusOutEvent( TQFocusEvent * )
@ -1019,7 +1019,7 @@ void PopupMenuEditor::focusOutEvent( TQFocusEvent * )
TQWidget * w = this;
while ( w && w != fw && ::tqqt_cast<PopupMenuEditor*>(w) ) { // hide all popups
w->hide();
w = ((PopupMenuEditor *)w)->tqparentEditor();
w = ((PopupMenuEditor *)w)->parentEditor();
}
}
}
@ -1259,8 +1259,8 @@ void PopupMenuEditor::safeDec()
} while ( currentIndex > 0 && !currentItem()->isVisible() );
if ( currentIndex == 0 &&
!currentItem()->isVisible() &&
tqparentMenu ) {
tqparentMenu->setFocus();
parentMenu ) {
parentMenu->setFocus();
}
}
@ -1317,9 +1317,9 @@ void PopupMenuEditor::navigateUp( bool ctrl )
safeDec();
}
showSubMenu();
} else if ( tqparentMenu ) {
tqparentMenu->setFocus();
tqparentMenu->update();
} else if ( parentMenu ) {
parentMenu->setFocus();
parentMenu->update();
}
}
@ -1351,9 +1351,9 @@ void PopupMenuEditor::navigateLeft()
if ( currentItem()->isSeparator() ||
currentIndex >= (int)itemList.count() ||
currentField == 0 ) {
if ( tqparentMenu ) {
if ( parentMenu ) {
hideSubMenu();
tqparentMenu->setFocus();
parentMenu->setFocus();
} else if ( !currentItem()->isSeparator() ) {
currentField = 2;
}
@ -1448,7 +1448,7 @@ TQString PopupMenuEditor::constructName( PopupMenuEditorItem *item )
{
TQString s;
TQString name = item->action()->menuText();
TQWidget *e = tqparentEditor();
TQWidget *e = parentEditor();
PopupMenuEditor *p = ::tqqt_cast<PopupMenuEditor*>(e);
if ( p ) {
int idx = p->tqfind( item->m );

4
kdevdesigner/designer/popupmenueditor.h
Unescape View File

@ -140,7 +140,7 @@ public:
TQPtrList<PopupMenuEditorItem> * items() { return &itemList; }
TQWidget * tqparentEditor() { return tqparentMenu; }
TQWidget * parentEditor() { return parentMenu; }
signals:
void inserted( TQAction * );
@ -212,7 +212,7 @@ private:
TQPtrList<PopupMenuEditorItem> itemList;
PopupMenuEditorItem addItem;
PopupMenuEditorItem addSeparator;
TQWidget * tqparentMenu;
TQWidget * parentMenu;
int iconWidth;
int textWidth;

2
kdevdesigner/designer/preferences.ui
Unescape View File

@ -640,7 +640,7 @@
<slot access="protected">init()</slot>
<slot access="protected">destroy()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>styledbutton.h</includehint>
<includehint>styledbutton.h</includehint>

6
kdevdesigner/designer/project.cpp
Unescape View File

@ -1316,8 +1316,8 @@ void Project::addObject( TQObject *o )
TQT_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) )
);
}
if ( fw->tqparentWidget() ) {
fw->tqparentWidget()->setFixedSize( 1, 1 );
if ( fw->parentWidget() ) {
fw->parentWidget()->setFixedSize( 1, 1 );
fw->show();
}
} else {
@ -1494,7 +1494,7 @@ void Project::designerCreated()
fw->reparent( MainWindow::self->qWorkspace(), TQPoint( 0, 0 ), FALSE );
TQApplication::sendPostedEvents( MainWindow::self->qWorkspace(),
TQEvent::ChildInserted );
fw->tqparentWidget()->setFixedSize( 1, 1 );
fw->parentWidget()->setFixedSize( 1, 1 );
fw->show();
}
}

2
kdevdesigner/designer/projectsettings.ui
Unescape View File

@ -297,5 +297,5 @@
<slot access="protected">languageChanged( const QString &amp; )</slot>
<slot access="protected">okClicked()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

72
kdevdesigner/designer/propertyeditor.cpp
Unescape View File

@ -184,7 +184,7 @@ PropertyItem::PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *
PropertyItem::~PropertyItem()
{
if ( resetButton )
delete resetButton->tqparentWidget();
delete resetButton->parentWidget();
resetButton = 0;
}
@ -349,7 +349,7 @@ void PropertyItem::setOpen( bool b )
void PropertyItem::showEditor()
{
createResetButton();
resetButton->tqparentWidget()->show();
resetButton->parentWidget()->show();
}
/*! Subclasses have to hide the editor of the item here
@ -358,7 +358,7 @@ void PropertyItem::showEditor()
void PropertyItem::hideEditor()
{
createResetButton();
resetButton->tqparentWidget()->hide();
resetButton->parentWidget()->hide();
}
/*! This is called to init the value of the item. Reimplement in
@ -402,7 +402,7 @@ TQString PropertyItem::name() const
void PropertyItem::createResetButton()
{
if ( resetButton ) {
resetButton->tqparentWidget()->lower();
resetButton->parentWidget()->lower();
return;
}
const TQPixmap DesignerResetPix = SmallIcon( "designer_resetproperty.png" , KDevDesignerPartFactory::instance());
@ -455,8 +455,8 @@ void PropertyItem::placeEditor( TQWidget *w )
r = TQRect( listview->viewportToContents( r.topLeft() ), r.size() );
w->resize( r.size() );
listview->moveChild( w, r.x(), r.y() );
resetButton->tqparentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() );
listview->moveChild( resetButton->tqparentWidget(), r.x() + r.width() - 8, r.y() );
resetButton->parentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() );
listview->moveChild( resetButton->parentWidget(), r.x() + r.width() - 8, r.y() );
resetButton->setFixedHeight( TQMAX( 0, r.height() - 3 ) );
}
@ -3019,13 +3019,13 @@ static TQVariant::Type type_to_variant( const TQString &s )
}
#ifndef TQT_NO_SQL
static bool tqparent_is_data_aware( TQWidget *w )
static bool parent_is_data_aware( TQWidget *w )
{
TQWidget *p = w ? w->tqparentWidget() : 0;
TQWidget *p = w ? w->parentWidget() : 0;
while ( p && !p->isTopLevel() ) {
if ( ::tqqt_cast<QDesignerDataBrowser*>(p) || ::tqqt_cast<QDesignerDataView*>(p) )
return TRUE;
p = p->tqparentWidget();
p = p->parentWidget();
}
return FALSE;
}
@ -3045,10 +3045,10 @@ void PropertyList::setupProperties()
TQMap<TQString, bool> unique;
TQObject *w = editor->widget();
TQStringList valueSet;
bool tqparentHasLayout =
bool parentHasLayout =
w->isWidgetType() &&
!editor->formWindow()->isMainContainer( TQT_TQOBJECT(w) ) && ( (TQWidget*)w )->tqparentWidget() &&
WidgetFactory::tqlayoutType( ( (TQWidget*)w )->tqparentWidget() ) != WidgetFactory::NoLayout;
!editor->formWindow()->isMainContainer( TQT_TQOBJECT(w) ) && ( (TQWidget*)w )->parentWidget() &&
WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
const TQMetaProperty* p =
editor->widget()->tqmetaObject()->
@ -3092,7 +3092,7 @@ void PropertyList::setupProperties()
continue;
if ( qstrcmp( p->name(), "baseSize" ) == 0 )
continue;
if ( tqparentHasLayout && qstrcmp( p->name(), "geometry" ) == 0 )
if ( parentHasLayout && qstrcmp( p->name(), "geometry" ) == 0 )
continue;
if ( ::tqqt_cast<TQLayoutWidget*>(w) || ::tqqt_cast<Spacer*>(w) ) {
if ( qstrcmp( p->name(), "sizePolicy" ) == 0 )
@ -3212,7 +3212,7 @@ void PropertyList::setupProperties()
TQStringList lst;
for ( uint i = 0; i < l.count(); ++i ) {
TQString k = l.at( i );
// filter out enum-tqmasks
// filter out enum-masks
if ( k[0] == 'M' && k[1].category() == TQChar::Letter_Uppercase )
continue;
lst << k;
@ -3236,24 +3236,24 @@ void PropertyList::setupProperties()
}
if ( !::tqqt_cast<TQSplitter*>(w) && !::tqqt_cast<MenuBarEditor*>(w) && !::tqqt_cast<QDesignerToolBar*>(w) &&
w->isWidgetType() && WidgetFactory::tqlayoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) {
item = new PropertyLayoutItem( this, item, 0, "tqlayoutSpacing" );
w->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) {
item = new PropertyLayoutItem( this, item, 0, "layoutSpacing" );
setPropertyValue( item );
if ( MetaDataBase::isPropertyChanged( editor->widget(), "tqlayoutSpacing" )
if ( MetaDataBase::isPropertyChanged( editor->widget(), "layoutSpacing" )
|| MetaDataBase::spacing( editor->widget() ) != -1 )
tqlayoutInitValue( item, TRUE );
layoutInitValue( item, TRUE );
else
tqlayoutInitValue( item );
item = new PropertyLayoutItem( this, item, 0, "tqlayoutMargin" );
layoutInitValue( item );
item = new PropertyLayoutItem( this, item, 0, "layoutMargin" );
setPropertyValue( item );
if ( MetaDataBase::isPropertyChanged( editor->widget(), "tqlayoutMargin" )
if ( MetaDataBase::isPropertyChanged( editor->widget(), "layoutMargin" )
|| MetaDataBase::margin( editor->widget() ) != -1 )
tqlayoutInitValue( item, TRUE );
layoutInitValue( item, TRUE );
else
tqlayoutInitValue( item );
layoutInitValue( item );
TQWidget *widget = (TQWidget*)w;
if ( ( !::tqqt_cast<TQLayoutWidget*>(widget) &&
widget->tqparentWidget() && ::tqqt_cast<FormWindow*>(widget->tqparentWidget()) ) ) {
widget->parentWidget() && ::tqqt_cast<FormWindow*>(widget->parentWidget()) ) ) {
item = new PropertyListItem( this, item, 0, "resizeMode", FALSE );
TQStringList lst;
lst << "Auto" << "FreeResize" << "Minimum" << "Fixed";
@ -3282,7 +3282,7 @@ void PropertyList::setupProperties()
#ifndef TQT_NO_SQL
if ( !::tqqt_cast<TQDataTable*>(editor->widget()) && !::tqqt_cast<TQDataBrowser*>(editor->widget()) &&
!::tqqt_cast<TQDataView*>(editor->widget()) && tqparent_is_data_aware( ::tqqt_cast<TQWidget*>(editor->widget()) ) ) {
!::tqqt_cast<TQDataView*>(editor->widget()) && parent_is_data_aware( ::tqqt_cast<TQWidget*>(editor->widget()) ) ) {
item = new PropertyDatabaseItem( this, item, 0, "database", TQT_BASE_OBJECT(editor->formWindow()->mainContainer()) != TQT_BASE_OBJECT(w) );
setPropertyValue( item );
if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) )
@ -3392,7 +3392,7 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name,
case TQVariant::Int:
if ( name == "accel" )
item = new PropertyTextItem( this, item, 0, name, FALSE, FALSE, FALSE, TRUE );
else if ( name == "tqlayoutSpacing" || name == "tqlayoutMargin" )
else if ( name == "layoutSpacing" || name == "layoutMargin" )
item = new PropertyLayoutItem( this, item, 0, name );
else if ( name == "resizeMode" )
item = new PropertyListItem( this, item, 0, name, TRUE );
@ -3496,7 +3496,7 @@ void PropertyList::valueChanged( PropertyItem *i )
editor->formWindow()->commandHistory()->addCommand( cmd, TRUE );
}
void PropertyList::tqlayoutInitValue( PropertyItem *i, bool changed )
void PropertyList::layoutInitValue( PropertyItem *i, bool changed )
{
if ( !editor->widget() )
return;
@ -3663,7 +3663,7 @@ void PropertyList::refetchData()
if ( i->hasSubItems() )
i->initChildren();
bool changed = MetaDataBase::isPropertyChanged( editor->widget(), i->name() );
if ( ( i->name() == "tqlayoutSpacing" || i->name() == "tqlayoutMargin" ) ) {
if ( ( i->name() == "layoutSpacing" || i->name() == "layoutMargin" ) ) {
if ( i->value().toString() != "-1" )
i->setChanged( TRUE, FALSE );
else
@ -3715,9 +3715,9 @@ void PropertyList::setPropertyValue( PropertyItem *i )
i->setValue( TQVariant( TRUE, 0 ) );
else
i->setValue( TQVariant( FALSE, 0 ) );
} else if ( i->name() == "tqlayoutSpacing" ) {
} else if ( i->name() == "layoutSpacing" ) {
( (PropertyLayoutItem*)i )->setValue( MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) ) ) ));
} else if ( i->name() == "tqlayoutMargin" ) {
} else if ( i->name() == "layoutMargin" ) {
( (PropertyLayoutItem*)i )->setValue( MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) ) ) ));
} else if ( i->name() == "resizeMode" ) {
( (PropertyListItem*)i )->setCurrentItem( MetaDataBase::resizeMode( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) ) )) );
@ -4165,11 +4165,11 @@ void PropertyEditor::setWidget( TQObject *w, FormWindow *fw )
// if there is no properties displayed then we really should show them.
// to do this check the number of properties in the list.
bool ret = (listview->childCount() > 0) ? TRUE : FALSE;
if ( wid->isWidgetType() && WidgetFactory::tqlayoutType( (TQWidget*)wid ) != WidgetFactory::NoLayout ) {
if ( wid->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)wid ) != WidgetFactory::NoLayout ) {
TQListViewItemIterator it( listview );
ret = FALSE;
while ( it.current() ) {
if ( it.current()->text( 0 ) == "tqlayoutSpacing" || it.current()->text( 0 ) == "tqlayoutMargin" ) {
if ( it.current()->text( 0 ) == "layoutSpacing" || it.current()->text( 0 ) == "layoutMargin" ) {
ret = TRUE;
break;
}
@ -4323,10 +4323,10 @@ void PropertyEditor::setSignalHandlersEnabled( bool b )
void PropertyEditor::updateWindow()
{
if ( isHidden() && count() ) {
tqparentWidget()->show();
MainWindow::self->setAppropriate( (TQDockWindow*)tqparentWidget(), TRUE );
parentWidget()->show();
MainWindow::self->setAppropriate( (TQDockWindow*)parentWidget(), TRUE );
} else if ( isShown() && !count() ) {
tqparentWidget()->hide();
MainWindow::self->setAppropriate( (TQDockWindow*)tqparentWidget(), FALSE );
parentWidget()->hide();
MainWindow::self->setAppropriate( (TQDockWindow*)parentWidget(), FALSE );
}
}

2
kdevdesigner/designer/propertyeditor.h
Unescape View File

@ -690,7 +690,7 @@ public:
virtual void setPropertyValue( PropertyItem *i );
virtual void setCurrentProperty( const TQString &n );
void tqlayoutInitValue( PropertyItem *i, bool changed = FALSE );
void layoutInitValue( PropertyItem *i, bool changed = FALSE );
PropertyEditor *propertyEditor() const;
TQString whatsThisAt( const TQPoint &p );
void showCurrentWhatsThis();

2
kdevdesigner/designer/replacedialog.ui
Unescape View File

@ -314,5 +314,5 @@
<slot>doReplaceAll()</slot>
<slot>setEditor( EditorInterface * e, TQObject * fw )</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

68
kdevdesigner/designer/resource.cpp
Unescape View File

@ -460,10 +460,10 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
}
} else if ( e.tagName() == "exportmacro" ) {
exportMacro = e.firstChild().toText().data();
} else if ( e.tagName() == "tqlayoutdefaults" ) {
formwindow->setLayoutDefaultSpacing( e.attribute( "spacing", TQString::number( formwindow->tqlayoutDefaultSpacing() ) ).toInt() );
formwindow->setLayoutDefaultMargin( e.attribute( "margin", TQString::number( formwindow->tqlayoutDefaultMargin() ) ).toInt() );
} else if ( e.tagName() == "tqlayoutfunctions" ) {
} else if ( e.tagName() == "layoutdefaults" ) {
formwindow->setLayoutDefaultSpacing( e.attribute( "spacing", TQString::number( formwindow->layoutDefaultSpacing() ) ).toInt() );
formwindow->setLayoutDefaultMargin( e.attribute( "margin", TQString::number( formwindow->layoutDefaultMargin() ) ).toInt() );
} else if ( e.tagName() == "layoutfunctions" ) {
formwindow->setSpacingFunction( e.attribute( "spacing" ) );
formwindow->setMarginFunction( e.attribute( "margin" ) );
if ( !formwindow->marginFunction().isEmpty() || !formwindow->spacingFunction().isEmpty() )
@ -739,14 +739,14 @@ TQString Resource::copy()
TQWidgetList widgets = formwindow->selectedWidgets();
TQWidgetList tmp( widgets );
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
TQWidget *p = w->tqparentWidget();
TQWidget *p = w->parentWidget();
bool save = TRUE;
while ( p ) {
if ( tmp.tqfindRef( p ) != -1 ) {
save = FALSE;
break;
}
p = p->tqparentWidget();
p = p->parentWidget();
}
if ( save )
saveObject( TQT_TQOBJECT(w), 0, ts, 0 );
@ -1353,8 +1353,8 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent )
if ( !::tqqt_cast<TQSplitter*>(obj) &&
WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) &&
obj->isWidgetType() &&
WidgetFactory::tqlayoutType( (TQWidget*)obj, tqlayout ) != WidgetFactory::NoLayout ) {
WidgetFactory::LayoutType lay = WidgetFactory::tqlayoutType( (TQWidget*)obj, tqlayout );
WidgetFactory::layoutType( (TQWidget*)obj, tqlayout ) != WidgetFactory::NoLayout ) {
WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, tqlayout );
switch ( lay ) {
case WidgetFactory::HBox:
closeTag = makeIndent( indent ) + "</hbox>";
@ -1410,12 +1410,12 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
}
}
} else if ( ::tqqt_cast<TQLayout*>(w) ) {
if ( MetaDataBase::spacing( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) ) > -1 )
if ( MetaDataBase::spacing( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) ) > -1 )
changed << "spacing";
if ( MetaDataBase::margin( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) ) > -1 )
if ( MetaDataBase::margin( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) ) > -1 )
changed << "margin";
if ( MetaDataBase::resizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) ) != "Auto"
&& !MetaDataBase::resizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) ).isEmpty() )
if ( MetaDataBase::resizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) ) != "Auto"
&& !MetaDataBase::resizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) ).isEmpty() )
changed << "resizeMode";
}
@ -1429,8 +1429,8 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
if ( changed.isEmpty() )
return;
bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->tqparentWidget() &&
WidgetFactory::tqlayoutType( ( (TQWidget*)w )->tqparentWidget() ) != WidgetFactory::NoLayout;
bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() &&
WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
TQStrList lst = w->tqmetaObject()->propertyNames( !::tqqt_cast<Spacer*>(w) );
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
@ -1516,7 +1516,7 @@ void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::T
void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant &value, TQVariant::Type t, TQTextStream &ts, int indent )
{
if ( name == "hAlign" || name =="vAlign" || name == "wordwrap" ||
name == "tqlayoutMargin" || name =="tqlayoutSpacing" )
name == "layoutMargin" || name =="layoutSpacing" )
return;
int num;
uint unum;
@ -1527,7 +1527,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
switch ( t ) {
case TQVariant::String:
if ( name == "resizeMode" ) {
TQString resmod = MetaDataBase::resizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) );
TQString resmod = MetaDataBase::resizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) );
if ( !resmod.isNull() && resmod != "Auto" ) {
ts << makeIndent( indent ) << "<enum>";
ts << resmod;
@ -1550,9 +1550,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
if ( ::tqqt_cast<TQLayout*>(w) ) {
num = -1;
if ( name == "spacing" )
num = MetaDataBase::spacing( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) );
num = MetaDataBase::spacing( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) );
else if ( name == "margin" )
num = MetaDataBase::margin( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) );
num = MetaDataBase::margin( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) );
if ( num != -1 )
ts << makeIndent( indent ) << "<number>" << TQString::number( num ) << "</number>" << endl;
} else {
@ -1613,8 +1613,8 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
TQVariant v( value );
ts << makeIndent( indent ) << "<font>" << endl;
TQFont f( tqApp->font() );
if ( w && w->isWidgetType() && ((TQWidget*)w)->tqparentWidget() )
f = ((TQWidget*)w)->tqparentWidget()->font();
if ( w && w->isWidgetType() && ((TQWidget*)w)->parentWidget() )
f = ((TQWidget*)w)->parentWidget()->font();
TQFont f2( v.toFont() );
indent++;
if ( f.family() != f2.family() )
@ -1774,9 +1774,9 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL
TQString className = e.attribute( "class", TQWIDGET_OBJECT_NAME_STRING );
#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
TQString tqparentClassName = WidgetFactory::classNameOf( tqparent );
TQString parentClassName = WidgetFactory::classNameOf( tqparent );
bool isPlugin =
WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( tqparentClassName ) );
WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( parentClassName ) );
if ( isPlugin )
qWarning( "####### loading custom container widgets without page support not implemented!" );
// ### TODO loading for custom container widgets without pages
@ -1799,7 +1799,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL
if ( ::tqqt_cast<TQMainWindow*>(w) )
w = ( (TQMainWindow*)w )->centralWidget();
if ( tqlayout ) {
switch ( WidgetFactory::tqlayoutType( tqlayout ) ) {
switch ( WidgetFactory::layoutType( tqlayout ) ) {
case WidgetFactory::HBox:
( (TQHBoxLayout*)tqlayout )->addWidget( w );
break;
@ -1893,12 +1893,12 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL
} else if ( isPlugin ) {
if ( attrib == "label" ) {
WidgetInterface *iface = 0;
widgetManager()->queryInterface( tqparentClassName, &iface );
widgetManager()->queryInterface( parentClassName, &iface );
if ( iface ) {
TQWidgetContainerInterfacePrivate *iface2 = 0;
iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&iface2 );
if ( iface2 ) {
iface2->insertPage( tqparentClassName,
iface2->insertPage( parentClassName,
(TQWidget*)tqparent, v.toString(), -1, w );
iface2->release();
}
@ -2145,7 +2145,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
{
const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->tqfindProperty( prop, TRUE ), TRUE );
if ( !::tqqt_cast<TQLayout*>(obj) ) {// no tqlayouts in metadatabase... (RS)
if ( !::tqqt_cast<TQLayout*>(obj) ) {// no layouts in metadatabase... (RS)
if ( obj->inherits( "CustomWidget" ) ) {
MetaDataBase::CustomWidget *cw = ( (CustomWidget*)obj )->customWidget();
if ( cw && !cw->hasProperty( prop.latin1() ) && !p && prop != "toolTip" && prop != "whatsThis" )
@ -2157,8 +2157,8 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
TQVariant defVarient;
if ( e.tagName() == "font" ) {
TQFont f( tqApp->font() );
if ( obj->isWidgetType() && ( (TQWidget*)obj )->tqparentWidget() )
f = ( (TQWidget*)obj )->tqparentWidget()->font();
if ( obj->isWidgetType() && ( (TQWidget*)obj )->parentWidget() )
f = ( (TQWidget*)obj )->parentWidget()->font();
defVarient = TQVariant( f );
}
@ -2260,13 +2260,13 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
if ( ::tqqt_cast<TQLayout*>(obj) ) {
if ( prop == "spacing" ) {
MetaDataBase::setSpacing( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(obj) ) ) ), v.toInt() );
MetaDataBase::setSpacing( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(obj) ) ) ), v.toInt() );
return;
} else if ( prop == "margin" ) {
MetaDataBase::setMargin( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(obj) ) ) ), v.toInt() );
MetaDataBase::setMargin( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(obj) ) ) ), v.toInt() );
return;
} else if ( e.tagName() == "enum" && prop == "resizeMode" ) {
MetaDataBase::setResizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(obj) ) ) ), v.toString() );
MetaDataBase::setResizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(obj) ) ) ), v.toString() );
return;
}
}
@ -2891,8 +2891,8 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
if ( !( exportMacro = MetaDataBase::exportMacro( TQT_TQOBJECT(formwindow->mainContainer()) ) ).isEmpty() )
ts << makeIndent( indent ) << "<exportmacro>" << exportMacro << "</exportmacro>" << endl;
if ( formwindow ) {
ts << makeIndent( indent ) << "<tqlayoutdefaults spacing=\"" << formwindow->tqlayoutDefaultSpacing()
<< "\" margin=\"" << formwindow->tqlayoutDefaultMargin() << "\"/>" << endl;
ts << makeIndent( indent ) << "<layoutdefaults spacing=\"" << formwindow->layoutDefaultSpacing()
<< "\" margin=\"" << formwindow->layoutDefaultMargin() << "\"/>" << endl;
if ( formwindow->hasLayoutFunctions() ) {
TQString s = "";
TQString m = "";
@ -2900,7 +2900,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
s = TQString( " spacing=\"%1\"" ).tqarg( formwindow->spacingFunction() );
if ( !formwindow->marginFunction().isEmpty() )
m = TQString( " margin=\"%1\"" ).tqarg( formwindow->marginFunction() );
ts << makeIndent( indent ) << "<tqlayoutfunctions" << s << m << "/>" << endl;
ts << makeIndent( indent ) << "<layoutfunctions" << s << m << "/>" << endl;
}
}
}

2
kdevdesigner/designer/richtextfontdialog.ui
Unescape View File

@ -343,5 +343,5 @@
<slot returnType="TQString">getColor()</slot>
<slot returnType="TQString">getFont()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

14
kdevdesigner/designer/sizehandle.cpp
Unescape View File

@ -98,7 +98,7 @@ void SizeHandle::setWidget( TQWidget *w )
void SizeHandle::paintEvent( TQPaintEvent * )
{
if ( ( (FormWindow*)tqparentWidget() )->currentWidget() != widget )
if ( ( (FormWindow*)parentWidget() )->currentWidget() != widget )
return;
TQPainter p( this );
p.setPen( blue );
@ -120,8 +120,8 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e )
TQPoint rp = mapFromGlobal( e->globalPos() );
TQPoint d = oldPressPos - rp;
oldPressPos = rp;
TQPoint checkPos = widget->tqparentWidget()->mapFromGlobal( e->globalPos() );
TQRect pr = widget->tqparentWidget()->rect();
TQPoint checkPos = widget->parentWidget()->mapFromGlobal( e->globalPos() );
TQRect pr = widget->parentWidget()->rect();
// ##### move code around a bit to reduce duplicated code here
switch ( dir ) {
@ -221,7 +221,7 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e )
formWindow->sizePreview()->setGeometry( lg );
formWindow->sizePreview()->show();
formWindow->sizePreview()->raise();
if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout )
if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout )
formWindow->updateChildSelections( widget );
}
@ -287,7 +287,7 @@ void WidgetSelection::setWidget( TQWidget *w, bool updateDict )
}
wid = w;
bool active = !wid->tqparentWidget() || WidgetFactory::tqlayoutType( wid->tqparentWidget() ) == WidgetFactory::NoLayout;
bool active = !wid->parentWidget() || WidgetFactory::layoutType( wid->parentWidget() ) == WidgetFactory::NoLayout;
for ( int i = SizeHandle::LeftTop; i <= SizeHandle::Left; ++i ) {
SizeHandle *h = handles[ i ];
if ( h ) {
@ -308,10 +308,10 @@ bool WidgetSelection::isUsed() const
void WidgetSelection::updateGeometry()
{
if ( !wid || !wid->tqparentWidget() )
if ( !wid || !wid->parentWidget() )
return;
TQPoint p = wid->tqparentWidget()->mapToGlobal( wid->pos() );
TQPoint p = wid->parentWidget()->mapToGlobal( wid->pos() );
p = formWindow->mapFromGlobal( p );
TQRect r( p, wid->size() );

2
kdevdesigner/designer/startdialog.ui
Unescape View File

@ -320,5 +320,5 @@
<slot>accept()</slot>
<slot>reject()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kdevdesigner/designer/styledbutton.cpp
Unescape View File

@ -258,7 +258,7 @@ void StyledButton::dragEnterEvent( TQDragEnterEvent *e )
void StyledButton::dragLeaveEvent( TQDragLeaveEvent * )
{
if ( hasFocus() )
tqparentWidget()->setFocus();
parentWidget()->setFocus();
}
void StyledButton::dragMoveEvent( TQDragMoveEvent *e )

2
kdevdesigner/designer/tableeditor.ui
Unescape View File

@ -824,5 +824,5 @@
</includes>
<pixmapfunction>BarIcon2</pixmapfunction>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kdevdesigner/designer/variabledialog.ui
Unescape View File

@ -290,5 +290,5 @@
<slot>okClicked()</slot>
<slot>currentItemChanged( TQListViewItem * i )</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

72
kdevdesigner/designer/widgetfactory.cpp
Unescape View File

@ -109,9 +109,9 @@ FormWindow *find_formwindow( TQWidget *w )
for (;;) {
if ( ::tqqt_cast<FormWindow*>(w) )
return (FormWindow*)w;
if ( !w->tqparentWidget() )
if ( !w->parentWidget() )
return 0;
w = w->tqparentWidget();
w = w->parentWidget();
}
}
@ -486,10 +486,10 @@ TQMap< int, TQStringList > *changedProperties = 0;
/*!
\class WidgetFactory widgetfactory.h
\brief Set of static functions for creating widgets, tqlayouts and do other stuff
\brief Set of static functions for creating widgets, layouts and do other stuff
The widget factory offers functions to create widgets, create and
delete tqlayouts find out other details - all based on the
delete layouts find out other details - all based on the
WidgetDatabase's data. So the functions that use ids use the same
ids as in the WidgetDatabase.
*/
@ -567,7 +567,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay
if ( ::tqqt_cast<TQLayoutWidget*>(widget) &&
( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) ||
widget && ::tqqt_cast<FormWindow*>(widget->tqparentWidget()) ) )
widget && ::tqqt_cast<FormWindow*>(widget->parentWidget()) ) )
margin = MainWindow::self->currentLayoutDefaultMargin();
if ( !tqlayout && ::tqqt_cast<TQTabWidget*>(widget) )
@ -1006,7 +1006,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
TQWidget::tqlayout() of \a w or to 0 after the function call.
*/
WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQWidget *w, TQLayout *&tqlayout )
WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tqlayout )
{
tqlayout = 0;
@ -1048,7 +1048,7 @@ WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQWidget *w, TQLayout *&t
/*!
\overload
*/
WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQLayout *tqlayout )
WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *tqlayout )
{
if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout) )
return HBox;
@ -1062,14 +1062,14 @@ WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQLayout *tqlayout )
/*!
\overload
*/
WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQWidget *w )
WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w )
{
TQLayout *l = 0;
return tqlayoutType( w, l );
return layoutType( w, l );
}
TQWidget *WidgetFactory::tqlayoutParent( TQLayout *tqlayout )
TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout )
{
TQObject *o = TQT_TQOBJECT(tqlayout);
while ( o ) {
@ -1126,25 +1126,25 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w )
/*! Returns the actual designer widget of the container \a w. This is
normally \a w itself, but might be a tqparent or grand tqparent of \a w
(e.g. when working with a tabwidget and \a w is the container which
contains and tqlayouts childs, but the actual widget known to the
contains and layouts childs, but the actual widget known to the
designer is the tabwidget which is the tqparent of \a w. So this
function returns the tabwidget then.)
*/
TQWidget* WidgetFactory::widgetOfContainer( TQWidget *w )
{
if ( w && ::tqqt_cast<TQWidgetStack*>(w->tqparentWidget()) )
w = w->tqparentWidget();
if ( w->tqparentWidget() && w->tqparentWidget()->tqparentWidget() &&
w->tqparentWidget()->tqparentWidget()->tqparentWidget() &&
::tqqt_cast<TQToolBox*>(w->tqparentWidget()->tqparentWidget()->tqparentWidget()) )
return w->tqparentWidget()->tqparentWidget()->tqparentWidget();
if ( w && ::tqqt_cast<TQWidgetStack*>(w->parentWidget()) )
w = w->parentWidget();
if ( w->parentWidget() && w->parentWidget()->parentWidget() &&
w->parentWidget()->parentWidget()->parentWidget() &&
::tqqt_cast<TQToolBox*>(w->parentWidget()->parentWidget()->parentWidget()) )
return w->parentWidget()->parentWidget()->parentWidget();
while ( w ) {
int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) );
if ( WidgetDatabase::isContainer( id ) ||
w && ::tqqt_cast<FormWindow*>(w->tqparentWidget()) )
w && ::tqqt_cast<FormWindow*>(w->parentWidget()) )
return w;
w = w->tqparentWidget();
w = w->parentWidget();
}
return w;
}
@ -1191,7 +1191,7 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o )
TQWidget *w = (TQWidget*)o;
while ( !iface && w && !::tqqt_cast<FormWindow*>(w) ) {
widgetManager()->queryInterface( classNameOf( w ), &iface );
w = w->tqparentWidget();
w = w->parentWidget();
}
if ( !iface )
return ( lastWasAPassiveInteractor = FALSE );
@ -1487,7 +1487,7 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName )
return TQVariant();
} else if ( propName == "frameworkCode" ) {
return TQVariant( TRUE, 0 );
} else if ( propName == "tqlayoutMargin" || propName == "tqlayoutSpacing" ) {
} else if ( propName == "layoutMargin" || propName == "layoutSpacing" ) {
return TQVariant( -1 );
}
@ -1602,7 +1602,7 @@ bool TQLayoutWidget::event( TQEvent *e )
/*
This function must be called on TQLayoutWidget creation and whenever
the TQLayoutWidget's tqparent tqlayout changes (e.g., from a TQHBoxLayout
to a TQVBoxLayout), because of the (illogical) way tqlayouting works.
to a TQVBoxLayout), because of the (illogical) way layouting works.
*/
void TQLayoutWidget::updateSizePolicy()
{
@ -1626,22 +1626,22 @@ void TQLayoutWidget::updateSizePolicy()
if ( tqlayout() ) {
/*
tqparentLayout is set to the tqparent tqlayout if there is one and if it is
top level, in which case tqlayouting is illogical.
parentLayout is set to the tqparent tqlayout if there is one and if it is
top level, in which case layouting is illogical.
*/
TQLayout *tqparentLayout = 0;
TQLayout *parentLayout = 0;
if ( tqparent() && tqparent()->isWidgetType() ) {
tqparentLayout = ((TQWidget *)tqparent())->tqlayout();
if ( tqparentLayout &&
::tqqt_cast<TQLayoutWidget*>(tqparentLayout->mainWidget()) )
tqparentLayout = 0;
parentLayout = ((TQWidget *)tqparent())->tqlayout();
if ( parentLayout &&
::tqqt_cast<TQLayoutWidget*>(parentLayout->mainWidget()) )
parentLayout = 0;
}
TQObjectListIt it( childrenListObject() );
TQObject *o;
if ( ::tqqt_cast<TQVBoxLayout*>(tqlayout()) ) {
if ( ::tqqt_cast<TQHBoxLayout*>(tqparentLayout) )
if ( ::tqqt_cast<TQHBoxLayout*>(parentLayout) )
vt = TQSizePolicy::Minimum;
else
vt = TQSizePolicy::Fixed;
@ -1662,7 +1662,7 @@ void TQLayoutWidget::updateSizePolicy()
vt |= TQSizePolicy::Maximum;
}
} else if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout()) ) {
if ( ::tqqt_cast<TQVBoxLayout*>(tqparentLayout) )
if ( ::tqqt_cast<TQVBoxLayout*>(parentLayout) )
ht = TQSizePolicy::Minimum;
else
ht = TQSizePolicy::Fixed;
@ -1685,10 +1685,10 @@ void TQLayoutWidget::updateSizePolicy()
} else if ( ::tqqt_cast<TQGridLayout*>(tqlayout()) ) {
ht = TQSizePolicy::Fixed;
vt = TQSizePolicy::Fixed;
if ( tqparentLayout ) {
if ( ::tqqt_cast<TQVBoxLayout*>(tqparentLayout) )
if ( parentLayout ) {
if ( ::tqqt_cast<TQVBoxLayout*>(parentLayout) )
ht = TQSizePolicy::Minimum;
else if ( ::tqqt_cast<TQHBoxLayout*>(tqparentLayout) )
else if ( ::tqqt_cast<TQHBoxLayout*>(parentLayout) )
vt = TQSizePolicy::Minimum;
}
@ -1730,8 +1730,8 @@ void TQLayoutWidget::updateSizePolicy()
void CustomWidget::paintEvent( TQPaintEvent *e )
{
if ( ::tqqt_cast<FormWindow*>(tqparentWidget()) ) {
( (FormWindow*)tqparentWidget() )->paintGrid( this, e );
if ( ::tqqt_cast<FormWindow*>(parentWidget()) ) {
( (FormWindow*)parentWidget() )->paintGrid( this, e );
} else {
TQPainter p( this );
p.fillRect( rect(), tqcolorGroup().dark() );

50
kdevdesigner/designer/widgetfactory.h
Unescape View File

@ -81,10 +81,10 @@ public:
static TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type );
static void deleteLayout( TQWidget *widget );
static LayoutType tqlayoutType( TQWidget *w );
static LayoutType tqlayoutType( TQWidget *w, TQLayout *&tqlayout );
static LayoutType tqlayoutType( TQLayout *tqlayout );
static TQWidget *tqlayoutParent( TQLayout *tqlayout );
static LayoutType layoutType( TQWidget *w );
static LayoutType layoutType( TQWidget *w, TQLayout *&tqlayout );
static LayoutType layoutType( TQLayout *tqlayout );
static TQWidget *layoutParent( TQLayout *tqlayout );
static TQWidget* containerOfWidget( TQWidget *w );
static TQWidget* widgetOfContainer( TQWidget *w );
@ -263,7 +263,7 @@ class CustomWidget : public TQWidget
public:
CustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *cw )
: TQWidget( tqparent, name ), cusw( cw ) {
alwaysExpand = tqparentWidget() && tqparentWidget()->inherits( "FormWindow" );
alwaysExpand = parentWidget() && parentWidget()->inherits( "FormWindow" );
tqsetSizePolicy( cw->sizePolicy );
if ( !alwaysExpand )
setBackgroundMode( PaletteDark );
@ -402,15 +402,15 @@ public:
: TQToolButton( tqparent, name ) {}
bool isInButtonGroup() const {
return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
}
int buttonGroupId() const {
return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
}
void setButtonGroupId( int id ) {
if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
( (TQButtonGroup*)tqparentWidget() )->remove( this );
( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
( (TQButtonGroup*)parentWidget() )->remove( this );
( (TQButtonGroup*)parentWidget() )->insert( this, id );
}
}
};
@ -426,15 +426,15 @@ public:
: TQRadioButton( tqparent, name ) {}
bool isInButtonGroup() const {
return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
}
int buttonGroupId() const {
return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
}
void setButtonGroupId( int id ) {
if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
( (TQButtonGroup*)tqparentWidget() )->remove( this );
( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
( (TQButtonGroup*)parentWidget() )->remove( this );
( (TQButtonGroup*)parentWidget() )->insert( this, id );
}
}
@ -451,15 +451,15 @@ public:
: TQPushButton( tqparent, name ) {}
bool isInButtonGroup() const {
return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
}
int buttonGroupId() const {
return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
}
void setButtonGroupId( int id ) {
if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
( (TQButtonGroup*)tqparentWidget() )->remove( this );
( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
( (TQButtonGroup*)parentWidget() )->remove( this );
( (TQButtonGroup*)parentWidget() )->insert( this, id );
}
}
@ -476,15 +476,15 @@ public:
: TQCheckBox( tqparent, name ) {}
bool isInButtonGroup() const {
return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
}
int buttonGroupId() const {
return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
}
void setButtonGroupId( int id ) {
if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
( (TQButtonGroup*)tqparentWidget() )->remove( this );
( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
( (TQButtonGroup*)parentWidget() )->remove( this );
( (TQButtonGroup*)parentWidget() )->insert( this, id );
}
}

2
kdevdesigner/designer/wizardeditor.ui
Unescape View File

@ -338,5 +338,5 @@
</includes>
<pixmapfunction>BarIcon2</pixmapfunction>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

16
kdevdesigner/interfaces/designerinterface.h
Unescape View File

@ -190,14 +190,14 @@ struct DesignerFormWindow
virtual void adjustSize() = 0;
virtual void editConnections() = 0;
virtual void checkAccels() = 0;
virtual void tqlayoutH() = 0;
virtual void tqlayoutV() = 0;
virtual void tqlayoutHSplit() = 0;
virtual void tqlayoutVSplit() = 0;
virtual void tqlayoutG() = 0;
virtual void tqlayoutHContainer( TQWidget* w ) = 0;
virtual void tqlayoutVContainer( TQWidget* w ) = 0;
virtual void tqlayoutGContainer( TQWidget* w ) = 0;
virtual void layoutH() = 0;
virtual void layoutV() = 0;
virtual void layoutHSplit() = 0;
virtual void layoutVSplit() = 0;
virtual void layoutG() = 0;
virtual void layoutHContainer( TQWidget* w ) = 0;
virtual void layoutVContainer( TQWidget* w ) = 0;
virtual void layoutGContainer( TQWidget* w ) = 0;
virtual void breakLayout() = 0;
virtual void selectWidget( TQWidget * w ) = 0;
virtual void selectAll() = 0;

6
kdevdesigner/shared/domtool.cpp
Unescape View File

@ -404,9 +404,9 @@ void DomTool::fixDocument( TQDomDocument& doc )
bool stdset = toBool( e.attribute( "stdset" ) );
if ( stdset || name == "toolTip" || name == "whatsThis" ||
name == "buddy" ||
e.tqparentNode().toElement().tagName() == "item" ||
e.tqparentNode().toElement().tagName() == "spacer" ||
e.tqparentNode().toElement().tagName() == "column"
e.parentNode().toElement().tagName() == "item" ||
e.parentNode().toElement().tagName() == "spacer" ||
e.parentNode().toElement().tagName() == "column"
)
e.removeAttribute( "stdset" );
else

8
kdevdesigner/shared/ui2uib.cpp
Unescape View File

@ -134,7 +134,7 @@
use UibMagic + 1 for version 2, UibMagic + 2 for version 3, etc.
*/
static TQCString tqlayoutForTag( const TQString& tag )
static TQCString layoutForTag( const TQString& tag )
{
if ( tag == "grid" ) {
return TQGRIDLAYOUT_OBJECT_NAME_STRING;
@ -458,7 +458,7 @@ static void outputLayoutWidgetsSubLayout( TQMap<int, TQStringList>& buddies,
if ( tag == "grid" || tag == "hbox" || tag == "vbox" ) {
out << (TQ_UINT8) Object_SubLayout;
subLayoutNo = outputObject( buddies, objects, strings, out, f,
tqlayoutForTag(tag) );
layoutForTag(tag) );
} else if ( tag == "property" ) {
if ( f.attribute("name") == "name" ) {
name = DomTool::elementToVariant( f, name ).asCString();
@ -542,7 +542,7 @@ static int outputObject( TQMap<int, TQStringList>& buddies,
} else if ( tag == "grid" || tag == "hbox" || tag == "vbox" ) {
out << (TQ_UINT8) Object_SubLayout;
outputObject( buddies, objects, strings, out, f,
tqlayoutForTag(tag) );
layoutForTag(tag) );
} else if ( tag == "item" ) {
if ( elem.tagName() == "menubar" ) {
out << (TQ_UINT8) Object_MenuItem;
@ -682,7 +682,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
}
break;
case 'l':
if ( tag == "tqlayoutdefaults" ) {
if ( tag == "layoutdefaults" ) {
TQString margin = elem.attribute( "margin" );
if ( !margin.isEmpty() )
defaultMargin = margin.toInt();

4
kdevdesigner/shared/widgetdatabase.cpp
Unescape View File

@ -91,7 +91,7 @@ WidgetDatabaseRecord::~WidgetDatabaseRecord()
one application doesn't make sense anyway and so you don't need more
than an instance of the widgetdatabase.
For creating widgets, tqlayouts, etc. see WidgetFactory.
For creating widgets, layouts, etc. see WidgetFactory.
*/
/*!
@ -440,7 +440,7 @@ void WidgetDatabase::setupDataBase( int id )
r->name = "Spacer";
r->group = widgetGroup( "Temp" );
r->toolTip = "Spacer";
r->whatsThis = "The Spacer provides horizontal and vertical spacing to be able to manipulate the behaviour of tqlayouts.";
r->whatsThis = "The Spacer provides horizontal and vertical spacing to be able to manipulate the behaviour of layouts.";
append( r );

74
kdevdesigner/uilib/qwidgetfactory.cpp
Unescape View File

@ -456,7 +456,7 @@ TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connec
widget = e;
} else if ( e.tagName() == "pixmapinproject" ) {
usePixmapCollection = TRUE;
} else if ( e.tagName() == "tqlayoutdefaults" ) {
} else if ( e.tagName() == "layoutdefaults" ) {
defSpacing = e.attribute( "spacing", TQString::number( defSpacing ) ).toInt();
defMargin = e.attribute( "margin", TQString::number( defMargin ) ).toInt();
}
@ -776,7 +776,7 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings,
}
void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in,
TQObject *tqparent, TQListViewItem *tqparentItem )
TQObject *tqparent, TQListViewItem *parentItem )
{
TQStringList texts;
TQValueList<TQPixmap> pixmaps;
@ -790,10 +790,10 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in,
tqparent = TQT_TQOBJECT((TQListView *) tqparent);
TQListViewItem *item = 0;
if ( listView != 0 ) {
if ( tqparentItem == 0 ) {
if ( parentItem == 0 ) {
item = new TQListViewItem( listView, d->lastItem );
} else {
item = new TQListViewItem( tqparentItem, d->lastItem );
item = new TQListViewItem( parentItem, d->lastItem );
}
d->lastItem = item;
}
@ -880,7 +880,7 @@ void TQWidgetFactory::inputMenuItem( TQObject **objects,
unpackCString( strings, in, name );
unpackCString( strings, in, text );
TQPopupMenu *popupMenu = new TQPopupMenu( menuBar->tqparentWidget(), name );
TQPopupMenu *popupMenu = new TQPopupMenu( menuBar->parentWidget(), name );
in >> objectTag;
while ( !in.atEnd() && objectTag != Object_End ) {
@ -908,21 +908,21 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
TQObject *obj = 0;
TQWidget *widget = 0;
TQLayout *tqlayout = 0;
TQWidget *tqparentWidget = 0;
TQLayout *tqparentLayout = 0;
TQWidget *parentWidget = 0;
TQLayout *parentLayout = 0;
bool isTQObject = !className.isEmpty();
if ( isTQObject ) {
if ( tqparent != 0 ) {
if ( tqparent->isWidgetType() ) {
if ( tqparent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) ) {
tqparentWidget = ((TQMainWindow *) tqparent)->centralWidget();
parentWidget = ((TQMainWindow *) tqparent)->centralWidget();
} else {
tqparentWidget = (TQWidget *) tqparent;
parentWidget = (TQWidget *) tqparent;
}
} else if ( tqparent->inherits(TQLAYOUT_OBJECT_NAME_STRING) ) {
tqparentLayout = (TQLayout *) tqparent;
tqparentWidget = ancestorWidget;
parentLayout = (TQLayout *) tqparent;
parentWidget = ancestorWidget;
}
}
@ -941,10 +941,10 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
} else if ( className == TQVBOXLAYOUT_OBJECT_NAME_STRING ) {
type = VBox;
}
if ( tqparentLayout != 0 && tqparentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
if ( parentLayout != 0 && parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
tqlayout = createLayout( 0, 0, type );
} else {
tqlayout = createLayout( tqparentWidget, tqparentLayout, type );
tqlayout = createLayout( parentWidget, parentLayout, type );
}
obj = TQT_TQOBJECT(tqlayout);
} else if ( className == TQMENUBAR_OBJECT_NAME_STRING ) {
@ -960,7 +960,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
obj = TQT_TQOBJECT(widget);
} else if ( className == TQWIDGET_OBJECT_NAME_STRING ) {
unpackCString( strings, in, className );
widget = createWidget( className, tqparentWidget, 0 );
widget = createWidget( className, parentWidget, 0 );
obj = TQT_TQOBJECT(widget);
}
@ -1098,15 +1098,15 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
((TQToolBar *) widget)->addSeparator();
break;
case Object_SubAction:
inputObject( objects, numObjects, strings, in, tqparentWidget,
inputObject( objects, numObjects, strings, in, parentWidget,
obj != 0 ? obj : tqparent, TQACTION_OBJECT_NAME_STRING );
break;
case Object_SubLayout:
inputObject( objects, numObjects, strings, in, tqparentWidget, obj,
inputObject( objects, numObjects, strings, in, parentWidget, obj,
TQLAYOUT_OBJECT_NAME_STRING );
break;
case Object_SubWidget:
inputObject( objects, numObjects, strings, in, tqparentWidget, obj,
inputObject( objects, numObjects, strings, in, parentWidget, obj,
TQWIDGET_OBJECT_NAME_STRING );
break;
case Object_TextProperty:
@ -1151,18 +1151,18 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
metAttribute--;
}
if ( tqparentLayout != 0 ) {
if ( parentLayout != 0 ) {
if ( widget != 0 ) {
if ( tqparentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
((TQGridLayout *) tqparentLayout)->addMultiCellWidget(
if ( parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
((TQGridLayout *) parentLayout)->addMultiCellWidget(
widget, row, row + rowspan - 1, column,
column + colspan - 1 );
} else {
((TQBoxLayout *) tqparentLayout)->addWidget( widget );
((TQBoxLayout *) parentLayout)->addWidget( widget );
}
} else if ( tqlayout != 0 ) {
if ( tqparentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
((TQGridLayout *) tqparentLayout)->addMultiCellLayout(
if ( parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
((TQGridLayout *) parentLayout)->addMultiCellLayout(
tqlayout, row, row + rowspan - 1, column,
column + colspan - 1 );
}
@ -1606,7 +1606,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
w = ( (TQMainWindow*)w )->centralWidget();
if ( tqlayout ) {
switch( tqlayoutType( tqlayout ) ) {
switch( layoutType( tqlayout ) ) {
case HBox:
( (TQHBoxLayout*)tqlayout )->addWidget( w );
break;
@ -1626,7 +1626,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
}
}
#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
TQString tqparentClassName = tqparent ? tqparent->className() : 0;
TQString parentClassName = tqparent ? tqparent->className() : 0;
bool isPlugin = tqparent ? !!d->customWidgets.tqfind( tqparent->className() ) : FALSE;
if ( isPlugin )
qWarning( "####### loading custom container widgets without page support not implemented!" );
@ -1642,39 +1642,39 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
createWidgetInternal( n, w, tqlayout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) );
dbControls = oldDbControls;
} else if ( n.tagName() == "hbox" ) {
TQLayout *tqparentLayout = tqlayout;
TQLayout *parentLayout = tqlayout;
if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
tqlayout = createLayout( 0, 0, TQWidgetFactory::HBox, isTQLayoutWidget );
else
tqlayout = createLayout( w, tqlayout, TQWidgetFactory::HBox, isTQLayoutWidget );
obj = TQT_TQOBJECT(tqlayout);
n = n.firstChild().toElement();
if ( tqparentLayout && tqparentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
( (TQGridLayout*)tqparentLayout )->addMultiCellLayout( tqlayout, row,
if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row,
row + rowspan - 1, col, col + colspan - 1 );
continue;
} else if ( n.tagName() == "grid" ) {
TQLayout *tqparentLayout = tqlayout;
TQLayout *parentLayout = tqlayout;
if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
tqlayout = createLayout( 0, 0, TQWidgetFactory::Grid, isTQLayoutWidget );
else
tqlayout = createLayout( w, tqlayout, TQWidgetFactory::Grid, isTQLayoutWidget );
obj = TQT_TQOBJECT(tqlayout);
n = n.firstChild().toElement();
if ( tqparentLayout && tqparentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
( (TQGridLayout*)tqparentLayout )->addMultiCellLayout( tqlayout, row,
if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row,
row + rowspan - 1, col, col + colspan - 1 );
continue;
} else if ( n.tagName() == "vbox" ) {
TQLayout *tqparentLayout = tqlayout;
TQLayout *parentLayout = tqlayout;
if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
tqlayout = createLayout( 0, 0, TQWidgetFactory::VBox, isTQLayoutWidget );
else
tqlayout = createLayout( w, tqlayout, TQWidgetFactory::VBox, isTQLayoutWidget );
obj = TQT_TQOBJECT(tqlayout);
n = n.firstChild().toElement();
if ( tqparentLayout && tqparentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
( (TQGridLayout*)tqparentLayout )->addMultiCellLayout( tqlayout, row,
if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row,
row + rowspan - 1, col, col + colspan - 1 );
continue;
} else if ( n.tagName() == "property" && obj ) {
@ -1699,13 +1699,13 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
} else if ( isPlugin ) {
if ( attrib == "label" ) {
WidgetInterface *iface = 0;
widgetInterfaceManager->queryInterface( tqparentClassName, &iface );
widgetInterfaceManager->queryInterface( parentClassName, &iface );
if ( iface ) {
TQWidgetContainerInterfacePrivate *iface2 = 0;
iface->queryInterface( IID_TQWidgetContainer,
(TQUnknownInterface**)&iface2 );
if ( iface2 ) {
iface2->insertPage( tqparentClassName,
iface2->insertPage( parentClassName,
(TQWidget*)tqparent, translate( v.toString() ), -1, w );
iface2->release();
}
@ -1794,7 +1794,7 @@ TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* tqlayout,
return l;
}
TQWidgetFactory::LayoutType TQWidgetFactory::tqlayoutType( TQLayout *tqlayout ) const
TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *tqlayout ) const
{
if ( tqlayout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
return HBox;

4
kdevdesigner/uilib/qwidgetfactory.h
Unescape View File

@ -68,7 +68,7 @@ private:
void loadTabOrder( const TQDomElement &e );
TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout, const TQString &classNameArg );
TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type, bool isTQLayoutWidget = FALSE );
LayoutType tqlayoutType( TQLayout *l ) const;
LayoutType layoutType( TQLayout *l ) const;
void setProperty( TQObject* widget, const TQString &prop, TQVariant value );
void setProperty( TQObject* widget, const TQString &prop, const TQDomElement &e );
void createSpacer( const TQDomElement &e, TQLayout *tqlayout );
@ -114,7 +114,7 @@ private:
void inputColumnOrRow( const UibStrTable& strings, TQDataStream& in,
TQObject *tqparent, bool isRow );
void inputItem( const UibStrTable& strings, TQDataStream& in,
TQObject *tqparent, TQListViewItem *tqparentItem = 0 );
TQObject *tqparent, TQListViewItem *parentItem = 0 );
void inputMenuItem( TQObject **objects, const UibStrTable& strings,
TQDataStream& in, TQMenuBar *menuBar );
TQObject *inputObject( TQObject **objects, int& numObjects,

22
languages/ada/AdaParser.cpp
Unescape View File

@ -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));
}

4
languages/ada/AdaParser.hpp
Unescape View File

@ -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

8
languages/ada/AdaStoreWalker.cpp
Unescape View File

@ -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;
}

2
languages/ada/AdaStoreWalker.hpp
Unescape View File

@ -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);

8
languages/ada/AdaTreeParserSuper.cpp
Unescape View File

@ -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;
}

2
languages/ada/AdaTreeParserSuper.hpp
Unescape View File

@ -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);

12
languages/ada/ada.g
Unescape View File

@ -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 )
)*
;

2
languages/ada/ada.store.g
Unescape View File

@ -582,7 +582,7 @@ name_or_qualified
)
| #(INDEXED_COMPONENT name_or_qualified value_s)
| #(TIC name_or_qualified
( tqparenthesized_primary
( parenthesized_primary
| attribute_id
)
)

6
languages/ada/ada.tree.g
Unescape View File

@ -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
)
)

4
languages/ada/addclassdlg.ui
Unescape View File

@ -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>

4
languages/ada/configproblemreporter.ui
Unescape View File

@ -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>

4
languages/cpp/addattributedialogbase.ui
Unescape View File

@ -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>

4
languages/cpp/addmethoddialogbase.ui
Unescape View File

@ -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>

4
languages/cpp/app_templates/kateplugin2/plugin_app.cpp
Unescape View File

@ -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());

2
languages/cpp/app_templates/kateplugin2/plugin_app.h
Unescape View File

@ -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 ). */

2
languages/cpp/app_templates/kconfig35/appview_base.ui
Unescape View File

@ -29,5 +29,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
languages/cpp/app_templates/kconfig35/prefs-base.ui
Unescape View File

@ -120,7 +120,7 @@
</spacer>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
</includehints>

2
languages/cpp/app_templates/kde4app/kapp4view_base.ui
Unescape View File

@ -206,7 +206,7 @@
</item>
</tqlayout>
</widget>
<tqlayoutdefault spacing="6" margin="11" />
<layoutdefault spacing="6" margin="11" />
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<resources/>
<connections/>

2
languages/cpp/app_templates/kde4app/prefs_base.ui
Unescape View File

@ -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>

2
languages/cpp/app_templates/kdevpart/globalconfigbase.ui
Unescape View File

@ -16,5 +16,5 @@
<string>%{APPNAME}</string>
</property>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
languages/cpp/app_templates/kdevpart/projectconfigbase.ui
Unescape View File

@ -16,5 +16,5 @@
<string>%{APPNAME}</string>
</property>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
languages/cpp/app_templates/kdevpart2/globalconfigbase.ui
Unescape View File

@ -16,5 +16,5 @@
<string>%{APPNAME}</string>
</property>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
languages/cpp/app_templates/kdevpart2/projectconfigbase.ui
Unescape View File

@ -16,5 +16,5 @@
<string>%{APPNAME}</string>
</property>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
languages/cpp/app_templates/khello2/widgetbase.ui
Unescape View File

@ -48,5 +48,5 @@
<Q_SLOTS>
<slot>button_clicked()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
languages/cpp/app_templates/kmake/mainview.ui
Unescape View File

@ -72,5 +72,5 @@
<Q_SLOTS>
<slot>slotHelloButtonClicked()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

6
languages/cpp/app_templates/kofficepart/kopart_factory.cpp
Unescape View File

@ -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 );

2
languages/cpp/app_templates/kofficepart/kopart_factory.h
Unescape View File

@ -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();

6
languages/cpp/app_templates/kofficepart/kopart_part.cpp
Unescape View File

@ -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;

4
languages/cpp/app_templates/kofficepart/kopart_part.h
Unescape View File

@ -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 & );

8
languages/cpp/app_templates/kpartapp/app_part.cpp
Unescape View File

@ -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")

4
languages/cpp/app_templates/kpartapp/app_part.h
Unescape View File

@ -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();

4
languages/cpp/app_templates/kscons_kmdi/app_part.cpp
Unescape View File

@ -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);

2
languages/cpp/app_templates/kscons_kmdi/app_part.h
Unescape View File

@ -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*/);
/**

4
languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp
Unescape View File

@ -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;

2
languages/cpp/app_templates/kscons_kmdi/appkmdiView.h
Unescape View File

@ -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; }

2
languages/cpp/app_templates/kscons_kmdi/prefs.ui
Unescape View File

@ -26,5 +26,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
languages/cpp/app_templates/kscons_kxt/appview_base.ui
Unescape View File

@ -31,5 +31,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
languages/cpp/app_templates/kscons_kxt/prefs-base.ui
Unescape View File

@ -122,7 +122,7 @@
</spacer>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
</includehints>

4
languages/cpp/app_templates/kscreensaver/kscreensaverui.ui
Unescape View File

@ -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>

2
languages/cpp/app_templates/kxt/appview_base.ui
Unescape View File

@ -29,5 +29,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
languages/cpp/app_templates/kxt/prefs-base.ui
Unescape View File

@ -120,7 +120,7 @@
</spacer>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
</includehints>

2
languages/cpp/app_templates/opieapp/examplebase.ui
Unescape View File

@ -45,5 +45,5 @@
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
languages/cpp/app_templates/qtopiaapp/examplebase.ui
Unescape View File

@ -45,5 +45,5 @@
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

4
languages/cpp/ccconfigwidgetbase.ui
Unescape View File

@ -1780,8 +1780,8 @@ you right click on a variable in a header file.</string>
<slot>isValidQtDir(const QString&amp;)</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>

4
languages/cpp/classgeneratorconfigbase.ui
Unescape View File

@ -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>

2
languages/cpp/codeinformationrepository.h
Unescape View File

@ -20,7 +20,7 @@
struct TypeProcessor {
virtual TQString processType( const TQString& type ) = 0;
virtual TQString tqparentType() = 0;
virtual TQString parentType() = 0;
};
class KDevCodeRepository;

2
languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
Unescape View File

@ -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>" ) );

4
languages/cpp/configproblemreporter.ui
Unescape View File

@ -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>

36
languages/cpp/cppcodecompletion.cpp
Unescape View File

@ -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;

4
languages/cpp/cppnewclassdlgbase.ui
Unescape View File

@ -1282,8 +1282,8 @@ Namespace1::Namespace2::...::NamespaceN</string>
<slot access="protected">classNamespaceChanged( const QString &amp; )</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>

2
languages/cpp/cppsupportpart.cpp
Unescape View File

@ -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("/") )
{

2
languages/cpp/creategettersetter.ui
Unescape View File

@ -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>

2
languages/cpp/createpcsdialogbase.ui
Unescape View File

@ -160,7 +160,7 @@
<slot>slotSelected(const QString&amp;)</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>

2
languages/cpp/debugger/dbgtoolbar.cpp
Unescape View File

@ -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()));

4
languages/cpp/debugger/debuggerconfigwidgetbase.ui
Unescape View File

@ -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>

2
languages/cpp/debugger/debuggertracingdialogbase.ui
Unescape View File

@ -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>

8
languages/cpp/debugger/gdboutputwidget.cpp
Unescape View File

@ -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_);
}

4
languages/cpp/debugger/gdboutputwidget.h
Unescape View File

@ -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_;
};
}

4
languages/cpp/debugger/gdbparser.cpp
Unescape View File

@ -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, '(', ')');
}

14
languages/cpp/doc/kde2book.toc
Unescape View File

@ -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"/>

2
languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui
Unescape View File

@ -58,5 +58,5 @@
<Q_SIGNALS>
<signal>enabled(int)</signal>
</Q_SIGNALS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui
Unescape View File

@ -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>

2
languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui
Unescape View File

@ -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>

2
languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
Unescape View File

@ -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>

22
languages/cpp/simpletype.cpp
Unescape View File

@ -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();
}

8
languages/cpp/simpletype.h
Unescape View File

@ -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 ;

10
languages/cpp/simpletypecachebinder.h
Unescape View File

@ -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();
};
};

8
languages/cpp/simpletypecatalog.cpp
Unescape View File

@ -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;

6
languages/cpp/simpletypefunction.cpp
Unescape View File

@ -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;
}

12
languages/cpp/simpletypenamespace.cpp
Unescape View File

@ -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

2
languages/cpp/simpletypenamespace.h
Unescape View File

@ -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 );

2
languages/cpp/subclassingdlg.cpp
Unescape View File

@ -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;

4
languages/cpp/subclassingdlgbase.ui
Unescape View File

@ -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>

2
languages/cpp/typedesc.cpp
Unescape View File

@ -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() {

2
languages/cpp/typedesc.h
Unescape View File

@ -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;
}

4
languages/csharp/csharpconfigwidgetbase.ui
Unescape View File

@ -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>

2
languages/fortran/ftnchekconfigwidget.cpp
Unescape View File

@ -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);

4
languages/fortran/ftnchekconfigwidgetbase.ui
Unescape View File

@ -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>

4
languages/java/configproblemreporter.ui
Unescape View File

@ -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>

2
languages/java/java.g
Unescape View File

@ -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

2
languages/kjssupport/subclassingdlg.cpp
Unescape View File

@ -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;

4
languages/kjssupport/subclassingdlgbase.ui
Unescape View File

@ -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>

2
languages/lib/designer_integration/implementationwidgetbase.ui
Unescape View File

@ -260,7 +260,7 @@
<Q_SLOTS>
<slot access="protected">classNameChanged(const QString &amp;)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>

4
languages/pascal/configproblemreporter.ui
Unescape View File

@ -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>

4
languages/perl/perlconfigwidgetbase.ui
Unescape View File

@ -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>

2
languages/perl/perlparser.h
Unescape View File

@ -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;

10
languages/php/data/phpfunctions
Unescape View File

@ -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)

28
languages/php/doc/php.toc
Unescape View File

@ -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"/>

4
languages/php/phpconfigwidgetbase.ui
Unescape View File

@ -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>

4
languages/php/phpinfodlg.ui
Unescape View File

@ -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>

4
languages/php/phpnewclassdlgbase.ui
Unescape View File

@ -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>

2
languages/python/app_templates/pyqt/documentdetails.ui
Unescape View File

@ -76,5 +76,5 @@
</widget>
<includes>
</includes>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
languages/python/app_templates/pyqt/templates-ui-dialog
Unescape View File

@ -16,5 +16,5 @@
<string>Form1</string>
</property>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
languages/python/app_templates/pyqt/templates-ui-mainwin
Unescape View File

@ -432,5 +432,5 @@
<slot>helpContents()</slot>
<slot>helpAbout()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

10
languages/python/doc/python.toc
Unescape View File

@ -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"/>

4
languages/python/pythonconfigwidgetbase.ui
Unescape View File

@ -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>

4
languages/python/pythonsupportpart.cpp
Unescape View File

@ -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 );

2
languages/ruby/app_templates/kxt/appview_base.ui
Unescape View File

@ -29,5 +29,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
languages/ruby/app_templates/kxt/prefs-base.ui
Unescape View File

@ -120,7 +120,7 @@
</spacer>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
</includehints>

2
languages/ruby/debugger/dbgtoolbar.cpp
Unescape View File

@ -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()));

2
languages/ruby/debugger/rdbbreakpointwidget.cpp
Unescape View File

@ -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)
{

4
languages/ruby/debugger/variablewidget.cpp
Unescape View File

@ -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);
}
}
// **************************************************************************

4
languages/ruby/rubyconfigwidgetbase.ui
Unescape View File

@ -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>

4
languages/sql/sqlconfigwidget.ui
Unescape View File

@ -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>

2
lib/antlr/antlr/AST.hpp
Unescape View File

@ -151,7 +151,7 @@ extern ANTLR_API RefAST nullAST;
extern ANTLR_API AST* const nullASTptr;
#ifdef NEEDS_OPERATOR_LESS_THAN
// RK: aptqparently needed by MSVC and a SUN CC, up to and including
// RK: apparently needed by MSVC and a SUN CC, up to and including
// 2.7.2 this was undefined ?
inline bool operator<( RefAST l, RefAST r )
{

2
lib/antlr/antlr/CharScanner.hpp
Unescape View File

@ -43,7 +43,7 @@ class ANTLR_API CharScanner;
ANTLR_C_USING(tolower)
#ifdef ANTLR_REALLY_NO_STRCASECMP
// Aptqparently, neither strcasecmp nor stricmp is standard, and Codewarrior
// Apparently, neither strcasecmp nor stricmp is standard, and Codewarrior
// on the mac has neither...
inline int strcasecmp(const char *s1, const char *s2)
{

4
lib/astyle/ASBeautifier.cpp
Unescape View File

@ -1067,7 +1067,7 @@ string ASBeautifier::beautify(const string &originalLine)
}
}
// handle tqparenthesies
// handle parenthesies
if (ch == '(' || ch == '[' || ch == ')' || ch == ']')
{
if (ch == '(' || ch == '[')
@ -1555,7 +1555,7 @@ string ASBeautifier::beautify(const string &originalLine)
}
// check for preBlockStatements ONLY if not within tqparenthesies
// check for preBlockStatements ONLY if not within parenthesies
// (otherwise 'struct XXX' statements would be wrongly interpreted...)
if (isWhiteSpace(prevCh) && !isInTemplate && parenDepth == 0)
{

22
lib/astyle/ASFormatter.cpp
Unescape View File

@ -573,7 +573,7 @@ string ASFormatter::nextLine()
}
}
// handle tqparenthesies
// handle parenthesies
if (currentChar == '(' || currentChar == '[' || (isInTemplate && currentChar == '<'))
{
parenStack->back()++;
@ -593,7 +593,7 @@ string ASFormatter::nextLine()
}
}
// check if this tqparenthesis closes a header, e.g. if (...), while (...)
// check if this parenthesis closes a header, e.g. if (...), while (...)
if (isInHeader && parenStack->back() == 0)
{
isInHeader = false;
@ -1033,10 +1033,10 @@ void ASFormatter::setOperatorPaddingMode(bool state)
}
/**
* set tqparenthesis outside padding mode.
* set parenthesis outside padding mode.
* options:
* true statement tqparenthesiss will be padded with spaces around them.
* false statement tqparenthesiss will not be padded.
* true statement parenthesiss will be padded with spaces around them.
* false statement parenthesiss will not be padded.
*
* @param state the padding mode.
*/
@ -1046,10 +1046,10 @@ void ASFormatter::setParensOutsidePaddingMode(bool state)
}
/**
* set tqparenthesis inside padding mode.
* set parenthesis inside padding mode.
* options:
* true statement tqparenthesis will be padded with spaces around them.
* false statement tqparenthesis will not be padded.
* true statement parenthesis will be padded with spaces around them.
* false statement parenthesis will not be padded.
*
* @param state the padding mode.
*/
@ -1059,10 +1059,10 @@ void ASFormatter::setParensInsidePaddingMode(bool state)
}
/**
* set tqparenthesis unpadding mode.
* set parenthesis unpadding mode.
* options:
* true statement tqparenthesis will be unpadded with spaces removed around them.
* false statement tqparenthesis will not be unpadded.
* true statement parenthesis will be unpadded with spaces removed around them.
* false statement parenthesis will not be unpadded.
*
* @param state the padding mode.
*/

16
lib/cppparser/macro.h
Unescape View File

@ -266,7 +266,7 @@ class Macro {
/** Set the name for this macro */
void setName( const TQString& name ) {
m_name = name;
tqinvalidateHash();
invalidateHash();
}
/** Get the file name that contains this macro */
@ -276,7 +276,7 @@ class Macro {
/** Set the file name that contains this macro */
void setFileName( const TQString& fileName ) {
m_fileName = fileName;
tqinvalidateHash();
invalidateHash();
}
/** Get the line the macro is defined on */
@ -304,7 +304,7 @@ class Macro {
/** Set the body of the macro */
void setBody( const TQString& body ) {
m_body = body;
tqinvalidateHash();
invalidateHash();
}
/** This is used so the lexer does not have to remove macros that should really stay(they are just temporarily shadowed by an isUndef-macro */
@ -314,7 +314,7 @@ class Macro {
void setUndef() {
m_isUndefMacro = true;
tqinvalidateHash();
invalidateHash();
};
/** Check whether the macro has arguments that are passed to it */
@ -323,7 +323,7 @@ class Macro {
}
void setHasArguments( bool hasArguments ) {
m_hasArguments = hasArguments;
tqinvalidateHash();
invalidateHash();
}
/** Get a list of arguments passed to this macro */
TQValueList<Argument> argumentList() const {
@ -334,7 +334,7 @@ class Macro {
void clearArgumentList() {
m_argumentList.clear();
m_hasArguments = false;
tqinvalidateHash();
invalidateHash();
}
/** Add an argument to this macro */
void addArgument( const Argument& argument ) {
@ -343,7 +343,7 @@ class Macro {
/** Add a list of arguments to this macro */
void addArgumentList( const TQValueList<Argument>& arguments ) {
m_argumentList += arguments;
tqinvalidateHash();
invalidateHash();
}
///This hash respects macro-name and argument-count
@ -359,7 +359,7 @@ class Macro {
}
private:
inline void tqinvalidateHash() const {
inline void invalidateHash() const {
m_idHashValid = m_valueHashValid = false;
}

4
lib/interfaces/hashedstring.cpp
Unescape View File

@ -72,7 +72,7 @@ class HashedStringSetData : public KShared {
mutable size_t m_hash;
HashedStringSetData() : m_hashValid( false ) {
}
inline void tqinvalidateHash() {
inline void invalidateHash() {
m_hashValid = false;
}
@ -180,7 +180,7 @@ void HashedStringSet::insert( const HashedString& str ) {
if( str.str().isEmpty() ) return;
makeDataPrivate();
m_data->m_files.insert( str );
m_data->tqinvalidateHash();
m_data->invalidateHash();
}
bool HashedStringSet::operator <= ( const HashedStringSet& rhs ) const {

2
lib/widgets/flagboxes.cpp
Unescape View File

@ -67,7 +67,7 @@ FlagListToolTip::FlagListToolTip(TQWidget *tqparent)
void FlagListToolTip::maybeTip(const TQPoint &pos)
{
FlagListBox *listbox = static_cast<FlagListBox*>(tqparentWidget());
FlagListBox *listbox = static_cast<FlagListBox*>(parentWidget());
TQListViewItem *item = listbox->itemAt(pos);
FlagListItem *flitem = static_cast<FlagListItem*>(item);

4
parts/abbrev/abbrevconfigwidgetbase.ui
Unescape View File

@ -185,6 +185,6 @@
<slot access="protected">removeTemplate()</slot>
<slot access="protected">selectionChanged()</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>

4
parts/abbrev/addtemplatedlgbase.ui
Unescape View File

@ -168,8 +168,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>

4
parts/appwizard/appwizarddlgbase.ui
Unescape View File

@ -648,8 +648,8 @@
<slot access="protected">favouritesContextMenu( TQIconViewItem *, const TQPoint &amp; )</slot>
<slot>showTemplates(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>klistview.h</includehint>
<includehint>kiconview.h</includehint>

2
parts/appwizard/common/COPYING.LIB
Unescape View File

@ -245,7 +245,7 @@ linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.
If such an object file uses only numerical parameters, data
structure tqlayouts and accessors, and small macros and small inline
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the

4
parts/appwizard/filepropspagebase.ui
Unescape View File

@ -157,8 +157,8 @@
<slot>slotSelectionChanged()</slot>
<slot>slotClassnameChanged(const QString&amp;)</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>

4
parts/appwizard/importdlgbase.ui
Unescape View File

@ -355,8 +355,8 @@ will be the author, everything between
<slot access="protected">projectTypeChanged(const QString &amp;)</slot>
<slot access="protected">projectTypeChanged(int)</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>

4
parts/appwizard/vcs_form.ui
Unescape View File

@ -79,6 +79,6 @@
<include location="global" impldecl="in declaration">tqwidgetstack.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>

16
parts/astyle/astyleconfig.ui
Unescape View File

@ -862,10 +862,10 @@ correctly.
<cstring>Pad_ParenthesesIn</cstring>
</property>
<property name="text">
<string>Add spa&amp;ces inside tqparentheses</string>
<string>Add spa&amp;ces inside parentheses</string>
</property>
<property name="toolTip" stdset="0">
<string>Insert space padding around tqparenthesis on the inside only.</string>
<string>Insert space padding around parenthesis on the inside only.</string>
</property>
</widget>
<widget class="TQCheckBox">
@ -873,10 +873,10 @@ correctly.
<cstring>Pad_ParenthesesOut</cstring>
</property>
<property name="text">
<string>A&amp;dd spaces outside tqparentheses</string>
<string>A&amp;dd spaces outside parentheses</string>
</property>
<property name="toolTip" stdset="0">
<string>Insert space padding around tqparenthesis on the outside only.</string>
<string>Insert space padding around parenthesis on the outside only.</string>
</property>
</widget>
<widget class="TQCheckBox">
@ -884,10 +884,10 @@ correctly.
<cstring>Pad_ParenthesesUn</cstring>
</property>
<property name="text">
<string>Remove &amp;unnecessary spaces around tqparentheses</string>
<string>Remove &amp;unnecessary spaces around parentheses</string>
</property>
<property name="toolTip" stdset="0">
<string>Remove unnecessary space padding around tqparenthesis.</string>
<string>Remove unnecessary space padding around parenthesis.</string>
</property>
</widget>
<widget class="TQCheckBox">
@ -1327,6 +1327,6 @@ multiple single-statement lines.</string>
<Q_SLOTS>
<slot>allFiles()</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>

2
parts/bookmarks/bookmarks_settings_base.ui
Unescape View File

@ -233,7 +233,7 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
</includehints>

26
parts/classview/classtooldlg.cpp
Unescape View File

@ -38,11 +38,11 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
TQPushButton *close_button = new KPushButton(KStdGuiItem::close(), this);
tqparents_button = new TQToolButton(this);
tqparents_button->setPixmap( UserIcon("CTtqparents", KIcon::DefaultState, ClassViewFactory::instance()) );
tqparents_button->setToggleButton(true);
tqparents_button->setFixedSize(tqparents_button->tqsizeHint());
TQToolTip::add(tqparents_button, i18n("Show tqparents"));
parents_button = new TQToolButton(this);
parents_button->setPixmap( UserIcon("CTparents", KIcon::DefaultState, ClassViewFactory::instance()) );
parents_button->setToggleButton(true);
parents_button->setFixedSize(parents_button->tqsizeHint());
TQToolTip::add(parents_button, i18n("Show parents"));
tqchildren_button = new TQToolButton(this);
tqchildren_button->setPixmap( UserIcon("CTtqchildren", KIcon::DefaultState, ClassViewFactory::instance()) );
@ -95,7 +95,7 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
firstrowLayout->addWidget(class_combo, 1);
firstrowLayout->addWidget(close_button, 0);
secondrowLayout->addWidget(tqparents_button);
secondrowLayout->addWidget(parents_button);
secondrowLayout->addWidget(tqchildren_button);
secondrowLayout->addWidget(clients_button);
secondrowLayout->addWidget(suppliers_button);
@ -112,7 +112,7 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
this, TQT_SLOT(slotClose()) );
connect( access_combo, TQT_SIGNAL(activated(const TQString&)),
this, TQT_SLOT(slotAccessComboChoice(const TQString&)) );
connect( tqparents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents()));
connect( parents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents()));
connect( tqchildren_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren()));
connect( clients_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewClients()));
connect( suppliers_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewSuppliers()));
@ -170,7 +170,7 @@ void ClassToolDialog::viewNone()
}
/** View the tqparents of the current class. */
/** View the parents of the current class. */
void ClassToolDialog::viewParents()
{
currentOperation = ViewParents;
@ -202,7 +202,7 @@ void ClassToolDialog::viewSuppliers()
}
/** View methods in this class and tqparents. */
/** View methods in this class and parents. */
void ClassToolDialog::viewMethods()
{
currentOperation = ViewMethods;
@ -210,7 +210,7 @@ void ClassToolDialog::viewMethods()
}
/** View attributes in this class and tqparents. */
/** View attributes in this class and parents. */
void ClassToolDialog::viewAttributes()
{
currentOperation = ViewAttributes;
@ -283,7 +283,7 @@ void ClassToolDialog::updateCaptionAndButtons()
switch (currentOperation)
{
case ViewParents:
button = tqparents_button;
button = parents_button;
caption = i18n("Parents");
break;
case ViewChildren:
@ -312,7 +312,7 @@ void ClassToolDialog::updateCaptionAndButtons()
break;
}
tqparents_button->setOn(false);
parents_button->setOn(false);
tqchildren_button->setOn(false);
clients_button->setOn(false);
suppliers_button->setOn(false);
@ -339,7 +339,7 @@ void ClassToolDialog::buildTree()
switch (currentOperation)
{
case ViewParents:
class_tree->insertClassAndClasses(currentClass, currentClass->tqparents);
class_tree->insertClassAndClasses(currentClass, currentClass->parents);
break;
case ViewChildren:
{

8
parts/classview/classtooldlg.h
Unescape View File

@ -45,7 +45,7 @@ public slots:
/** View nothing. */
void viewNone();
/** View the tqparents of the current class. */
/** View the parents of the current class. */
void viewParents();
/** View the tqchildren of the current class. */
void viewChildren();
@ -53,9 +53,9 @@ public slots:
void viewClients();
/** View all classes that this class has as attributes. */
void viewSuppliers();
/** View methods in this class and tqparents. */
/** View methods in this class and parents. */
void viewMethods();
/** View attributes in this class and tqparents. */
/** View attributes in this class and parents. */
void viewAttributes();
private slots:
@ -75,7 +75,7 @@ private:
ClassToolWidget *class_tree;
TQComboBox *class_combo;
TQToolButton *tqparents_button;
TQToolButton *parents_button;
TQToolButton *tqchildren_button;
TQToolButton *clients_button;
TQToolButton *suppliers_button;

32
parts/classview/classtoolwidget.cpp
Unescape View File

@ -60,16 +60,16 @@ void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, TQValueLis
}
void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList<ParsedParent> &tqparentList)
void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList<ParsedParent> &parentList)
{
ClassTreeItem *root = new ClassTreeClassItem(this, 0, parsedClass);
ClassTreeItem *lastItem = 0;
TQPtrListIterator<ParsedParent> it(tqparentList);
TQPtrListIterator<ParsedParent> it(parentList);
for (; it.current(); ++it) {
ParsedClass *tqparentClass = m_part->classStore()->getClassByName((*it)->name());
lastItem = new ClassTreeClassItem(root, lastItem, tqparentClass);
ParsedClass *parentClass = m_part->classStore()->getClassByName((*it)->name());
lastItem = new ClassTreeClassItem(root, lastItem, parentClass);
lastItem->setExpandable(false);
}
@ -124,14 +124,14 @@ void ClassToolWidget::insertAllClassMethods(ParsedClass *parsedClass, PIAccess f
{
ClassTreeItem *lastItem = 0;
// First treat all tqparents.
for ( ParsedParent *pParent = parsedClass->tqparents.first();
// First treat all parents.
for ( ParsedParent *pParent = parsedClass->parents.first();
pParent != 0;
pParent = parsedClass->tqparents.next() )
pParent = parsedClass->parents.next() )
{
ParsedClass *tqparentClass = m_part->classStore()->getClassByName(pParent->name());
if (tqparentClass)
addClassAndMethods(tqparentClass, filter, &lastItem);
ParsedClass *parentClass = m_part->classStore()->getClassByName(pParent->name());
if (parentClass)
addClassAndMethods(parentClass, filter, &lastItem);
}
// Add the current class
@ -142,14 +142,14 @@ void ClassToolWidget::insertAllClassMethods(ParsedClass *parsedClass, PIAccess f
void ClassToolWidget::insertAllClassAttributes(ParsedClass *parsedClass, PIAccess filter)
{
ClassTreeItem *lastItem = 0;
// First treat all tqparents.
for ( ParsedParent *pParent = parsedClass->tqparents.first();
// First treat all parents.
for ( ParsedParent *pParent = parsedClass->parents.first();
pParent != 0;
pParent = parsedClass->tqparents.next() )
pParent = parsedClass->parents.next() )
{
ParsedClass *tqparentClass = m_part->classStore()->getClassByName(pParent->name());
if (tqparentClass)
addClassAndAttributes(tqparentClass, filter, &lastItem);
ParsedClass *parentClass = m_part->classStore()->getClassByName(pParent->name());
if (parentClass)
addClassAndAttributes(parentClass, filter, &lastItem);
}
// Add the current class

2
parts/classview/classtoolwidget.h
Unescape View File

@ -27,7 +27,7 @@ public:
~ClassToolWidget();
void insertClassAndClasses(ParsedClass *parsedClass, TQValueList<ParsedClass*> classList);
void insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList<ParsedParent> &tqparentList);
void insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList<ParsedParent> &parentList);
void insertAllClassMethods(ParsedClass *parsedClass, PIAccess filter);
void insertAllClassAttributes(ParsedClass *parsedClass, PIAccess filter);

4
parts/classview/classtreebase.cpp
Unescape View File

@ -433,7 +433,7 @@ protected:
void ClassToolTip::maybeTip(const TQPoint &p)
{
ClassTreeBase *ctw = static_cast<ClassTreeBase*>(tqparentWidget());
ClassTreeBase *ctw = static_cast<ClassTreeBase*>(parentWidget());
TQListViewItem *item = ctw->itemAt(p);
TQRect r = ctw->tqitemRect(item);
@ -525,7 +525,7 @@ void ClassTreeBase::slotItemExecuted( TQListViewItem* item )
if (!item)
return;
// toggle open state for tqparents
// toggle open state for parents
if (item->childCount() > 0)
setOpen(item, !isOpen(item));

2
parts/ctags2/ctags2_createtagfilebase.ui
Unescape View File

@ -139,7 +139,7 @@
<slot>createTagFile()</slot>
<slot>validate()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>

2
parts/ctags2/ctags2_part.cpp
Unescape View File

@ -268,7 +268,7 @@ int CTags2Part::getFileLineFromStream( TQTextStream & istream, TQString const &
{
if ( pattern.isEmpty() ) return -1;
// ctags interestingly escapes "/", but aptqparently nothing else. lets revert that
// ctags interestingly escapes "/", but apparently nothing else. lets revert that
TQString unescaped = pattern;
unescaped.tqreplace( "\\/", "/" );

2
parts/ctags2/ctags2_selecttagfilebase.ui
Unescape View File

@ -119,7 +119,7 @@
<Q_SLOTS>
<slot>validate()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>

2
parts/ctags2/ctags2_settingswidgetbase.ui
Unescape View File

@ -368,7 +368,7 @@
<slot>moveUpTagFile()</slot>
<slot>moveDownTagFile()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kurlrequester.h</includehint>

2
parts/ctags2/ctags2_widgetbase.ui
Unescape View File

@ -173,7 +173,7 @@
<slot access="private">line_edit_changed()</slot>
<slot access="private">regeneratebutton_clicked()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>klineedit.h</includehint>

4
parts/distpart/distpart_ui.ui
Unescape View File

@ -1210,8 +1210,8 @@ Build Files</string>
<slot>slotRemoveFile(TQListBoxItem *item)</slot>
</Q_SLOTS>
<pixmapfunction>DesktopIcon</pixmapfunction>
<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>klistbox.h</includehint>
<includehint>klineedit.h</includehint>

2
parts/documentation/addcatalogdlgbase.ui
Unescape View File

@ -199,7 +199,7 @@
<slot>locationURLChanged( const QString &amp; )</slot>
<slot>docTypeChanged( const QString &amp; )</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kurlrequester.h</includehint>

2
parts/documentation/docglobalconfigwidgetbase.ui
Unescape View File

@ -550,7 +550,7 @@
<slot>updateConfig()</slot>
<slot>updateIndex()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>

2
parts/documentation/docprojectconfigwidgetbase.ui
Unescape View File

@ -143,7 +143,7 @@
<Q_SLOTS>
<slot>changeDocSystem(const QString &amp;)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>

2
parts/documentation/editbookmarkdlg.ui
Unescape View File

@ -156,7 +156,7 @@
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>klineedit.h</includehint>

2
parts/documentation/editcatalogdlgbase.ui
Unescape View File

@ -187,7 +187,7 @@
<Q_SLOTS>
<slot>locationURLChanged( const QString &amp; )</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>klineedit.h</includehint>

2
parts/documentation/find_documentation_optionsbase.ui
Unescape View File

@ -214,5 +214,5 @@ sources and change their priority here.</string>
<slot>sourceMoveUp()</slot>
<slot>sourceMoveDown()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
parts/documentation/find_documentationbase.ui
Unescape View File

@ -159,7 +159,7 @@
<slot>clickOnItem( TQListViewItem * item )</slot>
<slot>buttonPressedOnItem( int button, TQListViewItem * item, const QPoint &amp; pos, int c )</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="1" margin="1"/>
<layoutdefaults spacing="1" margin="1"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klistview.h</includehint>

6
parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
Unescape View File

@ -434,9 +434,9 @@ void DocDoxygenPlugin::createBookIndex(const TQString &tagfile, IndexBox* index,
}
void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index,
DocumentationCatalogItem *item, TQDomElement &tqparentEl, const TQString &prefix)
DocumentationCatalogItem *item, TQDomElement &parentEl, const TQString &prefix)
{
TQDomElement docEl = tqparentEl;
TQDomElement docEl = parentEl;
TQDomElement childEl = docEl.firstChild().toElement();
while (!childEl.isNull())
@ -460,7 +460,7 @@ void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index,
|| (childEl.attribute("kind") == "slot")
|| (childEl.attribute("kind") == "signal") ))
{
TQString classname = tqparentEl.namedItem("name").firstChild().toText().data();
TQString classname = parentEl.namedItem("name").firstChild().toText().data();
TQString membername = childEl.namedItem("name").firstChild().toText().data();
TQString anchor = childEl.namedItem("anchor").firstChild().toText().data();
TQString arglist = childEl.namedItem("arglist").firstChild().toText().data();

2
parts/documentation/plugins/doxygen/docdoxygenplugin.h
Unescape View File

@ -58,7 +58,7 @@ protected:
void createBookIndex(const TQString &tagfile, IndexBox* index, DocumentationCatalogItem* item, const TQString &baseHtmlUrl = TQString());
void createIndexFromTag(TQDomDocument &dom, IndexBox* index, DocumentationCatalogItem* item,
TQDomElement &tqparentEl, const TQString &prefix);
TQDomElement &parentEl, const TQString &prefix);
void autoSetupDocs(const TQString &defaultDir, const TQString &searchDir,
const TQString &name);

14
parts/documentation/protocols/chm/chm.cpp
Unescape View File

@ -178,11 +178,11 @@ void ChmProtocol::get( const KURL& url )
TQRegExp mergeParam("<param name=\"Merge\" value=\"(.*)\">", false);
mergeParam.setMinimal(true);
std::stack<int> tqparents;
std::stack<int> parents;
int counter = 1;
int current = 0;
int old = 0, pos = 0;
tqparents.push(0);
parents.push(0);
while ((pos = s.tqfind(object, pos)) != -1) {
if(htmlOutput) output += s.mid(old, pos - old);
if(catalog) {
@ -191,12 +191,12 @@ void ChmProtocol::get( const KURL& url )
int pos = 0;
while( (pos = ms.tqfind(ex, pos)) != -1) {
if(ms.mid(pos, 4) == "<UL>") {
tqparents.push(current);
parents.push(current);
} else{
if(tqparents.empty()){
if(parents.empty()){
}else{
current = tqparents.top();
tqparents.pop();
current = parents.top();
parents.pop();
}
}
pos++;
@ -221,7 +221,7 @@ void ChmProtocol::get( const KURL& url )
KURL u = url;
u.setPath(bigpath + local);
TQString str;
output += str.sprintf("%i\n%i\n", tqparents.top(), current);
output += str.sprintf("%i\n%i\n", parents.top(), current);
output += name + "\n" + u.prettyURL() + "\n";
}
m_bIndex = 1;

4
parts/documentation/protocols/chm/kchmpart.cpp
Unescape View File

@ -47,10 +47,10 @@ KChmPartFactory::~KChmPartFactory()
delete s_about;
}
KParts::Part* KChmPartFactory::createPartObject( TQWidget *tqparentWidget, const char *, TQObject *,
KParts::Part* KChmPartFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *,
const char *name, const char *, const TQStringList & )
{
KChmPart* part = new KChmPart( tqparentWidget, name );
KChmPart* part = new KChmPart( parentWidget, name );
return part;
}

2
parts/documentation/protocols/chm/kchmpart.h
Unescape View File

@ -39,7 +39,7 @@ class KChmPartFactory: public KParts::Factory
virtual ~KChmPartFactory();
virtual KParts::Part* createPartObject(
TQWidget *tqparentWidget, const char *widgetName,
TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const char *classname, const TQStringList &args );

2
parts/documentation/selecttopicbase.ui
Unescape View File

@ -138,5 +138,5 @@
<Q_SLOTS>
<slot>newSlot()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
parts/doxygen/input.cpp
Unescape View File

@ -329,7 +329,7 @@ InputStrList::InputStrList(const TQString & label,
{
TQGridLayout *tqlayout = new TQGridLayout(this, 2, 2, 5);
TQWidget *dw = new TQWidget(this); /* dummy widget used for tqlayouting */
TQWidget *dw = new TQWidget(this); /* dummy widget used for layouting */
TQHBoxLayout *boxtqlayout = new TQHBoxLayout(dw, 0, 5);
le = new KLineEdit(dw);
lab = new TQLabel(le,label+":", this );

4
parts/filecreate/fcconfigwidgetbase.ui
Unescape View File

@ -535,6 +535,6 @@
<slot>edit_template_content_button_clicked()</slot>
<slot>edit_type_content_button_clicked()</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>

4
parts/filecreate/fctemplateeditbase.ui
Unescape View File

@ -183,8 +183,8 @@
<Q_SLOTS>
<slot>init()</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>

4
parts/filecreate/fctypeeditbase.ui
Unescape View File

@ -271,8 +271,8 @@
<Q_SLOTS>
<slot>init()</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>kicondialog.h</includehint>
<includehint>kurlrequester.h</includehint>

2
parts/filecreate/file-templates/ui
Unescape View File

@ -16,5 +16,5 @@
<string>Form1</string>
</property>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
parts/filecreate/file-templates/ui-confdialog
Unescape View File

@ -161,5 +161,5 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
parts/filecreate/file-templates/ui-dialog
Unescape View File

@ -16,5 +16,5 @@
<string>Form1</string>
</property>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
parts/filecreate/file-templates/ui-dialogb
Unescape View File

@ -119,5 +119,5 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
parts/filecreate/file-templates/ui-dialogb-qt4
Unescape View File

@ -15,7 +15,7 @@
<property name="windowTitle" >
<string>Dialog</string>
</property>
<widget class=TQWIDGET_OBJECT_NAME_STRING name="tqlayoutWidget" >
<widget class=TQWIDGET_OBJECT_NAME_STRING name="layoutWidget" >
<property name="geometry" >
<rect>
<x>20</x>

2
parts/filecreate/file-templates/ui-dialogr
Unescape View File

@ -119,5 +119,5 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
parts/filecreate/file-templates/ui-dialogr-qt4
Unescape View File

@ -15,7 +15,7 @@
<property name="windowTitle" >
<string>Dialog</string>
</property>
<widget class=TQWIDGET_OBJECT_NAME_STRING name="tqlayoutWidget" >
<widget class=TQWIDGET_OBJECT_NAME_STRING name="layoutWidget" >
<property name="geometry" >
<rect>
<x>300</x>

2
parts/filecreate/file-templates/ui-mainwin
Unescape View File

@ -432,5 +432,5 @@
<slot>helpContents()</slot>
<slot>helpAbout()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
parts/filecreate/file-templates/ui-tabdialog
Unescape View File

@ -143,5 +143,5 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
parts/filecreate/file-templates/ui-widget
Unescape View File

@ -16,5 +16,5 @@
<string>Form1</string>
</property>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
parts/filecreate/file-templates/ui-wizard
Unescape View File

@ -24,5 +24,5 @@
</attribute>
</widget>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
parts/filelist/projectviewconfigbase.ui
Unescape View File

@ -89,5 +89,5 @@
</spacer>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
parts/filelist/projectviewprojectconfigbase.ui
Unescape View File

@ -87,7 +87,7 @@
</spacer>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
</includehints>

4
parts/fileview/filegroupsconfigwidgetbase.ui
Unescape View File

@ -224,6 +224,6 @@
<slot access="protected">moveUp()</slot>
<slot access="protected">moveDown()</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>

2
parts/fileview/filegroupswidget.cpp
Unescape View File

@ -209,7 +209,7 @@ void FileGroupsWidget::slotItemExecuted(TQListViewItem *item)
if (!item)
return;
// toggle open state for tqparents
// toggle open state for parents
if (item->childCount() > 0)
setOpen(item, !isOpen(item));

2
parts/fileview/vcscolorsconfigwidgetbase.ui
Unescape View File

@ -252,7 +252,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorcombo.h</includehint>
<includehint>kcolorcombo.h</includehint>

2
parts/outputviews/filterdlg.ui
Unescape View File

@ -160,5 +160,5 @@
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

4
parts/partexplorer/partexplorerformbase.ui
Unescape View File

@ -130,8 +130,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>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>

2
parts/quickopen/quickopenbase.ui
Unescape View File

@ -170,7 +170,7 @@
<slot>slotExecuted( TQListBoxItem * )</slot>
<slot>slotReturnPressed()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistbox.h</includehint>
<includehint>klineedit.h</includehint>

2
parts/quickopen/quickopenfunctionchooseformbase.ui
Unescape View File

@ -222,7 +222,7 @@
<slot specifier="pure virtual">slotFileChange( int id )</slot>
<slot specifier="pure virtual">slotArgsChange( int id )</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>ksqueezedtextlabel.h</includehint>
<includehint>klistbox.h</includehint>

2
parts/regexptest/regexptestdlg.cpp
Unescape View File

@ -144,7 +144,7 @@ void RegexpTestDialog::checkPOSIX()
regcompMessage = i18n("Invalid collating element");
break;
case REG_EPAREN:
regcompMessage = i18n("Unmatched tqparenthesis group operators");
regcompMessage = i18n("Unmatched parenthesis group operators");
break;
case REG_ESUBREG:
regcompMessage = i18n("Invalid back reference to subexpression");

4
parts/regexptest/regexptestdlgbase.ui
Unescape View File

@ -344,8 +344,8 @@
<slot>somethingChanged()</slot>
<slot access="protected">showRegExpEditor()</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>

4
parts/replace/replacedlg.ui
Unescape View File

@ -369,8 +369,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>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>

2
parts/scripting/scriptingglobalconfigbase.ui
Unescape View File

@ -43,7 +43,7 @@
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>keditlistbox.h</includehint>
<includehint>klineedit.h</includehint>

60
parts/snippet/snippet_widget.cpp
Unescape View File

@ -672,9 +672,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
dlg.setCaption(i18n("Enter Values for Variables"));
TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout");
TQGridLayout * tqlayoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutTop");
TQGridLayout * tqlayoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutVar");
TQGridLayout * tqlayoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutBtn");
TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
TQGridLayout * layoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "layoutBtn");
KTextEdit *te = NULL;
TQLabel * labTop = NULL;
@ -684,8 +684,8 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
labTop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
labTop->sizePolicy().hasHeightForWidth() ) );
labTop->setText(i18n("Enter the replacement values for these variables:"));
tqlayoutTop->addWidget(labTop, 0, 0);
tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 );
layoutTop->addWidget(labTop, 0, 0);
tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
int i = 0; //walk through the variable map and add
@ -696,10 +696,10 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
cb = new TQCheckBox( &dlg, "cbVar" );
cb->setChecked( FALSE );
cb->setText(it.key());
tqlayoutVar->addWidget( cb, i ,0, TQt::AlignTop );
layoutVar->addWidget( cb, i ,0, TQt::AlignTop );
te = new KTextEdit( &dlg, "teVar" );
tqlayoutVar->addWidget( te, i, 1, TQt::AlignTop );
layoutVar->addWidget( te, i, 1, TQt::AlignTop );
if ((*mapSave)[it.key()].length() > 0) {
cb->setChecked( TRUE );
@ -716,22 +716,22 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
i++;
}
tqlayout->addMultiCellLayout( tqlayoutVar, 1, 1, 0, 1 );
tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" );
btn1->setText(i18n("&Cancel"));
btn1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
btn1->sizePolicy().hasHeightForWidth() ) );
tqlayoutBtn->addWidget( btn1, 0, 0 );
layoutBtn->addWidget( btn1, 0, 0 );
KPushButton * btn2 = new KPushButton( &dlg, "pushButton2" );
btn2->setText(i18n("&Apply"));
btn2->setDefault( TRUE );
btn2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
btn2->sizePolicy().hasHeightForWidth() ) );
tqlayoutBtn->addWidget( btn2, 0, 1 );
layoutBtn->addWidget( btn2, 0, 1 );
tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 );
tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
// --END-- building a dynamic dialog
//connect the buttons to the TQDialog default slots
@ -763,8 +763,8 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
}
bReturn = true;
iBasicHeight = dlg.tqgeometry().height() - tqlayoutVar->tqgeometry().height();
iOneHeight = tqlayoutVar->tqgeometry().height() / mapVar2Te.count();
iBasicHeight = dlg.tqgeometry().height() - layoutVar->tqgeometry().height();
iOneHeight = layoutVar->tqgeometry().height() / mapVar2Te.count();
iWidth = dlg.tqgeometry().width();
}
@ -777,9 +777,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
for (it2 = mapVar2Cb.begin(); it2 != mapVar2Cb.end(); ++it2)
delete it2.data();
mapVar2Cb.clear();
delete tqlayoutTop;
delete tqlayoutVar;
delete tqlayoutBtn;
delete layoutTop;
delete layoutVar;
delete layoutBtn;
delete tqlayout;
if (i==0) //if nothing happened this means, that there are no variables to translate
@ -801,18 +801,18 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
dlg.setCaption(i18n("Enter Values for Variables"));
TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout");
TQGridLayout * tqlayoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutTop");
TQGridLayout * tqlayoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutVar");
TQGridLayout * tqlayoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "tqlayoutBtn");
TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
TQGridLayout * layoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "layoutBtn");
KTextEdit *te = NULL;
TQLabel * labTop = NULL;
TQCheckBox * cb = NULL;
labTop = new TQLabel( &dlg, "label" );
tqlayoutTop->addWidget(labTop, 0, 0);
layoutTop->addWidget(labTop, 0, 0);
labTop->setText(i18n("Enter the replacement values for %1:").tqarg( var ));
tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 );
tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
cb = new TQCheckBox( &dlg, "cbVar" );
@ -820,8 +820,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
cb->setText(i18n( "Make value &default" ));
te = new KTextEdit( &dlg, "teVar" );
tqlayoutVar->addWidget( te, 0, 1, TQt::AlignTop);
tqlayoutVar->addWidget( cb, 1, 1, TQt::AlignTop);
layoutVar->addWidget( te, 0, 1, TQt::AlignTop);
layoutVar->addWidget( cb, 1, 1, TQt::AlignTop);
if ((*mapSave)[var].length() > 0) {
cb->setChecked( TRUE );
te->setText((*mapSave)[var]);
@ -832,18 +832,18 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
"If you use the same variable later, even in another snippet, the value entered to the right "
"will be the default value for that variable.") );
tqlayout->addMultiCellLayout( tqlayoutVar, 1, 1, 0, 1 );
tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" );
btn1->setText(i18n("&Cancel"));
tqlayoutBtn->addWidget( btn1, 0, 0 );
layoutBtn->addWidget( btn1, 0, 0 );
KPushButton * btn2 = new KPushButton( &dlg, "pushButton2" );
btn2->setText(i18n("&Apply"));
btn2->setDefault( TRUE );
tqlayoutBtn->addWidget( btn2, 0, 1 );
layoutBtn->addWidget( btn2, 0, 1 );
tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 );
tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
te->setFocus();
// --END-- building a dynamic dialog
@ -872,9 +872,9 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
delete labTop;
delete btn1;
delete btn2;
delete tqlayoutTop;
delete tqlayoutVar;
delete tqlayoutBtn;
delete layoutTop;
delete layoutVar;
delete layoutBtn;
delete tqlayout;
return strReturn;

2
parts/snippet/snippetdlg.ui
Unescape View File

@ -203,7 +203,7 @@
<Q_SLOTS>
<slot>slotHelp()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>

2
parts/snippet/snippetsettingsbase.ui
Unescape View File

@ -221,7 +221,7 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
</includehints>

8
parts/texttools/texttoolswidget.cpp
Unescape View File

@ -47,7 +47,7 @@ public:
{
return extra.isNull()? tag : TQString("%1: %2").tqarg(tag).tqarg(extra);
}
TextStructItem *tqparentStructItem()
TextStructItem *parentStructItem()
{ return static_cast<TextStructItem*>(tqparent()); }
TQString tag;
@ -298,10 +298,10 @@ void TextToolsWidget::parseXML()
TextStructItem *closingItem = currentItem;
while (closingItem->tqparent() && closingItem->tag != tag)
closingItem = closingItem->tqparentStructItem();
closingItem = closingItem->parentStructItem();
if (closingItem->tqparent()) {
closingItem->endpos = endpos;
currentItem = closingItem->tqparentStructItem();
currentItem = closingItem->parentStructItem();
} else {
kdDebug(9030) << "found no opening tag " << tag << "." << endl;
}
@ -378,7 +378,7 @@ void TextToolsWidget::parseLaTeX()
kdDebug(9030) << "Match with " << tag << " and title " << title << endl;
int level = hierarchyLevels.tqfind(tag);
while (currentItem->tqparent() && level <= hierarchyLevels.tqfind(currentItem->tag))
currentItem = currentItem->tqparentStructItem();
currentItem = currentItem->parentStructItem();
TextStructItem *item = new TextStructItem(currentItem);
item->tag = tag;

4
parts/tools/addtooldlg.ui
Unescape View File

@ -235,8 +235,8 @@ executed.&lt;/p&gt;</string>
<slot returnType="TQString">getApp()</slot>
<slot access="private">treeSelectionChanged( TQListViewItem * lvi )</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>

2
parts/tools/tools_part.cpp
Unescape View File

@ -57,7 +57,7 @@ ToolsPart::ToolsPart(TQObject *tqparent, const char *name, const TQStringList &)
connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
// Aptqparently action lists can only be plugged after the
// Apparently action lists can only be plugged after the
// xmlgui client has been registered
TQTimer::singleShot(0, this, TQT_SLOT(updateToolsMenu()));
}

4
parts/tools/toolsconfigwidgetbase.ui
Unescape View File

@ -405,6 +405,6 @@
<slot access="protected">toolsmenuaddClicked()</slot>
<slot access="protected">toolsmenuremoveClicked()</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>

4
parts/uimode/uichooser.ui
Unescape View File

@ -245,6 +245,6 @@
<Q_SLOTS>
<slot access="protected">maybeEnableCloseOnHover(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"/>
</UI>

4
parts/valgrind/dialog_widget.ui
Unescape View File

@ -338,8 +338,8 @@
<slot access="private" specifier="non virtual">checkBoxToggled()</slot>
<slot>init()</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>

2
parts/vcsmanager/vcsmanagerprojectconfigbase.ui
Unescape View File

@ -54,5 +54,5 @@
</spacer>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
src/core.h
Unescape View File

@ -28,7 +28,7 @@ public:
/**
* Setup shourtcut tips. For every KAction with a shortcut,
* appends the shortcut string, in tqparenthesis, to the
* appends the shortcut string, in parenthesis, to the
* actions's tooltip. If tooltip already has any text in
* parens, it's removed and shortcut is added instead.
*

4
src/generalinfowidgetbase.ui
Unescape View File

@ -233,8 +233,8 @@ Placed in the AUTHORS file</string>
<include location="global" impldecl="in implementation">kdialog.h</include>
<include location="global" impldecl="in declaration">ksqueezedtextlabel.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>

2
src/mimewarningdialog.ui
Unescape View File

@ -250,5 +250,5 @@
<slot>accept()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

6
src/newui/dmainwindow.cpp
Unescape View File

@ -83,7 +83,7 @@ void DMainWindow::createToolWindows()
void DMainWindow::addWidget(TQWidget *widget, const TQString &title)
{
// tqinvalidateActiveTabWidget();
// invalidateActiveTabWidget();
if (m_firstRemoved && m_activeTabWidget == m_tabs.first())
{
m_central->addDock(0, 0, m_activeTabWidget);
@ -175,14 +175,14 @@ DTabWidget *DMainWindow::splitHorizontal()
DTabWidget *DMainWindow::splitVertical()
{
// tqinvalidateActiveTabWidget();
// invalidateActiveTabWidget();
int row = m_central->indexOf(m_activeTabWidget).first;
m_activeTabWidget = createTab();
m_central->addDock(row, m_central->numCols(row), m_activeTabWidget);
return m_activeTabWidget;
}
void DMainWindow::tqinvalidateActiveTabWidget()
void DMainWindow::invalidateActiveTabWidget()
{
/* TQWidget *focused = m_central->tqfocusWidget();
kdDebug(9000) << "tqinvalidate: " << focused << endl;

2
src/newui/dmainwindow.h
Unescape View File

@ -107,7 +107,7 @@ protected:
TQWidget *m_currentWidget;
private slots:
void tqinvalidateActiveTabWidget();
void invalidateActiveTabWidget();
};

2
src/pluginselectdialogbase.ui
Unescape View File

@ -172,7 +172,7 @@
<Q_SLOTS>
<slot access="protected">saveAsDefault()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurllabel.h</includehint>
</includehints>

2
src/profileengine/editor/addprofilewidget.ui
Unescape View File

@ -117,5 +117,5 @@
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
src/profileengine/editor/profileeditorbase.ui
Unescape View File

@ -657,7 +657,7 @@
<slot>addDisabled()</slot>
<slot>delDisabled()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>klistview.h</includehint>

6
src/profileengine/lib/profile.cpp
Unescape View File

@ -104,10 +104,10 @@ void Profile::save()
Profile::EntryList Profile::list(List type)
{
EntryList tqparentList;
EntryList parentList;
if (m_parent)
tqparentList = m_parent->list(type);
EntryList list = tqparentList;
parentList = m_parent->list(type);
EntryList list = parentList;
for (EntryList::iterator it = list.begin(); it != list.end(); ++it)
(*it).derived = true;
TQStringList &personalList = listByType(type);

6
src/projectsession.cpp
Unescape View File

@ -221,8 +221,8 @@ void ProjectSession::recreateViews(KURL& url, TQDomElement docEl, bool activate)
}
//// // restore focus
//// if (pFocusedView != 0L) {
//// if (pFocusedView->tqparentWidget()->inherits("QextMdiChildView")) {
//// ((QextMdiChildView*)pFocusedView->tqparentWidget())->activate();
//// if (pFocusedView->parentWidget()->inherits("QextMdiChildView")) {
//// ((QextMdiChildView*)pFocusedView->parentWidget())->activate();
//// }
//// pFocusedView->setFocus();
//// }
@ -349,7 +349,7 @@ bool ProjectSession::saveToFile( const TQString & sessionFileName, const TQValue
TQDomElement viewEl = domdoc.createElement( "View"+viewIdStr);
docEl.appendChild( viewEl);
// focus?
//// viewEl.setAttribute("Focus", (((CEditWidget*)pView->tqparentWidget()) == m_pDocViewMan->currentEditView()));
//// viewEl.setAttribute("Focus", (((CEditWidget*)pView->parentWidget()) == m_pDocViewMan->currentEditView()));
viewEl.setAttribute("Type", "???");
TQDomElement viewPropertiesEl = domdoc.createElement("AdditionalSettings");

2
src/settingswidget.ui
Unescape View File

@ -517,7 +517,7 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>

2
src/simplemainwindow.cpp
Unescape View File

@ -70,7 +70,7 @@ SimpleMainWindow::SimpleMainWindow(TQWidget* tqparent, const char *name)
SimpleMainWindow::~ SimpleMainWindow( )
{
TopLevel::tqinvalidateInstance( this );
TopLevel::invalidateInstance( this );
}
void SimpleMainWindow::init()

2
src/toplevel.cpp
Unescape View File

@ -28,7 +28,7 @@ KDevMainWindow *TopLevel::getInstance()
return s_instance;
}
void TopLevel::tqinvalidateInstance(KDevMainWindow *instance)
void TopLevel::invalidateInstance(KDevMainWindow *instance)
{
if ( s_instance == instance )
s_instance = 0;

2
src/toplevel.h
Unescape View File

@ -16,7 +16,7 @@ public:
static KDevMainWindow *getInstance(); //!< Get a pointer to the single KDevTopLevel object
static bool mainWindowValid();
static void tqinvalidateInstance(KDevMainWindow *instance); //!< Signal that the object has been (or is about to be) destroyed
static void invalidateInstance(KDevMainWindow *instance); //!< Signal that the object has been (or is about to be) destroyed
private:

2
vcs/clearcase/integrator/ccintegratordlgbase.ui
Unescape View File

@ -43,5 +43,5 @@
</spacer>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
vcs/cvsservice/checkoutdialogbase.ui
Unescape View File

@ -303,7 +303,7 @@
<tabstop>pruneDirsCheck</tabstop>
<tabstop>fetchModulesButton</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>

2
vcs/cvsservice/commitdialogbase.ui
Unescape View File

@ -157,5 +157,5 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

4
vcs/cvsservice/cvsformbase.ui
Unescape View File

@ -218,6 +218,6 @@ Most of the thime you'll just reuse the project name</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"/>
</UI>

4
vcs/cvsservice/cvsoptionswidgetbase.ui
Unescape View File

@ -221,8 +221,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>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
vcs/cvsservice/diffdialogbase.ui
Unescape View File

@ -271,5 +271,5 @@
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
vcs/cvsservice/editorsdialogbase.ui
Unescape View File

@ -84,5 +84,5 @@
<slot>close()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
vcs/cvsservice/integrator/fetcherdlgbase.ui
Unescape View File

@ -149,5 +149,5 @@
<tabstop>pushButton2</tabstop>
<tabstop>comboBox5</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
vcs/cvsservice/integrator/initdlg.ui
Unescape View File

@ -62,7 +62,7 @@
</spacer>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>

2
vcs/cvsservice/integrator/integratordlgbase.ui
Unescape View File

@ -394,5 +394,5 @@
<slot>login_clicked()</slot>
<slot>createModule_clicked()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
vcs/cvsservice/releaseinputdialogbase.ui
Unescape View File

@ -242,5 +242,5 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
vcs/cvsservice/tagdialogbase.ui
Unescape View File

@ -155,5 +155,5 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
vcs/perforce/integrator/pfintegratordlgbase.ui
Unescape View File

@ -43,5 +43,5 @@
</spacer>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
vcs/subversion/commitdlgbase.ui
Unescape View File

@ -103,7 +103,7 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>ktextedit.h</includehint>
<includehint>ktextedit.h</includehint>

2
vcs/subversion/integrator/svnintegratordlgbase.ui
Unescape View File

@ -181,7 +181,7 @@ http://localhost/svn/projectname/trunk</string>
<slot>setEnabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>

14
vcs/subversion/kdevsvnd.cpp
Unescape View File

@ -241,7 +241,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
//
// int KSvnd::gettqStatus( const KURL::List& list ) {
// int result = 0;
// uint files = 0, folders = 0, tqparentsentries = 0, tqparentshavesvn = 0, subdirhavesvn = 0, external = 0;
// uint files = 0, folders = 0, parentsentries = 0, parentshavesvn = 0, subdirhavesvn = 0, external = 0;
// for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) {
// if ( isFolder ( ( *it ) ) ) {
// folders++;
@ -249,7 +249,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
// files++;
// }
// if ( isFileInSvnEntries ( (*it).filename(),( *it ).directory() + "/.svn/entries" ) ) { // normal subdir known in the working copy
// tqparentsentries++;
// parentsentries++;
// } else if ( isFolder( *it ) ) { // other subfolders (either another module checkouted or an external, or something not known at all)
// if ( TQFile::exists( ( *it ).path() + "/.svn/entries" ) )
// subdirhavesvn++;
@ -258,7 +258,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
// }
// }
// if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //tqparent has a .svn ?
// tqparentshavesvn++;
// parentshavesvn++;
// }
// if ( files > 0 )
// result |= SomeAreFiles;
@ -268,15 +268,15 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
// }
// if ( folders > 0 )
// result |= SomeAreFolders;
// if ( tqparentsentries == list.count() ) {
// if ( parentsentries == list.count() ) {
// result |= AllAreInParentsEntries;
// result |= SomeAreInParentsEntries;
// } else if ( tqparentsentries != 0 )
// } else if ( parentsentries != 0 )
// result |= SomeAreInParentsEntries;
// if ( tqparentshavesvn == list.count() ) {
// if ( parentshavesvn == list.count() ) {
// result |= AllParentsHaveSvn;
// result |= SomeParentsHaveSvn;
// } else if ( tqparentshavesvn > 0 )
// } else if ( parentshavesvn > 0 )
// result |= SomeParentsHaveSvn;
// if ( subdirhavesvn == list.count() ) {
// result |= AllHaveSvn;

2
vcs/subversion/subversiondiff.ui
Unescape View File

@ -96,5 +96,5 @@
<slot>accept()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
vcs/subversion/subversionprojectwidget.ui
Unescape View File

@ -81,7 +81,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>kpushbutton.h</includehint>

2
vcs/subversion/svn_co.ui
Unescape View File

@ -325,7 +325,7 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>kpushbutton.h</includehint>

2
vcs/subversion/svn_commitdlgbase.ui
Unescape View File

@ -127,5 +127,5 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
vcs/subversion/svn_copydlgwidget.ui
Unescape View File

@ -223,7 +223,7 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kurlrequester.h</includehint>

2
vcs/subversion/svn_logviewoptiondlgbase.ui
Unescape View File

@ -148,7 +148,7 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
vcs/subversion/svn_mergeoptiondlgbase.ui
Unescape View File

@ -351,7 +351,7 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>

2
vcs/subversion/svn_switchdlgbase.ui
Unescape View File

@ -202,7 +202,7 @@
<Q_SLOTS>
<slot>Form1_destroyed( QObject * )</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>

2
vcs/subversion/svnssltrustpromptbase.ui
Unescape View File

@ -112,5 +112,5 @@
<slot>accept()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

Write Preview
Loading…
Cancel
Save