summaryrefslogtreecommitdiffstats
path: root/umbrello/umbrello/dialogs
diff options
context:
space:
mode:
Diffstat (limited to 'umbrello/umbrello/dialogs')
-rw-r--r--umbrello/umbrello/dialogs/codeeditor.cpp80
-rw-r--r--umbrello/umbrello/dialogs/codeeditor.h4
-rw-r--r--umbrello/umbrello/dialogs/codegenerationoptionsbase.ui2
-rw-r--r--umbrello/umbrello/dialogs/codegenerationpolicybase.ui2
-rw-r--r--umbrello/umbrello/dialogs/codegenerationwizardbase.ui2
-rw-r--r--umbrello/umbrello/dialogs/codeviewerdialog.h2
-rw-r--r--umbrello/umbrello/dialogs/codeviewerdialogbase.ui2
-rw-r--r--umbrello/umbrello/dialogs/codevieweroptionsbase.ui2
-rw-r--r--umbrello/umbrello/dialogs/diagrampropertiespage.ui2
-rw-r--r--umbrello/umbrello/dialogs/exportallviewsdialogbase.ui2
-rw-r--r--umbrello/umbrello/dialogs/settingsdlg.cpp2
-rw-r--r--umbrello/umbrello/dialogs/umlrolepropertiesbase.ui2
12 files changed, 52 insertions, 52 deletions
diff --git a/umbrello/umbrello/dialogs/codeeditor.cpp b/umbrello/umbrello/dialogs/codeeditor.cpp
index b4533d83..934fc628 100644
--- a/umbrello/umbrello/dialogs/codeeditor.cpp
+++ b/umbrello/umbrello/dialogs/codeeditor.cpp
@@ -409,28 +409,28 @@ void CodeEditor::appendText (CodeClassFieldDeclarationBlock * db ) {
TQString indent = db->getIndentationString();
TQString body = db->formatMultiLineText (db->getText(), indent, "\n");
- UMLObject * tqparentObj = db->getParentClassField()->getParentObject();
+ UMLObject * parentObj = db->getParentClassField()->getParentObject();
TQColor bgcolor = getState().editBlockColor;
TQString componentName = TQString("");
- if(tqparentObj)
+ if(parentObj)
{
- if(db->getParentClassField()->tqparentIsAttribute()) {
- componentName = tqparentDocName + "::attribute_field(" + tqparentObj->getName() + ')';
+ if(db->getParentClassField()->parentIsAttribute()) {
+ componentName = parentDocName + "::attribute_field(" + parentObj->getName() + ')';
} else {
- UMLRole * role = dynamic_cast<UMLRole*>(tqparentObj);
- componentName = tqparentDocName + "::association_field(" + role->getName() + ')';
+ UMLRole * role = dynamic_cast<UMLRole*>(parentObj);
+ componentName = parentDocName + "::association_field(" + role->getName() + ')';
}
bgcolor = getState().umlObjectColor;
}
- appendText(db->getComment(), db, tqparentObj,componentName);
+ appendText(db->getComment(), db, parentObj,componentName);
if(!db->getWriteOutText() && m_showHiddenBlocks)
bgcolor = getState().hiddenColor;
if(!StringIsBlank(body))
- insert(body,db,false,getState().fontColor,bgcolor,tqparentObj);
+ insert(body,db,false,getState().fontColor,bgcolor,parentObj);
}
@@ -460,42 +460,42 @@ void CodeEditor::appendText (CodeMethodBlock * mb) {
bgcolor = getState().hiddenColor;
}
- TQString componentName = TQString("<b>tqparentless method\?</b>");
+ TQString componentName = TQString("<b>parentless method\?</b>");
// ugly, but we need to know if there is a tqparent object here.
CodeOperation * op = dynamic_cast<CodeOperation*>(mb);
CodeAccessorMethod * accessor = dynamic_cast<CodeAccessorMethod*>(mb);
- UMLObject * tqparentObj = 0;
+ UMLObject * parentObj = 0;
if(op)
{
- tqparentObj = op->getParentOperation();
- if(((UMLOperation*)tqparentObj)->isConstructorOperation())
- componentName = tqparentDocName + "::operation("+ tqparentObj->getName()+") constructor method";
+ parentObj = op->getParentOperation();
+ if(((UMLOperation*)parentObj)->isConstructorOperation())
+ componentName = parentDocName + "::operation("+ parentObj->getName()+") constructor method";
else
- componentName = tqparentDocName + "::operation("+ tqparentObj->getName()+") method";
+ componentName = parentDocName + "::operation("+ parentObj->getName()+") method";
}
if(accessor)
{
- tqparentObj = accessor->getParentObject();
- if(accessor->getParentClassField()->tqparentIsAttribute()) {
- componentName = tqparentDocName + "::attribute_field(" + tqparentObj->getName() + ") accessor method";
+ parentObj = accessor->getParentObject();
+ if(accessor->getParentClassField()->parentIsAttribute()) {
+ componentName = parentDocName + "::attribute_field(" + parentObj->getName() + ") accessor method";
} else {
- UMLRole * role = dynamic_cast<UMLRole*>(tqparentObj);
- componentName = tqparentDocName + "::association_field(" + role->getName() + ") accessor method";
+ UMLRole * role = dynamic_cast<UMLRole*>(parentObj);
+ componentName = parentDocName + "::association_field(" + role->getName() + ") accessor method";
}
}
- //appendText(mb->getComment(), mb, tqparentObj, componentName);
- appendText(mb->getComment(), mb->getComment(), tqparentObj, componentName);
+ //appendText(mb->getComment(), mb, parentObj, componentName);
+ appendText(mb->getComment(), mb->getComment(), parentObj, componentName);
if(!StringIsBlank(startText))
- insert(startText,mb,false,getState().fontColor,bgcolor,tqparentObj);
+ insert(startText,mb,false,getState().fontColor,bgcolor,parentObj);
// always insert body for methods..IF we don't, we create a
// situation where the user cant edit the body (!)
- insert(body,mb,true,getState().fontColor,bgcolor,tqparentObj);
+ insert(body,mb,true,getState().fontColor,bgcolor,parentObj);
if(!StringIsBlank(endText))
- insert(endText,mb,false,getState().fontColor,bgcolor,tqparentObj);
+ insert(endText,mb,false,getState().fontColor,bgcolor,parentObj);
}
@@ -520,22 +520,22 @@ void CodeEditor::appendText(HierarchicalCodeBlock * hblock)
return;
OwnedHierarchicalCodeBlock * test = dynamic_cast<OwnedHierarchicalCodeBlock *>(hblock);
- UMLObject * tqparentObj = 0;
+ UMLObject * parentObj = 0;
TQString componentName = TQString("");
TQColor paperColor = getState().nonEditBlockColor;
if(test)
{
- tqparentObj = test->getParentObject();
- UMLClassifier *c = dynamic_cast<UMLClassifier*>(tqparentObj);
+ parentObj = test->getParentObject();
+ UMLClassifier *c = dynamic_cast<UMLClassifier*>(parentObj);
if (c) {
TQString typeStr;
if (c->isInterface())
typeStr = "Interface";
else
typeStr = "Class";
- componentName = tqparentDocName + "::" + typeStr + '(' + tqparentObj->getName() + ')';
+ componentName = parentDocName + "::" + typeStr + '(' + parentObj->getName() + ')';
} else {
- componentName = tqparentDocName + "::UNKNOWN(" + tqparentObj->getName() + ')';
+ componentName = parentDocName + "::UNKNOWN(" + parentObj->getName() + ')';
}
paperColor = getState().umlObjectColor;
@@ -549,10 +549,10 @@ void CodeEditor::appendText(HierarchicalCodeBlock * hblock)
TQString startText = hblock->formatMultiLineText ( hblock->getStartText(), indent, "\n");
TQString endText = hblock->formatMultiLineText( hblock->getEndText(), indent, "\n");
- appendText(hblock->getComment(), hblock, tqparentObj, componentName);
+ appendText(hblock->getComment(), hblock, parentObj, componentName);
if(!StringIsBlank(startText))
- insert(startText,hblock,false,getState().fontColor,paperColor, tqparentObj);
+ insert(startText,hblock,false,getState().fontColor,paperColor, parentObj);
appendText(items);
if(!StringIsBlank(endText))
insert(endText,hblock,false,getState().fontColor,paperColor);
@@ -774,13 +774,13 @@ void CodeEditor::slotRedrawText() {
rebuildView(m_lastPara);
}
-void CodeEditor::init ( CodeViewerDialog * tqparentDlg, CodeDocument * tqparentDoc ) {
+void CodeEditor::init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc ) {
// safety to insure that we are up to date
- tqparentDoc->synchronize();
+ parentDoc->synchronize();
- m_parentDlg = tqparentDlg;
- m_parentDoc = tqparentDoc;
+ m_parentDlg = parentDlg;
+ m_parentDoc = parentDoc;
setUndoRedoEnabled( false );
setCursor( TQCursor( 0 ) );
@@ -801,9 +801,9 @@ void CodeEditor::init ( CodeViewerDialog * tqparentDlg, CodeDocument * tqparentD
// set name of tqparent doc
ClassifierCodeDocument * cdoc = dynamic_cast<ClassifierCodeDocument*>(m_parentDoc);
if(cdoc)
- tqparentDocName = cdoc->getParentClassifier()->getName();
+ parentDocName = cdoc->getParentClassifier()->getName();
else
- tqparentDocName = "";
+ parentDocName = "";
// set some viewability parameters
//int margin = fontMetrics().height();
@@ -832,7 +832,7 @@ void CodeEditor::updateTextBlockFromText (TextBlock * block) {
TQString baseIndent = block->getIndentationString(block->getIndentationLevel()+(cmb ? 1 : 0));
TextBlockInfo *info = (*m_tbInfoMap)[block];
- UMLObject * tqparentObj = info->getParent();
+ UMLObject * parentObj = info->getParent();
int pstart = m_textBlockList.tqfindRef(block);
TQString content = "";
@@ -862,8 +862,8 @@ void CodeEditor::updateTextBlockFromText (TextBlock * block) {
// if a tqparent for the block, try to set its documentation
// as long as its NOT an accessor codeblock.
- if(tqparentObj && !info->isCodeAccessorMethod)
- tqparentObj->setDoc(content);
+ if(parentObj && !info->isCodeAccessorMethod)
+ parentObj->setDoc(content);
// make note that its now user generated
if(cmb)
diff --git a/umbrello/umbrello/dialogs/codeeditor.h b/umbrello/umbrello/dialogs/codeeditor.h
index b430b27d..5f72fc7a 100644
--- a/umbrello/umbrello/dialogs/codeeditor.h
+++ b/umbrello/umbrello/dialogs/codeeditor.h
@@ -91,7 +91,7 @@ protected:
private:
- TQString tqparentDocName;
+ TQString parentDocName;
CodeDocument * m_parentDoc;
CodeViewerDialog * m_parentDlg;
@@ -124,7 +124,7 @@ private:
void updateTextBlockFromText (TextBlock * block);
void initText ( CodeDocument * doc );
- void init ( CodeViewerDialog * tqparentDlg, CodeDocument * tqparentDoc );
+ void init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc );
void changeTextBlockHighlighting(TextBlock * tb, bool selected);
bool isParaEditable (int para);
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
index d58bf99f..601b5385 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
@@ -525,7 +525,7 @@ is empty</string>
<slot access="protected">browseClicked()</slot>
<slot access="protected">activeLanguageChanged(int id)</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
diff --git a/umbrello/umbrello/dialogs/codegenerationpolicybase.ui b/umbrello/umbrello/dialogs/codegenerationpolicybase.ui
index 31476a8b..620af610 100644
--- a/umbrello/umbrello/dialogs/codegenerationpolicybase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationpolicybase.ui
@@ -35,5 +35,5 @@
<Q_SLOTS>
<slot access="protected">apply()</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
index 32773a59..517df16e 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
@@ -305,5 +305,5 @@ for in the right hand side list</string>
<slot access="protected">deselectClass()</slot>
<slot>classGenerated( UMLClassifier * /* c */ )</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.h b/umbrello/umbrello/dialogs/codeviewerdialog.h
index 0f447d3a..2228dfae 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.h
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.h
@@ -52,7 +52,7 @@ public:
/** return the code viewer state */
Settings::CodeViewerState getState( );
- TQString tqparentDocName;
+ TQString parentDocName;
/**
* Adds a code document to the tabbed output
diff --git a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
index d29b21a8..665d6ccf 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
+++ b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
@@ -109,5 +109,5 @@
<Q_SLOTS>
<slot>changeHighlighting(int)</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
index 57a43309..ed75ea9d 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
@@ -362,7 +362,7 @@
<data format="XPM.GZ" length="4462">789c9d97c76e24490e86effd1442f3d65870d2451a0ce6206f5adeb4cc620f8c34f2553225b5a4c1befb46927fe6a1d4c0ccac4287fa8a0c26834193f5dbb785b3fd9d856fbf7d799ec9ecba5ea8afe469e15bf3727ffffeeffffcf1e797af49b2d0ffc7d142f2f55f5fbe1ecc16ea85dde9a4ed81290045faa77ca49cf4ab67ba1e3953969173651ab9d4fdf1c8a27c3872ad7c3c72d3b32c2a67c3f3444636fbef23eb7e590267e68fcc4656395d8dacf6d938ef97eaef289781cddebdb2846fccff44b989ba58e3411f3dc75158e6df1d3889539517ca49bf54fe43398d1dec4f46567f685fd9c539f43fc025f80c1c3ce8d93f28e77185f8bf0c6cfae4c0b5f9c3c6e5c0542a4b5876fe13708df39d2bd7716372aa8c93c4e4723bb2f977aadc26ceec4bdb7310e6b0bfab9c2445ecd49f1370694cebca65d260ffa6711a41aef14d24e94cee6be3348e0ae5e9c8765f07ca3e8db17f0f9c825794eb3489351fe9bb7217e4969f29388bd51ee9fda5715a19730696b852fea95c6471647ca95cf64bcf43e0cef4657b647bfe6acf213d6bb32f9a9f5992b5a64f9a8f990b6cf9ecc15d6cf9acf6b2da55a8a75cb973dee4b2d1b38b5c05de02434e87e01aacfb351df5bebddea74b5c67f9c795711ea15e357e2ecde358fb87efc0a867df8cac728a074e62e527706afb59f3cf6583be5c28bb3c35f693812d1fbdc6dbe57966fec932d899ffa4f7e38adca17e34beaeca4b9c271a18f1d5fc739257b0d70d9c68be7bed7fcee7827ab91cd8e4740cf6b19d4ffb87ab07b9bf516e72d4a3ac821b9cef6e60d84f47367ded2fae1d9f7704f6163f79000ffde27660f387ed3c5dbf54dfeebb0bf6acbe6b706bfa5ef32f8f8b18f5bf0f463f20edb77956a4e68fbc80b3c4facd163847be6bfde72ec86dbeac82715fbc0286be683cf3bc081d44f7df80d344fb0b6b7de64581fb916765297263d6fccd9b7ee97e566e8b06cfdb1f59cf2bda2f8bbc2c11df0c5c41aefdb328ca22b1feb0012eedbce24736f91b18fb796d64eb87cb60817dcdafb07d906bfd14d22f659d8785ef97b2f6d7b2df6ef1d6fb2babaac6f92e8c25b27ecc1f239b7f3a5fca5a8678ea7c2d9bc0e6ef1238b3fca2c7814d5f4cbf9334b5f833384bed3c7a5f5514f4adbe2ec07962e7590457f06f6f649b977afe2a16f42f5e070bfc591e18f7a5f1a812a9e0df39d827da4fbd8c6ccfd7785569bf945f953371a9d5a3de67950bfa2d75c63eb2fb15bdcfaaf011e6c7263846bf8f4636f91618f3c7d3c0f047fb69550efab2074e12bd6fd27957553ec33c5b043bcc7f9d0795f818fdb501a3df8ae673e507ff69021eea37063bc45ffb73550736ff36c0a84f3e0317a86f8b5f139e6ffe1f821de6d9127898ff3be00a7c3ab2cd03e3d697560ff40016e47b3bb2e96bbd559d8f32bbff4b7065f193042c98873acf240af6adbf3c83c5f2954bb0c7bcd77c107d81d2fdebc63e33ff640aaecc9e1c8151df5c803dfaadc64b52dfa03ed64636ffb4ff4b2867f453ede7227586fcd3f9264ded91fffafe236d5da37fe83c91ceb7b9e5b7f6731ff92ed7f747d6fbf7e185cf58347e3e6932e47b3430fa893edf87d795c2fc3f003b67f5f902cec17abfde0dfa3c053b3c5ffb832fc2eb8fddcf233887fc195c801f46b6f3cdc02558fba72f7d2d1a7f7e321ee58fe0cad86bbff24dd3e2fe74fef836b0c6eb60d62fa6bf5e07b3419f853dd7dc70fb8bd5f1255fd90ed30f9f3c5ff30ddff21ddff384a7fcc08ffcc4cf61cdf8855ff9e79c7e1db4dff89d3f7891977899577895d7789d377893b7f83b6fcfe937bc13b477798ff7f9800ff928ac633ee11f7cca6761d7f99c7e1b3cb908da11c7413be1943376e153cc39175c72f549ff9e17c31744429e6a6aa8a58e2ee98aaee9866e7f617fc24b7417a4f734a1293dd0233dd133cd8285177aa5f9f3b63ca5377aa78f607b919668995682e62aadd17ab0b1419b9ff41f682b48bed336edd02eed05ed7d5ea3033a0cdf1ed1f127fd273ae123fa41a774a6b685cee982228a837e42e927fd47caf8985c38651eb40b2ac38e4a5842658a97fab33fd248cb87d2c9a55cc9b5dcc82d1fc99ddccb44a6f230af2f8ff224cf417f262ff22a3fe54ddee543166549966545567f617f4dd66523dc6b2c9bb225df655b7682f692ecca9eeccfe97772c09b722847722c27c1f3eb70f66bf9116c9fca999ccbc59cfe25bf4a143a5ef8992561324a78bd92522acf9ebc78efe7cf7b153276db37bef59dbff457fedadff85b7f27abfede4ffcd4cf9ff76faeff4fffefeff8c7f5fedfdfbffc0fa355c495</data>
</image>
</images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
</includehints>
diff --git a/umbrello/umbrello/dialogs/diagrampropertiespage.ui b/umbrello/umbrello/dialogs/diagrampropertiespage.ui
index bfb00529..8dc7f029 100644
--- a/umbrello/umbrello/dialogs/diagrampropertiespage.ui
+++ b/umbrello/umbrello/dialogs/diagrampropertiespage.ui
@@ -406,5 +406,5 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
</widget>
</vbox>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
index 503181e4..e795d2c9 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
+++ b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
@@ -207,7 +207,7 @@ Only the folders made by the user are created in the base directory (Logical vie
<slot>reject()</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp
index f051925a..a227572d 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.cpp
+++ b/umbrello/umbrello/dialogs/settingsdlg.cpp
@@ -343,7 +343,7 @@ void SettingsDlg::slotDefault() {
break;
case Settings::page_font:
- m_FontWidgets.chooser -> setFont( tqparentWidget() -> font() );
+ m_FontWidgets.chooser -> setFont( parentWidget() -> font() );
break;
case Settings::page_UI:
diff --git a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
index 22a24023..ecaa98ae 100644
--- a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
+++ b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
@@ -199,5 +199,5 @@
</grid>
</widget>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 00:07:27 +0000