summaryrefslogtreecommitdiffstats
path: root/quanta/utility
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit6c79d50fa9fbdff7f69ca57a8ab5fcc942375593 (patch)
treef47737d56c3239a0d8bc600674f0ca04b6e30d6e /quanta/utility
parent36c36b53a129509d56fdaa0a7c9fcbcacd0c5826 (diff)
downloadtdewebdev-6c79d50fa9fbdff7f69ca57a8ab5fcc942375593.tar.gz
tdewebdev-6c79d50fa9fbdff7f69ca57a8ab5fcc942375593.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'quanta/utility')
-rw-r--r--quanta/utility/qpevents.cpp4
-rw-r--r--quanta/utility/qpevents.h6
-rw-r--r--quanta/utility/quantabookmarks.cpp6
-rw-r--r--quanta/utility/quantabookmarks.h2
-rw-r--r--quanta/utility/quantacommon.cpp2
-rw-r--r--quanta/utility/tagaction.cpp12
-rw-r--r--quanta/utility/tagactionmanager.cpp10
-rw-r--r--quanta/utility/tagactionmanager.h2
-rw-r--r--quanta/utility/tagactionset.cpp24
-rw-r--r--quanta/utility/tagactionset.h12
-rw-r--r--quanta/utility/toolbartabwidget.cpp32
-rw-r--r--quanta/utility/toolbartabwidget.h8
12 files changed, 60 insertions, 60 deletions
diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp
index f41384c1..b4d43f48 100644
--- a/quanta/utility/qpevents.cpp
+++ b/quanta/utility/qpevents.cpp
@@ -36,8 +36,8 @@
#include "tagaction.h"
//TODO: Better create a class for each internal event action
-QPEvents::QPEvents(TQObject *tqparent, const char *name)
- : TQObject(tqparent, name)
+QPEvents::QPEvents(TQObject *parent, const char *name)
+ : TQObject(parent, name)
{
m_eventNames["before_save"] = i18n("Before Document Save");
m_eventNames["after_save"] = i18n("After Document Save");
diff --git a/quanta/utility/qpevents.h b/quanta/utility/qpevents.h
index b46770ef..6d7372a2 100644
--- a/quanta/utility/qpevents.h
+++ b/quanta/utility/qpevents.h
@@ -55,10 +55,10 @@ class QPEvents : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- static QPEvents* const ref(TQObject *tqparent = 0L)
+ static QPEvents* const ref(TQObject *parent = 0L)
{
static QPEvents *m_ref;
- if (!m_ref) m_ref = new QPEvents(tqparent);
+ if (!m_ref) m_ref = new QPEvents(parent);
return m_ref;
}
~QPEvents();
@@ -74,7 +74,7 @@ public slots:
void slotEventHappened(const TQString& name, const TQString& argument1, const TQString& argument2);
private:
- QPEvents(TQObject *tqparent = 0, const char *name = 0);
+ QPEvents(TQObject *parent = 0, const char *name = 0);
/** Calls the action associated with an event. Returns true if the call succeeded, false
otherwise. The call might fail if:
- the action type is unknown
diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp
index ad0f3327..3208a874 100644
--- a/quanta/utility/quantabookmarks.cpp
+++ b/quanta/utility/quantabookmarks.cpp
@@ -61,12 +61,12 @@ static void ssort( TQMemArray<uint> &a, int max )
// TODO add a insort() or bubble_sort - more efficient for aboutToShow() ?
-QuantaBookmarks::QuantaBookmarks(ViewManager *tqparent,Sorting sort, bool onlyFromActualDocument )
- : TQObject( tqparent, "bookmarks" )
+QuantaBookmarks::QuantaBookmarks(ViewManager *parent,Sorting sort, bool onlyFromActualDocument )
+ : TQObject( parent, "bookmarks" )
, m_sorting(sort)
, m_onlyFromActualDocument(onlyFromActualDocument)
{
- m_viewManager = tqparent;
+ m_viewManager = parent;
_tries=0;
m_bookmarksMenu = 0L;
m_doc = 0L;
diff --git a/quanta/utility/quantabookmarks.h b/quanta/utility/quantabookmarks.h
index a613aa9c..fa9f00cd 100644
--- a/quanta/utility/quantabookmarks.h
+++ b/quanta/utility/quantabookmarks.h
@@ -47,7 +47,7 @@ class QuantaBookmarks : public TQObject
public:
enum Sorting { Position, Creation };
- QuantaBookmarks(ViewManager *tqparent, Sorting sort=Position, bool onlyFromActualDocument = false );
+ QuantaBookmarks(ViewManager *parent, Sorting sort=Position, bool onlyFromActualDocument = false );
virtual ~QuantaBookmarks();
void createActions( KActionCollection* );
diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp
index bc279dc9..e50e55da 100644
--- a/quanta/utility/quantacommon.cpp
+++ b/quanta/utility/quantacommon.cpp
@@ -381,7 +381,7 @@ TQString QuantaCommon::qUrl(const KURL &url)
/** No descriptions */
void QuantaCommon::dirCreationError(TQWidget *widget, const KURL& url)
{
- KMessageBox::error(widget, i18n("<qt>Cannot create folder<br><b>%1</b>.<br>Check that you have write permission in the tqparent folder or that the connection to<br><b>%2</b><br> is valid.</qt>")
+ KMessageBox::error(widget, i18n("<qt>Cannot create folder<br><b>%1</b>.<br>Check that you have write permission in the parent folder or that the connection to<br><b>%2</b><br> is valid.</qt>")
.tqarg(url.prettyURL(0, KURL::StripFileProtocol))
.tqarg(url.protocol()+"://"+url.user()+"@"+url.host()));}
diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp
index a4a58a43..4a559962 100644
--- a/quanta/utility/tagaction.cpp
+++ b/quanta/utility/tagaction.cpp
@@ -1055,11 +1055,11 @@ void TagAction::applyTagInSelection(Node* start_node, int start_offset, Node* en
Node* nodeCursor = start_node;
Node* nodeParent = start_node;
if (nodeParent->tag->type == Tag::Text)
- nodeParent = nodeParent->tqparent;
+ nodeParent = nodeParent->parent;
- //Checking if at least one tqparent of node can have a Text Node as child, otherwise
+ //Checking if at least one parent of node can have a Text Node as child, otherwise
//it is impossible for the
- //user to add this node. In that case, try to insert the Node in the closest tqparent accepting it.
+ //user to add this node. In that case, try to insert the Node in the closest parent accepting it.
//e.g. TR : a normal insertion would require to have the caret in the TABLE Node, but it is
//impossible
TQTag* nodeTQTag = QuantaCommon::tagFromDTD(w->defaultDTD(), node->tag->name);
@@ -1080,7 +1080,7 @@ void TagAction::applyTagInSelection(Node* start_node, int start_offset, Node* en
if (specialTagInsertion) // Attention: not smartTagInsertion
{
- //let's try to insert this node in the closest tqparent accepting it.
+ //let's try to insert this node in the closest parent accepting it.
while (nodeParent)
{
TQTag* nodeParentTQTag = QuantaCommon::tagFromDTD(w->defaultDTD(), nodeParent->tag->name);
@@ -1092,7 +1092,7 @@ void TagAction::applyTagInSelection(Node* start_node, int start_offset, Node* en
nodeTreeModified = true;
break;
}
- nodeParent = nodeParent->tqparent;
+ nodeParent = nodeParent->parent;
}
}
else if(!nodeTQTag->isSingle())
@@ -1248,7 +1248,7 @@ 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* parent_of_tag_parent = tag_parent->tqparent;
+ Node* parent_of_tag_parent = tag_parent->parent;
if(common_parent_end_child == common_parent_start_child)
common_parent_end_child = 0;
if(!common_parent_start_child)
diff --git a/quanta/utility/tagactionmanager.cpp b/quanta/utility/tagactionmanager.cpp
index 88eb0d08..3733aaaf 100644
--- a/quanta/utility/tagactionmanager.cpp
+++ b/quanta/utility/tagactionmanager.cpp
@@ -54,18 +54,18 @@ TagActionManager* TagActionManager::self()
return s_mSelf;
}
-void TagActionManager::initActions(TQWidget* tqparent)
+void TagActionManager::initActions(TQWidget* parent)
{
- Q_ASSERT(tqparent);
+ Q_ASSERT(parent);
- m_actionCollection = new KActionCollection(tqparent);
+ m_actionCollection = new KActionCollection(parent);
TagActionSet* general(new TagActionSet());
- general->initActions(tqparent);
+ general->initActions(parent);
m_tagActionSets.append(general);
TableTagActionSet* table(new TableTagActionSet());
- table->initActions(tqparent);
+ table->initActions(parent);
m_tagActionSets.append(table);
}
diff --git a/quanta/utility/tagactionmanager.h b/quanta/utility/tagactionmanager.h
index 77f7ad23..0977d32c 100644
--- a/quanta/utility/tagactionmanager.h
+++ b/quanta/utility/tagactionmanager.h
@@ -62,7 +62,7 @@ private:
TagActionManager(TagActionManager const&)
{}
- void initActions(TQWidget* tqparent);
+ void initActions(TQWidget* parent);
private:
static TagActionManager* s_mSelf;
diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp
index 7d85aaba..d74a2ca9 100644
--- a/quanta/utility/tagactionset.cpp
+++ b/quanta/utility/tagactionset.cpp
@@ -40,8 +40,8 @@
#include "resource.h"
-TagActionSetAbstract::TagActionSetAbstract(TQObject *tqparent, const char *name)
- : TQObject(tqparent, name), m_currentNode(0)
+TagActionSetAbstract::TagActionSetAbstract(TQObject *parent, const char *name)
+ : TQObject(parent, name), m_currentNode(0)
{}
TagActionSetAbstract::~TagActionSetAbstract()
@@ -53,7 +53,7 @@ Node* TagActionSetAbstract::parentTag(Node* node, TQString const& tagName)
Node* aux = node;
while(aux && aux->nodeName().lower() != tagName)
- aux = aux->tqparent;
+ aux = aux->parent;
return aux;
}
@@ -81,8 +81,8 @@ bool TagActionSetAbstract::fillWithTagActions(TQWidget* /*widget*/, DOM::Node co
//_____________________________________________________________________________
-TagActionSet::TagActionSet(TQObject *tqparent, const char *name)
- : TagActionSetAbstract(tqparent, name), m_separator(0)
+TagActionSet::TagActionSet(TQObject *parent, const char *name)
+ : TagActionSetAbstract(parent, name), m_separator(0)
{
m_separator = new KActionSeparator();
}
@@ -96,7 +96,7 @@ void TagActionSet::initActionMenus(TQWidget* /*widget*/)
{
}
-void TagActionSet::initActions(TQWidget* /*tqparent*/)
+void TagActionSet::initActions(TQWidget* /*parent*/)
{
KActionCollection* ac(TagActionManager::self()->actionCollection());
@@ -266,8 +266,8 @@ void TagActionSet::slotCutDivElement()
//_____________________________________________________________________________
-TableTagActionSet::TableTagActionSet(TQObject *tqparent, const char *name)
- : TagActionSetAbstract(tqparent, name), m_separator(0), m_tableActionMenu_0(0), m_insertActionMenu_1(0)
+TableTagActionSet::TableTagActionSet(TQObject *parent, const char *name)
+ : TagActionSetAbstract(parent, name), m_separator(0), m_tableActionMenu_0(0), m_insertActionMenu_1(0)
{
m_separator = new KActionSeparator();
}
@@ -287,10 +287,10 @@ void TableTagActionSet::initActionMenus(TQWidget* widget)
}
-void TableTagActionSet::initActions(TQWidget* tqparent)
+void TableTagActionSet::initActions(TQWidget* parent)
{
if(!m_tableActionMenu_0)
- initActionMenus(tqparent);
+ initActionMenus(parent);
KActionCollection* ac(TagActionManager::self()->actionCollection());
@@ -587,7 +587,7 @@ void TableTagActionSet::slotInsertRowAbove()
if(!nearRow)
return;
- Node* nodeParent= nearRow->tqparent;
+ Node* nodeParent= nearRow->parent;
QuantaView* view = ViewManager::ref()->activeView();
NodeModifsSet *modifs = new NodeModifsSet();
@@ -619,7 +619,7 @@ void TableTagActionSet::slotInsertRowBelow()
if(!nearRow)
return;
- Node* nodeParent= nearRow->tqparent;
+ Node* nodeParent= nearRow->parent;
Node* nextSibling = nearRow->SNext();
QuantaView* view = ViewManager::ref()->activeView();
diff --git a/quanta/utility/tagactionset.h b/quanta/utility/tagactionset.h
index ad51a917..49d49b6a 100644
--- a/quanta/utility/tagactionset.h
+++ b/quanta/utility/tagactionset.h
@@ -40,7 +40,7 @@ class TagActionSetAbstract : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- TagActionSetAbstract(TQObject *tqparent = 0, const char *name = 0);
+ TagActionSetAbstract(TQObject *parent = 0, const char *name = 0);
virtual ~TagActionSetAbstract();
DOM::Node const& currentDomNode() const {return m_currentDomNode;}
@@ -49,7 +49,7 @@ public:
static Node* firstChildTag(Node* node, TQString const& tagName);
virtual bool isInTagContext(/*DOM::Node const& node*/) const = 0;
- virtual void initActions(TQWidget* tqparent) = 0;
+ virtual void initActions(TQWidget* parent) = 0;
virtual bool fillWithTagActions(TQWidget* widget, DOM::Node const& node);
virtual void unplugAllActions(TQWidget* widget) const = 0;
@@ -69,11 +69,11 @@ class TagActionSet : public TagActionSetAbstract
Q_OBJECT
TQ_OBJECT
public:
- TagActionSet(TQObject *tqparent = 0, const char *name = 0);
+ TagActionSet(TQObject *parent = 0, const char *name = 0);
virtual ~TagActionSet() {}
virtual bool isInTagContext() const;
- virtual void initActions(TQWidget* tqparent);
+ virtual void initActions(TQWidget* parent);
virtual bool fillWithTagActions(TQWidget* widget, DOM::Node const& node);
virtual void unplugAllActions(TQWidget* widget) const;
@@ -98,12 +98,12 @@ class TableTagActionSet : public TagActionSetAbstract
Q_OBJECT
TQ_OBJECT
public:
- TableTagActionSet(TQObject *tqparent = 0, const char *name = 0);
+ TableTagActionSet(TQObject *parent = 0, const char *name = 0);
virtual ~TableTagActionSet()
{}
virtual bool isInTagContext(/*DOM::Node const& node*/) const;
- virtual void initActions(TQWidget* tqparent);
+ virtual void initActions(TQWidget* parent);
virtual bool fillWithTagActions(TQWidget* widget, DOM::Node const& node);
virtual void unplugAllActions(TQWidget* widget) const;
diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp
index d519faf3..05061762 100644
--- a/quanta/utility/toolbartabwidget.cpp
+++ b/quanta/utility/toolbartabwidget.cpp
@@ -38,28 +38,28 @@
//app includes
#include "toolbartabwidget.h"
-ToolbarTabWidget::ToolbarTabWidget(TQWidget * tqparent, const char * name, WFlags f)
-:TQTabWidget(tqparent, name, f)
+ToolbarTabWidget::ToolbarTabWidget(TQWidget * parent, const char * name, WFlags f)
+:TQTabWidget(parent, name, f)
{
m_popupMenu = new KPopupMenu(this);
m_popupMenu->insertTitle(i18n("Toolbar Menu"), 1);
- m_popupMenu->insertItem(i18n("New Action..."), tqparent, TQT_SLOT(slotNewAction()));
+ m_popupMenu->insertItem(i18n("New Action..."), parent, TQT_SLOT(slotNewAction()));
m_popupMenu->insertSeparator();
- m_popupMenu->insertItem(i18n("New Toolbar..."), tqparent, TQT_SLOT(slotAddToolbar()));
+ m_popupMenu->insertItem(i18n("New Toolbar..."), parent, TQT_SLOT(slotAddToolbar()));
m_popupMenu->insertItem(i18n("Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar()));
m_popupMenu->insertItem(i18n("Rename Toolbar..."), this, TQT_SLOT(slotRenameToolbar()));
m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), this, TQT_SLOT(slotEditToolbar()));
connect(this, TQT_SIGNAL(removeToolbar(const TQString&)),
- tqparent, TQT_SLOT(slotRemoveToolbar(const TQString&)));
+ parent, TQT_SLOT(slotRemoveToolbar(const TQString&)));
connect(this, TQT_SIGNAL(renameToolbar(const TQString&)),
- tqparent, TQT_SLOT(slotRenameToolbar(const TQString&)));
+ parent, TQT_SLOT(slotRenameToolbar(const TQString&)));
connect(this, TQT_SIGNAL(editToolbar(const TQString&)),
- tqparent, TQT_SLOT(slotConfigureToolbars(const TQString&)));
+ parent, TQT_SLOT(slotConfigureToolbars(const TQString&)));
connect(this, TQT_SIGNAL(newAction()),
- tqparent, TQT_SLOT(slotNewAction()));
+ parent, TQT_SLOT(slotNewAction()));
connect(this, TQT_SIGNAL(addToolbar()),
- tqparent, TQT_SLOT(slotAddToolbar()));
+ parent, TQT_SLOT(slotAddToolbar()));
KAcceleratorManager::setNoAccel(this);
}
@@ -124,10 +124,10 @@ TQWidget* ToolbarTabWidget::page(const TQString& id)
void ToolbarTabWidget::removePage(TQWidget * w)
{
- TQWidget *tqparent = w->parentWidget();
- if (w->inherits("KToolBar") && tqparent)
+ TQWidget *parent = w->parentWidget();
+ if (w->inherits("KToolBar") && parent)
{
- TQTabWidget::removePage(tqparent);
+ TQTabWidget::removePage(parent);
for (TQMap<TQString, TQWidget*>::ConstIterator it = toolbarList.constBegin(); it != toolbarList.constEnd(); ++it)
{
if (it.data() == w)
@@ -136,7 +136,7 @@ void ToolbarTabWidget::removePage(TQWidget * w)
break;
}
}
- delete tqparent;
+ delete parent;
}
}
@@ -223,11 +223,11 @@ int ToolbarTabWidget::tabHeight() const
}
-QuantaToolBar::QuantaToolBar(TQWidget *tqparent, const char *name, bool honor_style, bool readConfig)
-:KToolBar (tqparent, name=0, honor_style, readConfig)
+QuantaToolBar::QuantaToolBar(TQWidget *parent, const char *name, bool honor_style, bool readConfig)
+:KToolBar (parent, name=0, honor_style, readConfig)
{
m_popupMenu = new KPopupMenu(this);
- m_toolbarTab = dynamic_cast<ToolbarTabWidget*>(tqparent->parentWidget());
+ m_toolbarTab = dynamic_cast<ToolbarTabWidget*>(parent->parentWidget());
currentActionName = "";
m_iconTextMenu = new KPopupMenu(this);
m_iconTextMenu->setCheckable(true);
diff --git a/quanta/utility/toolbartabwidget.h b/quanta/utility/toolbartabwidget.h
index 11318394..7fd47031 100644
--- a/quanta/utility/toolbartabwidget.h
+++ b/quanta/utility/toolbartabwidget.h
@@ -31,10 +31,10 @@ class ToolbarTabWidget: public TQTabWidget
public:
TQWidgetStack *m_widgetStack;
- static ToolbarTabWidget* const ref(TQWidget *tqparent = 0L, const char *name = 0L)
+ static ToolbarTabWidget* const ref(TQWidget *parent = 0L, const char *name = 0L)
{
static ToolbarTabWidget *m_ref;
- if (!m_ref) m_ref = new ToolbarTabWidget (tqparent, name);
+ if (!m_ref) m_ref = new ToolbarTabWidget (parent, name);
return m_ref;
}
virtual ~ToolbarTabWidget(){};
@@ -77,7 +77,7 @@ protected:
TQMap<TQString, TQWidget*> toolbarList;
private:
- ToolbarTabWidget(TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0);
+ ToolbarTabWidget(TQWidget * parent = 0, const char * name = 0, WFlags f = 0);
KToolBar::IconText m_iconText;
};
@@ -88,7 +88,7 @@ class QuantaToolBar: public KToolBar
TQ_OBJECT
public:
- QuantaToolBar (TQWidget *tqparent, const char *name=0, bool honor_style=FALSE, bool readConfig=TRUE);
+ QuantaToolBar (TQWidget *parent, const char *name=0, bool honor_style=FALSE, bool readConfig=TRUE);
virtual ~QuantaToolBar() {};
private slots: