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-ecb5cbfe19da
tags/v3.5.13
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
------------------

* kolab/issue4335 (partly): D'n'D a mail attachment with the icon is not working (rt#6126)
* kolab/issue3908 (partly): Mail view and print layout problem if description of attachment is to long (#5872)
* kolab/issue3908 (partly): Mail view and print tqlayout problem if description of attachment is to long (#5872)
* kolab/issue4455: calendar activate/deactivate handling broken
* kolab/issue4282: Adding a new event from an invitation update mail shows unnecssary message
dialog 'store/throw away' (rt#6094)
@@ -269,7 +269,7 @@ Problems addressed
* kolab/issue3902: Delete a folder while syncing leads to crash
* kolab/issue4250: Edit "Out of office" replies: Resend notification only after: days is missing (rt#6076)
* kolab/issue4249: Crash while printing a mail without preview pane (rt#6075)
* kolab/issue4142: Composer: view all fields layout and small problems (rt#6032)
* kolab/issue4142: Composer: view all fields tqlayout and small problems (rt#6032)
* kolab/issue4012: Calender view update problem, if the same appointment is moved on the server in other folders (rt#5930)


@@ -551,7 +551,7 @@ Problems addressed

* kolab/issue3923(partial): Save as of an attachment of an invitation crashes kontact
* kolab/issue3930: time on the Marcus Bains line doesn't change
* kolab/issue3908(partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
* kolab/issue3908(partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
* kolab/issue3926: Start khelpcenter instead of webbrowser help: from the introduction/welcome screen (rt#5881)
* kolab/issue3481: Keep current email in front after saving an attachment (rt#5746)
* kolab/issue3098: OnlineIMAP, sometimes Mail body no longer shown -> Crash
@@ -565,7 +565,7 @@ Problems addressed
* kolab/issue3065: Crash in KOAgendaItem::paintEvent
* kolab/issue3902: Delete a folder while syncing leads to crash
* kolab/issue3903: Kontact hangs when switching to calendar view (rt#5870)
* kolab/issue3908 (partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
* kolab/issue3908 (partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
* kolab/issue3807: Reminder: None of the buttons should be the default (rt#5845)
* kolab/issue3809: Reminder: sorting in look&feel of kontact (rt#5846)
* kolab/issue3813: reccuring events show wrong dates (rt#5855)
@@ -593,7 +593,7 @@ Friday, October 2th 2009
Problems addressed
------------------

* kolab/issue3783: SMIME encrypted and signed mail: Audit log dialog contains ???? at the bottom
* kolab/issue3783: SMIME encrypted and signed mail: Audit log dialog tqcontains ???? at the bottom
* kolab/issue3823: mimetreeviewer doesn't show structure of forward-as-attachment message #n where #n > 1
* kolab/issue3889: Kontact crahes if opening/changing calendar view (rt#5868)
* kolab/issue3867: Save S/MIME encrypted mails unencrypted after reading them
@@ -1108,7 +1108,7 @@ Friday, November 21st 2008
Problems addressed
------------------

* kolab/issue2627 Status line for audit log shown, even when it is not implemented.
* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented.
* kolab/issue2617 Kleopatra: After importing a p7c or p12 file the user is informed, that he has imported 0 certifictes.
* kolab/issue2620 Kleopatra throws an error message, if no .gnupg exists and no agent is running.

@@ -1125,7 +1125,7 @@ Sunday, November 9th 2008
Problems addressed
------------------

* kolab/issue2627 Status line for audit log shown, even when it is not implemented.
* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented.
*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.
* 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.
@@ -1474,7 +1474,7 @@ Friday, February 29th 2008
Problems addressed
-------------------

* Prevent crash after changing the layout and replying then. (778728)
* Prevent crash after changing the tqlayout and replying then. (778728)
* kolab/issue2442 kolab/issue2442 (kioslave crashs after closing kontact, if the vacation reminder is activated. (779694)
* "Enterprise headers" makes impossible to select text in first paragraph of body. [ kde-bug#151150 ] (779994)
* kolab/issue1700 kleopatra crashes after ldap search. (780211)
@@ -1696,10 +1696,10 @@ Problems addressed
* kolab/issue2142 ( part 1 ) Make sure the file selector is shown on top of the filter dialog. (732794)
* crash when there is no smime backend, and the protocol can't be determined.(733049 )
* kolab/issue2151 Fix creation of new folders when restarting KMail before the next sync. ( 733149 )
* kolab/issue2142 ( part 2 ) Provide a proper parent for the "ask to overwrite" dialog.(733495)
* kolab/issue2142 ( part 2 ) Provide a proper tqparent for the "ask to overwrite" dialog.(733495)
* kolab/issue 2176 Move transaction code into the filtermanager, from the caller and make sure filter counts are written to and read from the right section. ( 733511 )
* kolab/issue2175 Show an error message if the to-be-imported filters file can't be read. (733519 )
* kolab/issue2181 Fix crash when opening a message without a parent, cleanup initialization order.(734247)
* kolab/issue2181 Fix crash when opening a message without a tqparent, cleanup initialization order.(734247)

New functionality
-------------------
@@ -2063,7 +2063,7 @@ Bugfixes

Korganizer
-----------
- proko35 W1-9 icon alignment was improved.
- proko35 W1-9 icon tqalignment was improved.

Additional Fixes
================

+ 1
- 1
README.Kolab View File

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

+ 2
- 2
akregator/COPYING View File

@@ -59,7 +59,7 @@ modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. This License applies to any program or other work which contains
0. This License applies to any program or other work which tqcontains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
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:

The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
code means all the source code for all modules it tqcontains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include

+ 10
- 10
akregator/HACKING View File

@@ -66,7 +66,7 @@ Spaces
================================================================================

Spaces should be used between the conditional / loop type and the
conditional statement. They should not be used after parenthesis. However
conditional statement. They should not be used after tqparenthesis. However
the should be to mark of mathematical or comparative operators.

if ( foo == bar )
@@ -87,17 +87,17 @@ class should be roughly as follows:
public typedefs:
public ctors:
public methods:
public slots:
signals:
public Q_SLOTS:
Q_SIGNALS:
protected methods:
protected slots:
protected Q_SLOTS:
protected fields:
private methods:
private slots:
private Q_SLOTS:
private fields:
private ctors: // if you define ctors/dtor as private, put them at end

If there are no private slots there is no need for two private sections, however
If there are no private Q_SLOTS there is no need for two private sections, however
private functions and private variables should be clearly separated.

The implementations files -- .cpp files -- should follow (when possible) the
@@ -163,10 +163,10 @@ class Test : public QObject

static Test *instance() { return m_instance; }

public slots:
public Q_SLOTS:
void receive(QSomething &);

signals:
Q_SIGNALS:
void send(QSomething &);

protected:
@@ -174,7 +174,7 @@ class Test : public QObject

static void someProtectedStaticFunc();

protected slots:
protected Q_SLOTS:
void protectedSlot();

protected:
@@ -185,7 +185,7 @@ class Test : public QObject

static int staticPrivateMethod();

private slots:
private Q_SLOTS:
void privateSlotIndeed(int youWonder);

private:

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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#include <tqstring.h>

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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#ifndef ABOUTDATA_H

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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#include "actionmanager.h"
@@ -43,7 +43,7 @@ void ActionManager::setInstance(ActionManager* manager)
}


ActionManager::ActionManager(TQObject* parent, const char* name) : TQObject(parent, name), d(new ActionManagerPrivate)
ActionManager::ActionManager(TQObject* tqparent, const char* name) : TQObject(tqparent, name), d(new ActionManagerPrivate)
{}

ActionManager::~ActionManager()

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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#ifndef AKREGATOR_ACTIONMANAGER_H
@@ -36,14 +36,14 @@ namespace Akregator {
/** interface for accessing actions, popup menus etc. from widgets.
(Extracted from the implementation to avoid dependencies between widgets and Akregator::Part).
*/
class ActionManager : public QObject
class ActionManager : public TQObject
{
public:

static ActionManager* getInstance();
static void setInstance(ActionManager* manager);

ActionManager(TQObject* parent=0, const char* name=0);
ActionManager(TQObject* tqparent=0, const char* name=0);
virtual ~ActionManager();

virtual KAction* action(const char* name, const char* classname=0) = 0;

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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#include <tqwidget.h>
@@ -89,7 +89,7 @@ class ActionManagerImpl::NodeSelectVisitor : public TreeNodeVisitor
{
KAction* remove = m_manager->action("feed_remove");
if (remove)
remove->setEnabled(node->parent()); // root nodes must not be deleted
remove->setEnabled(node->tqparent()); // root nodes must not be deleted
KAction* hp = m_manager->action("feed_homepage");
if (hp)
hp->setEnabled(false);
@@ -222,7 +222,7 @@ void ActionManagerImpl::slotNodeSelected(TreeNode* node)
d->nodeSelectVisitor->visit(node);
}

ActionManagerImpl::ActionManagerImpl(Part* part, TQObject* parent, const char* name) : ActionManager(parent, name), d(new ActionManagerImplPrivate)
ActionManagerImpl::ActionManagerImpl(Part* part, TQObject* tqparent, const char* name) : ActionManager(tqparent, name), d(new ActionManagerImplPrivate)
{
d->nodeSelectVisitor = new NodeSelectVisitor(this);
d->part = part;
@@ -314,13 +314,13 @@ void ActionManagerImpl::initView(View* view)
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");

// Settings menu
KToggleAction* sqf = new KToggleAction(i18n("Show Quick Filter"), TQString::null, 0, d->view, TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter");
KToggleAction* sqf = new KToggleAction(i18n("Show Quick Filter"), TQString(), 0, d->view, TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter");
sqf->setChecked( Settings::showQuickFilter() );

new KAction( i18n("Open in Tab"), "tab_new", "Shift+Return", d->view, TQT_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" );
new KAction( i18n("Open in Background Tab"), TQString::null, "tab_new", d->view, TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" );
new KAction( i18n("Open in Background Tab"), TQString(), "tab_new", d->view, TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" );
new KAction( i18n("Open in External Browser"), "window_new", "Ctrl+Shift+Return", d->view, TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" );
new KAction( i18n("Copy Link Address"), TQString::null, TQString::null, d->view, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" );
new KAction( i18n("Copy Link Address"), TQString(), TQString(), d->view, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" );

new KAction(i18n("Pre&vious Unread Article"), "", Key_Minus, d->view, TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article");
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)
connect(importantAction, TQT_SIGNAL(toggled(bool)), d->view, TQT_SLOT(slotArticleToggleKeepFlag(bool)));


new KAction( i18n("Move Node Up"), TQString::null, "Shift+Alt+Up", view, TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" );
new KAction( i18n("Move Node Down"), TQString::null, "Shift+Alt+Down", view, TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" );
new KAction( i18n("Move Node Left"), TQString::null, "Shift+Alt+Left", view, TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" );
new KAction( i18n("Move Node Right"), TQString::null, "Shift+Alt+Right", view, TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right");
new KAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", view, TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" );
new KAction( i18n("Move Node Down"), TQString(), "Shift+Alt+Down", view, TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" );
new KAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", view, TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" );
new KAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", view, TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right");
}

void ActionManagerImpl::initArticleViewer(ArticleViewer* articleViewer)
@@ -385,8 +385,8 @@ void ActionManagerImpl::initArticleListView(ArticleListView* articleList)
else
d->articleList = articleList;

new KAction( i18n("&Previous Article"), TQString::null, "Left", articleList, TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" );
new KAction( i18n("&Next Article"), TQString::null, "Right", articleList, TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" );
new KAction( i18n("&Previous Article"), TQString(), "Left", articleList, TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" );
new KAction( i18n("&Next Article"), TQString(), "Right", articleList, TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" );
}

void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
@@ -401,12 +401,12 @@ void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
new KAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", listTabWidget, TQT_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed");
new KAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", listTabWidget, TQT_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed");

new KAction( i18n("Go to Top of Tree"), TQString::null, "Ctrl+Home", listTabWidget, TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" );
new KAction( i18n("Go to Bottom of Tree"), TQString::null, "Ctrl+End", listTabWidget, TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" );
new KAction( i18n("Go Left in Tree"), TQString::null, "Ctrl+Left", listTabWidget, TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" );
new KAction( i18n("Go Right in Tree"), TQString::null, "Ctrl+Right", listTabWidget, TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" );
new KAction( i18n("Go Up in Tree"), TQString::null, "Ctrl+Up", listTabWidget, TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" );
new KAction( i18n("Go Down in Tree"), TQString::null, "Ctrl+Down", listTabWidget, TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" );
new KAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", listTabWidget, TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" );
new KAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", listTabWidget, TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" );
new KAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", listTabWidget, TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" );
new KAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", listTabWidget, TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" );
new KAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", listTabWidget, TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" );
new KAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", listTabWidget, TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" );
}

void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
@@ -419,7 +419,7 @@ void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
new KAction(i18n("Select Next Tab"), "", "Ctrl+Period", d->tabWidget, TQT_SLOT(slotNextTab()),actionCollection(), "select_next_tab");
new KAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", d->tabWidget, TQT_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab");
new KAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, d->tabWidget, TQT_SLOT(slotDetachTab()), actionCollection(), "tab_detach" );
new KAction( i18n("Copy Link Address"), TQString::null, TQString::null, d->tabWidget, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" );
new KAction( i18n("Copy Link Address"), TQString(), TQString(), d->tabWidget, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" );
new KAction( i18n("&Close Tab"), "tab_remove", KStdAccel::close(), d->tabWidget, TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" );
}


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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#ifndef AKREGATOR_ACTIONMANAGERIMPL_H
@@ -50,9 +50,10 @@ class TabWidget;
class ActionManagerImpl : public ActionManager
{
Q_OBJECT
TQ_OBJECT

public:
ActionManagerImpl(Part* part, TQObject* parent=0, const char* name=0);
ActionManagerImpl(Part* part, TQObject* tqparent=0, const char* name=0);
virtual ~ActionManagerImpl();

virtual KAction* action(const char* name, const char* classname=0);

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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#include "feed.h"
@@ -39,18 +39,18 @@

namespace Akregator {

AddFeedWidget::AddFeedWidget(TQWidget *parent, const char *name)
: AddFeedWidgetBase(parent, name)
AddFeedWidget::AddFeedWidget(TQWidget *tqparent, const char *name)
: AddFeedWidgetBase(tqparent, name)
{
pixmapLabel1->setPixmap(kapp->iconLoader()->loadIcon( "package_network",KIcon::Desktop,KIcon::SizeHuge, KIcon::DefaultState, 0, true));
statusLabel->setText(TQString::null);
statusLabel->setText(TQString());
}

AddFeedWidget::~AddFeedWidget()
{}

AddFeedDialog::AddFeedDialog(TQWidget *parent, const char *name)
: KDialogBase(KDialogBase::Swallow, Qt::WStyle_DialogBorder, parent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel)
AddFeedDialog::AddFeedDialog(TQWidget *tqparent, const char *name)
: KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, tqparent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel)
{
widget = new AddFeedWidget(this);
connect(widget->urlEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged(const TQString&)));
@@ -79,7 +79,7 @@ void AddFeedDialog::slotOk( )
if (feedURL.startsWith("feed:"))
feedURL = feedURL.right( feedURL.length() - 5 );

if (feedURL.find(":/") == -1)
if (feedURL.tqfind(":/") == -1)
feedURL.prepend("http://");
f->setXmlUrl(feedURL);


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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#ifndef AKREGATORADDFEEDDIALOG_H
@@ -41,16 +41,18 @@ namespace Akregator
class AddFeedWidget : public AddFeedWidgetBase
{
Q_OBJECT
TQ_OBJECT
public:
AddFeedWidget(TQWidget *parent = 0, const char *name = 0);
AddFeedWidget(TQWidget *tqparent = 0, const char *name = 0);
~AddFeedWidget();
};

class AddFeedDialog : public KDialogBase
{
Q_OBJECT
TQ_OBJECT
public:
AddFeedDialog(TQWidget *parent = 0, const char *name = 0);
AddFeedDialog(TQWidget *tqparent = 0, const char *name = 0);
~AddFeedDialog();

void setURL(const TQString& t);

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

@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>Akregator::AddFeedWidgetBase</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>AddFeedWidget</cstring>
</property>
@@ -22,7 +22,7 @@
<property name="margin">
<number>0</number>
</property>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout16</cstring>
</property>
@@ -30,7 +30,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>pixmapLabel1</cstring>
</property>
@@ -63,7 +63,7 @@
</size>
</property>
</spacer>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout15</cstring>
</property>
@@ -82,7 +82,7 @@
</size>
</property>
</widget>
<widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
<widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -95,7 +95,7 @@
<string>Add New Source</string>
</property>
</widget>
<widget class="QLabel" row="1" column="0">
<widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -115,7 +115,7 @@
<cstring>statusLabel</cstring>
</property>
<property name="text">
<string>Status</string>
<string>tqStatus</string>
</property>
</widget>
<spacer>

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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#ifndef AKREGATOR_OPTIONS_H

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

@@ -19,8 +19,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
#include <dcopclient.h>
#include <kaboutdata.h>
@@ -117,9 +117,9 @@ class Part::ApplyFiltersInterceptor : public ArticleInterceptor
};

Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
TQObject *parent, const char *name, const TQStringList& )
TQObject *tqparent, const char *name, const TQStringList& )
: DCOPObject("AkregatorIface")
, MyBasePart(parent, name)
, MyBasePart(tqparent, name)
, m_standardListLoaded(false)
, m_shuttingDown(false)
, m_mergedPart(0)
@@ -416,7 +416,7 @@ bool Part::openFile()
{
if (file.open(IO_ReadOnly))
{
// Read OPML feeds list and build QDom tree.
// Read OPML feeds list and build TQDom tree.
TQTextStream stream(&file);
stream.setEncoding(TQTextStream::UnicodeUTF8); // FIXME not all opmls are in utf8
str = stream.read();
@@ -452,7 +452,7 @@ bool Part::openFile()
m_view->loadFeeds(createDefaultFeedList());
}

emit setStatusBarText(TQString::null);
emit setStatusBarText(TQString());

if( Settings::markAllFeedsReadOnStartup() )
@@ -522,7 +522,7 @@ bool Part::mergePart(KParts::Part* part)
{
if (m_mergedPart) {
factory()->removeClient(m_mergedPart);
if (childClients()->tqcontainsRef(m_mergedPart))
if (childClients()->containsRef(m_mergedPart))
removeChildClient(m_mergedPart);
}
if (part)
@@ -634,7 +634,7 @@ void Part::importFile(const KURL& url)
TQFile file(filename);
if (file.open(IO_ReadOnly))
{
// Read OPML feeds list and build QDom tree.
// Read OPML feeds list and build TQDom tree.
TQDomDocument doc;
if (doc.setContent(file.readAll()))
m_view->importFeeds(doc);
@@ -692,7 +692,7 @@ void Part::exportFile(const KURL& url)

void Part::fileImport()
{
KURL url = KFileDialog::getOpenURL( TQString::null,
KURL url = KFileDialog::getOpenURL( TQString(),
"*.opml *.xml|" + i18n("OPML Outlines (*.opml, *.xml)")
+"\n*|" + i18n("All Files") );

@@ -702,7 +702,7 @@ void Part::fileImport()

void Part::fileExport()
{
KURL url= KFileDialog::getSaveURL( TQString::null,
KURL url= KFileDialog::getSaveURL( TQString(),
"*.opml *.xml|" + i18n("OPML Outlines (*.opml, *.xml)")
+"\n*|" + i18n("All Files") );

@@ -979,8 +979,8 @@ bool Part::tryToLock(const TQString& backendName)
"You should disable the archive for now "
"unless you are sure that %2 is not already running.</qt>")
.arg( programName, programName, backendName );
// TQString::arg( st ) only tqreplaces the first occurrence of %1
// with st while TQString::arg( s1, s2 ) tqreplacess all occurrences
// TQString::arg( st ) only replaces the first occurrence of %1
// with st while TQString::arg( s1, s2 ) replacess all occurrences
// of %1 with s1 and all occurrences of %2 with s2. So don't
// even think about changing the above to .arg( programName ).
else
@@ -1014,7 +1014,7 @@ bool Part::tryToLock(const TQString& backendName)

KCursorSaver idle( KBusyPtr::idle() );
if ( KMessageBox::No ==
KMessageBox::warningYesNo( 0, msg, TQString::null,
KMessageBox::warningYesNo( 0, msg, TQString(),
i18n("Force Access"),
i18n("Disable Archive")) )
{

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

@@ -19,8 +19,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#ifndef _AKREGATORPART_H_
@@ -60,6 +60,7 @@ namespace Akregator
class BrowserExtension : public KParts::BrowserExtension
{
Q_OBJECT
TQ_OBJECT

public:
BrowserExtension(Part *p, const char *name );
@@ -76,12 +77,13 @@ namespace Akregator
class Part : public MyBasePart, virtual public AkregatorPartIface
{
Q_OBJECT
TQ_OBJECT
public:
typedef MyBasePart inherited;

/** Default constructor.*/
Part(TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent, const char *name, const TQStringList&);
TQObject *tqparent, const char *name, const TQStringList&);

/** Destructor. */
virtual ~Part();

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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#ifndef AKREGATORPARTIFACE_H

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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#include <kdebug.h>

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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#ifndef AKREGATOR_RUN_H
@@ -35,6 +35,7 @@ class Viewer;
class BrowserRun : public KParts::BrowserRun
{
Q_OBJECT
TQ_OBJECT
public:
/** 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 */
enum OpeningMode

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

@@ -20,8 +20,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#include "actionmanagerimpl.h"
@@ -210,8 +210,8 @@ View::~View()
kdDebug() << "View::~View(): leaving" << endl;
}

View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, const char *name)
: TQWidget(parent, name), m_viewMode(NormalView), m_actionManager(actionManager)
View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, const char *name)
: TQWidget(tqparent, name), m_viewMode(NormalView), m_actionManager(actionManager)
{
m_editNodePropertiesVisitor = new EditNodePropertiesVisitor(this);
m_deleteNodeVisitor = new DeleteNodeVisitor(this);
@@ -366,7 +366,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons

if (!Settings::resetQuickFilterOnNodeChange())
{
m_searchBar->slotSeStatus(Settings::statusFilter());
m_searchBar->slotSetqStatus(Settings::statusFilter());
m_searchBar->slotSetText(Settings::textFilter());
}

@@ -533,7 +533,7 @@ bool View::importFeeds(const TQDomDocument& doc)
return true;
}

bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
bool View::loadFeeds(const TQDomDocument& doc, Folder* tqparent)
{
FeedList* feedList = new FeedList();
bool parsed = feedList->readFromXML(doc);
@@ -546,7 +546,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
}
m_feedListView->setUpdatesEnabled(false);
m_tagNodeListView->setUpdatesEnabled(false);
if (!parent)
if (!tqparent)
{
TagSet* tagSet = Kernel::self()->tagSet();

@@ -570,7 +570,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
// create a tag for every tag ID in the archive that is not part of the tagset
// this is a fallback in case the tagset was corrupted,
// so the tagging information from archive does not get lost.
if (!tagSet->tqcontainsID(*it))
if (!tagSet->containsID(*it))
{
Tag tag(*it, *it);
tagSet->insert(tag);
@@ -578,7 +578,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
}
}
else
m_feedList->append(feedList, parent);
m_feedList->append(feedList, tqparent);

m_feedListView->setUpdatesEnabled(true);
m_feedListView->triggerUpdate();
@@ -705,7 +705,7 @@ void View::slotFrameChanged(Frame *f)
emit signalStarted(0);
break;
case Frame::Canceled:
emit signalCanceled(TQString::null);
emit signalCanceled(TQString());
break;
case Frame::Idle:
case Frame::Completed:
@@ -725,13 +725,13 @@ void View::slotMoveCurrentNodeUp()
if (!current)
return;
TreeNode* prev = current->prevSibling();
Folder* parent = current->parent();
Folder* tqparent = current->tqparent();

if (!prev || !parent)
if (!prev || !tqparent)
return;

parent->removeChild(prev);
parent->insertChild(prev, current);
tqparent->removeChild(prev);
tqparent->insertChild(prev, current);
m_listTabWidget->activeView()->ensureNodeVisible(current);
}

@@ -741,41 +741,41 @@ void View::slotMoveCurrentNodeDown()
if (!current)
return;
TreeNode* next = current->nextSibling();
Folder* parent = current->parent();
Folder* tqparent = current->tqparent();

if (!next || !parent)
if (!next || !tqparent)
return;

parent->removeChild(current);
parent->insertChild(current, next);
tqparent->removeChild(current);
tqparent->insertChild(current, next);
m_listTabWidget->activeView()->ensureNodeVisible(current);
}

void View::slotMoveCurrentNodeLeft()
{
TreeNode* current = m_listTabWidget->activeView()->selectedNode();
if (!current || !current->parent() || !current->parent()->parent())
if (!current || !current->tqparent() || !current->tqparent()->tqparent())
return;

Folder* parent = current->parent();
Folder* grandparent = current->parent()->parent();
Folder* tqparent = current->tqparent();
Folder* grandtqparent = current->tqparent()->tqparent();

parent->removeChild(current);
grandparent->insertChild(current, parent);
tqparent->removeChild(current);
grandtqparent->insertChild(current, tqparent);
m_listTabWidget->activeView()->ensureNodeVisible(current);
}

void View::slotMoveCurrentNodeRight()
{
TreeNode* current = m_listTabWidget->activeView()->selectedNode();
if (!current || !current->parent())
if (!current || !current->tqparent())
return;
TreeNode* prev = current->prevSibling();

if ( prev && prev->isGroup() )
{
Folder* fg = static_cast<Folder*>(prev);
current->parent()->removeChild(current);
current->tqparent()->removeChild(current);
fg->appendChild(current);
m_listTabWidget->activeView()->ensureNodeVisible(current);
}
@@ -880,16 +880,16 @@ void View::slotFeedAdd()
if ( m_feedListView->selectedNode()->isGroup())
group = static_cast<Folder*>(m_feedListView->selectedNode());
else
group= m_feedListView->selectedNode()->parent();
group= m_feedListView->selectedNode()->tqparent();

}

TreeNode* lastChild = group->children().last();
TreeNode* lastChild = group->tqchildren().last();

addFeed(TQString::null, lastChild, group, false);
addFeed(TQString(), lastChild, group, false);
}

void View::addFeed(const TQString& url, TreeNode *after, Folder* parent, bool autoExec)
void View::addFeed(const TQString& url, TreeNode *after, Folder* tqparent, bool autoExec)
{

AddFeedDialog *afd = new AddFeedDialog( 0, "add_feed" );
@@ -923,10 +923,10 @@ void View::addFeed(const TQString& url, TreeNode *after, Folder* parent, bool au
return;
}

if (!parent)
parent = m_feedList->rootNode();
if (!tqparent)
tqparent = m_feedList->rootNode();

parent->insertChild(feed, after);
tqparent->insertChild(feed, after);

m_feedListView->ensureNodeVisible(feed);

@@ -947,7 +947,7 @@ void View::slotFeedAddGroup()
if (!node->isGroup())
{
after = node;
node = node->parent();
node = node->tqparent();
}

Folder* currentGroup = static_cast<Folder*> (node);
@@ -1077,7 +1077,7 @@ void View::slotFetchingStopped()
{
m_mainFrame->setState(Frame::Completed);
m_actionManager->action("feed_stop")->setEnabled(false);
m_mainFrame->seStatusText(TQString::null);
m_mainFrame->seStatusText(TQString());
}

void View::slotFeedFetched(Feed *feed)
@@ -1100,7 +1100,7 @@ void View::slotFeedFetched(Feed *feed)

void View::slotMouseButtonPressed(int button, const Article& article, const TQPoint &, int)
{
if (button == Qt::MidButton)
if (button == TQt::MidButton)
{
KURL link = article.link();
switch (Settings::mMBBehaviour())
@@ -1152,7 +1152,7 @@ void View::slotNewTag()

void View::slotTagCreated(const Tag& tag)
{
if (m_tagNodeList && !m_tagNodeList->tqcontainsTagId(tag.id()))
if (m_tagNodeList && !m_tagNodeList->containsTagId(tag.id()))
{
TagNode* tagNode = new TagNode(tag, m_feedList->rootNode());
m_tagNodeList->rootNode()->appendChild(tagNode);
@@ -1186,7 +1186,7 @@ void View::slotArticleSelected(const Article& article)
if (delay > 0)
m_markReadTimer->start( delay*1000, true );
else
a.seStatus(Article::Read);
a.setqStatus(Article::Read);
}
}

@@ -1266,18 +1266,18 @@ void View::slotCopyLinkAddress()
link = article.link().url();
else
link = article.guid();
QClipboard *cb = TQApplication::clipboard();
cb->setText(link, QClipboard::Clipboard);
cb->setText(link, QClipboard::Selection);
TQClipboard *cb = TQApplication::clipboard();
cb->setText(link, TQClipboard::Clipboard);
cb->setText(link, TQClipboard::Selection);
}
}

void View::slotFeedURLDropped(KURL::List &urls, TreeNode* after, Folder* parent)
void View::slotFeedURLDropped(KURL::List &urls, TreeNode* after, Folder* tqparent)
{
KURL::List::iterator it;
for ( it = urls.begin(); it != urls.end(); ++it )
{
addFeed((*it).prettyURL(), after, parent, false);
addFeed((*it).prettyURL(), after, tqparent, false);
}
}

@@ -1370,7 +1370,7 @@ void View::slotSetSelectedArticleRead()
return;

for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
(*it).seStatus(Article::Read);
(*it).setqStatus(Article::Read);
}

void View::slotTextToSpeechRequest()
@@ -1408,7 +1408,7 @@ void View::slotSetSelectedArticleUnread()
return;

for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
(*it).seStatus(Article::Unread);
(*it).setqStatus(Article::Unread);
}

void View::slotSetSelectedArticleNew()
@@ -1419,7 +1419,7 @@ void View::slotSetSelectedArticleNew()
return;

for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
(*it).seStatus(Article::New);
(*it).setqStatus(Article::New);
}

void View::slotSetCurrentArticleReadDelayed()
@@ -1429,7 +1429,7 @@ void View::slotSetCurrentArticleReadDelayed()
if (article.isNull())
return;

article.seStatus(Article::Read);
article.setqStatus(Article::Read);
}

void View::slotMouseOverInfo(const KFileItem *kifi)
@@ -1441,7 +1441,7 @@ void View::slotMouseOverInfo(const KFileItem *kifi)
}
else
{
m_mainFrame->seStatusText(TQString::null);
m_mainFrame->seStatusText(TQString());
}
}

@@ -1453,7 +1453,7 @@ void View::readProperties(KConfig* config)
m_searchBar->slotSetText(config->readEntry("searchLine"));
int statusfilter = config->readNumEntry("searchCombo", -1);
if (statusfilter != -1)
m_searchBar->slotSeStatus(statusfilter);
m_searchBar->slotSetqStatus(statusfilter);
}

int selectedID = config->readNumEntry("selectedNodeID", -1);

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

@@ -20,8 +20,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#ifndef _AKREGATORVIEW_H_
@@ -77,18 +77,19 @@ namespace Akregator {
/**
* This is the main widget of the view, containing tree view, article list, viewer etc.
*/
class View : public QWidget
class View : public TQWidget
{
Q_OBJECT
TQ_OBJECT
public:

/** constructor
@param part the Akregator::Part which tqcontains this widget
@param parent parent widget
@param part the Akregator::Part which contains this widget
@param tqparent tqparent widget
@param Actionmanager for this view
@param name the name of the widget (@ref TQWidget )
*/
View(Akregator::Part *part, TQWidget *parent, ActionManagerImpl* actionManager, const char* name);
View(Akregator::Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, const char* name);

/** destructor. Note that cleanups should be done in
slotOnShutdown(), so we don't risk accessing self-deleting objects after deletion. */
@@ -103,11 +104,11 @@ namespace Akregator {
@param doc the DOM tree (OPML) of the feeds to import */
bool importFeeds(const TQDomDocument& doc);

/** Parse OPML presentation of feeds and read in articles archive, if present. If @c parent is @c NULL, the current
feed list is tqreplaced by the parsed one
/** Parse OPML presentation of feeds and read in articles archive, if present. If @c tqparent is @c NULL, the current
feed list is replaced by the parsed one
@param doc TQDomDocument generated from OPML
@param parent The parent group the new nodes */
bool loadFeeds(const TQDomDocument& doc, Folder* parent = 0);
@param tqparent The tqparent group the new nodes */
bool loadFeeds(const TQDomDocument& doc, Folder* tqparent = 0);

/**
@return the displayed Feed List in OPML format
@@ -189,7 +190,7 @@ namespace Akregator {
void slotCaptionChanged(const TQString &);

/** called when URLs are dropped into the tree view */
void slotFeedURLDropped (KURL::List &urls, TreeNode* after, Folder *parent);
void slotFeedURLDropped (KURL::List &urls, TreeNode* after, Folder *tqparent);

/** displays a URL in the status bar when the user moves the mouse over a link */
void slotMouseOverInfo(const KFileItem *kifi);
@@ -271,7 +272,7 @@ namespace Akregator {

protected:

void addFeed(const TQString& url, TreeNode* after, Folder* parent, bool autoExec = true);
void addFeed(const TQString& url, TreeNode* after, Folder* tqparent, bool autoExec = true);

void connectToFeedList(FeedList* feedList);
void disconnectFromFeedList(FeedList* feedList);

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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#include "article.h"
@@ -55,7 +55,7 @@ struct Article::Private : public Shared
0001 0000 Keep
*/

enum Status {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};
enum tqStatus {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};

TQString guid;
Backend::FeedStorage* archive;
@@ -109,7 +109,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
if (article.meta("deleted") == "true")
{ // if article is in deleted state, we just add the status and omit the rest
d->status = Private::Read | Private::Deleted;
d->archive->seStatus(d->guid, d->status);
d->archive->setqStatus(d->guid, d->status);
}
else
{ // article is not deleted, let's add it to the archive
@@ -157,7 +157,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
int statusInt = status.toInt();
if (statusInt == New)
statusInt = Unread;
seStatus(statusInt);
setqStatus(statusInt);
}
setKeep(article.meta("keep") == "true");
}
@@ -210,9 +210,9 @@ void Article::setDeleted()
if (isDeleted())
return;
seStatus(Read);
setqStatus(Read);
d->status = Private::Deleted | Private::Read;
d->archive->seStatus(d->guid, d->status);
d->archive->setqStatus(d->guid, d->status);
d->archive->setDeleted(d->guid);

if (d->feed)
@@ -299,13 +299,13 @@ int Article::status() const
return Unread;
}

void Article::seStatus(int stat)
void Article::setqStatus(int stat)
{
// use status() rather than statusBits() here to filter out status flags that we are not
// interested in
int oldStatus = status();
int oldtqStatus = status();

if (oldStatus != stat)
if (oldtqStatus != stat)
{
switch (stat)
{
@@ -319,9 +319,9 @@ void Article::seStatus(int stat)
d->status = ( d->status | Private::New) & ~Private::Read;
break;
}
d->archive->seStatus(d->guid, d->status);
d->archive->setqStatus(d->guid, d->status);
if (d->feed)
d->feed->setArticleChanged(*this, oldStatus);
d->feed->setArticleChanged(*this, oldtqStatus);
}
}

@@ -404,7 +404,7 @@ RSS::Enclosure Article::enclosure() const
void Article::setKeep(bool keep)
{
d->status = keep ? ( statusBits() | Private::Keep) : ( statusBits() & ~Private::Keep);
d->archive->seStatus(d->guid, d->status);
d->archive->setqStatus(d->guid, d->status);
if (d->feed)
d->feed->setArticleChanged(*this);
}
@@ -453,11 +453,11 @@ TQString Article::buildTitle(const TQString& description)
if (description.stripWhiteSpace().isEmpty())
return "";
int i = s.find('>',500); /*avoid processing too much */
int i = s.tqfind('>',500); /*avoid processing too much */
if (i != -1)
s = s.left(i+1);
TQRegExp rx("(<([^\\s>]*)(?:[^>]*)>)[^<]*", false);
TQString tagName, toReplace, tqreplaceWith;
TQString tagName, toReplace, replaceWith;
while (rx.search(s) != -1 )
{
tagName=rx.cap(2);
@@ -466,11 +466,11 @@ TQString Article::buildTitle(const TQString& description)
else if (tagName.startsWith("br") || tagName.startsWith("BR"))
{
toReplace=rx.cap(1);
tqreplaceWith=" ";
replaceWith=" ";
}
else
toReplace=rx.cap(1); // strip just tag
s=s.tqreplace(s.find(toReplace),toReplace.length(),tqreplaceWith); // do the deed
s=s.tqreplace(s.tqfind(toReplace),toReplace.length(),replaceWith); // do the deed
}
if (s.length()> 90)
s=s.left(90)+"...";

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

@@ -19,8 +19,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#ifndef AKREGATOR_ARTICLE_H
@@ -57,7 +57,7 @@ namespace Akregator
class Article
{
public:
enum Status { Unread=0, Read, New };
enum tqStatus { Unread=0, Read, New };
typedef TQValueList<Article> List;

Article();
@@ -80,7 +80,7 @@ namespace Akregator
bool isNull() const;
int status() const;
void seStatus(int s);
void setqStatus(int s);

void offsetPubDate(int secs);


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

@@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
@@ -50,8 +50,8 @@ TQString Criterion::subjectToString(Subject subj)
return TQString::tqfromLatin1("Author");
case Description:
return TQString::tqfromLatin1("Description");
case Status:
return TQString::tqfromLatin1("Status");
case tqStatus:
return TQString::tqfromLatin1("tqStatus");
case KeepFlag:
return TQString::tqfromLatin1("KeepFlag");
default: // should never happen (TM)
@@ -69,8 +69,8 @@ Criterion::Subject Criterion::stringToSubject(const TQString& subjStr)
return Description;
else if (subjStr == TQString::tqfromLatin1("Author"))
return Author;
else if (subjStr == TQString::tqfromLatin1("Status"))
return Status;
else if (subjStr == TQString::tqfromLatin1("tqStatus"))
return tqStatus;
else if (subjStr == TQString::tqfromLatin1("KeepFlag"))
return KeepFlag;

@@ -163,7 +163,7 @@ bool Criterion::satisfiedBy( const Article &article ) const
// ### Maybe use prettyURL here?
concreteSubject = TQVariant(article.link().url());
break;
case Status:
case tqStatus:
concreteSubject = TQVariant(article.status());
break;
case KeepFlag:
@@ -179,7 +179,7 @@ bool Criterion::satisfiedBy( const Article &article ) const

switch ( predicateType ) {
case Contains:
satisfied = concreteSubject.toString().find( m_object.toString(), 0, false ) != -1;
satisfied = concreteSubject.toString().tqfind( m_object.toString(), 0, false ) != -1;
break;
case Equals:
if (subjectType=="int")
@@ -449,7 +449,7 @@ SeStatusAction::SeStatusAction(int status) : m_status(status)
void SeStatusAction::exec(Article& article)
{
if (!article.isNull())
article.seStatus(m_status);
article.setqStatus(m_status);
}

int SeStatusAction::status() const
@@ -457,7 +457,7 @@ int SeStatusAction::status() const
return m_status;
}

void SeStatusAction::seStatus(int status)
void SeStatusAction::setqStatus(int status)
{
m_status = status;
}

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

@@ -18,7 +18,7 @@
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
@@ -174,7 +174,7 @@ class SeStatusAction : public AbstractAction
virtual void exec(Article& article);
int status() const;
void seStatus(int status);
void setqStatus(int status);

virtual void writeConfig(KConfig* config) const;
virtual void readConfig(KConfig* config);
@@ -190,7 +190,7 @@ class AssignTagAction : public AbstractAction
{
public:

AssignTagAction(const TQString& tagID=TQString::null);
AssignTagAction(const TQString& tagID=TQString());
virtual void exec(Article& article);
const TQString& tagID() const;
@@ -259,7 +259,7 @@ class Criterion
public:

enum Subject {
Title, Description, Author, Link, Status, KeepFlag
Title, Description, Author, Link, tqStatus, KeepFlag
};

static TQString subjectToString(Subject subj);

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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#include "akregatorconfig.h"
@@ -60,17 +60,17 @@ class ArticleListView::ArticleListViewPrivate
{
public:

ArticleListViewPrivate(ArticleListView* parent) : m_parent(parent) { }
ArticleListViewPrivate(ArticleListView* tqparent) : m_tqparent(tqparent) { }

void ensureCurrentItemVisible()
{
if (m_parent->currentItem())
if (m_tqparent->currentItem())
{
m_parent->center( m_parent->contentsX(), m_parent->itemPos(m_parent->currentItem()), 0, 9.0 );
m_tqparent->center( m_tqparent->contentsX(), m_tqparent->itemPos(m_tqparent->currentItem()), 0, 9.0 );
}
}

ArticleListView* m_parent;
ArticleListView* m_tqparent;

/** maps article to article item */
TQMap<Article, ArticleItem*> articleMap;
@@ -131,7 +131,7 @@ class ArticleListView::ArticleItem : public KListViewItem
friend class ArticleListView;

public:
ArticleItem( TQListView *parent, const Article& a);
ArticleItem( TQListView *tqparent, const Article& a);
~ArticleItem();

Article& article();
@@ -155,8 +155,8 @@ class ArticleListView::ArticleItem : public KListViewItem
};

// FIXME: Remove resolveEntities for KDE 4.0, it's now done in the parser
ArticleListView::ArticleItem::ArticleItem( TQListView *parent, const Article& a)
: KListViewItem( parent, KCharsets::resolveEntities(a.title()), a.feed()->title(), KGlobal::locale()->formatDateTime(a.pubDate(), true, false) ), m_article(a), m_pubDate(a.pubDate().toTime_t())
ArticleListView::ArticleItem::ArticleItem( TQListView *tqparent, const Article& a)
: KListViewItem( tqparent, KCharsets::resolveEntities(a.title()), a.feed()->title(), KGlobal::locale()->formatDateTime(a.pubDate(), true, false) ), m_article(a), m_pubDate(a.pubDate().toTime_t())
{
if (a.keep())
setPixmap(0, keepFlag());
@@ -182,9 +182,9 @@ void ArticleListView::ArticleItem::paintCell ( TQPainter * p, const TQColorGroup
TQColorGroup cg2(cg);
if (article().status() == Article::Unread)
cg2.setColor(TQColorGroup::Text, Qt::blue);
cg2.setColor(TQColorGroup::Text, TQt::blue);
else // New
cg2.setColor(TQColorGroup::Text, Qt::red);
cg2.setColor(TQColorGroup::Text, TQt::red);
KListViewItem::paintCell( p, cg2, column, width, align );
}
@@ -213,8 +213,8 @@ int ArticleListView::ArticleItem::compare(TQListViewItem *i, int col, bool ascen

/* ==================================================================================== */

ArticleListView::ArticleListView(TQWidget *parent, const char *name)
: KListView(parent, name)
ArticleListView::ArticleListView(TQWidget *tqparent, const char *name)
: KListView(tqparent, name)
{
d = new ArticleListViewPrivate(this);
d->noneSelected = true;
@@ -577,7 +577,7 @@ void ArticleListView::viewportPaintEvent(TQPaintEvent *e)
if(!e)
return;
TQString message = TQString::null;
TQString message = TQString();
//kdDebug() << "visible articles: " << visibleArticles() << endl;

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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
#ifndef AKREGATORARTICLELISTVIEW_H
#define AKREGATORARTICLELISTVIEW_H
@@ -43,8 +43,9 @@ namespace Akregator
class ArticleListView : public KListView
{
Q_OBJECT
TQ_OBJECT
public:
ArticleListView(TQWidget *parent = 0, const char *name = 0);
ArticleListView(TQWidget *tqparent = 0, const char *name = 0);
virtual ~ArticleListView();
/** returns the current article, or a null article if there is none */

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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#include <tqdatetime.h>
@@ -157,8 +157,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
ArticleViewer* m_view;
};

ArticleViewer::ArticleViewer(TQWidget *parent, const char *name)
: Viewer(parent, name), m_htmlFooter(), m_currentText(), m_node(0), m_viewMode(NormalView)
ArticleViewer::ArticleViewer(TQWidget *tqparent, const char *name)
: Viewer(tqparent, name), m_htmlFooter(), m_currentText(), m_node(0), m_viewMode(NormalView)
{
setJScriptEnabled(false);
setJavaEnabled(false);
@@ -169,8 +169,8 @@ ArticleViewer::ArticleViewer(TQWidget *parent, const char *name)

generateNormalModeCSS();
generateCombinedModeCSS();
new KAction( i18n("&Scroll Up"), TQString::null, "Up", this, TQT_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" );
new KAction( i18n("&Scroll Down"), TQString::null, "Down", this, TQT_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" );
new KAction( i18n("&Scroll Up"), TQString(), "Up", this, TQT_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" );
new KAction( i18n("&Scroll Down"), TQString(), "Down", this, TQT_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" );
connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));


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

@@ -19,8 +19,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#ifndef ARTICLEVIEWER_H
@@ -48,9 +48,10 @@ namespace Akregator
class ArticleViewer : public Viewer
{
Q_OBJECT
TQ_OBJECT
public:
/** Constructor */
ArticleViewer(TQWidget* parent, const char* name);
ArticleViewer(TQWidget* tqparent, const char* name);
virtual ~ArticleViewer();
virtual bool openURL(const KURL &url);

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

@@ -11,7 +11,7 @@
<Action name="viewer_copy"/>
<Action name="selectAll"/>
<Separator/>
<Action name="find"/>
<Action name="tqfind"/>
<Action name="findNext"/>
</Menu>
<Menu noMerge="1" name="view">

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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#include <tqstringlist.h>
@@ -41,7 +41,7 @@
namespace Akregator
{

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)
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)
{
addPage(new SettingsGeneral(this, "General"), i18n("General"), "package_settings");
addPage(new SettingsArchive(this, "Archive"), i18n("Archive"), "package_settings");

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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#ifndef AKREGATOR_CONFIGDIALOG_H
@@ -35,9 +35,10 @@ class SettingsAppearance;
class ConfigDialog : public KConfigDialog
{
Q_OBJECT
TQ_OBJECT
public:
ConfigDialog(TQWidget *parent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
ConfigDialog(TQWidget *tqparent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
virtual ~ConfigDialog();


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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#include "dragobjects.h"

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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#ifndef AKREGATOR_DRAGOBJECTS_H

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

@@ -19,8 +19,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#include <tqtimer.h>
@@ -365,7 +365,7 @@ bool Feed::fetchErrorOccurred() { return d->fetchError; }
bool Feed::isArticlesLoaded() const { return d->articlesLoaded; }


TQDomElement Feed::toOPML( TQDomElement parent, TQDomDocument document ) const
TQDomElement Feed::toOPML( TQDomElement tqparent, TQDomDocument document ) const
{
TQDomElement el = document.createElement( "outline" );
el.setAttribute( "text", title() );
@@ -388,7 +388,7 @@ TQDomElement Feed::toOPML( TQDomElement parent, TQDomDocument document ) const
el.setAttribute( "maxArticleNumber", d->maxArticleNumber );
el.setAttribute( "type", "rss" ); // despite some additional fields, its still "rss" OPML
el.setAttribute( "version", "RSS" );
parent.appendChild( el );
tqparent.appendChild( el );
return el;
}

@@ -402,7 +402,7 @@ void Feed::slotMarkAllArticlesAsRead()
TQValueList<Article>::Iterator en = tarticles.end();

for (it = tarticles.begin(); it != en; ++it)
(*it).seStatus(Article::Read);
(*it).setqStatus(Article::Read);
setNotificationMode(true, true);
}
}
@@ -464,9 +464,9 @@ void Feed::appendArticles(const RSS::Document &doc)
d->addedArticlesNotify.append(mya);
if (!mya.isDeleted() && !markImmediatelyAsRead())
mya.seStatus(Article::New);
mya.setqStatus(Article::New);
else
mya.seStatus(Article::Read);
mya.setqStatus(Article::Read);
changed = true;
}
@@ -479,12 +479,12 @@ void Feed::appendArticles(const RSS::Document &doc)
{
mya.setKeep(old.keep());
int oldstatus = old.status();
old.seStatus(Article::Read);
old.setqStatus(Article::Read);

d->articles.remove(old.guid());
appendArticle(mya);

mya.seStatus(oldstatus);
mya.setqStatus(oldstatus);

d->updatedArticlesNotify.append(mya);
changed = true;
@@ -558,7 +558,7 @@ void Feed::fetch(bool followDiscovery)
{
if ((*it).status() == Article::New)
{
(*it).seStatus(Article::Unread);
(*it).setqStatus(Article::Unread);
}
}

@@ -579,7 +579,7 @@ void Feed::tryFetch()
{
d->fetchError = false;

d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, Status)) );
d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, tqStatus)) );
//connect(d->loader, TQT_SIGNAL(progress(unsigned long)), this, TQT_SLOT(slotSetProgress(unsigned long)));
d->loader->loadFrom( d->xmlUrl, new RSS::FileRetriever );
}
@@ -595,7 +595,7 @@ void Feed::slotImageFetched(const TQPixmap& image)
nodeModified();
}

void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status)
void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus status)
{
// Note that loader instances delete themselves
d->loader = 0;
@@ -735,14 +735,14 @@ void Feed::setArticleDeleted(Article& a)
articlesModified();
}

void Feed::setArticleChanged(Article& a, int oldStatus)
void Feed::setArticleChanged(Article& a, int oldtqStatus)
{
if (oldStatus != -1)
if (oldtqStatus != -1)
{
int newStatus = a.status();
if (oldStatus == Article::Read && newStatus != Article::Read)
int newtqStatus = a.status();
if (oldtqStatus == Article::Read && newtqStatus != Article::Read)
setUnread(unread()+1);
else if (oldStatus != Article::Read && newStatus == Article::Read)
else if (oldtqStatus != Article::Read && newtqStatus == Article::Read)
setUnread(unread()-1);
}
d->updatedArticlesNotify.append(a);
@@ -759,13 +759,13 @@ TreeNode* Feed::next()
if ( nextSibling() )
return nextSibling();

Folder* p = parent();
Folder* p = tqparent();
while (p)
{
if ( p->nextSibling() )
return p->nextSibling();
else
p = p->parent();
p = p->tqparent();
}
return 0;
}

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

@@ -19,8 +19,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#ifndef AKREGATORFEED_H
@@ -43,7 +43,7 @@ namespace KPIM {
// needed for slot fetchCompleted()
using RSS::Document;
using RSS::Loader;
using RSS::Status;
using RSS::tqStatus;

namespace Akregator
{
@@ -64,6 +64,7 @@ namespace Akregator
friend class Article;
Q_OBJECT
TQ_OBJECT
public:
/** the archiving modes:
- globalDefault: use default from Settings (default)
@@ -94,7 +95,7 @@ namespace Akregator
virtual bool accept(TreeNodeVisitor* visitor);

/** exports the feed settings to OPML */
virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const;
virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const;

/**
returns whether this feed uses its own fetch interval or the global setting
@@ -177,7 +178,7 @@ namespace Akregator
/** sets the description of this feed */
void setDescription(const TQString& s);

virtual TQValueList<Article> articles(const TQString& tag=TQString::null);
virtual TQValueList<Article> articles(const TQString& tag=TQString());

/** returns the article with the given @c guid, or a null article if it not exists */
virtual Article findArticle(const TQString& guid) const;
@@ -253,7 +254,7 @@ namespace Akregator
private slots:

void fetchCompleted(Loader *loader, Document doc, Status status);
void fetchCompleted(Loader *loader, Document doc, tqStatus status);
void slotImageFetched(const TQPixmap& image);

private:
@@ -264,10 +265,10 @@ namespace Akregator
void setArticleDeleted(Article& a);

/** notifies that article @c mya was changed
@param oldStatus if the status was changed, it tqcontains the old status, -1 otherwise
@param oldtqStatus if the status was changed, it contains the old status, -1 otherwise
To be called by @ref Article
*/
void setArticleChanged(Article& a, int oldStatus=-1);
void setArticleChanged(Article& a, int oldtqStatus=-1);
void enforceLimitArticleNumber();


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

@@ -19,8 +19,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#include "feed.h"
@@ -69,8 +69,8 @@ void FeedIconManager::fetchIcon(Feed* feed)
loadIcon(iconURL);
}

FeedIconManager::FeedIconManager(TQObject * parent, const char *name)
: TQObject(parent, name), DCOPObject("FeedIconManager"), d(new FeedIconManagerPrivate)
FeedIconManager::FeedIconManager(TQObject * tqparent, const char *name)
: TQObject(tqparent, name), DCOPObject("FeedIconManager"), d(new FeedIconManagerPrivate)
{
connectDCOPSignal("kded",
"favicons", "iconChanged(bool, TQString, TQString)",
@@ -119,14 +119,14 @@ TQString FeedIconManager::iconLocation(const KURL & url) const
kapp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data,
replyType, reply);

if (replyType == "TQString") {
if (replyType == TQSTRING_OBJECT_NAME_STRING) {
TQDataStream replyStream(reply, IO_ReadOnly);
TQString result;
replyStream >> result;
return result;
}

return TQString::null;
return TQString();
}

void FeedIconManager::slotFeedDestroyed(TreeNode* node)
@@ -134,7 +134,7 @@ void FeedIconManager::slotFeedDestroyed(TreeNode* node)
Feed* feed = dynamic_cast<Feed*>(node);
if (feed)
while (d->registeredFeeds.tqcontains(feed))
d->registeredFeeds.remove(d->registeredFeeds.find(feed));
d->registeredFeeds.remove(d->registeredFeeds.tqfind(feed));
}

void FeedIconManager::slotIconChanged(bool /*isHost*/, const TQString& hostOrURL,

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

@@ -19,8 +19,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#ifndef FEEDICONMGR_H
@@ -45,6 +45,7 @@ namespace Akregator
class FeedIconManager:public TQObject, public DCOPObject
{
Q_OBJECT
// TQ_OBJECT
K_DCOP
public:

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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/

#include "actionmanager.h"
@@ -34,23 +34,23 @@

namespace Akregator {

FeedItem::FeedItem(FolderItem* parent, Feed* node) : TreeNodeItem(parent, node)
FeedItem::FeedItem(FolderItem* tqparent, Feed* node) : TreeNodeItem(tqparent, node)
{
initialize(node);
}

FeedItem::FeedItem(KListView* parent, Feed* node) : TreeNodeItem(parent, node)
FeedItem::FeedItem(KListView* tqparent, Feed* node) : TreeNodeItem(tqparent, node)
{
initialize(node);
}

FeedItem::FeedItem(KListView* parent, TreeNodeItem* after, Feed* node) : TreeNodeItem(parent, after, node)
FeedItem::FeedItem(KListView* tqparent, TreeNodeItem* after, Feed* node) : TreeNodeItem(tqparent, after, node)
{
initialize(node);
}


FeedItem::FeedItem(FolderItem* parent, TreeNodeItem* after, Feed* node) : TreeNodeItem(parent, after, node)
FeedItem::FeedItem(FolderItem* tqparent, TreeNodeItem* after, Feed* node) : TreeNodeItem(tqparent, after, node)
{
initialize(node);
}

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

@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distributio