From 929d7ae4f69d62b8f1f6d3506adf75f017753935 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- quanta/utility/newstuff.cpp | 34 +++++++++++++------------- quanta/utility/newstuff.h | 16 ++++++------- quanta/utility/tagaction.cpp | 14 +++++------ quanta/utility/tagaction.h | 2 +- quanta/utility/tagactionset.cpp | 48 ++++++++++++++++++------------------- quanta/utility/tagactionset.h | 2 +- quanta/utility/toolbartabwidget.cpp | 18 +++++++------- 7 files changed, 67 insertions(+), 67 deletions(-) (limited to 'quanta/utility') diff --git a/quanta/utility/newstuff.cpp b/quanta/utility/newstuff.cpp index adf4e5d0..bc3a052f 100644 --- a/quanta/utility/newstuff.cpp +++ b/quanta/utility/newstuff.cpp @@ -50,13 +50,13 @@ void QNewDTEPStuff::installResource() } else ok = false; if (!ok) - KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded DTEP tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("DTEP Installation Error")); + KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded DTEP tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("DTEP Installation Error")); } -QNewToolbarStuff::QNewToolbarStuff(const TQString &type, TQWidget *tqparentWidget) - :KNewStuffSecure(type, tqparentWidget) +QNewToolbarStuff::QNewToolbarStuff(const TQString &type, TQWidget *parentWidget) + :KNewStuffSecure(type, parentWidget) { - connect(this, TQT_SIGNAL(loadToolbarFile(const KURL&)), tqparentWidget, TQT_SLOT(slotLoadToolbarFile(const KURL&))); + connect(this, TQT_SIGNAL(loadToolbarFile(const KURL&)), parentWidget, TQT_SLOT(slotLoadToolbarFile(const KURL&))); } @@ -64,26 +64,26 @@ void QNewToolbarStuff::installResource() { KURL destURL = KURL::fromPathOrURL(KGlobal::dirs()->saveLocation("data") + resourceDir + "toolbars/" + TQFileInfo(m_tarName).fileName()); bool ok = true; - if (QuantaCommon::checkOverwrite(destURL, tqparentWidget())) + if (QuantaCommon::checkOverwrite(destURL, parentWidget())) { - if (!QExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, tqparentWidget())) + if (!QExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, parentWidget())) ok = false; else { - if (KMessageBox::questionYesNo(tqparentWidget(), i18n("Do you want to load the newly downloaded toolbar?"), i18n("Load Toolbar"), i18n("Load"), KStdGuiItem::cancel()) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(parentWidget(), i18n("Do you want to load the newly downloaded toolbar?"), i18n("Load Toolbar"), i18n("Load"), KStdGuiItem::cancel()) == KMessageBox::Yes) { emit loadToolbarFile(destURL); } } if (!ok) - KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded toolbar tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Toolbar Installation Error")); + KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded toolbar tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Toolbar Installation Error")); } } -QNewTemplateStuff::QNewTemplateStuff(const TQString &type, TQWidget *tqparentWidget) - :KNewStuffSecure(type, tqparentWidget) +QNewTemplateStuff::QNewTemplateStuff(const TQString &type, TQWidget *parentWidget) + :KNewStuffSecure(type, parentWidget) { - connect(this, TQT_SIGNAL(openFile(const KURL&)), tqparentWidget, TQT_SLOT(slotFileOpen(const KURL&))); + connect(this, TQT_SIGNAL(openFile(const KURL&)), parentWidget, TQT_SLOT(slotFileOpen(const KURL&))); } @@ -91,19 +91,19 @@ void QNewTemplateStuff::installResource() { KURL destURL = KURL::fromPathOrURL(KGlobal::dirs()->saveLocation("data") + resourceDir + "templates/" + TQFileInfo(m_tarName).fileName()); bool ok = true; - if (QuantaCommon::checkOverwrite(destURL, tqparentWidget())) + if (QuantaCommon::checkOverwrite(destURL, parentWidget())) { - if (!QExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, tqparentWidget())) + if (!QExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, parentWidget())) ok = false; else { - if (KMessageBox::questionYesNo(tqparentWidget(), i18n("Do you want to open the newly downloaded template?"), i18n("Open Template"), KStdGuiItem::open(), KStdGuiItem::cancel()) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(parentWidget(), i18n("Do you want to open the newly downloaded template?"), i18n("Open Template"), KStdGuiItem::open(), KStdGuiItem::cancel()) == KMessageBox::Yes) { emit openFile(destURL); } } if (!ok) - KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded template file."), i18n("Template Installation Error")); + KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded template file."), i18n("Template Installation Error")); } } @@ -121,7 +121,7 @@ void QNewScriptStuff::installResource() ok = false; if (!ok) - KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Script Installation Error")); + KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Script Installation Error")); } void QNewDocStuff::installResource() @@ -138,7 +138,7 @@ void QNewDocStuff::installResource() ok = false; if (!ok) - KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Documentation Installation Error")); + KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Documentation Installation Error")); } #include "newstuff.moc" diff --git a/quanta/utility/newstuff.h b/quanta/utility/newstuff.h index 3be6857d..f504accf 100644 --- a/quanta/utility/newstuff.h +++ b/quanta/utility/newstuff.h @@ -35,8 +35,8 @@ class QNewDTEPStuff: public KNewStuffSecure TQ_OBJECT public: - QNewDTEPStuff(const TQString &type, TQWidget *tqparentWidget=0) - :KNewStuffSecure(type, tqparentWidget){}; + QNewDTEPStuff(const TQString &type, TQWidget *parentWidget=0) + :KNewStuffSecure(type, parentWidget){}; ~QNewDTEPStuff() {}; private: @@ -54,7 +54,7 @@ class QNewToolbarStuff: public KNewStuffSecure TQ_OBJECT public: - QNewToolbarStuff(const TQString &type, TQWidget *tqparentWidget=0); + QNewToolbarStuff(const TQString &type, TQWidget *parentWidget=0); ~QNewToolbarStuff() {}; signals: @@ -75,7 +75,7 @@ class QNewTemplateStuff: public KNewStuffSecure TQ_OBJECT public: - QNewTemplateStuff(const TQString &type, TQWidget *tqparentWidget=0); + QNewTemplateStuff(const TQString &type, TQWidget *parentWidget=0); ~QNewTemplateStuff() {}; signals: @@ -96,8 +96,8 @@ class QNewScriptStuff: public KNewStuffSecure TQ_OBJECT public: - QNewScriptStuff(const TQString &type, TQWidget *tqparentWidget=0) - :KNewStuffSecure(type, tqparentWidget){}; + QNewScriptStuff(const TQString &type, TQWidget *parentWidget=0) + :KNewStuffSecure(type, parentWidget){}; ~QNewScriptStuff() {}; private: @@ -115,8 +115,8 @@ class QNewDocStuff: public KNewStuffSecure TQ_OBJECT public: - QNewDocStuff(const TQString &type, TQWidget *tqparentWidget=0) - :KNewStuffSecure(type, tqparentWidget){}; + QNewDocStuff(const TQString &type, TQWidget *parentWidget=0) + :KNewStuffSecure(type, parentWidget){}; ~QNewDocStuff() {}; private: diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp index f354dc5c..3030d661 100644 --- a/quanta/utility/tagaction.cpp +++ b/quanta/utility/tagaction.cpp @@ -72,14 +72,14 @@ int MyProcess::commSetupDoneC() return KProcess::commSetupDoneC(); } -TagAction::TagAction( TQDomElement *element, KMainWindow *tqparentMainWindow, bool toggle) +TagAction::TagAction( TQDomElement *element, KMainWindow *parentMainWindow, bool toggle) : KToggleAction(element->attribute("text").isEmpty() ? TQString("") : i18n(element->attribute("text").utf8()), - KShortcut(element->attribute("shortcut")), 0, 0, tqparentMainWindow->actionCollection(), element->attribute("name").ascii()), + KShortcut(element->attribute("shortcut")), 0, 0, parentMainWindow->actionCollection(), element->attribute("name").ascii()), //disable toggle now m_toggle(toggle) m_toggle(false) { setToolTip(element->attribute("tooltip")); - m_parentMainWindow = tqparentMainWindow; + m_parentMainWindow = parentMainWindow; m_modified = false; m_useInputFile = false; m_useOutputFile = false; @@ -1066,7 +1066,7 @@ void TagAction::applyTagInSelection(Node* start_node, int start_offset, Node* en if (!nodeTQTag) return; bool specialTagInsertion = false; - TQPtrList qTagList = nodeTQTag->tqparents(); + TQPtrList qTagList = nodeTQTag->parents(); TQTag* qTag = 0; for (qTag = qTagList.first(); qTag; qTag = qTagList.next()) { @@ -1248,15 +1248,15 @@ void TagAction::deapplyTagInSelection(Node* start_node, int start_offset, Node* Node* common_parent_start_child = kafkaCommon::getCommonParentChild(start_node, tag_parent); Node* common_parent_end_child = kafkaCommon::getCommonParentChild(end_node, tag_parent); - Node* tqparent_of_tag_parent = tag_parent->tqparent; + Node* parent_of_tag_parent = tag_parent->tqparent; if(common_parent_end_child == common_parent_start_child) common_parent_end_child = 0; if(!common_parent_start_child) common_parent_start_child = kafkaCommon::getCommonParentChild(start_node, commonParent); - kafkaCommon::moveNode(common_parent_start_child, tqparent_of_tag_parent, tag_parent, selection, modifs, true, true); + kafkaCommon::moveNode(common_parent_start_child, parent_of_tag_parent, tag_parent, selection, modifs, true, true); if(common_parent_end_child) - kafkaCommon::moveNode(common_parent_end_child, tqparent_of_tag_parent, tag_parent, selection, modifs, true, true); + kafkaCommon::moveNode(common_parent_end_child, parent_of_tag_parent, tag_parent, selection, modifs, true, true); // Remove tag_parent node subtree if empty if(!tag_parent->hasChildNodes()) diff --git a/quanta/utility/tagaction.h b/quanta/utility/tagaction.h index d940faf7..1f114a81 100644 --- a/quanta/utility/tagaction.h +++ b/quanta/utility/tagaction.h @@ -55,7 +55,7 @@ public: * @param toggle If set to true, the class behaves like a KToggleAction; * Else it behaves like a KAction. This avoids the multi-inheritance problem. */ - TagAction(TQDomElement *element, KMainWindow *tqparentMainWindow, bool toggle = false); + TagAction(TQDomElement *element, KMainWindow *parentMainWindow, bool toggle = false); virtual ~TagAction(); TQDomElement data() const { return tag; } diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp index dc994716..7d85aaba 100644 --- a/quanta/utility/tagactionset.cpp +++ b/quanta/utility/tagactionset.cpp @@ -47,7 +47,7 @@ TagActionSetAbstract::TagActionSetAbstract(TQObject *tqparent, const char *name) TagActionSetAbstract::~TagActionSetAbstract() {} -Node* TagActionSetAbstract::tqparentTag(Node* node, TQString const& tagName) +Node* TagActionSetAbstract::parentTag(Node* node, TQString const& tagName) { Q_ASSERT(node); @@ -221,14 +221,14 @@ bool TagActionSet::isInDivArea() const { Q_ASSERT(m_currentNode); - return tqparentTag(m_currentNode, "div"); + return parentTag(m_currentNode, "div"); } void TagActionSet::slotCopyDivElement() { Q_ASSERT(m_currentNode); - Node* divNode = tqparentTag(m_currentNode, "div"); + Node* divNode = parentTag(m_currentNode, "div"); Q_ASSERT(divNode); Node* divClosingNode = divNode->getClosingNode(); @@ -245,7 +245,7 @@ void TagActionSet::slotCutDivElement() { Q_ASSERT(m_currentNode); - Node* divNode = tqparentTag(m_currentNode, "div"); + Node* divNode = parentTag(m_currentNode, "div"); Q_ASSERT(divNode); Node* divClosingNode = divNode->getClosingNode(); @@ -274,7 +274,7 @@ TableTagActionSet::TableTagActionSet(TQObject *tqparent, const char *name) bool TableTagActionSet::isInTagContext() const { - return tqparentTag(m_currentNode, "table"); + return parentTag(m_currentNode, "table"); } void TableTagActionSet::initActionMenus(TQWidget* widget) @@ -575,14 +575,14 @@ void TableTagActionSet::slotInsertTable() bool TableTagActionSet::canInsertRowAbove() const { - return isInTagContext() && tqparentTag(m_currentNode, "tbody"); + return isInTagContext() && parentTag(m_currentNode, "tbody"); } void TableTagActionSet::slotInsertRowAbove() { Q_ASSERT(m_currentNode); - Node* nearRow = tqparentTag(m_currentNode, "tr"); + Node* nearRow = parentTag(m_currentNode, "tr"); if(!nearRow) return; @@ -610,11 +610,11 @@ void TableTagActionSet::slotInsertRowBelow() Q_ASSERT(m_currentNode); Node* nearRow = 0; - Node* aux = tqparentTag(m_currentNode, "thead"); + Node* aux = parentTag(m_currentNode, "thead"); if(aux) nearRow= firstChildTag(tableStart(), "tr"); else - nearRow = tqparentTag(m_currentNode, "tr"); + nearRow = parentTag(m_currentNode, "tr"); if(!nearRow) return; @@ -781,7 +781,7 @@ void TableTagActionSet::slotRemoveRows() if(!selection.hasSelection()) { - Node* nearTr = tqparentTag(m_currentNode, "tr"); + Node* nearTr = parentTag(m_currentNode, "tr"); kafkaCommon::extractAndDeleteNode(nearTr, modifs, true, true); } else @@ -789,8 +789,8 @@ void TableTagActionSet::slotRemoveRows() Node* startSelection = kafkaCommon::getNodeFromLocation(selection.cursorNode()); Node* endSelection = kafkaCommon::getNodeFromLocation(selection.cursorNodeEndSel()); - Node* startTr = tqparentTag(startSelection, "tr"); - Node* endTr = tqparentTag(endSelection, "tr"); + Node* startTr = parentTag(startSelection, "tr"); + Node* endTr = parentTag(endSelection, "tr"); Node* iteratorNode = startTr; bool loop(true); @@ -844,7 +844,7 @@ void TableTagActionSet::slotRemoveColumns() if(startColumnIndex == -1 || endColumnIndex == -1) return; - m_currentNode = tqparentTag(m_currentNode, "tbody"); // m_currentNode will become invalid + m_currentNode = parentTag(m_currentNode, "tbody"); // m_currentNode will become invalid for(int i = 0; i != numberOfColumnsSelected; ++i) removeColumn(startColumnIndex, modifs); } @@ -880,9 +880,9 @@ void TableTagActionSet::slotRemoveCellsContent() if(!selection.hasSelection()) { Node* aux = m_currentNode; - m_currentNode = tqparentTag(m_currentNode, "tbody"); + m_currentNode = parentTag(m_currentNode, "tbody"); - Node* nearTd = tqparentTag(aux, "td"); + Node* nearTd = parentTag(aux, "td"); clearCellContents(nearTd, modifs); } else @@ -890,8 +890,8 @@ void TableTagActionSet::slotRemoveCellsContent() Node* startSelection = kafkaCommon::getNodeFromLocation(selection.cursorNode()); Node* endSelection = kafkaCommon::getNodeFromLocation(selection.cursorNodeEndSel()); - Node* startTd = tqparentTag(startSelection, "td"); - Node* endTd = tqparentTag(endSelection, "td"); + Node* startTd = parentTag(startSelection, "td"); + Node* endTd = parentTag(endSelection, "td"); if(!startTd || !endTd) return; @@ -933,8 +933,8 @@ void TableTagActionSet::slotMergeSelectedCells() Node* startSelection = kafkaCommon::getNodeFromLocation(selection.cursorNode()); Node* endSelection = kafkaCommon::getNodeFromLocation(selection.cursorNodeEndSel()); - Node* startTd = tqparentTag(startSelection, "td"); - Node* endTd = tqparentTag(endSelection, "td"); + Node* startTd = parentTag(startSelection, "td"); + Node* endTd = parentTag(endSelection, "td"); Node* nodeIterator = startTd->SNext(); Node* stopNode = endTd->SNext(); @@ -975,7 +975,7 @@ Node* TableTagActionSet::tableStart() const Q_ASSERT(isInTagContext()); Q_ASSERT(m_currentNode); - return tqparentTag(m_currentNode, "table"); + return parentTag(m_currentNode, "table"); } int TableTagActionSet::numberOfColumns() const @@ -1004,7 +1004,7 @@ int TableTagActionSet::numberOfColumns() const int TableTagActionSet::currentColumnIndex() const { return columnIndex(m_currentNode); -/* Node* nearTd = tqparentTag(m_currentNode, "td"); +/* Node* nearTd = parentTag(m_currentNode, "td"); if(!nearTd) return -1; @@ -1012,7 +1012,7 @@ int TableTagActionSet::currentColumnIndex() const if(!_tableStart) return -1; - Node* firstTd = firstChildTag(tqparentTag(m_currentNode, "tr"), "td"); + Node* firstTd = firstChildTag(parentTag(m_currentNode, "tr"), "td"); //Node* firstTd = firstChildTag(_tableStart, "td"); if(!firstTd) return -1; @@ -1032,7 +1032,7 @@ int TableTagActionSet::currentColumnIndex() const int TableTagActionSet::columnIndex(Node* node) const { - Node* nearTd = tqparentTag(node, "td"); + Node* nearTd = parentTag(node, "td"); if(!nearTd) return -1; @@ -1040,7 +1040,7 @@ int TableTagActionSet::columnIndex(Node* node) const if(!_tableStart) return -1; - Node* firstTd = firstChildTag(tqparentTag(node, "tr"), "td"); + Node* firstTd = firstChildTag(parentTag(node, "tr"), "td"); if(!firstTd) return -1; diff --git a/quanta/utility/tagactionset.h b/quanta/utility/tagactionset.h index 5b813acb..ad51a917 100644 --- a/quanta/utility/tagactionset.h +++ b/quanta/utility/tagactionset.h @@ -45,7 +45,7 @@ public: DOM::Node const& currentDomNode() const {return m_currentDomNode;} - static Node* tqparentTag(Node* node, TQString const& tagName); + static Node* parentTag(Node* node, TQString const& tagName); static Node* firstChildTag(Node* node, TQString const& tagName); virtual bool isInTagContext(/*DOM::Node const& node*/) const = 0; diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp index cd3ac37e..90602623 100644 --- a/quanta/utility/toolbartabwidget.cpp +++ b/quanta/utility/toolbartabwidget.cpp @@ -65,9 +65,9 @@ ToolbarTabWidget::ToolbarTabWidget(TQWidget * tqparent, const char * name, WFlag void ToolbarTabWidget::insertTab(TQWidget *child, const TQString &label, const TQString &id) { - if (child->inherits("KToolBar") && child->tqparentWidget()) + if (child->inherits("KToolBar") && child->parentWidget()) { - TQTabWidget::insertTab(child->tqparentWidget(), label); + TQTabWidget::insertTab(child->parentWidget(), label); toolbarList.insert(id, child); } } @@ -78,7 +78,7 @@ TQWidget* ToolbarTabWidget::page(int index) for (TQMap::Iterator it = toolbarList.begin(); it != toolbarList.end(); ++it) { - if (it.data()->tqparentWidget() == w) + if (it.data()->parentWidget() == w) { w = *it; break; @@ -92,7 +92,7 @@ TQString ToolbarTabWidget::id(TQWidget *w) const TQString idStr; for (TQMap::ConstIterator it = toolbarList.constBegin(); it != toolbarList.constEnd(); ++it) { - if (it.data()->tqparentWidget() == w) + if (it.data()->parentWidget() == w) { idStr = it.key(); break; @@ -107,7 +107,7 @@ TQString ToolbarTabWidget::id(int index) const TQString idStr; for (TQMap::ConstIterator it = toolbarList.constBegin(); it != toolbarList.constEnd(); ++it) { - if (it.data()->tqparentWidget() == w) + if (it.data()->parentWidget() == w) { idStr = it.key(); break; @@ -124,7 +124,7 @@ TQWidget* ToolbarTabWidget::page(const TQString& id) void ToolbarTabWidget::removePage(TQWidget * w) { - TQWidget *tqparent = w->tqparentWidget(); + TQWidget *tqparent = w->parentWidget(); if (w->inherits("KToolBar") && tqparent) { TQTabWidget::removePage(tqparent); @@ -179,7 +179,7 @@ void ToolbarTabWidget::mousePressEvent ( TQMouseEvent * e ) pageW = currentPage(); for (TQMap::Iterator it = toolbarList.begin(); it != toolbarList.end(); ++it) { - if (it.data()->tqparentWidget() == pageW) + if (it.data()->parentWidget() == pageW) { tabUnderMouse = it.key(); break; @@ -227,7 +227,7 @@ QuantaToolBar::QuantaToolBar(TQWidget *tqparent, const char *name, bool honor_st :KToolBar (tqparent, name=0, honor_style, readConfig) { m_popupMenu = new KPopupMenu(this); - m_toolbarTab = dynamic_cast(tqparent->tqparentWidget()); + m_toolbarTab = dynamic_cast(tqparent->parentWidget()); currentActionName = ""; m_iconTextMenu = new KPopupMenu(this); m_iconTextMenu->setCheckable(true); @@ -311,7 +311,7 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e) for (uint i = 0; i < tqchildrenList->count(); i++) { KToolBarButton *w = static_cast(TQT_TQWIDGET(tqchildrenList->at(i))); - TQPoint p1 = w->tqparentWidget()->mapToGlobal(w->pos()); + TQPoint p1 = w->parentWidget()->mapToGlobal(w->pos()); TQPoint p2 = TQPoint(p1.x() + w->width(), p1.y()+w->height()); if (TQRect(p1, p2).tqcontains(p)) { -- cgit v1.2.1