Browse Source

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
tags/v3.5.13
tpearson 8 years ago
parent
commit
36a36a5c10
100 changed files with 392 additions and 392 deletions
  1. 2
    2
      NewsLog.txt
  2. 1
    1
      akregator/src/actionmanager.cpp
  3. 1
    1
      akregator/src/actionmanager.h
  4. 2
    2
      akregator/src/actionmanagerimpl.cpp
  5. 1
    1
      akregator/src/actionmanagerimpl.h
  6. 4
    4
      akregator/src/addfeeddialog.cpp
  7. 2
    2
      akregator/src/addfeeddialog.h
  8. 2
    2
      akregator/src/akregator_part.cpp
  9. 1
    1
      akregator/src/akregator_part.h
  10. 28
    28
      akregator/src/akregator_view.cpp
  11. 7
    7
      akregator/src/akregator_view.h
  12. 9
    9
      akregator/src/articlelistview.cpp
  13. 1
    1
      akregator/src/articlelistview.h
  14. 2
    2
      akregator/src/articleviewer.cpp
  15. 1
    1
      akregator/src/articleviewer.h
  16. 1
    1
      akregator/src/configdialog.cpp
  17. 1
    1
      akregator/src/configdialog.h
  18. 4
    4
      akregator/src/feed.cpp
  19. 1
    1
      akregator/src/feed.h
  20. 2
    2
      akregator/src/feediconmanager.cpp
  21. 4
    4
      akregator/src/feeditem.cpp
  22. 4
    4
      akregator/src/feeditem.h
  23. 9
    9
      akregator/src/feedlist.cpp
  24. 3
    3
      akregator/src/feedlist.h
  25. 34
    34
      akregator/src/feedlistview.cpp
  26. 6
    6
      akregator/src/feedlistview.h
  27. 1
    1
      akregator/src/fetchqueue.cpp
  28. 1
    1
      akregator/src/fetchqueue.h
  29. 4
    4
      akregator/src/folder.cpp
  30. 3
    3
      akregator/src/folder.h
  31. 4
    4
      akregator/src/folderitem.cpp
  32. 4
    4
      akregator/src/folderitem.h
  33. 2
    2
      akregator/src/frame.cpp
  34. 1
    1
      akregator/src/frame.h
  35. 2
    2
      akregator/src/librss/article.cpp
  36. 2
    2
      akregator/src/librss/article.h
  37. 1
    1
      akregator/src/librss/document.cpp
  38. 6
    6
      akregator/src/librss/tools_p.cpp
  39. 3
    3
      akregator/src/librss/tools_p.h
  40. 1
    1
      akregator/src/listtabwidget.cpp
  41. 2
    2
      akregator/src/listtabwidget.h
  42. 1
    1
      akregator/src/mk4storage/metakit/CHANGES
  43. 3
    3
      akregator/src/mk4storage/metakit/src/column.cpp
  44. 64
    64
      akregator/src/mk4storage/metakit/src/custom.cpp
  45. 9
    9
      akregator/src/mk4storage/metakit/src/handler.cpp
  46. 1
    1
      akregator/src/mk4storage/metakit/src/handler.h
  47. 1
    1
      akregator/src/mk4storage/metakit/src/handler.inl
  48. 6
    6
      akregator/src/mk4storage/metakit/src/remap.cpp
  49. 1
    1
      akregator/src/mk4storage/metakit/tests/ok/f07a.txt
  50. 1
    1
      akregator/src/mk4storage/metakit/tests/tformat.cpp
  51. 4
    4
      akregator/src/nodelist.cpp
  52. 2
    2
      akregator/src/nodelist.h
  53. 2
    2
      akregator/src/pageviewer.cpp
  54. 1
    1
      akregator/src/pageviewer.h
  55. 2
    2
      akregator/src/plugin.h
  56. 4
    4
      akregator/src/propertiesdialog.cpp
  57. 2
    2
      akregator/src/propertiesdialog.h
  58. 1
    1
      akregator/src/searchbar.cpp
  59. 1
    1
      akregator/src/searchbar.h
  60. 1
    1
      akregator/src/settings_advanced.cpp
  61. 1
    1
      akregator/src/settings_advanced.h
  62. 4
    4
      akregator/src/simplenodeselector.cpp
  63. 2
    2
      akregator/src/simplenodeselector.h
  64. 2
    2
      akregator/src/tabwidget.cpp
  65. 1
    1
      akregator/src/tabwidget.h
  66. 3
    3
      akregator/src/tagaction.cpp
  67. 1
    1
      akregator/src/tagaction.h
  68. 1
    1
      akregator/src/tagfolder.cpp
  69. 1
    1
      akregator/src/tagfolder.h
  70. 4
    4
      akregator/src/tagfolderitem.cpp
  71. 4
    4
      akregator/src/tagfolderitem.h
  72. 3
    3
      akregator/src/tagnode.cpp
  73. 1
    1
      akregator/src/tagnode.h
  74. 4
    4
      akregator/src/tagnodeitem.cpp
  75. 4
    4
      akregator/src/tagnodeitem.h
  76. 3
    3
      akregator/src/tagnodelist.cpp
  77. 1
    1
      akregator/src/tagnodelist.h
  78. 1
    1
      akregator/src/tagpropertiesdialog.cpp
  79. 1
    1
      akregator/src/tagpropertiesdialog.h
  80. 1
    1
      akregator/src/tagset.cpp
  81. 1
    1
      akregator/src/tagset.h
  82. 3
    3
      akregator/src/trayicon.cpp
  83. 1
    1
      akregator/src/trayicon.h
  84. 11
    11
      akregator/src/treenode.cpp
  85. 7
    7
      akregator/src/treenode.h
  86. 9
    9
      akregator/src/treenodeitem.cpp
  87. 5
    5
      akregator/src/treenodeitem.h
  88. 2
    2
      akregator/src/viewer.cpp
  89. 1
    1
      akregator/src/viewer.h
  90. 4
    4
      certmanager/certificateinfowidgetimpl.cpp
  91. 1
    1
      certmanager/certificateinfowidgetimpl.h
  92. 3
    3
      certmanager/certificatewizardimpl.cpp
  93. 1
    1
      certmanager/certificatewizardimpl.h
  94. 2
    2
      certmanager/certlistview.cpp
  95. 1
    1
      certmanager/certlistview.h
  96. 14
    14
      certmanager/certmanager.cpp
  97. 1
    1
      certmanager/certmanager.h
  98. 4
    4
      certmanager/conf/appearanceconfigpage.cpp
  99. 1
    1
      certmanager/conf/appearanceconfigpage.h
  100. 0
    0
      certmanager/conf/appearanceconfigwidget.cpp

+ 2
- 2
NewsLog.txt View File

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

+ 1
- 1
akregator/src/actionmanager.cpp View File

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

+ 1
- 1
akregator/src/actionmanager.h View File

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

+ 2
- 2
akregator/src/actionmanagerimpl.cpp View File

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

+ 1
- 1
akregator/src/actionmanagerimpl.h View File

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

+ 4
- 4
akregator/src/addfeeddialog.cpp View File

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

+ 2
- 2
akregator/src/addfeeddialog.h View File

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

+ 2
- 2
akregator/src/akregator_part.cpp View File

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

+ 1
- 1
akregator/src/akregator_part.h View File

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

+ 28
- 28
akregator/src/akregator_view.cpp View File

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


+ 7
- 7
akregator/src/akregator_view.h View File

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

+ 9
- 9
akregator/src/articlelistview.cpp View File

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

+ 1
- 1
akregator/src/articlelistview.h View File

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

+ 2
- 2
akregator/src/articleviewer.cpp View File

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

+ 1
- 1
akregator/src/articleviewer.h View File

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

+ 1
- 1
akregator/src/configdialog.cpp View File

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

+ 1
- 1
akregator/src/configdialog.h View File

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


+ 4
- 4
akregator/src/feed.cpp View File

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

+ 1
- 1
akregator/src/feed.h View File

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

+ 2
- 2
akregator/src/feediconmanager.cpp View File

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

+ 4
- 4
akregator/src/feeditem.cpp View File

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

+ 4
- 4
akregator/src/feeditem.h View File

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

+ 9
- 9
akregator/src/feedlist.cpp View File

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

+ 3
- 3
akregator/src/feedlist.h View File

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

+ 34
- 34
akregator/src/feedlistview.cpp View File

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


+ 6
- 6
akregator/src/feedlistview.h View File

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

+ 1
- 1
akregator/src/fetchqueue.cpp View File

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

+ 1
- 1
akregator/src/fetchqueue.h View File

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

+ 4
- 4
akregator/src/folder.cpp View File

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

+ 3
- 3
akregator/src/folder.h View File

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

+ 4
- 4
akregator/src/folderitem.cpp View File

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

+ 4
- 4
akregator/src/folderitem.h View File

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

+ 2
- 2
akregator/src/frame.cpp View File

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

+ 1
- 1
akregator/src/frame.h View File

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

+ 2
- 2
akregator/src/librss/article.cpp View File

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

+ 2
- 2
akregator/src/librss/article.h View File

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

+ 1
- 1
akregator/src/librss/document.cpp View File

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

+ 6
- 6
akregator/src/librss/tools_p.cpp View File

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


+ 3
- 3
akregator/src/librss/tools_p.h View File

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

+ 1
- 1
akregator/src/listtabwidget.cpp View File

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

+ 2
- 2
akregator/src/listtabwidget.h View File

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

+ 1
- 1
akregator/src/mk4storage/metakit/CHANGES View File

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


+ 3
- 3
akregator/src/mk4storage/metakit/src/column.cpp View File

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

+ 64
- 64
akregator/src/mk4storage/metakit/src/custom.cpp View File

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

+ 9
- 9
akregator/src/mk4storage/metakit/src/handler.cpp View File

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

+ 1
- 1
akregator/src/mk4storage/metakit/src/handler.h View File

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

+ 1
- 1
akregator/src/mk4storage/metakit/src/handler.inl View File

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

/////////////////////////////////////////////////////////////////////////////

+ 6
- 6
akregator/src/mk4storage/metakit/src/remap.cpp View File

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


+ 1
- 1
akregator/src/mk4storage/metakit/tests/ok/f07a.txt View File

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

+ 1
- 1
akregator/src/mk4storage/metakit/tests/tformat.cpp View File

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


+ 4
- 4
akregator/src/nodelist.cpp View File

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

+ 2
- 2
akregator/src/nodelist.h View File

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

+ 2
- 2
akregator/src/pageviewer.cpp View File

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

+ 1
- 1
akregator/src/pageviewer.h View File

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


+ 2
- 2
akregator/src/plugin.h View File

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

+ 4
- 4
akregator/src/propertiesdialog.cpp View File

@@ -38,8 +38,8 @@