summaryrefslogtreecommitdiffstats
path: root/akregator
diff options
context:
space:
mode:
Diffstat (limited to 'akregator')
-rw-r--r--akregator/src/actionmanager.cpp2
-rw-r--r--akregator/src/actionmanager.h2
-rw-r--r--akregator/src/actionmanagerimpl.cpp4
-rw-r--r--akregator/src/actionmanagerimpl.h2
-rw-r--r--akregator/src/addfeeddialog.cpp8
-rw-r--r--akregator/src/addfeeddialog.h4
-rw-r--r--akregator/src/akregator_part.cpp4
-rw-r--r--akregator/src/akregator_part.h2
-rw-r--r--akregator/src/akregator_view.cpp56
-rw-r--r--akregator/src/akregator_view.h14
-rw-r--r--akregator/src/articlelistview.cpp18
-rw-r--r--akregator/src/articlelistview.h2
-rw-r--r--akregator/src/articleviewer.cpp4
-rw-r--r--akregator/src/articleviewer.h2
-rw-r--r--akregator/src/configdialog.cpp2
-rw-r--r--akregator/src/configdialog.h2
-rw-r--r--akregator/src/feed.cpp8
-rw-r--r--akregator/src/feed.h2
-rw-r--r--akregator/src/feediconmanager.cpp4
-rw-r--r--akregator/src/feeditem.cpp8
-rw-r--r--akregator/src/feeditem.h8
-rw-r--r--akregator/src/feedlist.cpp18
-rw-r--r--akregator/src/feedlist.h6
-rw-r--r--akregator/src/feedlistview.cpp68
-rw-r--r--akregator/src/feedlistview.h12
-rw-r--r--akregator/src/fetchqueue.cpp2
-rw-r--r--akregator/src/fetchqueue.h2
-rw-r--r--akregator/src/folder.cpp8
-rw-r--r--akregator/src/folder.h6
-rw-r--r--akregator/src/folderitem.cpp8
-rw-r--r--akregator/src/folderitem.h8
-rw-r--r--akregator/src/frame.cpp4
-rw-r--r--akregator/src/frame.h2
-rw-r--r--akregator/src/librss/article.cpp4
-rw-r--r--akregator/src/librss/article.h4
-rw-r--r--akregator/src/librss/document.cpp2
-rw-r--r--akregator/src/librss/tools_p.cpp12
-rw-r--r--akregator/src/librss/tools_p.h6
-rw-r--r--akregator/src/listtabwidget.cpp2
-rw-r--r--akregator/src/listtabwidget.h4
-rw-r--r--akregator/src/mk4storage/metakit/CHANGES2
-rw-r--r--akregator/src/mk4storage/metakit/src/column.cpp6
-rw-r--r--akregator/src/mk4storage/metakit/src/custom.cpp128
-rw-r--r--akregator/src/mk4storage/metakit/src/handler.cpp18
-rw-r--r--akregator/src/mk4storage/metakit/src/handler.h2
-rw-r--r--akregator/src/mk4storage/metakit/src/handler.inl2
-rw-r--r--akregator/src/mk4storage/metakit/src/remap.cpp12
-rw-r--r--akregator/src/mk4storage/metakit/tests/ok/f07a.txt2
-rw-r--r--akregator/src/mk4storage/metakit/tests/tformat.cpp2
-rw-r--r--akregator/src/nodelist.cpp8
-rw-r--r--akregator/src/nodelist.h4
-rw-r--r--akregator/src/pageviewer.cpp4
-rw-r--r--akregator/src/pageviewer.h2
-rw-r--r--akregator/src/plugin.h4
-rw-r--r--akregator/src/propertiesdialog.cpp8
-rw-r--r--akregator/src/propertiesdialog.h4
-rw-r--r--akregator/src/searchbar.cpp2
-rw-r--r--akregator/src/searchbar.h2
-rw-r--r--akregator/src/settings_advanced.cpp2
-rw-r--r--akregator/src/settings_advanced.h2
-rw-r--r--akregator/src/simplenodeselector.cpp8
-rw-r--r--akregator/src/simplenodeselector.h4
-rw-r--r--akregator/src/tabwidget.cpp4
-rw-r--r--akregator/src/tabwidget.h2
-rw-r--r--akregator/src/tagaction.cpp6
-rw-r--r--akregator/src/tagaction.h2
-rw-r--r--akregator/src/tagfolder.cpp2
-rw-r--r--akregator/src/tagfolder.h2
-rw-r--r--akregator/src/tagfolderitem.cpp8
-rw-r--r--akregator/src/tagfolderitem.h8
-rw-r--r--akregator/src/tagnode.cpp6
-rw-r--r--akregator/src/tagnode.h2
-rw-r--r--akregator/src/tagnodeitem.cpp8
-rw-r--r--akregator/src/tagnodeitem.h8
-rw-r--r--akregator/src/tagnodelist.cpp6
-rw-r--r--akregator/src/tagnodelist.h2
-rw-r--r--akregator/src/tagpropertiesdialog.cpp2
-rw-r--r--akregator/src/tagpropertiesdialog.h2
-rw-r--r--akregator/src/tagset.cpp2
-rw-r--r--akregator/src/tagset.h2
-rw-r--r--akregator/src/trayicon.cpp6
-rw-r--r--akregator/src/trayicon.h2
-rw-r--r--akregator/src/treenode.cpp22
-rw-r--r--akregator/src/treenode.h14
-rw-r--r--akregator/src/treenodeitem.cpp18
-rw-r--r--akregator/src/treenodeitem.h10
-rw-r--r--akregator/src/viewer.cpp4
-rw-r--r--akregator/src/viewer.h2
88 files changed, 358 insertions, 358 deletions
diff --git a/akregator/src/actionmanager.cpp b/akregator/src/actionmanager.cpp
index 5598457aa..2dcdeb59f 100644
--- a/akregator/src/actionmanager.cpp
+++ b/akregator/src/actionmanager.cpp
@@ -43,7 +43,7 @@ void ActionManager::setInstance(ActionManager* manager)
}
-ActionManager::ActionManager(TQObject* tqparent, const char* name) : TQObject(tqparent, name), d(new ActionManagerPrivate)
+ActionManager::ActionManager(TQObject* parent, const char* name) : TQObject(parent, name), d(new ActionManagerPrivate)
{}
ActionManager::~ActionManager()
diff --git a/akregator/src/actionmanager.h b/akregator/src/actionmanager.h
index bcdba56bc..9a41c4d58 100644
--- a/akregator/src/actionmanager.h
+++ b/akregator/src/actionmanager.h
@@ -43,7 +43,7 @@ class ActionManager : public TQObject
static ActionManager* getInstance();
static void setInstance(ActionManager* manager);
- ActionManager(TQObject* tqparent=0, const char* name=0);
+ ActionManager(TQObject* parent=0, const char* name=0);
virtual ~ActionManager();
virtual KAction* action(const char* name, const char* classname=0) = 0;
diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp
index b8c946694..827d1a95e 100644
--- a/akregator/src/actionmanagerimpl.cpp
+++ b/akregator/src/actionmanagerimpl.cpp
@@ -89,7 +89,7 @@ class ActionManagerImpl::NodeSelectVisitor : public TreeNodeVisitor
{
KAction* remove = m_manager->action("feed_remove");
if (remove)
- remove->setEnabled(node->tqparent()); // root nodes must not be deleted
+ remove->setEnabled(node->parent()); // root nodes must not be deleted
KAction* hp = m_manager->action("feed_homepage");
if (hp)
hp->setEnabled(false);
@@ -222,7 +222,7 @@ void ActionManagerImpl::slotNodeSelected(TreeNode* node)
d->nodeSelectVisitor->visit(node);
}
-ActionManagerImpl::ActionManagerImpl(Part* part, TQObject* tqparent, const char* name) : ActionManager(tqparent, name), d(new ActionManagerImplPrivate)
+ActionManagerImpl::ActionManagerImpl(Part* part, TQObject* parent, const char* name) : ActionManager(parent, name), d(new ActionManagerImplPrivate)
{
d->nodeSelectVisitor = new NodeSelectVisitor(this);
d->part = part;
diff --git a/akregator/src/actionmanagerimpl.h b/akregator/src/actionmanagerimpl.h
index 398135c64..3b63ab95e 100644
--- a/akregator/src/actionmanagerimpl.h
+++ b/akregator/src/actionmanagerimpl.h
@@ -53,7 +53,7 @@ class ActionManagerImpl : public ActionManager
TQ_OBJECT
public:
- ActionManagerImpl(Part* part, TQObject* tqparent=0, const char* name=0);
+ ActionManagerImpl(Part* part, TQObject* parent=0, const char* name=0);
virtual ~ActionManagerImpl();
virtual KAction* action(const char* name, const char* classname=0);
diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp
index 591e0d619..1cca9d903 100644
--- a/akregator/src/addfeeddialog.cpp
+++ b/akregator/src/addfeeddialog.cpp
@@ -39,8 +39,8 @@
namespace Akregator {
-AddFeedWidget::AddFeedWidget(TQWidget *tqparent, const char *name)
- : AddFeedWidgetBase(tqparent, name)
+AddFeedWidget::AddFeedWidget(TQWidget *parent, const char *name)
+ : AddFeedWidgetBase(parent, name)
{
pixmapLabel1->setPixmap(kapp->iconLoader()->loadIcon( "package_network",KIcon::Desktop,KIcon::SizeHuge, KIcon::DefaultState, 0, true));
statusLabel->setText(TQString());
@@ -49,8 +49,8 @@ AddFeedWidget::AddFeedWidget(TQWidget *tqparent, const char *name)
AddFeedWidget::~AddFeedWidget()
{}
-AddFeedDialog::AddFeedDialog(TQWidget *tqparent, const char *name)
- : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, tqparent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel)
+AddFeedDialog::AddFeedDialog(TQWidget *parent, const char *name)
+ : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, parent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel)
{
widget = new AddFeedWidget(this);
connect(widget->urlEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged(const TQString&)));
diff --git a/akregator/src/addfeeddialog.h b/akregator/src/addfeeddialog.h
index 1152f3d09..113d7f2a2 100644
--- a/akregator/src/addfeeddialog.h
+++ b/akregator/src/addfeeddialog.h
@@ -43,7 +43,7 @@ namespace Akregator
Q_OBJECT
TQ_OBJECT
public:
- AddFeedWidget(TQWidget *tqparent = 0, const char *name = 0);
+ AddFeedWidget(TQWidget *parent = 0, const char *name = 0);
~AddFeedWidget();
};
@@ -52,7 +52,7 @@ namespace Akregator
Q_OBJECT
TQ_OBJECT
public:
- AddFeedDialog(TQWidget *tqparent = 0, const char *name = 0);
+ AddFeedDialog(TQWidget *parent = 0, const char *name = 0);
~AddFeedDialog();
void setURL(const TQString& t);
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index bd9f77cfe..223db5a01 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -117,9 +117,9 @@ class Part::ApplyFiltersInterceptor : public ArticleInterceptor
};
Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
- TQObject *tqparent, const char *name, const TQStringList& )
+ TQObject *parent, const char *name, const TQStringList& )
: DCOPObject("AkregatorIface")
- , MyBasePart(tqparent, name)
+ , MyBasePart(parent, name)
, m_standardListLoaded(false)
, m_shuttingDown(false)
, m_mergedPart(0)
diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h
index c60316cca..763aad84c 100644
--- a/akregator/src/akregator_part.h
+++ b/akregator/src/akregator_part.h
@@ -83,7 +83,7 @@ namespace Akregator
/** Default constructor.*/
Part(TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name, const TQStringList&);
+ TQObject *parent, const char *name, const TQStringList&);
/** Destructor. */
virtual ~Part();
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index c92e4ec26..3aa9dd2c6 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -210,8 +210,8 @@ View::~View()
kdDebug() << "View::~View(): leaving" << endl;
}
-View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, const char *name)
- : TQWidget(tqparent, name), m_viewMode(NormalView), m_actionManager(actionManager)
+View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, const char *name)
+ : TQWidget(parent, name), m_viewMode(NormalView), m_actionManager(actionManager)
{
m_editNodePropertiesVisitor = new EditNodePropertiesVisitor(this);
m_deleteNodeVisitor = new DeleteNodeVisitor(this);
@@ -533,7 +533,7 @@ bool View::importFeeds(const TQDomDocument& doc)
return true;
}
-bool View::loadFeeds(const TQDomDocument& doc, Folder* tqparent)
+bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
{
FeedList* feedList = new FeedList();
bool parsed = feedList->readFromXML(doc);
@@ -546,7 +546,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* tqparent)
}
m_feedListView->setUpdatesEnabled(false);
m_tagNodeListView->setUpdatesEnabled(false);
- if (!tqparent)
+ if (!parent)
{
TagSet* tagSet = Kernel::self()->tagSet();
@@ -578,7 +578,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* tqparent)
}
}
else
- m_feedList->append(feedList, tqparent);
+ m_feedList->append(feedList, parent);
m_feedListView->setUpdatesEnabled(true);
m_feedListView->triggerUpdate();
@@ -725,13 +725,13 @@ void View::slotMoveCurrentNodeUp()
if (!current)
return;
TreeNode* prev = current->prevSibling();
- Folder* tqparent = current->tqparent();
+ Folder* parent = current->parent();
- if (!prev || !tqparent)
+ if (!prev || !parent)
return;
- tqparent->removeChild(prev);
- tqparent->insertChild(prev, current);
+ parent->removeChild(prev);
+ parent->insertChild(prev, current);
m_listTabWidget->activeView()->ensureNodeVisible(current);
}
@@ -741,41 +741,41 @@ void View::slotMoveCurrentNodeDown()
if (!current)
return;
TreeNode* next = current->nextSibling();
- Folder* tqparent = current->tqparent();
+ Folder* parent = current->parent();
- if (!next || !tqparent)
+ if (!next || !parent)
return;
- tqparent->removeChild(current);
- tqparent->insertChild(current, next);
+ parent->removeChild(current);
+ parent->insertChild(current, next);
m_listTabWidget->activeView()->ensureNodeVisible(current);
}
void View::slotMoveCurrentNodeLeft()
{
TreeNode* current = m_listTabWidget->activeView()->selectedNode();
- if (!current || !current->tqparent() || !current->tqparent()->tqparent())
+ if (!current || !current->parent() || !current->parent()->parent())
return;
- Folder* tqparent = current->tqparent();
- Folder* grandtqparent = current->tqparent()->tqparent();
+ Folder* parent = current->parent();
+ Folder* grandparent = current->parent()->parent();
- tqparent->removeChild(current);
- grandtqparent->insertChild(current, tqparent);
+ parent->removeChild(current);
+ grandparent->insertChild(current, parent);
m_listTabWidget->activeView()->ensureNodeVisible(current);
}
void View::slotMoveCurrentNodeRight()
{
TreeNode* current = m_listTabWidget->activeView()->selectedNode();
- if (!current || !current->tqparent())
+ if (!current || !current->parent())
return;
TreeNode* prev = current->prevSibling();
if ( prev && prev->isGroup() )
{
Folder* fg = static_cast<Folder*>(prev);
- current->tqparent()->removeChild(current);
+ current->parent()->removeChild(current);
fg->appendChild(current);
m_listTabWidget->activeView()->ensureNodeVisible(current);
}
@@ -880,7 +880,7 @@ void View::slotFeedAdd()
if ( m_feedListView->selectedNode()->isGroup())
group = static_cast<Folder*>(m_feedListView->selectedNode());
else
- group= m_feedListView->selectedNode()->tqparent();
+ group= m_feedListView->selectedNode()->parent();
}
@@ -889,7 +889,7 @@ void View::slotFeedAdd()
addFeed(TQString(), lastChild, group, false);
}
-void View::addFeed(const TQString& url, TreeNode *after, Folder* tqparent, bool autoExec)
+void View::addFeed(const TQString& url, TreeNode *after, Folder* parent, bool autoExec)
{
AddFeedDialog *afd = new AddFeedDialog( 0, "add_feed" );
@@ -923,10 +923,10 @@ void View::addFeed(const TQString& url, TreeNode *after, Folder* tqparent, bool
return;
}
- if (!tqparent)
- tqparent = m_feedList->rootNode();
+ if (!parent)
+ parent = m_feedList->rootNode();
- tqparent->insertChild(feed, after);
+ parent->insertChild(feed, after);
m_feedListView->ensureNodeVisible(feed);
@@ -947,7 +947,7 @@ void View::slotFeedAddGroup()
if (!node->isGroup())
{
after = node;
- node = node->tqparent();
+ node = node->parent();
}
Folder* currentGroup = static_cast<Folder*> (node);
@@ -1272,12 +1272,12 @@ void View::slotCopyLinkAddress()
}
}
-void View::slotFeedURLDropped(KURL::List &urls, TreeNode* after, Folder* tqparent)
+void View::slotFeedURLDropped(KURL::List &urls, TreeNode* after, Folder* parent)
{
KURL::List::iterator it;
for ( it = urls.begin(); it != urls.end(); ++it )
{
- addFeed((*it).prettyURL(), after, tqparent, false);
+ addFeed((*it).prettyURL(), after, parent, false);
}
}
diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h
index 66796d428..c6e94eb09 100644
--- a/akregator/src/akregator_view.h
+++ b/akregator/src/akregator_view.h
@@ -85,11 +85,11 @@ namespace Akregator {
/** constructor
@param part the Akregator::Part which contains this widget
- @param tqparent tqparent widget
+ @param parent parent widget
@param Actionmanager for this view
@param name the name of the widget (@ref TQWidget )
*/
- View(Akregator::Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, const char* name);
+ View(Akregator::Part *part, TQWidget *parent, ActionManagerImpl* actionManager, const char* name);
/** destructor. Note that cleanups should be done in
slotOnShutdown(), so we don't risk accessing self-deleting objects after deletion. */
@@ -104,11 +104,11 @@ namespace Akregator {
@param doc the DOM tree (OPML) of the feeds to import */
bool importFeeds(const TQDomDocument& doc);
- /** Parse OPML presentation of feeds and read in articles archive, if present. If @c tqparent is @c NULL, the current
+ /** Parse OPML presentation of feeds and read in articles archive, if present. If @c parent is @c NULL, the current
feed list is replaced by the parsed one
@param doc TQDomDocument generated from OPML
- @param tqparent The tqparent group the new nodes */
- bool loadFeeds(const TQDomDocument& doc, Folder* tqparent = 0);
+ @param parent The parent group the new nodes */
+ bool loadFeeds(const TQDomDocument& doc, Folder* parent = 0);
/**
@return the displayed Feed List in OPML format
@@ -190,7 +190,7 @@ namespace Akregator {
void slotCaptionChanged(const TQString &);
/** called when URLs are dropped into the tree view */
- void slotFeedURLDropped (KURL::List &urls, TreeNode* after, Folder *tqparent);
+ void slotFeedURLDropped (KURL::List &urls, TreeNode* after, Folder *parent);
/** displays a URL in the status bar when the user moves the mouse over a link */
void slotMouseOverInfo(const KFileItem *kifi);
@@ -272,7 +272,7 @@ namespace Akregator {
protected:
- void addFeed(const TQString& url, TreeNode* after, Folder* tqparent, bool autoExec = true);
+ void addFeed(const TQString& url, TreeNode* after, Folder* parent, bool autoExec = true);
void connectToFeedList(FeedList* feedList);
void disconnectFromFeedList(FeedList* feedList);
diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp
index ecf262285..0ec644ad7 100644
--- a/akregator/src/articlelistview.cpp
+++ b/akregator/src/articlelistview.cpp
@@ -60,17 +60,17 @@ class ArticleListView::ArticleListViewPrivate
{
public:
- ArticleListViewPrivate(ArticleListView* tqparent) : m_tqparent(tqparent) { }
+ ArticleListViewPrivate(ArticleListView* parent) : m_parent(parent) { }
void ensureCurrentItemVisible()
{
- if (m_tqparent->currentItem())
+ if (m_parent->currentItem())
{
- m_tqparent->center( m_tqparent->contentsX(), m_tqparent->itemPos(m_tqparent->currentItem()), 0, 9.0 );
+ m_parent->center( m_parent->contentsX(), m_parent->itemPos(m_parent->currentItem()), 0, 9.0 );
}
}
- ArticleListView* m_tqparent;
+ ArticleListView* m_parent;
/** maps article to article item */
TQMap<Article, ArticleItem*> articleMap;
@@ -131,7 +131,7 @@ class ArticleListView::ArticleItem : public KListViewItem
friend class ArticleListView;
public:
- ArticleItem( TQListView *tqparent, const Article& a);
+ ArticleItem( TQListView *parent, const Article& a);
~ArticleItem();
Article& article();
@@ -155,8 +155,8 @@ class ArticleListView::ArticleItem : public KListViewItem
};
// FIXME: Remove resolveEntities for KDE 4.0, it's now done in the parser
-ArticleListView::ArticleItem::ArticleItem( TQListView *tqparent, const Article& a)
- : KListViewItem( tqparent, KCharsets::resolveEntities(a.title()), a.feed()->title(), KGlobal::locale()->formatDateTime(a.pubDate(), true, false) ), m_article(a), m_pubDate(a.pubDate().toTime_t())
+ArticleListView::ArticleItem::ArticleItem( TQListView *parent, const Article& a)
+ : KListViewItem( parent, KCharsets::resolveEntities(a.title()), a.feed()->title(), KGlobal::locale()->formatDateTime(a.pubDate(), true, false) ), m_article(a), m_pubDate(a.pubDate().toTime_t())
{
if (a.keep())
setPixmap(0, keepFlag());
@@ -213,8 +213,8 @@ int ArticleListView::ArticleItem::compare(TQListViewItem *i, int col, bool ascen
/* ==================================================================================== */
-ArticleListView::ArticleListView(TQWidget *tqparent, const char *name)
- : KListView(tqparent, name)
+ArticleListView::ArticleListView(TQWidget *parent, const char *name)
+ : KListView(parent, name)
{
d = new ArticleListViewPrivate(this);
d->noneSelected = true;
diff --git a/akregator/src/articlelistview.h b/akregator/src/articlelistview.h
index 5dbc08044..95fd64ad1 100644
--- a/akregator/src/articlelistview.h
+++ b/akregator/src/articlelistview.h
@@ -45,7 +45,7 @@ namespace Akregator
Q_OBJECT
TQ_OBJECT
public:
- ArticleListView(TQWidget *tqparent = 0, const char *name = 0);
+ ArticleListView(TQWidget *parent = 0, const char *name = 0);
virtual ~ArticleListView();
/** returns the current article, or a null article if there is none */
diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp
index 977abc99d..7aa745700 100644
--- a/akregator/src/articleviewer.cpp
+++ b/akregator/src/articleviewer.cpp
@@ -157,8 +157,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
ArticleViewer* m_view;
};
-ArticleViewer::ArticleViewer(TQWidget *tqparent, const char *name)
- : Viewer(tqparent, name), m_htmlFooter(), m_currentText(), m_node(0), m_viewMode(NormalView)
+ArticleViewer::ArticleViewer(TQWidget *parent, const char *name)
+ : Viewer(parent, name), m_htmlFooter(), m_currentText(), m_node(0), m_viewMode(NormalView)
{
setJScriptEnabled(false);
setJavaEnabled(false);
diff --git a/akregator/src/articleviewer.h b/akregator/src/articleviewer.h
index 7d756262a..7b0e626e7 100644
--- a/akregator/src/articleviewer.h
+++ b/akregator/src/articleviewer.h
@@ -51,7 +51,7 @@ namespace Akregator
TQ_OBJECT
public:
/** Constructor */
- ArticleViewer(TQWidget* tqparent, const char* name);
+ ArticleViewer(TQWidget* parent, const char* name);
virtual ~ArticleViewer();
virtual bool openURL(const KURL &url);
diff --git a/akregator/src/configdialog.cpp b/akregator/src/configdialog.cpp
index 76fd06c5d..4c3d43506 100644
--- a/akregator/src/configdialog.cpp
+++ b/akregator/src/configdialog.cpp
@@ -41,7 +41,7 @@
namespace Akregator
{
-ConfigDialog::ConfigDialog(TQWidget* tqparent, const char* name, KConfigSkeleton* config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal) : KConfigDialog(tqparent, name, config, dialogType, dialogButtons, defaultButton, modal)
+ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, KConfigSkeleton* config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal) : KConfigDialog(parent, name, config, dialogType, dialogButtons, defaultButton, modal)
{
addPage(new SettingsGeneral(this, "General"), i18n("General"), "package_settings");
addPage(new SettingsArchive(this, "Archive"), i18n("Archive"), "package_settings");
diff --git a/akregator/src/configdialog.h b/akregator/src/configdialog.h
index 670742a99..f67140010 100644
--- a/akregator/src/configdialog.h
+++ b/akregator/src/configdialog.h
@@ -38,7 +38,7 @@ class ConfigDialog : public KConfigDialog
TQ_OBJECT
public:
- ConfigDialog(TQWidget *tqparent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
+ ConfigDialog(TQWidget *parent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
virtual ~ConfigDialog();
diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp
index 2188b3843..44d40977e 100644
--- a/akregator/src/feed.cpp
+++ b/akregator/src/feed.cpp
@@ -365,7 +365,7 @@ bool Feed::fetchErrorOccurred() { return d->fetchError; }
bool Feed::isArticlesLoaded() const { return d->articlesLoaded; }
-TQDomElement Feed::toOPML( TQDomElement tqparent, TQDomDocument document ) const
+TQDomElement Feed::toOPML( TQDomElement parent, TQDomDocument document ) const
{
TQDomElement el = document.createElement( "outline" );
el.setAttribute( "text", title() );
@@ -388,7 +388,7 @@ TQDomElement Feed::toOPML( TQDomElement tqparent, TQDomDocument document ) const
el.setAttribute( "maxArticleNumber", d->maxArticleNumber );
el.setAttribute( "type", "rss" ); // despite some additional fields, its still "rss" OPML
el.setAttribute( "version", "RSS" );
- tqparent.appendChild( el );
+ parent.appendChild( el );
return el;
}
@@ -759,13 +759,13 @@ TreeNode* Feed::next()
if ( nextSibling() )
return nextSibling();
- Folder* p = tqparent();
+ Folder* p = parent();
while (p)
{
if ( p->nextSibling() )
return p->nextSibling();
else
- p = p->tqparent();
+ p = p->parent();
}
return 0;
}
diff --git a/akregator/src/feed.h b/akregator/src/feed.h
index c9590365b..663723cba 100644
--- a/akregator/src/feed.h
+++ b/akregator/src/feed.h
@@ -95,7 +95,7 @@ namespace Akregator
virtual bool accept(TreeNodeVisitor* visitor);
/** exports the feed settings to OPML */
- virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const;
+ virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const;
/**
returns whether this feed uses its own fetch interval or the global setting
diff --git a/akregator/src/feediconmanager.cpp b/akregator/src/feediconmanager.cpp
index ba75561ea..f1e8140b7 100644
--- a/akregator/src/feediconmanager.cpp
+++ b/akregator/src/feediconmanager.cpp
@@ -69,8 +69,8 @@ void FeedIconManager::fetchIcon(Feed* feed)
loadIcon(iconURL);
}
-FeedIconManager::FeedIconManager(TQObject * tqparent, const char *name)
-: TQObject(tqparent, name), DCOPObject("FeedIconManager"), d(new FeedIconManagerPrivate)
+FeedIconManager::FeedIconManager(TQObject * parent, const char *name)
+: TQObject(parent, name), DCOPObject("FeedIconManager"), d(new FeedIconManagerPrivate)
{
connectDCOPSignal("kded",
"favicons", "iconChanged(bool, TQString, TQString)",
diff --git a/akregator/src/feeditem.cpp b/akregator/src/feeditem.cpp
index 8cdafeada..03d0f077f 100644
--- a/akregator/src/feeditem.cpp
+++ b/akregator/src/feeditem.cpp
@@ -34,23 +34,23 @@
namespace Akregator {
-FeedItem::FeedItem(FolderItem* tqparent, Feed* node) : TreeNodeItem(tqparent, node)
+FeedItem::FeedItem(FolderItem* parent, Feed* node) : TreeNodeItem(parent, node)
{
initialize(node);
}
-FeedItem::FeedItem(KListView* tqparent, Feed* node) : TreeNodeItem(tqparent, node)
+FeedItem::FeedItem(KListView* parent, Feed* node) : TreeNodeItem(parent, node)
{
initialize(node);
}
-FeedItem::FeedItem(KListView* tqparent, TreeNodeItem* after, Feed* node) : TreeNodeItem(tqparent, after, node)
+FeedItem::FeedItem(KListView* parent, TreeNodeItem* after, Feed* node) : TreeNodeItem(parent, after, node)
{
initialize(node);
}
-FeedItem::FeedItem(FolderItem* tqparent, TreeNodeItem* after, Feed* node) : TreeNodeItem(tqparent, after, node)
+FeedItem::FeedItem(FolderItem* parent, TreeNodeItem* after, Feed* node) : TreeNodeItem(parent, after, node)
{
initialize(node);
}
diff --git a/akregator/src/feeditem.h b/akregator/src/feeditem.h
index 4f716a62b..ad0de2a3c 100644
--- a/akregator/src/feeditem.h
+++ b/akregator/src/feeditem.h
@@ -40,10 +40,10 @@ class FeedItem : public TreeNodeItem
{
public:
- FeedItem(FolderItem* tqparent, Feed* node);
- FeedItem(FolderItem* tqparent, TreeNodeItem* after, Feed* node);
- FeedItem(KListView* tqparent, Feed* node);
- FeedItem(KListView* tqparent, TreeNodeItem* after, Feed* node);
+ FeedItem(FolderItem* parent, Feed* node);
+ FeedItem(FolderItem* parent, TreeNodeItem* after, Feed* node);
+ FeedItem(KListView* parent, Feed* node);
+ FeedItem(KListView* parent, TreeNodeItem* after, Feed* node);
virtual ~FeedItem();
virtual Feed* node();
diff --git a/akregator/src/feedlist.cpp b/akregator/src/feedlist.cpp
index 72db09113..1daf1aa63 100644
--- a/akregator/src/feedlist.cpp
+++ b/akregator/src/feedlist.cpp
@@ -80,8 +80,8 @@ class FeedList::RemoveNodeVisitor : public TreeNodeVisitor
FeedList* m_list;
};
-FeedList::FeedList(TQObject *tqparent, const char *name)
- : NodeList(tqparent, name), d(new FeedListPrivate)
+FeedList::FeedList(TQObject *parent, const char *name)
+ : NodeList(parent, name), d(new FeedListPrivate)
{
d->addNodeVisitor = new AddNodeVisitor(this);
d->removeNodeVisitor = new RemoveNodeVisitor(this);
@@ -104,7 +104,7 @@ void FeedList::removeNode(TreeNode* node)
d->removeNodeVisitor->visit(node);
}
-void FeedList::parseChildNodes(TQDomNode &node, Folder* tqparent)
+void FeedList::parseChildNodes(TQDomNode &node, Folder* parent)
{
TQDomElement e = node.toElement(); // try to convert the node to an element.
@@ -119,13 +119,13 @@ void FeedList::parseChildNodes(TQDomNode &node, Folder* tqparent)
{
if (!d->urlMap[feed->xmlUrl()].contains(feed))
d->urlMap[feed->xmlUrl()].append(feed);
- tqparent->appendChild(feed);
+ parent->appendChild(feed);
}
}
else
{
Folder* fg = Folder::fromOPML(e);
- tqparent->appendChild(fg);
+ parent->appendChild(fg);
if (e.hasChildNodes())
{
@@ -214,13 +214,13 @@ Article FeedList::findArticle(const TQString& feedURL, const TQString& guid) con
return feed ? feed->findArticle(guid) : Article();
}
-void FeedList::append(FeedList* list, Folder* tqparent, TreeNode* after)
+void FeedList::append(FeedList* list, Folder* parent, TreeNode* after)
{
if ( list == this )
return;
- if ( !flatList()->contains(tqparent) )
- tqparent = rootNode();
+ if ( !flatList()->contains(parent) )
+ parent = rootNode();
TQValueList<TreeNode*> tqchildren = list->rootNode()->tqchildren();
@@ -228,7 +228,7 @@ void FeedList::append(FeedList* list, Folder* tqparent, TreeNode* after)
for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it)
{
list->rootNode()->removeChild(*it);
- tqparent->insertChild(*it, after);
+ parent->insertChild(*it, after);
after = *it;
}
}
diff --git a/akregator/src/feedlist.h b/akregator/src/feedlist.h
index 4e630ea7c..683cdd152 100644
--- a/akregator/src/feedlist.h
+++ b/akregator/src/feedlist.h
@@ -47,14 +47,14 @@ Q_OBJECT
TQ_OBJECT
public:
- FeedList(TQObject *tqparent = 0, const char *name = 0);
+ FeedList(TQObject *parent = 0, const char *name = 0);
/** Destructor. Contained nodes are deleted! */
~FeedList();
/** appends another feed list as sub tree. The root node of @c list is ignored. NOTE: nodes are _moved_ from @c list to this feed list, not copied */
- void append(FeedList* list, Folder* tqparent=0, TreeNode* after=0);
+ void append(FeedList* list, Folder* parent=0, TreeNode* after=0);
/** reads an OPML document and appends the items to this list
@param doc the OPML document to parse
@@ -82,7 +82,7 @@ protected:
public: // compat with KDE-3.x assertions, remove for KDE 4
// private:
- void parseChildNodes(TQDomNode &node, Folder* tqparent);
+ void parseChildNodes(TQDomNode &node, Folder* parent);
// never call these
FeedList(const FeedList&) : NodeList() {}
diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp
index fa33b89da..aa6101ded 100644
--- a/akregator/src/feedlistview.cpp
+++ b/akregator/src/feedlistview.cpp
@@ -65,7 +65,7 @@ class NodeListView::NodeListViewPrivate
bool showTagFolders;
// Drag and Drop variables
- TQListViewItem *tqparent;
+ TQListViewItem *parent;
TQListViewItem *afterme;
TQTimer autoopentimer;
ConnectNodeVisitor* connectNodeVisitor;
@@ -179,7 +179,7 @@ class NodeListView::DeleteItemVisitor : public TreeNodeVisitor
virtual bool visitFolder(Folder* node)
{
- // delete child items recursively before deleting tqparent
+ // delete child items recursively before deleting parent
TQValueList<TreeNode*> tqchildren = node->tqchildren();
for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it )
visit(*it);
@@ -212,7 +212,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
TagNodeItem* item = 0;
TreeNode* prev = node->prevSibling();
- FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
+ FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent()));
if (parentItem)
{
if (prev)
@@ -246,7 +246,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
TagFolderItem* item = 0;
TreeNode* prev = node->prevSibling();
- FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
+ FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent()));
if (parentItem)
{
if (prev)
@@ -284,7 +284,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
FolderItem* item = 0;
TreeNode* prev = node->prevSibling();
- FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
+ FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent()));
if (parentItem)
{
if (prev)
@@ -321,7 +321,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
FeedItem* item = 0;
TreeNode* prev = node->prevSibling();
- FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
+ FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent()));
if (parentItem)
{
@@ -352,8 +352,8 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
NodeListView* m_view;
};
-NodeListView::NodeListView( TQWidget *tqparent, const char *name)
- : KListView(tqparent, name), d(new NodeListViewPrivate)
+NodeListView::NodeListView( TQWidget *parent, const char *name)
+ : KListView(parent, name), d(new NodeListViewPrivate)
{
d->showTagFolders = true;
d->connectNodeVisitor = new ConnectNodeVisitor(this),
@@ -510,7 +510,7 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem*
if (KURLDrag::canDecode(e))
{
- FolderItem* tqparent = dynamic_cast<FolderItem*> (d->tqparent);
+ FolderItem* parent = dynamic_cast<FolderItem*> (d->parent);
TreeNodeItem* afterMe = 0;
if(d->afterme)
@@ -519,7 +519,7 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem*
KURL::List urls;
KURLDrag::decode( e, urls );
e->accept();
- emit signalDropped( urls, afterMe ? afterMe->node() : 0, tqparent ? tqparent->node() : 0);
+ emit signalDropped( urls, afterMe ? afterMe->node() : 0, parent ? parent->node() : 0);
}
}
else
@@ -527,23 +527,23 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem*
}
}
-void NodeListView::movableDropEvent(TQListViewItem* /*tqparent*/, TQListViewItem* /*afterme*/)
+void NodeListView::movableDropEvent(TQListViewItem* /*parent*/, TQListViewItem* /*afterme*/)
{
d->autoopentimer.stop();
- if (d->tqparent)
+ if (d->parent)
{
openFolder();
- Folder* parentNode = (dynamic_cast<FolderItem*> (d->tqparent))->node();
+ Folder* parentNode = (dynamic_cast<FolderItem*> (d->parent))->node();
TreeNode* afterMeNode = 0;
TreeNode* current = selectedNode();
if (d->afterme)
afterMeNode = (dynamic_cast<TreeNodeItem*> (d->afterme))->node();
- current->tqparent()->removeChild(current);
+ current->parent()->removeChild(current);
parentNode->insertChild(current, afterMeNode);
- KListView::movableDropEvent(d->tqparent, d->afterme);
+ KListView::movableDropEvent(d->parent, d->afterme);
}
}
@@ -557,13 +557,13 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
TQPoint vp = contentsToViewport(event->pos());
TQListViewItem *i = itemAt(vp);
- TQListViewItem *qitqparent;
+ TQListViewItem *qiparent;
TQListViewItem *qiafterme;
- findDrop( event->pos(), qitqparent, qiafterme );
+ findDrop( event->pos(), qiparent, qiafterme );
if (event->source() == viewport()) {
// disable any drops where the result would be top level nodes
- if (i && !i->tqparent())
+ if (i && !i->parent())
{
event->ignore();
d->autoopentimer.stop();
@@ -572,12 +572,12 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
// prevent dragging nodes from All Feeds to My Tags or vice versa
TQListViewItem* root1 = i;
- while (root1 && root1->tqparent())
- root1 = root1->tqparent();
+ while (root1 && root1->parent())
+ root1 = root1->parent();
TQListViewItem* root2 = selectedItem();
- while (root2 && root2->tqparent())
- root2 = root2->tqparent();
+ while (root2 && root2->parent())
+ root2 = root2->parent();
if (root1 != root2)
{
@@ -587,7 +587,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
}
// don't drop node into own subtree
- TQListViewItem* p = qitqparent;
+ TQListViewItem* p = qiparent;
while (p)
if (p == selectedItem())
{
@@ -597,7 +597,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
}
else
{
- p = p->tqparent();
+ p = p->parent();
}
// disable drags onto the item itself
@@ -615,7 +615,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
// event->pos().x() < header()->cellPos(header()->mapToIndex(0)))
// {} else
- // do we want to move inside the old tqparent or do we want to move to a new tqparent
+ // do we want to move inside the old parent or do we want to move to a new parent
if (i && (itemAt(vp - TQPoint(0,5)) == i && itemAt(vp + TQPoint(0,5)) == i))
{
setDropVisualizer(false);
@@ -625,10 +625,10 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
TreeNode *iNode = (dynamic_cast<TreeNodeItem*> (i))->node();
if (iNode->isGroup())
{
- if (i != d->tqparent)
+ if (i != d->parent)
d->autoopentimer.start(750);
- d->tqparent = i;
+ d->parent = i;
d->afterme = 0;
}
else
@@ -644,7 +644,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
setDropVisualizer(true);
setDropHighlighter(false);
cleanItemHighlighter();
- d->tqparent = qitqparent;
+ d->parent = qiparent;
d->afterme = qiafterme;
d->autoopentimer.stop();
}
@@ -665,7 +665,7 @@ bool NodeListView::acceptDrag(TQDropEvent *e) const
else
{
// disable dragging of top-level nodes (All Feeds, My Tags)
- if (selectedItem() && !selectedItem()->tqparent())
+ if (selectedItem() && !selectedItem()->parent())
return false;
else
return true;
@@ -719,8 +719,8 @@ void NodeListView::slotItemLeft()
sel->setOpen(false);
else
{
- if (sel->tqparent())
- setSelected( sel->tqparent(), true );
+ if (sel->parent())
+ setSelected( sel->parent(), true );
}
ensureItemVisible( selectedItem() );
@@ -927,7 +927,7 @@ void NodeListView::slotNodeAdded(TreeNode* node)
d->createItemVisitor->visit(node);
}
-void NodeListView::slotNodeRemoved(Folder* /*tqparent*/, TreeNode* node)
+void NodeListView::slotNodeRemoved(Folder* /*parent*/, TreeNode* node)
{
if (node)
d->deleteItemVisitor->deleteItem(node, false);
@@ -1012,9 +1012,9 @@ TQDragObject *NodeListView::dragObject()
void NodeListView::openFolder() {
d->autoopentimer.stop();
- if (d->tqparent && !d->tqparent->isOpen())
+ if (d->parent && !d->parent->isOpen())
{
- d->tqparent->setOpen(true);
+ d->parent->setOpen(true);
}
}
diff --git a/akregator/src/feedlistview.h b/akregator/src/feedlistview.h
index 1a5111f4d..52952089d 100644
--- a/akregator/src/feedlistview.h
+++ b/akregator/src/feedlistview.h
@@ -41,7 +41,7 @@ class NodeListView : public KListView
Q_OBJECT
TQ_OBJECT
public:
- NodeListView( TQWidget *tqparent = 0, const char *name = 0 );
+ NodeListView( TQWidget *parent = 0, const char *name = 0 );
virtual ~NodeListView();
/** sets the feed list to show. Disconnects from the old feed list, if there is any. */
@@ -92,7 +92,7 @@ public slots:
void slotItemBegin();
/** select last item in the list */
void slotItemEnd();
- /** go to tqparent item */
+ /** go to parent item */
void slotItemLeft();
/** go to first child */
void slotItemRight();
@@ -133,7 +133,7 @@ public: // compat with KDE-3.x assertions, remove for KDE 4
int cx, int cy, int cw, int ch );
virtual void contentsDragMoveEvent(TQDragMoveEvent* event);
virtual bool acceptDrag(TQDropEvent *event) const;
- virtual void movableDropEvent(TQListViewItem* tqparent, TQListViewItem* afterme);
+ virtual void movableDropEvent(TQListViewItem* parent, TQListViewItem* afterme);
virtual TQDragObject *dragObject();
@@ -155,10 +155,10 @@ protected slots:
/** called when a node is added to the tree. If no item for the node exists, it will be created */
virtual void slotNodeAdded(TreeNode* node);
- /** Called when a node in the tree is taken out of the tree (tqparent->removeChild())
+ /** Called when a node in the tree is taken out of the tree (parent->removeChild())
Removes a node and its tqchildren from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */
- virtual void slotNodeRemoved(Folder* tqparent, TreeNode* node);
+ virtual void slotNodeRemoved(Folder* parent, TreeNode* node);
/** deletes the item belonging to the deleted node */
virtual void slotNodeDestroyed(TreeNode* node);
@@ -195,7 +195,7 @@ class TagNodeListView : public NodeListView
Q_OBJECT
TQ_OBJECT
public:
- TagNodeListView(TQWidget *tqparent = 0, const char *name = 0) {}
+ TagNodeListView(TQWidget *parent = 0, const char *name = 0) {}
virtual ~TagNodeListView() {}
private:
diff --git a/akregator/src/fetchqueue.cpp b/akregator/src/fetchqueue.cpp
index c00abe2e5..c78d9a487 100644
--- a/akregator/src/fetchqueue.cpp
+++ b/akregator/src/fetchqueue.cpp
@@ -42,7 +42,7 @@ class FetchQueue::FetchQueuePrivate
};
-FetchQueue::FetchQueue(TQObject* tqparent, const char* name): TQObject(tqparent, name), d(new FetchQueuePrivate) {}
+FetchQueue::FetchQueue(TQObject* parent, const char* name): TQObject(parent, name), d(new FetchQueuePrivate) {}
FetchQueue::~FetchQueue()
diff --git a/akregator/src/fetchqueue.h b/akregator/src/fetchqueue.h
index 9e92bb162..149ad6c1f 100644
--- a/akregator/src/fetchqueue.h
+++ b/akregator/src/fetchqueue.h
@@ -40,7 +40,7 @@ class FetchQueue : public TQObject
public:
- FetchQueue(TQObject* tqparent=0, const char* name=0);
+ FetchQueue(TQObject* parent=0, const char* name=0);
virtual ~FetchQueue();
/** returns true when no feeds are neither fetching nor queued */
diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp
index 2a0f2776e..1d2c6a5cf 100644
--- a/akregator/src/folder.cpp
+++ b/akregator/src/folder.cpp
@@ -115,11 +115,11 @@ TQValueList<Article> Folder::articles(const TQString& tag)
return seq;
}
-TQDomElement Folder::toOPML( TQDomElement tqparent, TQDomDocument document ) const
+TQDomElement Folder::toOPML( TQDomElement parent, TQDomDocument document ) const
{
TQDomElement el = document.createElement( "outline" );
el.setAttribute( "text", title() );
- tqparent.appendChild( el );
+ parent.appendChild( el );
el.setAttribute("isOpen", d->open ? "true" : "false");
el.setAttribute( "id", TQString::number(id()) );
@@ -332,13 +332,13 @@ TreeNode* Folder::next()
if ( nextSibling() )
return nextSibling();
- Folder* p = tqparent();
+ Folder* p = parent();
while (p)
{
if ( p->nextSibling() )
return p->nextSibling();
else
- p = p->tqparent();
+ p = p->parent();
}
return 0;
}
diff --git a/akregator/src/folder.h b/akregator/src/folder.h
index 32811f679..6743dd573 100644
--- a/akregator/src/folder.h
+++ b/akregator/src/folder.h
@@ -79,12 +79,12 @@ namespace Akregator
/** Helps the rest of the app to decide if node should be handled as group or not. Use only where necessary, use polymorphism where possible. */
virtual bool isGroup() const { return true; }
- /** converts the feed group into OPML format for save and export and appends it to node @c tqparent in document @document.
+ /** converts the feed group into OPML format for save and export and appends it to node @c parent in document @document.
Children are processed and appended recursively.
- @param tqparent The tqparent element
+ @param parent The parent element
@param document The DOM document
@return The newly created element representing this feed group */
- virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const;
+ virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const;
/** returns the (direct) tqchildren of this node.
@return a list of pointers to the child nodes
diff --git a/akregator/src/folderitem.cpp b/akregator/src/folderitem.cpp
index baab25f3f..c9866c19c 100644
--- a/akregator/src/folderitem.cpp
+++ b/akregator/src/folderitem.cpp
@@ -33,22 +33,22 @@
namespace Akregator {
-FolderItem::FolderItem(FolderItem* tqparent, Folder* node) : TreeNodeItem(tqparent, node)
+FolderItem::FolderItem(FolderItem* parent, Folder* node) : TreeNodeItem(parent, node)
{
initialize(node);
}
-FolderItem::FolderItem(FolderItem* tqparent, TreeNodeItem* after, Folder* node) : TreeNodeItem(tqparent, after, node)
+FolderItem::FolderItem(FolderItem* parent, TreeNodeItem* after, Folder* node) : TreeNodeItem(parent, after, node)
{
initialize(node);
}
-FolderItem::FolderItem(KListView* tqparent, Folder* node) : TreeNodeItem(tqparent, node)
+FolderItem::FolderItem(KListView* parent, Folder* node) : TreeNodeItem(parent, node)
{
initialize(node);
}
-FolderItem::FolderItem(KListView* tqparent, TreeNodeItem* after, Folder* node) : TreeNodeItem(tqparent, after, node)
+FolderItem::FolderItem(KListView* parent, TreeNodeItem* after, Folder* node) : TreeNodeItem(parent, after, node)
{
initialize(node);
}
diff --git a/akregator/src/folderitem.h b/akregator/src/folderitem.h
index 02516e032..efc4d4e9f 100644
--- a/akregator/src/folderitem.h
+++ b/akregator/src/folderitem.h
@@ -41,10 +41,10 @@ class FolderItem : public TreeNodeItem
{
public:
- FolderItem(FolderItem* tqparent, Folder* node);
- FolderItem(FolderItem* tqparent, TreeNodeItem* after, Folder* node);
- FolderItem(KListView* tqparent, Folder* node);
- FolderItem(KListView* tqparent, TreeNodeItem* after, Folder* node);
+ FolderItem(FolderItem* parent, Folder* node);
+ FolderItem(FolderItem* parent, TreeNodeItem* after, Folder* node);
+ FolderItem(KListView* parent, Folder* node);
+ FolderItem(KListView* parent, TreeNodeItem* after, Folder* node);
virtual ~FolderItem();
virtual Folder* node();
diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp
index e800bafda..f0f48cea1 100644
--- a/akregator/src/frame.cpp
+++ b/akregator/src/frame.cpp
@@ -37,8 +37,8 @@
namespace Akregator {
-Frame::Frame(TQObject * tqparent, KParts::ReadOnlyPart *p, TQWidget *visWidget, const TQString& tit, bool watchSignals)
- :TQObject(tqparent, "aKregatorFrame")
+Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, const TQString& tit, bool watchSignals)
+ :TQObject(parent, "aKregatorFrame")
{
m_autoDeletePart = false;
m_part=p;
diff --git a/akregator/src/frame.h b/akregator/src/frame.h
index b504cc44d..24a879546 100644
--- a/akregator/src/frame.h
+++ b/akregator/src/frame.h
@@ -46,7 +46,7 @@ namespace Akregator
TQ_OBJECT
public:
- Frame(TQObject *tqparent, KParts::ReadOnlyPart *part, TQWidget *w, const TQString& tit, bool watchSignals=true);
+ Frame(TQObject *parent, KParts::ReadOnlyPart *part, TQWidget *w, const TQString& tit, bool watchSignals=true);
virtual ~Frame();
enum {Idle, Started, Completed, Canceled};
diff --git a/akregator/src/librss/article.cpp b/akregator/src/librss/article.cpp
index 14e0bb125..59949244b 100644
--- a/akregator/src/librss/article.cpp
+++ b/akregator/src/librss/article.cpp
@@ -261,9 +261,9 @@ TQString Article::meta(const TQString &key) const
return d->meta[key];
}
-KURLLabel *Article::widget(TQWidget *tqparent, const char *name) const
+KURLLabel *Article::widget(TQWidget *parent, const char *name) const
{
- KURLLabel *label = new KURLLabel(d->link.url(), d->title, tqparent, name);
+ KURLLabel *label = new KURLLabel(d->link.url(), d->title, parent, name);
label->setUseTips(true);
if (!d->description.isNull())
label->setTipText(d->description);
diff --git a/akregator/src/librss/article.h b/akregator/src/librss/article.h
index 833b224a4..7656eeeda 100644
--- a/akregator/src/librss/article.h
+++ b/akregator/src/librss/article.h
@@ -145,7 +145,7 @@ namespace RSS
TQString meta(const TQString &key) const;
/**
- * @param tqparent The tqparent widget for the KURLLabel.
+ * @param parent The parent widget for the KURLLabel.
* @param name A name for the widget which will be used internally.
* @return a widget (a KURLLabel in this case) for the Article.
* This makes building a user-interface which contains the
@@ -158,7 +158,7 @@ namespace RSS
* Note that you have to delete the KURLLabel object returned by
* this method yourself.
*/
- KURLLabel *widget(TQWidget *tqparent = 0, const char *name = 0) const;
+ KURLLabel *widget(TQWidget *parent = 0, const char *name = 0) const;
typedef TQMap<TQString, TQString> MetaInfoMap;
diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp
index bc10f8a31..610cec4c8 100644
--- a/akregator/src/librss/document.cpp
+++ b/akregator/src/librss/document.cpp
@@ -183,7 +183,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
d->link = extractLink(channelNode, d->format);
- /* This is ugly but necessary since RSS 0.90 and 1.0 have a different tqparent
+ /* This is ugly but necessary since RSS 0.90 and 1.0 have a different parent
* node for <image>, <textinput> and <item> than RSS 0.91-0.94 and RSS 2.0.
*/
TQDomNode parentNode;
diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp
index baaa6409d..c4daa0561 100644
--- a/akregator/src/librss/tools_p.cpp
+++ b/akregator/src/librss/tools_p.cpp
@@ -30,9 +30,9 @@ time_t parseISO8601Date(const TQString &s)
return KRFCDate::parseDateISO8601(s + "T12:00:00");
}
-TQString childNodesAsXML(const TQDomNode& tqparent)
+TQString childNodesAsXML(const TQDomNode& parent)
{
- TQDomNodeList list = tqparent.childNodes();
+ TQDomNodeList list = parent.childNodes();
TQString str;
TQTextStream ts( &str, IO_WriteOnly );
for (uint i = 0; i < list.count(); ++i)
@@ -117,9 +117,9 @@ static TQString extractAtomContent(const TQDomElement& e)
return TQString();
}
-TQString extractNode(const TQDomNode &tqparent, const TQString &elemName, bool isInlined)
+TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined)
{
- TQDomNode node = tqparent.namedItem(elemName);
+ TQDomNode node = parent.namedItem(elemName);
if (node.isNull())
return TQString();
@@ -143,9 +143,9 @@ TQString extractNode(const TQDomNode &tqparent, const TQString &elemName, bool i
return result.isEmpty() ? TQString() : result;
}
-TQString extractTitle(const TQDomNode & tqparent)
+TQString extractTitle(const TQDomNode & parent)
{
- TQDomNode node = tqparent.namedItem(TQString::tqfromLatin1("title"));
+ TQDomNode node = parent.namedItem(TQString::tqfromLatin1("title"));
if (node.isNull())
return TQString();
diff --git a/akregator/src/librss/tools_p.h b/akregator/src/librss/tools_p.h
index 900baa225..47be905d8 100644
--- a/akregator/src/librss/tools_p.h
+++ b/akregator/src/librss/tools_p.h
@@ -29,9 +29,9 @@ namespace RSS
unsigned int count;
};
- TQString extractNode(const TQDomNode &tqparent, const TQString &elemName, bool isInlined=true);
- TQString extractTitle(const TQDomNode &tqparent);
- TQString childNodesAsXML(const TQDomNode& tqparent);
+ TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined=true);
+ TQString extractTitle(const TQDomNode &parent);
+ TQString childNodesAsXML(const TQDomNode& parent);
time_t parseISO8601Date(const TQString &s);
TQString parseItemAuthor(const TQDomElement& element, Format format, Version version);
}
diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp
index a8c8f5d14..a137f1fe7 100644
--- a/akregator/src/listtabwidget.cpp
+++ b/akregator/src/listtabwidget.cpp
@@ -152,7 +152,7 @@ void ListTabWidget::slotTabClicked(int id)
}
}
-ListTabWidget::ListTabWidget(TQWidget* tqparent, const char* name) : TQWidget(tqparent, name), d(new ListTabWidgetPrivate)
+ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(parent, name), d(new ListTabWidgetPrivate)
{
d->idCounter = 0;
d->current = 0;
diff --git a/akregator/src/listtabwidget.h b/akregator/src/listtabwidget.h
index f720d36f1..1dd4d92e7 100644
--- a/akregator/src/listtabwidget.h
+++ b/akregator/src/listtabwidget.h
@@ -50,7 +50,7 @@ Q_OBJECT
public:
- ListTabWidget(TQWidget* tqparent=0, const char* name=0);
+ ListTabWidget(TQWidget* parent=0, const char* name=0);
virtual ~ListTabWidget();
enum ViewMode { single, /* horizontalTabs, */ verticalTabs };
@@ -72,7 +72,7 @@ public slots:
void slotItemBegin();
/** select last item in the list */
void slotItemEnd();
- /** go to tqparent item */
+ /** go to parent item */
void slotItemLeft();
/** go to first child */
void slotItemRight();
diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES
index 1e1761cad..4f167afbc 100644
--- a/akregator/src/mk4storage/metakit/CHANGES
+++ b/akregator/src/mk4storage/metakit/CHANGES
@@ -298,7 +298,7 @@
2003-01-24 Fixed cleanup order bug in Mk4tcl
There was a long-standing bug in Mk4tcl, in which cleanup order of
- MkPath objects caused them to access their MkWorkspace tqparent even
+ MkPath objects caused them to access their MkWorkspace parent even
though it was already deleted. This may have caused some of the
crash-on-exit bugs in the past.
diff --git a/akregator/src/mk4storage/metakit/src/column.cpp b/akregator/src/mk4storage/metakit/src/column.cpp
index dda916abd..2d191c645 100644
--- a/akregator/src/mk4storage/metakit/src/column.cpp
+++ b/akregator/src/mk4storage/metakit/src/column.cpp
@@ -770,7 +770,7 @@ void c4_Column::StoreBytes(t4_i32 pos_, const c4_Bytes& buffer_)
t4_i32 c4_Column::PullValue(const t4_byte*& ptr_)
{
- t4_i32 tqmask = *ptr_ ? 0 : ~0;
+ t4_i32 mask = *ptr_ ? 0 : ~0;
t4_i32 v = 0;
for (;;) {
@@ -779,7 +779,7 @@ t4_i32 c4_Column::PullValue(const t4_byte*& ptr_)
break;
}
- return tqmask ^ (v - 0x80); // oops, last byte had bit 7 set
+ return mask ^ (v - 0x80); // oops, last byte had bit 7 set
}
void c4_Column::PushValue(t4_byte*& ptr_, t4_i32 v_)
@@ -1398,7 +1398,7 @@ void c4_ColOfInts::ResizeData(int index_, int count_, bool clear_)
/* _currwidth 1: 2: 4:
* shiftPos 3 2 1 shift the offset right this much
- * maskPos 7 3 1 tqmask the offset with this
+ * maskPos 7 3 1 mask the offset with this
*/
const int shiftPos = _currWidth == 4 ? 1 : 4 - _currWidth;
diff --git a/akregator/src/mk4storage/metakit/src/custom.cpp b/akregator/src/mk4storage/metakit/src/custom.cpp
index 6ed1d5ab3..a6275cea7 100644
--- a/akregator/src/mk4storage/metakit/src/custom.cpp
+++ b/akregator/src/mk4storage/metakit/src/custom.cpp
@@ -233,7 +233,7 @@ bool c4_CustomViewer::RemoveRows(int, int)
class c4_SliceViewer : public c4_CustomViewer
{
- c4_View _tqparent;
+ c4_View _parent;
int _first, _limit, _step;
public:
@@ -249,7 +249,7 @@ public:
};
c4_SliceViewer::c4_SliceViewer (c4_Sequence& seq_, int first_, int limit_, int step_)
- : _tqparent (&seq_), _first (first_), _limit (limit_), _step (step_)
+ : _parent (&seq_), _first (first_), _limit (limit_), _step (step_)
{
d4_assert(_step != 0);
}
@@ -260,12 +260,12 @@ c4_SliceViewer::~c4_SliceViewer ()
c4_View c4_SliceViewer::GetTemplate()
{
- return _tqparent.Clone(); // could probably return _tqparent just as well
+ return _parent.Clone(); // could probably return _parent just as well
}
int c4_SliceViewer::GetSize()
{
- int n = _limit >= 0 ? _limit : _tqparent.GetSize();
+ int n = _limit >= 0 ? _limit : _parent.GetSize();
if (n < _first)
n = _first;
@@ -277,14 +277,14 @@ bool c4_SliceViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
{
row_ = _first + _step * (_step > 0 ? row_ : row_ - GetSize() + 1);
- return _tqparent.GetItem(row_, col_, buf_);
+ return _parent.GetItem(row_, col_, buf_);
}
bool c4_SliceViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
{
row_ = _first + _step * (_step > 0 ? row_ : row_ - GetSize() + 1);
- _tqparent.SetItem(row_, col_, buf_);
+ _parent.SetItem(row_, col_, buf_);
return true;
}
@@ -297,7 +297,7 @@ bool c4_SliceViewer::InsertRows(int pos_, c4_Cursor value_, int count_)
if (_limit >= 0)
_limit += count_;
- _tqparent.InsertAt(pos_, *value_, count_);
+ _parent.InsertAt(pos_, *value_, count_);
return true;
}
@@ -310,7 +310,7 @@ bool c4_SliceViewer::RemoveRows(int pos_, int count_)
if (_limit >= 0)
_limit -= count_;
- _tqparent.RemoveAt(pos_, count_);
+ _parent.RemoveAt(pos_, count_);
return true;
}
@@ -323,7 +323,7 @@ c4_CustomViewer* f4_CustSlice(c4_Sequence& seq_, int first_, int limit_, int ste
class c4_ProductViewer : public c4_CustomViewer
{
- c4_View _tqparent, _argView, _template;
+ c4_View _parent, _argView, _template;
public:
c4_ProductViewer (c4_Sequence& seq_, const c4_View& view_);
@@ -335,7 +335,7 @@ public:
};
c4_ProductViewer::c4_ProductViewer (c4_Sequence& seq_, const c4_View& view_)
- : _tqparent (&seq_), _argView (view_), _template (_tqparent.Clone())
+ : _parent (&seq_), _argView (view_), _template (_parent.Clone())
{
for (int i = 0; i < _argView.NumProperties(); ++i)
_template.AddProperty(_argView.NthProperty(i));
@@ -352,12 +352,12 @@ c4_View c4_ProductViewer::GetTemplate()
int c4_ProductViewer::GetSize()
{
- return _tqparent.GetSize() * _argView.GetSize();
+ return _parent.GetSize() * _argView.GetSize();
}
bool c4_ProductViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
{
- c4_View v = _tqparent;
+ c4_View v = _parent;
if (col_ < v.NumProperties())
{
@@ -384,7 +384,7 @@ c4_CustomViewer* f4_CustProduct(c4_Sequence& seq_, const c4_View& view_)
class c4_RemapWithViewer : public c4_CustomViewer
{
- c4_View _tqparent, _argView;
+ c4_View _parent, _argView;
public:
c4_RemapWithViewer (c4_Sequence& seq_, const c4_View& view_);
@@ -397,7 +397,7 @@ public:
};
c4_RemapWithViewer::c4_RemapWithViewer (c4_Sequence& seq_, const c4_View& view_)
- : _tqparent (&seq_), _argView (view_)
+ : _parent (&seq_), _argView (view_)
{
}
@@ -407,7 +407,7 @@ c4_RemapWithViewer::~c4_RemapWithViewer ()
c4_View c4_RemapWithViewer::GetTemplate()
{
- return _tqparent.Clone(); // could probably return _tqparent just as well
+ return _parent.Clone(); // could probably return _parent just as well
}
int c4_RemapWithViewer::GetSize()
@@ -422,7 +422,7 @@ bool c4_RemapWithViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
row_ = ((const c4_IntProp&) map) (_argView[row_]);
- return _tqparent.GetItem(row_, col_, buf_);
+ return _parent.GetItem(row_, col_, buf_);
}
bool c4_RemapWithViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
@@ -432,7 +432,7 @@ bool c4_RemapWithViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
row_ = ((const c4_IntProp&) map) (_argView[row_]);
- _tqparent.SetItem(row_, col_, buf_);
+ _parent.SetItem(row_, col_, buf_);
return true;
}
@@ -445,7 +445,7 @@ c4_CustomViewer* f4_CustRemapWith(c4_Sequence& seq_, const c4_View& view_)
class c4_PairViewer : public c4_CustomViewer
{
- c4_View _tqparent, _argView, _template;
+ c4_View _parent, _argView, _template;
public:
c4_PairViewer (c4_Sequence& seq_, const c4_View& view_);
@@ -460,7 +460,7 @@ public:
};
c4_PairViewer::c4_PairViewer (c4_Sequence& seq_, const c4_View& view_)
- : _tqparent (&seq_), _argView (view_), _template (_tqparent.Clone())
+ : _parent (&seq_), _argView (view_), _template (_parent.Clone())
{
for (int i = 0; i < _argView.NumProperties(); ++i)
_template.AddProperty(_argView.NthProperty(i));
@@ -477,12 +477,12 @@ c4_View c4_PairViewer::GetTemplate()
int c4_PairViewer::GetSize()
{
- return _tqparent.GetSize();
+ return _parent.GetSize();
}
bool c4_PairViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
{
- c4_View v = _tqparent;
+ c4_View v = _parent;
if (col_ >= v.NumProperties())
{
@@ -496,7 +496,7 @@ bool c4_PairViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
bool c4_PairViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
{
- c4_View v = _tqparent;
+ c4_View v = _parent;
if (col_ >= v.NumProperties())
{
@@ -511,14 +511,14 @@ bool c4_PairViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
bool c4_PairViewer::InsertRows(int pos_, c4_Cursor value_, int count_)
{
- _tqparent.InsertAt(pos_, *value_, count_);
+ _parent.InsertAt(pos_, *value_, count_);
_argView.InsertAt(pos_, *value_, count_);
return true;
}
bool c4_PairViewer::RemoveRows(int pos_, int count_)
{
- _tqparent.RemoveAt(pos_, count_);
+ _parent.RemoveAt(pos_, count_);
_argView.RemoveAt(pos_, count_);
return true;
}
@@ -532,7 +532,7 @@ c4_CustomViewer* f4_CustPair(c4_Sequence& seq_, const c4_View& view_)
class c4_ConcatViewer : public c4_CustomViewer
{
- c4_View _tqparent, _argView;
+ c4_View _parent, _argView;
public:
c4_ConcatViewer (c4_Sequence& seq_, const c4_View& view_);
@@ -545,7 +545,7 @@ public:
};
c4_ConcatViewer::c4_ConcatViewer (c4_Sequence& seq_, const c4_View& view_)
- : _tqparent (&seq_), _argView (view_)
+ : _parent (&seq_), _argView (view_)
{
}
@@ -555,23 +555,23 @@ c4_ConcatViewer::~c4_ConcatViewer ()
c4_View c4_ConcatViewer::GetTemplate()
{
- return _tqparent.Clone(); // could probably return _tqparent just as well
+ return _parent.Clone(); // could probably return _parent just as well
}
int c4_ConcatViewer::GetSize()
{
- return _tqparent.GetSize() + _argView.GetSize();
+ return _parent.GetSize() + _argView.GetSize();
}
bool c4_ConcatViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
{
- c4_View v = _tqparent;
+ c4_View v = _parent;
- if (row_ >= _tqparent.GetSize())
+ if (row_ >= _parent.GetSize())
{
v = _argView;
- row_ -= _tqparent.GetSize();
- col_ = v.FindProperty(_tqparent.NthProperty(col_).GetId());
+ row_ -= _parent.GetSize();
+ col_ = v.FindProperty(_parent.NthProperty(col_).GetId());
if (col_ < 0)
return false;
@@ -582,13 +582,13 @@ bool c4_ConcatViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
bool c4_ConcatViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
{
- c4_View v = _tqparent;
+ c4_View v = _parent;
- if (row_ >= _tqparent.GetSize())
+ if (row_ >= _parent.GetSize())
{
v = _argView;
- row_ -= _tqparent.GetSize();
- col_ = v.FindProperty(_tqparent.NthProperty(col_).GetId());
+ row_ -= _parent.GetSize();
+ col_ = v.FindProperty(_parent.NthProperty(col_).GetId());
d4_assert(col_ >= 0);
}
@@ -605,7 +605,7 @@ c4_CustomViewer* f4_CustConcat(c4_Sequence& seq_, const c4_View& view_)
class c4_RenameViewer : public c4_CustomViewer
{
- c4_View _tqparent, _template;
+ c4_View _parent, _template;
public:
c4_RenameViewer (c4_Sequence& seq_, const c4_Property& old_,
@@ -622,11 +622,11 @@ public:
c4_RenameViewer::c4_RenameViewer (c4_Sequence& seq_, const c4_Property& old_,
const c4_Property& new_)
- : _tqparent (&seq_)
+ : _parent (&seq_)
{
- for (int i = 0; i < _tqparent.NumProperties(); ++i)
+ for (int i = 0; i < _parent.NumProperties(); ++i)
{
- const c4_Property& prop = _tqparent.NthProperty(i);
+ const c4_Property& prop = _parent.NthProperty(i);
_template.AddProperty(prop.GetId() == old_.GetId() ? new_ : prop);
}
}
@@ -642,17 +642,17 @@ c4_View c4_RenameViewer::GetTemplate()
int c4_RenameViewer::GetSize()
{
- return _tqparent.GetSize();
+ return _parent.GetSize();
}
bool c4_RenameViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
{
- return _tqparent.GetItem(row_, col_, buf_);
+ return _parent.GetItem(row_, col_, buf_);
}
bool c4_RenameViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
{
- _tqparent.SetItem(row_, col_, buf_);
+ _parent.SetItem(row_, col_, buf_);
return true;
}
@@ -666,7 +666,7 @@ c4_CustomViewer* f4_CustRename(c4_Sequence& seq_, const c4_Property& old_,
class c4_GroupByViewer : public c4_CustomViewer
{
- c4_View _tqparent, _keys, _sorted, _temp;
+ c4_View _parent, _keys, _sorted, _temp;
c4_Property _result;
c4_DWordArray _map;
@@ -685,9 +685,9 @@ public:
c4_GroupByViewer::c4_GroupByViewer (c4_Sequence& seq_, const c4_View& keys_,
const c4_Property& result_)
- : _tqparent (&seq_), _keys (keys_), _result (result_)
+ : _parent (&seq_), _keys (keys_), _result (result_)
{
- _sorted = _tqparent.SortOn(_keys);
+ _sorted = _parent.SortOn(_keys);
int n = _sorted.GetSize();
c4_Bytes temp;
@@ -804,7 +804,7 @@ c4_CustomViewer* f4_CustGroupBy(c4_Sequence& seq_, const c4_View& template_,
class c4_JoinPropViewer : public c4_CustomViewer
{
- c4_View _tqparent, _template;
+ c4_View _parent, _template;
c4_ViewProp _sub;
int _subPos, _subWidth;
c4_DWordArray _base, _offset;
@@ -820,20 +820,20 @@ public:
c4_JoinPropViewer::c4_JoinPropViewer (c4_Sequence& seq_,
const c4_ViewProp& sub_, bool outer_)
- : _tqparent (&seq_),
- _sub (sub_), _subPos (_tqparent.FindProperty(sub_.GetId())), _subWidth (0)
+ : _parent (&seq_),
+ _sub (sub_), _subPos (_parent.FindProperty(sub_.GetId())), _subWidth (0)
{
d4_assert(_subPos >= 0);
- for (int k = 0; k < _tqparent.NumProperties(); ++k)
+ for (int k = 0; k < _parent.NumProperties(); ++k)
{
if (k != _subPos)
- _template.AddProperty(_tqparent.NthProperty(k));
+ _template.AddProperty(_parent.NthProperty(k));
else // if there are no rows, then this join does very little anyway
//! OOPS: if this is an unattached view, then the subviews can differ
- if (_tqparent.GetSize() > 0)
+ if (_parent.GetSize() > 0)
{
- c4_View view = sub_ (_tqparent[0]);
+ c4_View view = sub_ (_parent[0]);
for (int l = 0; l < view.NumProperties(); ++l)
{
_template.AddProperty(view.NthProperty(l));
@@ -845,9 +845,9 @@ c4_JoinPropViewer::c4_JoinPropViewer (c4_Sequence& seq_,
_base.SetSize(0, 5);
_offset.SetSize(0, 5);
- for (int i = 0; i < _tqparent.GetSize(); ++i)
+ for (int i = 0; i < _parent.GetSize(); ++i)
{
- c4_View v = _sub (_tqparent[i]);
+ c4_View v = _sub (_parent[i]);
int n = v.GetSize();
if (n == 0 && outer_)
@@ -880,7 +880,7 @@ int c4_JoinPropViewer::GetSize()
bool c4_JoinPropViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
{
- c4_View v = _tqparent;
+ c4_View v = _parent;
int r = _base.GetAt(row_);
if (col_ >= _subPos)
@@ -890,7 +890,7 @@ bool c4_JoinPropViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
}
else
{
- v = _sub (_tqparent[r]);
+ v = _sub (_parent[r]);
r = _offset.GetAt(row_);
if (r < 0)
return false; // if this is a null row in an outer join
@@ -913,7 +913,7 @@ c4_CustomViewer* f4_CustJoinProp(c4_Sequence& seq_,
class c4_JoinViewer : public c4_CustomViewer
{
- c4_View _tqparent, _argView, _template;
+ c4_View _parent, _argView, _template;
c4_DWordArray _base, _offset;
public:
@@ -928,14 +928,14 @@ public:
c4_JoinViewer::c4_JoinViewer (c4_Sequence& seq_,const c4_View& keys_,
const c4_View& view_, bool outer_)
- : _tqparent (&seq_), _argView (view_.SortOn(keys_))
+ : _parent (&seq_), _argView (view_.SortOn(keys_))
{
// why not in GetTemplate, since we don't need to know this...
- _template = _tqparent.Clone();
+ _template = _parent.Clone();
for (int l = 0; l < _argView.NumProperties(); ++l)
_template.AddProperty(_argView.NthProperty(l));
- c4_View sorted = _tqparent.SortOn(keys_).Project(keys_);
+ c4_View sorted = _parent.SortOn(keys_).Project(keys_);
c4_View temp = _argView.Project(keys_);
_base.SetSize(0, 5);
@@ -945,7 +945,7 @@ c4_JoinViewer::c4_JoinViewer (c4_Sequence& seq_,const c4_View& keys_,
for (int i = 0; i < sorted.GetSize(); ++i)
{
- int orig = _tqparent.GetIndexOf(sorted[i]);
+ int orig = _parent.GetIndexOf(sorted[i]);
d4_assert(orig >= 0);
if (i > 0 && sorted[i] == sorted[i-1])
@@ -1009,7 +1009,7 @@ int c4_JoinViewer::GetSize()
bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
{
- c4_View v = _tqparent;
+ c4_View v = _parent;
int r = _base.GetAt(row_);
if (col_ >= v.NumProperties())
@@ -1030,7 +1030,7 @@ bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
#if 0
bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
{
- c4_View v = _tqparent;
+ c4_View v = _parent;
int o = 0;
int r = _offset.GetAt(row_);
diff --git a/akregator/src/mk4storage/metakit/src/handler.cpp b/akregator/src/mk4storage/metakit/src/handler.cpp
index 9bacfc9f8..6c68c5c3f 100644
--- a/akregator/src/mk4storage/metakit/src/handler.cpp
+++ b/akregator/src/mk4storage/metakit/src/handler.cpp
@@ -78,13 +78,13 @@ void c4_Handler::Move(int from_, int to_)
// c4_HandlerSeq
c4_HandlerSeq::c4_HandlerSeq (c4_Persist* persist_)
- : _persist (persist_), _field (0), _tqparent (0), _numRows (0)
+ : _persist (persist_), _field (0), _parent (0), _numRows (0)
{
}
c4_HandlerSeq::c4_HandlerSeq (c4_HandlerSeq& owner_, c4_Handler* handler_)
: _persist (owner_.Persist()), _field (owner_.FindField(handler_)),
- _tqparent (&owner_), _numRows (0)
+ _parent (&owner_), _numRows (0)
{
for (int i = 0; i < NumFields(); ++i) {
c4_Field& field = Field(i);
@@ -98,7 +98,7 @@ c4_HandlerSeq::c4_HandlerSeq (c4_HandlerSeq& owner_, c4_Handler* handler_)
c4_HandlerSeq::~c4_HandlerSeq ()
{
- const bool rootLevel = _tqparent == this;
+ const bool rootLevel = _parent == this;
c4_Persist* pers = _persist;
if (rootLevel && pers != 0)
@@ -129,7 +129,7 @@ c4_Persist* c4_HandlerSeq::Persist() const
void c4_HandlerSeq::DefineRoot()
{
d4_assert(_field == 0);
- d4_assert(_tqparent == 0);
+ d4_assert(_parent == 0);
SetNumRows(1);
@@ -137,7 +137,7 @@ void c4_HandlerSeq::DefineRoot()
_field = d4_new c4_Field (desc);
d4_assert(!*desc);
- _tqparent = this;
+ _parent = this;
}
c4_Handler* c4_HandlerSeq::CreateHandler(const c4_Property& prop_)
@@ -162,7 +162,7 @@ void c4_HandlerSeq::DetachFromParent()
_field = 0;
}
- _tqparent = 0;
+ _parent = 0;
}
void c4_HandlerSeq::DetachFromStorage(bool full_)
@@ -293,7 +293,7 @@ void c4_HandlerSeq::Restructure(c4_Field& field_, bool remove_)
}
}
- if (_tqparent == this)
+ if (_parent == this)
delete ofld; // the root table owns its field structure tree
}
@@ -398,8 +398,8 @@ void c4_HandlerSeq::ExchangeEntries(int srcPos_, c4_HandlerSeq& dst_, int dstPos
c4_HandlerSeq& t2 = dst_.SubEntry(col, dstPos_);
// adjust the parents
- t1._tqparent = this;
- t2._tqparent = &dst_;
+ t1._parent = this;
+ t2._parent = &dst_;
// reattach the proper field structures
t1.Restructure(Field(col), false);
diff --git a/akregator/src/mk4storage/metakit/src/handler.h b/akregator/src/mk4storage/metakit/src/handler.h
index 7cf2efdf6..6003f625d 100644
--- a/akregator/src/mk4storage/metakit/src/handler.h
+++ b/akregator/src/mk4storage/metakit/src/handler.h
@@ -88,7 +88,7 @@ class c4_HandlerSeq : public c4_Sequence
c4_PtrArray _handlers;
c4_Persist* _persist;
c4_Field* _field;
- c4_HandlerSeq* _tqparent;
+ c4_HandlerSeq* _parent;
int _numRows;
public:
diff --git a/akregator/src/mk4storage/metakit/src/handler.inl b/akregator/src/mk4storage/metakit/src/handler.inl
index 10d45f3ce..75321f9c7 100644
--- a/akregator/src/mk4storage/metakit/src/handler.inl
+++ b/akregator/src/mk4storage/metakit/src/handler.inl
@@ -84,7 +84,7 @@ d4_inline const c4_Sequence* c4_HandlerSeq::HandlerContext(int) const
d4_inline c4_HandlerSeq& c4_HandlerSeq::Parent() const
{
- return *_tqparent;
+ return *_parent;
}
/////////////////////////////////////////////////////////////////////////////
diff --git a/akregator/src/mk4storage/metakit/src/remap.cpp b/akregator/src/mk4storage/metakit/src/remap.cpp
index 9bc9b440f..cc8175df2 100644
--- a/akregator/src/mk4storage/metakit/src/remap.cpp
+++ b/akregator/src/mk4storage/metakit/src/remap.cpp
@@ -258,10 +258,10 @@ t4_i32 c4_HashViewer::CalcHash(c4_Cursor cursor_) const
int c4_HashViewer::LookDict(t4_i32 hash_, c4_Cursor cursor_) const
{
- const unsigned int tqmask = _map.GetSize() - 2;
+ const unsigned int mask = _map.GetSize() - 2;
/* We must come up with (i, incr) such that 0 <= i < _size
and 0 < incr < _size and both are a function of hash */
- int i = tqmask & ~hash_;
+ int i = mask & ~hash_;
/* We use ~hash_ instead of hash_, as degenerate hash functions, such
as for ints <sigh>, can have lots of leading zeros. It's not
really a performance risk, but better safe than sorry. */
@@ -272,14 +272,14 @@ int c4_HashViewer::LookDict(t4_i32 hash_, c4_Cursor cursor_) const
/* Derive incr from hash_, just to make it more arbitrary. Note that
incr must not be 0, or we will get into an infinite loop.*/
- unsigned incr = (hash_ ^ ((unsigned long) hash_ >> 3)) & tqmask;
+ unsigned incr = (hash_ ^ ((unsigned long) hash_ >> 3)) & mask;
if (!incr)
- incr = tqmask;
+ incr = mask;
int poly = GetPoly();
for (;;)
{
- i = (i+incr) & tqmask;
+ i = (i+incr) & mask;
if (IsUnused(i))
break;
if (Hash(i) == hash_ && KeySame(Row(i), cursor_))
@@ -288,7 +288,7 @@ int c4_HashViewer::LookDict(t4_i32 hash_, c4_Cursor cursor_) const
freeslot = i;
/* Cycle through GF(2^n)-{0} */
incr = incr << 1;
- if (incr > tqmask)
+ if (incr > mask)
incr ^= poly; /* This will implicitely clear the highest bit */
}
diff --git a/akregator/src/mk4storage/metakit/tests/ok/f07a.txt b/akregator/src/mk4storage/metakit/tests/ok/f07a.txt
index 8f3ed2077..79963d7b4 100644
--- a/akregator/src/mk4storage/metakit/tests/ok/f07a.txt
+++ b/akregator/src/mk4storage/metakit/tests/ok/f07a.txt
@@ -1,3 +1,3 @@
VIEW 1 rows = dict:V
0: subview 'dict'
- VIEW 0 rows = tqparent:I index:I view:V
+ VIEW 0 rows = parent:I index:I view:V
diff --git a/akregator/src/mk4storage/metakit/tests/tformat.cpp b/akregator/src/mk4storage/metakit/tests/tformat.cpp
index 67530b7fd..ba6e92549 100644
--- a/akregator/src/mk4storage/metakit/tests/tformat.cpp
+++ b/akregator/src/mk4storage/metakit/tests/tformat.cpp
@@ -207,7 +207,7 @@ void TestFormat()
c4_View v3 = pView (v2[0]);
A(v3.GetSize() == 2);
*/
- #define FORMAT07 "dict[tqparent:I,index:I,view[name:S,type:S,child:I]]"
+ #define FORMAT07 "dict[parent:I,index:I,view[name:S,type:S,child:I]]"
c4_Storage s1 ("f07a", 1);
s1.SetStructure(FORMAT07);
diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp
index 1ed274d1c..6bcee5f6d 100644
--- a/akregator/src/nodelist.cpp
+++ b/akregator/src/nodelist.cpp
@@ -118,7 +118,7 @@ class NodeList::RemoveNodeVisitor : public TreeNodeVisitor
NodeList* m_list;
};
-NodeList::NodeList(TQObject *tqparent, const char *name) : d(new NodeListPrivate)
+NodeList::NodeList(TQObject *parent, const char *name) : d(new NodeListPrivate)
{
d->rootNode = 0;
d->addNodeVisitor = new AddNodeVisitor(this);
@@ -215,8 +215,8 @@ int NodeList::generateID()
void NodeList::slotNodeAdded(TreeNode* node)
{
- Folder* tqparent = node->tqparent();
- if ( !node || !d->flatList.contains(tqparent) || d->flatList.contains(node) )
+ Folder* parent = node->parent();
+ if ( !node || !d->flatList.contains(parent) || d->flatList.contains(node) )
return;
addNode(node, false);
@@ -230,7 +230,7 @@ void NodeList::slotNodeDestroyed(TreeNode* node)
removeNode(node);
}
-void NodeList::slotNodeRemoved(Folder* /*tqparent*/, TreeNode* node)
+void NodeList::slotNodeRemoved(Folder* /*parent*/, TreeNode* node)
{
if ( !node || !d->flatList.contains(node) )
return;
diff --git a/akregator/src/nodelist.h b/akregator/src/nodelist.h
index 3d628ec78..c441ead7e 100644
--- a/akregator/src/nodelist.h
+++ b/akregator/src/nodelist.h
@@ -52,7 +52,7 @@ Q_OBJECT
TQ_OBJECT
public:
- NodeList(TQObject *tqparent=0, const char *name=0);
+ NodeList(TQObject *parent=0, const char *name=0);
virtual ~NodeList();
virtual Folder* rootNode() const;
@@ -104,7 +104,7 @@ public slots: // compat with KDE-3.x assertions, remove for KDE 4
virtual void slotNodeDestroyed(TreeNode* node);
virtual void slotNodeAdded(TreeNode* node);
- virtual void slotNodeRemoved(Folder* tqparent, TreeNode* node);
+ virtual void slotNodeRemoved(Folder* parent, TreeNode* node);
public: // compat with KDE-3.x assertions, remove for KDE 4
// private:
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index 0392535cf..70e0e413f 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -95,8 +95,8 @@ class PageViewer::PageViewerPrivate
};
-PageViewer::PageViewer(TQWidget *tqparent, const char *name)
- : Viewer(tqparent, name), d(new PageViewerPrivate)
+PageViewer::PageViewer(TQWidget *parent, const char *name)
+ : Viewer(parent, name), d(new PageViewerPrivate)
{
// this hack is necessary since the part looks for []HTML Settings] in
// KGlobal::config() by default, which is wrong when running in Kontact
diff --git a/akregator/src/pageviewer.h b/akregator/src/pageviewer.h
index 2fb3a155c..82b497d65 100644
--- a/akregator/src/pageviewer.h
+++ b/akregator/src/pageviewer.h
@@ -42,7 +42,7 @@ namespace Akregator
Q_OBJECT
TQ_OBJECT
public:
- PageViewer(TQWidget* tqparent, const char* name);
+ PageViewer(TQWidget* parent, const char* name);
virtual ~PageViewer();
virtual bool openURL(const KURL &url);
diff --git a/akregator/src/plugin.h b/akregator/src/plugin.h
index 2d615ccbd..650a4a924 100644
--- a/akregator/src/plugin.h
+++ b/akregator/src/plugin.h
@@ -26,10 +26,10 @@ namespace Akregator
virtual bool init() = 0;
/**
- * TODO @param tqparent you must tqparent the widget to tqparent
+ * TODO @param parent you must parent the widget to parent
* @return the configure widget for your plugin, create it on the heap!
*/
- //TODO rename configureWidget( TQWidget *tqparent )
+ //TODO rename configureWidget( TQWidget *parent )
// virtual PluginConfig* configure() const { return 0; }
void addPluginProperty( const TQString& key, const TQString& value );
diff --git a/akregator/src/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp
index e3ce7b1e9..b5b732bae 100644
--- a/akregator/src/propertiesdialog.cpp
+++ b/akregator/src/propertiesdialog.cpp
@@ -38,8 +38,8 @@
namespace Akregator {
-FeedPropertiesWidget::FeedPropertiesWidget(TQWidget *tqparent, const char *name)
- : FeedPropertiesWidgetBase(tqparent, name)
+FeedPropertiesWidget::FeedPropertiesWidget(TQWidget *parent, const char *name)
+ : FeedPropertiesWidgetBase(parent, name)
{
}
@@ -65,8 +65,8 @@ void FeedPropertiesWidget::slotUpdateCheckBoxToggled( bool enabled )
}
-FeedPropertiesDialog::FeedPropertiesDialog(TQWidget *tqparent, const char *name)
- : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, tqparent, name, true, i18n("Feed Properties"), KDialogBase::Ok|KDialogBase::Cancel)
+FeedPropertiesDialog::FeedPropertiesDialog(TQWidget *parent, const char *name)
+ : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, parent, name, true, i18n("Feed Properties"), KDialogBase::Ok|KDialogBase::Cancel)
{
widget=new FeedPropertiesWidget(this);
setMainWidget(widget);
diff --git a/akregator/src/propertiesdialog.h b/akregator/src/propertiesdialog.h
index 0c854c361..8be70c615 100644
--- a/akregator/src/propertiesdialog.h
+++ b/akregator/src/propertiesdialog.h
@@ -35,7 +35,7 @@ namespace Akregator
Q_OBJECT
TQ_OBJECT
public:
- FeedPropertiesWidget(TQWidget *tqparent = 0, const char *name = 0);
+ FeedPropertiesWidget(TQWidget *parent = 0, const char *name = 0);
~FeedPropertiesWidget();
virtual void slotUpdateComboBoxActivated(int index);
virtual void slotUpdateCheckBoxToggled(bool enabled);
@@ -47,7 +47,7 @@ namespace Akregator
Q_OBJECT
TQ_OBJECT
public:
- FeedPropertiesDialog(TQWidget *tqparent = 0, const char *name = 0);
+ FeedPropertiesDialog(TQWidget *parent = 0, const char *name = 0);
~FeedPropertiesDialog();
void setFeed(Feed* feed);
diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp
index abb319af4..d6f9549a7 100644
--- a/akregator/src/searchbar.cpp
+++ b/akregator/src/searchbar.cpp
@@ -60,7 +60,7 @@ public:
int delay;
};
-SearchBar::SearchBar(TQWidget* tqparent, const char* name) : TQHBox(tqparent, name), d(new SearchBar::SearchBarPrivate)
+SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name), d(new SearchBar::SearchBarPrivate)
{
d->delay = 400;
setMargin(2);
diff --git a/akregator/src/searchbar.h b/akregator/src/searchbar.h
index 18cb5d07a..6aff87b54 100644
--- a/akregator/src/searchbar.h
+++ b/akregator/src/searchbar.h
@@ -44,7 +44,7 @@ class SearchBar : public TQHBox
public:
- SearchBar(TQWidget* tqparent=0, const char* name=0);
+ SearchBar(TQWidget* parent=0, const char* name=0);
virtual ~SearchBar();
TQString text() const;
diff --git a/akregator/src/settings_advanced.cpp b/akregator/src/settings_advanced.cpp
index 0aea7367f..7a849ff9b 100644
--- a/akregator/src/settings_advanced.cpp
+++ b/akregator/src/settings_advanced.cpp
@@ -11,7 +11,7 @@
namespace Akregator {
-SettingsAdvanced::SettingsAdvanced(TQWidget* tqparent, const char* name) : SettingsAdvancedBase(tqparent, name)
+SettingsAdvanced::SettingsAdvanced(TQWidget* parent, const char* name) : SettingsAdvancedBase(parent, name)
{
TQStringList backends = Backend::StorageFactoryRegistry::self()->list();
diff --git a/akregator/src/settings_advanced.h b/akregator/src/settings_advanced.h
index 2186645de..e8873cfa1 100644
--- a/akregator/src/settings_advanced.h
+++ b/akregator/src/settings_advanced.h
@@ -21,7 +21,7 @@ class SettingsAdvanced : public SettingsAdvancedBase
TQ_OBJECT
public:
- SettingsAdvanced(TQWidget* tqparent=0, const char* name=0);
+ SettingsAdvanced(TQWidget* parent=0, const char* name=0);
/** returns the key of the currently selected factory */
TQString selectedFactory() const;
diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp
index c4e91e5a6..5370bebef 100644
--- a/akregator/src/simplenodeselector.cpp
+++ b/akregator/src/simplenodeselector.cpp
@@ -44,8 +44,8 @@ class SelectNodeDialog::SelectNodeDialogPrivate
SimpleNodeSelector* widget;
};
-SelectNodeDialog::SelectNodeDialog(FeedList* feedList, TQWidget* tqparent, char* name) :
- KDialogBase(tqparent, name, true, i18n("Select Feed or Folder"),
+SelectNodeDialog::SelectNodeDialog(FeedList* feedList, TQWidget* parent, char* name) :
+ KDialogBase(parent, name, true, i18n("Select Feed or Folder"),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), d(new SelectNodeDialogPrivate)
{
d->widget = new SimpleNodeSelector(feedList, this);
@@ -111,7 +111,7 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor
virtual bool visitTreeNode(TreeNode* node)
{
- TQListViewItem* pi = node->tqparent() ? m_view->d->nodeToItem[node->tqparent()] : 0;
+ TQListViewItem* pi = node->parent() ? m_view->d->nodeToItem[node->parent()] : 0;
KListViewItem* item = 0;
if (pi != 0)
@@ -131,7 +131,7 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor
};
-SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* tqparent, const char* name) : TQWidget(tqparent, name), d(new SimpleNodeSelectorPrivate)
+SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, const char* name) : TQWidget(parent, name), d(new SimpleNodeSelectorPrivate)
{
d->list = feedList;
connect(feedList, TQT_SIGNAL(signalDestroyed(FeedList*)), this, TQT_SLOT(slotFeedListDestroyed(FeedList*)));
diff --git a/akregator/src/simplenodeselector.h b/akregator/src/simplenodeselector.h
index 97e87fda3..ccdacb84b 100644
--- a/akregator/src/simplenodeselector.h
+++ b/akregator/src/simplenodeselector.h
@@ -46,7 +46,7 @@ class SelectNodeDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- SelectNodeDialog(FeedList* feedList, TQWidget* tqparent=0, char* name=0);
+ SelectNodeDialog(FeedList* feedList, TQWidget* parent=0, char* name=0);
virtual ~SelectNodeDialog();
TreeNode* selectedNode() const;
@@ -70,7 +70,7 @@ class SimpleNodeSelector : public TQWidget
TQ_OBJECT
public:
- SimpleNodeSelector(FeedList* feedList, TQWidget* tqparent=0, const char* name=0);
+ SimpleNodeSelector(FeedList* feedList, TQWidget* parent=0, const char* name=0);
virtual ~SimpleNodeSelector();
TreeNode* selectedNode() const;
diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp
index cbd7e737a..be7857b6a 100644
--- a/akregator/src/tabwidget.cpp
+++ b/akregator/src/tabwidget.cpp
@@ -63,8 +63,8 @@ class TabWidget::TabWidgetPrivate
TQToolButton* tabsClose;
};
-TabWidget::TabWidget(TQWidget * tqparent, const char *name)
- :KTabWidget(tqparent, name), d(new TabWidgetPrivate)
+TabWidget::TabWidget(TQWidget * parent, const char *name)
+ :KTabWidget(parent, name), d(new TabWidgetPrivate)
{
d->CurrentMaxLength = 30;
d->currentItem = 0;
diff --git a/akregator/src/tabwidget.h b/akregator/src/tabwidget.h
index bd357ad01..ec7168c59 100644
--- a/akregator/src/tabwidget.h
+++ b/akregator/src/tabwidget.h
@@ -41,7 +41,7 @@ class TabWidget : public KTabWidget
TQ_OBJECT
public:
- TabWidget(TQWidget * tqparent = 0, const char *name = 0);
+ TabWidget(TQWidget * parent = 0, const char *name = 0);
virtual ~TabWidget();
void addFrame(Frame *f);
diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp
index 75ce305ea..d9c29a988 100644
--- a/akregator/src/tagaction.cpp
+++ b/akregator/src/tagaction.cpp
@@ -44,9 +44,9 @@ class TagAction::TagActionPrivate
//TQMap<TQPopupMenu*, int> popupToId;
};
-TagAction::TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *tqparent)
-//KAction (const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, TQObject *tqparent, const char *name=0)
- : KToggleAction(tag.name(), KShortcut(), 0, 0, tqparent), d(new TagActionPrivate)
+TagAction::TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *parent)
+//KAction (const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name=0)
+ : KToggleAction(tag.name(), KShortcut(), 0, 0, parent), d(new TagActionPrivate)
{
d->tag = tag;
connect(this, TQT_SIGNAL(toggled(const Tag&, bool)), receiver, slot);
diff --git a/akregator/src/tagaction.h b/akregator/src/tagaction.h
index f87606395..43142ecc4 100644
--- a/akregator/src/tagaction.h
+++ b/akregator/src/tagaction.h
@@ -42,7 +42,7 @@ class TagAction : public KToggleAction
public:
- TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *tqparent=0);
+ TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *parent=0);
virtual ~TagAction();
//virtual int plug(TQWidget *widget, int index=-1);
diff --git a/akregator/src/tagfolder.cpp b/akregator/src/tagfolder.cpp
index bb361fce6..7aa8190fb 100644
--- a/akregator/src/tagfolder.cpp
+++ b/akregator/src/tagfolder.cpp
@@ -52,7 +52,7 @@ bool TagFolder::accept(TreeNodeVisitor* visitor)
return visitor->visitFolder(this);
}
-TQDomElement TagFolder::toOPML( TQDomElement /*tqparent*/, TQDomDocument /*document*/ ) const
+TQDomElement TagFolder::toOPML( TQDomElement /*parent*/, TQDomDocument /*document*/ ) const
{
return TQDomElement();
}
diff --git a/akregator/src/tagfolder.h b/akregator/src/tagfolder.h
index 1c883ff05..49a8ddf72 100644
--- a/akregator/src/tagfolder.h
+++ b/akregator/src/tagfolder.h
@@ -43,7 +43,7 @@ class TagFolder : public Folder
virtual ~TagFolder();
virtual bool accept(TreeNodeVisitor* visitor);
- virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const;
+ virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const;
private:
class TagFolderPrivate;
diff --git a/akregator/src/tagfolderitem.cpp b/akregator/src/tagfolderitem.cpp
index fe57de4a4..09fcf0c2b 100644
--- a/akregator/src/tagfolderitem.cpp
+++ b/akregator/src/tagfolderitem.cpp
@@ -33,19 +33,19 @@
namespace Akregator {
-TagFolderItem::TagFolderItem(FolderItem* tqparent, TagFolder* node) : FolderItem(tqparent, node)
+TagFolderItem::TagFolderItem(FolderItem* parent, TagFolder* node) : FolderItem(parent, node)
{
}
-TagFolderItem::TagFolderItem(FolderItem* tqparent, TreeNodeItem* after, TagFolder* node) : FolderItem(tqparent, after, node)
+TagFolderItem::TagFolderItem(FolderItem* parent, TreeNodeItem* after, TagFolder* node) : FolderItem(parent, after, node)
{
}
-TagFolderItem::TagFolderItem(KListView* tqparent, TagFolder* node) : FolderItem(tqparent, node)
+TagFolderItem::TagFolderItem(KListView* parent, TagFolder* node) : FolderItem(parent, node)
{
}
-TagFolderItem::TagFolderItem(KListView* tqparent, TreeNodeItem* after, TagFolder* node) : FolderItem(tqparent, after, node)
+TagFolderItem::TagFolderItem(KListView* parent, TreeNodeItem* after, TagFolder* node) : FolderItem(parent, after, node)
{
}
diff --git a/akregator/src/tagfolderitem.h b/akregator/src/tagfolderitem.h
index 6cdefa3d5..fc9102666 100644
--- a/akregator/src/tagfolderitem.h
+++ b/akregator/src/tagfolderitem.h
@@ -40,10 +40,10 @@ class TagFolderItem : public FolderItem
{
public:
- TagFolderItem(FolderItem* tqparent, TagFolder* node);
- TagFolderItem(FolderItem* tqparent, TreeNodeItem* after, TagFolder* node);
- TagFolderItem(KListView* tqparent, TagFolder* node);
- TagFolderItem(KListView* tqparent, TreeNodeItem* after, TagFolder* node);
+ TagFolderItem(FolderItem* parent, TagFolder* node);
+ TagFolderItem(FolderItem* parent, TreeNodeItem* after, TagFolder* node);
+ TagFolderItem(KListView* parent, TagFolder* node);
+ TagFolderItem(KListView* parent, TreeNodeItem* after, TagFolder* node);
virtual ~TagFolderItem();
virtual TagFolder* node();
diff --git a/akregator/src/tagnode.cpp b/akregator/src/tagnode.cpp
index 24d81755a..55273f727 100644
--- a/akregator/src/tagnode.cpp
+++ b/akregator/src/tagnode.cpp
@@ -131,7 +131,7 @@ TQStringList TagNode::tags() const
return TQStringList();
}
-TQDomElement TagNode::toOPML( TQDomElement tqparent, TQDomDocument document ) const
+TQDomElement TagNode::toOPML( TQDomElement parent, TQDomDocument document ) const
{
return TQDomElement();
}
@@ -141,13 +141,13 @@ TreeNode* TagNode::next()
if ( nextSibling() )
return nextSibling();
- Folder* p = tqparent();
+ Folder* p = parent();
while (p)
{
if ( p->nextSibling() )
return p->nextSibling();
else
- p = p->tqparent();
+ p = p->parent();
}
return 0;
}
diff --git a/akregator/src/tagnode.h b/akregator/src/tagnode.h
index ebdf15a00..db3d82251 100644
--- a/akregator/src/tagnode.h
+++ b/akregator/src/tagnode.h
@@ -93,7 +93,7 @@ public:
/** reimplemented to return an invalid element */
- virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const;
+ virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const;
/** returns the next node in the tree.
Calling next() unless it returns 0 iterates through the tree in pre-order
diff --git a/akregator/src/tagnodeitem.cpp b/akregator/src/tagnodeitem.cpp
index ec083145c..90e05ba2f 100644
--- a/akregator/src/tagnodeitem.cpp
+++ b/akregator/src/tagnodeitem.cpp
@@ -35,22 +35,22 @@
namespace Akregator {
-TagNodeItem::TagNodeItem(FolderItem* tqparent, TagNode* node) : TreeNodeItem(tqparent, node)
+TagNodeItem::TagNodeItem(FolderItem* parent, TagNode* node) : TreeNodeItem(parent, node)
{
initialize(node);
}
-TagNodeItem::TagNodeItem(FolderItem* tqparent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(tqparent, after, node)
+TagNodeItem::TagNodeItem(FolderItem* parent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(parent, after, node)
{
initialize(node);
}
-TagNodeItem::TagNodeItem(KListView* tqparent, TagNode* node) : TreeNodeItem(tqparent, node)
+TagNodeItem::TagNodeItem(KListView* parent, TagNode* node) : TreeNodeItem(parent, node)
{
initialize(node);
}
-TagNodeItem::TagNodeItem(KListView* tqparent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(tqparent, after, node)
+TagNodeItem::TagNodeItem(KListView* parent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(parent, after, node)
{
initialize(node);
}
diff --git a/akregator/src/tagnodeitem.h b/akregator/src/tagnodeitem.h
index f5ea5edf5..a2719bb30 100644
--- a/akregator/src/tagnodeitem.h
+++ b/akregator/src/tagnodeitem.h
@@ -37,10 +37,10 @@ class TagNodeItem : public TreeNodeItem
{
public:
- TagNodeItem(FolderItem* tqparent, TagNode* node);
- TagNodeItem(FolderItem* tqparent, TreeNodeItem* after, TagNode* node);
- TagNodeItem(KListView* tqparent, TagNode* node);
- TagNodeItem(KListView* tqparent, TreeNodeItem* after, TagNode* node);
+ TagNodeItem(FolderItem* parent, TagNode* node);
+ TagNodeItem(FolderItem* parent, TreeNodeItem* after, TagNode* node);
+ TagNodeItem(KListView* parent, TagNode* node);
+ TagNodeItem(KListView* parent, TreeNodeItem* after, TagNode* node);
virtual ~TagNodeItem();
virtual void nodeChanged();
diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp
index cf87b7707..46acb9d1b 100644
--- a/akregator/src/tagnodelist.cpp
+++ b/akregator/src/tagnodelist.cpp
@@ -142,14 +142,14 @@ void TagNodeList::slotNodeAdded(TreeNode* node)
}
}
-void TagNodeList::slotNodeRemoved(Folder* tqparent, TreeNode* node)
+void TagNodeList::slotNodeRemoved(Folder* parent, TreeNode* node)
{
- NodeList::slotNodeRemoved(tqparent, node);
+ NodeList::slotNodeRemoved(parent, node);
TagNode* tagNode = dynamic_cast<TagNode*>(node);
TQString id = tagNode ? tagNode->tag().id() : TQString();
- if (tqparent == rootNode() && tagNode != 0L && containsTagId(id))
+ if (parent == rootNode() && tagNode != 0L && containsTagId(id))
{
d->tagIdToNodeMap.remove(id);
emit signalTagNodeRemoved(tagNode);
diff --git a/akregator/src/tagnodelist.h b/akregator/src/tagnodelist.h
index 02d1bf8b0..5f06f455b 100644
--- a/akregator/src/tagnodelist.h
+++ b/akregator/src/tagnodelist.h
@@ -80,7 +80,7 @@ namespace Akregator {
virtual void slotNodeDestroyed(TreeNode* node);
virtual void slotNodeAdded(TreeNode* node);
- virtual void slotNodeRemoved(Folder* tqparent, TreeNode* node);
+ virtual void slotNodeRemoved(Folder* parent, TreeNode* node);
private:
diff --git a/akregator/src/tagpropertiesdialog.cpp b/akregator/src/tagpropertiesdialog.cpp
index f14b7494b..531b7ff9f 100644
--- a/akregator/src/tagpropertiesdialog.cpp
+++ b/akregator/src/tagpropertiesdialog.cpp
@@ -40,7 +40,7 @@ class TagPropertiesDialog::TagPropertiesDialogPrivate
TagPropertiesWidgetBase* widget;
};
-TagPropertiesDialog::TagPropertiesDialog(TQWidget *tqparent, const char *name) : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, tqparent, name, true, i18n("Tag Properties"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Apply), d(new TagPropertiesDialogPrivate)
+TagPropertiesDialog::TagPropertiesDialog(TQWidget *parent, const char *name) : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, parent, name, true, i18n("Tag Properties"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Apply), d(new TagPropertiesDialogPrivate)
{
d->widget = new TagPropertiesWidgetBase(this);
setMainWidget(d->widget);
diff --git a/akregator/src/tagpropertiesdialog.h b/akregator/src/tagpropertiesdialog.h
index 3665bbe44..1dffd8dac 100644
--- a/akregator/src/tagpropertiesdialog.h
+++ b/akregator/src/tagpropertiesdialog.h
@@ -38,7 +38,7 @@ class TagPropertiesDialog : public KDialogBase
public:
- TagPropertiesDialog(TQWidget *tqparent=0, const char *name=0);
+ TagPropertiesDialog(TQWidget *parent=0, const char *name=0);
virtual ~TagPropertiesDialog();
void setTag(const Tag& tag);
diff --git a/akregator/src/tagset.cpp b/akregator/src/tagset.cpp
index a6b412856..fd1cd42f0 100644
--- a/akregator/src/tagset.cpp
+++ b/akregator/src/tagset.cpp
@@ -38,7 +38,7 @@ class TagSet::TagSetPrivate
TQMap<TQString,Tag> map;
};
-TagSet::TagSet(TQObject* tqparent) : TQObject(tqparent), d(new TagSetPrivate)
+TagSet::TagSet(TQObject* parent) : TQObject(parent), d(new TagSetPrivate)
{
}
diff --git a/akregator/src/tagset.h b/akregator/src/tagset.h
index 49b19aed9..4a1c83247 100644
--- a/akregator/src/tagset.h
+++ b/akregator/src/tagset.h
@@ -51,7 +51,7 @@ class TagSet : public TQObject
TQ_OBJECT
public:
- TagSet(TQObject* tqparent=0);
+ TagSet(TQObject* parent=0);
virtual ~TagSet();
/** adds a tag to the tag set. The tag set will emit signalTagAdded */
diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp
index e48593354..e2fb42274 100644
--- a/akregator/src/trayicon.cpp
+++ b/akregator/src/trayicon.cpp
@@ -57,8 +57,8 @@ void TrayIcon::setInstance(TrayIcon* trayIcon)
}
-TrayIcon::TrayIcon(TQWidget *tqparent, const char *name)
- : KSystemTray(tqparent, name), m_unread(0)
+TrayIcon::TrayIcon(TQWidget *parent, const char *name)
+ : KSystemTray(parent, name), m_unread(0)
{
m_defaultIcon=KSystemTray::loadIcon("akregator");
TQPixmap m_unreadIcon=KSystemTray::loadIcon("akregator_empty");
@@ -177,7 +177,7 @@ void TrayIcon::slotSetUnread(int unread)
void TrayIcon::viewButtonClicked()
{
- TQWidget *p=TQT_TQWIDGET(tqparent());
+ TQWidget *p=TQT_TQWIDGET(parent());
KWin::forceActiveWindow(p->winId());
}
diff --git a/akregator/src/trayicon.h b/akregator/src/trayicon.h
index 316d938b0..4af30613c 100644
--- a/akregator/src/trayicon.h
+++ b/akregator/src/trayicon.h
@@ -40,7 +40,7 @@ namespace Akregator
static TrayIcon* getInstance();
static void setInstance(TrayIcon* trayIcon);
- TrayIcon(TQWidget *tqparent = 0, const char *name = 0);
+ TrayIcon(TQWidget *parent = 0, const char *name = 0);
~TrayIcon();
TQPixmap takeScreenshot() const;
diff --git a/akregator/src/treenode.cpp b/akregator/src/treenode.cpp
index 58e4ae8ea..9cc716b45 100644
--- a/akregator/src/treenode.cpp
+++ b/akregator/src/treenode.cpp
@@ -40,7 +40,7 @@ class TreeNode::TreeNodePrivate
bool nodeChangeOccurred;
bool articleChangeOccurred;
TQString title;
- Folder* tqparent;
+ Folder* parent;
uint id;
bool signalDestroyedEmitted;
};
@@ -52,7 +52,7 @@ TreeNode::TreeNode()
d->nodeChangeOccurred = false;
d->articleChangeOccurred = false;
d->title = "";
- d->tqparent = 0;
+ d->parent = 0;
d->id = 0;
d->signalDestroyedEmitted = false;
@@ -91,9 +91,9 @@ void TreeNode::setTitle(const TQString& title)
TreeNode* TreeNode::nextSibling() const
{
- if (!d->tqparent)
+ if (!d->parent)
return 0;
- TQValueList<TreeNode*> tqchildren = d->tqparent->tqchildren();
+ TQValueList<TreeNode*> tqchildren = d->parent->tqchildren();
TreeNode* me = (TreeNode*)this;
int idx = tqchildren.findIndex(me);
@@ -103,23 +103,23 @@ TreeNode* TreeNode::nextSibling() const
TreeNode* TreeNode::prevSibling() const
{
- if (!d->tqparent)
+ if (!d->parent)
return 0;
- TQValueList<TreeNode*> tqchildren = d->tqparent->tqchildren();
+ TQValueList<TreeNode*> tqchildren = d->parent->tqchildren();
TreeNode* me = (TreeNode*)this;
int idx = tqchildren.findIndex(me);
- return idx > 0 ? *(d->tqparent->tqchildren().at(idx-1)) : 0L;
+ return idx > 0 ? *(d->parent->tqchildren().at(idx-1)) : 0L;
}
-Folder* TreeNode::tqparent() const
+Folder* TreeNode::parent() const
{
- return d->tqparent;
+ return d->parent;
}
-void TreeNode::setParent(Folder* tqparent)
+void TreeNode::setParent(Folder* parent)
{
- d->tqparent = tqparent;
+ d->parent = parent;
}
void TreeNode::setNotificationMode(bool doNotify, bool notifyOccurredChanges)
diff --git a/akregator/src/treenode.h b/akregator/src/treenode.h
index b50b050a6..305bc5d47 100644
--- a/akregator/src/treenode.h
+++ b/akregator/src/treenode.h
@@ -100,16 +100,16 @@ public:
virtual TreeNode* prevSibling() const;
- /** Returns the tqparent node.
- @return the tqparent feed group, 0 if there is none */
+ /** Returns the parent node.
+ @return the parent feed group, 0 if there is none */
- virtual Folder* tqparent() const;
+ virtual Folder* parent() const;
- /** Sets tqparent node; Don't call this directly, is done automatically by
+ /** Sets parent node; Don't call this directly, is done automatically by
insertChild-methods in @ref Folder. */
- virtual void setParent(Folder* tqparent);
+ virtual void setParent(Folder* parent);
/** Returns a sequence of the articles this node contains. For feed groups, this returns a concatenated list of all articles in the sub tree.
@@ -128,10 +128,10 @@ public:
virtual bool isGroup() const = 0;
/** exports node and child nodes to OPML (with akregator settings)
- @param tqparent the dom element the child node will be attached to
+ @param parent the dom element the child node will be attached to
@param document the opml document */
- virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const = 0;
+ virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const = 0;
/**
@param doNotify notification on changes on/off flag
diff --git a/akregator/src/treenodeitem.cpp b/akregator/src/treenodeitem.cpp
index a5955a9f7..32b12c9c5 100644
--- a/akregator/src/treenodeitem.cpp
+++ b/akregator/src/treenodeitem.cpp
@@ -36,25 +36,25 @@
namespace Akregator {
-TreeNodeItem::TreeNodeItem(FolderItem* tqparent, TreeNode* node)
- : KListViewItem(tqparent), m_node(node)
+TreeNodeItem::TreeNodeItem(FolderItem* parent, TreeNode* node)
+ : KListViewItem(parent), m_node(node)
{
initialize(node);
}
-TreeNodeItem::TreeNodeItem(KListView* tqparent, TreeNode* node)
- : KListViewItem(tqparent), m_node(node)
+TreeNodeItem::TreeNodeItem(KListView* parent, TreeNode* node)
+ : KListViewItem(parent), m_node(node)
{
initialize(node);
}
-TreeNodeItem::TreeNodeItem(KListView* tqparent, TreeNodeItem* after, TreeNode* node) : KListViewItem(tqparent, after), m_node(node)
+TreeNodeItem::TreeNodeItem(KListView* parent, TreeNodeItem* after, TreeNode* node) : KListViewItem(parent, after), m_node(node)
{
initialize(node);
}
-TreeNodeItem::TreeNodeItem(FolderItem* tqparent, TreeNodeItem* after, TreeNode* node)
- : KListViewItem(tqparent, after), m_node(node)
+TreeNodeItem::TreeNodeItem(FolderItem* parent, TreeNodeItem* after, TreeNode* node)
+ : KListViewItem(parent, after), m_node(node)
{
initialize(node);
}
@@ -99,9 +99,9 @@ TreeNodeItem* TreeNodeItem::nextSibling() const
return static_cast<TreeNodeItem*>(KListViewItem::nextSibling());
}
-FolderItem* TreeNodeItem::tqparent() const
+FolderItem* TreeNodeItem::parent() const
{
- return static_cast<FolderItem*>(KListViewItem::tqparent());
+ return static_cast<FolderItem*>(KListViewItem::parent());
}
diff --git a/akregator/src/treenodeitem.h b/akregator/src/treenodeitem.h
index 3b263d734..386da0d5d 100644
--- a/akregator/src/treenodeitem.h
+++ b/akregator/src/treenodeitem.h
@@ -43,10 +43,10 @@ class TreeNodeItem : public KListViewItem
public:
- TreeNodeItem(FolderItem* tqparent, TreeNode* node);
- TreeNodeItem(FolderItem* tqparent, TreeNodeItem* after, TreeNode* node);
- TreeNodeItem(KListView* tqparent, TreeNode* node);
- TreeNodeItem(KListView* tqparent, TreeNodeItem* after, TreeNode* node);
+ TreeNodeItem(FolderItem* parent, TreeNode* node);
+ TreeNodeItem(FolderItem* parent, TreeNodeItem* after, TreeNode* node);
+ TreeNodeItem(KListView* parent, TreeNode* node);
+ TreeNodeItem(KListView* parent, TreeNodeItem* after, TreeNode* node);
virtual ~TreeNodeItem();
virtual TreeNode* node();
@@ -55,7 +55,7 @@ public:
virtual TQString toolTip() const;
virtual TreeNodeItem* firstChild() const;
virtual TreeNodeItem* nextSibling() const;
- virtual FolderItem* tqparent() const;
+ virtual FolderItem* parent() const;
virtual void showContextMenu(const TQPoint& p) = 0;
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index 4302f0a7e..d24e715f8 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -47,8 +47,8 @@
namespace Akregator {
-Viewer::Viewer(TQWidget *tqparent, const char *name)
- : KHTMLPart(tqparent, name), m_url(0)
+Viewer::Viewer(TQWidget *parent, const char *name)
+ : KHTMLPart(parent, name), m_url(0)
{
setZoomFactor(100);
setMetaRefreshEnabled(true);
diff --git a/akregator/src/viewer.h b/akregator/src/viewer.h
index c6e2c4432..d01949c9b 100644
--- a/akregator/src/viewer.h
+++ b/akregator/src/viewer.h
@@ -47,7 +47,7 @@ namespace Akregator
*/
static void displayInExternalBrowser(const KURL &url, const TQString& mimetype=TQString());
- Viewer(TQWidget* tqparent, const char* name);
+ Viewer(TQWidget* parent, const char* name);
virtual ~Viewer();
virtual bool closeURL();