Browse Source

Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
tags/v3.5.13
tpearson 9 years ago
parent
commit
7be55ffa06
100 changed files with 2422 additions and 2422 deletions
  1. +1
    -1
      akregator/src/aboutdata.cpp
  2. +1
    -1
      akregator/src/actionmanager.cpp
  3. +3
    -3
      akregator/src/actionmanager.h
  4. +79
    -79
      akregator/src/actionmanagerimpl.cpp
  5. +3
    -3
      akregator/src/actionmanagerimpl.h
  6. +13
    -13
      akregator/src/addfeeddialog.cpp
  7. +5
    -5
      akregator/src/addfeeddialog.h
  8. +110
    -110
      akregator/src/akregator_part.cpp
  9. +14
    -14
      akregator/src/akregator_part.h
  10. +3
    -3
      akregator/src/akregator_partiface.h
  11. +3
    -3
      akregator/src/akregator_run.cpp
  12. +2
    -2
      akregator/src/akregator_run.h
  13. +145
    -145
      akregator/src/akregator_view.cpp
  14. +27
    -27
      akregator/src/akregator_view.h
  15. +29
    -29
      akregator/src/article.cpp
  16. +12
    -12
      akregator/src/article.h
  17. +101
    -101
      akregator/src/articlefilter.cpp
  18. +22
    -22
      akregator/src/articlefilter.h
  19. +3
    -3
      akregator/src/articleinterceptor.cpp
  20. +1
    -1
      akregator/src/articleinterceptor.h
  21. +80
    -80
      akregator/src/articlelistview.cpp
  22. +16
    -16
      akregator/src/articlelistview.h
  23. +111
    -111
      akregator/src/articleviewer.cpp
  24. +15
    -15
      akregator/src/articleviewer.h
  25. +4
    -4
      akregator/src/configdialog.cpp
  26. +1
    -1
      akregator/src/configdialog.h
  27. +19
    -19
      akregator/src/dragobjects.cpp
  28. +12
    -12
      akregator/src/dragobjects.h
  29. +81
    -81
      akregator/src/feed.cpp
  30. +17
    -17
      akregator/src/feed.h
  31. +28
    -28
      akregator/src/feediconmanager.cpp
  32. +8
    -8
      akregator/src/feediconmanager.h
  33. +7
    -7
      akregator/src/feeditem.cpp
  34. +3
    -3
      akregator/src/feeditem.h
  35. +31
    -31
      akregator/src/feedlist.cpp
  36. +6
    -6
      akregator/src/feedlist.h
  37. +79
    -79
      akregator/src/feedlistview.cpp
  38. +14
    -14
      akregator/src/feedlistview.h
  39. +43
    -43
      akregator/src/feedstorage.h
  40. +73
    -73
      akregator/src/feedstoragedummyimpl.cpp
  41. +45
    -45
      akregator/src/feedstoragedummyimpl.h
  42. +14
    -14
      akregator/src/fetchqueue.cpp
  43. +2
    -2
      akregator/src/fetchqueue.h
  44. +49
    -49
      akregator/src/folder.cpp
  45. +6
    -6
      akregator/src/folder.h
  46. +4
    -4
      akregator/src/folderitem.cpp
  47. +2
    -2
      akregator/src/folderitem.h
  48. +27
    -27
      akregator/src/frame.cpp
  49. +19
    -19
      akregator/src/frame.h
  50. +8
    -8
      akregator/src/kcursorsaver.h
  51. +47
    -47
      akregator/src/librss/article.cpp
  52. +17
    -17
      akregator/src/librss/article.h
  53. +12
    -12
      akregator/src/librss/category.cpp
  54. +4
    -4
      akregator/src/librss/category.h
  55. +188
    -188
      akregator/src/librss/document.cpp
  56. +15
    -15
      akregator/src/librss/document.h
  57. +20
    -20
      akregator/src/librss/enclosure.cpp
  58. +5
    -5
      akregator/src/librss/enclosure.h
  59. +27
    -27
      akregator/src/librss/feeddetector.cpp
  60. +11
    -11
      akregator/src/librss/feeddetector.h
  61. +2
    -2
      akregator/src/librss/global.h
  62. +24
    -24
      akregator/src/librss/image.cpp
  63. +11
    -11
      akregator/src/librss/image.h
  64. +49
    -49
      akregator/src/librss/loader.cpp
  65. +12
    -12
      akregator/src/librss/loader.h
  66. +3
    -3
      akregator/src/librss/testlibrss.cpp
  67. +2
    -2
      akregator/src/librss/testlibrss.h
  68. +13
    -13
      akregator/src/librss/textinput.cpp
  69. +8
    -8
      akregator/src/librss/textinput.h
  70. +58
    -58
      akregator/src/librss/tools_p.cpp
  71. +5
    -5
      akregator/src/librss/tools_p.h
  72. +23
    -23
      akregator/src/listtabwidget.cpp
  73. +3
    -3
      akregator/src/listtabwidget.h
  74. +4
    -4
      akregator/src/main.cpp
  75. +21
    -21
      akregator/src/mainwindow.cpp
  76. +2
    -2
      akregator/src/mainwindow.h
  77. +84
    -84
      akregator/src/mk4storage/feedstoragemk4impl.cpp
  78. +39
    -39
      akregator/src/mk4storage/feedstoragemk4impl.h
  79. +4
    -4
      akregator/src/mk4storage/mk4confwidget.cpp
  80. +7
    -7
      akregator/src/mk4storage/storagefactorymk4impl.cpp
  81. +3
    -3
      akregator/src/mk4storage/storagefactorymk4impl.h
  82. +46
    -46
      akregator/src/mk4storage/storagemk4impl.cpp
  83. +17
    -17
      akregator/src/mk4storage/storagemk4impl.h
  84. +22
    -22
      akregator/src/nodelist.cpp
  85. +10
    -10
      akregator/src/nodelist.h
  86. +14
    -14
      akregator/src/notificationmanager.cpp
  87. +6
    -6
      akregator/src/notificationmanager.h
  88. +58
    -58
      akregator/src/pageviewer.cpp
  89. +7
    -7
      akregator/src/pageviewer.h
  90. +3
    -3
      akregator/src/plugin.cpp
  91. +7
    -7
      akregator/src/plugin.h
  92. +9
    -9
      akregator/src/pluginmanager.cpp
  93. +5
    -5
      akregator/src/pluginmanager.h
  94. +18
    -18
      akregator/src/progressmanager.cpp
  95. +11
    -11
      akregator/src/propertiesdialog.cpp
  96. +7
    -7
      akregator/src/propertiesdialog.h
  97. +35
    -35
      akregator/src/searchbar.cpp
  98. +5
    -5
      akregator/src/searchbar.h
  99. +12
    -12
      akregator/src/settings_advanced.cpp
  100. +6
    -6
      akregator/src/settings_advanced.h

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

@@ -22,7 +22,7 @@
without including the source code for Qt in the source distribution.
*/

#include <qstring.h>
#include <tqstring.h>

#include "aboutdata.h"


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

@@ -43,7 +43,7 @@ void ActionManager::setInstance(ActionManager* manager)
}


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

ActionManager::~ActionManager()

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

@@ -25,7 +25,7 @@
#ifndef AKREGATOR_ACTIONMANAGER_H
#define AKREGATOR_ACTIONMANAGER_H

#include <qobject.h>
#include <tqobject.h>

class QWidget;

@@ -43,11 +43,11 @@ class ActionManager : public QObject
static ActionManager* getInstance();
static void setInstance(ActionManager* manager);

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

virtual KAction* action(const char* name, const char* classname=0) = 0;
virtual QWidget* container(const char* name) = 0;
virtual TQWidget* container(const char* name) = 0;
private:


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

@@ -22,7 +22,7 @@
without including the source code for Qt in the source distribution.
*/

#include <qwidget.h>
#include <tqwidget.h>
#include <kaction.h>
#include <kactioncollection.h>
#include <klocale.h>
@@ -30,9 +30,9 @@
#include <kshortcut.h>
#include <kxmlguifactory.h>

#include <qmap.h>
#include <qstring.h>
#include <qvaluelist.h>
#include <tqmap.h>
#include <tqstring.h>
#include <tqvaluelist.h>

#include "actionmanagerimpl.h"
#include "akregatorconfig.h"
@@ -134,19 +134,19 @@ public:
KActionMenu* tagMenu;
KActionCollection* actionCollection;
TagSet* tagSet;
QMap<QString, TagAction*> tagActions;
TQMap<TQString, TagAction*> tagActions;
TabWidget* tabWidget;
KAction* speakSelectedArticlesAction;
};

void ActionManagerImpl::slotUpdateTagActions(bool enabled, const QStringList& tagIds)
void ActionManagerImpl::slotUpdateTagActions(bool enabled, const TQStringList& tagIds)
{
if (Settings::showTaggingGUI() && d->tagMenu)
{
d->tagMenu->setEnabled(enabled);
QValueList<TagAction*> actions = d->tagActions.values();
TQValueList<TagAction*> actions = d->tagActions.values();

for (QValueList<TagAction*>::ConstIterator it = actions.begin(); it != actions.end(); ++it)
for (TQValueList<TagAction*>::ConstIterator it = actions.begin(); it != actions.end(); ++it)
{
(*it)->setChecked(tagIds.contains((*it)->tag().id()));
}
@@ -160,20 +160,20 @@ void ActionManagerImpl::setTagSet(TagSet* tagSet)

if (d->tagSet != 0)
{
disconnect(d->tagSet, SIGNAL(signalTagAdded(const Tag&)), this, SLOT(slotTagAdded(const Tag&)));
disconnect(d->tagSet, SIGNAL(signalTagRemoved(const Tag&)), this, SLOT(slotTagRemoved(const Tag&)));
disconnect(d->tagSet, TQT_SIGNAL(signalTagAdded(const Tag&)), this, TQT_SLOT(slotTagAdded(const Tag&)));
disconnect(d->tagSet, TQT_SIGNAL(signalTagRemoved(const Tag&)), this, TQT_SLOT(slotTagRemoved(const Tag&)));
}

d->tagSet = tagSet;

if (tagSet != 0)
{
connect(d->tagSet, SIGNAL(signalTagAdded(const Tag&)), this, SLOT(slotTagAdded(const Tag&)));
connect(d->tagSet, SIGNAL(signalTagRemoved(const Tag&)), this, SLOT(slotTagRemoved(const Tag&)));
connect(d->tagSet, TQT_SIGNAL(signalTagAdded(const Tag&)), this, TQT_SLOT(slotTagAdded(const Tag&)));
connect(d->tagSet, TQT_SIGNAL(signalTagRemoved(const Tag&)), this, TQT_SLOT(slotTagRemoved(const Tag&)));
}

QValueList<TagAction*> actions = d->tagActions.values();
for (QValueList<TagAction*>::ConstIterator it = actions.begin(); it != actions.end(); ++it)
TQValueList<TagAction*> actions = d->tagActions.values();
for (TQValueList<TagAction*>::ConstIterator it = actions.begin(); it != actions.end(); ++it)
{
d->tagMenu->remove(*it);
delete *it;
@@ -186,8 +186,8 @@ void ActionManagerImpl::setTagSet(TagSet* tagSet)

if (tagSet != 0L)
{
QValueList<Tag> list = tagSet->toMap().values();
for (QValueList<Tag>::ConstIterator it = list.begin(); it != list.end(); ++it)
TQValueList<Tag> list = tagSet->toMap().values();
for (TQValueList<Tag>::ConstIterator it = list.begin(); it != list.end(); ++it)
slotTagAdded(*it);
}
}
@@ -199,7 +199,7 @@ void ActionManagerImpl::slotTagAdded(const Tag& tag)

if (!d->tagActions.contains(tag.id()))
{
d->tagActions[tag.id()] = new TagAction(tag, d->view, SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu);
d->tagActions[tag.id()] = new TagAction(tag, d->view, TQT_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu);
d->tagMenu->insert(d->tagActions[tag.id()]);
}
}
@@ -209,7 +209,7 @@ void ActionManagerImpl::slotTagRemoved(const Tag& tag)
if (!Settings::showTaggingGUI())
return;

QString id = tag.id();
TQString id = tag.id();
TagAction* action = d->tagActions[id];
d->tagMenu->remove(action);
d->tagActions.remove(id);
@@ -222,7 +222,7 @@ void ActionManagerImpl::slotNodeSelected(TreeNode* node)
d->nodeSelectVisitor->visit(node);
}

ActionManagerImpl::ActionManagerImpl(Part* part, QObject* parent, const char* name) : ActionManager(parent, name), d(new ActionManagerImplPrivate)
ActionManagerImpl::ActionManagerImpl(Part* part, TQObject* parent, const char* name) : ActionManager(parent, name), d(new ActionManagerImplPrivate)
{
d->nodeSelectVisitor = new NodeSelectVisitor(this);
d->part = part;
@@ -262,15 +262,15 @@ void ActionManagerImpl::initTrayIcon(TrayIcon* trayIcon)

void ActionManagerImpl::initPart()
{
new KAction(i18n("&Import Feeds..."), "", "", d->part, SLOT(fileImport()), d->actionCollection, "file_import");
new KAction(i18n("&Export Feeds..."), "", "", d->part, SLOT(fileExport()), d->actionCollection, "file_export");
//new KAction(i18n("&Get Feeds From Web..."), "", "", d->part, SLOT(fileGetFeeds()), d->actionCollection, "file_getfromweb");
new KAction(i18n("&Import Feeds..."), "", "", d->part, TQT_SLOT(fileImport()), d->actionCollection, "file_import");
new KAction(i18n("&Export Feeds..."), "", "", d->part, TQT_SLOT(fileExport()), d->actionCollection, "file_export");
//new KAction(i18n("&Get Feeds From Web..."), "", "", d->part, TQT_SLOT(fileGetFeeds()), d->actionCollection, "file_getfromweb");

new KAction(i18n("Send &Link Address..."), "mail_generic", "", d->part, SLOT(fileSendLink()), d->actionCollection, "file_sendlink");
new KAction(i18n("Send &File..."), "mail_generic", "", d->part, SLOT(fileSendFile()), d->actionCollection, "file_sendfile");
new KAction(i18n("Send &Link Address..."), "mail_generic", "", d->part, TQT_SLOT(fileSendLink()), d->actionCollection, "file_sendlink");
new KAction(i18n("Send &File..."), "mail_generic", "", d->part, TQT_SLOT(fileSendFile()), d->actionCollection, "file_sendfile");

KStdAction::configureNotifications(d->part, SLOT(showKNotifyOptions()), d->actionCollection); // options_configure_notifications
new KAction( i18n("Configure &Akregator..."), "configure", "", d->part, SLOT(showOptions()), d->actionCollection, "akregator_configure_akregator" );
KStdAction::configureNotifications(d->part, TQT_SLOT(showKNotifyOptions()), d->actionCollection); // options_configure_notifications
new KAction( i18n("Configure &Akregator..."), "configure", "", d->part, TQT_SLOT(showOptions()), d->actionCollection, "akregator_configure_akregator" );
}

void ActionManagerImpl::initView(View* view)
@@ -281,51 +281,51 @@ void ActionManagerImpl::initView(View* view)
d->view = view;

// tag actions
new KAction(i18n("&New Tag..."), "", "", d->view, SLOT(slotNewTag()), actionCollection(), "tag_new");
new KAction(i18n("&New Tag..."), "", "", d->view, TQT_SLOT(slotNewTag()), actionCollection(), "tag_new");

// Feed/Feed Group popup menu
new KAction(i18n("&Open Homepage"), "", "Ctrl+H", d->view, SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage");
new KAction(i18n("&Add Feed..."), "bookmark_add", "Insert", d->view, SLOT(slotFeedAdd()), actionCollection(), "feed_add");
new KAction(i18n("Ne&w Folder..."), "folder_new", "Shift+Insert", d->view, SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group");
new KAction(i18n("&Delete Feed"), "editdelete", "Alt+Delete", d->view, SLOT(slotFeedRemove()), actionCollection(), "feed_remove");
new KAction(i18n("&Edit Feed..."), "edit", "F2", d->view, SLOT(slotFeedModify()), actionCollection(), "feed_modify");
new KAction(i18n("&Open Homepage"), "", "Ctrl+H", d->view, TQT_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage");
new KAction(i18n("&Add Feed..."), "bookmark_add", "Insert", d->view, TQT_SLOT(slotFeedAdd()), actionCollection(), "feed_add");
new KAction(i18n("Ne&w Folder..."), "folder_new", "Shift+Insert", d->view, TQT_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group");
new KAction(i18n("&Delete Feed"), "editdelete", "Alt+Delete", d->view, TQT_SLOT(slotFeedRemove()), actionCollection(), "feed_remove");
new KAction(i18n("&Edit Feed..."), "edit", "F2", d->view, TQT_SLOT(slotFeedModify()), actionCollection(), "feed_modify");
KActionMenu* vm = new KActionMenu( i18n( "&View Mode" ), actionCollection(), "view_mode" );

KRadioAction *ra = new KRadioAction(i18n("&Normal View"), "view_top_bottom", "Ctrl+Shift+1", d->view, SLOT(slotNormalView()), actionCollection(), "normal_view");
KRadioAction *ra = new KRadioAction(i18n("&Normal View"), "view_top_bottom", "Ctrl+Shift+1", d->view, TQT_SLOT(slotNormalView()), actionCollection(), "normal_view");
ra->setExclusiveGroup( "ViewMode" );
vm->insert(ra);

ra = new KRadioAction(i18n("&Widescreen View"), "view_left_right", "Ctrl+Shift+2", d->view, SLOT(slotWidescreenView()), actionCollection(), "widescreen_view");
ra = new KRadioAction(i18n("&Widescreen View"), "view_left_right", "Ctrl+Shift+2", d->view, TQT_SLOT(slotWidescreenView()), actionCollection(), "widescreen_view");
ra->setExclusiveGroup( "ViewMode" );
vm->insert(ra);

ra = new KRadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", d->view, SLOT(slotCombinedView()), actionCollection(), "combined_view");
ra = new KRadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", d->view, TQT_SLOT(slotCombinedView()), actionCollection(), "combined_view");
ra->setExclusiveGroup( "ViewMode" );
vm->insert(ra);

// toolbar / feed menu
new KAction(i18n("&Fetch Feed"), "down", KStdAccel::shortcut(KStdAccel::Reload), d->view, SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch");
new KAction(i18n("Fe&tch All Feeds"), "bottom", "Ctrl+L", d->view, SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all");
new KAction(i18n("&Fetch Feed"), "down", KStdAccel::shortcut(KStdAccel::Reload), d->view, TQT_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch");
new KAction(i18n("Fe&tch All Feeds"), "bottom", "Ctrl+L", d->view, TQT_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all");

KAction* stopAction = new KAction(i18n( "&Abort Fetches" ), "stop", Key_Escape, Kernel::self()->fetchQueue(), SLOT(slotAbort()), actionCollection(), "feed_stop");
KAction* stopAction = new KAction(i18n( "&Abort Fetches" ), "stop", Key_Escape, Kernel::self()->fetchQueue(), TQT_SLOT(slotAbort()), actionCollection(), "feed_stop");
stopAction->setEnabled(false);

new KAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", d->view, SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read");
new KAction(i18n("Ma&rk All Feeds as Read"), "goto", "Ctrl+Shift+R", d->view, SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read");
new KAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", d->view, TQT_SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read");
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"), QString::null, 0, d->view, SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter");
KToggleAction* sqf = new KToggleAction(i18n("Show Quick Filter"), TQString::null, 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, SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" );
new KAction( i18n("Open in Background Tab"), QString::null, "tab_new", d->view, SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" );
new KAction( i18n("Open in External Browser"), "window_new", "Ctrl+Shift+Return", d->view, SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" );
new KAction( i18n("Copy Link Address"), QString::null, QString::null, d->view, SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" );
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 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("Pre&vious Unread Article"), "", Key_Minus, d->view, SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article");
new KAction(i18n("Ne&xt Unread Article"), "", Key_Plus, d->view, SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article");
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");

new KAction(i18n("&Delete"), "editdelete", "Delete", d->view, SLOT(slotArticleDelete()), actionCollection(), "article_delete");
new KAction(i18n("&Delete"), "editdelete", "Delete", d->view, TQT_SLOT(slotArticleDelete()), actionCollection(), "article_delete");

if (Settings::showTaggingGUI())
{
@@ -335,39 +335,39 @@ void ActionManagerImpl::initView(View* view)
KActionMenu* statusMenu = new KActionMenu ( i18n( "&Mark As" ),
actionCollection(), "article_set_status" );

d->speakSelectedArticlesAction = new KAction(i18n("&Speak Selected Articles"), "kttsd", "", d->view, SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech");
d->speakSelectedArticlesAction = new KAction(i18n("&Speak Selected Articles"), "kttsd", "", d->view, TQT_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech");

KAction* abortTTS = new KAction(i18n( "&Stop Speaking" ), "player_stop", Key_Escape, SpeechClient::self(), SLOT(slotAbortJobs()), actionCollection(), "akr_aborttexttospeech");
KAction* abortTTS = new KAction(i18n( "&Stop Speaking" ), "player_stop", Key_Escape, SpeechClient::self(), TQT_SLOT(slotAbortJobs()), actionCollection(), "akr_aborttexttospeech");
abortTTS->setEnabled(false);

connect(SpeechClient::self(), SIGNAL(signalActivated(bool)),
abortTTS, SLOT(setEnabled(bool)));
connect(SpeechClient::self(), TQT_SIGNAL(signalActivated(bool)),
abortTTS, TQT_SLOT(setEnabled(bool)));

statusMenu->insert(new KAction(KGuiItem(i18n("as in: mark as read","&Read"), "",
i18n("Mark selected article as read")),
"Ctrl+E", d->view, SLOT(slotSetSelectedArticleRead()),
"Ctrl+E", d->view, TQT_SLOT(slotSetSelectedArticleRead()),
actionCollection(), "article_set_status_read"));

statusMenu->insert(new KAction(KGuiItem(i18n("&New"), "",
i18n("Mark selected article as new")),
"Ctrl+N", d->view, SLOT(slotSetSelectedArticleNew()),
"Ctrl+N", d->view, TQT_SLOT(slotSetSelectedArticleNew()),
actionCollection(), "article_set_status_new" ));


statusMenu->insert(new KAction(KGuiItem(i18n("&Unread"), "",
i18n("Mark selected article as unread")),
"Ctrl+U", d->view, SLOT(slotSetSelectedArticleUnread()),
"Ctrl+U", d->view, TQT_SLOT(slotSetSelectedArticleUnread()),
actionCollection(), "article_set_status_unread"));

KToggleAction* importantAction = new KToggleAction(i18n("&Mark as Important"), "flag", "Ctrl+I", actionCollection(), "article_set_status_important");
importantAction->setCheckedState(i18n("Remove &Important Mark"));
connect(importantAction, SIGNAL(toggled(bool)), d->view, SLOT(slotArticleToggleKeepFlag(bool)));
connect(importantAction, TQT_SIGNAL(toggled(bool)), d->view, TQT_SLOT(slotArticleToggleKeepFlag(bool)));


new KAction( i18n("Move Node Up"), QString::null, "Shift+Alt+Up", view, SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" );
new KAction( i18n("Move Node Down"), QString::null, "Shift+Alt+Down", view, SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" );
new KAction( i18n("Move Node Left"), QString::null, "Shift+Alt+Left", view, SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" );
new KAction( i18n("Move Node Right"), QString::null, "Shift+Alt+Right", view, SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right");
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");
}

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

new KAction( i18n("&Previous Article"), QString::null, "Left", articleList, SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" );
new KAction( i18n("&Next Article"), QString::null, "Right", articleList, SLOT(slotNextArticle()), actionCollection(), "go_next_article" );
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" );
}

void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
@@ -396,17 +396,17 @@ void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
else
d->listTabWidget = listTabWidget;

new KAction(i18n("&Previous Feed"), "", "P", listTabWidget, SLOT(slotPrevFeed()),actionCollection(), "go_prev_feed");
new KAction(i18n("&Next Feed"), "", "N", listTabWidget, SLOT(slotNextFeed()),actionCollection(), "go_next_feed");
new KAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", listTabWidget, SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed");
new KAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", listTabWidget, SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed");
new KAction( i18n("Go to Top of Tree"), QString::null, "Ctrl+Home", listTabWidget, SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" );
new KAction( i18n("Go to Bottom of Tree"), QString::null, "Ctrl+End", listTabWidget, SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" );
new KAction( i18n("Go Left in Tree"), QString::null, "Ctrl+Left", listTabWidget, SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" );
new KAction( i18n("Go Right in Tree"), QString::null, "Ctrl+Right", listTabWidget, SLOT(slotItemRight()), d->actionCollection, "feedstree_right" );
new KAction( i18n("Go Up in Tree"), QString::null, "Ctrl+Up", listTabWidget, SLOT(slotItemUp()), d->actionCollection, "feedstree_up" );
new KAction( i18n("Go Down in Tree"), QString::null, "Ctrl+Down", listTabWidget, SLOT(slotItemDown()), d->actionCollection, "feedstree_down" );
new KAction(i18n("&Previous Feed"), "", "P", listTabWidget, TQT_SLOT(slotPrevFeed()),actionCollection(), "go_prev_feed");
new KAction(i18n("&Next Feed"), "", "N", listTabWidget, TQT_SLOT(slotNextFeed()),actionCollection(), "go_next_feed");
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" );
}

void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
@@ -416,14 +416,14 @@ void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
else
d->tabWidget = tabWidget;

new KAction(i18n("Select Next Tab"), "", "Ctrl+Period", d->tabWidget, SLOT(slotNextTab()),actionCollection(), "select_next_tab");
new KAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", d->tabWidget, SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab");
new KAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, d->tabWidget, SLOT(slotDetachTab()), actionCollection(), "tab_detach" );
new KAction( i18n("Copy Link Address"), QString::null, QString::null, d->tabWidget, SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" );
new KAction( i18n("&Close Tab"), "tab_remove", KStdAccel::close(), d->tabWidget, SLOT(slotCloseTab()), actionCollection(), "tab_remove" );
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("&Close Tab"), "tab_remove", KStdAccel::close(), d->tabWidget, TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" );
}

QWidget* ActionManagerImpl::container(const char* name)
TQWidget* ActionManagerImpl::container(const char* name)
{
return d->part->factory()->container(name, d->part);
}

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

@@ -52,11 +52,11 @@ class ActionManagerImpl : public ActionManager
Q_OBJECT

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

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

void initView(View* view);
void initTrayIcon(TrayIcon* trayIcon);
@@ -70,7 +70,7 @@ class ActionManagerImpl : public ActionManager

/** fills the remove tag menu with the given tags
enables/disables tag menu action according to @c enabled */
void slotUpdateTagActions(bool enabled, const QStringList& tagIds);
void slotUpdateTagActions(bool enabled, const TQStringList& tagIds);
void slotNodeSelected(TreeNode* node);

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

@@ -25,7 +25,7 @@
#include "feed.h"
#include "addfeeddialog.h"

#include <qcheckbox.h>
#include <tqcheckbox.h>

#include <kapplication.h>
#include <kurl.h>
@@ -39,21 +39,21 @@

namespace Akregator {

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

AddFeedWidget::~AddFeedWidget()
{}

AddFeedDialog::AddFeedDialog(QWidget *parent, const char *name)
AddFeedDialog::AddFeedDialog(TQWidget *parent, const char *name)
: KDialogBase(KDialogBase::Swallow, Qt::WStyle_DialogBorder, parent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel)
{
widget = new AddFeedWidget(this);
connect(widget->urlEdit, SIGNAL(textChanged(const QString&)), this, SLOT(textChanged(const QString&)));
connect(widget->urlEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged(const TQString&)));
enableButtonOK(false);
setMainWidget(widget);
}
@@ -61,7 +61,7 @@ AddFeedDialog::AddFeedDialog(QWidget *parent, const char *name)
AddFeedDialog::~AddFeedDialog()
{}

void AddFeedDialog::setURL(const QString& t)
void AddFeedDialog::setURL(const TQString& t)
{
widget->urlEdit->setText(t);
}
@@ -85,12 +85,12 @@ void AddFeedDialog::slotOk( )

widget->statusLabel->setText( i18n("Downloading %1").arg(feedURL) );

connect( feed, SIGNAL(fetched(Feed* )),
this, SLOT(fetchCompleted(Feed *)) );
connect( feed, SIGNAL(fetchError(Feed* )),
this, SLOT(fetchError(Feed *)) );
connect( feed, SIGNAL(fetchDiscovery(Feed* )),
this, SLOT(fetchDiscovery(Feed *)) );
connect( feed, TQT_SIGNAL(fetched(Feed* )),
this, TQT_SLOT(fetchCompleted(Feed *)) );
connect( feed, TQT_SIGNAL(fetchError(Feed* )),
this, TQT_SLOT(fetchError(Feed *)) );
connect( feed, TQT_SIGNAL(fetchDiscovery(Feed* )),
this, TQT_SLOT(fetchDiscovery(Feed *)) );

f->fetch(true);
}
@@ -112,7 +112,7 @@ void AddFeedDialog::fetchDiscovery(Feed *f)
feedURL=f->xmlUrl();
}

void AddFeedDialog::textChanged(const QString& text)
void AddFeedDialog::textChanged(const TQString& text)
{
enableButtonOK(!text.isEmpty());
}

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

@@ -42,7 +42,7 @@ namespace Akregator
{
Q_OBJECT
public:
AddFeedWidget(QWidget *parent = 0, const char *name = 0);
AddFeedWidget(TQWidget *parent = 0, const char *name = 0);
~AddFeedWidget();
};

@@ -50,10 +50,10 @@ namespace Akregator
{
Q_OBJECT
public:
AddFeedDialog(QWidget *parent = 0, const char *name = 0);
AddFeedDialog(TQWidget *parent = 0, const char *name = 0);
~AddFeedDialog();

void setURL(const QString& t);
void setURL(const TQString& t);
Feed *feed;

public slots:
@@ -63,11 +63,11 @@ namespace Akregator
void fetchError(Feed *);

private slots:
void textChanged(const QString&);
void textChanged(const TQString&);

private:
AddFeedWidget *widget;
QString feedURL;
TQString feedURL;
};
}


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

@@ -49,11 +49,11 @@
#include <kparts/genericfactory.h>
#include <kparts/partmanager.h>

#include <qfile.h>
#include <qobjectlist.h>
#include <qstringlist.h>
#include <qtimer.h>
#include <qwidgetlist.h>
#include <tqfile.h>
#include <tqobjectlist.h>
#include <tqstringlist.h>
#include <tqtimer.h>
#include <tqwidgetlist.h>
#include <private/qucomextra_p.h>

#include <cerrno>
@@ -116,8 +116,8 @@ class Part::ApplyFiltersInterceptor : public ArticleInterceptor
}
};

Part::Part( QWidget *parentWidget, const char * /*widgetName*/,
QObject *parent, const char *name, const QStringList& )
Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
TQObject *parent, const char *name, const TQStringList& )
: DCOPObject("AkregatorIface")
, MyBasePart(parent, name)
, m_standardListLoaded(false)
@@ -144,9 +144,9 @@ Part::Part( QWidget *parentWidget, const char * /*widgetName*/,
m_storage = 0;
Backend::StorageFactory* factory = Backend::StorageFactoryRegistry::self()->getFactory(Settings::archiveBackend());
QStringList storageParams;
TQStringList storageParams;
storageParams.append(QString("taggingEnabled=%1").arg(Settings::showTaggingGUI() ? "true" : "false"));
storageParams.append(TQString("taggingEnabled=%1").arg(Settings::showTaggingGUI() ? "true" : "false"));
if (factory != 0)
{
@@ -193,12 +193,12 @@ Part::Part( QWidget *parentWidget, const char * /*widgetName*/,

m_extension = new BrowserExtension(this, "ak_extension");

connect(m_view, SIGNAL(setWindowCaption(const QString&)), this, SIGNAL(setWindowCaption(const QString&)));
connect(m_view, SIGNAL(setStatusBarText(const QString&)), this, SIGNAL(setStatusBarText(const QString&)));
connect(m_view, SIGNAL(setProgress(int)), m_extension, SIGNAL(loadingProgress(int)));
connect(m_view, SIGNAL(signalCanceled(const QString&)), this, SIGNAL(canceled(const QString&)));
connect(m_view, SIGNAL(signalStarted(KIO::Job*)), this, SIGNAL(started(KIO::Job*)));
connect(m_view, SIGNAL(signalCompleted()), this, SIGNAL(completed()));
connect(m_view, TQT_SIGNAL(setWindowCaption(const TQString&)), this, TQT_SIGNAL(setWindowCaption(const TQString&)));
connect(m_view, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&)));
connect(m_view, TQT_SIGNAL(setProgress(int)), m_extension, TQT_SIGNAL(loadingProgress(int)));
connect(m_view, TQT_SIGNAL(signalCanceled(const TQString&)), this, TQT_SIGNAL(canceled(const TQString&)));
connect(m_view, TQT_SIGNAL(signalStarted(KIO::Job*)), this, TQT_SIGNAL(started(KIO::Job*)));
connect(m_view, TQT_SIGNAL(signalCompleted()), this, TQT_SIGNAL(completed()));

// notify the part that this is our internal widget
setWidget(m_view);
@@ -207,7 +207,7 @@ Part::Part( QWidget *parentWidget, const char * /*widgetName*/,
TrayIcon::setInstance(trayIcon);
m_actionManager->initTrayIcon(trayIcon);

connect(trayIcon, SIGNAL(showPart()), this, SIGNAL(showPart()));
connect(trayIcon, TQT_SIGNAL(showPart()), this, TQT_SIGNAL(showPart()));

if ( isTrayIconEnabled() )
{
@@ -217,22 +217,22 @@ Part::Part( QWidget *parentWidget, const char * /*widgetName*/,
else
NotificationManager::self()->setWidget(getMainWindow(), instance());

connect( trayIcon, SIGNAL(quitSelected()),
kapp, SLOT(quit())) ;
connect( trayIcon, TQT_SIGNAL(quitSelected()),
kapp, TQT_SLOT(quit())) ;

connect( m_view, SIGNAL(signalUnreadCountChanged(int)), trayIcon, SLOT(slotSetUnread(int)) );
connect( m_view, TQT_SIGNAL(signalUnreadCountChanged(int)), trayIcon, TQT_SLOT(slotSetUnread(int)) );

connect(kapp, SIGNAL(shutDown()), this, SLOT(slotOnShutdown()));
connect(kapp, TQT_SIGNAL(shutDown()), this, TQT_SLOT(slotOnShutdown()));

m_autosaveTimer = new QTimer(this);
connect(m_autosaveTimer, SIGNAL(timeout()), this, SLOT(slotSaveFeedList()));
m_autosaveTimer = new TQTimer(this);
connect(m_autosaveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSaveFeedList()));
m_autosaveTimer->start(5*60*1000); // 5 minutes

setXMLFile("akregator_part.rc", true);

initFonts();

RSS::FileRetriever::setUserAgent(QString("Akregator/%1; librss/remnants").arg(AKREGATOR_VERSION));
RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").arg(AKREGATOR_VERSION));
}

void Part::loadPlugins()
@@ -252,7 +252,7 @@ void Part::slotOnShutdown()
{
m_shuttingDown = true;
const QString lockLocation = locateLocal("data", "akregator/lock");
const TQString lockLocation = locateLocal("data", "akregator/lock");
KSimpleConfig config(lockLocation);
config.writeEntry("pid", -1);
config.sync();
@@ -276,7 +276,7 @@ void Part::slotSettingsChanged()

RSS::FileRetriever::setUseCache(Settings::useHTMLCache());

QStringList fonts;
TQStringList fonts;
fonts.append(Settings::standardFont());
fonts.append(Settings::fixedFont());
fonts.append(Settings::sansSerifFont());
@@ -338,56 +338,56 @@ void Part::openStandardFeedList()
m_standardListLoaded = true;
}

QDomDocument Part::createDefaultFeedList()
TQDomDocument Part::createDefaultFeedList()
{
QDomDocument doc;
QDomProcessingInstruction z = doc.createProcessingInstruction("xml","version=\"1.0\" encoding=\"UTF-8\"");
TQDomDocument doc;
TQDomProcessingInstruction z = doc.createProcessingInstruction("xml","version=\"1.0\" encoding=\"UTF-8\"");
doc.appendChild( z );

QDomElement root = doc.createElement( "opml" );
TQDomElement root = doc.createElement( "opml" );
root.setAttribute("version","1.0");
doc.appendChild( root );

QDomElement head = doc.createElement( "head" );
TQDomElement head = doc.createElement( "head" );
root.appendChild(head);

QDomElement text = doc.createElement( "text" );
TQDomElement text = doc.createElement( "text" );
text.appendChild(doc.createTextNode(i18n("Feeds")));
head.appendChild(text);

QDomElement body = doc.createElement( "body" );
TQDomElement body = doc.createElement( "body" );
root.appendChild(body);

QDomElement mainFolder = doc.createElement( "outline" );
TQDomElement mainFolder = doc.createElement( "outline" );
mainFolder.setAttribute("text","KDE");
body.appendChild(mainFolder);

QDomElement ak = doc.createElement( "outline" );
TQDomElement ak = doc.createElement( "outline" );
ak.setAttribute("text",i18n("Akregator News"));
ak.setAttribute("xmlUrl","http://akregator.sf.net/rss2.php");
mainFolder.appendChild(ak);

QDomElement akb = doc.createElement( "outline" );
TQDomElement akb = doc.createElement( "outline" );
akb.setAttribute("text",i18n("Akregator Blog"));
akb.setAttribute("xmlUrl","http://akregator.pwsp.net/blog/?feed=rss2");
mainFolder.appendChild(akb);

QDomElement dot = doc.createElement( "outline" );
TQDomElement dot = doc.createElement( "outline" );
dot.setAttribute("text",i18n("KDE Dot News"));
dot.setAttribute("xmlUrl","http://www.kde.org/dotkdeorg.rdf");
mainFolder.appendChild(dot);

QDomElement plan = doc.createElement( "outline" );
TQDomElement plan = doc.createElement( "outline" );
plan.setAttribute("text",i18n("Planet KDE"));
plan.setAttribute("xmlUrl","http://planetkde.org/rss20.xml");
mainFolder.appendChild(plan);

QDomElement apps = doc.createElement( "outline" );
TQDomElement apps = doc.createElement( "outline" );
apps.setAttribute("text",i18n("KDE Apps"));
apps.setAttribute("xmlUrl","http://www.kde.org/dot/kde-apps-content.rdf");
mainFolder.appendChild(apps);

QDomElement look = doc.createElement( "outline" );
TQDomElement look = doc.createElement( "outline" );
look.setAttribute("text",i18n("KDE Look"));
look.setAttribute("xmlUrl","http://www.kde.org/kde-look-content.rdf");
mainFolder.appendChild(look);
@@ -399,14 +399,14 @@ bool Part::openFile()
{
emit setStatusBarText(i18n("Opening Feed List...") );

QString str;
// m_file is always local so we can use QFile on it
QFile file(m_file);
TQString str;
// m_file is always local so we can use TQFile on it
TQFile file(m_file);

bool fileExists = file.exists();
QString listBackup = m_storage->restoreFeedList();
TQString listBackup = m_storage->restoreFeedList();
QDomDocument doc;
TQDomDocument doc;

if (!fileExists)
{
@@ -417,8 +417,8 @@ bool Part::openFile()
if (file.open(IO_ReadOnly))
{
// Read OPML feeds list and build QDom tree.
QTextStream stream(&file);
stream.setEncoding(QTextStream::UnicodeUTF8); // FIXME not all opmls are in utf8
TQTextStream stream(&file);
stream.setEncoding(TQTextStream::UnicodeUTF8); // FIXME not all opmls are in utf8
str = stream.read();
file.close();
}
@@ -428,7 +428,7 @@ bool Part::openFile()

if (file.size() > 0) // don't backup empty files
{
QString backup = m_file + "-backup." + QString::number(QDateTime::currentDateTime().toTime_t());
TQString backup = m_file + "-backup." + TQString::number(TQDateTime::currentDateTime().toTime_t());
copyFile(backup);
@@ -444,7 +444,7 @@ bool Part::openFile()
{
if (file.size() > 0) // don't backup empty files
{
QString backup = m_file + "-backup." + QString::number(QDateTime::currentDateTime().toTime_t());
TQString backup = m_file + "-backup." + TQString::number(TQDateTime::currentDateTime().toTime_t());
copyFile(backup);

KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("OPML Parsing Error") );
@@ -452,7 +452,7 @@ bool Part::openFile()
m_view->loadFeeds(createDefaultFeedList());
}

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

if( Settings::markAllFeedsReadOnStartup() )
@@ -473,16 +473,16 @@ void Part::slotSaveFeedList()
// the first time we overwrite the feed list, we create a backup
if (!m_backedUpList)
{
QString backup = m_file + "~";
TQString backup = m_file + "~";

if (copyFile(backup))
m_backedUpList = true;
}

QString xmlStr = m_view->feedListToOPML().toString();
TQString xmlStr = m_view->feedListToOPML().toString();
m_storage->storeFeedList(xmlStr);

QFile file(m_file);
TQFile file(m_file);
if (file.open(IO_WriteOnly) == false)
{
//FIXME: allow to save the feedlist into different location -tpr 20041118
@@ -490,9 +490,9 @@ void Part::slotSaveFeedList()
return;
}

// use QTextStream to dump the text to the file
QTextStream stream(&file);
stream.setEncoding(QTextStream::UnicodeUTF8);
// use TQTextStream to dump the text to the file
TQTextStream stream(&file);
stream.setEncoding(TQTextStream::UnicodeUTF8);

// Write OPML data file.
// Archive data files are saved elsewhere.
@@ -534,31 +534,31 @@ bool Part::mergePart(KParts::Part* part)
return true;
}

QWidget* Part::getMainWindow()
TQWidget* Part::getMainWindow()
{
// this is a dirty fix to get the main window used for the tray icon
QWidgetList *l = kapp->topLevelWidgets();
QWidgetListIt it( *l );
QWidget *wid;
TQWidgetList *l = kapp->topLevelWidgets();
TQWidgetListIt it( *l );
TQWidget *wid;

// check if there is an akregator main window
while ( (wid = it.current()) != 0 )
{
++it;
//kdDebug() << "win name: " << wid->name() << endl;
if (QString(wid->name()) == "akregator_mainwindow")
if (TQString(wid->name()) == "akregator_mainwindow")
{
delete l;
return wid;
}
}
// if not, check for kontact main window
QWidgetListIt it2( *l );
TQWidgetListIt it2( *l );
while ( (wid = it2.current()) != 0 )
{
++it2;
if (QString(wid->name()).startsWith("kontact-mainwindow"))
if (TQString(wid->name()).startsWith("kontact-mainwindow"))
{
delete l;
return wid;
@@ -568,11 +568,11 @@ QWidget* Part::getMainWindow()
return 0;
}

void Part::loadTagSet(const QString& path)
void Part::loadTagSet(const TQString& path)
{
QDomDocument doc;
TQDomDocument doc;

QFile file(path);
TQFile file(path);
if (file.open(IO_ReadOnly))
{
doc.setContent(file.readAll());
@@ -594,19 +594,19 @@ void Part::loadTagSet(const QString& path)
}
}

void Part::saveTagSet(const QString& path)
void Part::saveTagSet(const TQString& path)
{
QString xmlStr = Kernel::self()->tagSet()->toXML().toString();
TQString xmlStr = Kernel::self()->tagSet()->toXML().toString();

m_storage->storeTagSet(xmlStr);
QFile file(path);
TQFile file(path);
if ( file.open(IO_WriteOnly) )
{

QTextStream stream(&file);
stream.setEncoding(QTextStream::UnicodeUTF8);
TQTextStream stream(&file);
stream.setEncoding(TQTextStream::UnicodeUTF8);
stream << xmlStr << "\n";
file.close();
}
@@ -614,7 +614,7 @@ void Part::saveTagSet(const QString& path)

void Part::importFile(const KURL& url)
{
QString filename;
TQString filename;

bool isRemote = false;

@@ -631,11 +631,11 @@ void Part::importFile(const KURL& url)
}
}

QFile file(filename);
TQFile file(filename);
if (file.open(IO_ReadOnly))
{
// Read OPML feeds list and build QDom tree.
QDomDocument doc;
TQDomDocument doc;
if (doc.setContent(file.readAll()))
m_view->importFeeds(doc);
else
@@ -652,7 +652,7 @@ void Part::exportFile(const KURL& url)
{
if (url.isLocalFile())
{
QFile file(url.path());
TQFile file(url.path());

if ( file.exists() &&
KMessageBox::questionYesNo(m_view,
@@ -668,8 +668,8 @@ void Part::exportFile(const KURL& url)
return;
}

QTextStream stream(&file);
stream.setEncoding(QTextStream::UnicodeUTF8);
TQTextStream stream(&file);
stream.setEncoding(TQTextStream::UnicodeUTF8);

stream << m_view->feedListToOPML().toString() << "\n";
file.close();
@@ -679,8 +679,8 @@ void Part::exportFile(const KURL& url)
KTempFile tmpfile;
tmpfile.setAutoDelete(true);

QTextStream stream(tmpfile.file());
stream.setEncoding(QTextStream::UnicodeUTF8);
TQTextStream stream(tmpfile.file());
stream.setEncoding(TQTextStream::UnicodeUTF8);

stream << m_view->feedListToOPML().toString() << "\n";
tmpfile.close();
@@ -692,7 +692,7 @@ void Part::exportFile(const KURL& url)

void Part::fileImport()
{
KURL url = KFileDialog::getOpenURL( QString::null,
KURL url = KFileDialog::getOpenURL( TQString::null,
"*.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( QString::null,
KURL url= KFileDialog::getSaveURL( TQString::null,
"*.opml *.xml|" + i18n("OPML Outlines (*.opml, *.xml)")
+"\n*|" + i18n("All Files") );

@@ -720,7 +720,7 @@ void Part::fileGetFeeds()
void Part::fileSendArticle(bool attach)
{
// FIXME: you have to open article to tab to be able to send...
QString title, text;
TQString title, text;

text = m_view->currentFrame()->part()->url().prettyURL();
if(text.isEmpty() || text.isNull())
@@ -751,14 +751,14 @@ void Part::fetchAllFeeds()
m_view->slotFetchAllFeeds();
}

void Part::fetchFeedUrl(const QString&s)
void Part::fetchFeedUrl(const TQString&s)
{
kdDebug() << "fetchFeedURL==" << s << endl;
}

void Part::addFeedsToGroup(const QStringList& urls, const QString& group)
void Part::addFeedsToGroup(const TQStringList& urls, const TQString& group)
{
for (QStringList::ConstIterator it = urls.begin(); it != urls.end(); ++it)
for (TQStringList::ConstIterator it = urls.begin(); it != urls.end(); ++it)
{
kdDebug() << "Akregator::Part::addFeedToGroup adding feed with URL " << *it << " to group " << group << endl;
m_view->addFeedToGroup(*it, group);
@@ -790,10 +790,10 @@ void Part::showOptions()

KConfigDialog* dialog = new ConfigDialog( m_view, "settings", Settings::self() );

connect( dialog, SIGNAL(settingsChanged()),
this, SLOT(slotSettingsChanged()) );
connect( dialog, SIGNAL(settingsChanged()),
TrayIcon::getInstance(), SLOT(settingsChanged()) );
connect( dialog, TQT_SIGNAL(settingsChanged()),
this, TQT_SLOT(slotSettingsChanged()) );
connect( dialog, TQT_SIGNAL(settingsChanged()),
TrayIcon::getInstance(), TQT_SLOT(settingsChanged()) );

dialog->show();
}
@@ -811,10 +811,10 @@ void Part::partActivateEvent(KParts::PartActivateEvent* event)
MyBasePart::partActivateEvent(event);
}

KParts::Part* Part::hitTest(QWidget *widget, const QPoint &globalPos)
KParts::Part* Part::hitTest(TQWidget *widget, const TQPoint &globalPos)
{
bool child = false;
QWidget *me = this->widget();
TQWidget *me = this->widget();
while (widget) {
if (widget == me) {
child = true;
@@ -834,7 +834,7 @@ KParts::Part* Part::hitTest(QWidget *widget, const QPoint &globalPos)

void Part::initFonts()
{
QStringList fonts = Settings::fonts();
TQStringList fonts = Settings::fonts();
if (fonts.isEmpty())
{
fonts.append(KGlobalSettings::generalFont().family());
@@ -893,17 +893,17 @@ void Part::initFonts()

}

bool Part::copyFile(const QString& backup)
bool Part::copyFile(const TQString& backup)
{
QFile file(m_file);
TQFile file(m_file);

if (file.open(IO_ReadOnly))
{
QFile backupFile(backup);
TQFile backupFile(backup);
if (backupFile.open(IO_WriteOnly))
{
QTextStream in(&file);
QTextStream out(&backupFile);
TQTextStream in(&file);
TQTextStream out(&backupFile);
while (!in.atEnd())
out << in.readLine();
backupFile.close();
@@ -919,7 +919,7 @@ bool Part::copyFile(const QString& backup)
return false;
}

static QString getMyHostName()
static TQString getMyHostName()
{
char hostNameC[256];
// null terminate this C string
@@ -927,31 +927,31 @@ static QString getMyHostName()
// set the string to 0 length if gethostname fails
if(gethostname(hostNameC, 255))
hostNameC[0] = 0;
return QString::fromLocal8Bit(hostNameC);
return TQString::fromLocal8Bit(hostNameC);
}

// taken from KMail
bool Part::tryToLock(const QString& backendName)
bool Part::tryToLock(const TQString& backendName)
{
// Check and create a lock file to prevent concurrent access to metakit archive
QString appName = kapp->instanceName();
TQString appName = kapp->instanceName();
if ( appName.isEmpty() )
appName = "akregator";

QString programName;
TQString programName;
const KAboutData *about = kapp->aboutData();
if ( about )
programName = about->programName();
if ( programName.isEmpty() )
programName = i18n("Akregator");

QString lockLocation = locateLocal("data", "akregator/lock");
TQString lockLocation = locateLocal("data", "akregator/lock");
KSimpleConfig config(lockLocation);
int oldPid = config.readNumEntry("pid", -1);
const QString oldHostName = config.readEntry("hostname");
const QString oldAppName = config.readEntry( "appName", appName );
const QString oldProgramName = config.readEntry( "programName", programName );
const QString hostName = getMyHostName();
const TQString oldHostName = config.readEntry("hostname");
const TQString oldAppName = config.readEntry( "appName", appName );
const TQString oldProgramName = config.readEntry( "programName", programName );
const TQString hostName = getMyHostName();
bool first_instance = false;
if ( oldPid == -1 )
first_instance = true;
@@ -965,7 +965,7 @@ bool Part::tryToLock(const QString& backendName)

if ( !first_instance )
{
QString msg;
TQString msg;
if ( oldHostName == hostName )
{
// this can only happen if the user is running this application on
@@ -979,8 +979,8 @@ bool Part::tryToLock(const QString& backendName)
"You should disable the archive for now "
"unless you are sure that %2 is not already running.</qt>")
.arg( programName, programName, backendName );
// QString::arg( st ) only replaces the first occurrence of %1
// with st while QString::arg( s1, s2 ) replacess 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 QString& backendName)

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

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

@@ -81,8 +81,8 @@ namespace Akregator
typedef MyBasePart inherited;

/** Default constructor.*/
Part(QWidget *parentWidget, const char *widgetName,
QObject *parent, const char *name, const QStringList&);
Part(TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, const TQStringList&);

/** Destructor. */
virtual ~Part();
@@ -99,7 +99,7 @@ namespace Akregator
/** Opens standard feedlist */
virtual void openStandardFeedList();

virtual void fetchFeedUrl(const QString&);
virtual void fetchFeedUrl(const TQString&);

/** Fetch all feeds in the feed tree */
virtual void fetchAllFeeds();
@@ -111,7 +111,7 @@ namespace Akregator
If the group does not exist, it is created. The feed is added as the last member
of the group.
*/
virtual void addFeedsToGroup(const QStringList& urls, const QString& group);
virtual void addFeedsToGroup(const TQStringList& urls, const TQString& group);

virtual void addFeed();

@@ -132,8 +132,8 @@ namespace Akregator
@return true iff merging was successful, i.e. the GUI factory was not NULL */
virtual bool mergePart(KParts::Part*);

void loadTagSet(const QString& path);
void saveTagSet(const QString& path);
void loadTagSet(const TQString& path);
void saveTagSet(const TQString& path);

public slots:
/** Used to save settings after changing them from configuration dialog. Calls AkregatorPart's saveSettings. */
@@ -174,9 +174,9 @@ namespace Akregator
void exportFile(const KURL& url);

/** FIXME: hack to get the tray icon working */
QWidget* getMainWindow();
TQWidget* getMainWindow();

virtual KParts::Part *hitTest(QWidget *widget, const QPoint &globalPos);
virtual KParts::Part *hitTest(TQWidget *widget, const TQPoint &globalPos);

/** reimplemented to load/unload the merged parts on selection/deselection */
virtual void partActivateEvent(KParts::PartActivateEvent* event);
@@ -187,22 +187,22 @@ namespace Akregator

private: // methods

bool copyFile(const QString& backup);
bool copyFile(const TQString& backup);

/** fills the font settings with system fonts, if fonts are not set */
void initFonts();

/** creates an OPML file containing the initial feeds (KDE feeds) */
static QDomDocument createDefaultFeedList();
static TQDomDocument createDefaultFeedList();

bool tryToLock(const QString& backendName);
bool tryToLock(const TQString& backendName);

private: // attributes

class ApplyFiltersInterceptor;
ApplyFiltersInterceptor* m_applyFiltersInterceptor;
QString m_standardFeedList;
QString m_tagSetPath;
TQString m_standardFeedList;
TQString m_tagSetPath;
bool m_standardListLoaded;
bool m_shuttingDown;

@@ -210,7 +210,7 @@ namespace Akregator
KParts::Part* m_mergedPart;
View* m_view;

QTimer* m_autosaveTimer;
TQTimer* m_autosaveTimer;
/** did we backup the feed list already? */
bool m_backedUpList;
Backend::Storage* m_storage;

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

@@ -26,7 +26,7 @@
#define AKREGATORPARTIFACE_H

#include <dcopobject.h>
#include <qstringlist.h>
#include <tqstringlist.h>
#include <kurl.h>

namespace Akregator {
@@ -36,10 +36,10 @@ namespace Akregator {
K_DCOP
k_dcop:
virtual void openStandardFeedList() = 0;
virtual void fetchFeedUrl(const QString&) = 0;
virtual void fetchFeedUrl(const TQString&) = 0;
virtual void fetchAllFeeds() = 0;
virtual void saveSettings() = 0;
virtual void addFeedsToGroup(const QStringList&, const QString&) = 0;
virtual void addFeedsToGroup(const TQStringList&, const TQString&) = 0;
virtual void exportFile(const KURL& url) = 0;
virtual void addFeed() = 0;
};

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

@@ -30,7 +30,7 @@
namespace Akregator {


BrowserRun::BrowserRun(QWidget* mainWindow, Viewer* currentViewer, const KURL& url, const KParts::URLArgs& args, OpeningMode mode)
BrowserRun::BrowserRun(TQWidget* mainWindow, Viewer* currentViewer, const KURL& url, const KParts::URLArgs& args, OpeningMode mode)
: KParts::BrowserRun(url, args, 0L, mainWindow, false, false, true)
{
m_currentViewer = currentViewer;
@@ -38,7 +38,7 @@ BrowserRun::BrowserRun(QWidget* mainWindow, Viewer* currentViewer, const KURL& u

if (mode == CURRENT_TAB)
{
connect(m_currentViewer, SIGNAL(destroyed()), this, SLOT(slotViewerDeleted()));
connect(m_currentViewer, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotViewerDeleted()));
}
setEnableExternalBrowser(false);
}
@@ -48,7 +48,7 @@ BrowserRun::~BrowserRun()
kdDebug() << "BrowserRun::~BrowserRun()" << endl;
}

void BrowserRun::foundMimeType( const QString & type )
void BrowserRun::foundMimeType( const TQString & type )
{
if (type=="text/html" ||type=="text/xml" || type=="application/xhtml+xml")
emit signalOpenInViewer(url(), m_currentViewer, m_openingMode);

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

@@ -45,7 +45,7 @@ class BrowserRun : public KParts::BrowserRun
EXTERNAL
};

BrowserRun(QWidget* mainWindow, Viewer* currentViewer, const KURL& url, const KParts::URLArgs& args, OpeningMode mode);
BrowserRun(TQWidget* mainWindow, Viewer* currentViewer, const KURL& url, const KParts::URLArgs& args, OpeningMode mode);
virtual ~BrowserRun();

signals:
@@ -53,7 +53,7 @@ class BrowserRun : public KParts::BrowserRun
void signalOpenInViewer(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode);

protected:
virtual void foundMimeType(const QString& type);
virtual void foundMimeType(const TQString& type);

private slots:
void slotViewerDeleted();

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

@@ -84,24 +84,24 @@
#include <kxmlguifactory.h>
#include <kparts/partmanager.h>

#include <qbuttongroup.h>
#include <qcheckbox.h>
#include <qdatetime.h> // for startup time measure
#include <qfile.h>
#include <qhbox.h>
#include <qlabel.h>
#include <qlayout.h>
#include <qmultilineedit.h>
#include <qpopupmenu.h>
#include <qptrlist.h>
#include <qstylesheet.h>
#include <qtextstream.h>
#include <qtimer.h>
#include <qtoolbutton.h>
#include <qtooltip.h>
#include <qvaluevector.h>
#include <qwhatsthis.h>
#include <qclipboard.h>
#include <tqbuttongroup.h>
#include <tqcheckbox.h>
#include <tqdatetime.h> // for startup time measure
#include <tqfile.h>
#include <tqhbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqmultilineedit.h>
#include <tqpopupmenu.h>
#include <tqptrlist.h>
#include <tqstylesheet.h>
#include <tqtextstream.h>
#include <tqtimer.h>
#include <tqtoolbutton.h>
#include <tqtooltip.h>
#include <tqvaluevector.h>
#include <tqwhatsthis.h>
#include <tqclipboard.h>

namespace Akregator {

@@ -145,13 +145,13 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor

virtual bool visitTagNode(TagNode* node)
{
QString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").arg(node->title());
TQString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").arg(node->title());
if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Tag"), KStdGuiItem::del()) == KMessageBox::Continue)
{
Tag tag = node->tag();
QValueList<Article> articles = m_view->m_feedList->rootNode()->articles(tag.id());
TQValueList<Article> articles = m_view->m_feedList->rootNode()->articles(tag.id());
node->setNotificationMode(false);
for (QValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
(*it).removeTag(tag.id());
node->setNotificationMode(true);
Kernel::self()->tagSet()->remove(tag);
@@ -162,7 +162,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor

virtual bool visitFolder(Folder* node)
{
QString msg;
TQString msg;
if (node->title().isEmpty())
msg = i18n("<qt>Are you sure you want to delete this folder and its feeds and subfolders?</qt>");
else
@@ -178,7 +178,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor

virtual bool visitFeed(Feed* node)
{
QString msg;
TQString msg;
if (node->title().isEmpty())
msg = i18n("<qt>Are you sure you want to delete this feed?</qt>");
else
@@ -210,38 +210,38 @@ View::~View()
kdDebug() << "View::~View(): leaving" << endl;
}

View::View( Part *part, QWidget *parent, ActionManagerImpl* actionManager, const char *name)
: QWidget(parent, name), m_viewMode(NormalView), m_actionManager(actionManager)
View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, const char *name)
: TQWidget(parent, name), m_viewMode(NormalView), m_actionManager(actionManager)
{
m_editNodePropertiesVisitor = new EditNodePropertiesVisitor(this);
m_deleteNodeVisitor = new DeleteNodeVisitor(this);
m_keepFlagIcon = QPixmap(locate("data", "akregator/pics/akregator_flag.png"));
m_keepFlagIcon = TQPixmap(locate("data", "akregator/pics/akregator_flag.png"));
m_part = part;
m_feedList = new FeedList();
m_tagNodeList = new TagNodeList(m_feedList, Kernel::self()->tagSet());
m_shuttingDown = false;
m_displayingAboutPage = false;
m_currentFrame = 0L;
setFocusPolicy(QWidget::StrongFocus);
setFocusPolicy(TQWidget::StrongFocus);

QVBoxLayout *lt = new QVBoxLayout( this );
TQVBoxLayout *lt = new TQVBoxLayout( this );
m_horizontalSplitter = new QSplitter(QSplitter::Horizontal, this);
m_horizontalSplitter = new TQSplitter(TQSplitter::Horizontal, this);

m_horizontalSplitter->setOpaqueResize(true);
lt->addWidget(m_horizontalSplitter);

connect (Kernel::self()->fetchQueue(), SIGNAL(fetched(Feed*)), this, SLOT(slotFeedFetched(Feed*)));
connect (Kernel::self()->fetchQueue(), SIGNAL(signalStarted()), this, SLOT(slotFetchingStarted()));
connect (Kernel::self()->fetchQueue(), SIGNAL(signalStopped()), this, SLOT(slotFetchingStopped()));
connect (Kernel::self()->fetchQueue(), TQT_SIGNAL(fetched(Feed*)), this, TQT_SLOT(slotFeedFetched(Feed*)));
connect (Kernel::self()->fetchQueue(), TQT_SIGNAL(signalStarted()), this, TQT_SLOT(slotFetchingStarted()));
connect (Kernel::self()->fetchQueue(), TQT_SIGNAL(signalStopped()), this, TQT_SLOT(slotFetchingStopped()));

connect(Kernel::self()->tagSet(), SIGNAL(signalTagAdded(const Tag&)), this, SLOT(slotTagCreated(const Tag&)));
connect(Kernel::self()->tagSet(), SIGNAL(signalTagRemoved(const Tag&)), this, SLOT(slotTagRemoved(const Tag&)));
connect(Kernel::self()->tagSet(), TQT_SIGNAL(signalTagAdded(const Tag&)), this, TQT_SLOT(slotTagCreated(const Tag&)));
connect(Kernel::self()->tagSet(), TQT_SIGNAL(signalTagRemoved(const Tag&)), this, TQT_SLOT(slotTagRemoved(const Tag&)));

m_listTabWidget = new ListTabWidget(m_horizontalSplitter);
m_actionManager->initListTabWidget(m_listTabWidget);

connect(m_listTabWidget, SIGNAL(signalNodeSelected(TreeNode*)), this, SLOT(slotNodeSelected(TreeNode*)));
connect(m_listTabWidget, TQT_SIGNAL(signalNodeSelected(TreeNode*)), this, TQT_SLOT(slotNodeSelected(TreeNode*)));

if (!Settings::showTaggingGUI())
m_listTabWidget->setViewMode(ListTabWidget::single);
@@ -249,16 +249,16 @@ View::View( Part *part, QWidget *parent, ActionManagerImpl* actionManager, const
m_feedListView = new NodeListView( this, "feedtree" );
m_listTabWidget->addView(m_feedListView, i18n("Feeds"), KGlobal::iconLoader()->loadIcon("folder", KIcon::Small));

connect(m_feedListView, SIGNAL(signalContextMenu(KListView*, TreeNode*, const QPoint&)), this, SLOT(slotFeedTreeContextMenu(KListView*, TreeNode*, const QPoint&)));
connect(m_feedListView, TQT_SIGNAL(signalContextMenu(KListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(KListView*, TreeNode*, const TQPoint&)));

connect(m_feedListView, SIGNAL(signalDropped (KURL::List &, TreeNode*,
Folder*)), this, SLOT(slotFeedURLDropped (KURL::List &,
connect(m_feedListView, TQT_SIGNAL(signalDropped (KURL::List &, TreeNode*,
Folder*)), this, TQT_SLOT(slotFeedURLDropped (KURL::List &,
TreeNode*, Folder*)));

m_tagNodeListView = new NodeListView(this);
m_listTabWidget->addView(m_tagNodeListView, i18n("Tags"), KGlobal::iconLoader()->loadIcon("rss_tag", KIcon::Small));

connect(m_tagNodeListView, SIGNAL(signalContextMenu(KListView*, TreeNode*, const QPoint&)), this, SLOT(slotFeedTreeContextMenu(KListView*, TreeNode*, const QPoint&)));
connect(m_tagNodeListView, TQT_SIGNAL(signalContextMenu(KListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(KListView*, TreeNode*, const TQPoint&)));

ProgressManager::self()->setFeedList(m_feedList);
@@ -266,17 +266,17 @@ View::View( Part *part, QWidget *parent, ActionManagerImpl* actionManager, const
m_tabs = new TabWidget(m_horizontalSplitter);
m_actionManager->initTabWidget(m_tabs);

connect( m_part, SIGNAL(signalSettingsChanged()), m_tabs, SLOT(slotSettingsChanged()));
connect( m_part, TQT_SIGNAL(signalSettingsChanged()), m_tabs, TQT_SLOT(slotSettingsChanged()));

connect( m_tabs, SIGNAL( currentFrameChanged(Frame *) ), this,
SLOT( slotFrameChanged(Frame *) ) );
connect( m_tabs, TQT_SIGNAL( currentFrameChanged(Frame *) ), this,
TQT_SLOT( slotFrameChanged(Frame *) ) );

QWhatsThis::add(m_tabs, i18n("You can view multiple articles in several open tabs."));
TQWhatsThis::add(m_tabs, i18n("You can view multiple articles in several open tabs."));

m_mainTab = new QWidget(this, "Article Tab");
QVBoxLayout *mainTabLayout = new QVBoxLayout( m_mainTab, 0, 2, "mainTabLayout");
m_mainTab = new TQWidget(this, "Article Tab");
TQVBoxLayout *mainTabLayout = new TQVBoxLayout( m_mainTab, 0, 2, "mainTabLayout");

QWhatsThis::add(m_mainTab, i18n("Articles list."));
TQWhatsThis::add(m_mainTab, i18n("Articles list."));

m_searchBar = new SearchBar(m_mainTab);

@@ -285,36 +285,36 @@ View::View( Part *part, QWidget *parent, ActionManagerImpl* actionManager, const

mainTabLayout->addWidget(m_searchBar);

m_articleSplitter = new QSplitter(QSplitter::Vertical, m_mainTab, "panner2");
m_articleSplitter = new TQSplitter(TQSplitter::Vertical, m_mainTab, "panner2");

m_articleList = new ArticleListView( m_articleSplitter, "articles" );
m_actionManager->initArticleListView(m_articleList);

connect( m_articleList, SIGNAL(signalMouseButtonPressed(int, const Article&, const QPoint &, int)), this, SLOT(slotMouseButtonPressed(int, const Article&, const QPoint &, int)));
connect( m_articleList, TQT_SIGNAL(signalMouseButtonPressed(int, const Article&, const TQPoint &, int)), this, TQT_SLOT(slotMouseButtonPressed(int, const Article&, const TQPoint &, int)));

// use selectionChanged instead of clicked
connect( m_articleList, SIGNAL(signalArticleChosen(const Article&)),
this, SLOT( slotArticleSelected(const Article&)) );
connect( m_articleList, SIGNAL(signalDoubleClicked(const Article&, const QPoint&, int)),
this, SLOT( slotOpenArticleExternal(const Article&, const QPoint&, int)) );
connect( m_articleList, TQT_SIGNAL(signalArticleChosen(const Article&)),
this, TQT_SLOT( slotArticleSelected(const Article&)) );
connect( m_articleList, TQT_SIGNAL(signalDoubleClicked(const Article&, const TQPoint&, int)),
this, TQT_SLOT( slotOpenArticleExternal(const Article&, const TQPoint&, int)) );

m_articleViewer = new ArticleViewer(m_articleSplitter, "article_viewer");
m_articleViewer->setSafeMode(); // disable JS, Java, etc...

m_actionManager->initArticleViewer(m_articleViewer);

connect(m_searchBar, SIGNAL(signalSearch(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)), m_articleList, SLOT(slotSetFilter(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)));
connect(m_searchBar, TQT_SIGNAL(signalSearch(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)), m_articleList, TQT_SLOT(slotSetFilter(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)));

connect(m_searchBar, SIGNAL(signalSearch(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)), m_articleViewer, SLOT(slotSetFilter(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)));
connect(m_searchBar, TQT_SIGNAL(signalSearch(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)), m_articleViewer, TQT_SLOT(slotSetFilter(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)));

connect( m_articleViewer, SIGNAL(urlClicked(const KURL&, Viewer*, bool, bool)),
this, SLOT(slotUrlClickedInViewer(const KURL&, Viewer*, bool, bool)) );
connect( m_articleViewer, TQT_SIGNAL(urlClicked(const KURL&, Viewer*, bool, bool)),
this, TQT_SLOT(slotUrlClickedInViewer(const KURL&, Viewer*, bool, bool)) );

connect( m_articleViewer->browserExtension(), SIGNAL(mouseOverInfo(const KFileItem *)),
this, SLOT(slotMouseOverInfo(const KFileItem *)) );
connect( m_articleViewer->browserExtension(), TQT_SIGNAL(mouseOverInfo(const KFileItem *)),
this, TQT_SLOT(slotMouseOverInfo(const KFileItem *)) );

connect( m_part, SIGNAL(signalSettingsChanged()), m_articleViewer, SLOT(slotPaletteOrFontChanged()));
QWhatsThis::add(m_articleViewer->widget(), i18n("Browsing area."));
connect( m_part, TQT_SIGNAL(signalSettingsChanged()), m_articleViewer, TQT_SLOT(slotPaletteOrFontChanged()));
TQWhatsThis::add(m_articleViewer->widget(), i18n("Browsing area."));
mainTabLayout->addWidget( m_articleSplitter );

m_mainFrame=new Frame(this, m_part, m_mainTab, i18n("Articles"), false);
@@ -335,18 +335,18 @@ View::View( Part *part, QWidget *parent, ActionManagerImpl* actionManager, const
m_displayingAboutPage = true;
}

m_fetchTimer = new QTimer(this);
connect( m_fetchTimer, SIGNAL(timeout()), this, SLOT(slotDoIntervalFetches()) );
m_fetchTimer = new TQTimer(this);
connect( m_fetchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDoIntervalFetches()) );
m_fetchTimer->start(1000*60);

// delete expired articles once per hour
m_expiryTimer = new QTimer(this);
connect(m_expiryTimer, SIGNAL(timeout()), this,
SLOT(slotDeleteExpiredArticles()) );
m_expiryTimer = new TQTimer(this);
connect(m_expiryTimer, TQT_SIGNAL(timeout()), this,
TQT_SLOT(slotDeleteExpiredArticles()) );
m_expiryTimer->start(3600*1000);

m_markReadTimer = new QTimer(this);
connect(m_markReadTimer, SIGNAL(timeout()), this, SLOT(slotSetCurrentArticleReadDelayed()) );
m_markReadTimer = new TQTimer(this);
connect(m_markReadTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSetCurrentArticleReadDelayed()) );

switch (Settings::viewMode())
{
@@ -366,7 +366,7 @@ View::View( Part *part, QWidget *parent, ActionManagerImpl* actionManager, const
m_searchBar->slotSetText(Settings::textFilter());
}

QTimer::singleShot(1000, this, SLOT(slotDeleteExpiredArticles()) );
TQTimer::singleShot(1000, this, TQT_SLOT(slotDeleteExpiredArticles()) );
m_part->mergePart(m_articleViewer);
}

@@ -416,17 +416,17 @@ void View::slotOpenNewTab(const KURL& url, bool background)
{
PageViewer* page = new PageViewer(this, "page");
connect( m_part, SIGNAL(signalSettingsChanged()), page, SLOT(slotPaletteOrFontChanged()));
connect( m_part, TQT_SIGNAL(signalSettingsChanged()), page, TQT_SLOT(slotPaletteOrFontChanged()));

connect( page, SIGNAL(setTabIcon(const QPixmap&)),
this, SLOT(setTabIcon(const QPixmap&)));
connect( page, SIGNAL(urlClicked(const KURL &, Viewer*, bool, bool)),
this, SLOT(slotUrlClickedInViewer(const KURL &, Viewer*, bool, bool)) );
connect( page, TQT_SIGNAL(setTabIcon(const TQPixmap&)),
this, TQT_SLOT(setTabIcon(const TQPixmap&)));
connect( page, TQT_SIGNAL(urlClicked(const KURL &, Viewer*, bool, bool)),
this, TQT_SLOT(slotUrlClickedInViewer(const KURL &, Viewer*, bool, bool)) );

Frame* frame = new Frame(this, page, page->widget(), i18n("Untitled"));
frame->setAutoDeletePart(true); // delete page viewer when removing the tab

connect(page, SIGNAL(setWindowCaption (const QString &)), frame, SLOT(setTitle (const QString &)));
connect(page, TQT_SIGNAL(setWindowCaption (const TQString &)), frame, TQT_SLOT(setTitle (const TQString &)));
connectFrame(frame);
m_tabs->addFrame(frame);

@@ -439,7 +439,7 @@ void View::slotOpenNewTab(const KURL& url, bool background)
}


void View::setTabIcon(const QPixmap& icon)
void View::setTabIcon(const TQPixmap& icon)
{
const PageViewer *s = dynamic_cast<const PageViewer*>(sender());
if (s) {
@@ -449,21 +449,21 @@ void View::setTabIcon(const QPixmap& icon)

void View::connectFrame(Frame *f)
{
connect(f, SIGNAL(statusText(const QString &)), this, SLOT(slotStatusText(const QString&)));
connect(f, SIGNAL(captionChanged (const QString &)), this, SLOT(slotCaptionChanged (const QString &)));
connect(f, SIGNAL(loadingProgress(int)), this, SLOT(slotLoadingProgress(int)) );
connect(f, SIGNAL(started()), this, SLOT(slotStarted()));
connect(f, SIGNAL(completed()), this, SLOT(slotCompleted()));
connect(f, SIGNAL(canceled(const QString &)), this, SLOT(slotCanceled(const QString&)));
connect(f, TQT_SIGNAL(statusText(const TQString &)), this, TQT_SLOT(slotStatusText(const TQString&)));
connect(f, TQT_SIGNAL(captionChanged (const TQString &)), this, TQT_SLOT(slotCaptionChanged (const TQString &)));
connect(f, TQT_SIGNAL(loadingProgress(int)), this, TQT_SLOT(slotLoadingProgress(int)) );
connect(f, TQT_SIGNAL(started()), this, TQT_SLOT(slotStarted()));
connect(f, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted()));
connect(f, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCanceled(const TQString&)));
}

void View::slotStatusText(const QString &c)
void View::slotStatusText(const TQString &c)
{
if (sender() == m_currentFrame)
emit setStatusBarText(c);
}

void View::slotCaptionChanged(const QString &c)
void View::slotCaptionChanged(const TQString &c)
{
if (sender() == m_currentFrame)
emit setWindowCaption(c);
@@ -475,7 +475,7 @@ void View::slotStarted()
emit signalStarted(0);
}

void View::slotCanceled(const QString &s)
void View::slotCanceled(const TQString &s)
{
if (sender() == m_currentFrame)
emit signalCanceled(s);
@@ -493,7 +493,7 @@ void View::slotLoadingProgress(int percent)
emit setProgress(percent);
}

bool View::importFeeds(const QDomDocument& doc)
bool View::importFeeds(const TQDomDocument& doc)
{
FeedList* feedList = new FeedList();
bool parsed = feedList->readFromXML(doc);
@@ -504,7 +504,7 @@ bool View::importFeeds(const QDomDocument& doc)
delete feedList;
return false;
}
QString title = feedList->title();
TQString title = feedList->title();

if (title.isEmpty())
title = i18n("Imported Folder");
@@ -525,7 +525,7 @@ bool View::importFeeds(const QDomDocument& doc)
return true;
}

bool View::loadFeeds(const QDomDocument& doc, Folder* parent)
bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
{
FeedList* feedList = new FeedList();
bool parsed = feedList->readFromXML(doc);
@@ -554,9 +554,9 @@ bool View::loadFeeds(const QDomDocument& doc, Folder* parent)
m_feedListView->setNodeList(m_feedList);
m_tagNodeListView->setNodeList(m_tagNodeList);

QStringList tagIDs = m_feedList->rootNode()->tags();
QStringList::ConstIterator end = tagIDs.end();
for (QStringList::ConstIterator it = tagIDs.begin(); it != end; ++it)
TQStringList tagIDs = m_feedList->rootNode()->tags();
TQStringList::ConstIterator end = tagIDs.end();
for (TQStringList::ConstIterator it = tagIDs.begin(); it != end; ++it)
{
kdDebug() << *it << endl;
// create a tag for every tag ID in the archive that is not part of the tagset
@@ -586,12 +586,12 @@ void View::slotDeleteExpiredArticles()
rootNode->slotDeleteExpiredArticles();
}

QDomDocument View::feedListToOPML()
TQDomDocument View::feedListToOPML()
{
return m_feedList->toXML();
}

void View::addFeedToGroup(const QString& url, const QString& groupName)
void View::addFeedToGroup(const TQString& url, const TQString& groupName)
{

// Locate the group.
@@ -630,7 +630,7 @@ void View::slotNormalView()
m_articleViewer->slotShowSummary(m_listTabWidget->activeView()->selectedNode());
}

m_articleSplitter->setOrientation(QSplitter::Vertical);
m_articleSplitter->setOrientation(TQSplitter::Vertical);
m_viewMode = NormalView;

Settings::setViewMode( m_viewMode );
@@ -654,7 +654,7 @@ void View::slotWidescreenView()
m_articleViewer->slotShowSummary(m_listTabWidget->activeView()->selectedNode());
}

m_articleSplitter->setOrientation(QSplitter::Horizontal);
m_articleSplitter->setOrientation(TQSplitter::Horizontal);
m_viewMode = WidescreenView;

Settings::setViewMode( m_viewMode );
@@ -697,7 +697,7 @@ void View::slotFrameChanged(Frame *f)
emit signalStarted(0);
break;
case Frame::Canceled:
emit signalCanceled(QString::null);
emit signalCanceled(TQString::null);
break;
case Frame::Idle:
case Frame::Completed:
@@ -706,7 +706,7 @@ void View::slotFrameChanged(Frame *f)
}
}

void View::slotFeedTreeContextMenu(KListView*, TreeNode* /*node*/, const QPoint& /*p*/)
void View::slotFeedTreeContextMenu(KListView*, TreeNode* /*node*/, const TQPoint& /*p*/)
{
m_tabs->showPage(m_mainTab);
}
@@ -824,8 +824,8 @@ void View::slotOpenURL(const KURL& url, Viewer* currentViewer, BrowserRun::Openi
KParts::URLArgs args = currentViewer ? currentViewer->browserExtension()->urlArgs() : KParts::URLArgs();
BrowserRun* r = new BrowserRun(this, currentViewer, url, args, mode);
connect(r, SIGNAL(signalOpenInViewer(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode)),
this, SLOT(slotOpenURLReply(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode)));
connect(r, TQT_SIGNAL(signalOpenInViewer(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode)),
this, TQT_SLOT(slotOpenURLReply(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode)));
}
}

@@ -878,10 +878,10 @@ void View::slotFeedAdd()

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

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

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

AddFeedDialog *afd = new AddFeedDialog( 0, "add_feed" );
@@ -892,7 +892,7 @@ void View::addFeed(const QString& url, TreeNode *after, Folder* parent, bool aut
afd->slotOk();
else
{
if (afd->exec() != QDialog::Accepted)
if (afd->exec() != TQDialog::Accepted)
{
delete afd;
return;
@@ -908,7 +908,7 @@ void View::addFeed(const QString& url, TreeNode *after, Folder* parent, bool aut
dlg->selectFeedName();

if (!autoExec)
if (dlg->exec() != QDialog::Accepted)
if (dlg->exec() != TQDialog::Accepted)
{
delete feed;
delete dlg;
@@ -946,7 +946,7 @@ void View::slotFeedAddGroup()

bool Ok;

QString text = KInputDialog::getText(i18n("Add Folder"), i18n("Folder name:"), "", &Ok);
TQString text = KInputDialog::getText(i18n("Add Folder"), i18n("Folder name:"), "", &Ok);

if (Ok)
{
@@ -1069,7 +1069,7 @@ void View::slotFetchingStopped()
{
m_mainFrame->setState(Frame::Completed);
m_actionManager->action("feed_stop")->setEnabled(false);
m_mainFrame->setStatusText(QString::null);
m_mainFrame->setStatusText(TQString::null);
}

void View::slotFeedFetched(Feed *feed)
@@ -1077,9 +1077,9 @@ void View::slotFeedFetched(Feed *feed)
// iterate through the articles (once again) to do notifications properly
if (feed->articles().count() > 0)
{
QValueList<Article> articles = feed->articles();
QValueList<Article>::ConstIterator it;
QValueList<Article>::ConstIterator end = articles.end();
TQValueList<Article> articles = feed->articles();
TQValueList<Article>::ConstIterator it;
TQValueList<Article>::ConstIterator end = articles.end();
for (it = articles.begin(); it != end; ++it)
{
if ((*it).status()==Article::New && ((*it).feed()->useNotification() || Settings::useNotifications()))
@@ -1090,7 +1090,7 @@ void View::slotFeedFetched(Feed *feed)
}
}

void View::slotMouseButtonPressed(int button, const Article& article, const QPoint &, int)
void View::slotMouseButtonPressed(int button, const Article& article, const TQPoint &, int)
{
if (button == Qt::MidButton)
{
@@ -1112,8 +1112,8 @@ void View::slotMouseButtonPressed(int button, const Article& article, const QPoi
void View::slotAssignTag(const Tag& tag, bool assign)
{
kdDebug() << (assign ? "assigned" : "removed") << " tag \"" << tag.id() << "\"" << endl;
QValueList<Article> selectedArticles = m_articleList->selectedArticles();
for (QValueList<Article>::Iterator it = selectedArticles.begin(); it != selectedArticles.end(); ++it)
TQValueList<Article> selectedArticles = m_articleList->selectedArticles();
for (TQValueList<Article>::Iterator it = selectedArticles.begin(); it != selectedArticles.end(); ++it)
{
if (assign)
(*it).addTag(tag.id());
@@ -1126,8 +1126,8 @@ void View::slotAssignTag(const Tag& tag, bool assign)
void View::slotRemoveTag(const Tag& tag)
{
kdDebug() << "remove tag \"" << tag.id() << "\" from selected articles" << endl;
QValueList<Article> selectedArticles = m_articleList->selectedArticles();
for (QValueList<Article>::Iterator it = selectedArticles.begin(); it != selectedArticles.end(); ++it)
TQValueList<Article> selectedArticles = m_articleList->selectedArticles();
for (TQValueList<Article>::Iterator it = selectedArticles.begin(); it != selectedArticles.end(); ++it)
(*it).removeTag(tag.id());

updateTagActions();
@@ -1192,7 +1192,7 @@ void View::slotArticleSelected(const Article& article)
m_articleViewer->slotShowArticle(a);
}

void View::slotOpenArticleExternal(const Article& article, const QPoint&, int)
void View::slotOpenArticleExternal(const Article& article, const TQPoint&, int)
{
if (!article.isNull())
Viewer::displayInExternalBrowser(article.link());
@@ -1220,7 +1220,7 @@ void View::slotOpenCurrentArticle()

void View::slotOpenCurrentArticleExternal()
{
slotOpenArticleExternal(m_articleList->currentArticle(), QPoint(), 0);
slotOpenArticleExternal(m_articleList->currentArticle(), TQPoint(), 0);
}

void View::slotOpenCurrentArticleBackgroundTab()
@@ -1250,7 +1250,7 @@ void View::slotCopyLinkAddress()
if(article.isNull())
return;

QString link;
TQString link;
if (article.link().isValid() || (article.guidIsPermaLink() && KURL(article.guid()).isValid()))
{
// in case link isn't valid, fall back to the guid permaLink.
@@ -1258,7 +1258,7 @@ void View::slotCopyLinkAddress()
link = article.link().url();
else
link = article.guid();
QClipboard *cb = QApplication::clipboard();
QClipboard *cb = TQApplication::clipboard();
cb->setText(link, QClipboard::Clipboard);
cb->setText(link, QClipboard::Selection);
}
@@ -1296,15 +1296,15 @@ void View::slotArticleDelete()
if ( m_viewMode == CombinedView )
return;

QValueList<Article> articles = m_articleList->selectedArticles();
TQValueList<Article> articles = m_articleList->selectedArticles();

QString msg;
TQString msg;
switch (articles.count())
{
case 0:
return;
case 1:
msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").arg(QStyleSheet::escape(articles.first().title()));
msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").arg(TQStyleSheet::escape(articles.first().title()));
break;
default:
msg = i18n("<qt>Are you sure you want to delete the selected article?</qt>",
@@ -1317,8 +1317,8 @@ void View::slotArticleDelete()
if (m_listTabWidget->activeView()->selectedNode())
m_listTabWidget->activeView()->selectedNode()->setNotificationMode(false);

QValueList<Feed*> feeds;
for (QValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
TQValueList<Feed*> feeds;
for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
{
Feed* feed = (*it).feed();
if (!feeds.contains(feed))
@@ -1327,7 +1327,7 @@ void View::slotArticleDelete()
(*it).setDeleted();
}

for (QValueList<Feed*>::Iterator it = feeds.begin(); it != feeds.end(); ++it)
for (TQValueList<Feed*>::Iterator it = feeds.begin(); it != feeds.end(); ++it)
{
(*it)->setNotificationMode(true);
}
@@ -1340,28 +1340,28 @@ void View::slotArticleDelete()

void View::slotArticleToggleKeepFlag(bool /*enabled*/)
{
QValueList<Article> articles = m_articleList->selectedArticles();
TQValueList<Article> articles = m_articleList->selectedArticles();

if (articles.isEmpty())
return;

bool allFlagsSet = true;
for (QValueList<Article>::Iterator it = articles.begin(); allFlagsSet && it != articles.end(); ++it)
for (TQValueList<Article>::Iterator it = articles.begin(); allFlagsSet && it != articles.end(); ++it)
if (!(*it).keep())
allFlagsSet = false;

for (QValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
(*it).setKeep(!allFlagsSet);
}

void View::slotSetSelectedArticleRead()
{
QValueList<Article> articles = m_articleList->selectedArticles();
TQValueList<Article> articles = m_articleList->selectedArticles();

if (articles.isEmpty())
return;

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

@@ -1385,7 +1385,7 @@ void View::slotTextToSpeechRequest()
}
else