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-ecb5cbfe19
tpearson 7 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
1696 1696
 * kolab/issue2142 ( part 1 ) Make sure the file selector is shown on top of the filter dialog. (732794)
1697 1697
 * crash when there is no smime backend, and the protocol can't be determined.(733049 )
1698 1698
 * kolab/issue2151 Fix creation of new folders when restarting KMail before the next sync. ( 733149 )
1699
-* kolab/issue2142 ( part 2 ) Provide a proper tqparent for the "ask to overwrite" dialog.(733495)
1699
+* kolab/issue2142 ( part 2 ) Provide a proper parent for the "ask to overwrite" dialog.(733495)
1700 1700
 * 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 )
1701 1701
 * kolab/issue2175 Show an error message if the to-be-imported filters file can't be read. (733519 )
1702
-* kolab/issue2181 Fix crash when opening a message without a tqparent, cleanup initialization order.(734247)
1702
+* kolab/issue2181 Fix crash when opening a message without a parent, cleanup initialization order.(734247)
1703 1703
 
1704 1704
 New functionality
1705 1705
 -------------------

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

@@ -43,7 +43,7 @@ void ActionManager::setInstance(ActionManager* manager)
43 43
 }
44 44
 
45 45
 
46
-ActionManager::ActionManager(TQObject* tqparent, const char* name) : TQObject(tqparent, name), d(new ActionManagerPrivate)
46
+ActionManager::ActionManager(TQObject* parent, const char* name) : TQObject(parent, name), d(new ActionManagerPrivate)
47 47
 {}
48 48
 
49 49
 ActionManager::~ActionManager()

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

@@ -43,7 +43,7 @@ class ActionManager : public TQObject
43 43
         static ActionManager* getInstance();
44 44
         static void setInstance(ActionManager* manager);
45 45
 
46
-        ActionManager(TQObject* tqparent=0, const char* name=0);
46
+        ActionManager(TQObject* parent=0, const char* name=0);
47 47
         virtual ~ActionManager();
48 48
 
49 49
         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
89 89
     {
90 90
         KAction* remove = m_manager->action("feed_remove");
91 91
         if (remove)
92
-            remove->setEnabled(node->tqparent()); // root nodes must not be deleted
92
+            remove->setEnabled(node->parent()); // root nodes must not be deleted
93 93
         KAction* hp = m_manager->action("feed_homepage");
94 94
         if (hp)
95 95
             hp->setEnabled(false);
@@ -222,7 +222,7 @@ void ActionManagerImpl::slotNodeSelected(TreeNode* node)
222 222
         d->nodeSelectVisitor->visit(node);
223 223
 }
224 224
 
225
-ActionManagerImpl::ActionManagerImpl(Part* part, TQObject* tqparent, const char* name) : ActionManager(tqparent, name), d(new ActionManagerImplPrivate)
225
+ActionManagerImpl::ActionManagerImpl(Part* part, TQObject* parent, const char* name) : ActionManager(parent, name), d(new ActionManagerImplPrivate)
226 226
 {
227 227
     d->nodeSelectVisitor = new NodeSelectVisitor(this);
228 228
     d->part = part;

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

@@ -53,7 +53,7 @@ class ActionManagerImpl : public ActionManager
53 53
   TQ_OBJECT
54 54
 
55 55
     public:
56
-        ActionManagerImpl(Part* part, TQObject* tqparent=0, const char* name=0);
56
+        ActionManagerImpl(Part* part, TQObject* parent=0, const char* name=0);
57 57
         virtual ~ActionManagerImpl();
58 58
 
59 59
         virtual KAction* action(const char* name, const char* classname=0);

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

@@ -39,8 +39,8 @@
39 39
 
40 40
 namespace Akregator {
41 41
 
42
-AddFeedWidget::AddFeedWidget(TQWidget *tqparent, const char *name)
43
-   : AddFeedWidgetBase(tqparent, name)
42
+AddFeedWidget::AddFeedWidget(TQWidget *parent, const char *name)
43
+   : AddFeedWidgetBase(parent, name)
44 44
 {
45 45
     pixmapLabel1->setPixmap(kapp->iconLoader()->loadIcon( "package_network",KIcon::Desktop,KIcon::SizeHuge, KIcon::DefaultState, 0, true));
46 46
     statusLabel->setText(TQString());
@@ -49,8 +49,8 @@ AddFeedWidget::AddFeedWidget(TQWidget *tqparent, const char *name)
49 49
 AddFeedWidget::~AddFeedWidget()
50 50
 {}
51 51
 
52
-AddFeedDialog::AddFeedDialog(TQWidget *tqparent, const char *name)
53
-   : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, tqparent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel)
52
+AddFeedDialog::AddFeedDialog(TQWidget *parent, const char *name)
53
+   : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, parent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel)
54 54
 {
55 55
     widget = new AddFeedWidget(this);
56 56
     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
43 43
       Q_OBJECT
44 44
   TQ_OBJECT
45 45
       public:
46
-         AddFeedWidget(TQWidget *tqparent = 0, const char *name = 0);
46
+         AddFeedWidget(TQWidget *parent = 0, const char *name = 0);
47 47
          ~AddFeedWidget();
48 48
    };
49 49
 
@@ -52,7 +52,7 @@ namespace Akregator
52 52
       Q_OBJECT
53 53
   TQ_OBJECT
54 54
       public:
55
-         AddFeedDialog(TQWidget *tqparent = 0, const char *name = 0);
55
+         AddFeedDialog(TQWidget *parent = 0, const char *name = 0);
56 56
          ~AddFeedDialog();
57 57
 
58 58
          void setURL(const TQString& t);

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

@@ -117,9 +117,9 @@ class Part::ApplyFiltersInterceptor : public ArticleInterceptor
117 117
 };
118 118
 
119 119
 Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
120
-                              TQObject *tqparent, const char *name, const TQStringList& )
120
+                              TQObject *parent, const char *name, const TQStringList& )
121 121
     : DCOPObject("AkregatorIface")
122
-       , MyBasePart(tqparent, name)
122
+       , MyBasePart(parent, name)
123 123
        , m_standardListLoaded(false)
124 124
        , m_shuttingDown(false)
125 125
        , m_mergedPart(0)

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

@@ -83,7 +83,7 @@ namespace Akregator
83 83
 
84 84
             /** Default constructor.*/
85 85
             Part(TQWidget *parentWidget, const char *widgetName,
86
-                          TQObject *tqparent, const char *name, const TQStringList&);
86
+                          TQObject *parent, const char *name, const TQStringList&);
87 87
 
88 88
 	        /** Destructor. */
89 89
             virtual ~Part();

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

@@ -210,8 +210,8 @@ View::~View()
210 210
     kdDebug() << "View::~View(): leaving" << endl;
211 211
 }
212 212
 
213
-View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, const char *name)
214
- : TQWidget(tqparent, name), m_viewMode(NormalView), m_actionManager(actionManager)
213
+View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, const char *name)
214
+ : TQWidget(parent, name), m_viewMode(NormalView), m_actionManager(actionManager)
215 215
 {
216 216
     m_editNodePropertiesVisitor = new EditNodePropertiesVisitor(this);
217 217
     m_deleteNodeVisitor = new DeleteNodeVisitor(this);
@@ -533,7 +533,7 @@ bool View::importFeeds(const TQDomDocument& doc)
533 533
     return true;
534 534
 }
535 535
 
536
-bool View::loadFeeds(const TQDomDocument& doc, Folder* tqparent)
536
+bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
537 537
 {
538 538
     FeedList* feedList = new FeedList();
539 539
     bool parsed = feedList->readFromXML(doc);
@@ -546,7 +546,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* tqparent)
546 546
     }
547 547
     m_feedListView->setUpdatesEnabled(false);
548 548
     m_tagNodeListView->setUpdatesEnabled(false);
549
-    if (!tqparent)
549
+    if (!parent)
550 550
     {
551 551
         TagSet* tagSet = Kernel::self()->tagSet();
552 552
 
@@ -578,7 +578,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* tqparent)
578 578
         }
579 579
     }
580 580
     else
581
-        m_feedList->append(feedList, tqparent);
581
+        m_feedList->append(feedList, parent);
582 582
 
583 583
     m_feedListView->setUpdatesEnabled(true);
584 584
     m_feedListView->triggerUpdate();
@@ -725,13 +725,13 @@ void View::slotMoveCurrentNodeUp()
725 725
     if (!current)
726 726
         return;
727 727
     TreeNode* prev = current->prevSibling();
728
-    Folder* tqparent = current->tqparent();
728
+    Folder* parent = current->parent();
729 729
 
730
-    if (!prev || !tqparent)
730
+    if (!prev || !parent)
731 731
         return;
732 732
 
733
-    tqparent->removeChild(prev);
734
-    tqparent->insertChild(prev, current);
733
+    parent->removeChild(prev);
734
+    parent->insertChild(prev, current);
735 735
     m_listTabWidget->activeView()->ensureNodeVisible(current);
736 736
 }
737 737
 
@@ -741,41 +741,41 @@ void View::slotMoveCurrentNodeDown()
741 741
     if (!current)
742 742
         return;
743 743
     TreeNode* next = current->nextSibling();
744
-    Folder* tqparent = current->tqparent();
744
+    Folder* parent = current->parent();
745 745
 
746
-    if (!next || !tqparent)
746
+    if (!next || !parent)
747 747
         return;
748 748
 
749
-    tqparent->removeChild(current);
750
-    tqparent->insertChild(current, next);
749
+    parent->removeChild(current);
750
+    parent->insertChild(current, next);
751 751
     m_listTabWidget->activeView()->ensureNodeVisible(current);
752 752
 }
753 753
 
754 754
 void View::slotMoveCurrentNodeLeft()
755 755
 {
756 756
     TreeNode* current = m_listTabWidget->activeView()->selectedNode();
757
-    if (!current || !current->tqparent() || !current->tqparent()->tqparent())
757
+    if (!current || !current->parent() || !current->parent()->parent())
758 758
         return;
759 759
 
760
-    Folder* tqparent = current->tqparent();
761
-    Folder* grandtqparent = current->tqparent()->tqparent();
760
+    Folder* parent = current->parent();
761
+    Folder* grandparent = current->parent()->parent();
762 762
 
763
-    tqparent->removeChild(current);
764
-    grandtqparent->insertChild(current, tqparent);
763
+    parent->removeChild(current);
764
+    grandparent->insertChild(current, parent);
765 765
     m_listTabWidget->activeView()->ensureNodeVisible(current);
766 766
 }
767 767
 
768 768
 void View::slotMoveCurrentNodeRight()
769 769
 {
770 770
     TreeNode* current = m_listTabWidget->activeView()->selectedNode();
771
-    if (!current || !current->tqparent())
771
+    if (!current || !current->parent())
772 772
         return;
773 773
     TreeNode* prev = current->prevSibling();
774 774
 
775 775
     if ( prev && prev->isGroup() )
776 776
     {
777 777
         Folder* fg = static_cast<Folder*>(prev);
778
-        current->tqparent()->removeChild(current);
778
+        current->parent()->removeChild(current);
779 779
         fg->appendChild(current);
780 780
         m_listTabWidget->activeView()->ensureNodeVisible(current);
781 781
     }
@@ -880,7 +880,7 @@ void View::slotFeedAdd()
880 880
         if ( m_feedListView->selectedNode()->isGroup())
881 881
             group = static_cast<Folder*>(m_feedListView->selectedNode());
882 882
         else
883
-            group= m_feedListView->selectedNode()->tqparent();
883
+            group= m_feedListView->selectedNode()->parent();
884 884
 
885 885
     }
886 886
 
@@ -889,7 +889,7 @@ void View::slotFeedAdd()
889 889
     addFeed(TQString(), lastChild, group, false);
890 890
 }
891 891
 
892
-void View::addFeed(const TQString& url, TreeNode *after, Folder* tqparent, bool autoExec)
892
+void View::addFeed(const TQString& url, TreeNode *after, Folder* parent, bool autoExec)
893 893
 {
894 894
 
895 895
     AddFeedDialog *afd = new AddFeedDialog( 0, "add_feed" );
@@ -923,10 +923,10 @@ void View::addFeed(const TQString& url, TreeNode *after, Folder* tqparent, bool
923 923
             return;
924 924
         }
925 925
 
926
-    if (!tqparent)
927
-        tqparent = m_feedList->rootNode();
926
+    if (!parent)
927
+        parent = m_feedList->rootNode();
928 928
 
929
-    tqparent->insertChild(feed, after);
929
+    parent->insertChild(feed, after);
930 930
 
931 931
     m_feedListView->ensureNodeVisible(feed);
932 932
 
@@ -947,7 +947,7 @@ void View::slotFeedAddGroup()
947 947
     if (!node->isGroup())
948 948
     {
949 949
         after = node;
950
-        node = node->tqparent();
950
+        node = node->parent();
951 951
     }
952 952
 
953 953
     Folder* currentGroup = static_cast<Folder*> (node);
@@ -1272,12 +1272,12 @@ void View::slotCopyLinkAddress()
1272 1272
     }
1273 1273
 }
1274 1274
 
1275
-void View::slotFeedURLDropped(KURL::List &urls, TreeNode* after, Folder* tqparent)
1275
+void View::slotFeedURLDropped(KURL::List &urls, TreeNode* after, Folder* parent)
1276 1276
 {
1277 1277
     KURL::List::iterator it;
1278 1278
     for ( it = urls.begin(); it != urls.end(); ++it )
1279 1279
     {
1280
-        addFeed((*it).prettyURL(), after, tqparent, false);
1280
+        addFeed((*it).prettyURL(), after, parent, false);
1281 1281
     }
1282 1282
 }
1283 1283
 

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

@@ -85,11 +85,11 @@ namespace Akregator {
85 85
 
86 86
             /** constructor
87 87
             @param part the Akregator::Part which contains this widget
88
-            @param tqparent tqparent widget
88
+            @param parent parent widget
89 89
             @param Actionmanager for this view
90 90
             @param name the name of the widget (@ref TQWidget )
91 91
             */
92
-            View(Akregator::Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, const char* name);
92
+            View(Akregator::Part *part, TQWidget *parent, ActionManagerImpl* actionManager, const char* name);
93 93
 
94 94
             /** destructor.  Note that cleanups should be done in
95 95
             slotOnShutdown(), so we don't risk accessing self-deleting objects after deletion. */
@@ -104,11 +104,11 @@ namespace Akregator {
104 104
             @param doc the DOM tree (OPML) of the feeds to import */
105 105
             bool importFeeds(const TQDomDocument& doc);
106 106
 
107
-            /** Parse OPML presentation of feeds and read in articles archive, if present. If @c tqparent is @c NULL, the current
107
+            /** Parse OPML presentation of feeds and read in articles archive, if present. If @c parent is @c NULL, the current
108 108
             feed list is replaced by the parsed one
109 109
              @param doc TQDomDocument generated from OPML
110
-             @param tqparent The tqparent group the new nodes */
111
-            bool loadFeeds(const TQDomDocument& doc, Folder* tqparent = 0);
110
+             @param parent The parent group the new nodes */
111
+            bool loadFeeds(const TQDomDocument& doc, Folder* parent = 0);
112 112
 
113 113
             /**
114 114
              @return the displayed Feed List in OPML format
@@ -190,7 +190,7 @@ namespace Akregator {
190 190
             void slotCaptionChanged(const TQString &);
191 191
 
192 192
             /** called when URLs are dropped into the tree view */
193
-            void slotFeedURLDropped (KURL::List &urls, TreeNode* after, Folder *tqparent);
193
+            void slotFeedURLDropped (KURL::List &urls, TreeNode* after, Folder *parent);
194 194
 
195 195
             /** displays a URL in the status bar when the user moves the mouse over a link */
196 196
             void slotMouseOverInfo(const KFileItem *kifi);
@@ -272,7 +272,7 @@ namespace Akregator {
272 272
 
273 273
         protected:
274 274
 
275
-            void addFeed(const TQString& url, TreeNode* after, Folder* tqparent, bool autoExec = true);
275
+            void addFeed(const TQString& url, TreeNode* after, Folder* parent, bool autoExec = true);
276 276
 
277 277
             void connectToFeedList(FeedList* feedList);
278 278
             void disconnectFromFeedList(FeedList* feedList);

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

@@ -60,17 +60,17 @@ class ArticleListView::ArticleListViewPrivate
60 60
 {
61 61
     public:
62 62
 
63
-    ArticleListViewPrivate(ArticleListView* tqparent) : m_tqparent(tqparent) { }
63
+    ArticleListViewPrivate(ArticleListView* parent) : m_parent(parent) { }
64 64
 
65 65
     void ensureCurrentItemVisible()
66 66
     {
67
-        if (m_tqparent->currentItem())
67
+        if (m_parent->currentItem())
68 68
         {
69
-            m_tqparent->center( m_tqparent->contentsX(), m_tqparent->itemPos(m_tqparent->currentItem()), 0, 9.0 );
69
+            m_parent->center( m_parent->contentsX(), m_parent->itemPos(m_parent->currentItem()), 0, 9.0 );
70 70
         }
71 71
     }
72 72
 
73
-    ArticleListView* m_tqparent;
73
+    ArticleListView* m_parent;
74 74
 
75 75
     /** maps article to article item */
76 76
     TQMap<Article, ArticleItem*> articleMap;
@@ -131,7 +131,7 @@ class ArticleListView::ArticleItem : public KListViewItem
131 131
         friend class ArticleListView;
132 132
 
133 133
         public:
134
-            ArticleItem( TQListView *tqparent, const Article& a);
134
+            ArticleItem( TQListView *parent, const Article& a);
135 135
             ~ArticleItem();
136 136
 
137 137
             Article& article();
@@ -155,8 +155,8 @@ class ArticleListView::ArticleItem : public KListViewItem
155 155
 };
156 156
 
157 157
 // FIXME: Remove resolveEntities for KDE 4.0, it's now done in the parser
158
-ArticleListView::ArticleItem::ArticleItem( TQListView *tqparent, const Article& a)
159
-    : 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())
158
+ArticleListView::ArticleItem::ArticleItem( TQListView *parent, const Article& a)
159
+    : 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())
160 160
 {
161 161
     if (a.keep())
162 162
         setPixmap(0, keepFlag());
@@ -213,8 +213,8 @@ int ArticleListView::ArticleItem::compare(TQListViewItem *i, int col, bool ascen
213 213
 
214 214
 /* ==================================================================================== */
215 215
 
216
-ArticleListView::ArticleListView(TQWidget *tqparent, const char *name)
217
-    : KListView(tqparent, name)
216
+ArticleListView::ArticleListView(TQWidget *parent, const char *name)
217
+    : KListView(parent, name)
218 218
 {
219 219
     d = new ArticleListViewPrivate(this);
220 220
     d->noneSelected = true;

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

@@ -45,7 +45,7 @@ namespace Akregator
45 45
         Q_OBJECT
46 46
   TQ_OBJECT
47 47
         public:
48
-            ArticleListView(TQWidget *tqparent = 0, const char *name = 0);
48
+            ArticleListView(TQWidget *parent = 0, const char *name = 0);
49 49
             virtual ~ArticleListView();
50 50
             
51 51
             /** 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
157 157
     ArticleViewer* m_view;
158 158
 };
159 159
 
160
-ArticleViewer::ArticleViewer(TQWidget *tqparent, const char *name)
161
-    : Viewer(tqparent, name), m_htmlFooter(), m_currentText(), m_node(0), m_viewMode(NormalView)
160
+ArticleViewer::ArticleViewer(TQWidget *parent, const char *name)
161
+    : Viewer(parent, name), m_htmlFooter(), m_currentText(), m_node(0), m_viewMode(NormalView)
162 162
 {
163 163
     setJScriptEnabled(false);
164 164
     setJavaEnabled(false);

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

@@ -51,7 +51,7 @@ namespace Akregator
51 51
   TQ_OBJECT
52 52
         public:
53 53
             /** Constructor */
54
-            ArticleViewer(TQWidget* tqparent, const char* name);
54
+            ArticleViewer(TQWidget* parent, const char* name);
55 55
             virtual ~ArticleViewer();
56 56
             
57 57
             virtual bool openURL(const KURL &url);

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

@@ -41,7 +41,7 @@
41 41
 namespace Akregator
42 42
 {
43 43
 
44
-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)
44
+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)
45 45
 {
46 46
     addPage(new SettingsGeneral(this, "General"), i18n("General"), "package_settings");
47 47
     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
38 38
   TQ_OBJECT
39 39
     public:
40 40
     
41
-        ConfigDialog(TQWidget *tqparent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
41
+        ConfigDialog(TQWidget *parent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
42 42
         
43 43
         virtual ~ConfigDialog();
44 44
 

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

@@ -365,7 +365,7 @@ bool Feed::fetchErrorOccurred() { return d->fetchError; }
365 365
 bool Feed::isArticlesLoaded() const { return d->articlesLoaded; }
366 366
 
367 367
 
368
-TQDomElement Feed::toOPML( TQDomElement tqparent, TQDomDocument document ) const
368
+TQDomElement Feed::toOPML( TQDomElement parent, TQDomDocument document ) const
369 369
 {
370 370
     TQDomElement el = document.createElement( "outline" );
371 371
     el.setAttribute( "text", title() );
@@ -388,7 +388,7 @@ TQDomElement Feed::toOPML( TQDomElement tqparent, TQDomDocument document ) const
388 388
     el.setAttribute( "maxArticleNumber", d->maxArticleNumber );
389 389
     el.setAttribute( "type", "rss" ); // despite some additional fields, its still "rss" OPML
390 390
     el.setAttribute( "version", "RSS" );
391
-    tqparent.appendChild( el );
391
+    parent.appendChild( el );
392 392
     return el;
393 393
 }
394 394
 
@@ -759,13 +759,13 @@ TreeNode* Feed::next()
759 759
     if ( nextSibling() )
760 760
         return nextSibling();
761 761
 
762
-    Folder* p = tqparent();
762
+    Folder* p = parent();
763 763
     while (p)
764 764
     {
765 765
         if ( p->nextSibling() )
766 766
             return p->nextSibling();
767 767
         else
768
-            p = p->tqparent();
768
+            p = p->parent();
769 769
     }
770 770
     return 0;
771 771
 }

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

@@ -95,7 +95,7 @@ namespace Akregator
95 95
             virtual bool accept(TreeNodeVisitor* visitor);
96 96
 
97 97
             /** exports the feed settings to OPML */
98
-            virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const;
98
+            virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const;
99 99
 
100 100
             /**
101 101
               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)
69 69
     loadIcon(iconURL);
70 70
 }
71 71
 
72
-FeedIconManager::FeedIconManager(TQObject * tqparent, const char *name)
73
-:  TQObject(tqparent, name), DCOPObject("FeedIconManager"), d(new FeedIconManagerPrivate)
72
+FeedIconManager::FeedIconManager(TQObject * parent, const char *name)
73
+:  TQObject(parent, name), DCOPObject("FeedIconManager"), d(new FeedIconManagerPrivate)
74 74
 {
75 75
     connectDCOPSignal("kded",
76 76
                       "favicons", "iconChanged(bool, TQString, TQString)",

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

@@ -34,23 +34,23 @@
34 34
 
35 35
 namespace Akregator {
36 36
 
37
-FeedItem::FeedItem(FolderItem* tqparent, Feed* node) : TreeNodeItem(tqparent, node)
37
+FeedItem::FeedItem(FolderItem* parent, Feed* node) : TreeNodeItem(parent, node)
38 38
 {
39 39
     initialize(node);
40 40
 }
41 41
 
42
-FeedItem::FeedItem(KListView* tqparent, Feed* node) : TreeNodeItem(tqparent, node)
42
+FeedItem::FeedItem(KListView* parent, Feed* node) : TreeNodeItem(parent, node)
43 43
 {
44 44
     initialize(node);
45 45
 }
46 46
 
47
-FeedItem::FeedItem(KListView* tqparent, TreeNodeItem* after, Feed* node) : TreeNodeItem(tqparent, after, node)
47
+FeedItem::FeedItem(KListView* parent, TreeNodeItem* after, Feed* node) : TreeNodeItem(parent, after, node)
48 48
 {
49 49
     initialize(node);
50 50
 }
51 51
 
52 52
 
53
-FeedItem::FeedItem(FolderItem* tqparent, TreeNodeItem* after, Feed* node) : TreeNodeItem(tqparent, after, node)
53
+FeedItem::FeedItem(FolderItem* parent, TreeNodeItem* after, Feed* node) : TreeNodeItem(parent, after, node)
54 54
 {
55 55
     initialize(node);
56 56
 }

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

@@ -40,10 +40,10 @@ class FeedItem : public TreeNodeItem
40 40
 {
41 41
  public:
42 42
     
43
-    FeedItem(FolderItem* tqparent, Feed* node);
44
-    FeedItem(FolderItem* tqparent, TreeNodeItem* after, Feed* node);
45
-    FeedItem(KListView* tqparent, Feed* node);
46
-    FeedItem(KListView* tqparent, TreeNodeItem* after, Feed* node);
43
+    FeedItem(FolderItem* parent, Feed* node);
44
+    FeedItem(FolderItem* parent, TreeNodeItem* after, Feed* node);
45
+    FeedItem(KListView* parent, Feed* node);
46
+    FeedItem(KListView* parent, TreeNodeItem* after, Feed* node);
47 47
 
48 48
     virtual ~FeedItem();
49 49
     virtual Feed* node();

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

@@ -80,8 +80,8 @@ class FeedList::RemoveNodeVisitor : public TreeNodeVisitor
80 80
         FeedList* m_list;
81 81
 };
82 82
 
83
-FeedList::FeedList(TQObject *tqparent, const char *name)
84
-    : NodeList(tqparent, name), d(new FeedListPrivate)
83
+FeedList::FeedList(TQObject *parent, const char *name)
84
+    : NodeList(parent, name), d(new FeedListPrivate)
85 85
 {
86 86
     d->addNodeVisitor = new AddNodeVisitor(this);
87 87
     d->removeNodeVisitor = new RemoveNodeVisitor(this);
@@ -104,7 +104,7 @@ void FeedList::removeNode(TreeNode* node)
104 104
    d->removeNodeVisitor->visit(node);
105 105
 }
106 106
 
107
-void FeedList::parseChildNodes(TQDomNode &node, Folder* tqparent)
107
+void FeedList::parseChildNodes(TQDomNode &node, Folder* parent)
108 108
 {
109 109
     TQDomElement e = node.toElement(); // try to convert the node to an element.
110 110
 
@@ -119,13 +119,13 @@ void FeedList::parseChildNodes(TQDomNode &node, Folder* tqparent)
119 119
             {
120 120
                 if (!d->urlMap[feed->xmlUrl()].contains(feed))
121 121
                     d->urlMap[feed->xmlUrl()].append(feed);
122
-                tqparent->appendChild(feed);
122
+                parent->appendChild(feed);
123 123
             }
124 124
         }
125 125
         else
126 126
         {
127 127
             Folder* fg = Folder::fromOPML(e);
128
-            tqparent->appendChild(fg);
128
+            parent->appendChild(fg);
129 129
 
130 130
             if (e.hasChildNodes())
131 131
             {
@@ -214,13 +214,13 @@ Article FeedList::findArticle(const TQString& feedURL, const TQString& guid) con
214 214
     return feed ? feed->findArticle(guid) : Article();
215 215
 }
216 216
 
217
-void FeedList::append(FeedList* list, Folder* tqparent, TreeNode* after)
217
+void FeedList::append(FeedList* list, Folder* parent, TreeNode* after)
218 218
 {
219 219
     if ( list == this )
220 220
         return;
221 221
 
222
-    if ( !flatList()->contains(tqparent) )
223
-        tqparent = rootNode();
222
+    if ( !flatList()->contains(parent) )
223
+        parent = rootNode();
224 224
 
225 225
     TQValueList<TreeNode*> tqchildren = list->rootNode()->tqchildren();
226 226
 
@@ -228,7 +228,7 @@ void FeedList::append(FeedList* list, Folder* tqparent, TreeNode* after)
228 228
     for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it)
229 229
     {
230 230
         list->rootNode()->removeChild(*it);
231
-        tqparent->insertChild(*it, after);
231
+        parent->insertChild(*it, after);
232 232
         after = *it;
233 233
     }
234 234
 }

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

@@ -47,14 +47,14 @@ Q_OBJECT
47 47
   TQ_OBJECT
48 48
 public:
49 49
 
50
-    FeedList(TQObject *tqparent = 0, const char *name = 0);
50
+    FeedList(TQObject *parent = 0, const char *name = 0);
51 51
 
52 52
     /** Destructor. Contained nodes are deleted! */
53 53
     ~FeedList();
54 54
 
55 55
     /** 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 */
56 56
     
57
-    void append(FeedList* list, Folder* tqparent=0, TreeNode* after=0);
57
+    void append(FeedList* list, Folder* parent=0, TreeNode* after=0);
58 58
 
59 59
     /** reads an OPML document and appends the items to this list
60 60
         @param doc the OPML document to parse
@@ -82,7 +82,7 @@ protected:
82 82
 public:         // compat with KDE-3.x assertions, remove for KDE 4
83 83
 // private:
84 84
 
85
-    void parseChildNodes(TQDomNode &node, Folder* tqparent);
85
+    void parseChildNodes(TQDomNode &node, Folder* parent);
86 86
 
87 87
     // never call these
88 88
     FeedList(const FeedList&) : NodeList() {}

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

@@ -65,7 +65,7 @@ class NodeListView::NodeListViewPrivate
65 65
     bool showTagFolders;
66 66
 
67 67
     // Drag and Drop variables
68
-    TQListViewItem *tqparent;
68
+    TQListViewItem *parent;
69 69
     TQListViewItem *afterme;
70 70
     TQTimer autoopentimer;
71 71
     ConnectNodeVisitor* connectNodeVisitor;
@@ -179,7 +179,7 @@ class NodeListView::DeleteItemVisitor : public TreeNodeVisitor
179 179
         
180 180
         virtual bool visitFolder(Folder* node)
181 181
         {
182
-            // delete child items recursively before deleting tqparent
182
+            // delete child items recursively before deleting parent
183 183
             TQValueList<TreeNode*> tqchildren = node->tqchildren();
184 184
             for (TQValueList<TreeNode*>::ConstIterator it =  tqchildren.begin(); it != tqchildren.end(); ++it )
185 185
                 visit(*it);
@@ -212,7 +212,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
212 212
             
213 213
             TagNodeItem* item = 0;
214 214
             TreeNode* prev = node->prevSibling();
215
-            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
215
+            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent()));
216 216
             if (parentItem)
217 217
             {
218 218
                 if (prev)
@@ -246,7 +246,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
246 246
          
247 247
             TagFolderItem* item = 0;
248 248
             TreeNode* prev = node->prevSibling();
249
-            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
249
+            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent()));
250 250
             if (parentItem)
251 251
             {
252 252
                 if (prev)
@@ -284,7 +284,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
284 284
                      
285 285
             FolderItem* item = 0;
286 286
             TreeNode* prev = node->prevSibling();
287
-            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
287
+            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent()));
288 288
             if (parentItem)
289 289
             {
290 290
                 if (prev)
@@ -321,7 +321,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
321 321
          
322 322
             FeedItem* item = 0;
323 323
             TreeNode* prev = node->prevSibling();
324
-            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
324
+            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent()));
325 325
             
326 326
             if (parentItem)
327 327
             {
@@ -352,8 +352,8 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
352 352
         NodeListView* m_view;
353 353
 };
354 354
 
355
-NodeListView::NodeListView( TQWidget *tqparent, const char *name)
356
-        : KListView(tqparent, name), d(new NodeListViewPrivate)
355
+NodeListView::NodeListView( TQWidget *parent, const char *name)
356
+        : KListView(parent, name), d(new NodeListViewPrivate)
357 357
 {
358 358
     d->showTagFolders = true;
359 359
     d->connectNodeVisitor = new ConnectNodeVisitor(this),
@@ -510,7 +510,7 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem*
510 510
 
511 511
         if (KURLDrag::canDecode(e))
512 512
         {
513
-            FolderItem* tqparent = dynamic_cast<FolderItem*> (d->tqparent);
513
+            FolderItem* parent = dynamic_cast<FolderItem*> (d->parent);
514 514
             TreeNodeItem* afterMe = 0;
515 515
             
516 516
             if(d->afterme)
@@ -519,7 +519,7 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem*
519 519
             KURL::List urls;
520 520
             KURLDrag::decode( e, urls );
521 521
             e->accept();
522
-            emit signalDropped( urls, afterMe ? afterMe->node() : 0, tqparent ? tqparent->node() : 0);
522
+            emit signalDropped( urls, afterMe ? afterMe->node() : 0, parent ? parent->node() : 0);
523 523
         }
524 524
     }
525 525
     else
@@ -527,23 +527,23 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem*
527 527
     }
528 528
 }
529 529
 
530
-void NodeListView::movableDropEvent(TQListViewItem* /*tqparent*/, TQListViewItem* /*afterme*/)
530
+void NodeListView::movableDropEvent(TQListViewItem* /*parent*/, TQListViewItem* /*afterme*/)
531 531
 {
532 532
 	d->autoopentimer.stop();
533
-    if (d->tqparent)
533
+    if (d->parent)
534 534
     {    
535 535
         openFolder();
536 536
 
537
-        Folder* parentNode = (dynamic_cast<FolderItem*> (d->tqparent))->node();
537
+        Folder* parentNode = (dynamic_cast<FolderItem*> (d->parent))->node();
538 538
         TreeNode* afterMeNode = 0; 
539 539
         TreeNode* current = selectedNode();
540 540
 
541 541
         if (d->afterme)
542 542
             afterMeNode = (dynamic_cast<TreeNodeItem*> (d->afterme))->node();
543 543
 
544
-        current->tqparent()->removeChild(current);
544
+        current->parent()->removeChild(current);
545 545
         parentNode->insertChild(current, afterMeNode);
546
-        KListView::movableDropEvent(d->tqparent, d->afterme);
546
+        KListView::movableDropEvent(d->parent, d->afterme);
547 547
     }    
548 548
 }
549 549
 
@@ -557,13 +557,13 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
557 557
     TQPoint vp = contentsToViewport(event->pos());
558 558
     TQListViewItem *i = itemAt(vp);
559 559
 
560
-    TQListViewItem *qitqparent;
560
+    TQListViewItem *qiparent;
561 561
     TQListViewItem *qiafterme;
562
-    findDrop( event->pos(), qitqparent, qiafterme );
562
+    findDrop( event->pos(), qiparent, qiafterme );
563 563
 
564 564
     if (event->source() == viewport()) {
565 565
         // disable any drops where the result would be top level nodes 
566
-        if (i && !i->tqparent())
566
+        if (i && !i->parent())
567 567
         {
568 568
             event->ignore();
569 569
             d->autoopentimer.stop();
@@ -572,12 +572,12 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
572 572
 
573 573
         // prevent dragging nodes from All Feeds to My Tags or vice versa
574 574
         TQListViewItem* root1 = i;
575
-        while (root1 && root1->tqparent())
576
-            root1 = root1->tqparent();
575
+        while (root1 && root1->parent())
576
+            root1 = root1->parent();
577 577
 
578 578
         TQListViewItem* root2 = selectedItem();
579
-        while (root2 && root2->tqparent())
580
-            root2 = root2->tqparent();
579
+        while (root2 && root2->parent())
580
+            root2 = root2->parent();
581 581
 
582 582
         if (root1 != root2)
583 583
         {
@@ -587,7 +587,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
587 587
         }
588 588
 
589 589
         // don't drop node into own subtree
590
-        TQListViewItem* p = qitqparent;
590
+        TQListViewItem* p = qiparent;
591 591
         while (p)
592 592
             if (p == selectedItem())
593 593
             {
@@ -597,7 +597,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
597 597
             }
598 598
             else
599 599
             {
600
-                p = p->tqparent();
600
+                p = p->parent();
601 601
             }
602 602
 
603 603
         // disable drags onto the item itself
@@ -615,7 +615,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
615 615
     //            event->pos().x() < header()->cellPos(header()->mapToIndex(0)))
616 616
     //   {} else
617 617
  
618
-    // do we want to move inside the old tqparent or do we want to move to a new tqparent
618
+    // do we want to move inside the old parent or do we want to move to a new parent
619 619
     if (i && (itemAt(vp - TQPoint(0,5)) == i && itemAt(vp + TQPoint(0,5)) == i))
620 620
     {
621 621
         setDropVisualizer(false);
@@ -625,10 +625,10 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
625 625
         TreeNode *iNode = (dynamic_cast<TreeNodeItem*> (i))->node();
626 626
         if (iNode->isGroup())
627 627
         {
628
-            if (i != d->tqparent)
628
+            if (i != d->parent)
629 629
                 d->autoopentimer.start(750);
630 630
 
631
-            d->tqparent = i;
631
+            d->parent = i;
632 632
             d->afterme = 0;
633 633
         }
634 634
         else
@@ -644,7 +644,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
644 644
         setDropVisualizer(true);
645 645
         setDropHighlighter(false);
646 646
         cleanItemHighlighter();
647
-        d->tqparent = qitqparent;
647
+        d->parent = qiparent;
648 648
         d->afterme = qiafterme;
649 649
         d->autoopentimer.stop();
650 650
     }
@@ -665,7 +665,7 @@ bool NodeListView::acceptDrag(TQDropEvent *e) const
665 665
     else
666 666
     {
667 667
         // disable dragging of top-level nodes (All Feeds, My Tags)
668
-        if (selectedItem() && !selectedItem()->tqparent())
668
+        if (selectedItem() && !selectedItem()->parent())
669 669
             return false;
670 670
         else
671 671
             return true;
@@ -719,8 +719,8 @@ void NodeListView::slotItemLeft()
719 719
         sel->setOpen(false);
720 720
     else
721 721
     {
722
-        if (sel->tqparent())
723
-            setSelected( sel->tqparent(), true );
722
+        if (sel->parent())
723
+            setSelected( sel->parent(), true );
724 724
     }
725 725
         
726 726
     ensureItemVisible( selectedItem() );    
@@ -927,7 +927,7 @@ void NodeListView::slotNodeAdded(TreeNode* node)
927 927
         d->createItemVisitor->visit(node);
928 928
 }
929 929
 
930
-void NodeListView::slotNodeRemoved(Folder* /*tqparent*/, TreeNode* node)
930
+void NodeListView::slotNodeRemoved(Folder* /*parent*/, TreeNode* node)
931 931
 {
932 932
     if (node)
933 933
         d->deleteItemVisitor->deleteItem(node, false);
@@ -1012,9 +1012,9 @@ TQDragObject *NodeListView::dragObject()
1012 1012
 
1013 1013
 void NodeListView::openFolder() {
1014 1014
     d->autoopentimer.stop();
1015
-    if (d->tqparent && !d->tqparent->isOpen())
1015
+    if (d->parent && !d->parent->isOpen())
1016 1016
     {
1017
-        d->tqparent->setOpen(true);
1017
+        d->parent->setOpen(true);
1018 1018
     }
1019 1019
 }
1020 1020
 

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

@@ -41,7 +41,7 @@ class NodeListView : public KListView
41 41
 Q_OBJECT
42 42
   TQ_OBJECT
43 43
 public:
44
-    NodeListView( TQWidget *tqparent = 0, const char *name = 0 );
44
+    NodeListView( TQWidget *parent = 0, const char *name = 0 );
45 45
     virtual ~NodeListView();
46 46
     
47 47
     /** sets the feed list to show. Disconnects from the old feed list, if there is any. */
@@ -92,7 +92,7 @@ public slots:
92 92
     void slotItemBegin();
93 93
     /** select last item in the list */
94 94
     void slotItemEnd();
95
-    /** go to tqparent item */
95
+    /** go to parent item */
96 96
     void slotItemLeft();
97 97
     /** go to first child */
98 98
     void slotItemRight();
@@ -133,7 +133,7 @@ public:         // compat with KDE-3.x assertions, remove for KDE 4
133 133
                                         int cx, int cy, int cw, int ch );
134 134
     virtual void contentsDragMoveEvent(TQDragMoveEvent* event);
135 135
     virtual bool acceptDrag(TQDropEvent *event) const;
136
-    virtual void movableDropEvent(TQListViewItem* tqparent, TQListViewItem* afterme);
136
+    virtual void movableDropEvent(TQListViewItem* parent, TQListViewItem* afterme);
137 137
 
138 138
     virtual TQDragObject *dragObject();
139 139
             
@@ -155,10 +155,10 @@ protected slots:
155 155
     /** called when a node is added to the tree. If no item for the node exists, it will be created */
156 156
     virtual void slotNodeAdded(TreeNode* node);
157 157
     
158
-    /** Called when a node in the tree is taken out of the tree (tqparent->removeChild()) 
158
+    /** Called when a node in the tree is taken out of the tree (parent->removeChild()) 
159 159
     
160 160
     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) */
161
-    virtual void slotNodeRemoved(Folder* tqparent, TreeNode* node);
161
+    virtual void slotNodeRemoved(Folder* parent, TreeNode* node);
162 162
     
163 163
     /** deletes the item belonging to the deleted node */
164 164
     virtual void slotNodeDestroyed(TreeNode* node);
@@ -195,7 +195,7 @@ class TagNodeListView : public NodeListView
195 195
     Q_OBJECT
196 196
   TQ_OBJECT
197 197
     public:
198
-        TagNodeListView(TQWidget *tqparent = 0, const char *name = 0) {} 
198
+        TagNodeListView(TQWidget *parent = 0, const char *name = 0) {} 
199 199
         virtual ~TagNodeListView() {}
200 200
 
201 201
     private:

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

@@ -42,7 +42,7 @@ class FetchQueue::FetchQueuePrivate
42 42
 };
43 43
 
44 44
 
45
-FetchQueue::FetchQueue(TQObject* tqparent, const char* name): TQObject(tqparent, name), d(new FetchQueuePrivate) {}
45
+FetchQueue::FetchQueue(TQObject* parent, const char* name): TQObject(parent, name), d(new FetchQueuePrivate) {}
46 46
 
47 47
 
48 48
 FetchQueue::~FetchQueue()

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

@@ -40,7 +40,7 @@ class FetchQueue : public TQObject
40 40
 
41 41
     public:
42 42
 
43
-        FetchQueue(TQObject* tqparent=0, const char* name=0);
43
+        FetchQueue(TQObject* parent=0, const char* name=0);
44 44
         virtual ~FetchQueue();
45 45
 
46 46
         /** 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)
115 115
     return seq;
116 116
 }
117 117
 
118
-TQDomElement Folder::toOPML( TQDomElement tqparent, TQDomDocument document ) const
118
+TQDomElement Folder::toOPML( TQDomElement parent, TQDomDocument document ) const
119 119
 {
120 120
     TQDomElement el = document.createElement( "outline" );
121 121
     el.setAttribute( "text", title() );
122
-    tqparent.appendChild( el );
122
+    parent.appendChild( el );
123 123
     el.setAttribute("isOpen", d->open ? "true" : "false");
124 124
     el.setAttribute( "id", TQString::number(id()) );
125 125
 
@@ -332,13 +332,13 @@ TreeNode* Folder::next()
332 332
     if ( nextSibling() )
333 333
         return nextSibling();
334 334
     
335
-    Folder* p = tqparent();
335
+    Folder* p = parent();
336 336
     while (p)
337 337
     {
338 338
         if ( p->nextSibling() )
339 339
             return p->nextSibling();
340 340
         else
341
-            p = p->tqparent();
341
+            p = p->parent();
342 342
     }
343 343
     return 0;
344 344
 }

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

@@ -79,12 +79,12 @@ namespace Akregator
79 79
             /** 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. */
80 80
             virtual bool isGroup() const { return true; }
81 81
 
82
-            /** converts the feed group into OPML format for save and export and appends it to node @c tqparent in document @document.
82
+            /** converts the feed group into OPML format for save and export and appends it to node @c parent in document @document.
83 83
             Children are processed and appended recursively.
84
-            @param tqparent The tqparent element 
84
+            @param parent The parent element 
85 85
             @param document The DOM document 
86 86
             @return The newly created element representing this feed group */
87
-            virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const;
87
+            virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const;
88 88
             
89 89
             /** returns the (direct) tqchildren of this node.
90 90
             @return a list of pointers to the child nodes

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

@@ -33,22 +33,22 @@
33 33
 
34 34
 namespace Akregator {
35 35
 
36
-FolderItem::FolderItem(FolderItem* tqparent, Folder* node) : TreeNodeItem(tqparent, node)
36
+FolderItem::FolderItem(FolderItem* parent, Folder* node) : TreeNodeItem(parent, node)
37 37
 {
38 38
     initialize(node);
39 39
 }
40 40
 
41
-FolderItem::FolderItem(FolderItem* tqparent, TreeNodeItem* after, Folder* node) : TreeNodeItem(tqparent, after, node)
41
+FolderItem::FolderItem(FolderItem* parent, TreeNodeItem* after, Folder* node) : TreeNodeItem(parent, after, node)
42 42
 {
43 43
     initialize(node);
44 44
 }
45 45
 
46
-FolderItem::FolderItem(KListView* tqparent, Folder* node) : TreeNodeItem(tqparent, node)
46
+FolderItem::FolderItem(KListView* parent, Folder* node) : TreeNodeItem(parent, node)
47 47
 {
48 48
     initialize(node);
49 49
 }
50 50
 
51
-FolderItem::FolderItem(KListView* tqparent, TreeNodeItem* after, Folder* node) : TreeNodeItem(tqparent, after, node)
51
+FolderItem::FolderItem(KListView* parent, TreeNodeItem* after, Folder* node) : TreeNodeItem(parent, after, node)
52 52
 {
53 53
     initialize(node);
54 54
 }

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

@@ -41,10 +41,10 @@ class FolderItem : public TreeNodeItem
41 41
 {
42 42
 
43 43
 public:
44
-    FolderItem(FolderItem* tqparent, Folder* node);
45
-    FolderItem(FolderItem* tqparent, TreeNodeItem* after, Folder* node);
46
-    FolderItem(KListView* tqparent, Folder* node);
47
-    FolderItem(KListView* tqparent, TreeNodeItem* after, Folder* node);
44
+    FolderItem(FolderItem* parent, Folder* node);
45
+    FolderItem(FolderItem* parent, TreeNodeItem* after, Folder* node);
46
+    FolderItem(KListView* parent, Folder* node);
47
+    FolderItem(KListView* parent, TreeNodeItem* after, Folder* node);
48 48
     virtual ~FolderItem();
49 49
     
50 50
     virtual Folder* node();

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

@@ -37,8 +37,8 @@
37 37
 
38 38
 namespace Akregator {
39 39
 
40
-Frame::Frame(TQObject * tqparent, KParts::ReadOnlyPart *p, TQWidget *visWidget, const TQString& tit, bool watchSignals)
41
-   :TQObject(tqparent, "aKregatorFrame")
40
+Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, const TQString& tit, bool watchSignals)
41
+   :TQObject(parent, "aKregatorFrame")
42 42
 {
43 43
     m_autoDeletePart = false;
44 44
     m_part=p;

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

@@ -46,7 +46,7 @@ namespace Akregator
46 46
   TQ_OBJECT
47 47
 
48 48
         public:
49
-            Frame(TQObject *tqparent, KParts::ReadOnlyPart *part, TQWidget *w, const TQString& tit, bool watchSignals=true);
49
+            Frame(TQObject *parent, KParts::ReadOnlyPart *part, TQWidget *w, const TQString& tit, bool watchSignals=true);
50 50
             virtual ~Frame();
51 51
 
52 52
             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
261 261
     return d->meta[key];
262 262
 }
263 263
 
264
-KURLLabel *Article::widget(TQWidget *tqparent, const char *name) const
264
+KURLLabel *Article::widget(TQWidget *parent, const char *name) const
265 265
 {
266
-	KURLLabel *label = new KURLLabel(d->link.url(), d->title, tqparent, name);
266
+	KURLLabel *label = new KURLLabel(d->link.url(), d->title, parent, name);
267 267
 	label->setUseTips(true);
268 268
 	if (!d->description.isNull())
269 269
 		label->setTipText(d->description);

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

@@ -145,7 +145,7 @@ namespace RSS
145 145
          TQString meta(const TQString &key) const;
146 146
          
147 147
          /**
148
-          * @param tqparent The tqparent widget for the KURLLabel.
148
+          * @param parent The parent widget for the KURLLabel.
149 149
           * @param name A name for the widget which will be used internally.
150 150
           * @return a widget (a KURLLabel in this case) for the Article.
151 151
           * This makes building a user-interface which contains the
@@ -158,7 +158,7 @@ namespace RSS
158 158
           * Note that you have to delete the KURLLabel object returned by
159 159
           * this method yourself.
160 160
           */
161
-         KURLLabel *widget(TQWidget *tqparent = 0, const char *name = 0) const;
161
+         KURLLabel *widget(TQWidget *parent = 0, const char *name = 0) const;
162 162
          
163 163
          typedef TQMap<TQString, TQString> MetaInfoMap;
164 164
          

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

@@ -183,7 +183,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
183 183
     d->link = extractLink(channelNode, d->format);
184 184
 
185 185
     
186
-    /* This is ugly but necessary since RSS 0.90 and 1.0 have a different tqparent
186
+    /* This is ugly but necessary since RSS 0.90 and 1.0 have a different parent
187 187
      * node for <image>, <textinput> and <item> than RSS 0.91-0.94 and RSS 2.0.
188 188
      */
189 189
     TQDomNode parentNode;

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

@@ -30,9 +30,9 @@ time_t parseISO8601Date(const TQString &s)
30 30
         return KRFCDate::parseDateISO8601(s + "T12:00:00");
31 31
 }
32 32
 
33
-TQString childNodesAsXML(const TQDomNode& tqparent)
33
+TQString childNodesAsXML(const TQDomNode& parent)
34 34
 {
35
-	TQDomNodeList list = tqparent.childNodes();
35
+	TQDomNodeList list = parent.childNodes();
36 36
 	TQString str;
37 37
 	TQTextStream ts( &str, IO_WriteOnly );
38 38
 	for (uint i = 0; i < list.count(); ++i)
@@ -117,9 +117,9 @@ static TQString extractAtomContent(const TQDomElement& e)
117 117
     return TQString();
118 118
 }
119 119
 
120
-TQString extractNode(const TQDomNode &tqparent, const TQString &elemName, bool isInlined)
120
+TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined)
121 121
 {
122
-	TQDomNode node = tqparent.namedItem(elemName);
122
+	TQDomNode node = parent.namedItem(elemName);
123 123
 	if (node.isNull())
124 124
 		return TQString();
125 125
 
@@ -143,9 +143,9 @@ TQString extractNode(const TQDomNode &tqparent, const TQString &elemName, bool i
143 143
         return result.isEmpty() ? TQString() : result;
144 144
 }
145 145
 
146
-TQString extractTitle(const TQDomNode & tqparent)
146
+TQString extractTitle(const TQDomNode & parent)
147 147
 {
148
-    TQDomNode node = tqparent.namedItem(TQString::tqfromLatin1("title"));
148
+    TQDomNode node = parent.namedItem(TQString::tqfromLatin1("title"));
149 149
     if (node.isNull())
150 150
         return TQString();
151 151
 

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

@@ -29,9 +29,9 @@ namespace RSS
29 29
 		unsigned int count;
30 30
 	};
31 31
 
32
-	TQString extractNode(const TQDomNode &tqparent, const TQString &elemName, bool isInlined=true);
33
-	TQString extractTitle(const TQDomNode &tqparent);
34
-	TQString childNodesAsXML(const TQDomNode& tqparent);
32
+	TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined=true);
33
+	TQString extractTitle(const TQDomNode &parent);
34
+	TQString childNodesAsXML(const TQDomNode& parent);
35 35
 	time_t parseISO8601Date(const TQString &s);
36 36
         TQString parseItemAuthor(const TQDomElement& element, Format format, Version version);
37 37
 }

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

@@ -152,7 +152,7 @@ void ListTabWidget::slotTabClicked(int id)
152 152
     }
153 153
 }
154 154
 
155
-ListTabWidget::ListTabWidget(TQWidget* tqparent, const char* name) : TQWidget(tqparent, name), d(new ListTabWidgetPrivate)
155
+ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(parent, name), d(new ListTabWidgetPrivate)
156 156
 {
157 157
     d->idCounter = 0;
158 158
     d->current = 0;

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

@@ -50,7 +50,7 @@ Q_OBJECT
50 50
 
51 51
 public:
52 52
 
53
-    ListTabWidget(TQWidget* tqparent=0, const char* name=0);
53
+    ListTabWidget(TQWidget* parent=0, const char* name=0);
54 54
     virtual ~ListTabWidget();
55 55
 
56 56
     enum ViewMode { single, /* horizontalTabs, */  verticalTabs };
@@ -72,7 +72,7 @@ public slots:
72 72
     void slotItemBegin();
73 73
     /** select last item in the list */
74 74
     void slotItemEnd();
75
-    /** go to tqparent item */
75
+    /** go to parent item */
76 76
     void slotItemLeft();
77 77
     /** go to first child */
78 78
     void slotItemRight();

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

@@ -298,7 +298,7 @@
298 298
 2003-01-24    Fixed cleanup order bug in Mk4tcl
299 299
 
300 300
    There was a long-standing bug in Mk4tcl, in which cleanup order of
301
-   MkPath objects caused them to access their MkWorkspace tqparent even
301
+   MkPath objects caused them to access their MkWorkspace parent even
302 302
    though it was already deleted.  This may have caused some of the
303 303
    crash-on-exit bugs in the past.
304 304
 

+ 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_)
770 770
       
771 771
 t4_i32 c4_Column::PullValue(const t4_byte*& ptr_)
772 772
 {
773
-  t4_i32 tqmask = *ptr_ ? 0 : ~0;
773
+  t4_i32 mask = *ptr_ ? 0 : ~0;
774 774
 
775 775
   t4_i32 v = 0;
776 776
   for (;;) {
@@ -779,7 +779,7 @@ t4_i32 c4_Column::PullValue(const t4_byte*& ptr_)
779 779
       break;      
780 780
   }
781 781
   
782
-  return tqmask ^ (v - 0x80);   // oops, last byte had bit 7 set
782
+  return mask ^ (v - 0x80);   // oops, last byte had bit 7 set
783 783
 }
784 784
 
785 785
 void c4_Column::PushValue(t4_byte*& ptr_, t4_i32 v_)
@@ -1398,7 +1398,7 @@ void c4_ColOfInts::ResizeData(int index_, int count_, bool clear_)
1398 1398
 
1399 1399
     /*  _currwidth    1:  2:  4:
1400 1400
      *    shiftPos     3   2   1    shift the offset right this much
1401
-     *    maskPos      7   3   1    tqmask the offset with this
1401
+     *    maskPos      7   3   1    mask the offset with this
1402 1402
      */
1403 1403
 
1404 1404
   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)
233 233
 
234 234
 class c4_SliceViewer : public c4_CustomViewer
235 235
 {
236
-  c4_View _tqparent;
236
+  c4_View _parent;
237 237
   int _first, _limit, _step;
238 238
 
239 239
 public: 
@@ -249,7 +249,7 @@ public:
249 249
 };
250 250
 
251 251
 c4_SliceViewer::c4_SliceViewer (c4_Sequence& seq_, int first_, int limit_, int step_)
252
-  : _tqparent (&seq_), _first (first_), _limit (limit_), _step (step_)
252
+  : _parent (&seq_), _first (first_), _limit (limit_), _step (step_)
253 253
 {
254 254
   d4_assert(_step != 0);
255 255
 }
@@ -260,12 +260,12 @@ c4_SliceViewer::~c4_SliceViewer ()
260 260
 
261 261
 c4_View c4_SliceViewer::GetTemplate()
262 262
 {
263
-  return _tqparent.Clone(); // could probably return _tqparent just as well
263
+  return _parent.Clone(); // could probably return _parent just as well
264 264
 }
265 265
 
266 266
 int c4_SliceViewer::GetSize()
267 267
 {
268
-  int n = _limit >= 0 ? _limit : _tqparent.GetSize();
268
+  int n = _limit >= 0 ? _limit : _parent.GetSize();
269 269
   if (n < _first)
270 270
     n = _first;
271 271
 
@@ -277,14 +277,14 @@ bool c4_SliceViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
277 277
 {
278 278
   row_ = _first + _step * (_step > 0 ? row_ : row_ - GetSize() + 1);
279 279
 
280
-  return _tqparent.GetItem(row_, col_, buf_);
280
+  return _parent.GetItem(row_, col_, buf_);
281 281
 }
282 282
 
283 283
 bool c4_SliceViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
284 284
 {
285 285
   row_ = _first + _step * (_step > 0 ? row_ : row_ - GetSize() + 1);
286 286
 
287
-  _tqparent.SetItem(row_, col_, buf_);
287
+  _parent.SetItem(row_, col_, buf_);
288 288
   return true;
289 289
 }
290 290
 
@@ -297,7 +297,7 @@ bool c4_SliceViewer::InsertRows(int pos_, c4_Cursor value_, int count_)
297 297
   if (_limit >= 0)
298 298
   _limit += count_;
299 299
 
300
-  _tqparent.InsertAt(pos_, *value_, count_);
300
+  _parent.InsertAt(pos_, *value_, count_);
301 301
   return true;
302 302
 }
303 303
 
@@ -310,7 +310,7 @@ bool c4_SliceViewer::RemoveRows(int pos_, int count_)
310 310
   if (_limit >= 0)
311 311
   _limit -= count_;
312 312
 
313
-  _tqparent.RemoveAt(pos_, count_);
313
+  _parent.RemoveAt(pos_, count_);
314 314
   return true;
315 315
 }
316 316
 
@@ -323,7 +323,7 @@ c4_CustomViewer* f4_CustSlice(c4_Sequence& seq_, int first_, int limit_, int ste
323 323
 
324 324
 class c4_ProductViewer : public c4_CustomViewer
325 325
 {
326
-  c4_View _tqparent, _argView, _template;
326
+  c4_View _parent, _argView, _template;
327 327
 
328 328
 public: 
329 329
   c4_ProductViewer (c4_Sequence& seq_, const c4_View& view_);
@@ -335,7 +335,7 @@ public:
335 335
 };
336 336
 
337 337
 c4_ProductViewer::c4_ProductViewer (c4_Sequence& seq_, const c4_View& view_)
338
-  : _tqparent (&seq_), _argView (view_), _template (_tqparent.Clone())
338
+  : _parent (&seq_), _argView (view_), _template (_parent.Clone())
339 339
 {
340 340
   for (int i = 0; i < _argView.NumProperties(); ++i)
341 341
     _template.AddProperty(_argView.NthProperty(i));
@@ -352,12 +352,12 @@ c4_View c4_ProductViewer::GetTemplate()
352 352
 
353 353
 int c4_ProductViewer::GetSize()
354 354
 {
355
-  return _tqparent.GetSize() * _argView.GetSize();
355
+  return _parent.GetSize() * _argView.GetSize();
356 356
 }
357 357
 
358 358
 bool c4_ProductViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
359 359
 {
360
-  c4_View v = _tqparent;
360
+  c4_View v = _parent;
361 361
 
362 362
   if (col_ < v.NumProperties())
363 363
   {
@@ -384,7 +384,7 @@ c4_CustomViewer* f4_CustProduct(c4_Sequence& seq_, const c4_View& view_)
384 384
 
385 385
 class c4_RemapWithViewer : public c4_CustomViewer
386 386
 {
387
-  c4_View _tqparent, _argView;
387
+  c4_View _parent, _argView;
388 388
 
389 389
 public: 
390 390
   c4_RemapWithViewer (c4_Sequence& seq_, const c4_View& view_);
@@ -397,7 +397,7 @@ public:
397 397
 };
398 398
 
399 399
 c4_RemapWithViewer::c4_RemapWithViewer (c4_Sequence& seq_, const c4_View& view_)
400
-  : _tqparent (&seq_), _argView (view_)
400
+  : _parent (&seq_), _argView (view_)
401 401
 {
402 402
 }
403 403
 
@@ -407,7 +407,7 @@ c4_RemapWithViewer::~c4_RemapWithViewer ()
407 407
 
408 408
 c4_View c4_RemapWithViewer::GetTemplate()
409 409
 {
410
-  return _tqparent.Clone(); // could probably return _tqparent just as well
410
+  return _parent.Clone(); // could probably return _parent just as well
411 411
 }
412 412
 
413 413
 int c4_RemapWithViewer::GetSize()
@@ -422,7 +422,7 @@ bool c4_RemapWithViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
422 422
 
423 423
   row_ = ((const c4_IntProp&) map) (_argView[row_]);
424 424
 
425
-  return _tqparent.GetItem(row_, col_, buf_);
425
+  return _parent.GetItem(row_, col_, buf_);
426 426
 }
427 427
 
428 428
 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_)
432 432
 
433 433
   row_ = ((const c4_IntProp&) map) (_argView[row_]);
434 434
 
435
-  _tqparent.SetItem(row_, col_, buf_);
435
+  _parent.SetItem(row_, col_, buf_);
436 436
   return true;
437 437
 }
438 438
 
@@ -445,7 +445,7 @@ c4_CustomViewer* f4_CustRemapWith(c4_Sequence& seq_, const c4_View& view_)
445 445
 
446 446
 class c4_PairViewer : public c4_CustomViewer
447 447
 {
448
-  c4_View _tqparent, _argView, _template;
448
+  c4_View _parent, _argView, _template;
449 449
 
450 450
 public: 
451 451
   c4_PairViewer (c4_Sequence& seq_, const c4_View& view_);
@@ -460,7 +460,7 @@ public:
460 460
 };
461 461
 
462 462
 c4_PairViewer::c4_PairViewer (c4_Sequence& seq_, const c4_View& view_)
463
-  : _tqparent (&seq_), _argView (view_), _template (_tqparent.Clone())
463
+  : _parent (&seq_), _argView (view_), _template (_parent.Clone())
464 464
 {
465 465
   for (int i = 0; i < _argView.NumProperties(); ++i)
466 466
     _template.AddProperty(_argView.NthProperty(i));
@@ -477,12 +477,12 @@ c4_View c4_PairViewer::GetTemplate()
477 477
 
478 478
 int c4_PairViewer::GetSize()
479 479
 {
480
-  return _tqparent.GetSize();
480
+  return _parent.GetSize();
481 481
 }
482 482
 
483 483
 bool c4_PairViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
484 484
 {
485
-  c4_View v = _tqparent;
485
+  c4_View v = _parent;
486 486
 
487 487
   if (col_ >= v.NumProperties())
488 488
   {
@@ -496,7 +496,7 @@ bool c4_PairViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
496 496
 
497 497
 bool c4_PairViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
498 498
 {
499
-  c4_View v = _tqparent;
499
+  c4_View v = _parent;
500 500
 
501 501
   if (col_ >= v.NumProperties())
502 502
   {
@@ -511,14 +511,14 @@ bool c4_PairViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
511 511
 
512 512
 bool c4_PairViewer::InsertRows(int pos_, c4_Cursor value_, int count_)
513 513
 {
514
-  _tqparent.InsertAt(pos_, *value_, count_);
514
+  _parent.InsertAt(pos_, *value_, count_);
515 515
   _argView.InsertAt(pos_, *value_, count_);
516 516
   return true;
517 517
 }
518 518
 
519 519
 bool c4_PairViewer::RemoveRows(int pos_, int count_)
520 520
 {
521
-  _tqparent.RemoveAt(pos_, count_);
521
+  _parent.RemoveAt(pos_, count_);
522 522
   _argView.RemoveAt(pos_, count_);
523 523
   return true;
524 524
 }
@@ -532,7 +532,7 @@ c4_CustomViewer* f4_CustPair(c4_Sequence& seq_, const c4_View& view_)
532 532
 
533 533
 class c4_ConcatViewer : public c4_CustomViewer
534 534
 {
535
-  c4_View _tqparent, _argView;
535
+  c4_View _parent, _argView;
536 536
 
537 537
 public: 
538 538
   c4_ConcatViewer (c4_Sequence& seq_, const c4_View& view_);
@@ -545,7 +545,7 @@ public:
545 545
 };
546 546
 
547 547
 c4_ConcatViewer::c4_ConcatViewer (c4_Sequence& seq_, const c4_View& view_)
548
-  : _tqparent (&seq_), _argView (view_)
548
+  : _parent (&seq_), _argView (view_)
549 549
 {
550 550
 }
551 551
 
@@ -555,23 +555,23 @@ c4_ConcatViewer::~c4_ConcatViewer ()
555 555
 
556 556
 c4_View c4_ConcatViewer::GetTemplate()
557 557
 {
558
-  return _tqparent.Clone(); // could probably return _tqparent just as well
558
+  return _parent.Clone(); // could probably return _parent just as well
559 559
 }
560 560
 
561 561
 int c4_ConcatViewer::GetSize()
562 562
 {
563
-  return _tqparent.GetSize() + _argView.GetSize();
563
+  return _parent.GetSize() + _argView.GetSize();
564 564
 }
565 565
 
566 566
 bool c4_ConcatViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
567 567
 {
568
-  c4_View v = _tqparent;
568
+  c4_View v = _parent;
569 569
 
570
-  if (row_ >= _tqparent.GetSize())
570
+  if (row_ >= _parent.GetSize())
571 571
   {
572 572
     v = _argView;
573
-    row_ -= _tqparent.GetSize();
574
-    col_ = v.FindProperty(_tqparent.NthProperty(col_).GetId());
573
+    row_ -= _parent.GetSize();
574
+    col_ = v.FindProperty(_parent.NthProperty(col_).GetId());
575 575
     
576 576
     if (col_ < 0)
577 577
       return false;
@@ -582,13 +582,13 @@ bool c4_ConcatViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
582 582
 
583 583
 bool c4_ConcatViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
584 584
 {
585
-  c4_View v = _tqparent;
585
+  c4_View v = _parent;
586 586
 
587
-  if (row_ >= _tqparent.GetSize())
587
+  if (row_ >= _parent.GetSize())
588 588
   {
589 589
     v = _argView;
590
-    row_ -= _tqparent.GetSize();
591
-    col_ = v.FindProperty(_tqparent.NthProperty(col_).GetId());
590
+    row_ -= _parent.GetSize();
591
+    col_ = v.FindProperty(_parent.NthProperty(col_).GetId());
592 592
     d4_assert(col_ >= 0);
593 593
   }
594 594
 
@@ -605,7 +605,7 @@ c4_CustomViewer* f4_CustConcat(c4_Sequence& seq_, const c4_View& view_)
605 605
 
606 606
 class c4_RenameViewer : public c4_CustomViewer
607 607
 {
608
-  c4_View _tqparent, _template;
608
+  c4_View _parent, _template;
609 609
 
610 610
 public: 
611 611
   c4_RenameViewer (c4_Sequence& seq_, const c4_Property& old_,
@@ -622,11 +622,11 @@ public:
622 622
 
623 623
 c4_RenameViewer::c4_RenameViewer (c4_Sequence& seq_, const c4_Property& old_,
624 624
                            const c4_Property& new_)
625
-  : _tqparent (&seq_)
625
+  : _parent (&seq_)
626 626
 {
627
-  for (int i = 0; i < _tqparent.NumProperties(); ++i)
627
+  for (int i = 0; i < _parent.NumProperties(); ++i)
628 628
   {
629
-    const c4_Property& prop = _tqparent.NthProperty(i);
629
+    const c4_Property& prop = _parent.NthProperty(i);
630 630
     _template.AddProperty(prop.GetId() == old_.GetId() ? new_ : prop);
631 631
   }
632 632
 }
@@ -642,17 +642,17 @@ c4_View c4_RenameViewer::GetTemplate()
642 642
 
643 643
 int c4_RenameViewer::GetSize()
644 644
 {
645
-  return _tqparent.GetSize();
645
+  return _parent.GetSize();
646 646
 }
647 647
 
648 648
 bool c4_RenameViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
649 649
 {
650
-  return _tqparent.GetItem(row_, col_, buf_);
650
+  return _parent.GetItem(row_, col_, buf_);
651 651
 }
652 652
 
653 653
 bool c4_RenameViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
654 654
 {
655
-  _tqparent.SetItem(row_, col_, buf_);
655
+  _parent.SetItem(row_, col_, buf_);
656 656
   return true;
657 657
 }
658 658
 
@@ -666,7 +666,7 @@ c4_CustomViewer* f4_CustRename(c4_Sequence& seq_, const c4_Property& old_,
666 666
 
667 667
 class c4_GroupByViewer : public c4_CustomViewer
668 668
 {
669
-  c4_View _tqparent, _keys, _sorted, _temp;
669
+  c4_View _parent, _keys, _sorted, _temp;
670 670
   c4_Property _result;
671 671
   c4_DWordArray _map;
672 672
 
@@ -685,9 +685,9 @@ public:
685 685
 
686 686
 c4_GroupByViewer::c4_GroupByViewer (c4_Sequence& seq_, const c4_View& keys_,
687 687
                            const c4_Property& result_)
688
-  : _tqparent (&seq_), _keys (keys_), _result (result_)
688
+  : _parent (&seq_), _keys (keys_), _result (result_)
689 689
 {
690
-  _sorted = _tqparent.SortOn(_keys);
690
+  _sorted = _parent.SortOn(_keys);
691 691
   int n = _sorted.GetSize();
692 692
 
693 693
   c4_Bytes temp;
@@ -804,7 +804,7 @@ c4_CustomViewer* f4_CustGroupBy(c4_Sequence& seq_, const c4_View& template_,
804 804
 
805 805
 class c4_JoinPropViewer : public c4_CustomViewer
806 806
 {
807
-  c4_View _tqparent, _template;
807
+  c4_View _parent, _template;
808 808
   c4_ViewProp _sub;
809 809
   int _subPos, _subWidth;
810 810
   c4_DWordArray _base, _offset;
@@ -820,20 +820,20 @@ public:
820 820
 
821 821
 c4_JoinPropViewer::c4_JoinPropViewer (c4_Sequence& seq_,
822 822
                     const c4_ViewProp& sub_, bool outer_)
823
-  : _tqparent (&seq_),
824
-    _sub (sub_), _subPos (_tqparent.FindProperty(sub_.GetId())), _subWidth (0)
823
+  : _parent (&seq_),
824
+    _sub (sub_), _subPos (_parent.FindProperty(sub_.GetId())), _subWidth (0)
825 825
 {
826 826
   d4_assert(_subPos >= 0);
827 827
 
828
-  for (int k = 0; k < _tqparent.NumProperties(); ++k)
828
+  for (int k = 0; k < _parent.NumProperties(); ++k)
829 829
   {
830 830
     if (k != _subPos)
831
-      _template.AddProperty(_tqparent.NthProperty(k));
831
+      _template.AddProperty(_parent.NthProperty(k));
832 832
     else  // if there are no rows, then this join does very little anyway
833 833
         //! OOPS: if this is an unattached view, then the subviews can differ
834
-      if (_tqparent.GetSize() > 0)
834
+      if (_parent.GetSize() > 0)
835 835
       {
836
-        c4_View view = sub_ (_tqparent[0]);
836
+        c4_View view = sub_ (_parent[0]);
837 837
         for (int l = 0; l < view.NumProperties(); ++l)
838 838
         {
839 839
           _template.AddProperty(view.NthProperty(l));
@@ -845,9 +845,9 @@ c4_JoinPropViewer::c4_JoinPropViewer (c4_Sequence& seq_,
845 845
   _base.SetSize(0, 5);
846 846
   _offset.SetSize(0, 5);
847 847
 
848
-  for (int i = 0; i < _tqparent.GetSize(); ++i)
848
+  for (int i = 0; i < _parent.GetSize(); ++i)
849 849
   {
850
-    c4_View v = _sub (_tqparent[i]);
850
+    c4_View v = _sub (_parent[i]);
851 851
 
852 852
     int n = v.GetSize();
853 853
     if (n == 0 && outer_)
@@ -880,7 +880,7 @@ int c4_JoinPropViewer::GetSize()
880 880
 
881 881
 bool c4_JoinPropViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
882 882
 {
883
-  c4_View v = _tqparent;
883
+  c4_View v = _parent;
884 884
   int r = _base.GetAt(row_);
885 885
 
886 886
   if (col_ >= _subPos)
@@ -890,7 +890,7 @@ bool c4_JoinPropViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
890 890
     }
891 891
     else
892 892
     {
893
-      v = _sub (_tqparent[r]);
893
+      v = _sub (_parent[r]);
894 894
       r = _offset.GetAt(row_);
895 895
       if (r < 0)
896 896
         return false; // if this is a null row in an outer join
@@ -913,7 +913,7 @@ c4_CustomViewer* f4_CustJoinProp(c4_Sequence& seq_,
913 913
 
914 914
 class c4_JoinViewer : public c4_CustomViewer
915 915
 {
916
-  c4_View _tqparent, _argView, _template;
916
+  c4_View _parent, _argView, _template;
917 917
   c4_DWordArray _base, _offset;
918 918
 
919 919
 public: 
@@ -928,14 +928,14 @@ public:
928 928
 
929 929
 c4_JoinViewer::c4_JoinViewer (c4_Sequence& seq_,const c4_View& keys_,
930 930
                 const c4_View& view_, bool outer_)
931
-  : _tqparent (&seq_), _argView (view_.SortOn(keys_))
931
+  : _parent (&seq_), _argView (view_.SortOn(keys_))
932 932
 {
933 933
     // why not in GetTemplate, since we don't need to know this...
934
-  _template = _tqparent.Clone();
934
+  _template = _parent.Clone();
935 935
   for (int l = 0; l < _argView.NumProperties(); ++l)
936 936
     _template.AddProperty(_argView.NthProperty(l));
937 937
 
938
-  c4_View sorted = _tqparent.SortOn(keys_).Project(keys_);
938
+  c4_View sorted = _parent.SortOn(keys_).Project(keys_);
939 939
   c4_View temp = _argView.Project(keys_);
940 940
 
941 941
   _base.SetSize(0, 5);
@@ -945,7 +945,7 @@ c4_JoinViewer::c4_JoinViewer (c4_Sequence& seq_,const c4_View& keys_,
945 945
 
946 946
   for (int i = 0; i < sorted.GetSize(); ++i)
947 947
   {
948
-    int orig = _tqparent.GetIndexOf(sorted[i]);
948
+    int orig = _parent.GetIndexOf(sorted[i]);
949 949
     d4_assert(orig >= 0);
950 950
 
951 951
     if (i > 0 && sorted[i] == sorted[i-1])
@@ -1009,7 +1009,7 @@ int c4_JoinViewer::GetSize()
1009 1009
 
1010 1010
 bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
1011 1011
 {
1012
-  c4_View v = _tqparent;
1012
+  c4_View v = _parent;
1013 1013
   int r = _base.GetAt(row_);
1014 1014
 
1015 1015
   if (col_ >= v.NumProperties())
@@ -1030,7 +1030,7 @@ bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
1030 1030
 #if 0
1031 1031
 bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
1032 1032
 {
1033
-  c4_View v = _tqparent;
1033
+  c4_View v = _parent;
1034 1034
 
1035 1035
   int o = 0;
1036 1036
   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_)
78 78
 // c4_HandlerSeq
79 79
 
80 80
 c4_HandlerSeq::c4_HandlerSeq (c4_Persist* persist_)
81
-  : _persist (persist_), _field (0), _tqparent (0), _numRows (0)
81
+  : _persist (persist_), _field (0), _parent (0), _numRows (0)
82 82
 { 
83 83
 }
84 84
 
85 85
 c4_HandlerSeq::c4_HandlerSeq (c4_HandlerSeq& owner_, c4_Handler* handler_)
86 86
   : _persist (owner_.Persist()), _field (owner_.FindField(handler_)),
87
-    _tqparent (&owner_), _numRows (0)
87
+    _parent (&owner_), _numRows (0)
88 88
 { 
89 89
   for (int i = 0; i < NumFields(); ++i) {
90 90
     c4_Field& field = Field(i);
@@ -98,7 +98,7 @@ c4_HandlerSeq::c4_HandlerSeq (c4_HandlerSeq& owner_, c4_Handler* handler_)
98 98
 
99 99
 c4_HandlerSeq::~c4_HandlerSeq ()
100 100
 {
101
-  const bool rootLevel = _tqparent == this;
101
+  const bool rootLevel = _parent == this;
102 102
   c4_Persist* pers = _persist;
103 103
 
104 104
   if (rootLevel && pers != 0)
@@ -129,7 +129,7 @@ c4_Persist* c4_HandlerSeq::Persist() const
129 129
 void c4_HandlerSeq::DefineRoot()
130 130
 { 
131 131
   d4_assert(_field == 0);
132
-  d4_assert(_tqparent == 0);
132
+  d4_assert(_parent == 0);
133 133
 
134 134
   SetNumRows(1);
135 135
 
@@ -137,7 +137,7 @@ void c4_HandlerSeq::DefineRoot()
137 137
   _field = d4_new c4_Field (desc);
138 138
   d4_assert(!*desc);
139 139
 
140
-  _tqparent = this;
140
+  _parent = this;
141 141
 }
142 142
 
143 143
 c4_Handler* c4_HandlerSeq::CreateHandler(const c4_Property& prop_)
@@ -162,7 +162,7 @@ void c4_HandlerSeq::DetachFromParent()
162 162
     _field = 0;
163 163
   }
164 164
 
165
-  _tqparent = 0;
165
+  _parent = 0;
166 166
 }
167 167
 
168 168
 void c4_HandlerSeq::DetachFromStorage(bool full_)
@@ -293,7 +293,7 @@ void c4_HandlerSeq::Restructure(c4_Field& field_, bool remove_)
293 293
 	}
294 294
     }
295 295
 
296
-  if (_tqparent == this)
296
+  if (_parent == this)
297 297
     delete ofld;  // the root table owns its field structure tree
298 298
 }
299 299
 
@@ -398,8 +398,8 @@ void c4_HandlerSeq::ExchangeEntries(int srcPos_, c4_HandlerSeq& dst_, int dstPos
398 398
       c4_HandlerSeq& t2 = dst_.SubEntry(col, dstPos_);
399 399
 
400 400
         // adjust the parents
401
-      t1._tqparent = this;
402
-      t2._tqparent = &dst_;
401
+      t1._parent = this;
402
+      t2._parent = &dst_;
403 403
 
404 404
         // reattach the proper field structures
405 405
       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
88 88
   c4_PtrArray _handlers;
89 89
   c4_Persist* _persist;
90 90
   c4_Field* _field; 
91
-  c4_HandlerSeq* _tqparent;
91
+  c4_HandlerSeq* _parent;
92 92
   int _numRows;
93 93
 
94 94
 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
84 84
 
85 85
 d4_inline c4_HandlerSeq& c4_HandlerSeq::Parent() const
86 86
 {
87
-  return *_tqparent;
87
+  return *_parent;
88 88
 }
89 89
 
90 90
 /////////////////////////////////////////////////////////////////////////////

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

@@ -258,10 +258,10 @@ t4_i32 c4_HashViewer::CalcHash(c4_Cursor cursor_) const
258 258
 
259 259
 int c4_HashViewer::LookDict(t4_i32 hash_, c4_Cursor cursor_) const
260 260
 {
261
-  const unsigned int tqmask = _map.GetSize() - 2;
261
+  const unsigned int mask = _map.GetSize() - 2;
262 262
   /* We must come up with (i, incr) such that 0 <= i < _size
263 263
      and 0 < incr < _size and both are a function of hash */
264
-  int i = tqmask & ~hash_;
264
+  int i = mask & ~hash_;
265 265
   /* We use ~hash_ instead of hash_, as degenerate hash functions, such
266 266
      as for ints <sigh>, can have lots of leading zeros. It's not
267 267
      really a performance risk, but better safe than sorry. */
@@ -272,14 +272,14 @@ int c4_HashViewer::LookDict(t4_i32 hash_, c4_Cursor cursor_) const
272 272
 
273 273
   /* Derive incr from hash_, just to make it more arbitrary. Note that
274 274
      incr must not be 0, or we will get into an infinite loop.*/
275
-  unsigned incr = (hash_ ^ ((unsigned long) hash_ >> 3)) & tqmask;
275
+  unsigned incr = (hash_ ^ ((unsigned long) hash_ >> 3)) & mask;
276 276
   if (!incr)
277
-    incr = tqmask;
277
+    incr = mask;
278 278
 
279 279
   int poly = GetPoly();
280 280
   for (;;)
281 281
   {
282
-    i = (i+incr) & tqmask;
282
+    i = (i+incr) & mask;
283 283
     if (IsUnused(i))
284 284
       break;
285 285
     if (Hash(i) == hash_ && KeySame(Row(i), cursor_))
@@ -288,7 +288,7 @@ int c4_HashViewer::LookDict(t4_i32 hash_, c4_Cursor cursor_) const
288 288
       freeslot = i;
289 289
       /* Cycle through GF(2^n)-{0} */
290 290
     incr = incr << 1;
291
-    if (incr > tqmask)
291
+    if (incr > mask)
292 292
       incr ^= poly; /* This will implicitely clear the highest bit */
293 293
   }
294 294
 

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

@@ -1,3 +1,3 @@
1 1
  VIEW     1 rows = dict:V
2 2
     0: subview 'dict'
3
-   VIEW     0 rows = tqparent:I index:I view:V
3
+   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()
207 207
     c4_View v3 = pView (v2[0]);
208 208
       A(v3.GetSize() == 2);
209 209
 */
210
-    #define FORMAT07 "dict[tqparent:I,index:I,view[name:S,type:S,child:I]]"
210
+    #define FORMAT07 "dict[parent:I,index:I,view[name:S,type:S,child:I]]"
211 211
     c4_Storage s1 ("f07a", 1);
212 212
     s1.SetStructure(FORMAT07);
213 213
 

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

@@ -118,7 +118,7 @@ class NodeList::RemoveNodeVisitor : public TreeNodeVisitor
118 118
         NodeList* m_list;
119 119
 };
120 120
 
121
-NodeList::NodeList(TQObject *tqparent, const char *name) : d(new NodeListPrivate)
121
+NodeList::NodeList(TQObject *parent, const char *name) : d(new NodeListPrivate)
122 122
 {
123 123
     d->rootNode = 0;
124 124
     d->addNodeVisitor = new AddNodeVisitor(this);
@@ -215,8 +215,8 @@ int NodeList::generateID()
215 215
 
216 216
 void NodeList::slotNodeAdded(TreeNode* node)
217 217
 {
218
-    Folder* tqparent = node->tqparent();
219
-    if ( !node || !d->flatList.contains(tqparent) || d->flatList.contains(node) )
218
+    Folder* parent = node->parent();
219
+    if ( !node || !d->flatList.contains(parent) || d->flatList.contains(node) )
220 220
         return;
221 221
 
222 222
     addNode(node, false);
@@ -230,7 +230,7 @@ void NodeList::slotNodeDestroyed(TreeNode* node)
230 230
     removeNode(node);
231 231
 }
232 232
 
233
-void NodeList::slotNodeRemoved(Folder* /*tqparent*/, TreeNode* node)
233
+void NodeList::slotNodeRemoved(Folder* /*parent*/, TreeNode* node)
234 234
 {
235 235
     if ( !node || !d->flatList.contains(node) )
236 236
         return;

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

@@ -52,7 +52,7 @@ Q_OBJECT
52 52
   TQ_OBJECT
53 53
 
54 54
 public:
55
-    NodeList(TQObject *tqparent=0, const char *name=0);
55
+    NodeList(TQObject *parent=0, const char *name=0);
56 56
     virtual ~NodeList();
57 57
 
58 58
     virtual Folder* rootNode() const;
@@ -104,7 +104,7 @@ public slots:         // compat with KDE-3.x assertions, remove for KDE 4
104 104
 
105 105
     virtual void slotNodeDestroyed(TreeNode* node);
106 106
     virtual void slotNodeAdded(TreeNode* node);
107
-    virtual void slotNodeRemoved(Folder* tqparent, TreeNode* node);
107
+    virtual void slotNodeRemoved(Folder* parent, TreeNode* node);
108 108
 
109 109
 public:         // compat with KDE-3.x assertions, remove for KDE 4
110 110
 // private:

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

@@ -95,8 +95,8 @@ class PageViewer::PageViewerPrivate
95 95
 };           
96 96
 
97 97
  
98
-PageViewer::PageViewer(TQWidget *tqparent, const char *name)
99
-    : Viewer(tqparent, name), d(new PageViewerPrivate)
98
+PageViewer::PageViewer(TQWidget *parent, const char *name)
99
+    : Viewer(parent, name), d(new PageViewerPrivate)
100 100
 {
101 101
     // this hack is necessary since the part looks for []HTML Settings] in
102 102
     // 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
42 42
         Q_OBJECT
43 43
   TQ_OBJECT
44 44
         public:
45
-            PageViewer(TQWidget* tqparent, const char* name);
45
+            PageViewer(TQWidget* parent, const char* name);
46 46
             virtual ~PageViewer();
47 47
             virtual bool openURL(const KURL &url);
48 48
 

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

@@ -26,10 +26,10 @@ namespace Akregator
26 26
 
27 27
             virtual bool init() = 0;
28 28
             /**
29
-             * TODO @param tqparent you must tqparent the widget to tqparent
29
+             * TODO @param parent you must parent the widget to parent
30 30
              * @return the configure widget for your plugin, create it on the heap!
31 31
              */
32
-             //TODO rename configureWidget( TQWidget *tqparent )
32
+             //TODO rename configureWidget( TQWidget *parent )
33 33
             // virtual PluginConfig* configure() const { return 0; }
34 34
 
35 35
             void addPluginProperty( const TQString& key, const TQString& value );

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

@@ -38,8 +38,8 @@
38 38
 
39 39
 namespace Akregator {
40 40
 
41
-FeedPropertiesWidget::FeedPropertiesWidget(TQWidget *tqparent, const char *name)
42
-        : FeedPropertiesWidgetBase(tqparent, name)
41
+FeedPropertiesWidget::FeedPropertiesWidget(TQWidget *parent, const char *name)
42
+        : FeedPropertiesWidgetBase(parent, name)
43 43
 {
44 44
 }
45 45
 
@@ -65,8 +65,8 @@ void FeedPropertiesWidget::slotUpdateCheckBoxToggled( bool enabled )
65 65
 }
66 66
 
67 67
 
68
-FeedPropertiesDialog::FeedPropertiesDialog(TQWidget *tqparent, const char *name)
69
-        : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, tqparent, name, true, i18n("Feed Properties"), KDialogBase::Ok|KDialogBase::Cancel)
68
+FeedPropertiesDialog::FeedPropertiesDialog(TQWidget *parent, const char *name)
69
+        : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, parent, name, true, i18n("Feed Properties"), KDialogBase::Ok|KDialogBase::Cancel)
70 70
 {
71 71
     widget=new FeedPropertiesWidget(this);
72 72
     setMainWidget(widget);

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

@@ -35,7 +35,7 @@ namespace Akregator
35 35
       Q_OBJECT
36 36
   TQ_OBJECT
37 37
       public:
38
-         FeedPropertiesWidget(TQWidget *tqparent = 0, const char *name = 0);
38
+         FeedPropertiesWidget(TQWidget *parent = 0, const char *name = 0);
39 39
          ~FeedPropertiesWidget();
40 40
          virtual void slotUpdateComboBoxActivated(int index);
41 41
          virtual void slotUpdateCheckBoxToggled(bool enabled);
@@ -47,7 +47,7 @@ namespace Akregator
47 47
       Q_OBJECT
48 48
   TQ_OBJECT
49 49
       public:
50
-         FeedPropertiesDialog(TQWidget *tqparent = 0, const char *name = 0);
50
+         FeedPropertiesDialog(TQWidget *parent = 0, const char *name = 0);
51 51
          ~FeedPropertiesDialog();
52 52
 
53 53
          void setFeed(Feed* feed);

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

@@ -60,7 +60,7 @@ public:
60 60
     int delay;
61 61
 };
62 62
 
63
-SearchBar::SearchBar(TQWidget* tqparent, const char* name) : TQHBox(tqparent, name), d(new SearchBar::SearchBarPrivate)
63
+SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name), d(new SearchBar::SearchBarPrivate)
64 64
 {
65 65
     d->delay = 400;
66 66
     setMargin(2);

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

@@ -44,7 +44,7 @@ class SearchBar : public TQHBox
44 44
 
45 45
     public:
46 46
 
47
-        SearchBar(TQWidget* tqparent=0, const char* name=0);
47
+        SearchBar(TQWidget* parent=0, const char* name=0);
48 48
         virtual ~SearchBar();
49 49
 
50 50
         TQString text() const;

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

@@ -11,7 +11,7 @@
11 11
 
12 12
 namespace Akregator {
13 13
 
14
-SettingsAdvanced::SettingsAdvanced(TQWidget* tqparent, const char* name) : SettingsAdvancedBase(tqparent, name)
14
+SettingsAdvanced::SettingsAdvanced(TQWidget* parent, const char* name) : SettingsAdvancedBase(parent, name)
15 15
 {
16 16
 
17 17
     TQStringList backends = Backend::StorageFactoryRegistry::self()->list();

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

@@ -21,7 +21,7 @@ class SettingsAdvanced : public SettingsAdvancedBase
21 21
     TQ_OBJECT
22 22
 
23 23
     public:
24
-        SettingsAdvanced(TQWidget* tqparent=0, const char* name=0);
24
+        SettingsAdvanced(TQWidget* parent=0, const char* name=0);
25 25
 
26 26
         /** returns the key of the currently selected factory */
27 27
         TQString selectedFactory() const;

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

@@ -44,8 +44,8 @@ class SelectNodeDialog::SelectNodeDialogPrivate
44 44
     SimpleNodeSelector* widget;
45 45
 };
46 46
 
47
-SelectNodeDialog::SelectNodeDialog(FeedList* feedList, TQWidget* tqparent, char* name) : 
48
- KDialogBase(tqparent, name, true, i18n("Select Feed or Folder"),
47
+SelectNodeDialog::SelectNodeDialog(FeedList* feedList, TQWidget* parent, char* name) : 
48
+ KDialogBase(parent, name, true, i18n("Select Feed or Folder"),
49 49
                   KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), d(new SelectNodeDialogPrivate)
50 50
 {
51 51
     d->widget = new SimpleNodeSelector(feedList, this);
@@ -111,7 +111,7 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor
111 111
 
112 112
     virtual bool visitTreeNode(TreeNode* node)
113 113
     {
114
-        TQListViewItem* pi = node->tqparent() ? m_view->d->nodeToItem[node->tqparent()] : 0;
114
+        TQListViewItem* pi = node->parent() ? m_view->d->nodeToItem[node->parent()] : 0;
115 115
          
116 116
         KListViewItem* item = 0;
117 117
         if (pi != 0)
@@ -131,7 +131,7 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor
131 131
 };
132 132
 
133 133
 
134
-SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* tqparent, const char* name) : TQWidget(tqparent, name), d(new SimpleNodeSelectorPrivate)
134
+SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, const char* name) : TQWidget(parent, name), d(new SimpleNodeSelectorPrivate)
135 135
 {
136 136
     d->list = feedList;
137 137
     connect(feedList, TQT_SIGNAL(signalDestroyed(FeedList*)), this, TQT_SLOT(slotFeedListDestroyed(FeedList*)));

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

@@ -46,7 +46,7 @@ class SelectNodeDialog : public KDialogBase
46 46
     Q_OBJECT
47 47
   TQ_OBJECT
48 48
     public:
49
-        SelectNodeDialog(FeedList* feedList, TQWidget* tqparent=0, char* name=0);
49
+        SelectNodeDialog(FeedList* feedList, TQWidget* parent=0, char* name=0);
50 50
         virtual ~SelectNodeDialog();
51 51
         
52 52
         TreeNode* selectedNode() const;
@@ -70,7 +70,7 @@ class SimpleNodeSelector : public TQWidget
70 70
   TQ_OBJECT
71 71
 
72 72
     public:
73
-        SimpleNodeSelector(FeedList* feedList, TQWidget* tqparent=0, const char* name=0);
73
+        SimpleNodeSelector(FeedList* feedList, TQWidget* parent=0, const char* name=0);
74 74
         virtual ~SimpleNodeSelector();
75 75
 
76 76
         TreeNode* selectedNode() const;

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

@@ -63,8 +63,8 @@ class TabWidget::TabWidgetPrivate
63 63
     TQToolButton* tabsClose;
64 64
 };
65 65
 
66
-TabWidget::TabWidget(TQWidget * tqparent, const char *name)
67
-        :KTabWidget(tqparent, name), d(new TabWidgetPrivate)
66
+TabWidget::TabWidget(TQWidget * parent, const char *name)
67
+        :KTabWidget(parent, name), d(new TabWidgetPrivate)
68 68
 {
69 69
     d->CurrentMaxLength = 30;
70 70
     d->currentItem = 0;

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

@@ -41,7 +41,7 @@ class TabWidget : public KTabWidget
41 41
   TQ_OBJECT
42 42
 
43 43
     public:
44
-        TabWidget(TQWidget * tqparent = 0, const char *name = 0);
44
+        TabWidget(TQWidget * parent = 0, const char *name = 0);
45 45
         virtual ~TabWidget();
46 46
 
47 47
         void addFrame(Frame *f);

+ 3
- 3
akregator/src/tagaction.cpp View File

@@ -44,9 +44,9 @@ class TagAction::TagActionPrivate
44 44
     //TQMap<TQPopupMenu*, int> popupToId;
45 45
 };
46 46
  
47
-TagAction::TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *tqparent)
48
-//KAction (const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, TQObject *tqparent, const char *name=0)
49
-       : KToggleAction(tag.name(), KShortcut(), 0, 0, tqparent), d(new TagActionPrivate)
47
+TagAction::TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *parent)
48
+//KAction (const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name=0)
49
+       : KToggleAction(tag.name(), KShortcut(), 0, 0, parent), d(new TagActionPrivate)
50 50
 {
51 51
      d->tag = tag;
52 52
      connect(this, TQT_SIGNAL(toggled(const Tag&, bool)), receiver, slot);

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

@@ -42,7 +42,7 @@ class TagAction : public KToggleAction
42 42
 
43 43
     public:
44 44
 
45
-        TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *tqparent=0);
45
+        TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *parent=0);
46 46
         virtual ~TagAction();
47 47
         
48 48
         //virtual int plug(TQWidget *widget, int index=-1);

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

@@ -52,7 +52,7 @@ bool TagFolder::accept(TreeNodeVisitor* visitor)
52 52
         return visitor->visitFolder(this);
53 53
 }
54 54
 
55
-TQDomElement TagFolder::toOPML( TQDomElement /*tqparent*/, TQDomDocument /*document*/ ) const
55
+TQDomElement TagFolder::toOPML( TQDomElement /*parent*/, TQDomDocument /*document*/ ) const
56 56
 {
57 57
     return TQDomElement();
58 58
 }

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

@@ -43,7 +43,7 @@ class TagFolder : public Folder
43 43
         virtual ~TagFolder();
44 44
         virtual bool accept(TreeNodeVisitor* visitor);
45 45
 
46
-        virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const;
46
+        virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const;
47 47
 
48 48
     private:
49 49
         class TagFolderPrivate;

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

@@ -33,19 +33,19 @@
33 33
 
34 34
 namespace Akregator {
35 35
 
36
-TagFolderItem::TagFolderItem(FolderItem* tqparent, TagFolder* node) : FolderItem(tqparent, node)
36
+TagFolderItem::TagFolderItem(FolderItem* parent, TagFolder* node) : FolderItem(parent, node)
37 37
 {
38 38
 }
39 39
 
40
-TagFolderItem::TagFolderItem(FolderItem* tqparent, TreeNodeItem* after, TagFolder* node) : FolderItem(tqparent, after, node)
40
+TagFolderItem::TagFolderItem(FolderItem* parent, TreeNodeItem* after, TagFolder* node) : FolderItem(parent, after, node)
41 41
 {
42 42
 }
43 43
 
44
-TagFolderItem::TagFolderItem(KListView* tqparent, TagFolder* node) : FolderItem(tqparent, node)
44
+TagFolderItem::TagFolderItem(KListView* parent, TagFolder* node) : FolderItem(parent, node)
45 45
 {
46 46
 }
47 47
 
48
-TagFolderItem::TagFolderItem(KListView* tqparent, TreeNodeItem* after, TagFolder* node) : FolderItem(tqparent, after, node)
48
+TagFolderItem::TagFolderItem(KListView* parent, TreeNodeItem* after, TagFolder* node) : FolderItem(parent, after, node)
49 49
 {
50 50
 }
51 51
 

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

@@ -40,10 +40,10 @@ class TagFolderItem : public FolderItem
40 40
 {
41 41
 
42 42
 public:
43
-    TagFolderItem(FolderItem* tqparent, TagFolder* node);
44
-    TagFolderItem(FolderItem* tqparent, TreeNodeItem* after, TagFolder* node);
45
-    TagFolderItem(KListView* tqparent, TagFolder* node);
46
-    TagFolderItem(KListView* tqparent, TreeNodeItem* after, TagFolder* node);
43
+    TagFolderItem(FolderItem* parent, TagFolder* node);
44
+    TagFolderItem(FolderItem* parent, TreeNodeItem* after, TagFolder* node);
45
+    TagFolderItem(KListView* parent, TagFolder* node);
46
+    TagFolderItem(KListView* parent, TreeNodeItem* after, TagFolder* node);
47 47
     virtual ~TagFolderItem();
48 48
     
49 49
     virtual TagFolder* node();

+ 3
- 3
akregator/src/tagnode.cpp View File

@@ -131,7 +131,7 @@ TQStringList TagNode::tags() const
131 131
    return TQStringList();
132 132
 }
133 133
 
134
-TQDomElement TagNode::toOPML( TQDomElement tqparent, TQDomDocument document ) const
134
+TQDomElement TagNode::toOPML( TQDomElement parent, TQDomDocument document ) const
135 135
 {
136 136
     return TQDomElement();
137 137
 }    
@@ -141,13 +141,13 @@ TreeNode* TagNode::next()
141 141
     if ( nextSibling() )
142 142
         return nextSibling();
143 143
 
144
-    Folder* p = tqparent();
144
+    Folder* p = parent();
145 145
     while (p)
146 146
     {
147 147
         if ( p->nextSibling() )
148 148
             return p->nextSibling();
149 149
         else
150
-            p = p->tqparent();
150
+            p = p->parent();
151 151
     }
152 152
     return 0;
153 153
 }

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

@@ -93,7 +93,7 @@ public:
93 93
 
94 94
     /** reimplemented to return an invalid element */
95 95
     
96
-    virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const;
96
+    virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const;
97 97
     
98 98
     /** returns the next node in the tree.
99 99
         Calling next() unless it returns 0 iterates through the tree in pre-order

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

@@ -35,22 +35,22 @@
35 35
 
36 36
 namespace Akregator {
37 37
 
38
-TagNodeItem::TagNodeItem(FolderItem* tqparent, TagNode* node) : TreeNodeItem(tqparent, node)
38
+TagNodeItem::TagNodeItem(FolderItem* parent, TagNode* node) : TreeNodeItem(parent, node)
39 39
 {
40 40
     initialize(node);
41 41
 }
42 42
 
43
-TagNodeItem::TagNodeItem(FolderItem* tqparent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(tqparent, after, node)
43
+TagNodeItem::TagNodeItem(FolderItem* parent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(parent, after, node)
44 44
 {
45 45
     initialize(node);
46 46
 }
47 47
 
48
-TagNodeItem::TagNodeItem(KListView* tqparent, TagNode* node) : TreeNodeItem(tqparent, node)
48
+TagNodeItem::TagNodeItem(KListView* parent, TagNode* node) : TreeNodeItem(parent, node)
49 49
 {
50 50
     initialize(node);
51 51
 }
52 52
 
53
-TagNodeItem::TagNodeItem(KListView* tqparent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(tqparent, after, node)
53
+TagNodeItem::TagNodeItem(KListView* parent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(parent, after, node)
54 54
 {
55 55
     initialize(node);
56 56
 }

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

@@ -37,10 +37,10 @@ class TagNodeItem : public TreeNodeItem
37 37
 {
38 38
 
39 39
 public:
40
-    TagNodeItem(FolderItem* tqparent, TagNode* node);
41
-    TagNodeItem(FolderItem* tqparent, TreeNodeItem* after, TagNode* node);
42
-    TagNodeItem(KListView* tqparent, TagNode* node);
43
-    TagNodeItem(KListView* tqparent, TreeNodeItem* after, TagNode* node);
40
+    TagNodeItem(FolderItem* parent, TagNode* node);
41
+    TagNodeItem(FolderItem* parent, TreeNodeItem* after, TagNode* node);
42
+    TagNodeItem(KListView* parent, TagNode* node);
43
+    TagNodeItem(KListView* parent, TreeNodeItem* after, TagNode* node);
44 44
     virtual ~TagNodeItem();
45 45
     virtual void nodeChanged();
46 46
     

+ 3
- 3
akregator/src/tagnodelist.cpp View File

@@ -142,14 +142,14 @@ void TagNodeList::slotNodeAdded(TreeNode* node)
142 142
     }
143 143
 }
144 144
 
145
-void TagNodeList::slotNodeRemoved(Folder* tqparent, TreeNode* node)
145
+void TagNodeList::slotNodeRemoved(Folder* parent, TreeNode* node)
146 146
 {
147
-    NodeList::slotNodeRemoved(tqparent, node);
147
+    NodeList::slotNodeRemoved(parent, node);
148 148