diff options
Diffstat (limited to 'quanta/treeviews')
-rw-r--r-- | quanta/treeviews/basetreeview.cpp | 2 | ||||
-rw-r--r-- | quanta/treeviews/fileinfodlg.ui | 2 | ||||
-rw-r--r-- | quanta/treeviews/quantapropertiespage.ui | 8 | ||||
-rw-r--r-- | quanta/treeviews/structtreetag.cpp | 32 | ||||
-rw-r--r-- | quanta/treeviews/structtreetag.h | 2 | ||||
-rw-r--r-- | quanta/treeviews/structtreeview.cpp | 38 | ||||
-rw-r--r-- | quanta/treeviews/tagattributetree.cpp | 2 | ||||
-rw-r--r-- | quanta/treeviews/templatedirform.ui | 8 | ||||
-rw-r--r-- | quanta/treeviews/templatestreeview.cpp | 14 | ||||
-rw-r--r-- | quanta/treeviews/uploadtreefile.cpp | 4 | ||||
-rw-r--r-- | quanta/treeviews/uploadtreefile.h | 2 | ||||
-rw-r--r-- | quanta/treeviews/uploadtreefolder.cpp | 8 | ||||
-rw-r--r-- | quanta/treeviews/uploadtreefolder.h | 2 | ||||
-rw-r--r-- | quanta/treeviews/uploadtreeview.cpp | 12 |
14 files changed, 68 insertions, 68 deletions
diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index ba35ab61..61a71be5 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -86,7 +86,7 @@ BaseTreeViewToolTip::BaseTreeViewToolTip( TQWidget *tqparent, BaseTreeView *lv ) void BaseTreeViewToolTip::maybeTip( const TQPoint &pos ) { - if ( !tqparentWidget() || !m_view || !m_view->showToolTips() ) + if ( !parentWidget() || !m_view || !m_view->showToolTips() ) return; TQListViewItem *item = m_view->itemAt(pos); diff --git a/quanta/treeviews/fileinfodlg.ui b/quanta/treeviews/fileinfodlg.ui index 145b4f4e..d9b45eeb 100644 --- a/quanta/treeviews/fileinfodlg.ui +++ b/quanta/treeviews/fileinfodlg.ui @@ -90,5 +90,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/treeviews/quantapropertiespage.ui b/quanta/treeviews/quantapropertiespage.ui index 6498445a..97c666b6 100644 --- a/quanta/treeviews/quantapropertiespage.ui +++ b/quanta/treeviews/quantapropertiespage.ui @@ -59,7 +59,7 @@ </property> <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="4"> <property name="name"> - <cstring>tqparentAttr</cstring> + <cstring>parentAttr</cstring> </property> <property name="text"> <string>&Inherit type from tqparent (nothing)</string> @@ -221,7 +221,7 @@ </widget> <connections> <connection> - <sender>tqparentAttr</sender> + <sender>parentAttr</sender> <signal>toggled(bool)</signal> <receiver>typesCombo</receiver> <slot>setDisabled(bool)</slot> @@ -241,7 +241,7 @@ </connections> <tabstops> <tabstop>typesCombo</tabstop> - <tabstop>tqparentAttr</tabstop> + <tabstop>parentAttr</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/treeviews/structtreetag.cpp b/quanta/treeviews/structtreetag.cpp index a0ac8baa..fbd41228 100644 --- a/quanta/treeviews/structtreetag.cpp +++ b/quanta/treeviews/structtreetag.cpp @@ -37,14 +37,14 @@ StructTreeTag::StructTreeTag(TQListView *tqparent, TQString a_title) node = 0L; hasOpenFileMenu = false; groupTag = 0L; - tqparentTree = static_cast<StructTreeView*>(tqparent); + parentTree = static_cast<StructTreeView*>(tqparent); } StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQString a_title, TQListViewItem *after ) : KListViewItem(tqparent, after, a_title) { - tqparentTree = tqparent->tqparentTree; + parentTree = tqparent->parentTree; hasOpenFileMenu = false; groupTag = 0L; static const TQString space = " "; @@ -105,36 +105,36 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQStri if (!typingInProgress) { - TQTag *tqparentTQTag = 0L; + TQTag *parentTQTag = 0L; if (node->tqparent) - tqparentTQTag = QuantaCommon::tagFromDTD(node->tqparent); + parentTQTag = QuantaCommon::tagFromDTD(node->tqparent); TQString qTagName = node->tag->dtd()->caseSensitive ? node->tag->name : node->tag->name.upper(); int line, col; node->tag->beginPos(line, col); - if (tqparentTQTag && !tqparentTQTag->childTags.tqcontains(qTagName) && - !tqparentTQTag->childTags.isEmpty()) + if (parentTQTag && !parentTQTag->childTags.tqcontains(qTagName) && + !parentTQTag->childTags.isEmpty()) { node->tag->write()->setErrorMark(line); - TQString tqparentTagName = node->tag->dtd()->caseSensitive ? node->tqparent->tag->name : node->tqparent->tag->name.upper(); - tqparentTree->showMessage(i18n("Line %1: %2 is not a possible child of %3.\n").tqarg(line + 1).tqarg(qTagName).tqarg(tqparentTagName)); + TQString parentTagName = node->tag->dtd()->caseSensitive ? node->tqparent->tag->name : node->tqparent->tag->name.upper(); + parentTree->showMessage(i18n("Line %1: %2 is not a possible child of %3.\n").tqarg(line + 1).tqarg(qTagName).tqarg(parentTagName)); } TQString nextTagName; if (node->next) { nextTagName = node->tag->dtd()->caseSensitive ? node->next->tag->name : node->next->tag->name.upper(); } - tqparentTQTag = QuantaCommon::tagFromDTD(node); - if (tqparentTQTag && !tqparentTQTag->isSingle() && - !tqparentTQTag->isOptional() && + parentTQTag = QuantaCommon::tagFromDTD(node); + if (parentTQTag && !parentTQTag->isSingle() && + !parentTQTag->isOptional() && (!node->next || ( !node->getClosingNode())) ) { node->tag->write()->setErrorMark(line); - tqparentTree->showMessage(i18n("Line %1, column %2: Closing tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName)); + parentTree->showMessage(i18n("Line %1, column %2: Closing tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName)); } else - if (!tqparentTQTag && node->tag->name.upper() != "!DOCTYPE") + if (!parentTQTag && node->tag->name.upper() != "!DOCTYPE") { node->tag->write()->setErrorMark(line); - tqparentTree->showMessage(i18n("Line %1, column %2: %3 is not part of %4.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName).tqarg(node->tag->dtd()->nickName)); + parentTree->showMessage(i18n("Line %1, column %2: %3 is not part of %4.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName).tqarg(node->tag->dtd()->nickName)); } } break; @@ -182,7 +182,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQStri if (!node->prev || qTagName != "/" + qPrevTagName) { node->tag->write()->setErrorMark(line); - tqparentTree->showMessage(i18n("Line %1, column %2: Opening tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName)); + parentTree->showMessage(i18n("Line %1, column %2: Opening tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName)); } } title = tag->tagStr().left(70).stripWhiteSpace(); @@ -207,7 +207,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, TQString a_title ) node = 0L; hasOpenFileMenu = false; groupTag = 0L; - tqparentTree = tqparent->tqparentTree; + parentTree = tqparent->parentTree; } diff --git a/quanta/treeviews/structtreetag.h b/quanta/treeviews/structtreetag.h index cd0e35b8..6170870d 100644 --- a/quanta/treeviews/structtreetag.h +++ b/quanta/treeviews/structtreetag.h @@ -39,7 +39,7 @@ public: bool hasOpenFileMenu; Tag* groupTag; TQRegExp fileNameRx; - StructTreeView *tqparentTree; + StructTreeView *parentTree; }; #endif diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp index 8519f72b..f2154208 100644 --- a/quanta/treeviews/structtreeview.cpp +++ b/quanta/treeviews/structtreeview.cpp @@ -159,7 +159,7 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly) Node *currentNode = baseNode; StructTreeTag *currentItem = top; //after this StructTreeTag *item = 0L; - StructTreeTag *tqparentItem = top; //under this + StructTreeTag *parentItem = top; //under this int level = 0; TQString title; TQString tagStr; @@ -219,7 +219,7 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly) if (!groupOnly) { title = ""; - item = new StructTreeTag(tqparentItem, currentNode, title, currentItem); + item = new StructTreeTag(parentItem, currentNode, title, currentItem); item->setOpen(level < openLevel); currentNode->mainListItem = item; @@ -264,7 +264,7 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly) if (currentNode->child) { currentNode = currentNode->child; - tqparentItem = item; + parentItem = item; currentItem = 0L; level++; } else @@ -280,7 +280,7 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly) while (currentNode) { level--; - //tqparentItem = dynamic_cast<StructTreeTag*>(tqparentItem->tqparent()); + //parentItem = dynamic_cast<StructTreeTag*>(parentItem->tqparent()); if (currentNode->tqparent && currentNode->tqparent->next) { currentNode = currentNode->tqparent->next; @@ -296,15 +296,15 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly) currentItem = static_cast<StructTreeTag*>(currentNode->prev->mainListItem); if (currentNode->tqparent) { - tqparentItem = static_cast<StructTreeTag*>(currentNode->tqparent->mainListItem); - if (!tqparentItem) + parentItem = static_cast<StructTreeTag*>(currentNode->tqparent->mainListItem); + if (!parentItem) { - tqparentItem = top; + parentItem = top; } } else { - tqparentItem = top; + parentItem = top; } } @@ -877,9 +877,9 @@ void StructTreeView::contentsMousePressEvent(TQMouseEvent* e) void StructTreeView::copySelectedItems(TQListViewItem* tqparent, TQListViewItem* after) { - StructTreeTag* tqparent_item = dynamic_cast<StructTreeTag*> (tqparent); + StructTreeTag* parent_item = dynamic_cast<StructTreeTag*> (tqparent); StructTreeTag* after_item = dynamic_cast<StructTreeTag*> (after); - if(!tqparent_item/* || !after_item*/) // can happen if the element is inserted as the first child + if(!parent_item/* || !after_item*/) // can happen if the element is inserted as the first child return; TQPtrList<TQListViewItem> selected_items = selectedItems(false); @@ -896,28 +896,28 @@ void StructTreeView::copySelectedItems(TQListViewItem* tqparent, TQListViewItem* else start_node_subtree = kafkaCommon::getNodeSubtree(start_node, 0, end_node, end_node->tag->tagStr().length()); - Node* tqparent_node = tqparent_item->node; - if(!tqparent_node) + Node* parent_node = parent_item->node; + if(!parent_node) return; Node* next_node = 0; if(after_item) next_node = after_item->node->SNext(); else - next_node = tqparent_node->firstChild(); + next_node = parent_node->firstChild(); NodeSelection cursor_holder; NodeModifsSet *modifs = new NodeModifsSet(); - kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, tqparent_node, next_node, cursor_holder, modifs); + kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, parent_node, next_node, cursor_holder, modifs); write->docUndoRedo->addNewModifsSet(modifs, undoRedo::NodeTreeModif, 0, false); } void StructTreeView::moveSelectedItems(TQListViewItem* tqparent, TQListViewItem* after) { - StructTreeTag* tqparent_item = dynamic_cast<StructTreeTag*> (tqparent); + StructTreeTag* parent_item = dynamic_cast<StructTreeTag*> (tqparent); StructTreeTag* after_item = dynamic_cast<StructTreeTag*> (after); - if(!tqparent_item || !after_item) + if(!parent_item || !after_item) return; TQPtrList<TQListViewItem> selected_items = selectedItems(false); @@ -939,14 +939,14 @@ void StructTreeView::moveSelectedItems(TQListViewItem* tqparent, TQListViewItem* start_node_subtree = kafkaCommon::DTDExtractNodeSubtree(start_node, 0, end_node, end_node->tag->tagStr().length(), &cursor_node, cursor_offset, modifs); - Node* tqparent_node = tqparent_item->node; - if(!tqparent_node) + Node* parent_node = parent_item->node; + if(!parent_node) return; Node* next_node = after_item->node->SNext(); NodeSelection cursor_holder(cursor_node, cursor_offset); - kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, tqparent_node, next_node, cursor_holder, modifs); + kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, parent_node, next_node, cursor_holder, modifs); write->docUndoRedo->addNewModifsSet(modifs, undoRedo::NodeTreeModif, &cursor_holder, false); } diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp index 46de89b3..981aea04 100644 --- a/quanta/treeviews/tagattributetree.cpp +++ b/quanta/treeviews/tagattributetree.cpp @@ -333,7 +333,7 @@ void TagAttributeTree::setCurrentNode(Node *node) for (uint i = 0; i < qTag->commonGroups.count(); i++) { group = new TopLevelItem(this, group, i18n(qTag->commonGroups[i].utf8())); - AttributeList *groupAttrs = qTag->tqparentDTD->commonAttrs->tqfind(qTag->commonGroups[i]); + AttributeList *groupAttrs = qTag->parentDTD->commonAttrs->tqfind(qTag->commonGroups[i]); for (uint j = 0; j < groupAttrs->count(); j++) { Attribute *attr = groupAttrs->at(j); diff --git a/quanta/treeviews/templatedirform.ui b/quanta/treeviews/templatedirform.ui index 6e2f41bb..54e8637b 100644 --- a/quanta/treeviews/templatedirform.ui +++ b/quanta/treeviews/templatedirform.ui @@ -57,7 +57,7 @@ </widget> <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqparentAttr</cstring> + <cstring>parentAttr</cstring> </property> <property name="text"> <string>&Inherit tqparent attribute</string> @@ -147,7 +147,7 @@ </widget> <connections> <connection> - <sender>tqparentAttr</sender> + <sender>parentAttr</sender> <signal>toggled(bool)</signal> <receiver>typesCombo</receiver> <slot>setDisabled(bool)</slot> @@ -156,14 +156,14 @@ <tabstops> <tabstop>dirName</tabstop> <tabstop>typesCombo</tabstop> - <tabstop>tqparentAttr</tabstop> + <tabstop>parentAttr</tabstop> <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> <Q_SLOTS> <slot>okBtn_clicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> </includehints> diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp index 5efd8b05..2f061462 100644 --- a/quanta/treeviews/templatestreeview.cpp +++ b/quanta/treeviews/templatestreeview.cpp @@ -383,10 +383,10 @@ void TemplatesTreeView::slotNewDir() if (m_dirInfo.mimeType.isEmpty()) { - createDirDlg->tqparentAttr->setText(i18n("&Inherit tqparent attribute (nothing)")); + createDirDlg->parentAttr->setText(i18n("&Inherit tqparent attribute (nothing)")); } else { - createDirDlg->tqparentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_dirInfo.mimeType])); + createDirDlg->parentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_dirInfo.mimeType])); } if (createDirDlg->exec()) { @@ -407,7 +407,7 @@ void TemplatesTreeView::slotNewDir() Maybe you do not have permission to write in the %1 folder.").tqarg(startDir)); return; } - if (! createDirDlg->tqparentAttr->isChecked()) + if (! createDirDlg->parentAttr->isChecked()) { m_dirInfo.mimeType = i18nToType[createDirDlg->typesCombo->currentText()]; m_dirInfo.preText = ""; @@ -612,14 +612,14 @@ void TemplatesTreeView::slotProperties() m_parentDirInfo = readDirInfo(dotFileInfo.dirPath()); if (!dotFileInfo.exists() || m_dirInfo.mimeType == m_parentDirInfo.mimeType) { - m_quantaProperties->tqparentAttr->setChecked(true); + m_quantaProperties->parentAttr->setChecked(true); } if (m_parentDirInfo.mimeType.isEmpty()) { - m_quantaProperties->tqparentAttr->setText(i18n("&Inherit tqparent attribute (nothing)")); + m_quantaProperties->parentAttr->setText(i18n("&Inherit tqparent attribute (nothing)")); } else { - m_quantaProperties->tqparentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_parentDirInfo.mimeType])); + m_quantaProperties->parentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_parentDirInfo.mimeType])); } m_quantaProperties->preTextEdit->setText(m_dirInfo.preText); m_quantaProperties->postTextEdit->setText(m_dirInfo.postText); @@ -681,7 +681,7 @@ void TemplatesTreeView::slotPropertiesApplied() DirInfo m_localDirInfo; TQString typeString = ""; - if (!m_quantaProperties->tqparentAttr->isChecked()) + if (!m_quantaProperties->parentAttr->isChecked()) { m_localDirInfo.mimeType = m_quantaProperties->typesCombo->currentText(); typeString = m_localDirInfo.mimeType; diff --git a/quanta/treeviews/uploadtreefile.cpp b/quanta/treeviews/uploadtreefile.cpp index f43b8f99..b4ad6845 100644 --- a/quanta/treeviews/uploadtreefile.cpp +++ b/quanta/treeviews/uploadtreefile.cpp @@ -32,7 +32,7 @@ UploadTreeFile::UploadTreeFile( UploadTreeFolder *tqparent, const KURL &a_url, c { m_url = a_url; isDir = false; - tqparentFolder = tqparent; + parentFolder = tqparent; m_fileItem = new KFileItem(a_fileItem); m_confirm = false; @@ -45,7 +45,7 @@ UploadTreeFile::UploadTreeFile( TQListView *tqparent, const KURL &a_url, const K { m_url = a_url; isDir = false; - tqparentFolder = 0L; + parentFolder = 0L; m_fileItem = new KFileItem(a_fileItem); m_confirm = false; diff --git a/quanta/treeviews/uploadtreefile.h b/quanta/treeviews/uploadtreefile.h index c2a118fc..246b3fe0 100644 --- a/quanta/treeviews/uploadtreefile.h +++ b/quanta/treeviews/uploadtreefile.h @@ -43,7 +43,7 @@ public: bool confirmUpload() {return m_confirm;} public: - UploadTreeFolder * tqparentFolder; + UploadTreeFolder * parentFolder; KURL m_url; bool isDir; bool m_confirm; diff --git a/quanta/treeviews/uploadtreefolder.cpp b/quanta/treeviews/uploadtreefolder.cpp index dc43419c..7e719912 100644 --- a/quanta/treeviews/uploadtreefolder.cpp +++ b/quanta/treeviews/uploadtreefolder.cpp @@ -30,7 +30,7 @@ UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * tqparent, const char * name ) : KListViewItem( tqparent, name, "", "", "" ) { - tqparentFolder = tqparent; + parentFolder = tqparent; m_url = a_url; m_url.adjustPath(1); @@ -43,7 +43,7 @@ UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * tqparen UploadTreeFolder::UploadTreeFolder(const KURL &a_url, TQListView * tqparent, const char * name ) : KListViewItem( tqparent, name, "", "", "" ) { - tqparentFolder = 0L; + parentFolder = 0L; m_url = a_url; m_url.adjustPath(1); @@ -64,9 +64,9 @@ TQString UploadTreeFolder::fullName() { TQString s=""; - if ( tqparentFolder ) + if ( parentFolder ) { - s = tqparentFolder->fullName(); + s = parentFolder->fullName(); s += m_url.fileName()+"/"; } else { diff --git a/quanta/treeviews/uploadtreefolder.h b/quanta/treeviews/uploadtreefolder.h index 000c14bf..fd08276f 100644 --- a/quanta/treeviews/uploadtreefolder.h +++ b/quanta/treeviews/uploadtreefolder.h @@ -46,7 +46,7 @@ public: void setWhichPixmap(const TQString& pixmap ); public: - UploadTreeFolder * tqparentFolder; + UploadTreeFolder * parentFolder; KURL m_url; public slots: // Public slots diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp index 250cc3a2..3b07b112 100644 --- a/quanta/treeviews/uploadtreeview.cpp +++ b/quanta/treeviews/uploadtreeview.cpp @@ -52,7 +52,7 @@ UploadTreeView::~UploadTreeView() int UploadTreeView::checkboxTree( TQListViewItem *it ) { - tqparentWidget()->setCursor(KCursor::workingCursor()); + parentWidget()->setCursor(KCursor::workingCursor()); TQListViewItem *itIter = it ? it->firstChild() : firstChild(); @@ -127,7 +127,7 @@ int UploadTreeView::checkboxTree( TQListViewItem *it ) } } - tqparentWidget()->setCursor(KCursor::arrowCursor()); + parentWidget()->setCursor(KCursor::arrowCursor()); return retVal; } @@ -177,7 +177,7 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it ) itF->setSelected( true ); } - itF = itF->tqparentFolder; + itF = itF->parentFolder; } else { @@ -191,10 +191,10 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it ) itFile->setWhichPixmap("check_clear"); itFile->setSelected(false); } - itF = itFile->tqparentFolder; + itF = itFile->parentFolder; } - //iterate through the item's tqparents and set the correct checkboxes for them + //iterate through the item's parents and set the correct checkboxes for them while (itF) { bool hasSelected = false; @@ -227,7 +227,7 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it ) itF->setWhichPixmap( "check_clear" ); itF->setSelected( false ); } - itF = itF->tqparentFolder; + itF = itF->parentFolder; } } |