Browse Source

Initial conversion of kdepim to TQt

This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK.  Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tpearson 8 years ago
parent
commit
67e29a054c
100 changed files with 732 additions and 705 deletions
  1. 11
    11
      NewsLog.txt
  2. 1
    1
      README.Kolab
  3. 2
    2
      akregator/COPYING
  4. 10
    10
      akregator/HACKING
  5. 2
    2
      akregator/src/aboutdata.cpp
  6. 2
    2
      akregator/src/aboutdata.h
  7. 3
    3
      akregator/src/actionmanager.cpp
  8. 4
    4
      akregator/src/actionmanager.h
  9. 20
    20
      akregator/src/actionmanagerimpl.cpp
  10. 4
    3
      akregator/src/actionmanagerimpl.h
  11. 8
    8
      akregator/src/addfeeddialog.cpp
  12. 6
    4
      akregator/src/addfeeddialog.h
  13. 7
    7
      akregator/src/addfeedwidgetbase.ui
  14. 2
    2
      akregator/src/akregator_options.h
  15. 13
    13
      akregator/src/akregator_part.cpp
  16. 5
    3
      akregator/src/akregator_part.h
  17. 2
    2
      akregator/src/akregator_partiface.h
  18. 2
    2
      akregator/src/akregator_run.cpp
  19. 3
    2
      akregator/src/akregator_run.h
  20. 48
    48
      akregator/src/akregator_view.cpp
  21. 13
    12
      akregator/src/akregator_view.h
  22. 17
    17
      akregator/src/article.cpp
  23. 4
    4
      akregator/src/article.h
  24. 9
    9
      akregator/src/articlefilter.cpp
  25. 4
    4
      akregator/src/articlefilter.h
  26. 14
    14
      akregator/src/articlelistview.cpp
  27. 4
    3
      akregator/src/articlelistview.h
  28. 6
    6
      akregator/src/articleviewer.cpp
  29. 4
    3
      akregator/src/articleviewer.h
  30. 1
    1
      akregator/src/articleviewer.rc
  31. 3
    3
      akregator/src/configdialog.cpp
  32. 4
    3
      akregator/src/configdialog.h
  33. 2
    2
      akregator/src/dragobjects.cpp
  34. 2
    2
      akregator/src/dragobjects.h
  35. 19
    19
      akregator/src/feed.cpp
  36. 9
    8
      akregator/src/feed.h
  37. 7
    7
      akregator/src/feediconmanager.cpp
  38. 3
    2
      akregator/src/feediconmanager.h
  39. 6
    6
      akregator/src/feeditem.cpp
  40. 6
    6
      akregator/src/feeditem.h
  41. 17
    17
      akregator/src/feedlist.cpp
  42. 7
    6
      akregator/src/feedlist.h
  43. 60
    60
      akregator/src/feedlistview.cpp
  44. 11
    9
      akregator/src/feedlistview.h
  45. 9
    9
      akregator/src/feedstorage.h
  46. 8
    8
      akregator/src/feedstoragedummyimpl.cpp
  47. 6
    6
      akregator/src/feedstoragedummyimpl.h
  48. 3
    3
      akregator/src/fetchqueue.cpp
  49. 7
    6
      akregator/src/fetchqueue.h
  50. 40
    40
      akregator/src/folder.cpp
  51. 17
    16
      akregator/src/folder.h
  52. 6
    6
      akregator/src/folderitem.cpp
  53. 6
    6
      akregator/src/folderitem.h
  54. 9
    9
      akregator/src/frame.cpp
  55. 5
    4
      akregator/src/frame.h
  56. 2
    2
      akregator/src/kcursorsaver.h
  57. 2
    2
      akregator/src/kernel.cpp
  58. 2
    2
      akregator/src/kernel.h
  59. 2
    2
      akregator/src/librss/article.cpp
  60. 6
    6
      akregator/src/librss/article.h
  61. 4
    4
      akregator/src/librss/category.cpp
  62. 2
    2
      akregator/src/librss/category.h
  63. 12
    12
      akregator/src/librss/document.cpp
  64. 4
    4
      akregator/src/librss/document.h
  65. 2
    2
      akregator/src/librss/enclosure.cpp
  66. 2
    2
      akregator/src/librss/enclosure.h
  67. 2
    2
      akregator/src/librss/feeddetector.cpp
  68. 2
    2
      akregator/src/librss/feeddetector.h
  69. 1
    1
      akregator/src/librss/global.h
  70. 4
    3
      akregator/src/librss/image.h
  71. 3
    3
      akregator/src/librss/loader.cpp
  72. 11
    7
      akregator/src/librss/loader.h
  73. 3
    3
      akregator/src/librss/testlibrss.cpp
  74. 4
    3
      akregator/src/librss/testlibrss.h
  75. 3
    3
      akregator/src/librss/textinput.h
  76. 12
    12
      akregator/src/librss/tools_p.cpp
  77. 3
    3
      akregator/src/librss/tools_p.h
  78. 3
    3
      akregator/src/listtabwidget.cpp
  79. 6
    5
      akregator/src/listtabwidget.h
  80. 2
    2
      akregator/src/main.cpp
  81. 4
    4
      akregator/src/mainwindow.cpp
  82. 4
    2
      akregator/src/mainwindow.h
  83. 6
    6
      akregator/src/mk4storage/feedstoragemk4impl.cpp
  84. 6
    6
      akregator/src/mk4storage/feedstoragemk4impl.h
  85. 13
    13
      akregator/src/mk4storage/metakit/CHANGES
  86. 1
    1
      akregator/src/mk4storage/metakit/README
  87. 1
    1
      akregator/src/mk4storage/metakit/include/mk4str.h
  88. 3
    3
      akregator/src/mk4storage/metakit/include/mk4str.inl
  89. 64
    64
      akregator/src/mk4storage/metakit/src/custom.cpp
  90. 2
    2
      akregator/src/mk4storage/metakit/src/field.cpp
  91. 1
    1
      akregator/src/mk4storage/metakit/src/field.h
  92. 1
    1
      akregator/src/mk4storage/metakit/src/format.cpp
  93. 12
    12
      akregator/src/mk4storage/metakit/src/handler.cpp
  94. 2
    2
      akregator/src/mk4storage/metakit/src/handler.h
  95. 1
    1
      akregator/src/mk4storage/metakit/src/handler.inl
  96. 2
    2
      akregator/src/mk4storage/metakit/src/persist.cpp
  97. 4
    4
      akregator/src/mk4storage/metakit/src/remap.cpp
  98. 2
    2
      akregator/src/mk4storage/metakit/src/store.cpp
  99. 1
    1
      akregator/src/mk4storage/metakit/src/view.cpp
  100. 0
    0
      akregator/src/mk4storage/metakit/tests/ok/f07a.txt

+ 11
- 11
NewsLog.txt View File

@@ -66,7 +66,7 @@ Problems addressed
66 66
 ------------------
67 67
 
68 68
 * kolab/issue4335 (partly): D'n'D a mail attachment with the icon is not working (rt#6126)
69
-* kolab/issue3908 (partly): Mail view and print layout problem if description of attachment is to long (#5872)
69
+* kolab/issue3908 (partly): Mail view and print tqlayout problem if description of attachment is to long (#5872)
70 70
 * kolab/issue4455: calendar activate/deactivate handling broken
71 71
 * kolab/issue4282: Adding a new event from an invitation update mail shows unnecssary message
72 72
                    dialog 'store/throw away' (rt#6094)
@@ -269,7 +269,7 @@ Problems addressed
269 269
 * kolab/issue3902: Delete a folder while syncing leads to crash
270 270
 * kolab/issue4250: Edit "Out of office" replies: Resend notification only after: days is missing (rt#6076)
271 271
 * kolab/issue4249: Crash while printing a mail without preview pane (rt#6075)
272
-* kolab/issue4142: Composer: view all fields layout and small problems (rt#6032)
272
+* kolab/issue4142: Composer: view all fields tqlayout and small problems (rt#6032)
273 273
 * kolab/issue4012: Calender view update problem, if the same appointment is moved on the server in other folders (rt#5930)
274 274
 
275 275
 
@@ -551,7 +551,7 @@ Problems addressed
551 551
 
552 552
 * kolab/issue3923(partial): Save as of an attachment of an invitation crashes kontact
553 553
 * kolab/issue3930: time on the Marcus Bains line doesn't change
554
-* kolab/issue3908(partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
554
+* kolab/issue3908(partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
555 555
 * kolab/issue3926: Start khelpcenter instead of webbrowser help: from the introduction/welcome screen (rt#5881)
556 556
 * kolab/issue3481: Keep current email in front after saving an attachment (rt#5746)
557 557
 * kolab/issue3098: OnlineIMAP, sometimes Mail body no longer shown -> Crash
@@ -565,7 +565,7 @@ Problems addressed
565 565
 * kolab/issue3065: Crash in KOAgendaItem::paintEvent
566 566
 * kolab/issue3902: Delete a folder while syncing leads to crash
567 567
 * kolab/issue3903: Kontact hangs when switching to calendar view (rt#5870)
568
-* kolab/issue3908 (partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
568
+* kolab/issue3908 (partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
569 569
 * kolab/issue3807: Reminder: None of the buttons should be the default (rt#5845)
570 570
 * kolab/issue3809: Reminder: sorting in look&feel of kontact (rt#5846)
571 571
 * kolab/issue3813: reccuring events show wrong dates (rt#5855)
@@ -593,7 +593,7 @@ Friday, October 2th 2009
593 593
 Problems addressed
594 594
 ------------------
595 595
 
596
-* kolab/issue3783: SMIME encrypted and signed mail: Audit log dialog contains ???? at the bottom
596
+* kolab/issue3783: SMIME encrypted and signed mail: Audit log dialog tqcontains ???? at the bottom
597 597
 * kolab/issue3823: mimetreeviewer doesn't show structure of forward-as-attachment message #n where #n > 1
598 598
 * kolab/issue3889: Kontact crahes if opening/changing calendar view (rt#5868)
599 599
 * kolab/issue3867: Save S/MIME encrypted mails unencrypted after reading them
@@ -1108,7 +1108,7 @@ Friday, November 21st 2008
1108 1108
 Problems addressed
1109 1109
 ------------------
1110 1110
 
1111
-* kolab/issue2627 Status line for audit log shown, even when it is not implemented.
1111
+* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented.
1112 1112
 * kolab/issue2617 Kleopatra: After importing a p7c or p12 file the user is informed, that he has imported 0 certifictes.
1113 1113
 * kolab/issue2620 Kleopatra throws an error message, if no .gnupg exists and no agent is running.
1114 1114
 
@@ -1125,7 +1125,7 @@ Sunday, November 9th 2008
1125 1125
 Problems addressed
1126 1126
 ------------------
1127 1127
 
1128
-* kolab/issue2627 Status line for audit log shown, even when it is not implemented.
1128
+* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented.
1129 1129
 *Support the /vendor/cmu/cyrus-imapd/sharedseen annotation available in Cyrus IMAP server 2.3.9 or higher which allows to share the seen flags between all users that have access to a folder.
1130 1130
 * Detect if the server supports shared seen flags. Also preserve the IMAP server capabilities in kmailrc so that detection also works without a prior sync.
1131 1131
  
@@ -1474,7 +1474,7 @@ Friday, February 29th 2008
1474 1474
 Problems addressed
1475 1475
 -------------------
1476 1476
 
1477
-* Prevent crash after changing the layout and replying then. (778728)
1477
+* Prevent crash after changing the tqlayout and replying then. (778728)
1478 1478
 * kolab/issue2442 kolab/issue2442 (kioslave crashs after closing kontact, if the vacation reminder is activated. (779694)
1479 1479
 * "Enterprise headers" makes impossible to select text in first paragraph of body. [ kde-bug#151150 ] (779994)
1480 1480
 * kolab/issue1700 kleopatra crashes after ldap search. (780211)
@@ -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 parent for the "ask to overwrite" dialog.(733495)
1699
+* kolab/issue2142 ( part 2 ) Provide a proper tqparent 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 parent, cleanup initialization order.(734247)
1702
+* kolab/issue2181 Fix crash when opening a message without a tqparent, cleanup initialization order.(734247)
1703 1703
 
1704 1704
 New functionality
1705 1705
 -------------------
@@ -2063,7 +2063,7 @@ Bugfixes
2063 2063
 
2064 2064
 Korganizer
2065 2065
 -----------
2066
-- proko35 W1-9 icon alignment was improved.
2066
+- proko35 W1-9 icon tqalignment was improved.
2067 2067
 
2068 2068
 Additional Fixes
2069 2069
 ================

+ 1
- 1
README.Kolab View File

@@ -39,7 +39,7 @@ KAddressBook:
39 39
    The scheme for the base DN is to take the parts of the fully
40 40
    qualified hostname of the kolab server and put ",dc=" between
41 41
    the parts and "dc=" in front of it. Or in Qt code:
42
-      baseDN = "dc=" + hostname.replace( '.', ",dc=" );
42
+      baseDN = "dc=" + hostname.tqreplace( '.', ",dc=" );
43 43
    Finally check the checkbox to activate the LDAP server. Now
44 44
    you can search the Kolab LDAP server and get all users on the
45 45
    system.

+ 2
- 2
akregator/COPYING View File

@@ -59,7 +59,7 @@ modification follow.
59 59
 		    GNU GENERAL PUBLIC LICENSE
60 60
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
61 61
 
62
-  0. This License applies to any program or other work which contains
62
+  0. This License applies to any program or other work which tqcontains
63 63
 a notice placed by the copyright holder saying it may be distributed
64 64
 under the terms of this General Public License.  The "Program", below,
65 65
 refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
154 154
 
155 155
 The source code for a work means the preferred form of the work for
156 156
 making modifications to it.  For an executable work, complete source
157
-code means all the source code for all modules it contains, plus any
157
+code means all the source code for all modules it tqcontains, plus any
158 158
 associated interface definition files, plus the scripts used to
159 159
 control compilation and installation of the executable.  However, as a
160 160
 special exception, the source code distributed need not include

+ 10
- 10
akregator/HACKING View File

@@ -66,7 +66,7 @@ Spaces
66 66
 ================================================================================
67 67
 
68 68
 Spaces should be used between the conditional / loop type and the
69
-conditional statement.  They should not be used after parenthesis.  However
69
+conditional statement.  They should not be used after tqparenthesis.  However
70 70
 the should be to mark of mathematical or comparative operators.
71 71
 
72 72
 if ( foo == bar )
@@ -87,17 +87,17 @@ class should be roughly as follows:
87 87
 public typedefs:
88 88
 public ctors:
89 89
 public methods:
90
-public slots:
91
-signals:
90
+public Q_SLOTS:
91
+Q_SIGNALS:
92 92
 protected methods:
93
-protected slots:
93
+protected Q_SLOTS:
94 94
 protected fields:
95 95
 private methods:
96
-private slots:
96
+private Q_SLOTS:
97 97
 private fields:
98 98
 private ctors: // if you define ctors/dtor as private, put them at end
99 99
 
100
-If there are no private slots there is no need for two private sections, however
100
+If there are no private Q_SLOTS there is no need for two private sections, however
101 101
 private functions and private variables should be clearly separated.
102 102
 
103 103
 The implementations files -- .cpp files -- should follow (when possible) the
@@ -163,10 +163,10 @@ class Test : public QObject
163 163
 
164 164
         static Test *instance() { return m_instance; }
165 165
 
166
-    public slots:
166
+    public Q_SLOTS:
167 167
         void receive(QSomething &);
168 168
 
169
-    signals:
169
+    Q_SIGNALS:
170 170
         void send(QSomething &);
171 171
 
172 172
     protected:
@@ -174,7 +174,7 @@ class Test : public QObject
174 174
 
175 175
         static void someProtectedStaticFunc();
176 176
 
177
-    protected slots:
177
+    protected Q_SLOTS:
178 178
         void protectedSlot();
179 179
 
180 180
     protected:
@@ -185,7 +185,7 @@ class Test : public QObject
185 185
 
186 186
         static int staticPrivateMethod();
187 187
 
188
-    private slots:
188
+    private Q_SLOTS:
189 189
         void privateSlotIndeed(int youWonder);
190 190
 
191 191
     private:

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

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #include <tqstring.h>

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

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #ifndef ABOUTDATA_H

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

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #include "actionmanager.h"
@@ -43,7 +43,7 @@ void ActionManager::setInstance(ActionManager* manager)
43 43
 }
44 44
 
45 45
 
46
-ActionManager::ActionManager(TQObject* parent, const char* name) : TQObject(parent, name), d(new ActionManagerPrivate)
46
+ActionManager::ActionManager(TQObject* tqparent, const char* name) : TQObject(tqparent, name), d(new ActionManagerPrivate)
47 47
 {}
48 48
 
49 49
 ActionManager::~ActionManager()

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

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #ifndef AKREGATOR_ACTIONMANAGER_H
@@ -36,14 +36,14 @@ namespace Akregator {
36 36
 /** interface for accessing actions, popup menus etc. from widgets.
37 37
     (Extracted from the implementation to avoid dependencies between widgets and  Akregator::Part).
38 38
  */
39
-class ActionManager : public QObject
39
+class ActionManager : public TQObject
40 40
 {
41 41
     public:
42 42
 
43 43
         static ActionManager* getInstance();
44 44
         static void setInstance(ActionManager* manager);
45 45
 
46
-        ActionManager(TQObject* parent=0, const char* name=0);
46
+        ActionManager(TQObject* tqparent=0, const char* name=0);
47 47
         virtual ~ActionManager();
48 48
 
49 49
         virtual KAction* action(const char* name, const char* classname=0) = 0;

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

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #include <tqwidget.h>
@@ -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->parent()); // root nodes must not be deleted
92
+            remove->setEnabled(node->tqparent()); // 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* parent, const char* name) : ActionManager(parent, name), d(new ActionManagerImplPrivate)
225
+ActionManagerImpl::ActionManagerImpl(Part* part, TQObject* tqparent, const char* name) : ActionManager(tqparent, name), d(new ActionManagerImplPrivate)
226 226
 {
227 227
     d->nodeSelectVisitor = new NodeSelectVisitor(this);
228 228
     d->part = part;
@@ -314,13 +314,13 @@ void ActionManagerImpl::initView(View* view)
314 314
     new KAction(i18n("Ma&rk All Feeds as Read"), "goto", "Ctrl+Shift+R", d->view, TQT_SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read");
315 315
 
316 316
     // Settings menu
317
-    KToggleAction* sqf = new KToggleAction(i18n("Show Quick Filter"), TQString::null, 0, d->view, TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter");
317
+    KToggleAction* sqf = new KToggleAction(i18n("Show Quick Filter"), TQString(), 0, d->view, TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter");
318 318
     sqf->setChecked( Settings::showQuickFilter() );
319 319
 
320 320
     new KAction( i18n("Open in Tab"), "tab_new", "Shift+Return", d->view, TQT_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" );
321
-    new KAction( i18n("Open in Background Tab"), TQString::null, "tab_new", d->view, TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" );
321
+    new KAction( i18n("Open in Background Tab"), TQString(), "tab_new", d->view, TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" );
322 322
     new KAction( i18n("Open in External Browser"), "window_new", "Ctrl+Shift+Return", d->view, TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" );
323
-    new KAction( i18n("Copy Link Address"), TQString::null, TQString::null, d->view, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" );
323
+    new KAction( i18n("Copy Link Address"), TQString(), TQString(), d->view, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" );
324 324
 
325 325
     new KAction(i18n("Pre&vious Unread Article"), "", Key_Minus, d->view, TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article");
326 326
     new KAction(i18n("Ne&xt Unread Article"), "", Key_Plus, d->view, TQT_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article");
@@ -364,10 +364,10 @@ void ActionManagerImpl::initView(View* view)
364 364
     connect(importantAction, TQT_SIGNAL(toggled(bool)), d->view, TQT_SLOT(slotArticleToggleKeepFlag(bool)));
365 365
 
366 366
 
367
-    new KAction( i18n("Move Node Up"), TQString::null, "Shift+Alt+Up", view, TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" );
368
-    new KAction( i18n("Move Node Down"), TQString::null,  "Shift+Alt+Down", view, TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" );
369
-    new KAction( i18n("Move Node Left"), TQString::null, "Shift+Alt+Left", view, TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" );
370
-    new KAction( i18n("Move Node Right"), TQString::null, "Shift+Alt+Right", view, TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right");
367
+    new KAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", view, TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" );
368
+    new KAction( i18n("Move Node Down"), TQString(),  "Shift+Alt+Down", view, TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" );
369
+    new KAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", view, TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" );
370
+    new KAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", view, TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right");
371 371
 }
372 372
 
373 373
 void ActionManagerImpl::initArticleViewer(ArticleViewer* articleViewer)
@@ -385,8 +385,8 @@ void ActionManagerImpl::initArticleListView(ArticleListView* articleList)
385 385
     else
386 386
         d->articleList = articleList;
387 387
 
388
-    new KAction( i18n("&Previous Article"), TQString::null, "Left", articleList, TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" );
389
-    new KAction( i18n("&Next Article"), TQString::null, "Right", articleList, TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" );
388
+    new KAction( i18n("&Previous Article"), TQString(), "Left", articleList, TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" );
389
+    new KAction( i18n("&Next Article"), TQString(), "Right", articleList, TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" );
390 390
 }
391 391
 
392 392
 void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
@@ -401,12 +401,12 @@ void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
401 401
     new KAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", listTabWidget, TQT_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed");
402 402
     new KAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", listTabWidget, TQT_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed");
403 403
 
404
-    new KAction( i18n("Go to Top of Tree"), TQString::null, "Ctrl+Home", listTabWidget, TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" );
405
-    new KAction( i18n("Go to Bottom of Tree"), TQString::null, "Ctrl+End", listTabWidget, TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" );
406
-    new KAction( i18n("Go Left in Tree"), TQString::null, "Ctrl+Left", listTabWidget, TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" );
407
-    new KAction( i18n("Go Right in Tree"), TQString::null, "Ctrl+Right", listTabWidget, TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" );
408
-    new KAction( i18n("Go Up in Tree"), TQString::null, "Ctrl+Up", listTabWidget, TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" );
409
-    new KAction( i18n("Go Down in Tree"), TQString::null, "Ctrl+Down", listTabWidget, TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" );
404
+    new KAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", listTabWidget, TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" );
405
+    new KAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", listTabWidget, TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" );
406
+    new KAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", listTabWidget, TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" );
407
+    new KAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", listTabWidget, TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" );
408
+    new KAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", listTabWidget, TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" );
409
+    new KAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", listTabWidget, TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" );
410 410
 }
411 411
 
412 412
 void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
@@ -419,7 +419,7 @@ void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
419 419
     new KAction(i18n("Select Next Tab"), "", "Ctrl+Period", d->tabWidget, TQT_SLOT(slotNextTab()),actionCollection(), "select_next_tab");
420 420
     new KAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", d->tabWidget, TQT_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab");
421 421
     new KAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, d->tabWidget, TQT_SLOT(slotDetachTab()), actionCollection(), "tab_detach" );
422
-    new KAction( i18n("Copy Link Address"), TQString::null, TQString::null, d->tabWidget, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" );
422
+    new KAction( i18n("Copy Link Address"), TQString(), TQString(), d->tabWidget, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" );
423 423
     new KAction( i18n("&Close Tab"), "tab_remove", KStdAccel::close(), d->tabWidget, TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" );
424 424
 }
425 425
 

+ 4
- 3
akregator/src/actionmanagerimpl.h View File

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #ifndef AKREGATOR_ACTIONMANAGERIMPL_H
@@ -50,9 +50,10 @@ class TabWidget;
50 50
 class ActionManagerImpl : public ActionManager
51 51
 {
52 52
     Q_OBJECT
53
+  TQ_OBJECT
53 54
 
54 55
     public:
55
-        ActionManagerImpl(Part* part, TQObject* parent=0, const char* name=0);
56
+        ActionManagerImpl(Part* part, TQObject* tqparent=0, const char* name=0);
56 57
         virtual ~ActionManagerImpl();
57 58
 
58 59
         virtual KAction* action(const char* name, const char* classname=0);

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

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #include "feed.h"
@@ -39,18 +39,18 @@
39 39
 
40 40
 namespace Akregator {
41 41
 
42
-AddFeedWidget::AddFeedWidget(TQWidget *parent, const char *name)
43
-   : AddFeedWidgetBase(parent, name)
42
+AddFeedWidget::AddFeedWidget(TQWidget *tqparent, const char *name)
43
+   : AddFeedWidgetBase(tqparent, name)
44 44
 {
45 45
     pixmapLabel1->setPixmap(kapp->iconLoader()->loadIcon( "package_network",KIcon::Desktop,KIcon::SizeHuge, KIcon::DefaultState, 0, true));
46
-    statusLabel->setText(TQString::null);
46
+    statusLabel->setText(TQString());
47 47
 }
48 48
 
49 49
 AddFeedWidget::~AddFeedWidget()
50 50
 {}
51 51
 
52
-AddFeedDialog::AddFeedDialog(TQWidget *parent, const char *name)
53
-   : KDialogBase(KDialogBase::Swallow, Qt::WStyle_DialogBorder, parent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel)
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)
54 54
 {
55 55
     widget = new AddFeedWidget(this);
56 56
     connect(widget->urlEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged(const TQString&)));
@@ -79,7 +79,7 @@ void AddFeedDialog::slotOk( )
79 79
     if (feedURL.startsWith("feed:"))
80 80
         feedURL = feedURL.right( feedURL.length() - 5 );
81 81
 
82
-    if (feedURL.find(":/") == -1)
82
+    if (feedURL.tqfind(":/") == -1)
83 83
         feedURL.prepend("http://");
84 84
     f->setXmlUrl(feedURL);
85 85
 

+ 6
- 4
akregator/src/addfeeddialog.h View File

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #ifndef AKREGATORADDFEEDDIALOG_H
@@ -41,16 +41,18 @@ namespace Akregator
41 41
    class AddFeedWidget : public AddFeedWidgetBase
42 42
    {
43 43
       Q_OBJECT
44
+  TQ_OBJECT
44 45
       public:
45
-         AddFeedWidget(TQWidget *parent = 0, const char *name = 0);
46
+         AddFeedWidget(TQWidget *tqparent = 0, const char *name = 0);
46 47
          ~AddFeedWidget();
47 48
    };
48 49
 
49 50
    class AddFeedDialog : public KDialogBase
50 51
    {
51 52
       Q_OBJECT
53
+  TQ_OBJECT
52 54
       public:
53
-         AddFeedDialog(TQWidget *parent = 0, const char *name = 0);
55
+         AddFeedDialog(TQWidget *tqparent = 0, const char *name = 0);
54 56
          ~AddFeedDialog();
55 57
 
56 58
          void setURL(const TQString& t);

+ 7
- 7
akregator/src/addfeedwidgetbase.ui View File

@@ -1,6 +1,6 @@
1 1
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
2 2
 <class>Akregator::AddFeedWidgetBase</class>
3
-<widget class="QWidget">
3
+<widget class="TQWidget">
4 4
     <property name="name">
5 5
         <cstring>AddFeedWidget</cstring>
6 6
     </property>
@@ -22,7 +22,7 @@
22 22
         <property name="margin">
23 23
             <number>0</number>
24 24
         </property>
25
-        <widget class="QLayoutWidget">
25
+        <widget class="TQLayoutWidget">
26 26
             <property name="name">
27 27
                 <cstring>tqlayout16</cstring>
28 28
             </property>
@@ -30,7 +30,7 @@
30 30
                 <property name="name">
31 31
                     <cstring>unnamed</cstring>
32 32
                 </property>
33
-                <widget class="QLabel">
33
+                <widget class="TQLabel">
34 34
                     <property name="name">
35 35
                         <cstring>pixmapLabel1</cstring>
36 36
                     </property>
@@ -63,7 +63,7 @@
63 63
                         </size>
64 64
                     </property>
65 65
                 </spacer>
66
-                <widget class="QLayoutWidget">
66
+                <widget class="TQLayoutWidget">
67 67
                     <property name="name">
68 68
                         <cstring>tqlayout15</cstring>
69 69
                     </property>
@@ -82,7 +82,7 @@
82 82
                                 </size>
83 83
                             </property>
84 84
                         </widget>
85
-                        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
85
+                        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
86 86
                             <property name="name">
87 87
                                 <cstring>textLabel1</cstring>
88 88
                             </property>
@@ -95,7 +95,7 @@
95 95
                                 <string>Add New Source</string>
96 96
                             </property>
97 97
                         </widget>
98
-                        <widget class="QLabel" row="1" column="0">
98
+                        <widget class="TQLabel" row="1" column="0">
99 99
                             <property name="name">
100 100
                                 <cstring>textLabel3</cstring>
101 101
                             </property>
@@ -115,7 +115,7 @@
115 115
                 <cstring>statusLabel</cstring>
116 116
             </property>
117 117
             <property name="text">
118
-                <string>Status</string>
118
+                <string>tqStatus</string>
119 119
             </property>
120 120
         </widget>
121 121
         <spacer>

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

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #ifndef AKREGATOR_OPTIONS_H

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

@@ -19,8 +19,8 @@
19 19
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20 20
 
21 21
     As a special exception, permission is given to link this program
22
-    with any edition of Qt, and distribute the resulting executable,
23
-    without including the source code for Qt in the source distribution.
22
+    with any edition of TQt, and distribute the resulting executable,
23
+    without including the source code for TQt in the source distribution.
24 24
 */
25 25
 #include <dcopclient.h>
26 26
 #include <kaboutdata.h>
@@ -117,9 +117,9 @@ class Part::ApplyFiltersInterceptor : public ArticleInterceptor
117 117
 };
118 118
 
119 119
 Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
120
-                              TQObject *parent, const char *name, const TQStringList& )
120
+                              TQObject *tqparent, const char *name, const TQStringList& )
121 121
     : DCOPObject("AkregatorIface")
122
-       , MyBasePart(parent, name)
122
+       , MyBasePart(tqparent, name)
123 123
        , m_standardListLoaded(false)
124 124
        , m_shuttingDown(false)
125 125
        , m_mergedPart(0)
@@ -416,7 +416,7 @@ bool Part::openFile()
416 416
     {
417 417
         if (file.open(IO_ReadOnly))
418 418
         {
419
-            // Read OPML feeds list and build QDom tree.
419
+            // Read OPML feeds list and build TQDom tree.
420 420
             TQTextStream stream(&file);
421 421
             stream.setEncoding(TQTextStream::UnicodeUTF8); // FIXME not all opmls are in utf8
422 422
             str = stream.read();
@@ -452,7 +452,7 @@ bool Part::openFile()
452 452
         m_view->loadFeeds(createDefaultFeedList());
453 453
     }
454 454
 
455
-    emit setStatusBarText(TQString::null);
455
+    emit setStatusBarText(TQString());
456 456
     
457 457
 
458 458
     if( Settings::markAllFeedsReadOnStartup() )
@@ -522,7 +522,7 @@ bool Part::mergePart(KParts::Part* part)
522 522
         {
523 523
           if (m_mergedPart) {
524 524
             factory()->removeClient(m_mergedPart);
525
-            if (childClients()->tqcontainsRef(m_mergedPart))
525
+            if (childClients()->containsRef(m_mergedPart))
526 526
               removeChildClient(m_mergedPart);
527 527
           }
528 528
           if (part)
@@ -634,7 +634,7 @@ void Part::importFile(const KURL& url)
634 634
     TQFile file(filename);
635 635
     if (file.open(IO_ReadOnly))
636 636
     {
637
-        // Read OPML feeds list and build QDom tree.
637
+        // Read OPML feeds list and build TQDom tree.
638 638
         TQDomDocument doc;
639 639
         if (doc.setContent(file.readAll()))
640 640
             m_view->importFeeds(doc);
@@ -692,7 +692,7 @@ void Part::exportFile(const KURL& url)
692 692
 
693 693
 void Part::fileImport()
694 694
 {
695
-    KURL url = KFileDialog::getOpenURL( TQString::null,
695
+    KURL url = KFileDialog::getOpenURL( TQString(),
696 696
                         "*.opml *.xml|" + i18n("OPML Outlines (*.opml, *.xml)")
697 697
                         +"\n*|" + i18n("All Files") );
698 698
 
@@ -702,7 +702,7 @@ void Part::fileImport()
702 702
 
703 703
     void Part::fileExport()
704 704
 {
705
-    KURL url= KFileDialog::getSaveURL( TQString::null,
705
+    KURL url= KFileDialog::getSaveURL( TQString(),
706 706
                         "*.opml *.xml|" + i18n("OPML Outlines (*.opml, *.xml)")
707 707
                         +"\n*|" + i18n("All Files") );
708 708
 
@@ -979,8 +979,8 @@ bool Part::tryToLock(const TQString& backendName)
979 979
                         "You should disable the archive for now "
980 980
                         "unless you are sure that %2 is not already running.</qt>")
981 981
                         .arg( programName, programName, backendName );
982
-              // TQString::arg( st ) only tqreplaces the first occurrence of %1
983
-              // with st while TQString::arg( s1, s2 ) tqreplacess all occurrences
982
+              // TQString::arg( st ) only replaces the first occurrence of %1
983
+              // with st while TQString::arg( s1, s2 ) replacess all occurrences
984 984
               // of %1 with s1 and all occurrences of %2 with s2. So don't
985 985
               // even think about changing the above to .arg( programName ).
986 986
             else
@@ -1014,7 +1014,7 @@ bool Part::tryToLock(const TQString& backendName)
1014 1014
 
1015 1015
         KCursorSaver idle( KBusyPtr::idle() );
1016 1016
         if ( KMessageBox::No ==
1017
-             KMessageBox::warningYesNo( 0, msg, TQString::null,
1017
+             KMessageBox::warningYesNo( 0, msg, TQString(),
1018 1018
                                         i18n("Force Access"),
1019 1019
                                         i18n("Disable Archive")) )
1020 1020
                                         {

+ 5
- 3
akregator/src/akregator_part.h View File

@@ -19,8 +19,8 @@
19 19
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20 20
 
21 21
     As a special exception, permission is given to link this program
22
-    with any edition of Qt, and distribute the resulting executable,
23
-    without including the source code for Qt in the source distribution.
22
+    with any edition of TQt, and distribute the resulting executable,
23
+    without including the source code for TQt in the source distribution.
24 24
 */
25 25
 
26 26
 #ifndef _AKREGATORPART_H_
@@ -60,6 +60,7 @@ namespace Akregator
60 60
     class BrowserExtension : public KParts::BrowserExtension
61 61
     {
62 62
         Q_OBJECT
63
+  TQ_OBJECT
63 64
 
64 65
         public:
65 66
             BrowserExtension(Part *p, const char *name );
@@ -76,12 +77,13 @@ namespace Akregator
76 77
     class Part : public MyBasePart, virtual public AkregatorPartIface
77 78
     {
78 79
         Q_OBJECT
80
+  TQ_OBJECT
79 81
         public:
80 82
            typedef MyBasePart inherited;
81 83
 
82 84
             /** Default constructor.*/
83 85
             Part(TQWidget *tqparentWidget, const char *widgetName,
84
-                          TQObject *parent, const char *name, const TQStringList&);
86
+                          TQObject *tqparent, const char *name, const TQStringList&);
85 87
 
86 88
 	        /** Destructor. */
87 89
             virtual ~Part();

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

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #ifndef AKREGATORPARTIFACE_H

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

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #include <kdebug.h>

+ 3
- 2
akregator/src/akregator_run.h View File

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #ifndef AKREGATOR_RUN_H 
@@ -35,6 +35,7 @@ class Viewer;
35 35
 class BrowserRun : public KParts::BrowserRun
36 36
 {
37 37
     Q_OBJECT
38
+  TQ_OBJECT
38 39
     public:
39 40
         /** indicates how HTML pages should be opened. It is passed in the constructor and sent back via the openInViewer signal. This is a workaround to fix opening of non-HTML mimetypes in 3.5, which will be refactored for KDE4 anyway. For 3.5.x it's the easiest way to fix the problem without changing too much code TODO KDE4: refactor, remove this enum  */
40 41
         enum OpeningMode 

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

@@ -20,8 +20,8 @@
20 20
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
21 21
 
22 22
     As a special exception, permission is given to link this program
23
-    with any edition of Qt, and distribute the resulting executable,
24
-    without including the source code for Qt in the source distribution.
23
+    with any edition of TQt, and distribute the resulting executable,
24
+    without including the source code for TQt in the source distribution.
25 25
 */
26 26
 
27 27
 #include "actionmanagerimpl.h"
@@ -210,8 +210,8 @@ View::~View()
210 210
     kdDebug() << "View::~View(): leaving" << endl;
211 211
 }
212 212
 
213
-View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, const char *name)
214
- : TQWidget(parent, name), m_viewMode(NormalView), m_actionManager(actionManager)
213
+View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, const char *name)
214
+ : TQWidget(tqparent, name), m_viewMode(NormalView), m_actionManager(actionManager)
215 215
 {
216 216
     m_editNodePropertiesVisitor = new EditNodePropertiesVisitor(this);
217 217
     m_deleteNodeVisitor = new DeleteNodeVisitor(this);
@@ -366,7 +366,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
366 366
 
367 367
     if (!Settings::resetQuickFilterOnNodeChange())
368 368
     {
369
-        m_searchBar->slotSeStatus(Settings::statusFilter());
369
+        m_searchBar->slotSetqStatus(Settings::statusFilter());
370 370
         m_searchBar->slotSetText(Settings::textFilter());
371 371
     }
372 372
 
@@ -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* parent)
536
+bool View::loadFeeds(const TQDomDocument& doc, Folder* tqparent)
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* parent)
546 546
     }
547 547
     m_feedListView->setUpdatesEnabled(false);
548 548
     m_tagNodeListView->setUpdatesEnabled(false);
549
-    if (!parent)
549
+    if (!tqparent)
550 550
     {
551 551
         TagSet* tagSet = Kernel::self()->tagSet();
552 552
 
@@ -570,7 +570,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
570 570
             // create a tag for every tag ID in the archive that is not part of the tagset
571 571
             // this is a fallback in case the tagset was corrupted,
572 572
             // so the tagging information from archive does not get lost.
573
-            if (!tagSet->tqcontainsID(*it))
573
+            if (!tagSet->containsID(*it))
574 574
             {
575 575
                 Tag tag(*it, *it);
576 576
                 tagSet->insert(tag);
@@ -578,7 +578,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
578 578
         }
579 579
     }
580 580
     else
581
-        m_feedList->append(feedList, parent);
581
+        m_feedList->append(feedList, tqparent);
582 582
 
583 583
     m_feedListView->setUpdatesEnabled(true);
584 584
     m_feedListView->triggerUpdate();
@@ -705,7 +705,7 @@ void View::slotFrameChanged(Frame *f)
705 705
             emit signalStarted(0);
706 706
             break;
707 707
         case Frame::Canceled:
708
-            emit signalCanceled(TQString::null);
708
+            emit signalCanceled(TQString());
709 709
             break;
710 710
         case Frame::Idle:
711 711
         case Frame::Completed:
@@ -725,13 +725,13 @@ void View::slotMoveCurrentNodeUp()
725 725
     if (!current)
726 726
         return;
727 727
     TreeNode* prev = current->prevSibling();
728
-    Folder* parent = current->parent();
728
+    Folder* tqparent = current->tqparent();
729 729
 
730
-    if (!prev || !parent)
730
+    if (!prev || !tqparent)
731 731
         return;
732 732
 
733
-    parent->removeChild(prev);
734
-    parent->insertChild(prev, current);
733
+    tqparent->removeChild(prev);
734
+    tqparent->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* parent = current->parent();
744
+    Folder* tqparent = current->tqparent();
745 745
 
746
-    if (!next || !parent)
746
+    if (!next || !tqparent)
747 747
         return;
748 748
 
749
-    parent->removeChild(current);
750
-    parent->insertChild(current, next);
749
+    tqparent->removeChild(current);
750
+    tqparent->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->parent() || !current->parent()->parent())
757
+    if (!current || !current->tqparent() || !current->tqparent()->tqparent())
758 758
         return;
759 759
 
760
-    Folder* parent = current->parent();
761
-    Folder* grandparent = current->parent()->parent();
760
+    Folder* tqparent = current->tqparent();
761
+    Folder* grandtqparent = current->tqparent()->tqparent();
762 762
 
763
-    parent->removeChild(current);
764
-    grandparent->insertChild(current, parent);
763
+    tqparent->removeChild(current);
764
+    grandtqparent->insertChild(current, tqparent);
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->parent())
771
+    if (!current || !current->tqparent())
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->parent()->removeChild(current);
778
+        current->tqparent()->removeChild(current);
779 779
         fg->appendChild(current);
780 780
         m_listTabWidget->activeView()->ensureNodeVisible(current);
781 781
     }
@@ -880,16 +880,16 @@ 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()->parent();
883
+            group= m_feedListView->selectedNode()->tqparent();
884 884
 
885 885
     }
886 886
 
887
-    TreeNode* lastChild = group->children().last();
887
+    TreeNode* lastChild = group->tqchildren().last();
888 888
 
889
-    addFeed(TQString::null, lastChild, group, false);
889
+    addFeed(TQString(), lastChild, group, false);
890 890
 }
891 891
 
892
-void View::addFeed(const TQString& url, TreeNode *after, Folder* parent, bool autoExec)
892
+void View::addFeed(const TQString& url, TreeNode *after, Folder* tqparent, 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* parent, bool au
923 923
             return;
924 924
         }
925 925
 
926
-    if (!parent)
927
-        parent = m_feedList->rootNode();
926
+    if (!tqparent)
927
+        tqparent = m_feedList->rootNode();
928 928
 
929
-    parent->insertChild(feed, after);
929
+    tqparent->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->parent();
950
+        node = node->tqparent();
951 951
     }
952 952
 
953 953
     Folder* currentGroup = static_cast<Folder*> (node);
@@ -1077,7 +1077,7 @@ void View::slotFetchingStopped()
1077 1077
 {
1078 1078
     m_mainFrame->setState(Frame::Completed);
1079 1079
     m_actionManager->action("feed_stop")->setEnabled(false);
1080
-    m_mainFrame->seStatusText(TQString::null);
1080
+    m_mainFrame->seStatusText(TQString());
1081 1081
 }
1082 1082
 
1083 1083
 void View::slotFeedFetched(Feed *feed)
@@ -1100,7 +1100,7 @@ void View::slotFeedFetched(Feed *feed)
1100 1100
 
1101 1101
 void View::slotMouseButtonPressed(int button, const Article& article, const TQPoint &, int)
1102 1102
 {
1103
-    if (button == Qt::MidButton)
1103
+    if (button == TQt::MidButton)
1104 1104
     {
1105 1105
         KURL link = article.link();
1106 1106
         switch (Settings::mMBBehaviour())
@@ -1152,7 +1152,7 @@ void View::slotNewTag()
1152 1152
 
1153 1153
 void View::slotTagCreated(const Tag& tag)
1154 1154
 {
1155
-    if (m_tagNodeList && !m_tagNodeList->tqcontainsTagId(tag.id()))
1155
+    if (m_tagNodeList && !m_tagNodeList->containsTagId(tag.id()))
1156 1156
     {
1157 1157
         TagNode* tagNode = new TagNode(tag, m_feedList->rootNode());
1158 1158
         m_tagNodeList->rootNode()->appendChild(tagNode);
@@ -1186,7 +1186,7 @@ void View::slotArticleSelected(const Article& article)
1186 1186
             if (delay > 0)
1187 1187
                 m_markReadTimer->start( delay*1000, true );
1188 1188
             else
1189
-                a.seStatus(Article::Read);
1189
+                a.setqStatus(Article::Read);
1190 1190
         }
1191 1191
     }
1192 1192
 
@@ -1266,18 +1266,18 @@ void View::slotCopyLinkAddress()
1266 1266
             link = article.link().url();
1267 1267
         else
1268 1268
             link = article.guid();
1269
-        QClipboard *cb = TQApplication::clipboard();
1270
-        cb->setText(link, QClipboard::Clipboard);
1271
-        cb->setText(link, QClipboard::Selection);
1269
+        TQClipboard *cb = TQApplication::clipboard();
1270
+        cb->setText(link, TQClipboard::Clipboard);
1271
+        cb->setText(link, TQClipboard::Selection);
1272 1272
     }
1273 1273
 }
1274 1274
 
1275
-void View::slotFeedURLDropped(KURL::List &urls, TreeNode* after, Folder* parent)
1275
+void View::slotFeedURLDropped(KURL::List &urls, TreeNode* after, Folder* tqparent)
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, parent, false);
1280
+        addFeed((*it).prettyURL(), after, tqparent, false);
1281 1281
     }
1282 1282
 }
1283 1283
 
@@ -1370,7 +1370,7 @@ void View::slotSetSelectedArticleRead()
1370 1370
         return;
1371 1371
 
1372 1372
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
1373
-        (*it).seStatus(Article::Read);
1373
+        (*it).setqStatus(Article::Read);
1374 1374
 }
1375 1375
 
1376 1376
 void View::slotTextToSpeechRequest()
@@ -1408,7 +1408,7 @@ void View::slotSetSelectedArticleUnread()
1408 1408
         return;
1409 1409
 
1410 1410
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
1411
-        (*it).seStatus(Article::Unread);
1411
+        (*it).setqStatus(Article::Unread);
1412 1412
 }
1413 1413
 
1414 1414
 void View::slotSetSelectedArticleNew()
@@ -1419,7 +1419,7 @@ void View::slotSetSelectedArticleNew()
1419 1419
         return;
1420 1420
 
1421 1421
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
1422
-        (*it).seStatus(Article::New);
1422
+        (*it).setqStatus(Article::New);
1423 1423
 }
1424 1424
 
1425 1425
 void View::slotSetCurrentArticleReadDelayed()
@@ -1429,7 +1429,7 @@ void View::slotSetCurrentArticleReadDelayed()
1429 1429
     if (article.isNull())
1430 1430
         return;
1431 1431
 
1432
-    article.seStatus(Article::Read);
1432
+    article.setqStatus(Article::Read);
1433 1433
 }
1434 1434
 
1435 1435
 void View::slotMouseOverInfo(const KFileItem *kifi)
@@ -1441,7 +1441,7 @@ void View::slotMouseOverInfo(const KFileItem *kifi)
1441 1441
     }
1442 1442
     else
1443 1443
     {
1444
-        m_mainFrame->seStatusText(TQString::null);
1444
+        m_mainFrame->seStatusText(TQString());
1445 1445
     }
1446 1446
 }
1447 1447
 
@@ -1453,7 +1453,7 @@ void View::readProperties(KConfig* config)
1453 1453
         m_searchBar->slotSetText(config->readEntry("searchLine"));
1454 1454
         int statusfilter = config->readNumEntry("searchCombo", -1);
1455 1455
         if (statusfilter != -1)
1456
-            m_searchBar->slotSeStatus(statusfilter);
1456
+            m_searchBar->slotSetqStatus(statusfilter);
1457 1457
     }
1458 1458
 
1459 1459
     int selectedID = config->readNumEntry("selectedNodeID", -1);

+ 13
- 12
akregator/src/akregator_view.h View File

@@ -20,8 +20,8 @@
20 20
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
21 21
 
22 22
     As a special exception, permission is given to link this program
23
-    with any edition of Qt, and distribute the resulting executable,
24
-    without including the source code for Qt in the source distribution.
23
+    with any edition of TQt, and distribute the resulting executable,
24
+    without including the source code for TQt in the source distribution.
25 25
 */
26 26
 
27 27
 #ifndef _AKREGATORVIEW_H_
@@ -77,18 +77,19 @@ namespace Akregator {
77 77
     /**
78 78
      * This is the main widget of the view, containing tree view, article list, viewer etc.
79 79
      */
80
-    class View : public QWidget
80
+    class View : public TQWidget
81 81
     {
82 82
         Q_OBJECT
83
+  TQ_OBJECT
83 84
         public:
84 85
 
85 86
             /** constructor
86
-            @param part the Akregator::Part which tqcontains this widget
87
-            @param parent parent widget
87
+            @param part the Akregator::Part which contains this widget
88
+            @param tqparent tqparent widget
88 89
             @param Actionmanager for this view
89 90
             @param name the name of the widget (@ref TQWidget )
90 91
             */
91
-            View(Akregator::Part *part, TQWidget *parent, ActionManagerImpl* actionManager, const char* name);
92
+            View(Akregator::Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, const char* name);
92 93
 
93 94
             /** destructor.  Note that cleanups should be done in
94 95
             slotOnShutdown(), so we don't risk accessing self-deleting objects after deletion. */
@@ -103,11 +104,11 @@ namespace Akregator {
103 104
             @param doc the DOM tree (OPML) of the feeds to import */
104 105
             bool importFeeds(const TQDomDocument& doc);
105 106
 
106
-            /** Parse OPML presentation of feeds and read in articles archive, if present. If @c parent is @c NULL, the current
107
-            feed list is tqreplaced by the parsed one
107
+            /** Parse OPML presentation of feeds and read in articles archive, if present. If @c tqparent is @c NULL, the current
108
+            feed list is replaced by the parsed one
108 109
              @param doc TQDomDocument generated from OPML
109
-             @param parent The parent group the new nodes */
110
-            bool loadFeeds(const TQDomDocument& doc, Folder* parent = 0);
110
+             @param tqparent The tqparent group the new nodes */
111
+            bool loadFeeds(const TQDomDocument& doc, Folder* tqparent = 0);
111 112
 
112 113
             /**
113 114
              @return the displayed Feed List in OPML format
@@ -189,7 +190,7 @@ namespace Akregator {
189 190
             void slotCaptionChanged(const TQString &);
190 191
 
191 192
             /** called when URLs are dropped into the tree view */
192
-            void slotFeedURLDropped (KURL::List &urls, TreeNode* after, Folder *parent);
193
+            void slotFeedURLDropped (KURL::List &urls, TreeNode* after, Folder *tqparent);
193 194
 
194 195
             /** displays a URL in the status bar when the user moves the mouse over a link */
195 196
             void slotMouseOverInfo(const KFileItem *kifi);
@@ -271,7 +272,7 @@ namespace Akregator {
271 272
 
272 273
         protected:
273 274
 
274
-            void addFeed(const TQString& url, TreeNode* after, Folder* parent, bool autoExec = true);
275
+            void addFeed(const TQString& url, TreeNode* after, Folder* tqparent, bool autoExec = true);
275 276
 
276 277
             void connectToFeedList(FeedList* feedList);
277 278
             void disconnectFromFeedList(FeedList* feedList);

+ 17
- 17
akregator/src/article.cpp View File

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #include "article.h"
@@ -55,7 +55,7 @@ struct Article::Private : public Shared
55 55
         0001 0000 Keep
56 56
      */
57 57
 
58
-    enum Status {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};
58
+    enum tqStatus {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};
59 59
 
60 60
     TQString guid;
61 61
     Backend::FeedStorage* archive;
@@ -109,7 +109,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
109 109
         if (article.meta("deleted") == "true") 
110 110
         { // if article is in deleted state, we just add the status and omit the rest
111 111
             d->status = Private::Read | Private::Deleted;
112
-            d->archive->seStatus(d->guid, d->status);
112
+            d->archive->setqStatus(d->guid, d->status);
113 113
         }
114 114
         else
115 115
         { // article is not deleted, let's add it to the archive
@@ -157,7 +157,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
157 157
                 int statusInt = status.toInt();
158 158
                 if (statusInt == New)
159 159
                     statusInt = Unread;
160
-                seStatus(statusInt);
160
+                setqStatus(statusInt);
161 161
             }
162 162
             setKeep(article.meta("keep") == "true");
163 163
         }
@@ -210,9 +210,9 @@ void Article::setDeleted()
210 210
     if (isDeleted())
211 211
         return;
212 212
   
213
-    seStatus(Read);
213
+    setqStatus(Read);
214 214
     d->status = Private::Deleted | Private::Read;
215
-    d->archive->seStatus(d->guid, d->status);
215
+    d->archive->setqStatus(d->guid, d->status);
216 216
     d->archive->setDeleted(d->guid);
217 217
 
218 218
     if (d->feed)
@@ -299,13 +299,13 @@ int Article::status() const
299 299
         return Unread;
300 300
 }
301 301
 
302
-void Article::seStatus(int stat)
302
+void Article::setqStatus(int stat)
303 303
 {
304 304
     // use status() rather than statusBits() here to filter out status flags that we are not
305 305
     // interested in
306
-    int oldStatus = status();
306
+    int oldtqStatus = status();
307 307
 
308
-    if (oldStatus != stat)
308
+    if (oldtqStatus != stat)
309 309
     {
310 310
         switch (stat)
311 311
         {
@@ -319,9 +319,9 @@ void Article::seStatus(int stat)
319 319
                 d->status = ( d->status | Private::New) & ~Private::Read;
320 320
                 break;
321 321
         }
322
-        d->archive->seStatus(d->guid, d->status);
322
+        d->archive->setqStatus(d->guid, d->status);
323 323
         if (d->feed)
324
-            d->feed->setArticleChanged(*this, oldStatus);
324
+            d->feed->setArticleChanged(*this, oldtqStatus);
325 325
      }
326 326
 }
327 327
 
@@ -404,7 +404,7 @@ RSS::Enclosure Article::enclosure() const
404 404
 void Article::setKeep(bool keep)
405 405
 {
406 406
     d->status = keep ? ( statusBits() | Private::Keep) : ( statusBits() & ~Private::Keep);
407
-    d->archive->seStatus(d->guid, d->status);
407
+    d->archive->setqStatus(d->guid, d->status);
408 408
     if (d->feed)
409 409
         d->feed->setArticleChanged(*this);
410 410
 }
@@ -453,11 +453,11 @@ TQString Article::buildTitle(const TQString& description)
453 453
     if (description.stripWhiteSpace().isEmpty())
454 454
         return "";
455 455
         
456
-    int i = s.find('>',500); /*avoid processing too much */
456
+    int i = s.tqfind('>',500); /*avoid processing too much */
457 457
     if (i != -1)
458 458
         s = s.left(i+1);
459 459
     TQRegExp rx("(<([^\\s>]*)(?:[^>]*)>)[^<]*", false);
460
-    TQString tagName, toReplace, tqreplaceWith;
460
+    TQString tagName, toReplace, replaceWith;
461 461
     while (rx.search(s) != -1 )
462 462
     {
463 463
         tagName=rx.cap(2);
@@ -466,11 +466,11 @@ TQString Article::buildTitle(const TQString& description)
466 466
         else if (tagName.startsWith("br") || tagName.startsWith("BR"))
467 467
         {
468 468
             toReplace=rx.cap(1);
469
-            tqreplaceWith=" ";
469
+            replaceWith=" ";
470 470
         }
471 471
         else
472 472
             toReplace=rx.cap(1);  // strip just tag
473
-        s=s.tqreplace(s.find(toReplace),toReplace.length(),tqreplaceWith); // do the deed
473
+        s=s.tqreplace(s.tqfind(toReplace),toReplace.length(),replaceWith); // do the deed
474 474
     }
475 475
     if (s.length()> 90)
476 476
         s=s.left(90)+"...";

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

@@ -19,8 +19,8 @@
19 19
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20 20
 
21 21
     As a special exception, permission is given to link this program
22
-    with any edition of Qt, and distribute the resulting executable,
23
-    without including the source code for Qt in the source distribution.
22
+    with any edition of TQt, and distribute the resulting executable,
23
+    without including the source code for TQt in the source distribution.
24 24
 */
25 25
 
26 26
 #ifndef AKREGATOR_ARTICLE_H
@@ -57,7 +57,7 @@ namespace Akregator
57 57
     class Article
58 58
     {
59 59
         public:
60
-            enum Status { Unread=0, Read, New };
60
+            enum tqStatus { Unread=0, Read, New };
61 61
             typedef TQValueList<Article> List;
62 62
 
63 63
             Article();
@@ -80,7 +80,7 @@ namespace Akregator
80 80
             bool isNull() const;
81 81
             
82 82
             int status() const;
83
-            void seStatus(int s);
83
+            void setqStatus(int s);
84 84
 
85 85
             void offsetPubDate(int secs);
86 86
 

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

@@ -17,7 +17,7 @@
17 17
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 18
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 19
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT
21 21
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 22
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 23
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
@@ -50,8 +50,8 @@ TQString Criterion::subjectToString(Subject subj)
50 50
             return TQString::tqfromLatin1("Author");
51 51
         case Description:
52 52
             return TQString::tqfromLatin1("Description");
53
-        case Status:
54
-            return TQString::tqfromLatin1("Status");
53
+        case tqStatus:
54
+            return TQString::tqfromLatin1("tqStatus");
55 55
         case KeepFlag:
56 56
             return TQString::tqfromLatin1("KeepFlag");
57 57
         default: // should never happen (TM)
@@ -69,8 +69,8 @@ Criterion::Subject Criterion::stringToSubject(const TQString& subjStr)
69 69
         return Description;
70 70
     else if (subjStr == TQString::tqfromLatin1("Author"))
71 71
         return Author;
72
-    else if (subjStr == TQString::tqfromLatin1("Status"))
73
-        return Status;
72
+    else if (subjStr == TQString::tqfromLatin1("tqStatus"))
73
+        return tqStatus;
74 74
     else if (subjStr == TQString::tqfromLatin1("KeepFlag"))
75 75
         return KeepFlag;
76 76
 
@@ -163,7 +163,7 @@ bool Criterion::satisfiedBy( const Article &article ) const
163 163
             // ### Maybe use prettyURL here?
164 164
             concreteSubject = TQVariant(article.link().url());
165 165
             break;
166
-        case Status:
166
+        case tqStatus:
167 167
             concreteSubject = TQVariant(article.status());
168 168
             break;
169 169
         case KeepFlag:
@@ -179,7 +179,7 @@ bool Criterion::satisfiedBy( const Article &article ) const
179 179
 
180 180
     switch ( predicateType ) {
181 181
         case Contains:
182
-            satisfied = concreteSubject.toString().find( m_object.toString(), 0, false ) != -1;
182
+            satisfied = concreteSubject.toString().tqfind( m_object.toString(), 0, false ) != -1;
183 183
             break;
184 184
         case Equals:
185 185
             if (subjectType=="int")
@@ -449,7 +449,7 @@ SeStatusAction::SeStatusAction(int status) : m_status(status)
449 449
 void SeStatusAction::exec(Article& article)
450 450
 {
451 451
     if (!article.isNull())
452
-        article.seStatus(m_status);
452
+        article.setqStatus(m_status);
453 453
 }
454 454
 
455 455
 int SeStatusAction::status() const
@@ -457,7 +457,7 @@ int SeStatusAction::status() const
457 457
     return m_status;
458 458
 }
459 459
 
460
-void SeStatusAction::seStatus(int status)
460
+void SeStatusAction::setqStatus(int status)
461 461
 {
462 462
     m_status = status;
463 463
 }

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

@@ -18,7 +18,7 @@
18 18
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
19 19
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
20 20
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT
22 22
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 23
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 24
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
@@ -174,7 +174,7 @@ class SeStatusAction : public AbstractAction
174 174
         virtual void exec(Article& article);
175 175
         
176 176
         int status() const;
177
-        void seStatus(int status);
177
+        void setqStatus(int status);
178 178
 
179 179
         virtual void writeConfig(KConfig* config) const;
180 180
         virtual void readConfig(KConfig* config);
@@ -190,7 +190,7 @@ class AssignTagAction : public AbstractAction
190 190
 {
191 191
     public:
192 192
 
193
-        AssignTagAction(const TQString& tagID=TQString::null);
193
+        AssignTagAction(const TQString& tagID=TQString());
194 194
         virtual void exec(Article& article);
195 195
                 
196 196
         const TQString& tagID() const;
@@ -259,7 +259,7 @@ class Criterion
259 259
     public:
260 260
 
261 261
         enum Subject {
262
-            Title, Description, Author, Link, Status, KeepFlag
262
+            Title, Description, Author, Link, tqStatus, KeepFlag
263 263
         };
264 264
 
265 265
         static TQString subjectToString(Subject subj);

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

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #include "akregatorconfig.h"
@@ -60,17 +60,17 @@ class ArticleListView::ArticleListViewPrivate
60 60
 {
61 61
     public:
62 62
 
63
-    ArticleListViewPrivate(ArticleListView* parent) : m_parent(parent) { }
63
+    ArticleListViewPrivate(ArticleListView* tqparent) : m_tqparent(tqparent) { }
64 64
 
65 65
     void ensureCurrentItemVisible()
66 66
     {
67
-        if (m_parent->currentItem())
67
+        if (m_tqparent->currentItem())
68 68
         {
69
-            m_parent->center( m_parent->contentsX(), m_parent->itemPos(m_parent->currentItem()), 0, 9.0 );
69
+            m_tqparent->center( m_tqparent->contentsX(), m_tqparent->itemPos(m_tqparent->currentItem()), 0, 9.0 );
70 70
         }
71 71
     }
72 72
 
73
-    ArticleListView* m_parent;
73
+    ArticleListView* m_tqparent;
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 *parent, const Article& a);
134
+            ArticleItem( TQListView *tqparent, 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 *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())
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())
160 160
 {
161 161
     if (a.keep())
162 162
         setPixmap(0, keepFlag());
@@ -182,9 +182,9 @@ void ArticleListView::ArticleItem::paintCell ( TQPainter * p, const TQColorGroup
182 182
         TQColorGroup cg2(cg);
183 183
     
184 184
         if (article().status() == Article::Unread)
185
-            cg2.setColor(TQColorGroup::Text, Qt::blue);
185
+            cg2.setColor(TQColorGroup::Text, TQt::blue);
186 186
         else // New
187
-            cg2.setColor(TQColorGroup::Text, Qt::red);
187
+            cg2.setColor(TQColorGroup::Text, TQt::red);
188 188
     
189 189
         KListViewItem::paintCell( p, cg2, column, width, align );
190 190
     }
@@ -213,8 +213,8 @@ int ArticleListView::ArticleItem::compare(TQListViewItem *i, int col, bool ascen
213 213
 
214 214
 /* ==================================================================================== */
215 215
 
216
-ArticleListView::ArticleListView(TQWidget *parent, const char *name)
217
-    : KListView(parent, name)
216
+ArticleListView::ArticleListView(TQWidget *tqparent, const char *name)
217
+    : KListView(tqparent, name)
218 218
 {
219 219
     d = new ArticleListViewPrivate(this);
220 220
     d->noneSelected = true;
@@ -577,7 +577,7 @@ void ArticleListView::viewportPaintEvent(TQPaintEvent *e)
577 577
     if(!e)
578 578
         return;
579 579
         
580
-    TQString message = TQString::null;
580
+    TQString message = TQString();
581 581
     
582 582
     //kdDebug() << "visible articles: " << visibleArticles() << endl;
583 583
     

+ 4
- 3
akregator/src/articlelistview.h View File

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 #ifndef AKREGATORARTICLELISTVIEW_H
25 25
 #define AKREGATORARTICLELISTVIEW_H
@@ -43,8 +43,9 @@ namespace Akregator
43 43
     class ArticleListView : public KListView
44 44
     {
45 45
         Q_OBJECT
46
+  TQ_OBJECT
46 47
         public:
47
-            ArticleListView(TQWidget *parent = 0, const char *name = 0);
48
+            ArticleListView(TQWidget *tqparent = 0, const char *name = 0);
48 49
             virtual ~ArticleListView();
49 50
             
50 51
             /** returns the current article, or a null article if there is none */

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

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #include <tqdatetime.h>
@@ -157,8 +157,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
157 157
     ArticleViewer* m_view;
158 158
 };
159 159
 
160
-ArticleViewer::ArticleViewer(TQWidget *parent, const char *name)
161
-    : Viewer(parent, name), m_htmlFooter(), m_currentText(), m_node(0), m_viewMode(NormalView)
160
+ArticleViewer::ArticleViewer(TQWidget *tqparent, const char *name)
161
+    : Viewer(tqparent, name), m_htmlFooter(), m_currentText(), m_node(0), m_viewMode(NormalView)
162 162
 {
163 163
     setJScriptEnabled(false);
164 164
     setJavaEnabled(false);
@@ -169,8 +169,8 @@ ArticleViewer::ArticleViewer(TQWidget *parent, const char *name)
169 169
 
170 170
     generateNormalModeCSS();
171 171
     generateCombinedModeCSS();
172
-    new KAction( i18n("&Scroll Up"), TQString::null, "Up", this, TQT_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" );
173
-    new KAction( i18n("&Scroll Down"), TQString::null, "Down", this, TQT_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" );
172
+    new KAction( i18n("&Scroll Up"), TQString(), "Up", this, TQT_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" );
173
+    new KAction( i18n("&Scroll Down"), TQString(), "Down", this, TQT_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" );
174 174
     
175 175
     connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
176 176
 

+ 4
- 3
akregator/src/articleviewer.h View File

@@ -19,8 +19,8 @@
19 19
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20 20
 
21 21
     As a special exception, permission is given to link this program
22
-    with any edition of Qt, and distribute the resulting executable,
23
-    without including the source code for Qt in the source distribution.
22
+    with any edition of TQt, and distribute the resulting executable,
23
+    without including the source code for TQt in the source distribution.
24 24
 */
25 25
 
26 26
 #ifndef ARTICLEVIEWER_H
@@ -48,9 +48,10 @@ namespace Akregator
48 48
      class ArticleViewer : public Viewer
49 49
     {
50 50
         Q_OBJECT
51
+  TQ_OBJECT
51 52
         public:
52 53
             /** Constructor */
53
-            ArticleViewer(TQWidget* parent, const char* name);
54
+            ArticleViewer(TQWidget* tqparent, const char* name);
54 55
             virtual ~ArticleViewer();
55 56
             
56 57
             virtual bool openURL(const KURL &url);

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

@@ -11,7 +11,7 @@
11 11
   <Action name="viewer_copy"/>
12 12
   <Action name="selectAll"/>
13 13
   <Separator/> 
14
-  <Action name="find"/>
14
+  <Action name="tqfind"/>
15 15
   <Action name="findNext"/>
16 16
 </Menu> 
17 17
 <Menu noMerge="1" name="view">

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

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #include <tqstringlist.h>
@@ -41,7 +41,7 @@
41 41
 namespace Akregator
42 42
 {
43 43
 
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)
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)
45 45
 {
46 46
     addPage(new SettingsGeneral(this, "General"), i18n("General"), "package_settings");
47 47
     addPage(new SettingsArchive(this, "Archive"), i18n("Archive"), "package_settings");

+ 4
- 3
akregator/src/configdialog.h View File

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #ifndef AKREGATOR_CONFIGDIALOG_H
@@ -35,9 +35,10 @@ class SettingsAppearance;
35 35
 class ConfigDialog : public KConfigDialog
36 36
 {
37 37
     Q_OBJECT
38
+  TQ_OBJECT
38 39
     public:
39 40
     
40
-        ConfigDialog(TQWidget *parent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
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 42
         
42 43
         virtual ~ConfigDialog();
43 44
 

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

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #include "dragobjects.h"

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

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #ifndef AKREGATOR_DRAGOBJECTS_H

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

@@ -19,8 +19,8 @@
19 19
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20 20
 
21 21
     As a special exception, permission is given to link this program
22
-    with any edition of Qt, and distribute the resulting executable,
23
-    without including the source code for Qt in the source distribution.
22
+    with any edition of TQt, and distribute the resulting executable,
23
+    without including the source code for TQt in the source distribution.
24 24
 */
25 25
 
26 26
 #include <tqtimer.h>
@@ -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 parent, TQDomDocument document ) const
368
+TQDomElement Feed::toOPML( TQDomElement tqparent, 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 parent, 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
-    parent.appendChild( el );
391
+    tqparent.appendChild( el );
392 392
     return el;
393 393
 }
394 394
 
@@ -402,7 +402,7 @@ void Feed::slotMarkAllArticlesAsRead()
402 402
         TQValueList<Article>::Iterator en = tarticles.end();
403 403
 
404 404
         for (it = tarticles.begin(); it != en; ++it)
405
-            (*it).seStatus(Article::Read);
405
+            (*it).setqStatus(Article::Read);
406 406
         setNotificationMode(true, true);
407 407
     }
408 408
 }
@@ -464,9 +464,9 @@ void Feed::appendArticles(const RSS::Document &doc)
464 464
             d->addedArticlesNotify.append(mya);
465 465
             
466 466
             if (!mya.isDeleted() && !markImmediatelyAsRead())
467
-                mya.seStatus(Article::New);
467
+                mya.setqStatus(Article::New);
468 468
             else
469
-                mya.seStatus(Article::Read);
469
+                mya.setqStatus(Article::Read);
470 470
                 
471 471
             changed = true;
472 472
         }
@@ -479,12 +479,12 @@ void Feed::appendArticles(const RSS::Document &doc)
479 479
             {
480 480
                 mya.setKeep(old.keep());
481 481
                 int oldstatus = old.status();
482
-                old.seStatus(Article::Read);
482
+                old.setqStatus(Article::Read);
483 483
 
484 484
                 d->articles.remove(old.guid());
485 485
                 appendArticle(mya);
486 486
 
487
-                mya.seStatus(oldstatus);
487
+                mya.setqStatus(oldstatus);
488 488
 
489 489
                 d->updatedArticlesNotify.append(mya);
490 490
                 changed = true;
@@ -558,7 +558,7 @@ void Feed::fetch(bool followDiscovery)
558 558
     {
559 559
         if ((*it).status() == Article::New)
560 560
         {
561
-            (*it).seStatus(Article::Unread);
561
+            (*it).setqStatus(Article::Unread);
562 562
         }
563 563
     }
564 564
 
@@ -579,7 +579,7 @@ void Feed::tryFetch()
579 579
 {
580 580
     d->fetchError = false;
581 581
 
582
-    d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, Status)) );
582
+    d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, tqStatus)) );
583 583
     //connect(d->loader, TQT_SIGNAL(progress(unsigned long)), this, TQT_SLOT(slotSetProgress(unsigned long)));
584 584
     d->loader->loadFrom( d->xmlUrl, new RSS::FileRetriever );
585 585
 }
@@ -595,7 +595,7 @@ void Feed::slotImageFetched(const TQPixmap& image)
595 595
     nodeModified();
596 596
 }
597 597
 
598
-void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status)
598
+void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus status)
599 599
 {
600 600
     // Note that loader instances delete themselves
601 601
     d->loader = 0;
@@ -735,14 +735,14 @@ void Feed::setArticleDeleted(Article& a)
735 735
     articlesModified();
736 736
 }
737 737
 
738
-void Feed::setArticleChanged(Article& a, int oldStatus)
738
+void Feed::setArticleChanged(Article& a, int oldtqStatus)
739 739
 {
740
-    if (oldStatus != -1)
740
+    if (oldtqStatus != -1)
741 741
     {
742
-        int newStatus = a.status();
743
-        if (oldStatus == Article::Read && newStatus != Article::Read)
742
+        int newtqStatus = a.status();
743
+        if (oldtqStatus == Article::Read && newtqStatus != Article::Read)
744 744
             setUnread(unread()+1);
745
-        else if (oldStatus != Article::Read && newStatus == Article::Read)
745
+        else if (oldtqStatus != Article::Read && newtqStatus == Article::Read)
746 746
             setUnread(unread()-1);
747 747
     }
748 748
     d->updatedArticlesNotify.append(a);
@@ -759,13 +759,13 @@ TreeNode* Feed::next()
759 759
     if ( nextSibling() )
760 760
         return nextSibling();
761 761
 
762
-    Folder* p = parent();
762
+    Folder* p = tqparent();
763 763
     while (p)
764 764
     {
765 765
         if ( p->nextSibling() )
766 766
             return p->nextSibling();
767 767
         else
768
-            p = p->parent();
768
+            p = p->tqparent();
769 769
     }
770 770
     return 0;
771 771
 }

+ 9
- 8
akregator/src/feed.h View File

@@ -19,8 +19,8 @@
19 19
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20 20
 
21 21
     As a special exception, permission is given to link this program
22
-    with any edition of Qt, and distribute the resulting executable,
23
-    without including the source code for Qt in the source distribution.
22
+    with any edition of TQt, and distribute the resulting executable,
23
+    without including the source code for TQt in the source distribution.
24 24
 */
25 25
 
26 26
 #ifndef AKREGATORFEED_H
@@ -43,7 +43,7 @@ namespace KPIM {
43 43
 // needed for slot fetchCompleted()
44 44
 using RSS::Document;
45 45
 using RSS::Loader;
46
-using RSS::Status;
46
+using RSS::tqStatus;
47 47
 
48 48
 namespace Akregator
49 49
 {
@@ -64,6 +64,7 @@ namespace Akregator
64 64
         friend class Article;
65 65
         
66 66
         Q_OBJECT
67
+  TQ_OBJECT
67 68
         public:
68 69
             /** the archiving modes:
69 70
                 - globalDefault: use default from Settings (default)
@@ -94,7 +95,7 @@ namespace Akregator
94 95
             virtual bool accept(TreeNodeVisitor* visitor);
95 96
 
96 97
             /** exports the feed settings to OPML */
97
-            virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const;
98
+            virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const;
98 99
 
99 100
             /**
100 101
               returns whether this feed uses its own fetch interval or the global setting
@@ -177,7 +178,7 @@ namespace Akregator
177 178
             /** sets the description of this feed */
178 179
             void setDescription(const TQString& s);
179 180
 
180
-            virtual TQValueList<Article> articles(const TQString& tag=TQString::null);
181
+            virtual TQValueList<Article> articles(const TQString& tag=TQString());
181 182
 
182 183
             /** returns the article with the given @c guid, or a null article if it not exists */
183 184
             virtual Article findArticle(const TQString& guid) const;
@@ -253,7 +254,7 @@ namespace Akregator
253 254
             
254 255
         private slots:
255 256
 
256
-            void fetchCompleted(Loader *loader, Document doc, Status status);
257
+            void fetchCompleted(Loader *loader, Document doc, tqStatus status);
257 258
             void slotImageFetched(const TQPixmap& image);
258 259
 
259 260
         private:
@@ -264,10 +265,10 @@ namespace Akregator
264 265
             void setArticleDeleted(Article& a);
265 266
 
266 267
             /** notifies that article @c mya was changed
267
-                @param oldStatus if the status was changed, it tqcontains the old status, -1 otherwise
268
+                @param oldtqStatus if the status was changed, it contains the old status, -1 otherwise
268 269
                 To be called by @ref Article
269 270
              */
270
-            void setArticleChanged(Article& a, int oldStatus=-1);
271
+            void setArticleChanged(Article& a, int oldtqStatus=-1);
271 272
             
272 273
             void enforceLimitArticleNumber();
273 274
 

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

@@ -19,8 +19,8 @@
19 19
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20 20
 
21 21
     As a special exception, permission is given to link this program
22
-    with any edition of Qt, and distribute the resulting executable,
23
-    without including the source code for Qt in the source distribution.
22
+    with any edition of TQt, and distribute the resulting executable,
23
+    without including the source code for TQt in the source distribution.
24 24
 */
25 25
 
26 26
 #include "feed.h"
@@ -69,8 +69,8 @@ void FeedIconManager::fetchIcon(Feed* feed)
69 69
     loadIcon(iconURL);
70 70
 }
71 71
 
72
-FeedIconManager::FeedIconManager(TQObject * parent, const char *name)
73
-:  TQObject(parent, name), DCOPObject("FeedIconManager"), d(new FeedIconManagerPrivate)
72
+FeedIconManager::FeedIconManager(TQObject * tqparent, const char *name)
73
+:  TQObject(tqparent, name), DCOPObject("FeedIconManager"), d(new FeedIconManagerPrivate)
74 74
 {
75 75
     connectDCOPSignal("kded",
76 76
                       "favicons", "iconChanged(bool, TQString, TQString)",
@@ -119,14 +119,14 @@ TQString FeedIconManager::iconLocation(const KURL & url) const
119 119
     kapp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data,
120 120
                              replyType, reply);
121 121
 
122
-    if (replyType == "TQString") {
122
+    if (replyType == TQSTRING_OBJECT_NAME_STRING) {
123 123
         TQDataStream replyStream(reply, IO_ReadOnly);
124 124
         TQString result;
125 125
         replyStream >> result;
126 126
         return result;
127 127
     }
128 128
 
129
-    return TQString::null;
129
+    return TQString();
130 130
 }
131 131
 
132 132
 void FeedIconManager::slotFeedDestroyed(TreeNode* node)
@@ -134,7 +134,7 @@ void FeedIconManager::slotFeedDestroyed(TreeNode* node)
134 134
     Feed* feed = dynamic_cast<Feed*>(node);
135 135
     if (feed)
136 136
         while (d->registeredFeeds.tqcontains(feed))
137
-            d->registeredFeeds.remove(d->registeredFeeds.find(feed));
137
+            d->registeredFeeds.remove(d->registeredFeeds.tqfind(feed));
138 138
 }
139 139
 
140 140
 void FeedIconManager::slotIconChanged(bool /*isHost*/, const TQString& hostOrURL,

+ 3
- 2
akregator/src/feediconmanager.h View File

@@ -19,8 +19,8 @@
19 19
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20 20
 
21 21
     As a special exception, permission is given to link this program
22
-    with any edition of Qt, and distribute the resulting executable,
23
-    without including the source code for Qt in the source distribution.
22
+    with any edition of TQt, and distribute the resulting executable,
23
+    without including the source code for TQt in the source distribution.
24 24
 */
25 25
 
26 26
 #ifndef FEEDICONMGR_H
@@ -45,6 +45,7 @@ namespace Akregator
45 45
     class FeedIconManager:public TQObject, public DCOPObject
46 46
     {
47 47
         Q_OBJECT
48
+//        TQ_OBJECT
48 49
         K_DCOP
49 50
         
50 51
         public:

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

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #include "actionmanager.h"
@@ -34,23 +34,23 @@
34 34
 
35 35
 namespace Akregator {
36 36
 
37
-FeedItem::FeedItem(FolderItem* parent, Feed* node) : TreeNodeItem(parent, node)
37
+FeedItem::FeedItem(FolderItem* tqparent, Feed* node) : TreeNodeItem(tqparent, node)
38 38
 {
39 39
     initialize(node);
40 40
 }
41 41
 
42
-FeedItem::FeedItem(KListView* parent, Feed* node) : TreeNodeItem(parent, node)
42
+FeedItem::FeedItem(KListView* tqparent, Feed* node) : TreeNodeItem(tqparent, node)
43 43
 {
44 44
     initialize(node);
45 45
 }
46 46
 
47
-FeedItem::FeedItem(KListView* parent, TreeNodeItem* after, Feed* node) : TreeNodeItem(parent, after, node)
47
+FeedItem::FeedItem(KListView* tqparent, TreeNodeItem* after, Feed* node) : TreeNodeItem(tqparent, after, node)
48 48
 {
49 49
     initialize(node);
50 50
 }
51 51
 
52 52
 
53
-FeedItem::FeedItem(FolderItem* parent, TreeNodeItem* after, Feed* node) : TreeNodeItem(parent, after, node)
53
+FeedItem::FeedItem(FolderItem* tqparent, TreeNodeItem* after, Feed* node) : TreeNodeItem(tqparent, after, node)
54 54
 {
55 55
     initialize(node);
56 56
 }

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

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #ifndef AKREGATORFEEDITEM_H
@@ -40,10 +40,10 @@ class FeedItem : public TreeNodeItem
40 40
 {
41 41
  public:
42 42
     
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);
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);
47 47
 
48 48
     virtual ~FeedItem();
49 49
     virtual Feed* node();

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

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 #include "feedlist.h"
25 25
 
@@ -80,8 +80,8 @@ class FeedList::RemoveNodeVisitor : public TreeNodeVisitor
80 80
         FeedList* m_list;
81 81
 };
82 82
 
83
-FeedList::FeedList(TQObject *parent, const char *name)
84
-    : NodeList(parent, name), d(new FeedListPrivate)
83
+FeedList::FeedList(TQObject *tqparent, const char *name)
84
+    : NodeList(tqparent, 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* parent)
107
+void FeedList::parseChildNodes(TQDomNode &node, Folder* tqparent)
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* parent)
119 119
             {
120 120
                 if (!d->urlMap[feed->xmlUrl()].tqcontains(feed))
121 121
                     d->urlMap[feed->xmlUrl()].append(feed);
122
-                parent->appendChild(feed);
122
+                tqparent->appendChild(feed);
123 123
             }
124 124
         }
125 125
         else
126 126
         {
127 127
             Folder* fg = Folder::fromOPML(e);
128
-            parent->appendChild(fg);
128
+            tqparent->appendChild(fg);
129 129
 
130 130
             if (e.hasChildNodes())
131 131
             {
@@ -214,21 +214,21 @@ 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* parent, TreeNode* after)
217
+void FeedList::append(FeedList* list, Folder* tqparent, TreeNode* after)
218 218
 {
219 219
     if ( list == this )
220 220
         return;
221 221
 
222
-    if ( !flatList()->tqcontains(parent) )
223
-        parent = rootNode();
222
+    if ( !flatList()->tqcontains(tqparent) )
223
+        tqparent = rootNode();
224 224
 
225
-    TQValueList<TreeNode*> children = list->rootNode()->children();
225
+    TQValueList<TreeNode*> tqchildren = list->rootNode()->tqchildren();
226 226
 
227
-    TQValueList<TreeNode*>::ConstIterator end(  children.end() );
228
-    for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it)
227
+    TQValueList<TreeNode*>::ConstIterator end(  tqchildren.end() );
228
+    for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it)
229 229
     {
230 230
         list->rootNode()->removeChild(*it);
231
-        parent->insertChild(*it, after);
231
+        tqparent->insertChild(*it, after);
232 232
         after = *it;
233 233
     }
234 234
 }
@@ -254,11 +254,11 @@ TQDomDocument FeedList::toXML() const
254 254
     TQDomElement body = doc.createElement( "body" );
255 255
     root.appendChild( body );
256 256
 
257
-    TQValueList<TreeNode*> children = rootNode()->children();
257
+    TQValueList<TreeNode*> tqchildren = rootNode()->tqchildren();
258 258
 
259
-    TQValueList<TreeNode*>::ConstIterator end(  children.end() );
259
+    TQValueList<TreeNode*>::ConstIterator end(  tqchildren.end() );
260 260
 
261
-    for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it)
261
+    for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it)
262 262
         body.appendChild( (*it)->toOPML(body, doc) );
263 263
 
264 264
     return doc;

+ 7
- 6
akregator/src/feedlist.h View File

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #ifndef AKREGATORFEEDLIST_H
@@ -44,16 +44,17 @@ class TreeNode;
44 44
 class FeedList : public NodeList
45 45
 {
46 46
 Q_OBJECT
47
+  TQ_OBJECT
47 48
 public:
48 49
 
49
-    FeedList(TQObject *parent = 0, const char *name = 0);
50
+    FeedList(TQObject *tqparent = 0, const char *name = 0);
50 51
 
51 52
     /** Destructor. Contained nodes are deleted! */
52 53
     ~FeedList();
53 54
 
54 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 */
55 56
     
56
-    void append(FeedList* list, Folder* parent=0, TreeNode* after=0);
57
+    void append(FeedList* list, Folder* tqparent=0, TreeNode* after=0);
57 58
 
58 59
     /** reads an OPML document and appends the items to this list
59 60
         @param doc the OPML document to parse
@@ -64,7 +65,7 @@ public:
64 65
     /** exports the feed list as OPML. The root node ("All Feeds") is ignored! */
65 66
     virtual TQDomDocument toXML() const;
66 67
 
67
-    /** returns a feed object for a given feed URL. If the feed list does not contain a feed with @c url, NULL is returned. If it tqcontains the same feed multiple times, any of the Feed objects is returned. */
68
+    /** returns a feed object for a given feed URL. If the feed list does not contain a feed with @c url, NULL is returned. If it contains the same feed multiple times, any of the Feed objects is returned. */
68 69
     Feed* findByURL(const TQString& feedURL) const;
69 70
 
70 71
     Article findArticle(const TQString& feedURL, const TQString& guid) const;
@@ -81,7 +82,7 @@ protected:
81 82
 public:         // compat with KDE-3.x assertions, remove for KDE 4
82 83
 // private:
83 84
 
84
-    void parseChildNodes(TQDomNode &node, Folder* parent);
85
+    void parseChildNodes(TQDomNode &node, Folder* tqparent);
85 86
 
86 87
     // never call these
87 88
     FeedList(const FeedList&) : NodeList() {}

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

@@ -18,8 +18,8 @@
18 18
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
 
20 20
     As a special exception, permission is given to link this program
21
-    with any edition of Qt, and distribute the resulting executable,
22
-    without including the source code for Qt in the source distribution.
21
+    with any edition of TQt, and distribute the resulting executable,
22
+    without including the source code for TQt in the source distribution.
23 23
 */
24 24
 
25 25
 #include "dragobjects.h"
@@ -65,7 +65,7 @@ class NodeListView::NodeListViewPrivate
65 65
     bool showTagFolders;
66 66
 
67 67
     // Drag and Drop variables
68
-    TQListViewItem *parent;
68
+    TQListViewItem *tqparent;
69 69
     TQListViewItem *afterme;
70 70
     TQTimer autoopentimer;
71 71
     ConnectNodeVisitor* connectNodeVisitor;
@@ -179,9 +179,9 @@ class NodeListView::DeleteItemVisitor : public TreeNodeVisitor
179 179
         
180 180
         virtual bool visitFolder(Folder* node)
181 181
         {
182
-            // delete child items recursively before deleting parent
183
-            TQValueList<TreeNode*> children = node->children();
184
-            for (TQValueList<TreeNode*>::ConstIterator it =  children.begin(); it != children.end(); ++it )
182
+            // delete child items recursively before deleting tqparent
183
+            TQValueList<TreeNode*> tqchildren = node->tqchildren();
184
+            for (TQValueList<TreeNode*>::ConstIterator it =  tqchildren.begin(); it != tqchildren.end(); ++it )
185 185
                 visit(*it);
186 186
             
187 187
             visitTreeNode(node);
@@ -212,15 +212,15 @@ 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->parent()));
216
-            if (parentItem)
215
+            FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
216
+            if (tqparentItem)
217 217
             {
218 218
                 if (prev)
219 219
                 {
220
-                    item = new TagNodeItem( parentItem, m_view->findNodeItem(prev), node);
220
+                    item = new TagNodeItem( tqparentItem, m_view->findNodeItem(prev), node);
221 221
                 }
222 222
                 else
223
-                    item = new TagNodeItem( parentItem, node);
223
+                    item = new TagNodeItem( tqparentItem, node);
224 224
             }
225 225
             else
226 226
             {
@@ -234,8 +234,8 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
234 234
             item->nodeChanged();     
235 235
             m_view->d->itemDict.insert(node, item);
236 236
             m_view->connectToNode(node);
237
-            if (parentItem)
238
-                parentItem->sortChildItems(0, true);
237
+            if (tqparentItem)
238
+                tqparentItem->sortChildItems(0, true);
239 239
             return true;
240 240
         }
241 241
 
@@ -246,15 +246,15 @@ 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->parent()));
250
-            if (parentItem)
249
+            FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
250
+            if (tqparentItem)
251 251
             {
252 252
                 if (prev)
253 253
                 {
254
-                    item = new TagFolderItem( parentItem, m_view->findNodeItem(prev), node);
254
+                    item = new TagFolderItem( tqparentItem, m_view->findNodeItem(prev), node);
255 255
                 }
256 256
                 else
257
-                    item = new TagFolderItem(parentItem, node);
257
+                    item = new TagFolderItem(tqparentItem, node);
258 258
             }
259 259
             else
260 260
             {
@@ -267,10 +267,10 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
267 267
 
268 268
             }
269 269
             m_view->d->itemDict.insert(node, item);
270
-            TQValueList<TreeNode*> children = node->children();
270
+            TQValueList<TreeNode*> tqchildren = node->tqchildren();
271 271
 
272
-            // add children recursively
273
-            for (TQValueList<TreeNode*>::ConstIterator it =  children.begin(); it != children.end(); ++it )
272
+            // add tqchildren recursively
273
+            for (TQValueList<TreeNode*>::ConstIterator it =  tqchildren.begin(); it != tqchildren.end(); ++it )
274 274
                 visit(*it);
275 275
 
276 276
             m_view->connectToNode(node);
@@ -284,15 +284,15 @@ 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->parent()));
288
-            if (parentItem)
287
+            FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
288
+            if (tqparentItem)
289 289
             {
290 290
                 if (prev)
291 291
                 {
292
-                    item = new FolderItem( parentItem, m_view->findNodeItem(prev), node);
292
+                    item = new FolderItem( tqparentItem, m_view->findNodeItem(prev), node);
293 293
                 }
294 294
                 else
295
-                    item = new FolderItem(parentItem, node);
295
+                    item = new FolderItem(tqparentItem, node);
296 296
             }
297 297
             else
298 298
             {
@@ -305,9 +305,9 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
305 305
             }
306 306
             m_view->d->itemDict.insert(node, item);
307 307
             
308
-            // add children recursively
309
-            TQValueList<TreeNode*> children = node->children();
310
-            for (TQValueList<TreeNode*>::ConstIterator it =  children.begin(); it != children.end(); ++it )
308
+            // add tqchildren recursively
309
+            TQValueList<TreeNode*> tqchildren = node->tqchildren();
310
+            for (TQValueList<TreeNode*>::ConstIterator it =  tqchildren.begin(); it != tqchildren.end(); ++it )
311 311
                 visit(*it);
312 312
 
313 313
             m_view->connectToNode(node);
@@ -321,16 +321,16 @@ 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->parent()));
324
+            FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
325 325
             
326
-            if (parentItem)
326
+            if (tqparentItem)
327 327
             {
328 328
                 if (prev)
329 329
                 {
330
-                    item = new FeedItem( parentItem, m_view->findNodeItem(prev), node);
330
+                    item = new FeedItem( tqparentItem, m_view->findNodeItem(prev), node);
331 331
                 }
332 332
                 else
333
-                    item = new FeedItem( parentItem, node);
333
+                    item = new FeedItem( tqparentItem, node);
334 334
             }
335 335
             else
336 336
             {
@@ -352,8 +352,8 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
352 352
         NodeListView* m_view;
353 353
 };
354 354
 
355
-NodeListView::NodeListView( TQWidget *parent, const char *name)
356
-        : KListView(parent, name), d(new NodeListViewPrivate)
355
+NodeListView::NodeListView( TQWidget *tqparent, const char *name)
356
+        : KListView(tqparent, name), d(new NodeListViewPrivate)
357 357
 {
358 358
     d->showTagFolders = true;
359 359
     d->connectNodeVisitor = new ConnectNodeVisitor(this),
@@ -457,7 +457,7 @@ TreeNode* NodeListView::findNodeByTitle(const TQString& title)
457 457
 
458 458
 TreeNodeItem* NodeListView::findNodeItem(TreeNode* node)
459 459
 {
460
-    return d->itemDict.find(node);
460
+    return d->itemDict.tqfind(node);
461 461
 }
462 462
 
463 463
 TreeNodeItem* NodeListView::findItemByTitle(const TQString& text, int column, ComparisonFlags compare) const
@@ -510,7 +510,7 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem*
510 510
 
511 511
         if (KURLDrag::canDecode(e))
512 512
         {
513
-            FolderItem* parent = dynamic_cast<FolderItem*> (d->parent);
513
+            FolderItem* tqparent = dynamic_cast<FolderItem*> (d->tqparent);
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, parent ? parent->node() : 0);