rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 12 years ago
parent 4c6f8d69e2
commit 36a36a5c10

@ -1696,10 +1696,10 @@ Problems addressed
* kolab/issue2142 ( part 1 ) Make sure the file selector is shown on top of the filter dialog. (732794)
* crash when there is no smime backend, and the protocol can't be determined.(733049 )
* kolab/issue2151 Fix creation of new folders when restarting KMail before the next sync. ( 733149 )
* kolab/issue2142 ( part 2 ) Provide a proper tqparent for the "ask to overwrite" dialog.(733495)
* kolab/issue2142 ( part 2 ) Provide a proper parent for the "ask to overwrite" dialog.(733495)
* kolab/issue 2176 Move transaction code into the filtermanager, from the caller and make sure filter counts are written to and read from the right section. ( 733511 )
* kolab/issue2175 Show an error message if the to-be-imported filters file can't be read. (733519 )
* kolab/issue2181 Fix crash when opening a message without a tqparent, cleanup initialization order.(734247)
* kolab/issue2181 Fix crash when opening a message without a parent, cleanup initialization order.(734247)
New functionality
-------------------

@ -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()

@ -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;

@ -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;

@ -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);

@ -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&)));

@ -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);

@ -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)

@ -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();

@ -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);
}
}

@ -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);

@ -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;

@ -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 */

@ -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);

@ -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);

@ -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");

@ -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();

@ -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;
}

@ -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

@ -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)",

@ -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);
}

@ -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();

@ -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;
}
}

@ -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() {}

@ -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);
}
}

@ -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:

@ -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()

@ -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 */

@ -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;
}

@ -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

@ -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)