diff options
Diffstat (limited to 'akregator/src')
142 files changed, 2879 insertions, 2879 deletions
diff --git a/akregator/src/aboutdata.cpp b/akregator/src/aboutdata.cpp index 93be34a2a..a2a747543 100644 --- a/akregator/src/aboutdata.cpp +++ b/akregator/src/aboutdata.cpp @@ -22,7 +22,7 @@ without including the source code for Qt in the source distribution. */ -#include <qstring.h> +#include <tqstring.h> #include "aboutdata.h" diff --git a/akregator/src/actionmanager.cpp b/akregator/src/actionmanager.cpp index 21d7f51eb..225f85d7f 100644 --- a/akregator/src/actionmanager.cpp +++ b/akregator/src/actionmanager.cpp @@ -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() diff --git a/akregator/src/actionmanager.h b/akregator/src/actionmanager.h index cae5985ca..045375d89 100644 --- a/akregator/src/actionmanager.h +++ b/akregator/src/actionmanager.h @@ -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: diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp index a8b50fc76..c22e84185 100644 --- a/akregator/src/actionmanagerimpl.cpp +++ b/akregator/src/actionmanagerimpl.cpp @@ -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); } diff --git a/akregator/src/actionmanagerimpl.h b/akregator/src/actionmanagerimpl.h index eefa3525e..ecf964780 100644 --- a/akregator/src/actionmanagerimpl.h +++ b/akregator/src/actionmanagerimpl.h @@ -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); diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp index c6fa6be18..cc10844b5 100644 --- a/akregator/src/addfeeddialog.cpp +++ b/akregator/src/addfeeddialog.cpp @@ -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()); } diff --git a/akregator/src/addfeeddialog.h b/akregator/src/addfeeddialog.h index e7e67a165..fc38e6175 100644 --- a/akregator/src/addfeeddialog.h +++ b/akregator/src/addfeeddialog.h @@ -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; }; } diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index b5392c791..449b871e7 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -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")) ) { diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h index b241517f5..6d43a7f12 100644 --- a/akregator/src/akregator_part.h +++ b/akregator/src/akregator_part.h @@ -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; diff --git a/akregator/src/akregator_partiface.h b/akregator/src/akregator_partiface.h index 2c4290b8a..5bb51075b 100644 --- a/akregator/src/akregator_partiface.h +++ b/akregator/src/akregator_partiface.h @@ -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; }; diff --git a/akregator/src/akregator_run.cpp b/akregator/src/akregator_run.cpp index b78c92f7c..4b67113ce 100644 --- a/akregator/src/akregator_run.cpp +++ b/akregator/src/akregator_run.cpp @@ -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); diff --git a/akregator/src/akregator_run.h b/akregator/src/akregator_run.h index ad549786c..db257fed8 100644 --- a/akregator/src/akregator_run.h +++ b/akregator/src/akregator_run.h @@ -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(); diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index f45f784ed..d238307d2 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -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 { - QString selectedText = static_cast<PageViewer *>(m_currentFrame->part())->selectedText(); + TQString selectedText = static_cast<PageViewer *>(m_currentFrame->part())->selectedText(); if (!selectedText.isEmpty()) SpeechClient::self()->slotSpeak(selectedText, "en"); @@ -1394,23 +1394,23 @@ void View::slotTextToSpeechRequest() void View::slotSetSelectedArticleUnread() { - 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::Unread); } void View::slotSetSelectedArticleNew() { - 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::New); } @@ -1433,7 +1433,7 @@ void View::slotMouseOverInfo(const KFileItem *kifi) } else { - m_mainFrame->setStatusText(QString::null); + m_mainFrame->setStatusText(TQString::null); } } @@ -1456,8 +1456,8 @@ void View::readProperties(KConfig* config) m_listTabWidget->activeView()->setSelectedNode(selNode); } - QStringList urls = config->readListEntry("FeedBrowserURLs"); - QStringList::ConstIterator it = urls.begin(); + TQStringList urls = config->readListEntry("FeedBrowserURLs"); + TQStringList::ConstIterator it = urls.begin(); for (; it != urls.end(); ++it) { KURL url = KURL::fromPathOrURL(*it); @@ -1480,9 +1480,9 @@ void View::saveProperties(KConfig* config) } // save browser URLs - QStringList urls; - QPtrList<Frame> frames = m_tabs->frames(); - QPtrList<Frame>::ConstIterator it = frames.begin(); + TQStringList urls; + TQPtrList<Frame> frames = m_tabs->frames(); + TQPtrList<Frame>::ConstIterator it = frames.begin(); for (; it != frames.end(); ++it) { Frame *frame = *it; @@ -1501,25 +1501,25 @@ void View::saveProperties(KConfig* config) void View::connectToFeedList(FeedList* feedList) { - connect(feedList->rootNode(), SIGNAL(signalChanged(TreeNode*)), this, SLOT(slotSetTotalUnread())); + connect(feedList->rootNode(), TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotSetTotalUnread())); slotSetTotalUnread(); } void View::disconnectFromFeedList(FeedList* feedList) { - disconnect(feedList->rootNode(), SIGNAL(signalChanged(TreeNode*)), this, SLOT(slotSetTotalUnread())); + disconnect(feedList->rootNode(), TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotSetTotalUnread())); } void View::updateTagActions() { - QStringList tags; + TQStringList tags; - QValueList<Article> selectedArticles = m_articleList->selectedArticles(); + TQValueList<Article> selectedArticles = m_articleList->selectedArticles(); - for (QValueList<Article>::ConstIterator it = selectedArticles.begin(); it != selectedArticles.end(); ++it) + for (TQValueList<Article>::ConstIterator it = selectedArticles.begin(); it != selectedArticles.end(); ++it) { - QStringList atags = (*it).tags(); - for (QStringList::ConstIterator it2 = atags.begin(); it2 != atags.end(); ++it2) + TQStringList atags = (*it).tags(); + for (TQStringList::ConstIterator it2 = atags.begin(); it2 != atags.end(); ++it2) { if (!tags.contains(*it2)) tags += *it2; diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h index 599f8cfdc..303de0aa6 100644 --- a/akregator/src/akregator_view.h +++ b/akregator/src/akregator_view.h @@ -27,8 +27,8 @@ #ifndef _AKREGATORVIEW_H_ #define _AKREGATORVIEW_H_ -#include <qpixmap.h> -#include <qwidget.h> +#include <tqpixmap.h> +#include <tqwidget.h> #include <kurl.h> @@ -86,9 +86,9 @@ namespace Akregator { @param part the Akregator::Part which contains this widget @param parent parent widget @param Actionmanager for this view - @param name the name of the widget (@ref QWidget ) + @param name the name of the widget (@ref TQWidget ) */ - View(Akregator::Part *part, QWidget *parent, ActionManagerImpl* actionManager, const char* name); + View(Akregator::Part *part, TQWidget *parent, ActionManagerImpl* actionManager, const char* name); /** destructor. Note that cleanups should be done in slotOnShutdown(), so we don't risk accessing self-deleting objects after deletion. */ @@ -101,18 +101,18 @@ namespace Akregator { /** Adds the feeds in @c doc to the "Imported Folder" @param doc the DOM tree (OPML) of the feeds to import */ - bool importFeeds(const QDomDocument& doc); + 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 replaced by the parsed one - @param doc QDomDocument generated from OPML + @param doc TQDomDocument generated from OPML @param parent The parent group the new nodes */ - bool loadFeeds(const QDomDocument& doc, Folder* parent = 0); + bool loadFeeds(const TQDomDocument& doc, Folder* parent = 0); /** @return the displayed Feed List in OPML format */ - QDomDocument feedListToOPML(); + TQDomDocument feedListToOPML(); /** Add a feed to a group. @@ -120,7 +120,7 @@ namespace Akregator { @param group The name of the folder into which the feed is added. If the group does not exist, it is created. The feed is added as the last member of the group. */ - void addFeedToGroup(const QString& url, const QString& group); + void addFeedToGroup(const TQString& url, const TQString& group); /** session management **/ virtual void readProperties(KConfig* config); @@ -132,12 +132,12 @@ namespace Akregator { /** emitted when the unread count of "All Feeds" was changed */ void signalUnreadCountChanged(int); - void setWindowCaption(const QString&); - void setStatusBarText(const QString&); + void setWindowCaption(const TQString&); + void setStatusBarText(const TQString&); void setProgress(int); void signalStarted(KIO::Job*); void signalCompleted(); - void signalCanceled(const QString&); + void signalCanceled(const TQString&); public slots: @@ -150,16 +150,16 @@ namespace Akregator { void slotArticleSelected(const Article&); /** Shows requested popup menu for feed tree */ - void slotFeedTreeContextMenu(KListView*, TreeNode*, const QPoint&); + void slotFeedTreeContextMenu(KListView*, TreeNode*, const TQPoint&); /** emits @ref signalUnreadCountChanged(int) */ void slotSetTotalUnread(); /** special behaviour in article list view (TODO: move code there?) */ - void slotMouseButtonPressed(int button, const Article& article, const QPoint & pos, int c); + void slotMouseButtonPressed(int button, const Article& article, const TQPoint & pos, int c); /** opens article of @c item in external browser */ - void slotOpenArticleExternal(const Article& article, const QPoint&, int); + void slotOpenArticleExternal(const Article& article, const TQPoint&, int); /** opens the current article (currentItem) in external browser TODO: use selected instead of current? */ @@ -186,7 +186,7 @@ namespace Akregator { void slotFrameChanged(Frame *f); /** sets the window caption after a frame change */ - void slotCaptionChanged(const QString &); + void slotCaptionChanged(const TQString &); /** called when URLs are dropped into the tree view */ void slotFeedURLDropped (KURL::List &urls, TreeNode* after, Folder *parent); @@ -195,10 +195,10 @@ namespace Akregator { void slotMouseOverInfo(const KFileItem *kifi); /** sets the status bar text to a given string */ - void slotStatusText(const QString &); + void slotStatusText(const TQString &); void slotStarted(); - void slotCanceled(const QString &); + void slotCanceled(const TQString &); void slotCompleted(); void slotLoadingProgress(int); @@ -271,7 +271,7 @@ namespace Akregator { protected: - void addFeed(const QString& url, TreeNode* after, Folder* parent, bool autoExec = true); + void addFeed(const TQString& url, TreeNode* after, Folder* parent, bool autoExec = true); void connectToFeedList(FeedList* feedList); void disconnectFromFeedList(FeedList* feedList); @@ -282,7 +282,7 @@ namespace Akregator { void connectFrame(Frame *); - void setTabIcon(const QPixmap&); + void setTabIcon(const TQPixmap&); void slotDoIntervalFetches(); void slotDeleteExpiredArticles(); @@ -308,29 +308,29 @@ namespace Akregator { ArticleViewer *m_articleViewer; TabWidget *m_tabs; - QWidget *m_mainTab; + TQWidget *m_mainTab; Frame *m_mainFrame; Frame *m_currentFrame; SearchBar* m_searchBar; - QSplitter *m_articleSplitter; - QSplitter *m_horizontalSplitter; + TQSplitter *m_articleSplitter; + TQSplitter *m_horizontalSplitter; ListTabWidget* m_listTabWidget; Akregator::Part *m_part; ViewMode m_viewMode; - QTimer *m_fetchTimer; - QTimer* m_expiryTimer; - QTimer *m_markReadTimer; + TQTimer *m_fetchTimer; + TQTimer* m_expiryTimer; + TQTimer *m_markReadTimer; bool m_shuttingDown; bool m_displayingAboutPage; ActionManagerImpl* m_actionManager; - QPixmap m_keepFlagIcon; + TQPixmap m_keepFlagIcon; friend class EditNodePropertiesVisitor; class EditNodePropertiesVisitor; EditNodePropertiesVisitor* m_editNodePropertiesVisitor; diff --git a/akregator/src/article.cpp b/akregator/src/article.cpp index eeab61dd5..75d3f7872 100644 --- a/akregator/src/article.cpp +++ b/akregator/src/article.cpp @@ -30,11 +30,11 @@ #include "shared.h" #include "utils.h" -#include <qdatetime.h> -#include <qdom.h> -#include <qregexp.h> -#include <qstringlist.h> -#include <qvaluelist.h> +#include <tqdatetime.h> +#include <tqdom.h> +#include <tqregexp.h> +#include <tqstringlist.h> +#include <tqvaluelist.h> #include <krfcdate.h> #include <kdebug.h> @@ -57,7 +57,7 @@ struct Article::Private : public Shared enum Status {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10}; - QString guid; + TQString guid; Backend::FeedStorage* archive; Feed* feed; @@ -67,7 +67,7 @@ struct Article::Private : public Shared // to read their values, you should therefore use the accessor methods of the Article // hash(), pubDate(), statusBits() rather than accessing them directly. uint hash; - QDateTime pubDate; + TQDateTime pubDate; int status; }; @@ -79,7 +79,7 @@ Article::Article() : d(new Private) d->archive = 0; } -Article::Article(const QString& guid, Feed* feed) : d(new Private) +Article::Article(const TQString& guid, Feed* feed) : d(new Private) { // this constructor should be as cheap as possible, so avoid calls to // read information from the archive in here if possible @@ -115,7 +115,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive) { // article is not deleted, let's add it to the archive d->archive->setHash(d->guid, hash() ); - QString title = article.title().isEmpty() ? buildTitle(article.description()) : article.title(); + TQString title = article.title().isEmpty() ? buildTitle(article.description()) : article.title(); d->archive->setTitle(d->guid, title); d->archive->setDescription(d->guid, article.description()); d->archive->setLink(d->guid, article.link().url()); @@ -123,14 +123,14 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive) d->archive->setCommentsLink(d->guid, article.commentsLink().url()); d->archive->setGuidIsPermaLink(d->guid, article.guidIsPermaLink()); d->archive->setGuidIsHash(d->guid, article.meta("guidIsHash") == "true"); - d->pubDate = article.pubDate().isValid() ? article.pubDate() : QDateTime::currentDateTime(); + d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::currentDateTime(); d->archive->setPubDate(d->guid, d->pubDate.toTime_t()); d->archive->setAuthor(d->guid, article.author()); - QValueList<RSS::Category> cats = article.categories(); - QValueList<RSS::Category>::ConstIterator end = cats.end(); + TQValueList<RSS::Category> cats = article.categories(); + TQValueList<RSS::Category>::ConstIterator end = cats.end(); - for (QValueList<RSS::Category>::ConstIterator it = cats.begin(); it != end; ++it) + for (TQValueList<RSS::Category>::ConstIterator it = cats.begin(); it != end; ++it) { Backend::Category cat; @@ -150,7 +150,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive) d->archive->removeEnclosure(d->guid); } - QString status = article.meta("status"); + TQString status = article.meta("status"); if (!status.isEmpty()) { @@ -170,7 +170,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive) { // if yes, update d->pubDate.setTime_t(d->archive->pubDate(d->guid)); d->archive->setHash(d->guid, hash() ); - QString title = article.title().isEmpty() ? buildTitle(article.description()) : article.title(); + TQString title = article.title().isEmpty() ? buildTitle(article.description()) : article.title(); d->archive->setTitle(d->guid, title); d->archive->setDescription(d->guid, article.description()); d->archive->setLink(d->guid, article.link().url()); @@ -325,12 +325,12 @@ void Article::setStatus(int stat) } } -QString Article::title() const +TQString Article::title() const { return d->archive->title(d->guid); } -QString Article::author() const +TQString Article::author() const { return d->archive->author(d->guid); } @@ -340,12 +340,12 @@ KURL Article::link() const return d->archive->link(d->guid); } -QString Article::description() const +TQString Article::description() const { return d->archive->description(d->guid); } -QString Article::guid() const +TQString Article::guid() const { return d->guid; } @@ -392,7 +392,7 @@ bool Article::keep() const RSS::Enclosure Article::enclosure() const { bool hasEnc; - QString url, type; + TQString url, type; int length; d->archive->enclosure(d->guid, hasEnc, url, type, length); return hasEnc ? RSS::Enclosure(url, length, type) : RSS::Enclosure(); @@ -409,26 +409,26 @@ void Article::setKeep(bool keep) d->feed->setArticleChanged(*this); } -void Article::addTag(const QString& tag) +void Article::addTag(const TQString& tag) { d->archive->addTag(d->guid, tag); if (d->feed) d->feed->setArticleChanged(*this); } -void Article::removeTag(const QString& tag) +void Article::removeTag(const TQString& tag) { d->archive->removeTag(d->guid, tag); if (d->feed) d->feed->setArticleChanged(*this); } -bool Article::hasTag(const QString& tag) const +bool Article::hasTag(const TQString& tag) const { return d->archive->tags(d->guid).contains(tag); } -QStringList Article::tags() const +TQStringList Article::tags() const { return d->archive->tags(d->guid); } @@ -436,7 +436,7 @@ QStringList Article::tags() const Feed* Article::feed() const { return d->feed; } -const QDateTime& Article::pubDate() const +const TQDateTime& Article::pubDate() const { // delayed loading of publication date information from archive if ( d->pubDate.isNull() ) @@ -447,17 +447,17 @@ const QDateTime& Article::pubDate() const return d->pubDate; } -QString Article::buildTitle(const QString& description) +TQString Article::buildTitle(const TQString& description) { - QString s = description; + TQString s = description; if (description.stripWhiteSpace().isEmpty()) return ""; int i = s.find('>',500); /*avoid processing too much */ if (i != -1) s = s.left(i+1); - QRegExp rx("(<([^\\s>]*)(?:[^>]*)>)[^<]*", false); - QString tagName, toReplace, replaceWith; + TQRegExp rx("(<([^\\s>]*)(?:[^>]*)>)[^<]*", false); + TQString tagName, toReplace, replaceWith; while (rx.search(s) != -1 ) { tagName=rx.cap(2); diff --git a/akregator/src/article.h b/akregator/src/article.h index a4dae19c6..29bbfdd77 100644 --- a/akregator/src/article.h +++ b/akregator/src/article.h @@ -58,13 +58,13 @@ namespace Akregator { public: enum Status { Unread=0, Read, New }; - typedef QValueList<Article> List; + typedef TQValueList<Article> List; Article(); /** creates am article object for an existing article. The constructor accesses the archive to load it's data */ - Article(const QString& guid, Feed* feed); + Article(const TQString& guid, Feed* feed); /** creates an article object from a parsed librss Article the article is added to the archive if not yet stored, or updated if stored but modified */ @@ -84,13 +84,13 @@ namespace Akregator void offsetPubDate(int secs); - QString title() const; + TQString title() const; KURL link() const; - QString author() const; + TQString author() const; - QString description() const; - QString guid() const; + TQString description() const; + TQString guid() const; /** if true, the article should be kept even when expired **/ bool keep() const; void setKeep(bool keep); @@ -113,16 +113,16 @@ namespace Akregator bool guidIsPermaLink() const; - const QDateTime& pubDate() const; + const TQDateTime& pubDate() const; KURL commentsLink() const; int comments() const; - void addTag(const QString& tag); - void removeTag(const QString& tag); - bool hasTag(const QString& tag) const; - QStringList tags() const; + void addTag(const TQString& tag); + void removeTag(const TQString& tag); + bool hasTag(const TQString& tag) const; + TQStringList tags() const; bool operator<(const Article &other) const; bool operator<=(const Article &other) const; @@ -132,7 +132,7 @@ namespace Akregator private: void initialize(RSS::Article article, Backend::FeedStorage* archive); - static QString buildTitle(const QString& description); + static TQString buildTitle(const TQString& description); int statusBits() const; // returns all of the status bits for the article. this // differs from status() which only returns the most relevant diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp index f21605fad..a8bf8a365 100644 --- a/akregator/src/articlefilter.cpp +++ b/akregator/src/articlefilter.cpp @@ -33,77 +33,77 @@ #include <kdebug.h> #include <kurl.h> -#include <qregexp.h> +#include <tqregexp.h> namespace Akregator { namespace Filters { -QString Criterion::subjectToString(Subject subj) +TQString Criterion::subjectToString(Subject subj) { switch (subj) { case Title: - return QString::fromLatin1("Title"); + return TQString::fromLatin1("Title"); case Link: - return QString::fromLatin1("Link"); + return TQString::fromLatin1("Link"); case Author: - return QString::fromLatin1("Author"); + return TQString::fromLatin1("Author"); case Description: - return QString::fromLatin1("Description"); + return TQString::fromLatin1("Description"); case Status: - return QString::fromLatin1("Status"); + return TQString::fromLatin1("Status"); case KeepFlag: - return QString::fromLatin1("KeepFlag"); + return TQString::fromLatin1("KeepFlag"); default: // should never happen (TM) - return QString::fromLatin1("Description"); + return TQString::fromLatin1("Description"); } } -Criterion::Subject Criterion::stringToSubject(const QString& subjStr) +Criterion::Subject Criterion::stringToSubject(const TQString& subjStr) { - if (subjStr == QString::fromLatin1("Title")) + if (subjStr == TQString::fromLatin1("Title")) return Title; - else if (subjStr == QString::fromLatin1("Link")) + else if (subjStr == TQString::fromLatin1("Link")) return Link; - else if (subjStr == QString::fromLatin1("Description")) + else if (subjStr == TQString::fromLatin1("Description")) return Description; - else if (subjStr == QString::fromLatin1("Author")) + else if (subjStr == TQString::fromLatin1("Author")) return Author; - else if (subjStr == QString::fromLatin1("Status")) + else if (subjStr == TQString::fromLatin1("Status")) return Status; - else if (subjStr == QString::fromLatin1("KeepFlag")) + else if (subjStr == TQString::fromLatin1("KeepFlag")) return KeepFlag; // hopefully never reached return Description; } -QString Criterion::predicateToString(Predicate pred) +TQString Criterion::predicateToString(Predicate pred) { switch (pred) { case Contains: - return QString::fromLatin1("Contains"); + return TQString::fromLatin1("Contains"); case Equals: - return QString::fromLatin1("Equals"); + return TQString::fromLatin1("Equals"); case Matches: - return QString::fromLatin1("Matches"); + return TQString::fromLatin1("Matches"); case Negation: - return QString::fromLatin1("Negation"); + return TQString::fromLatin1("Negation"); default:// hopefully never reached - return QString::fromLatin1("Contains"); + return TQString::fromLatin1("Contains"); } } -Criterion::Predicate Criterion::stringToPredicate(const QString& predStr) +Criterion::Predicate Criterion::stringToPredicate(const TQString& predStr) { - if (predStr == QString::fromLatin1("Contains")) + if (predStr == TQString::fromLatin1("Contains")) return Contains; - else if (predStr == QString::fromLatin1("Equals")) + else if (predStr == TQString::fromLatin1("Equals")) return Equals; - else if (predStr == QString::fromLatin1("Matches")) + else if (predStr == TQString::fromLatin1("Matches")) return Matches; - else if (predStr == QString::fromLatin1("Negation")) + else if (predStr == TQString::fromLatin1("Negation")) return Negation; // hopefully never reached @@ -114,7 +114,7 @@ Criterion::Criterion() { } -Criterion::Criterion( Subject subject, Predicate predicate, const QVariant &object ) +Criterion::Criterion( Subject subject, Predicate predicate, const TQVariant &object ) : m_subject( subject ) , m_predicate( predicate ) , m_object( object ) @@ -124,50 +124,50 @@ Criterion::Criterion( Subject subject, Predicate predicate, const QVariant &obje void Criterion::writeConfig(KConfig* config) const { - config->writeEntry(QString::fromLatin1("subject"), subjectToString(m_subject)); + config->writeEntry(TQString::fromLatin1("subject"), subjectToString(m_subject)); - config->writeEntry(QString::fromLatin1("predicate"), predicateToString(m_predicate)); + config->writeEntry(TQString::fromLatin1("predicate"), predicateToString(m_predicate)); - config->writeEntry(QString::fromLatin1("objectType"), QString(m_object.typeName())); + config->writeEntry(TQString::fromLatin1("objectType"), TQString(m_object.typeName())); - config->writeEntry(QString::fromLatin1("objectValue"), m_object); + config->writeEntry(TQString::fromLatin1("objectValue"), m_object); } void Criterion::readConfig(KConfig* config) { - m_subject = stringToSubject(config->readEntry(QString::fromLatin1("subject"))); - m_predicate = stringToPredicate(config->readEntry(QString::fromLatin1("predicate"))); - QVariant::Type type = QVariant::nameToType(config->readEntry(QString::fromLatin1("objType")).ascii()); + m_subject = stringToSubject(config->readEntry(TQString::fromLatin1("subject"))); + m_predicate = stringToPredicate(config->readEntry(TQString::fromLatin1("predicate"))); + TQVariant::Type type = TQVariant::nameToType(config->readEntry(TQString::fromLatin1("objType")).ascii()); - if (type != QVariant::Invalid) + if (type != TQVariant::Invalid) { - m_object = config->readPropertyEntry(QString::fromLatin1("objectValue"), type); + m_object = config->readPropertyEntry(TQString::fromLatin1("objectValue"), type); } } bool Criterion::satisfiedBy( const Article &article ) const { - QVariant concreteSubject; + TQVariant concreteSubject; switch ( m_subject ) { case Title: - concreteSubject = QVariant(article.title()); + concreteSubject = TQVariant(article.title()); break; case Description: - concreteSubject = QVariant(article.description()); + concreteSubject = TQVariant(article.description()); break; case Author: - concreteSubject = QVariant(article.author()); + concreteSubject = TQVariant(article.author()); break; case Link: // ### Maybe use prettyURL here? - concreteSubject = QVariant(article.link().url()); + concreteSubject = TQVariant(article.link().url()); break; case Status: - concreteSubject = QVariant(article.status()); + concreteSubject = TQVariant(article.status()); break; case KeepFlag: - concreteSubject = QVariant(article.keep()); + concreteSubject = TQVariant(article.keep()); default: break; } @@ -175,7 +175,7 @@ bool Criterion::satisfiedBy( const Article &article ) const bool satisfied = false; const Predicate predicateType = static_cast<Predicate>( m_predicate & ~Negation ); - QString subjectType=concreteSubject.typeName(); + TQString subjectType=concreteSubject.typeName(); switch ( predicateType ) { case Contains: @@ -188,7 +188,7 @@ bool Criterion::satisfiedBy( const Article &article ) const satisfied = concreteSubject.toString() == m_object.toString(); break; case Matches: - satisfied = QRegExp( m_object.toString() ).search( concreteSubject.toString() ) != -1; + satisfied = TQRegExp( m_object.toString() ).search( concreteSubject.toString() ) != -1; break; default: kdDebug() << "Internal inconsistency; predicateType should never be Negation" << endl; @@ -212,7 +212,7 @@ Criterion::Predicate Criterion::predicate() const return m_predicate; } -QVariant Criterion::object() const +TQVariant Criterion::object() const { return m_object; } @@ -236,7 +236,7 @@ ArticleMatcher* ArticleMatcher::clone() const return new ArticleMatcher(*this); } -ArticleMatcher::ArticleMatcher( const QValueList<Criterion> &criteria, Association assoc) +ArticleMatcher::ArticleMatcher( const TQValueList<Criterion> &criteria, Association assoc) : m_criteria( criteria ) , m_association( assoc ) { @@ -269,15 +269,15 @@ bool ArticleMatcher::matches( const Article &a ) const void ArticleMatcher::writeConfig(KConfig* config) const { - config->writeEntry(QString::fromLatin1("matcherAssociation"), associationToString(m_association)); + config->writeEntry(TQString::fromLatin1("matcherAssociation"), associationToString(m_association)); - config->writeEntry(QString::fromLatin1("matcherCriteriaCount"), m_criteria.count()); + config->writeEntry(TQString::fromLatin1("matcherCriteriaCount"), m_criteria.count()); int index = 0; - for (QValueList<Criterion>::ConstIterator it = m_criteria.begin(); it != m_criteria.end(); ++it) + for (TQValueList<Criterion>::ConstIterator it = m_criteria.begin(); it != m_criteria.end(); ++it) { - config->setGroup(config->group()+QString::fromLatin1("_Criterion")+QString::number(index)); + config->setGroup(config->group()+TQString::fromLatin1("_Criterion")+TQString::number(index)); (*it).writeConfig(config); ++index; } @@ -286,14 +286,14 @@ void ArticleMatcher::writeConfig(KConfig* config) const void ArticleMatcher::readConfig(KConfig* config) { m_criteria.clear(); - m_association = stringToAssociation(config->readEntry(QString::fromLatin1("matcherAssociation"))); + m_association = stringToAssociation(config->readEntry(TQString::fromLatin1("matcherAssociation"))); - int count = config->readNumEntry(QString::fromLatin1("matcherCriteriaCount"), 0); + int count = config->readNumEntry(TQString::fromLatin1("matcherCriteriaCount"), 0); for (int i = 0; i < count; ++i) { Criterion c; - config->setGroup(config->group()+QString::fromLatin1("_Criterion")+QString::number(i)); + config->setGroup(config->group()+TQString::fromLatin1("_Criterion")+TQString::number(i)); c.readConfig(config); m_criteria.append(c); } @@ -317,8 +317,8 @@ bool ArticleMatcher::anyCriterionMatches( const Article &a ) const { if (m_criteria.count()==0) return true; - QValueList<Criterion>::ConstIterator it = m_criteria.begin(); - QValueList<Criterion>::ConstIterator end = m_criteria.end(); + TQValueList<Criterion>::ConstIterator it = m_criteria.begin(); + TQValueList<Criterion>::ConstIterator end = m_criteria.end(); for ( ; it != end; ++it ) { if ( ( *it ).satisfiedBy( a ) ) { return true; @@ -331,8 +331,8 @@ bool ArticleMatcher::allCriteriaMatch( const Article &a ) const { if (m_criteria.count()==0) return true; - QValueList<Criterion>::ConstIterator it = m_criteria.begin(); - QValueList<Criterion>::ConstIterator end = m_criteria.end(); + TQValueList<Criterion>::ConstIterator it = m_criteria.begin(); + TQValueList<Criterion>::ConstIterator end = m_criteria.end(); for ( ; it != end; ++it ) { if ( !( *it ).satisfiedBy( a ) ) { return false; @@ -341,26 +341,26 @@ bool ArticleMatcher::allCriteriaMatch( const Article &a ) const return true; } -ArticleMatcher::Association ArticleMatcher::stringToAssociation(const QString& assocStr) +ArticleMatcher::Association ArticleMatcher::stringToAssociation(const TQString& assocStr) { - if (assocStr == QString::fromLatin1("LogicalAnd")) + if (assocStr == TQString::fromLatin1("LogicalAnd")) return LogicalAnd; - else if (assocStr == QString::fromLatin1("LogicalOr")) + else if (assocStr == TQString::fromLatin1("LogicalOr")) return LogicalOr; else return None; } -QString ArticleMatcher::associationToString(Association association) +TQString ArticleMatcher::associationToString(Association association) { switch (association) { case LogicalAnd: - return QString::fromLatin1("LogicalAnd"); + return TQString::fromLatin1("LogicalAnd"); case LogicalOr: - return QString::fromLatin1("LogicalOr"); + return TQString::fromLatin1("LogicalOr"); default: - return QString::fromLatin1("None"); + return TQString::fromLatin1("None"); } } @@ -368,14 +368,14 @@ QString ArticleMatcher::associationToString(Association association) class TagMatcher::TagMatcherPrivate { public: - QString tagID; + TQString tagID; bool operator==(const TagMatcherPrivate& other) const { return tagID == other.tagID; } }; -TagMatcher::TagMatcher(const QString& tagID) : d(new TagMatcherPrivate) +TagMatcher::TagMatcher(const TQString& tagID) : d(new TagMatcherPrivate) { d->tagID = tagID; } @@ -408,13 +408,13 @@ TagMatcher::TagMatcher(const TagMatcher& other) : AbstractMatcher(other), d(0) void TagMatcher::writeConfig(KConfig* config) const { - config->writeEntry(QString::fromLatin1("matcherType"), QString::fromLatin1("TagMatcher")); - config->writeEntry(QString::fromLatin1("matcherParams"), d->tagID); + config->writeEntry(TQString::fromLatin1("matcherType"), TQString::fromLatin1("TagMatcher")); + config->writeEntry(TQString::fromLatin1("matcherParams"), d->tagID); } void TagMatcher::readConfig(KConfig* config) { - d->tagID = config->readEntry(QString::fromLatin1("matcherParams")); + d->tagID = config->readEntry(TQString::fromLatin1("matcherParams")); } bool TagMatcher::operator==(const AbstractMatcher& other) const @@ -464,13 +464,13 @@ void SetStatusAction::setStatus(int status) void SetStatusAction::writeConfig(KConfig* config) const { - config->writeEntry(QString::fromLatin1("actionType"), QString::fromLatin1("SetStatusAction")); - config->writeEntry(QString::fromLatin1("actionParams"), m_status); + config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("SetStatusAction")); + config->writeEntry(TQString::fromLatin1("actionParams"), m_status); } void SetStatusAction::readConfig(KConfig* config) { - m_status = config->readNumEntry(QString::fromLatin1("actionParams"), Article::Read); + m_status = config->readNumEntry(TQString::fromLatin1("actionParams"), Article::Read); } bool SetStatusAction::operator==(const AbstractAction& other) @@ -484,7 +484,7 @@ bool SetStatusAction::operator==(const AbstractAction& other) } -AssignTagAction::AssignTagAction(const QString& tagID) : m_tagID(tagID) +AssignTagAction::AssignTagAction(const TQString& tagID) : m_tagID(tagID) { } @@ -499,7 +499,7 @@ class ArticleFilter::ArticleFilterPrivate : public Shared public: AbstractAction* action; AbstractMatcher* matcher; - QString name; + TQString name; int id; }; @@ -581,12 +581,12 @@ bool ArticleFilter::operator==(const ArticleFilter& other) const void ArticleFilterList::writeConfig(KConfig* config) const { - config->setGroup(QString::fromLatin1("Filters")); - config->writeEntry(QString::fromLatin1("count"), count()); + config->setGroup(TQString::fromLatin1("Filters")); + config->writeEntry(TQString::fromLatin1("count"), count()); int index = 0; for (ArticleFilterList::ConstIterator it = begin(); it != end(); ++it) { - config->setGroup(QString::fromLatin1("Filters_")+QString::number(index)); + config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(index)); (*it).writeConfig(config); ++index; } @@ -595,11 +595,11 @@ void ArticleFilterList::writeConfig(KConfig* config) const void ArticleFilterList::readConfig(KConfig* config) { clear(); - config->setGroup(QString::fromLatin1("Filters")); - int count = config->readNumEntry(QString::fromLatin1("count"), 0); + config->setGroup(TQString::fromLatin1("Filters")); + int count = config->readNumEntry(TQString::fromLatin1("count"), 0); for (int i = 0; i < count; ++i) { - config->setGroup(QString::fromLatin1("Filters_")+QString::number(i)); + config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(i)); ArticleFilter filter; filter.readConfig(config); append(filter); @@ -609,13 +609,13 @@ void ArticleFilterList::readConfig(KConfig* config) void AssignTagAction::readConfig(KConfig* config) { - m_tagID = config->readEntry(QString::fromLatin1("actionParams")); + m_tagID = config->readEntry(TQString::fromLatin1("actionParams")); } void AssignTagAction::writeConfig(KConfig* config) const { - config->writeEntry(QString::fromLatin1("actionType"), QString::fromLatin1("AssignTagAction")); - config->writeEntry(QString::fromLatin1("actionParams"), m_tagID); + config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("AssignTagAction")); + config->writeEntry(TQString::fromLatin1("actionParams"), m_tagID); } bool AssignTagAction::operator==(const AbstractAction& other) @@ -628,12 +628,12 @@ bool AssignTagAction::operator==(const AbstractAction& other) return m_tagID == o->m_tagID; } -const QString& AssignTagAction::tagID() const +const TQString& AssignTagAction::tagID() const { return m_tagID; } -void AssignTagAction::setTagID(const QString& tagID) +void AssignTagAction::setTagID(const TQString& tagID) { m_tagID = tagID; } @@ -644,7 +644,7 @@ void DeleteAction::readConfig(KConfig* /*config*/) void DeleteAction::writeConfig(KConfig* config) const { - config->writeEntry(QString::fromLatin1("actionType"), QString::fromLatin1("DeleteAction")); + config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("DeleteAction")); } bool DeleteAction::operator==(const AbstractAction& other) @@ -661,27 +661,27 @@ void ArticleFilter::readConfig(KConfig* config) delete d->action; d->action = 0; - d->name = config->readEntry(QString::fromLatin1("name")); - d->id = config->readNumEntry(QString::fromLatin1("id"), 0); + d->name = config->readEntry(TQString::fromLatin1("name")); + d->id = config->readNumEntry(TQString::fromLatin1("id"), 0); - QString matcherType = config->readEntry(QString::fromLatin1("matcherType")); + TQString matcherType = config->readEntry(TQString::fromLatin1("matcherType")); - if (matcherType == QString::fromLatin1("TagMatcher")) + if (matcherType == TQString::fromLatin1("TagMatcher")) d->matcher = new TagMatcher(); - else if (matcherType == QString::fromLatin1("ArticleMatcher")) + else if (matcherType == TQString::fromLatin1("ArticleMatcher")) d->matcher = new ArticleMatcher(); if (d->matcher) d->matcher->readConfig(config); - QString actionType = config->readEntry(QString::fromLatin1("actionType")); + TQString actionType = config->readEntry(TQString::fromLatin1("actionType")); - if (actionType == QString::fromLatin1("AssignTagAction")) + if (actionType == TQString::fromLatin1("AssignTagAction")) d->action = new AssignTagAction(); - else if (actionType == QString::fromLatin1("DeleteAction")) + else if (actionType == TQString::fromLatin1("DeleteAction")) d->action = new DeleteAction(); - else if (actionType == QString::fromLatin1("SetStatusAction")) + else if (actionType == TQString::fromLatin1("SetStatusAction")) d->action = new SetStatusAction(); if (d->action) @@ -690,18 +690,18 @@ void ArticleFilter::readConfig(KConfig* config) void ArticleFilter::writeConfig(KConfig* config) const { - config->writeEntry(QString::fromLatin1("name"), d->name); - config->writeEntry(QString::fromLatin1("id"), d->id); + config->writeEntry(TQString::fromLatin1("name"), d->name); + config->writeEntry(TQString::fromLatin1("id"), d->id); d->matcher->writeConfig(config); d->action->writeConfig(config); } -void ArticleFilter::setName(const QString& name) +void ArticleFilter::setName(const TQString& name) { d->name = name; } -const QString& ArticleFilter::name() const +const TQString& ArticleFilter::name() const { return d->name; } diff --git a/akregator/src/articlefilter.h b/akregator/src/articlefilter.h index 6acdcbc4f..9a9b4a76d 100644 --- a/akregator/src/articlefilter.h +++ b/akregator/src/articlefilter.h @@ -28,9 +28,9 @@ #ifndef ARTICLEFILTER_H #define ARTICLEFILTER_H -#include <qstring.h> -#include <qvaluelist.h> -#include <qvariant.h> +#include <tqstring.h> +#include <tqvaluelist.h> +#include <tqvariant.h> class KConfig; @@ -63,8 +63,8 @@ class ArticleFilter /** name of the filter, for display in filter list */ - const QString& name() const; - void setName(const QString& name); + const TQString& name() const; + void setName(const TQString& name); int id() const; @@ -86,7 +86,7 @@ class ArticleFilter }; -class ArticleFilterList : public QValueList<ArticleFilter> +class ArticleFilterList : public TQValueList<ArticleFilter> { public: @@ -119,7 +119,7 @@ class TagMatcher : public AbstractMatcher public: TagMatcher(); - TagMatcher(const QString& tagID); + TagMatcher(const TQString& tagID); TagMatcher(const TagMatcher& other); virtual ~TagMatcher(); @@ -190,11 +190,11 @@ class AssignTagAction : public AbstractAction { public: - AssignTagAction(const QString& tagID=QString::null); + AssignTagAction(const TQString& tagID=TQString::null); virtual void exec(Article& article); - const QString& tagID() const; - void setTagID(const QString& tagID); + const TQString& tagID() const; + void setTagID(const TQString& tagID); virtual void writeConfig(KConfig* config) const; virtual void readConfig(KConfig* config); @@ -203,7 +203,7 @@ class AssignTagAction : public AbstractAction virtual bool operator==(const AbstractAction& other); private: - QString m_tagID; + TQString m_tagID; }; /** a powerful matcher supporting multiple criterions, which can be combined via logical OR or AND @@ -218,7 +218,7 @@ class ArticleMatcher : public AbstractMatcher }; ArticleMatcher(); - ArticleMatcher( const QValueList<Criterion> &criteria, Association assoc); + ArticleMatcher( const TQValueList<Criterion> &criteria, Association assoc); ArticleMatcher(const ArticleMatcher& other); virtual ~ArticleMatcher(); @@ -241,13 +241,13 @@ class ArticleMatcher : public AbstractMatcher private: - static Association stringToAssociation(const QString& assocStr); - static QString associationToString(Association association); + static Association stringToAssociation(const TQString& assocStr); + static TQString associationToString(Association association); bool anyCriterionMatches( const Article &a ) const; bool allCriteriaMatch( const Article &a ) const; - QValueList<Criterion> m_criteria; + TQValueList<Criterion> m_criteria; Association m_association; }; @@ -262,8 +262,8 @@ class Criterion Title, Description, Author, Link, Status, KeepFlag }; - static QString subjectToString(Subject subj); - static Subject stringToSubject(const QString& subjStr); + static TQString subjectToString(Subject subj); + static Subject stringToSubject(const TQString& subjStr); enum Predicate { Contains = 0x01, @@ -272,11 +272,11 @@ class Criterion Negation = 0x80 }; - static QString predicateToString(Predicate pred); - static Predicate stringToPredicate(const QString& predStr); + static TQString predicateToString(Predicate pred); + static Predicate stringToPredicate(const TQString& predStr); Criterion(); - Criterion( Subject subject, Predicate predicate, const QVariant &object ); + Criterion( Subject subject, Predicate predicate, const TQVariant &object ); bool satisfiedBy( const Article &article ) const; @@ -285,14 +285,14 @@ class Criterion Subject subject() const; Predicate predicate() const; - QVariant object() const; + TQVariant object() const; bool operator==(const Criterion& other) const { return m_subject == other.m_subject && m_predicate == other.m_predicate && m_object == other.m_object; } private: Subject m_subject; Predicate m_predicate; - QVariant m_object; + TQVariant m_object; }; } // namespace Filters diff --git a/akregator/src/articleinterceptor.cpp b/akregator/src/articleinterceptor.cpp index c184713ad..7183ab8e2 100644 --- a/akregator/src/articleinterceptor.cpp +++ b/akregator/src/articleinterceptor.cpp @@ -1,7 +1,7 @@ #include "article.h" #include "articleinterceptor.h" -#include <qvaluelist.h> +#include <tqvaluelist.h> #include <kstaticdeleter.h> namespace Akregator @@ -10,7 +10,7 @@ namespace Akregator class ArticleInterceptorManager::ArticleInterceptorManagerPrivate { public: - QValueList<ArticleInterceptor*> interceptors; + TQValueList<ArticleInterceptor*> interceptors; }; @@ -43,7 +43,7 @@ void ArticleInterceptorManager::removeInterceptor(ArticleInterceptor* intercepto d->interceptors.remove(interceptor); } -QValueList<ArticleInterceptor*> ArticleInterceptorManager::interceptors() const +TQValueList<ArticleInterceptor*> ArticleInterceptorManager::interceptors() const { return d->interceptors; } diff --git a/akregator/src/articleinterceptor.h b/akregator/src/articleinterceptor.h index ed3c550c0..137d88856 100644 --- a/akregator/src/articleinterceptor.h +++ b/akregator/src/articleinterceptor.h @@ -33,7 +33,7 @@ class AKREGATOR_EXPORT ArticleInterceptorManager void addInterceptor(ArticleInterceptor* interceptor); void removeInterceptor(ArticleInterceptor* interceptor); - QValueList<ArticleInterceptor*> interceptors() const; + TQValueList<ArticleInterceptor*> interceptors() const; private: static ArticleInterceptorManager* m_self; diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp index 210da275b..72527822c 100644 --- a/akregator/src/articlelistview.cpp +++ b/akregator/src/articlelistview.cpp @@ -40,17 +40,17 @@ #include <kcharsets.h> #include <kurl.h> -#include <qdatetime.h> -#include <qpixmap.h> -#include <qpopupmenu.h> -#include <qptrlist.h> -#include <qvaluelist.h> -#include <qwhatsthis.h> -#include <qheader.h> -#include <qdragobject.h> -#include <qsimplerichtext.h> -#include <qpainter.h> -#include <qapplication.h> +#include <tqdatetime.h> +#include <tqpixmap.h> +#include <tqpopupmenu.h> +#include <tqptrlist.h> +#include <tqvaluelist.h> +#include <tqwhatsthis.h> +#include <tqheader.h> +#include <tqdragobject.h> +#include <tqsimplerichtext.h> +#include <tqpainter.h> +#include <tqapplication.h> #include <ctime> @@ -73,7 +73,7 @@ class ArticleListView::ArticleListViewPrivate ArticleListView* m_parent; /** maps article to article item */ - QMap<Article, ArticleItem*> articleMap; + TQMap<Article, ArticleItem*> articleMap; TreeNode* node; Akregator::Filters::ArticleMatcher textFilter; Akregator::Filters::ArticleMatcher statusFilter; @@ -131,13 +131,13 @@ class ArticleListView::ArticleItem : public KListViewItem friend class ArticleListView; public: - ArticleItem( QListView *parent, const Article& a); + ArticleItem( TQListView *parent, const Article& a); ~ArticleItem(); Article& article(); - void paintCell ( QPainter * p, const QColorGroup & cg, int column, int width, int align ); - virtual int compare(QListViewItem *i, int col, bool ascending) const; + void paintCell ( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ); + virtual int compare(TQListViewItem *i, int col, bool ascending) const; void updateItem(const Article& article); @@ -148,14 +148,14 @@ class ArticleListView::ArticleItem : public KListViewItem private: Article m_article; time_t m_pubDate; - static QPixmap keepFlag() { - static QPixmap s_keepFlag = QPixmap(locate("data", "akregator/pics/akregator_flag.png")); + static TQPixmap keepFlag() { + static TQPixmap s_keepFlag = TQPixmap(locate("data", "akregator/pics/akregator_flag.png")); return s_keepFlag; } }; // FIXME: Remove resolveEntities for KDE 4.0, it's now done in the parser -ArticleListView::ArticleItem::ArticleItem( QListView *parent, const Article& a) +ArticleListView::ArticleItem::ArticleItem( TQListView *parent, const Article& a) : KListViewItem( parent, KCharsets::resolveEntities(a.title()), a.feed()->title(), KGlobal::locale()->formatDateTime(a.pubDate(), true, false) ), m_article(a), m_pubDate(a.pubDate().toTime_t()) { if (a.keep()) @@ -172,19 +172,19 @@ Article& ArticleListView::ArticleItem::article() } // paint ze peons -void ArticleListView::ArticleItem::paintCell ( QPainter * p, const QColorGroup & cg, int column, int width, int align ) +void ArticleListView::ArticleItem::paintCell ( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ) { if (article().status() == Article::Read) KListViewItem::paintCell( p, cg, column, width, align ); else { // if article status is unread or new, we change the color: FIXME: make colors configurable - QColorGroup cg2(cg); + TQColorGroup cg2(cg); if (article().status() == Article::Unread) - cg2.setColor(QColorGroup::Text, Qt::blue); + cg2.setColor(TQColorGroup::Text, Qt::blue); else // New - cg2.setColor(QColorGroup::Text, Qt::red); + cg2.setColor(TQColorGroup::Text, Qt::red); KListViewItem::paintCell( p, cg2, column, width, align ); } @@ -194,13 +194,13 @@ void ArticleListView::ArticleItem::paintCell ( QPainter * p, const QColorGroup & void ArticleListView::ArticleItem::updateItem(const Article& article) { m_article = article; - setPixmap(0, m_article.keep() ? keepFlag() : QPixmap()); + setPixmap(0, m_article.keep() ? keepFlag() : TQPixmap()); setText(0, KCharsets::resolveEntities(m_article.title())); setText(1, m_article.feed()->title()); setText(2, KGlobal::locale()->formatDateTime(m_article.pubDate(), true, false)); } -int ArticleListView::ArticleItem::compare(QListViewItem *i, int col, bool ascending) const { +int ArticleListView::ArticleItem::compare(TQListViewItem *i, int col, bool ascending) const { if (col == 2) { ArticleItem* item = static_cast<ArticleItem*>(i); @@ -213,7 +213,7 @@ int ArticleListView::ArticleItem::compare(QListViewItem *i, int col, bool ascend /* ==================================================================================== */ -ArticleListView::ArticleListView(QWidget *parent, const char *name) +ArticleListView::ArticleListView(TQWidget *parent, const char *name) : KListView(parent, name) { d = new ArticleListViewPrivate(this); @@ -226,10 +226,10 @@ ArticleListView::ArticleListView(QWidget *parent, const char *name) addColumn(i18n("Article")); addColumn(i18n("Feed")); addColumn(i18n("Date")); - setSelectionMode(QListView::Extended); - setColumnWidthMode(2, QListView::Maximum); - setColumnWidthMode(1, QListView::Manual); - setColumnWidthMode(0, QListView::Manual); + setSelectionMode(TQListView::Extended); + setColumnWidthMode(2, TQListView::Maximum); + setColumnWidthMode(1, TQListView::Manual); + setColumnWidthMode(0, TQListView::Manual); setRootIsDecorated(false); setItemsRenameable(false); setItemsMovable(false); @@ -266,18 +266,18 @@ ArticleListView::ArticleListView(QWidget *parent, const char *name) header()->setStretchEnabled(true, 0); - QWhatsThis::add(this, i18n("<h2>Article list</h2>" + TQWhatsThis::add(this, i18n("<h2>Article list</h2>" "Here you can browse articles from the currently selected feed. " "You can also manage articles, as marking them as persistent (\"Keep Article\") or delete them, using the right mouse button menu." "To view the web page of the article, you can open the article internally in a tab or in an external browser window.")); - connect(this, SIGNAL(currentChanged(QListViewItem*)), this, SLOT(slotCurrentChanged(QListViewItem* ))); - connect(this, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged())); - connect(this, SIGNAL(doubleClicked(QListViewItem*, const QPoint&, int)), this, SLOT(slotDoubleClicked(QListViewItem*, const QPoint&, int)) ); - connect(this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(slotContextMenu(KListView*, QListViewItem*, const QPoint&))); + connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(slotCurrentChanged(TQListViewItem* ))); + connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(slotDoubleClicked(TQListViewItem*, const TQPoint&, int)) ); + connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&))); - connect(this, SIGNAL(mouseButtonPressed(int, QListViewItem *, const QPoint &, int)), this, SLOT(slotMouseButtonPressed(int, QListViewItem *, const QPoint &, int))); + connect(this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT(slotMouseButtonPressed(int, TQListViewItem *, const TQPoint &, int))); } Article ArticleListView::currentArticle() const @@ -314,10 +314,10 @@ void ArticleListView::slotShowNode(TreeNode* node) setUpdatesEnabled(false); - QValueList<Article> articles = d->node->articles(); + TQValueList<Article> articles = d->node->articles(); - QValueList<Article>::ConstIterator end = articles.end(); - QValueList<Article>::ConstIterator it = articles.begin(); + TQValueList<Article>::ConstIterator end = articles.end(); + TQValueList<Article>::ConstIterator it = articles.begin(); for (; it != end; ++it) { @@ -345,14 +345,14 @@ void ArticleListView::slotClear() clear(); } -void ArticleListView::slotArticlesAdded(TreeNode* /*node*/, const QValueList<Article>& list) +void ArticleListView::slotArticlesAdded(TreeNode* /*node*/, const TQValueList<Article>& list) { setUpdatesEnabled(false); bool statusActive = !(d->statusFilter.matchesAll()); bool textActive = !(d->textFilter.matchesAll()); - for (QValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it) + for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it) { if (!d->articleMap.contains(*it)) { @@ -369,7 +369,7 @@ void ArticleListView::slotArticlesAdded(TreeNode* /*node*/, const QValueList<Art triggerUpdate(); } -void ArticleListView::slotArticlesUpdated(TreeNode* /*node*/, const QValueList<Article>& list) +void ArticleListView::slotArticlesUpdated(TreeNode* /*node*/, const TQValueList<Article>& list) { setUpdatesEnabled(false); @@ -380,9 +380,9 @@ void ArticleListView::slotArticlesUpdated(TreeNode* /*node*/, const QValueList<A bool statusActive = !(d->statusFilter.matchesAll()); bool textActive = !(d->textFilter.matchesAll()); - QListViewItem* next = 0; // the item to select if a selected item is deleted + TQListViewItem* next = 0; // the item to select if a selected item is deleted - for (QValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it) + for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it) { if (!(*it).isNull() && d->articleMap.contains(*it)) @@ -435,17 +435,17 @@ void ArticleListView::slotArticlesUpdated(TreeNode* /*node*/, const QValueList<A triggerUpdate(); } -void ArticleListView::slotArticlesRemoved(TreeNode* /*node*/, const QValueList<Article>& list) +void ArticleListView::slotArticlesRemoved(TreeNode* /*node*/, const TQValueList<Article>& list) { // if only one item is selected and this selected item // is deleted, we will select the next item in the list bool singleSelected = selectedArticles().count() == 1; - QListViewItem* next = 0; // the item to select if a selected item is deleted + TQListViewItem* next = 0; // the item to select if a selected item is deleted setUpdatesEnabled(false); - for (QValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it) + for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it) { if (d->articleMap.contains(*it)) { @@ -482,18 +482,18 @@ void ArticleListView::slotArticlesRemoved(TreeNode* /*node*/, const QValueList<A void ArticleListView::connectToNode(TreeNode* node) { - connect(node, SIGNAL(signalDestroyed(TreeNode*)), this, SLOT(slotClear()) ); - connect(node, SIGNAL(signalArticlesAdded(TreeNode*, const QValueList<Article>&)), this, SLOT(slotArticlesAdded(TreeNode*, const QValueList<Article>&)) ); - connect(node, SIGNAL(signalArticlesUpdated(TreeNode*, const QValueList<Article>&)), this, SLOT(slotArticlesUpdated(TreeNode*, const QValueList<Article>&)) ); - connect(node, SIGNAL(signalArticlesRemoved(TreeNode*, const QValueList<Article>&)), this, SLOT(slotArticlesRemoved(TreeNode*, const QValueList<Article>&)) ); + connect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear()) ); + connect(node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) ); + connect(node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) ); + connect(node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) ); } void ArticleListView::disconnectFromNode(TreeNode* node) { - disconnect(node, SIGNAL(signalDestroyed(TreeNode*)), this, SLOT(slotClear()) ); - disconnect(node, SIGNAL(signalArticlesAdded(TreeNode*, const QValueList<Article>&)), this, SLOT(slotArticlesAdded(TreeNode*, const QValueList<Article>&)) ); - disconnect(node, SIGNAL(signalArticlesUpdated(TreeNode*, const QValueList<Article>&)), this, SLOT(slotArticlesUpdated(TreeNode*, const QValueList<Article>&)) ); - disconnect(node, SIGNAL(signalArticlesRemoved(TreeNode*, const QValueList<Article>&)), this, SLOT(slotArticlesRemoved(TreeNode*, const QValueList<Article>&)) ); + disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear()) ); + disconnect(node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) ); + disconnect(node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) ); + disconnect(node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) ); } void ArticleListView::applyFilters() @@ -505,14 +505,14 @@ void ArticleListView::applyFilters() if (!statusActive && !textActive) { - for (QListViewItemIterator it(this); it.current(); ++it) + for (TQListViewItemIterator it(this); it.current(); ++it) { (static_cast<ArticleItem*> (it.current()))->setVisible(true); } } else if (statusActive && !textActive) { - for (QListViewItemIterator it(this); it.current(); ++it) + for (TQListViewItemIterator it(this); it.current(); ++it) { ali = static_cast<ArticleItem*> (it.current()); ali->setVisible( d->statusFilter.matches( ali->article()) ); @@ -520,7 +520,7 @@ void ArticleListView::applyFilters() } else if (!statusActive && textActive) { - for (QListViewItemIterator it(this); it.current(); ++it) + for (TQListViewItemIterator it(this); it.current(); ++it) { ali = static_cast<ArticleItem*> (it.current()); ali->setVisible( d->textFilter.matches( ali->article()) ); @@ -528,7 +528,7 @@ void ArticleListView::applyFilters() } else // both true { - for (QListViewItemIterator it(this); it.current(); ++it) + for (TQListViewItemIterator it(this); it.current(); ++it) { ali = static_cast<ArticleItem*> (it.current()); ali->setVisible( d->statusFilter.matches( ali->article()) @@ -542,7 +542,7 @@ int ArticleListView::visibleArticles() { int visible = 0; ArticleItem* ali = 0; - for (QListViewItemIterator it(this); it.current(); ++it) { + for (TQListViewItemIterator it(this); it.current(); ++it) { ali = static_cast<ArticleItem*> (it.current()); visible += ali->isVisible() ? 1 : 0; } @@ -550,10 +550,10 @@ int ArticleListView::visibleArticles() } // from amarok :) -void ArticleListView::paintInfoBox(const QString &message) +void ArticleListView::paintInfoBox(const TQString &message) { - QPainter p( viewport() ); - QSimpleRichText t( message, QApplication::font() ); + TQPainter p( viewport() ); + TQSimpleRichText t( message, TQApplication::font() ); if ( t.width()+30 >= viewport()->width() || t.height()+30 >= viewport()->height() ) //too big, giving up @@ -566,10 +566,10 @@ void ArticleListView::paintInfoBox(const QString &message) p.setBrush( colorGroup().background() ); p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h ); - t.draw( &p, x+15, y+15, QRect(), colorGroup() ); + t.draw( &p, x+15, y+15, TQRect(), colorGroup() ); } -void ArticleListView::viewportPaintEvent(QPaintEvent *e) +void ArticleListView::viewportPaintEvent(TQPaintEvent *e) { KListView::viewportPaintEvent(e); @@ -577,7 +577,7 @@ void ArticleListView::viewportPaintEvent(QPaintEvent *e) if(!e) return; - QString message = QString::null; + TQString message = TQString::null; //kdDebug() << "visible articles: " << visibleArticles() << endl; @@ -614,10 +614,10 @@ void ArticleListView::viewportPaintEvent(QPaintEvent *e) paintInfoBox(message); } -QDragObject *ArticleListView::dragObject() +TQDragObject *ArticleListView::dragObject() { - QDragObject* d = 0; - QValueList<Article> articles = selectedArticles(); + TQDragObject* d = 0; + TQValueList<Article> articles = selectedArticles(); if (!articles.isEmpty()) { d = new ArticleDrag(articles, this); @@ -731,7 +731,7 @@ void ArticleListView::slotPreviousUnreadArticle() } } -void ArticleListView::keyPressEvent(QKeyEvent* e) +void ArticleListView::keyPressEvent(TQKeyEvent* e) { e->ignore(); } @@ -750,7 +750,7 @@ void ArticleListView::slotSelectionChanged() } } -void ArticleListView::slotCurrentChanged(QListViewItem* item) +void ArticleListView::slotCurrentChanged(TQListViewItem* item) { ArticleItem* ai = dynamic_cast<ArticleItem*> (item); if (ai) @@ -763,22 +763,22 @@ void ArticleListView::slotCurrentChanged(QListViewItem* item) } -void ArticleListView::slotDoubleClicked(QListViewItem* item, const QPoint& p, int i) +void ArticleListView::slotDoubleClicked(TQListViewItem* item, const TQPoint& p, int i) { ArticleItem* ali = dynamic_cast<ArticleItem*>(item); if (ali) emit signalDoubleClicked(ali->article(), p, i); } -void ArticleListView::slotContextMenu(KListView* /*list*/, QListViewItem* /*item*/, const QPoint& p) +void ArticleListView::slotContextMenu(KListView* /*list*/, TQListViewItem* /*item*/, const TQPoint& p) { - QWidget* w = ActionManager::getInstance()->container("article_popup"); - QPopupMenu* popup = static_cast<QPopupMenu *>(w); + TQWidget* w = ActionManager::getInstance()->container("article_popup"); + TQPopupMenu* popup = static_cast<TQPopupMenu *>(w); if (popup) popup->exec(p); } -void ArticleListView::slotMouseButtonPressed(int button, QListViewItem* item, const QPoint& p, int column) +void ArticleListView::slotMouseButtonPressed(int button, TQListViewItem* item, const TQPoint& p, int column) { ArticleItem* ali = dynamic_cast<ArticleItem*>(item); if (ali) @@ -797,11 +797,11 @@ ArticleListView::~ArticleListView() d = 0; } -QValueList<Article> ArticleListView::selectedArticles() const +TQValueList<Article> ArticleListView::selectedArticles() const { - QValueList<Article> ret; - QPtrList<QListViewItem> items = selectedItems(false); - for (QListViewItem* i = items.first(); i; i = items.next() ) + TQValueList<Article> ret; + TQPtrList<TQListViewItem> items = selectedItems(false); + for (TQListViewItem* i = items.first(); i; i = items.next() ) ret.append((static_cast<ArticleItem*>(i))->article()); return ret; } diff --git a/akregator/src/articlelistview.h b/akregator/src/articlelistview.h index 7b8ec08e9..cb3a7b5dd 100644 --- a/akregator/src/articlelistview.h +++ b/akregator/src/articlelistview.h @@ -44,14 +44,14 @@ namespace Akregator { Q_OBJECT public: - ArticleListView(QWidget *parent = 0, const char *name = 0); + ArticleListView(TQWidget *parent = 0, const char *name = 0); virtual ~ArticleListView(); /** returns the current article, or a null article if there is none */ Article currentArticle() const; /** returns a list of currently selected articles */ - QValueList<Article> selectedArticles() const; + TQValueList<Article> selectedArticles() const; enum Columns { itemTitle, feedTitle, pubDate }; @@ -82,13 +82,13 @@ namespace Akregator signals: void signalArticleChosen(const Article& article); - void signalDoubleClicked(const Article&, const QPoint&, int); - //void signalContextMenu(KListView*, ArticleItem*, const QPoint&); - void signalMouseButtonPressed(int, const Article&, const QPoint &, int); + void signalDoubleClicked(const Article&, const TQPoint&, int); + //void signalContextMenu(KListView*, ArticleItem*, const TQPoint&); + void signalMouseButtonPressed(int, const Article&, const TQPoint &, int); protected: /** reimplemented for kmail-like behaviour */ - virtual void keyPressEvent(QKeyEvent* e); + virtual void keyPressEvent(TQKeyEvent* e); /** applies text filter and status filter by setting visibility of items accordingly */ @@ -101,26 +101,26 @@ namespace Akregator /** Paints infobox for filtering and stuff */ - void paintInfoBox(const QString &message); + void paintInfoBox(const TQString &message); - virtual void viewportPaintEvent(QPaintEvent *e); + virtual void viewportPaintEvent(TQPaintEvent *e); void connectToNode(TreeNode* node); void disconnectFromNode(TreeNode* node); - virtual QDragObject *dragObject(); + virtual TQDragObject *dragObject(); protected slots: - void slotArticlesAdded(TreeNode* node, const QValueList<Article>& list); - void slotArticlesUpdated(TreeNode* node, const QValueList<Article>& list); - void slotArticlesRemoved(TreeNode* node, const QValueList<Article>& list); + void slotArticlesAdded(TreeNode* node, const TQValueList<Article>& list); + void slotArticlesUpdated(TreeNode* node, const TQValueList<Article>& list); + void slotArticlesRemoved(TreeNode* node, const TQValueList<Article>& list); - virtual void slotCurrentChanged(QListViewItem* item); + virtual void slotCurrentChanged(TQListViewItem* item); virtual void slotSelectionChanged(); - virtual void slotDoubleClicked(QListViewItem* item, const QPoint& p, int i); - virtual void slotContextMenu(KListView* list, QListViewItem* item, const QPoint& p); - virtual void slotMouseButtonPressed(int, QListViewItem *, const QPoint &, int); + virtual void slotDoubleClicked(TQListViewItem* item, const TQPoint& p, int i); + virtual void slotContextMenu(KListView* list, TQListViewItem* item, const TQPoint& p); + virtual void slotMouseButtonPressed(int, TQListViewItem *, const TQPoint &, int); public: // compat with KDE-3.x assertions, remove for KDE 4 // private: diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index 942ce623e..147f4ab41 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -22,10 +22,10 @@ without including the source code for Qt in the source distribution. */ -#include <qdatetime.h> -#include <qevent.h> -#include <qscrollview.h> -#include <qvaluelist.h> +#include <tqdatetime.h> +#include <tqevent.h> +#include <tqscrollview.h> +#include <tqvaluelist.h> #include <kaction.h> #include <kapplication.h> @@ -56,7 +56,7 @@ namespace Akregator { // from kmail::headerstyle.cpp -static inline QString directionOf(const QString &str) +static inline TQString directionOf(const TQString &str) { return str.isRightToLeft() ? "rtl" : "ltr" ; } @@ -69,12 +69,12 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor virtual bool visitFeed(Feed* node) { - m_view->m_link = QString(); + m_view->m_link = TQString(); - QString text; - text = QString("<div class=\"headerbox\" dir=\"%1\">\n").arg(QApplication::reverseLayout() ? "rtl" : "ltr"); + TQString text; + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); - text += QString("<div class=\"headertitle\" dir=\"%1\">").arg(directionOf(Utils::stripTags(node->title()))); + text += TQString("<div class=\"headertitle\" dir=\"%1\">").arg(directionOf(Utils::stripTags(node->title()))); text += node->title(); if(node->unread() == 0) text += i18n(" (no unread articles)"); @@ -85,26 +85,26 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor if (!node->image().isNull()) // image { - text += QString("<div class=\"body\">"); - QString url=node->xmlUrl(); - QString file = url.replace("/", "_").replace(":", "_"); + text += TQString("<div class=\"body\">"); + TQString url=node->xmlUrl(); + TQString file = url.replace("/", "_").replace(":", "_"); KURL u(m_view->m_imageDir); u.setFileName(file); - text += QString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(node->htmlUrl()).arg(u.url()); + text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(node->htmlUrl()).arg(u.url()); } else text += "<div class=\"body\">"; if( !node->description().isEmpty() ) { - text += QString("<div dir=\"%1\">").arg(Utils::stripTags(directionOf(node->description()))); + text += TQString("<div dir=\"%1\">").arg(Utils::stripTags(directionOf(node->description()))); text += i18n("<b>Description:</b> %1<br><br>").arg(node->description()); text += "</div>\n"; // /description } if ( !node->htmlUrl().isEmpty() ) { - text += QString("<div dir=\"%1\">").arg(directionOf(node->htmlUrl())); + text += TQString("<div dir=\"%1\">").arg(directionOf(node->htmlUrl())); text += i18n("<b>Homepage:</b> <a href=\"%1\">%2</a>").arg(node->htmlUrl()).arg(node->htmlUrl()); text += "</div>\n"; // / link } @@ -118,16 +118,16 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor virtual bool visitFolder(Folder* node) { - m_view->m_link = QString(); + m_view->m_link = TQString(); - QString text; - text = QString("<div class=\"headerbox\" dir=\"%1\">\n").arg(QApplication::reverseLayout() ? "rtl" : "ltr"); - text += QString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title()); + TQString text; + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); + text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title()); if(node->unread() == 0) text += i18n(" (no unread articles)"); else text += i18n(" (1 unread article)", " (%n unread articles)", node->unread()); - text += QString("</div>\n"); + text += TQString("</div>\n"); text += "</div>\n"; // /headerbox m_view->renderContent(text); @@ -136,16 +136,16 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor virtual bool visitTagNode(TagNode* node) { - m_view->m_link = QString(); + m_view->m_link = TQString(); - QString text; - text = QString("<div class=\"headerbox\" dir=\"%1\">\n").arg(QApplication::reverseLayout() ? "rtl" : "ltr"); - text += QString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title()); + TQString text; + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); + text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title()); if(node->unread() == 0) text += i18n(" (no unread articles)"); else text += i18n(" (1 unread article)", " (%n unread articles)", node->unread()); - text += QString("</div>\n"); + text += TQString("</div>\n"); text += "</div>\n"; // /headerbox m_view->renderContent(text); @@ -157,7 +157,7 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor ArticleViewer* m_view; }; -ArticleViewer::ArticleViewer(QWidget *parent, const char *name) +ArticleViewer::ArticleViewer(TQWidget *parent, const char *name) : Viewer(parent, name), m_htmlFooter(), m_currentText(), m_node(0), m_viewMode(NormalView) { setJScriptEnabled(false); @@ -169,13 +169,13 @@ ArticleViewer::ArticleViewer(QWidget *parent, const char *name) generateNormalModeCSS(); generateCombinedModeCSS(); - new KAction( i18n("&Scroll Up"), QString::null, "Up", this, SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" ); - new KAction( i18n("&Scroll Down"), QString::null, "Down", this, SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" ); + 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" ); - connect(this, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged())); + connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); - connect(kapp, SIGNAL(kdisplayPaletteChanged()), this, SLOT(slotPaletteOrFontChanged()) ); - connect(kapp, SIGNAL(kdisplayFontChanged()), this, SLOT(slotPaletteOrFontChanged()) ); + connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), this, TQT_SLOT(slotPaletteOrFontChanged()) ); + connect(kapp, TQT_SIGNAL(kdisplayFontChanged()), this, TQT_SLOT(slotPaletteOrFontChanged()) ); m_imageDir.setPath(KGlobal::dirs()->saveLocation("cache", "akregator/Media/")); m_htmlFooter = "</body></html>"; @@ -188,10 +188,10 @@ ArticleViewer::~ArticleViewer() void ArticleViewer::generateNormalModeCSS() { - const QColorGroup & cg = QApplication::palette().active(); + const TQColorGroup & cg = TQApplication::palette().active(); // from kmail::headerstyle.cpp - m_normalModeCSS = QString( + m_normalModeCSS = TQString( "@media screen, print {" "body {\n" " font-family: \"%1\" ! important;\n" @@ -199,13 +199,13 @@ void ArticleViewer::generateNormalModeCSS() " color: %3 ! important;\n" " background: %4 ! important;\n" "}\n\n").arg(Settings::standardFont()) - .arg(QString::number(pointsToPixel(Settings::mediumFontSize()))+"px") + .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px") .arg(cg.text().name()) .arg(cg.base().name()); - m_normalModeCSS += QString( + m_normalModeCSS += TQString( "a {\n" - + QString(" color: %1 ! important;\n") - + QString(!Settings::underlineLinks() ? " text-decoration: none ! important;\n" : "") + + TQString(" color: %1 ! important;\n") + + TQString(!Settings::underlineLinks() ? " text-decoration: none ! important;\n" : "") + "}\n\n" +".headerbox {\n" +" background: %2 ! important;\n" @@ -218,7 +218,7 @@ void ArticleViewer::generateNormalModeCSS() .arg(cg.background().name()) .arg(cg.text().name()); - m_normalModeCSS += QString(".headertitle a:link { color: %1 ! important; }\n" + m_normalModeCSS += TQString(".headertitle a:link { color: %1 ! important; }\n" ".headertitle a:visited { color: %2 ! important; }\n" ".headertitle a:hover{ color: %3 ! important; }\n" ".headertitle a:active { color: %4 ! important; }\n") @@ -227,7 +227,7 @@ void ArticleViewer::generateNormalModeCSS() .arg(cg.highlightedText().name()) .arg(cg.highlightedText().name()); - m_normalModeCSS += QString( + m_normalModeCSS += TQString( ".headertitle {\n" " background: %1 ! important;\n" " padding:2px;\n" @@ -247,7 +247,7 @@ void ArticleViewer::generateNormalModeCSS() "}\n\n").arg(cg.highlight().name()) .arg(cg.highlightedText().name()); - m_normalModeCSS += QString( + m_normalModeCSS += TQString( "body { clear: none; }\n\n" ".content {\n" " display: block;\n" @@ -267,10 +267,10 @@ void ArticleViewer::generateNormalModeCSS() void ArticleViewer::generateCombinedModeCSS() { - const QColorGroup & cg = QApplication::palette().active(); + const TQColorGroup & cg = TQApplication::palette().active(); // from kmail::headerstyle.cpp - m_combinedModeCSS = QString ( + m_combinedModeCSS = TQString ( // "<style type=\"text/css\">\n" "@media screen, print {" "body {\n" @@ -279,13 +279,13 @@ void ArticleViewer::generateCombinedModeCSS() " color: %3 ! important;\n" " background: %4 ! important;\n" "}\n\n").arg(Settings::standardFont()) - .arg(QString::number(pointsToPixel(Settings::mediumFontSize()))+"px") + .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px") .arg(cg.text().name()) .arg(cg.base().name()); m_combinedModeCSS += ( "a {\n" - + QString(" color: %1 ! important;\n") - + QString(!Settings::underlineLinks() ? " text-decoration: none ! important;\n" : "") + + TQString(" color: %1 ! important;\n") + + TQString(!Settings::underlineLinks() ? " text-decoration: none ! important;\n" : "") + "}\n\n" +".headerbox {\n" +" background: %2 ! important;\n" @@ -298,7 +298,7 @@ void ArticleViewer::generateCombinedModeCSS() .arg(cg.background().name()) .arg(cg.text().name()); - m_combinedModeCSS += QString(".headertitle a:link { color: %1 ! important; }\n" + m_combinedModeCSS += TQString(".headertitle a:link { color: %1 ! important; }\n" ".headertitle a:visited { color: %2 ! important; }\n" ".headertitle a:hover{ color: %3 ! important; }\n" ".headertitle a:active { color: %4 ! important; }\n") @@ -306,7 +306,7 @@ void ArticleViewer::generateCombinedModeCSS() .arg(cg.highlightedText().name()) .arg(cg.highlightedText().name()) .arg(cg.highlightedText().name()); - m_combinedModeCSS += QString( + m_combinedModeCSS += TQString( ".headertitle {\n" " background: %1 ! important;\n" " padding:2px;\n" @@ -326,7 +326,7 @@ void ArticleViewer::generateCombinedModeCSS() "}\n\n").arg(cg.highlight().name()) .arg(cg.highlightedText().name()); - m_combinedModeCSS += QString( + m_combinedModeCSS += TQString( "body { clear: none; }\n\n" ".content {\n" " display: block;\n" @@ -366,8 +366,8 @@ bool ArticleViewer::openURL(const KURL& url) void ArticleViewer::displayAboutPage() { - QString location = locate("data", "akregator/about/main.html"); - QString content = KPIM::kFileToString(location); + TQString location = locate("data", "akregator/about/main.html"); + TQString content = KPIM::kFileToString(location); content = content.arg( locate( "data", "libkdepim/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) ); @@ -375,7 +375,7 @@ void ArticleViewer::displayAboutPage() content = content.arg( "" ); begin(KURL( location )); - QString info = + TQString info = i18n("%1: Akregator version; %2: help:// URL; %3: homepage URL; " "--- end of comment ---", "<h2 style='margin-top: 0px;'>Welcome to Akregator %1</h2>" @@ -392,22 +392,22 @@ void ArticleViewer::displayAboutPage() .arg(AKREGATOR_VERSION) // Akregator version .arg("http://akregator.kde.org/"); // Akregator homepage URL - QString fontSize = QString::number( pointsToPixel( Settings::mediumFontSize() )); - QString appTitle = i18n("Akregator"); - QString catchPhrase = ""; //not enough space for a catch phrase at default window size i18n("Part of the Kontact Suite"); - QString quickDescription = i18n("An RSS feed reader for the K Desktop Environment."); + TQString fontSize = TQString::number( pointsToPixel( Settings::mediumFontSize() )); + TQString appTitle = i18n("Akregator"); + TQString catchPhrase = ""; //not enough space for a catch phrase at default window size i18n("Part of the Kontact Suite"); + TQString quickDescription = i18n("An RSS feed reader for the K Desktop Environment."); write(content.arg(fontSize).arg(appTitle).arg(catchPhrase).arg(quickDescription).arg(info)); end(); } -QString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& article) +TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& article) { - QString text; - text = QString("<div class=\"headerbox\" dir=\"%1\">\n").arg(QApplication::reverseLayout() ? "rtl" : "ltr"); + TQString text; + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); if (!article.title().isEmpty()) { - text += QString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title()))); + text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title()))); if (article.link().isValid()) text += "<a href=\""+article.link().url()+"\">"; text += article.title().replace("<", "<").replace(">", ">"); // TODO: better leave things escaped in the parser @@ -417,16 +417,16 @@ QString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& articl } if (article.pubDate().isValid()) { - text += QString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date"))); - text += QString ("%1:").arg(i18n("Date")); + text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date"))); + text += TQString ("%1:").arg(i18n("Date")); text += "</span><span class=\"headertext\">"; text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"</span>\n"; // TODO: might need RTL? } - QString author = article.author(); + TQString author = article.author(); if (!author.isEmpty()) { - text += QString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author"))); - text += QString ("%1:").arg(i18n("Author")); + text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author"))); + text += TQString ("%1:").arg(i18n("Author")); text += "</span><span class=\"headertext\">"; text += author+"</span>\n"; // TODO: might need RTL? } @@ -434,17 +434,17 @@ QString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& articl if (feed && !feed->image().isNull()) { - QString file = Utils::fileNameForUrl(feed->xmlUrl()); + TQString file = Utils::fileNameForUrl(feed->xmlUrl()); KURL u(m_imageDir); u.setFileName(file); - text += QString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url()); + text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url()); } if (!article.description().isEmpty()) { - text += QString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) ); + text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) ); text += "<span class=\"content\">"+article.description()+"</span>"; text += "</div>"; } @@ -458,7 +458,7 @@ QString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& articl text += "\">" + i18n( "Comments"); if (article.comments()) { - text += " ("+ QString::number(article.comments()) +")"; + text += " ("+ TQString::number(article.comments()) +")"; } text += "</a>"; } @@ -481,28 +481,28 @@ QString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& articl if (!article.enclosure().isNull()) { - //QString url = article.enclosure().url(); - //QString type = article.enclosure().type(); + //TQString url = article.enclosure().url(); + //TQString type = article.enclosure().type(); //int length = article.enclosure().length(); - //QString lengthStr = KIO::convertSize(length); + //TQString lengthStr = KIO::convertSize(length); - //text += QString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").arg(url).arg(url).arg(lengthStr).arg(type); + //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").arg(url).arg(url).arg(lengthStr).arg(type); } //kdDebug() << text << endl; return text; } -QString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& article) +TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& article) { - QString text; - text = QString("<div class=\"headerbox\" dir=\"%1\">\n").arg(QApplication::reverseLayout() ? "rtl" : "ltr"); + TQString text; + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); KURL link = article.link(); if (!article.title().isEmpty()) { - text += QString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title()))); + text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title()))); if (link.isValid()) text += "<a href=\""+link.url()+"\">"; text += article.title().replace("<", "<").replace(">", ">"); // TODO: better leave things escaped in the parser @@ -512,17 +512,17 @@ QString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& arti } if (article.pubDate().isValid()) { - text += QString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date"))); - text += QString ("%1:").arg(i18n("Date")); + text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date"))); + text += TQString ("%1:").arg(i18n("Date")); text += "</span><span class=\"headertext\">"; text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"</span>\n"; // TODO: might need RTL? } - QString author = article.author(); + TQString author = article.author(); if (!author.isEmpty()) { - text += QString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author"))); - text += QString ("%1:").arg(i18n("Author")); + text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author"))); + text += TQString ("%1:").arg(i18n("Author")); text += "</span><span class=\"headertext\">"; text += author+"</span>\n"; // TODO: might need RTL? } @@ -531,17 +531,17 @@ QString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& arti if (feed && !feed->image().isNull()) { - QString file = Utils::fileNameForUrl(feed->xmlUrl()); + TQString file = Utils::fileNameForUrl(feed->xmlUrl()); KURL u(m_imageDir); u.setFileName(file); - text += QString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url()); + text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url()); } if (!article.description().isEmpty()) { - text += QString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) ); + text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) ); text += "<span class=\"content\">"+article.description()+"</span>"; text += "</div>"; } @@ -555,7 +555,7 @@ QString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& arti text += "\">" + i18n( "Comments"); if (article.comments()) { - text += " ("+ QString::number(article.comments()) +")"; + text += " ("+ TQString::number(article.comments()) +")"; } text += "</a>"; } @@ -580,7 +580,7 @@ QString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& arti } -void ArticleViewer::renderContent(const QString& text) +void ArticleViewer::renderContent(const TQString& text) { closeURL(); m_currentText = text; @@ -592,7 +592,7 @@ void ArticleViewer::renderContent(const QString& text) void ArticleViewer::beginWriting() { - QString head = QString("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n <html><head><title>.</title></head>"); + TQString head = TQString("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n <html><head><title>.</title></head>"); view()->setContentsPos(0,0); begin(m_link); setUserStyleSheet(m_viewMode == CombinedView ? m_combinedModeCSS : m_normalModeCSS); @@ -658,15 +658,15 @@ void ArticleViewer::slotUpdateCombinedView() if (!m_node) return slotClear(); - QValueList<Article> articles = m_node->articles(); + TQValueList<Article> articles = m_node->articles(); qHeapSort(articles); - QValueList<Article>::ConstIterator end = articles.end(); - QValueList<Article>::ConstIterator it = articles.begin(); + TQValueList<Article>::ConstIterator end = articles.end(); + TQValueList<Article>::ConstIterator it = articles.begin(); - QString text; + TQString text; int num = 0; - QTime spent; + TQTime spent; spent.start(); for ( ; it != end; ++it) @@ -684,22 +684,22 @@ void ArticleViewer::slotUpdateCombinedView() } -void ArticleViewer::slotArticlesUpdated(TreeNode* /*node*/, const QValueList<Article>& /*list*/) +void ArticleViewer::slotArticlesUpdated(TreeNode* /*node*/, const TQValueList<Article>& /*list*/) { if (m_viewMode == CombinedView) slotUpdateCombinedView(); } -void ArticleViewer::slotArticlesAdded(TreeNode* /*node*/, const QValueList<Article>& /*list*/) +void ArticleViewer::slotArticlesAdded(TreeNode* /*node*/, const TQValueList<Article>& /*list*/) { } -void ArticleViewer::slotArticlesRemoved(TreeNode* /*node*/, const QValueList<Article>& /*list*/) +void ArticleViewer::slotArticlesRemoved(TreeNode* /*node*/, const TQValueList<Article>& /*list*/) { } /* testingtesting :) -void ArticleViewer::slotPopupMenu(KXMLGUIClient*, const QPoint& p, const KURL& kurl, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t) +void ArticleViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t) { kdDebug() << m_link << endl; kdDebug() << kurl.url() << endl; @@ -712,7 +712,7 @@ void ArticleViewer::slotClear() m_node = 0; m_article = Article(); - renderContent(QString()); + renderContent(TQString()); } void ArticleViewer::slotShowNode(TreeNode* node) @@ -735,12 +735,12 @@ void ArticleViewer::slotShowNode(TreeNode* node) slotUpdateCombinedView(); } -void ArticleViewer::keyPressEvent(QKeyEvent* e) +void ArticleViewer::keyPressEvent(TQKeyEvent* e) { e->ignore(); } -void ArticleViewer::urlSelected(const QString &url, int button, int state, const QString& _target, KParts::URLArgs args) +void ArticleViewer::urlSelected(const TQString &url, int button, int state, const TQString& _target, KParts::URLArgs args) { if(url == "config:/disable_introduction") { if(KMessageBox::questionYesNo( widget(), i18n("Are you sure you want to disable this introduction page?"), i18n("Disable Introduction Page"), i18n("Disable"), i18n("Keep Enabled") ) == KMessageBox::Yes) { @@ -766,15 +766,15 @@ void ArticleViewer::connectToNode(TreeNode* node) { if (m_viewMode == CombinedView) { -// connect( node, SIGNAL(signalChanged(TreeNode*)), this, SLOT(slotUpdateCombinedView() ) ); - connect( node, SIGNAL(signalArticlesAdded(TreeNode*, const QValueList<Article>&)), this, SLOT(slotArticlesAdded(TreeNode*, const QValueList<Article>&))); - connect( node, SIGNAL(signalArticlesRemoved(TreeNode*, const QValueList<Article>&)), this, SLOT(slotArticlesRemoved(TreeNode*, const QValueList<Article>&))); - connect( node, SIGNAL(signalArticlesUpdated(TreeNode*, const QValueList<Article>&)), this, SLOT(slotArticlesUpdated(TreeNode*, const QValueList<Article>&))); +// connect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotUpdateCombinedView() ) ); + connect( node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&))); + connect( node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&))); + connect( node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&))); } if (m_viewMode == SummaryView) - connect( node, SIGNAL(signalChanged(TreeNode*)), this, SLOT(slotShowSummary(TreeNode*) ) ); + connect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotShowSummary(TreeNode*) ) ); - connect( node, SIGNAL(signalDestroyed(TreeNode*)), this, SLOT(slotClear() ) ); + connect( node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear() ) ); } } @@ -782,12 +782,12 @@ void ArticleViewer::disconnectFromNode(TreeNode* node) { if (node) { -// disconnect( node, SIGNAL(signalChanged(TreeNode*)), this, SLOT(slotUpdateCombinedView() ) ); - disconnect( node, SIGNAL(signalDestroyed(TreeNode*)), this, SLOT(slotClear() ) ); - disconnect( node, SIGNAL(signalChanged(TreeNode*)), this, SLOT(slotShowSummary(TreeNode*) ) ); - disconnect( node, SIGNAL(signalArticlesAdded(TreeNode*, const QValueList<Article>&)), this, SLOT(slotArticlesAdded(TreeNode*, const QValueList<Article>&))); - disconnect( node, SIGNAL(signalArticlesRemoved(TreeNode*, const QValueList<Article>&)), this, SLOT(slotArticlesRemoved(TreeNode*, const QValueList<Article>&))); - disconnect( node, SIGNAL(signalArticlesUpdated(TreeNode*, const QValueList<Article>&)), this, SLOT(slotArticlesUpdated(TreeNode*, const QValueList<Article>&))); +// disconnect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotUpdateCombinedView() ) ); + disconnect( node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear() ) ); + disconnect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotShowSummary(TreeNode*) ) ); + disconnect( node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&))); + disconnect( node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&))); + disconnect( node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&))); } } diff --git a/akregator/src/articleviewer.h b/akregator/src/articleviewer.h index a9eb65b65..25928395e 100644 --- a/akregator/src/articleviewer.h +++ b/akregator/src/articleviewer.h @@ -28,8 +28,8 @@ #include <klocale.h> -#include <qcolor.h> -#include <qfont.h> +#include <tqcolor.h> +#include <tqfont.h> #include "article.h" #include "articlefilter.h" @@ -50,7 +50,7 @@ namespace Akregator Q_OBJECT public: /** Constructor */ - ArticleViewer(QWidget* parent, const char* name); + ArticleViewer(TQWidget* parent, const char* name); virtual ~ArticleViewer(); virtual bool openURL(const KURL &url); @@ -90,14 +90,14 @@ namespace Akregator protected slots: - void slotArticlesUpdated(TreeNode* node, const QValueList<Article>& list); - void slotArticlesAdded(TreeNode* node, const QValueList<Article>& list); - void slotArticlesRemoved(TreeNode* node, const QValueList<Article>& list); + void slotArticlesUpdated(TreeNode* node, const TQValueList<Article>& list); + void slotArticlesAdded(TreeNode* node, const TQValueList<Article>& list); + void slotArticlesRemoved(TreeNode* node, const TQValueList<Article>& list); protected: - virtual void keyPressEvent(QKeyEvent* e); - virtual void urlSelected (const QString &url, int button, int state, const QString &_target, KParts::URLArgs args); + virtual void keyPressEvent(TQKeyEvent* e); + virtual void urlSelected (const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args); public: // compat with KDE-3.x assertions, remove for KDE 4 // private: @@ -108,19 +108,19 @@ namespace Akregator /** renders @c body. Use this method whereever possible. @param body html to render, without header and footer */ - void renderContent(const QString& body); + void renderContent(const TQString& body); /** Takes an article and renders it as HTML with settings for normal view and widescreen view @param feed article's feed (used for feed icon atm) -- article.feed() would do. better use a (No)Icon flag. -fo @param article The article to render @return the rendered article as HTML */ - QString formatArticleNormalMode(Feed* feed, const Article& article); + TQString formatArticleNormalMode(Feed* feed, const Article& article); /** Takes an article and renders it as HTML with settings for combined view @param feed article's feed (used for feed icon atm) -- article.feed() would do. better use a (No)Icon flag. -fo @param article The article to render @return the rendered article as HTML */ - QString formatArticleCombinedMode(Feed* feed, const Article& article); + TQString formatArticleCombinedMode(Feed* feed, const Article& article); /** Resets the canvas and adds writes the HTML header to it. */ @@ -136,10 +136,10 @@ namespace Akregator void connectToNode(TreeNode* node); void disconnectFromNode(TreeNode* node); - QString m_normalModeCSS; - QString m_combinedModeCSS; - QString m_htmlFooter; - QString m_currentText; + TQString m_normalModeCSS; + TQString m_combinedModeCSS; + TQString m_htmlFooter; + TQString m_currentText; KURL m_imageDir; TreeNode* m_node; Article m_article; diff --git a/akregator/src/configdialog.cpp b/akregator/src/configdialog.cpp index c64f0ac0d..52e26548a 100644 --- a/akregator/src/configdialog.cpp +++ b/akregator/src/configdialog.cpp @@ -22,7 +22,7 @@ without including the source code for Qt in the source distribution. */ -#include <qstringlist.h> +#include <tqstringlist.h> #include <kcombobox.h> #include <klocale.h> @@ -35,13 +35,13 @@ #include "settings_archive.h" #include "settings_browser.h" #include "settings_general.h" -#include <qslider.h> -#include <qlabel.h> +#include <tqslider.h> +#include <tqlabel.h> namespace Akregator { -ConfigDialog::ConfigDialog(QWidget* 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* parent, const char* name, KConfigSkeleton* config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal) : KConfigDialog(parent, name, config, dialogType, dialogButtons, defaultButton, modal) { addPage(new SettingsGeneral(this, "General"), i18n("General"), "package_settings"); addPage(new SettingsArchive(this, "Archive"), i18n("Archive"), "package_settings"); diff --git a/akregator/src/configdialog.h b/akregator/src/configdialog.h index 01e8b958a..78136e324 100644 --- a/akregator/src/configdialog.h +++ b/akregator/src/configdialog.h @@ -37,7 +37,7 @@ class ConfigDialog : public KConfigDialog Q_OBJECT public: - ConfigDialog(QWidget *parent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false); + ConfigDialog(TQWidget *parent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false); virtual ~ConfigDialog(); diff --git a/akregator/src/dragobjects.cpp b/akregator/src/dragobjects.cpp index 9f7f812b7..679166e1e 100644 --- a/akregator/src/dragobjects.cpp +++ b/akregator/src/dragobjects.cpp @@ -25,27 +25,27 @@ #include "dragobjects.h" #include "feed.h" -#include <qcstring.h> +#include <tqcstring.h> namespace Akregator { class Article; -ArticleDrag::ArticleDrag(const QValueList<Article>& articles, QWidget* dragSource, const char* name) +ArticleDrag::ArticleDrag(const TQValueList<Article>& articles, TQWidget* dragSource, const char* name) : KURLDrag(articleURLs(articles), dragSource, name), m_items(articlesToDragItems(articles)) {} -bool ArticleDrag::canDecode(const QMimeSource* e) +bool ArticleDrag::canDecode(const TQMimeSource* e) { return e->provides("akregator/articles"); } -bool ArticleDrag::decode(const QMimeSource* e, QValueList<ArticleDragItem>& articles) +bool ArticleDrag::decode(const TQMimeSource* e, TQValueList<ArticleDragItem>& articles) { articles.clear(); - QByteArray array = e->encodedData("akregator/articles"); + TQByteArray array = e->encodedData("akregator/articles"); - QDataStream stream(array, IO_ReadOnly); + TQDataStream stream(array, IO_ReadOnly); while (!stream.atEnd()) { @@ -68,16 +68,16 @@ const char* ArticleDrag::format(int i) const return 0; } -QByteArray ArticleDrag::encodedData(const char* mime) const +TQByteArray ArticleDrag::encodedData(const char* mime) const { - QCString mimetype(mime); + TQCString mimetype(mime); if (mimetype == "akregator/articles") { - QByteArray ba; - QDataStream stream(ba, IO_WriteOnly); + TQByteArray ba; + TQDataStream stream(ba, IO_WriteOnly); - QValueList<ArticleDragItem>::ConstIterator end = m_items.end(); - for (QValueList<ArticleDragItem>::ConstIterator it = m_items.begin(); it != end; ++it) + TQValueList<ArticleDragItem>::ConstIterator end = m_items.end(); + for (TQValueList<ArticleDragItem>::ConstIterator it = m_items.begin(); it != end; ++it) { stream << (*it).feedURL; stream << (*it).guid; @@ -90,13 +90,13 @@ QByteArray ArticleDrag::encodedData(const char* mime) const } } -QValueList<ArticleDragItem> ArticleDrag::articlesToDragItems(const QValueList<Article>& articles) +TQValueList<ArticleDragItem> ArticleDrag::articlesToDragItems(const TQValueList<Article>& articles) { - QValueList<ArticleDragItem> items; + TQValueList<ArticleDragItem> items; - QValueList<Article>::ConstIterator end(articles.end()); + TQValueList<Article>::ConstIterator end(articles.end()); - for (QValueList<Article>::ConstIterator it = articles.begin(); it != end; ++it) + for (TQValueList<Article>::ConstIterator it = articles.begin(); it != end; ++it) { ArticleDragItem i; i.feedURL = (*it).feed() ? (*it).feed()->xmlUrl() : ""; @@ -107,11 +107,11 @@ QValueList<ArticleDragItem> ArticleDrag::articlesToDragItems(const QValueList<Ar return items; } -KURL::List ArticleDrag::articleURLs(const QValueList<Article>& articles) +KURL::List ArticleDrag::articleURLs(const TQValueList<Article>& articles) { KURL::List urls; - QValueList<Article>::ConstIterator end(articles.end()); - for (QValueList<Article>::ConstIterator it = articles.begin(); it != end; ++it) + TQValueList<Article>::ConstIterator end(articles.end()); + for (TQValueList<Article>::ConstIterator it = articles.begin(); it != end; ++it) urls.append((*it).link()); return urls; } diff --git a/akregator/src/dragobjects.h b/akregator/src/dragobjects.h index b83514c3c..ac95b0eed 100644 --- a/akregator/src/dragobjects.h +++ b/akregator/src/dragobjects.h @@ -30,10 +30,10 @@ #include <kurl.h> #include <kurldrag.h> -#include <qstring.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> -typedef class QMemArray<char> QByteArray; +typedef class TQMemArray<char> QByteArray; namespace Akregator { @@ -41,8 +41,8 @@ class Article; struct ArticleDragItem { - QString feedURL; - QString guid; + TQString feedURL; + TQString guid; }; class ArticleDrag : public KURLDrag @@ -50,21 +50,21 @@ class ArticleDrag : public KURLDrag public: - ArticleDrag(const QValueList<Article>& articles, QWidget* dragSource=0, const char* name=0); + ArticleDrag(const TQValueList<Article>& articles, TQWidget* dragSource=0, const char* name=0); - static bool canDecode(const QMimeSource* e); - static bool decode(const QMimeSource* e, QValueList<ArticleDragItem>& articles); + static bool canDecode(const TQMimeSource* e); + static bool decode(const TQMimeSource* e, TQValueList<ArticleDragItem>& articles); protected: - virtual QByteArray encodedData(const char* mime) const; + virtual TQByteArray encodedData(const char* mime) const; virtual const char* format(int i) const; private: - static QValueList<ArticleDragItem> articlesToDragItems(const QValueList<Article>& articles); - static KURL::List articleURLs(const QValueList<Article>& articles); - QValueList<ArticleDragItem> m_items; + static TQValueList<ArticleDragItem> articlesToDragItems(const TQValueList<Article>& articles); + static KURL::List articleURLs(const TQValueList<Article>& articles); + TQValueList<ArticleDragItem> m_items; }; } // namespace Akregator diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp index c088654a2..f0574c31a 100644 --- a/akregator/src/feed.cpp +++ b/akregator/src/feed.cpp @@ -23,13 +23,13 @@ without including the source code for Qt in the source distribution. */ -#include <qtimer.h> -#include <qdatetime.h> -#include <qlistview.h> -#include <qdom.h> -#include <qmap.h> -#include <qpixmap.h> -#include <qvaluelist.h> +#include <tqtimer.h> +#include <tqdatetime.h> +#include <tqlistview.h> +#include <tqdom.h> +#include <tqmap.h> +#include <tqpixmap.h> +#include <tqvaluelist.h> #include <kurl.h> #include <kdebug.h> @@ -77,31 +77,31 @@ class Feed::FeedPrivate bool articlesLoaded; Backend::FeedStorage* archive; - QString xmlUrl; - QString htmlUrl; - QString description; + TQString xmlUrl; + TQString htmlUrl; + TQString description; /** list of feed articles */ - QMap<QString, Article> articles; + TQMap<TQString, Article> articles; /** caches guids of tagged articles. key: tag, value: list of guids */ - QMap<QString, QStringList> taggedArticles; + TQMap<TQString, TQStringList> taggedArticles; /** list of deleted articles. This contains **/ - QValueList<Article> deletedArticles; + TQValueList<Article> deletedArticles; /** caches guids of deleted articles for notification */ - QValueList<Article> addedArticlesNotify; - QValueList<Article> removedArticlesNotify; - QValueList<Article> updatedArticlesNotify; + TQValueList<Article> addedArticlesNotify; + TQValueList<Article> removedArticlesNotify; + TQValueList<Article> updatedArticlesNotify; - QPixmap imagePixmap; + TQPixmap imagePixmap; RSS::Image image; - QPixmap favicon; + TQPixmap favicon; }; -QString Feed::archiveModeToString(ArchiveMode mode) +TQString Feed::archiveModeToString(ArchiveMode mode) { switch (mode) { @@ -122,16 +122,16 @@ QString Feed::archiveModeToString(ArchiveMode mode) return "globalDefault"; } -Feed* Feed::fromOPML(QDomElement e) +Feed* Feed::fromOPML(TQDomElement e) { Feed* feed = 0; if( e.hasAttribute("xmlUrl") || e.hasAttribute("xmlurl") || e.hasAttribute("xmlURL") ) { - QString title = e.hasAttribute("text") ? e.attribute("text") : e.attribute("title"); + TQString title = e.hasAttribute("text") ? e.attribute("text") : e.attribute("title"); - QString xmlUrl = e.hasAttribute("xmlUrl") ? e.attribute("xmlUrl") : e.attribute("xmlurl"); + TQString xmlUrl = e.hasAttribute("xmlUrl") ? e.attribute("xmlUrl") : e.attribute("xmlurl"); if (xmlUrl.isEmpty()) xmlUrl = e.attribute("xmlURL"); @@ -139,8 +139,8 @@ Feed* Feed::fromOPML(QDomElement e) // "autoFetch" is used in 3.4 // Will be removed in KDE4 - QString htmlUrl = e.attribute("htmlUrl"); - QString description = e.attribute("description"); + TQString htmlUrl = e.attribute("htmlUrl"); + TQString description = e.attribute("description"); int fetchInterval = e.attribute("fetchInterval").toInt(); ArchiveMode archiveMode = stringToArchiveMode(e.attribute("archiveMode")); int maxArticleAge = e.attribute("maxArticleAge").toUInt(); @@ -179,17 +179,17 @@ bool Feed::accept(TreeNodeVisitor* visitor) return visitor->visitTreeNode(this); } -QStringList Feed::tags() const +TQStringList Feed::tags() const { return d->archive->tags(); } -Article Feed::findArticle(const QString& guid) const +Article Feed::findArticle(const TQString& guid) const { return d->articles[guid]; } -QValueList<Article> Feed::articles(const QString& tag) +TQValueList<Article> Feed::articles(const TQString& tag) { if (!d->articlesLoaded) loadArticles(); @@ -197,9 +197,9 @@ QValueList<Article> Feed::articles(const QString& tag) return d->articles.values(); else { - QValueList<Article> tagged; - QStringList guids = d->archive->articles(tag); - for (QStringList::ConstIterator it = guids.begin(); it != guids.end(); ++it) + TQValueList<Article> tagged; + TQStringList guids = d->archive->articles(tag); + for (TQStringList::ConstIterator it = guids.begin(); it != guids.end(); ++it) tagged += d->articles[*it]; return tagged; @@ -208,7 +208,7 @@ QValueList<Article> Feed::articles(const QString& tag) void Feed::loadImage() { - QString imageFileName = KGlobal::dirs()->saveLocation("cache", "akregator/Media/") + TQString imageFileName = KGlobal::dirs()->saveLocation("cache", "akregator/Media/") + Utils::fileNameForUrl(d->xmlUrl) + ".png"; d->imagePixmap.load(imageFileName, "PNG"); @@ -222,8 +222,8 @@ void Feed::loadArticles() if (!d->archive) d->archive = Backend::Storage::getInstance()->archiveFor(xmlUrl()); - QStringList list = d->archive->articles(); - for ( QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) + TQStringList list = d->archive->articles(); + for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { Article mya(*it, this); d->articles[mya.guid()] = mya; @@ -238,9 +238,9 @@ void Feed::loadArticles() void Feed::recalcUnreadCount() { - QValueList<Article> tarticles = articles(); - QValueList<Article>::Iterator it; - QValueList<Article>::Iterator en = tarticles.end(); + TQValueList<Article> tarticles = articles(); + TQValueList<Article>::Iterator it; + TQValueList<Article>::Iterator en = tarticles.end(); int oldUnread = d->archive->unread(); @@ -257,7 +257,7 @@ void Feed::recalcUnreadCount() } } -Feed::ArchiveMode Feed::stringToArchiveMode(const QString& str) +Feed::ArchiveMode Feed::stringToArchiveMode(const TQString& str) { if (str == "globalDefault") return globalDefault; @@ -344,38 +344,38 @@ bool Feed::loadLinkedWebsite() const return d->loadLinkedWebsite; } -const QPixmap& Feed::favicon() const { return d->favicon; } +const TQPixmap& Feed::favicon() const { return d->favicon; } -const QPixmap& Feed::image() const { return d->imagePixmap; } +const TQPixmap& Feed::image() const { return d->imagePixmap; } -const QString& Feed::xmlUrl() const { return d->xmlUrl; } +const TQString& Feed::xmlUrl() const { return d->xmlUrl; } -void Feed::setXmlUrl(const QString& s) { d->xmlUrl = s; } +void Feed::setXmlUrl(const TQString& s) { d->xmlUrl = s; } -const QString& Feed::htmlUrl() const { return d->htmlUrl; } +const TQString& Feed::htmlUrl() const { return d->htmlUrl; } -void Feed::setHtmlUrl(const QString& s) { d->htmlUrl = s; } +void Feed::setHtmlUrl(const TQString& s) { d->htmlUrl = s; } -const QString& Feed::description() const { return d->description; } +const TQString& Feed::description() const { return d->description; } -void Feed::setDescription(const QString& s) { d->description = s; } +void Feed::setDescription(const TQString& s) { d->description = s; } bool Feed::fetchErrorOccurred() { return d->fetchError; } bool Feed::isArticlesLoaded() const { return d->articlesLoaded; } -QDomElement Feed::toOPML( QDomElement parent, QDomDocument document ) const +TQDomElement Feed::toOPML( TQDomElement parent, TQDomDocument document ) const { - QDomElement el = document.createElement( "outline" ); + TQDomElement el = document.createElement( "outline" ); el.setAttribute( "text", title() ); el.setAttribute( "title", title() ); el.setAttribute( "xmlUrl", d->xmlUrl ); el.setAttribute( "htmlUrl", d->htmlUrl ); - el.setAttribute( "id", QString::number(id()) ); + el.setAttribute( "id", TQString::number(id()) ); el.setAttribute( "description", d->description ); el.setAttribute( "useCustomFetchInterval", (useCustomFetchInterval() ? "true" : "false") ); - el.setAttribute( "fetchInterval", QString::number(fetchInterval()) ); + el.setAttribute( "fetchInterval", TQString::number(fetchInterval()) ); el.setAttribute( "archiveMode", archiveModeToString(d->archiveMode) ); el.setAttribute( "maxArticleAge", d->maxArticleAge ); el.setAttribute( "maxArticleNumber", d->maxArticleNumber ); @@ -397,9 +397,9 @@ void Feed::slotMarkAllArticlesAsRead() if (unread() > 0) { setNotificationMode(false, true); - QValueList<Article> tarticles = articles(); - QValueList<Article>::Iterator it; - QValueList<Article>::Iterator en = tarticles.end(); + TQValueList<Article> tarticles = articles(); + TQValueList<Article>::Iterator it; + TQValueList<Article>::Iterator en = tarticles.end(); for (it = tarticles.begin(); it != en; ++it) (*it).setStatus(Article::Read); @@ -412,7 +412,7 @@ void Feed::slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly) queue->addFeed(this); else { - uint now = QDateTime::currentDateTime().toTime_t(); + uint now = TQDateTime::currentDateTime().toTime_t(); // workaround for 3.5.x: if the last fetch went wrong, try again after 30 minutes // this fixes annoying behaviour of akregator, especially when the host is reachable @@ -446,7 +446,7 @@ void Feed::appendArticles(const RSS::Document &doc) int nudge=0; - QValueList<Article> deletedArticles = d->deletedArticles; + TQValueList<Article> deletedArticles = d->deletedArticles; for (it = d_articles.begin(); it != en; ++it) { @@ -457,8 +457,8 @@ void Feed::appendArticles(const RSS::Document &doc) nudge--; appendArticle(mya); - QValueList<ArticleInterceptor*> interceptors = ArticleInterceptorManager::self()->interceptors(); - for (QValueList<ArticleInterceptor*>::ConstIterator it = interceptors.begin(); it != interceptors.end(); ++it) + TQValueList<ArticleInterceptor*> interceptors = ArticleInterceptorManager::self()->interceptors(); + for (TQValueList<ArticleInterceptor*>::ConstIterator it = interceptors.begin(); it != interceptors.end(); ++it) (*it)->processArticle(mya); d->addedArticlesNotify.append(mya); @@ -494,9 +494,9 @@ void Feed::appendArticles(const RSS::Document &doc) } } - QValueList<Article>::ConstIterator dit = deletedArticles.begin(); - QValueList<Article>::ConstIterator dtmp; - QValueList<Article>::ConstIterator den = deletedArticles.end(); + TQValueList<Article>::ConstIterator dit = deletedArticles.begin(); + TQValueList<Article>::ConstIterator dtmp; + TQValueList<Article>::ConstIterator den = deletedArticles.end(); // delete articles with delete flag set completely from archive, which aren't in the current feed source anymore while (dit != den) @@ -519,7 +519,7 @@ bool Feed::usesExpiryByAge() const bool Feed::isExpired(const Article& a) const { - QDateTime now = QDateTime::currentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); int expiryAge = -1; // check whether the feed uses the global default and the default is limitArticleAge if ( d->archiveMode == globalDefault && Settings::archiveMode() == Settings::EnumArchiveMode::limitArticleAge) @@ -551,9 +551,9 @@ void Feed::fetch(bool followDiscovery) d->fetchTries = 0; // mark all new as unread - QValueList<Article> articles = d->articles.values(); - QValueList<Article>::Iterator it; - QValueList<Article>::Iterator en = articles.end(); + TQValueList<Article> articles = d->articles.values(); + TQValueList<Article>::Iterator it; + TQValueList<Article>::Iterator en = articles.end(); for (it = articles.begin(); it != en; ++it) { if ((*it).status() == Article::New) @@ -579,12 +579,12 @@ void Feed::tryFetch() { d->fetchError = false; - d->loader = RSS::Loader::create( this, SLOT(fetchCompleted(Loader *, Document, Status)) ); - //connect(d->loader, SIGNAL(progress(unsigned long)), this, SLOT(slotSetProgress(unsigned long))); + d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, Status)) ); + //connect(d->loader, TQT_SIGNAL(progress(unsigned long)), this, TQT_SLOT(slotSetProgress(unsigned long))); d->loader->loadFrom( d->xmlUrl, new RSS::FileRetriever ); } -void Feed::slotImageFetched(const QPixmap& image) +void Feed::slotImageFetched(const TQPixmap& image) { if (image.isNull()) return; @@ -618,7 +618,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status) else { d->fetchError = true; - d->lastErrorFetch = QDateTime::currentDateTime().toTime_t(); + d->lastErrorFetch = TQDateTime::currentDateTime().toTime_t(); emit fetchError(this); } return; @@ -635,7 +635,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status) if (doc.image() && d->imagePixmap.isNull()) { d->image = *doc.image(); - connect(&d->image, SIGNAL(gotPixmap(const QPixmap&)), this, SLOT(slotImageFetched(const QPixmap&))); + connect(&d->image, TQT_SIGNAL(gotPixmap(const TQPixmap&)), this, TQT_SLOT(slotImageFetched(const TQPixmap&))); d->image.getPixmap(); } @@ -647,7 +647,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status) appendArticles(doc); - d->archive->setLastFetch( QDateTime::currentDateTime().toTime_t()); + d->archive->setLastFetch( TQDateTime::currentDateTime().toTime_t()); emit fetched(this); } @@ -661,9 +661,9 @@ void Feed::slotDeleteExpiredArticles() if ( !usesExpiryByAge() ) return; - QValueList<Article> articles = d->articles.values(); + TQValueList<Article> articles = d->articles.values(); - QValueList<Article>::Iterator en = articles.end(); + TQValueList<Article>::Iterator en = articles.end(); setNotificationMode(false); @@ -672,7 +672,7 @@ void Feed::slotDeleteExpiredArticles() // doNotExpiredArticles once instead of in every iteration if (Settings::doNotExpireImportantArticles()) { - for (QValueList<Article>::Iterator it = articles.begin(); it != en; ++it) + for (TQValueList<Article>::Iterator it = articles.begin(); it != en; ++it) { if (!(*it).keep() && isExpired(*it)) { @@ -682,7 +682,7 @@ void Feed::slotDeleteExpiredArticles() } else { - for (QValueList<Article>::Iterator it = articles.begin(); it != en; ++it) + for (TQValueList<Article>::Iterator it = articles.begin(); it != en; ++it) { if (isExpired(*it)) { @@ -693,7 +693,7 @@ void Feed::slotDeleteExpiredArticles() setNotificationMode(true); } -void Feed::setFavicon(const QPixmap &p) +void Feed::setFavicon(const TQPixmap &p) { d->favicon = p; nodeModified(); @@ -776,7 +776,7 @@ void Feed::doArticleNotification() { // copy list, otherwise the refcounting in Article::Private breaks for // some reason (causing segfaults) - QValueList<Article> l = d->addedArticlesNotify; + TQValueList<Article> l = d->addedArticlesNotify; emit signalArticlesAdded(this, l); d->addedArticlesNotify.clear(); } @@ -784,7 +784,7 @@ void Feed::doArticleNotification() { // copy list, otherwise the refcounting in Article::Private breaks for // some reason (causing segfaults) - QValueList<Article> l = d->updatedArticlesNotify; + TQValueList<Article> l = d->updatedArticlesNotify; emit signalArticlesUpdated(this, l); d->updatedArticlesNotify.clear(); } @@ -792,7 +792,7 @@ void Feed::doArticleNotification() { // copy list, otherwise the refcounting in Article::Private breaks for // some reason (causing segfaults) - QValueList<Article> l = d->removedArticlesNotify; + TQValueList<Article> l = d->removedArticlesNotify; emit signalArticlesRemoved(this, l); d->removedArticlesNotify.clear(); } @@ -811,11 +811,11 @@ void Feed::enforceLimitArticleNumber() return; setNotificationMode(false); - QValueList<Article> articles = d->articles.values(); + TQValueList<Article> articles = d->articles.values(); qHeapSort(articles); - QValueList<Article>::Iterator it = articles.begin(); - QValueList<Article>::Iterator tmp; - QValueList<Article>::Iterator en = articles.end(); + TQValueList<Article>::Iterator it = articles.begin(); + TQValueList<Article>::Iterator tmp; + TQValueList<Article>::Iterator en = articles.end(); int c = 0; diff --git a/akregator/src/feed.h b/akregator/src/feed.h index e3e63da06..102415fdb 100644 --- a/akregator/src/feed.h +++ b/akregator/src/feed.h @@ -78,13 +78,13 @@ namespace Akregator /** converts strings to ArchiveMode value if parsing fails, it returns ArchiveMode::globalDefault */ - static ArchiveMode stringToArchiveMode(const QString& str); + static ArchiveMode stringToArchiveMode(const TQString& str); /** converts ArchiveMode values to corresponding strings */ - static QString archiveModeToString(ArchiveMode mode); + static TQString archiveModeToString(ArchiveMode mode); /** creates a Feed object from a description in OPML format */ - static Feed* fromOPML(QDomElement e); + static Feed* fromOPML(TQDomElement e); /** default constructor */ Feed(); @@ -94,7 +94,7 @@ namespace Akregator virtual bool accept(TreeNodeVisitor* visitor); /** exports the feed settings to OPML */ - virtual QDomElement toOPML( QDomElement parent, QDomDocument document ) const; + virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const; /** returns whether this feed uses its own fetch interval or the global setting @@ -153,36 +153,36 @@ namespace Akregator bool loadLinkedWebsite() const; /** returns the favicon */ - const QPixmap& favicon() const; + const TQPixmap& favicon() const; /** sets the favicon (used in the tree view) */ - void setFavicon(const QPixmap& p); + void setFavicon(const TQPixmap& p); /** returns the feed image */ - const QPixmap& image() const; + const TQPixmap& image() const; /** returns the url of the actual feed source (rss/rdf/atom file) */ - const QString& xmlUrl() const; + const TQString& xmlUrl() const; /** sets the url of the actual feed source (rss/rdf/atom file) */ - void setXmlUrl(const QString& s); + void setXmlUrl(const TQString& s); /** returns the URL of the HTML page of this feed */ - const QString& htmlUrl() const; + const TQString& htmlUrl() const; /** sets the URL of the HTML page of this feed */ - void setHtmlUrl(const QString& s); + void setHtmlUrl(const TQString& s); /** returns the description of this feed */ - const QString& description() const; + const TQString& description() const; /** sets the description of this feed */ - void setDescription(const QString& s); + void setDescription(const TQString& s); - virtual QValueList<Article> articles(const QString& tag=QString::null); + virtual TQValueList<Article> articles(const TQString& tag=TQString::null); /** returns the article with the given @c guid, or a null article if it not exists */ - virtual Article findArticle(const QString& guid) const; + virtual Article findArticle(const TQString& guid) const; - virtual QStringList tags() const; + virtual TQStringList tags() const; /** returns whether a fetch error has occurred */ bool fetchErrorOccurred(); @@ -254,7 +254,7 @@ namespace Akregator private slots: void fetchCompleted(Loader *loader, Document doc, Status status); - void slotImageFetched(const QPixmap& image); + void slotImageFetched(const TQPixmap& image); private: diff --git a/akregator/src/feediconmanager.cpp b/akregator/src/feediconmanager.cpp index b115ed920..13e65d51d 100644 --- a/akregator/src/feediconmanager.cpp +++ b/akregator/src/feediconmanager.cpp @@ -33,17 +33,17 @@ #include <kstaticdeleter.h> #include <kurl.h> -#include <qdict.h> -#include <qpixmap.h> -#include <qvaluelist.h> +#include <tqdict.h> +#include <tqpixmap.h> +#include <tqvaluelist.h> namespace Akregator { class FeedIconManager::FeedIconManagerPrivate { public: - QValueList<Feed*> registeredFeeds; - QDict<Feed> urlDict; + TQValueList<Feed*> registeredFeeds; + TQDict<Feed> urlDict; }; FeedIconManager *FeedIconManager::m_instance = 0; @@ -62,19 +62,19 @@ void FeedIconManager::fetchIcon(Feed* feed) if (!d->registeredFeeds.contains(feed)) { d->registeredFeeds.append(feed); - connect(feed, SIGNAL(signalDestroyed(TreeNode*)), this, SLOT(slotFeedDestroyed(TreeNode*))); + connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotFeedDestroyed(TreeNode*))); } - QString iconURL = getIconURL(KURL(feed->xmlUrl())); + TQString iconURL = getIconURL(KURL(feed->xmlUrl())); d->urlDict.insert(iconURL, feed); loadIcon(iconURL); } -FeedIconManager::FeedIconManager(QObject * parent, const char *name) -: QObject(parent, name), DCOPObject("FeedIconManager"), d(new FeedIconManagerPrivate) +FeedIconManager::FeedIconManager(TQObject * parent, const char *name) +: TQObject(parent, name), DCOPObject("FeedIconManager"), d(new FeedIconManagerPrivate) { connectDCOPSignal("kded", - "favicons", "iconChanged(bool, QString, QString)", - "slotIconChanged(bool, QString, QString)", false); + "favicons", "iconChanged(bool, TQString, TQString)", + "slotIconChanged(bool, TQString, TQString)", false); } @@ -84,16 +84,16 @@ FeedIconManager::~FeedIconManager() d = 0; } -void FeedIconManager::loadIcon(const QString & url) +void FeedIconManager::loadIcon(const TQString & url) { KURL u(url); - QString iconFile = iconLocation(u); + TQString iconFile = iconLocation(u); if (iconFile.isNull()) { - QByteArray data; - QDataStream ds(data, IO_WriteOnly); + TQByteArray data; + TQDataStream ds(data, IO_WriteOnly); ds << u; kapp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data); @@ -103,30 +103,30 @@ void FeedIconManager::loadIcon(const QString & url) } -QString FeedIconManager::getIconURL(const KURL& url) +TQString FeedIconManager::getIconURL(const KURL& url) { return "http://" +url.host() + "/"; } -QString FeedIconManager::iconLocation(const KURL & url) const +TQString FeedIconManager::iconLocation(const KURL & url) const { - QByteArray data, reply; - QCString replyType; - QDataStream ds(data, IO_WriteOnly); + TQByteArray data, reply; + TQCString replyType; + TQDataStream ds(data, IO_WriteOnly); ds << url; kapp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data, replyType, reply); - if (replyType == "QString") { - QDataStream replyStream(reply, IO_ReadOnly); - QString result; + if (replyType == "TQString") { + TQDataStream replyStream(reply, IO_ReadOnly); + TQString result; replyStream >> result; return result; } - return QString::null; + return TQString::null; } void FeedIconManager::slotFeedDestroyed(TreeNode* node) @@ -137,13 +137,13 @@ void FeedIconManager::slotFeedDestroyed(TreeNode* node) d->registeredFeeds.remove(d->registeredFeeds.find(feed)); } -void FeedIconManager::slotIconChanged(bool /*isHost*/, const QString& hostOrURL, - const QString& iconName) +void FeedIconManager::slotIconChanged(bool /*isHost*/, const TQString& hostOrURL, + const TQString& iconName) { - QString iconFile = KGlobal::dirs()->findResource("cache", + TQString iconFile = KGlobal::dirs()->findResource("cache", iconName+".png"); Feed* f; - QPixmap p = QPixmap(iconFile); + TQPixmap p = TQPixmap(iconFile); if (!p.isNull()) // we don't set null pixmaps, as feed checks pixmap.isNull() to find out whether the icon was already loaded or not. It would request the icon another time, resulting an infinite loop (until stack overflow that is { while (( f = d->urlDict.take(hostOrURL) )) diff --git a/akregator/src/feediconmanager.h b/akregator/src/feediconmanager.h index 04da5c97f..b0e7fed41 100644 --- a/akregator/src/feediconmanager.h +++ b/akregator/src/feediconmanager.h @@ -28,7 +28,7 @@ #include <dcopobject.h> -#include <qobject.h> +#include <tqobject.h> class QPixmap; class QString; @@ -42,27 +42,27 @@ namespace Akregator class Feed; class TreeNode; - class FeedIconManager:public QObject, public DCOPObject + class FeedIconManager:public TQObject, public DCOPObject { Q_OBJECT K_DCOP public: - FeedIconManager(QObject * = 0L, const char * = 0L); + FeedIconManager(TQObject * = 0L, const char * = 0L); ~FeedIconManager(); static FeedIconManager *self(); void fetchIcon(Feed* feed); - QString iconLocation(const KURL &) const; + TQString iconLocation(const KURL &) const; k_dcop: - void slotIconChanged(bool, const QString&, const QString&); + void slotIconChanged(bool, const TQString&, const TQString&); signals: - void signalIconChanged(const QString &, const QPixmap &); + void signalIconChanged(const TQString &, const TQPixmap &); public slots: void slotFeedDestroyed(TreeNode* node); @@ -71,9 +71,9 @@ namespace Akregator /** returns the url used to access the icon, e.g. http://dot.kde.org/ for "dot.kde.org/1113317400/" */ - QString getIconURL(const KURL& url); + TQString getIconURL(const KURL& url); - void loadIcon(const QString &); + void loadIcon(const TQString &); private: static FeedIconManager *m_instance; diff --git a/akregator/src/feeditem.cpp b/akregator/src/feeditem.cpp index 785548cf8..cb00e5c0f 100644 --- a/akregator/src/feeditem.cpp +++ b/akregator/src/feeditem.cpp @@ -26,11 +26,11 @@ #include "feed.h" #include "feeditem.h" -#include <qpopupmenu.h> +#include <tqpopupmenu.h> #include <kaction.h> #include <kdebug.h> #include <kiconloader.h> -#include <qstring.h> +#include <tqstring.h> namespace Akregator { @@ -82,12 +82,12 @@ void FeedItem::nodeChanged() TreeNodeItem::nodeChanged(); } -QPixmap FeedItem::errorPixmap() +TQPixmap FeedItem::errorPixmap() { return KGlobal::iconLoader()->loadIcon("error", KIcon::Small); } -QPixmap FeedItem::defaultPixmap() +TQPixmap FeedItem::defaultPixmap() { return KGlobal::iconLoader()->loadIcon("txt", KIcon::Small); } @@ -108,11 +108,11 @@ void FeedItem::initialize(Feed* node) } } -void FeedItem::showContextMenu(const QPoint& p) +void FeedItem::showContextMenu(const TQPoint& p) { - QWidget* w = ActionManager::getInstance()->container("feeds_popup"); + TQWidget* w = ActionManager::getInstance()->container("feeds_popup"); if (w) - static_cast<QPopupMenu *>(w)->exec(p); + static_cast<TQPopupMenu *>(w)->exec(p); } } // namespace Akregator diff --git a/akregator/src/feeditem.h b/akregator/src/feeditem.h index e51913ab1..cc3c7efb2 100644 --- a/akregator/src/feeditem.h +++ b/akregator/src/feeditem.h @@ -48,10 +48,10 @@ class FeedItem : public TreeNodeItem virtual ~FeedItem(); virtual Feed* node(); virtual void nodeChanged(); - virtual void showContextMenu(const QPoint& p); + virtual void showContextMenu(const TQPoint& p); - static QPixmap errorPixmap(); - static QPixmap defaultPixmap(); + static TQPixmap errorPixmap(); + static TQPixmap defaultPixmap(); private: void initialize(Feed* node); diff --git a/akregator/src/feedlist.cpp b/akregator/src/feedlist.cpp index 814f82e1a..4076c6231 100644 --- a/akregator/src/feedlist.cpp +++ b/akregator/src/feedlist.cpp @@ -23,10 +23,10 @@ */ #include "feedlist.h" -#include <qdatetime.h> -#include <qdom.h> -#include <qmap.h> -#include <qvaluelist.h> +#include <tqdatetime.h> +#include <tqdom.h> +#include <tqmap.h> +#include <tqvaluelist.h> #include <kdebug.h> #include <klocale.h> @@ -43,7 +43,7 @@ class FeedList::FeedListPrivate { public: - QMap<QString, QValueList<Feed*> > urlMap; + TQMap<TQString, TQValueList<Feed*> > urlMap; AddNodeVisitor* addNodeVisitor; RemoveNodeVisitor* removeNodeVisitor; }; @@ -80,7 +80,7 @@ class FeedList::RemoveNodeVisitor : public TreeNodeVisitor FeedList* m_list; }; -FeedList::FeedList(QObject *parent, const char *name) +FeedList::FeedList(TQObject *parent, const char *name) : NodeList(parent, name), d(new FeedListPrivate) { d->addNodeVisitor = new AddNodeVisitor(this); @@ -104,13 +104,13 @@ void FeedList::removeNode(TreeNode* node) d->removeNodeVisitor->visit(node); } -void FeedList::parseChildNodes(QDomNode &node, Folder* parent) +void FeedList::parseChildNodes(TQDomNode &node, Folder* parent) { - QDomElement e = node.toElement(); // try to convert the node to an element. + TQDomElement e = node.toElement(); // try to convert the node to an element. if( !e.isNull() ) { - QString title = e.hasAttribute("text") ? e.attribute("text") : e.attribute("title"); + TQString title = e.hasAttribute("text") ? e.attribute("text") : e.attribute("title"); if (e.hasAttribute("xmlUrl") || e.hasAttribute("xmlurl") || e.hasAttribute("xmlURL") ) { @@ -129,7 +129,7 @@ void FeedList::parseChildNodes(QDomNode &node, Folder* parent) if (e.hasChildNodes()) { - QDomNode child = e.firstChild(); + TQDomNode child = e.firstChild(); while(!child.isNull()) { parseChildNodes(child, fg); @@ -140,21 +140,21 @@ void FeedList::parseChildNodes(QDomNode &node, Folder* parent) } } -bool FeedList::readFromXML(const QDomDocument& doc) +bool FeedList::readFromXML(const TQDomDocument& doc) { - QDomElement root = doc.documentElement(); + TQDomElement root = doc.documentElement(); kdDebug() << "loading OPML feed " << root.tagName().lower() << endl; kdDebug() << "measuring startup time: START" << endl; - QTime spent; + TQTime spent; spent.start(); if (root.tagName().lower() != "opml") { return false; } - QDomNode bodyNode = root.firstChild(); + TQDomNode bodyNode = root.firstChild(); while (!bodyNode.isNull() && bodyNode.toElement().tagName().lower() != "body") bodyNode = bodyNode.nextSibling(); @@ -166,9 +166,9 @@ bool FeedList::readFromXML(const QDomDocument& doc) return false; } - QDomElement body = bodyNode.toElement(); + TQDomElement body = bodyNode.toElement(); - QDomNode i = body.firstChild(); + TQDomNode i = body.firstChild(); while( !i.isNull() ) { @@ -199,7 +199,7 @@ FeedList::~FeedList() d = 0; } -Feed* FeedList::findByURL(const QString& feedURL) const +Feed* FeedList::findByURL(const TQString& feedURL) const { if (d->urlMap[feedURL].isEmpty()) return 0; @@ -207,7 +207,7 @@ Feed* FeedList::findByURL(const QString& feedURL) const return *(d->urlMap[feedURL].begin()); } -Article FeedList::findArticle(const QString& feedURL, const QString& guid) const +Article FeedList::findArticle(const TQString& feedURL, const TQString& guid) const { Feed* feed = findByURL(feedURL); @@ -222,10 +222,10 @@ void FeedList::append(FeedList* list, Folder* parent, TreeNode* after) if ( !flatList()->contains(parent) ) parent = rootNode(); - QValueList<TreeNode*> children = list->rootNode()->children(); + TQValueList<TreeNode*> children = list->rootNode()->children(); - QValueList<TreeNode*>::ConstIterator end( children.end() ); - for (QValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it) + TQValueList<TreeNode*>::ConstIterator end( children.end() ); + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it) { list->rootNode()->removeChild(*it); parent->insertChild(*it, after); @@ -233,32 +233,32 @@ void FeedList::append(FeedList* list, Folder* parent, TreeNode* after) } } -QDomDocument FeedList::toXML() const +TQDomDocument FeedList::toXML() const { - QDomDocument doc; + TQDomDocument doc; doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) ); - 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 ti = doc.createElement( "text" ); + TQDomElement ti = doc.createElement( "text" ); head.appendChild( ti ); - QDomText t = doc.createTextNode( title() ); + TQDomText t = doc.createTextNode( title() ); ti.appendChild( t ); - QDomElement body = doc.createElement( "body" ); + TQDomElement body = doc.createElement( "body" ); root.appendChild( body ); - QValueList<TreeNode*> children = rootNode()->children(); + TQValueList<TreeNode*> children = rootNode()->children(); - QValueList<TreeNode*>::ConstIterator end( children.end() ); + TQValueList<TreeNode*>::ConstIterator end( children.end() ); - for (QValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it) + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it) body.appendChild( (*it)->toOPML(body, doc) ); return doc; diff --git a/akregator/src/feedlist.h b/akregator/src/feedlist.h index 5562e8c4a..7a44a12b3 100644 --- a/akregator/src/feedlist.h +++ b/akregator/src/feedlist.h @@ -46,7 +46,7 @@ class FeedList : public NodeList Q_OBJECT public: - FeedList(QObject *parent = 0, const char *name = 0); + FeedList(TQObject *parent = 0, const char *name = 0); /** Destructor. Contained nodes are deleted! */ ~FeedList(); @@ -59,15 +59,15 @@ public: @param doc the OPML document to parse @return whether parsing was successful or not (TODO: make errors more detailed) */ - virtual bool readFromXML(const QDomDocument& doc); + virtual bool readFromXML(const TQDomDocument& doc); /** exports the feed list as OPML. The root node ("All Feeds") is ignored! */ - virtual QDomDocument toXML() const; + virtual TQDomDocument toXML() const; /** returns a feed object for a given feed URL. If the feed list does not contain a feed with @c url, NULL is returned. If it contains the same feed multiple times, any of the Feed objects is returned. */ - Feed* findByURL(const QString& feedURL) const; + Feed* findByURL(const TQString& feedURL) const; - Article findArticle(const QString& feedURL, const QString& guid) const; + Article findArticle(const TQString& feedURL, const TQString& guid) const; signals: @@ -81,7 +81,7 @@ protected: public: // compat with KDE-3.x assertions, remove for KDE 4 // private: - void parseChildNodes(QDomNode &node, Folder* parent); + void parseChildNodes(TQDomNode &node, Folder* parent); // never call these FeedList(const FeedList&) : NodeList() {} diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp index 585e85098..b680c7c58 100644 --- a/akregator/src/feedlistview.cpp +++ b/akregator/src/feedlistview.cpp @@ -47,12 +47,12 @@ #include <kstringhandler.h> #include <kurldrag.h> -#include <qfont.h> -#include <qheader.h> -#include <qpainter.h> -#include <qptrdict.h> -#include <qtimer.h> -#include <qwhatsthis.h> +#include <tqfont.h> +#include <tqheader.h> +#include <tqpainter.h> +#include <tqptrdict.h> +#include <tqtimer.h> +#include <tqwhatsthis.h> namespace Akregator { @@ -60,14 +60,14 @@ class NodeListView::NodeListViewPrivate { public: /** used for finding the item belonging to a node */ - QPtrDict<TreeNodeItem> itemDict; + TQPtrDict<TreeNodeItem> itemDict; NodeList* nodeList; bool showTagFolders; // Drag and Drop variables - QListViewItem *parent; - QListViewItem *afterme; - QTimer autoopentimer; + TQListViewItem *parent; + TQListViewItem *afterme; + TQTimer autoopentimer; ConnectNodeVisitor* connectNodeVisitor; DisconnectNodeVisitor* disconnectNodeVisitor; CreateItemVisitor* createItemVisitor; @@ -81,16 +81,16 @@ class NodeListView::ConnectNodeVisitor : public TreeNodeVisitor virtual bool visitTreeNode(TreeNode* node) { - connect(node, SIGNAL(signalDestroyed(TreeNode*)), m_view, SLOT(slotNodeDestroyed(TreeNode*) )); - connect(node, SIGNAL(signalChanged(TreeNode*)), m_view, SLOT(slotNodeChanged(TreeNode*) )); + connect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*) )); + connect(node, TQT_SIGNAL(signalChanged(TreeNode*)), m_view, TQT_SLOT(slotNodeChanged(TreeNode*) )); return true; } virtual bool visitFolder(Folder* node) { visitTreeNode(node); - connect(node, SIGNAL(signalChildAdded(TreeNode*)), m_view, SLOT(slotNodeAdded(TreeNode*) )); - connect(node, SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_view, SLOT(slotNodeRemoved(Folder*, TreeNode*) )); + connect(node, TQT_SIGNAL(signalChildAdded(TreeNode*)), m_view, TQT_SLOT(slotNodeAdded(TreeNode*) )); + connect(node, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_view, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); return true; } @@ -98,10 +98,10 @@ class NodeListView::ConnectNodeVisitor : public TreeNodeVisitor { visitTreeNode(node); - connect(node, SIGNAL(fetchStarted(Feed*)), m_view, SLOT(slotFeedFetchStarted(Feed*))); - connect(node, SIGNAL(fetchAborted(Feed*)), m_view, SLOT(slotFeedFetchAborted(Feed*))); - connect(node, SIGNAL(fetchError(Feed*)), m_view, SLOT(slotFeedFetchError(Feed*))); - connect(node, SIGNAL(fetched(Feed*)), m_view, SLOT(slotFeedFetchCompleted(Feed*))); + connect(node, TQT_SIGNAL(fetchStarted(Feed*)), m_view, TQT_SLOT(slotFeedFetchStarted(Feed*))); + connect(node, TQT_SIGNAL(fetchAborted(Feed*)), m_view, TQT_SLOT(slotFeedFetchAborted(Feed*))); + connect(node, TQT_SIGNAL(fetchError(Feed*)), m_view, TQT_SLOT(slotFeedFetchError(Feed*))); + connect(node, TQT_SIGNAL(fetched(Feed*)), m_view, TQT_SLOT(slotFeedFetchCompleted(Feed*))); return true; } private: @@ -117,30 +117,30 @@ class NodeListView::DisconnectNodeVisitor : public TreeNodeVisitor virtual bool visitTagNode(TagNode* node) { - disconnect(node, SIGNAL(signalDestroyed(TreeNode*)), m_view, SLOT(slotNodeDestroyed(TreeNode*) )); - disconnect(node, SIGNAL(signalChanged(TreeNode*)), m_view, SLOT(slotNodeChanged(TreeNode*) )); + disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*) )); + disconnect(node, TQT_SIGNAL(signalChanged(TreeNode*)), m_view, TQT_SLOT(slotNodeChanged(TreeNode*) )); return true; } virtual bool visitFolder(Folder* node) { - disconnect(node, SIGNAL(signalChildAdded(TreeNode*)), m_view, SLOT(slotNodeAdded(TreeNode*) )); - disconnect(node, SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_view, SLOT(slotNodeRemoved(Folder*, TreeNode*) )); + disconnect(node, TQT_SIGNAL(signalChildAdded(TreeNode*)), m_view, TQT_SLOT(slotNodeAdded(TreeNode*) )); + disconnect(node, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_view, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); - disconnect(node, SIGNAL(signalDestroyed(TreeNode*)), m_view, SLOT(slotNodeDestroyed(TreeNode*) )); - disconnect(node, SIGNAL(signalChanged(TreeNode*)), m_view, SLOT(slotNodeChanged(TreeNode*) )); + disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*) )); + disconnect(node, TQT_SIGNAL(signalChanged(TreeNode*)), m_view, TQT_SLOT(slotNodeChanged(TreeNode*) )); return true; } virtual bool visitFeed(Feed* node) { - disconnect(node, SIGNAL(signalDestroyed(TreeNode*)), m_view, SLOT(slotNodeDestroyed(TreeNode*) )); - disconnect(node, SIGNAL(signalChanged(TreeNode*)), m_view, SLOT(slotNodeChanged(TreeNode*) )); - disconnect(node, SIGNAL(fetchStarted(Feed*)), m_view, SLOT(slotFeedFetchStarted(Feed*))); - disconnect(node, SIGNAL(fetchAborted(Feed*)), m_view, SLOT(slotFeedFetchAborted(Feed*))); - disconnect(node, SIGNAL(fetchError(Feed*)), m_view, SLOT(slotFeedFetchError(Feed*))); - disconnect(node, SIGNAL(fetched(Feed*)), m_view, SLOT(slotFeedFetchCompleted(Feed*))); + disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*) )); + disconnect(node, TQT_SIGNAL(signalChanged(TreeNode*)), m_view, TQT_SLOT(slotNodeChanged(TreeNode*) )); + disconnect(node, TQT_SIGNAL(fetchStarted(Feed*)), m_view, TQT_SLOT(slotFeedFetchStarted(Feed*))); + disconnect(node, TQT_SIGNAL(fetchAborted(Feed*)), m_view, TQT_SLOT(slotFeedFetchAborted(Feed*))); + disconnect(node, TQT_SIGNAL(fetchError(Feed*)), m_view, TQT_SLOT(slotFeedFetchError(Feed*))); + disconnect(node, TQT_SIGNAL(fetched(Feed*)), m_view, TQT_SLOT(slotFeedFetchCompleted(Feed*))); return true; } private: @@ -180,8 +180,8 @@ class NodeListView::DeleteItemVisitor : public TreeNodeVisitor virtual bool visitFolder(Folder* node) { // delete child items recursively before deleting parent - QValueList<TreeNode*> children = node->children(); - for (QValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it ) + TQValueList<TreeNode*> children = node->children(); + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it ) visit(*it); visitTreeNode(node); @@ -267,10 +267,10 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor } m_view->d->itemDict.insert(node, item); - QValueList<TreeNode*> children = node->children(); + TQValueList<TreeNode*> children = node->children(); // add children recursively - for (QValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it ) + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it ) visit(*it); m_view->connectToNode(node); @@ -306,8 +306,8 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor m_view->d->itemDict.insert(node, item); // add children recursively - QValueList<TreeNode*> children = node->children(); - for (QValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it ) + TQValueList<TreeNode*> children = node->children(); + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it ) visit(*it); m_view->connectToNode(node); @@ -352,7 +352,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor NodeListView* m_view; }; -NodeListView::NodeListView( QWidget *parent, const char *name) +NodeListView::NodeListView( TQWidget *parent, const char *name) : KListView(parent, name), d(new NodeListViewPrivate) { d->showTagFolders = true; @@ -377,15 +377,15 @@ NodeListView::NodeListView( QWidget *parent, const char *name) setAcceptDrops(true); setItemsMovable(true); - connect( this, SIGNAL(dropped(QDropEvent*, QListViewItem*)), this, SLOT(slotDropped(QDropEvent*, QListViewItem*)) ); - connect( this, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(slotSelectionChanged(QListViewItem*)) ); - connect( this, SIGNAL(itemRenamed(QListViewItem*, int, const QString&)), this, SLOT(slotItemRenamed(QListViewItem*, int, const QString&)) ); - connect( this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), this, SLOT(slotContextMenu(KListView*, QListViewItem*, const QPoint&)) ); - connect( &(d->autoopentimer), SIGNAL( timeout() ), this, SLOT( openFolder() ) ); + connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*)) ); + connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, int, const TQString&)), this, TQT_SLOT(slotItemRenamed(TQListViewItem*, int, const TQString&)) ); + connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( &(d->autoopentimer), TQT_SIGNAL( timeout() ), this, TQT_SLOT( openFolder() ) ); clear(); - QWhatsThis::add(this, i18n("<h2>Feeds tree</h2>" + TQWhatsThis::add(this, i18n("<h2>Feeds tree</h2>" "Here you can browse tree of feeds. " "You can also add feeds or feed groups (folders) " "using right-click menu, or reorganize them using " @@ -446,7 +446,7 @@ void NodeListView::setSelectedNode(TreeNode* node) setSelected(item, true); } -TreeNode* NodeListView::findNodeByTitle(const QString& title) +TreeNode* NodeListView::findNodeByTitle(const TQString& title) { TreeNodeItem* item = dynamic_cast<TreeNodeItem*>(findItemByTitle(title, 0)); if (!item) @@ -460,7 +460,7 @@ TreeNodeItem* NodeListView::findNodeItem(TreeNode* node) return d->itemDict.find(node); } -TreeNodeItem* NodeListView::findItemByTitle(const QString& text, int column, ComparisonFlags compare) const +TreeNodeItem* NodeListView::findItemByTitle(const TQString& text, int column, ComparisonFlags compare) const { return dynamic_cast<TreeNodeItem*> (KListView::findItem(text, column, compare)); } @@ -481,7 +481,7 @@ void NodeListView::startNodeRenaming(TreeNode* node) void NodeListView::clear() { - QPtrDictIterator<TreeNodeItem> it(d->itemDict); + TQPtrDictIterator<TreeNodeItem> it(d->itemDict); for( ; it.current(); ++it ) disconnectFromNode( it.current()->node() ); d->itemDict.clear(); @@ -490,7 +490,7 @@ void NodeListView::clear() KListView::clear(); } -void NodeListView::drawContentsOffset( QPainter * p, int ox, int oy, +void NodeListView::drawContentsOffset( TQPainter * p, int ox, int oy, int cx, int cy, int cw, int ch ) { bool oldUpdatesEnabled = isUpdatesEnabled(); @@ -499,7 +499,7 @@ void NodeListView::drawContentsOffset( QPainter * p, int ox, int oy, setUpdatesEnabled(oldUpdatesEnabled); } -void NodeListView::slotDropped( QDropEvent *e, QListViewItem* +void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem* /*after*/) { d->autoopentimer.stop(); @@ -527,7 +527,7 @@ void NodeListView::slotDropped( QDropEvent *e, QListViewItem* } } -void NodeListView::movableDropEvent(QListViewItem* /*parent*/, QListViewItem* /*afterme*/) +void NodeListView::movableDropEvent(TQListViewItem* /*parent*/, TQListViewItem* /*afterme*/) { d->autoopentimer.stop(); if (d->parent) @@ -552,13 +552,13 @@ void NodeListView::setShowTagFolders(bool enabled) d->showTagFolders = enabled; } -void NodeListView::contentsDragMoveEvent(QDragMoveEvent* event) +void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event) { - QPoint vp = contentsToViewport(event->pos()); - QListViewItem *i = itemAt(vp); + TQPoint vp = contentsToViewport(event->pos()); + TQListViewItem *i = itemAt(vp); - QListViewItem *qiparent; - QListViewItem *qiafterme; + TQListViewItem *qiparent; + TQListViewItem *qiafterme; findDrop( event->pos(), qiparent, qiafterme ); if (event->source() == viewport()) { @@ -571,11 +571,11 @@ void NodeListView::contentsDragMoveEvent(QDragMoveEvent* event) } // prevent dragging nodes from All Feeds to My Tags or vice versa - QListViewItem* root1 = i; + TQListViewItem* root1 = i; while (root1 && root1->parent()) root1 = root1->parent(); - QListViewItem* root2 = selectedItem(); + TQListViewItem* root2 = selectedItem(); while (root2 && root2->parent()) root2 = root2->parent(); @@ -587,7 +587,7 @@ void NodeListView::contentsDragMoveEvent(QDragMoveEvent* event) } // don't drop node into own subtree - QListViewItem* p = qiparent; + TQListViewItem* p = qiparent; while (p) if (p == selectedItem()) { @@ -616,7 +616,7 @@ void NodeListView::contentsDragMoveEvent(QDragMoveEvent* event) // {} else // do we want to move inside the old parent or do we want to move to a new parent - if (i && (itemAt(vp - QPoint(0,5)) == i && itemAt(vp + QPoint(0,5)) == i)) + if (i && (itemAt(vp - TQPoint(0,5)) == i && itemAt(vp + TQPoint(0,5)) == i)) { setDropVisualizer(false); setDropHighlighter(true); @@ -653,7 +653,7 @@ void NodeListView::contentsDragMoveEvent(QDragMoveEvent* event) KListView::contentsDragMoveEvent(event); } -bool NodeListView::acceptDrag(QDropEvent *e) const +bool NodeListView::acceptDrag(TQDropEvent *e) const { if (!acceptDrops() || !itemsMovable()) return false; @@ -700,7 +700,7 @@ void NodeListView::slotItemBegin() void NodeListView::slotItemEnd() { - QListViewItem* elt = firstChild(); + TQListViewItem* elt = firstChild(); if (elt) while (elt->itemBelow()) elt = elt->itemBelow(); @@ -710,7 +710,7 @@ void NodeListView::slotItemEnd() void NodeListView::slotItemLeft() { - QListViewItem* sel = selectedItem(); + TQListViewItem* sel = selectedItem(); if (!sel || sel == findNodeItem(rootNode())) return; @@ -728,7 +728,7 @@ void NodeListView::slotItemLeft() void NodeListView::slotItemRight() { - QListViewItem* sel = selectedItem(); + TQListViewItem* sel = selectedItem(); if (!sel) { setSelected( firstChild(), true ); @@ -746,7 +746,7 @@ void NodeListView::slotItemRight() void NodeListView::slotPrevFeed() { - for (QListViewItemIterator it( selectedItem()); it.current(); --it ) + for (TQListViewItemIterator it( selectedItem()); it.current(); --it ) { TreeNodeItem* tni = dynamic_cast<TreeNodeItem*>(*it); if (tni && !tni->isSelected() && !tni->node()->isGroup() ) @@ -760,7 +760,7 @@ void NodeListView::slotPrevFeed() void NodeListView::slotNextFeed() { - for (QListViewItemIterator it( selectedItem()); it.current(); ++it ) + for (TQListViewItemIterator it( selectedItem()); it.current(); ++it ) { TreeNodeItem* tni = dynamic_cast<TreeNodeItem*>(*it); if ( tni && !tni->isSelected() && !tni->node()->isGroup() ) @@ -779,7 +779,7 @@ void NodeListView::slotPrevUnreadFeed() if ( !selectedItem() ) slotNextUnreadFeed(); - QListViewItemIterator it( selectedItem() ); + TQListViewItemIterator it( selectedItem() ); for ( ; it.current(); --it ) { @@ -798,7 +798,7 @@ void NodeListView::slotPrevUnreadFeed() if (rootNode()->unread() > 0) { - it = QListViewItemIterator(lastItem()); + it = TQListViewItemIterator(lastItem()); for ( ; it.current(); --it) { @@ -820,7 +820,7 @@ void NodeListView::slotPrevUnreadFeed() void NodeListView::slotNextUnreadFeed() { - QListViewItemIterator it; + TQListViewItemIterator it; if ( !selectedItem() ) { @@ -828,10 +828,10 @@ void NodeListView::slotNextUnreadFeed() if (!firstChild() || !firstChild()->firstChild()) return; else - it = QListViewItemIterator( firstChild()->firstChild()); + it = TQListViewItemIterator( firstChild()->firstChild()); } else - it = QListViewItemIterator( selectedItem() ); + it = TQListViewItemIterator( selectedItem() ); for ( ; it.current(); ++it ) { @@ -853,7 +853,7 @@ void NodeListView::slotNextUnreadFeed() } } -void NodeListView::slotSelectionChanged(QListViewItem* item) +void NodeListView::slotSelectionChanged(TQListViewItem* item) { TreeNodeItem* ni = dynamic_cast<TreeNodeItem*> (item); @@ -863,7 +863,7 @@ void NodeListView::slotSelectionChanged(QListViewItem* item) } } -void NodeListView::slotItemRenamed(QListViewItem* item, int col, const QString& text) +void NodeListView::slotItemRenamed(TQListViewItem* item, int col, const TQString& text) { TreeNodeItem* ni = dynamic_cast<TreeNodeItem*> (item); if ( !ni || !ni->node() ) @@ -876,7 +876,7 @@ void NodeListView::slotItemRenamed(QListViewItem* item, int col, const QString& } } } -void NodeListView::slotContextMenu(KListView* list, QListViewItem* item, const QPoint& p) +void NodeListView::slotContextMenu(KListView* list, TQListViewItem* item, const TQPoint& p) { TreeNodeItem* ti = dynamic_cast<TreeNodeItem*>(item); emit signalContextMenu(list, ti ? ti->node() : 0, p); @@ -893,7 +893,7 @@ void NodeListView::slotFeedFetchStarted(Feed* feed) if (item) { KIconEffect iconEffect; - QPixmap tempIcon = iconEffect.apply(feed->favicon(), KIcon::Small, KIcon::DisabledState); + TQPixmap tempIcon = iconEffect.apply(feed->favicon(), KIcon::Small, KIcon::DisabledState); item->setPixmap(0, tempIcon); } } @@ -944,8 +944,8 @@ void NodeListView::connectToNodeList(NodeList* list) if (!list) return; - connect(list, SIGNAL(signalDestroyed(NodeList*)), this, SLOT(slotNodeListDestroyed(NodeList*)) ); - connect(list->rootNode(), SIGNAL(signalChanged(TreeNode*)), this, SLOT(slotRootNodeChanged(TreeNode*))); + connect(list, TQT_SIGNAL(signalDestroyed(NodeList*)), this, TQT_SLOT(slotNodeListDestroyed(NodeList*)) ); + connect(list->rootNode(), TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotRootNodeChanged(TreeNode*))); } void NodeListView::disconnectFromNodeList(NodeList* list) @@ -953,8 +953,8 @@ void NodeListView::disconnectFromNodeList(NodeList* list) if (!list) return; - disconnect(list, SIGNAL(signalDestroyed(NodeList*)), this, SLOT(slotNodeListDestroyed(NodeList*)) ); - disconnect(list->rootNode(), SIGNAL(signalChanged(TreeNode*)), this, SLOT(slotRootNodeChanged(TreeNode*))); + disconnect(list, TQT_SIGNAL(signalDestroyed(NodeList*)), this, TQT_SLOT(slotNodeListDestroyed(NodeList*)) ); + disconnect(list->rootNode(), TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotRootNodeChanged(TreeNode*))); } void NodeListView::disconnectFromNode(TreeNode* node) @@ -992,10 +992,10 @@ void NodeListView::slotNodeChanged(TreeNode* node) } } -QDragObject *NodeListView::dragObject() +TQDragObject *NodeListView::dragObject() { KMultipleDrag *md = new KMultipleDrag(viewport()); - QDragObject *obj = KListView::dragObject(); + TQDragObject *obj = KListView::dragObject(); if (obj) { md->addDragObject(obj); } diff --git a/akregator/src/feedlistview.h b/akregator/src/feedlistview.h index bf31574d8..efa84392f 100644 --- a/akregator/src/feedlistview.h +++ b/akregator/src/feedlistview.h @@ -40,7 +40,7 @@ class NodeListView : public KListView { Q_OBJECT public: - NodeListView( QWidget *parent = 0, const char *name = 0 ); + NodeListView( TQWidget *parent = 0, const char *name = 0 ); virtual ~NodeListView(); /** sets the feed list to show. Disconnects from the old feed list, if there is any. */ @@ -66,7 +66,7 @@ public: @param title @return node */ - TreeNode* findNodeByTitle(const QString& title); + TreeNode* findNodeByTitle(const TQString& title); /** ensures that @c node is visible. */ void ensureNodeVisible(TreeNode* node); @@ -105,7 +105,7 @@ signals: void signalDropped (KURL::List &, TreeNode*, Folder*); void signalNodeSelected(TreeNode*); void signalRootNodeChanged(NodeListView*, TreeNode*); - void signalContextMenu(KListView*, TreeNode*, const QPoint&); + void signalContextMenu(KListView*, TreeNode*, const TQPoint&); public: // compat with KDE-3.x assertions, remove for KDE 4 // protected: @@ -117,7 +117,7 @@ public: // compat with KDE-3.x assertions, remove for KDE 4 TreeNodeItem* findNodeItem(TreeNode* node); /** reimplemented to return TreeNodeItem* */ - virtual TreeNodeItem* findItemByTitle(const QString& text, int column, ComparisonFlags compare = ExactMatch | CaseSensitive ) const; + virtual TreeNodeItem* findItemByTitle(const TQString& text, int column, ComparisonFlags compare = ExactMatch | CaseSensitive ) const; /** observe @c node: connect status change signals of @c node to slots */ virtual void connectToNode(TreeNode* node); @@ -128,23 +128,23 @@ public: // compat with KDE-3.x assertions, remove for KDE 4 virtual void connectToNodeList(NodeList* list); virtual void disconnectFromNodeList(NodeList* list); - virtual void drawContentsOffset( QPainter * p, int ox, int oy, + virtual void drawContentsOffset( TQPainter * p, int ox, int oy, int cx, int cy, int cw, int ch ); - virtual void contentsDragMoveEvent(QDragMoveEvent* event); - virtual bool acceptDrag(QDropEvent *event) const; - virtual void movableDropEvent(QListViewItem* parent, QListViewItem* afterme); + virtual void contentsDragMoveEvent(TQDragMoveEvent* event); + virtual bool acceptDrag(TQDropEvent *event) const; + virtual void movableDropEvent(TQListViewItem* parent, TQListViewItem* afterme); - virtual QDragObject *dragObject(); + virtual TQDragObject *dragObject(); protected slots: - void slotDropped(QDropEvent *e, QListViewItem* after); + void slotDropped(TQDropEvent *e, TQListViewItem* after); void slotRootNodeChanged(TreeNode*); - virtual void slotSelectionChanged(QListViewItem* item); - virtual void slotContextMenu(KListView* list, QListViewItem* item, const QPoint& p); - virtual void slotItemRenamed(QListViewItem* item, int col, const QString& text); + virtual void slotSelectionChanged(TQListViewItem* item); + virtual void slotContextMenu(KListView* list, TQListViewItem* item, const TQPoint& p); + virtual void slotItemRenamed(TQListViewItem* item, int col, const TQString& text); virtual void slotFeedFetchStarted(Feed* feed); virtual void slotFeedFetchAborted(Feed* feed); virtual void slotFeedFetchError(Feed* feed); @@ -193,7 +193,7 @@ class TagNodeListView : public NodeListView { Q_OBJECT public: - TagNodeListView(QWidget *parent = 0, const char *name = 0) {} + TagNodeListView(TQWidget *parent = 0, const char *name = 0) {} virtual ~TagNodeListView() {} private: diff --git a/akregator/src/feedstorage.h b/akregator/src/feedstorage.h index eda8163d3..8ab9626e6 100644 --- a/akregator/src/feedstorage.h +++ b/akregator/src/feedstorage.h @@ -24,8 +24,8 @@ #ifndef AKREGATOR_BACKEND_FEEDSTORAGE_H #define AKREGATOR_BACKEND_FEEDSTORAGE_H -#include <qobject.h> -#include <qstring.h> +#include <tqobject.h> +#include <tqstring.h> #include "akregator_export.h" @@ -40,9 +40,9 @@ class AKREGATOR_EXPORT Category { public: - QString term; - QString scheme; - QString name; + TQString term; + TQString scheme; + TQString name; /** two categories are equal when scheme and term are equal, name is ignored */ @@ -75,10 +75,10 @@ class AKREGATOR_EXPORT FeedStorage : public QObject virtual void setLastFetch(int lastFetch) = 0; /** returns the guids of all articles in this storage. If a tagID is given, only articles with this tag are returned */ - virtual QStringList articles(const QString& tagID=QString::null) = 0; + virtual TQStringList articles(const TQString& tagID=TQString::null) = 0; /** returns the guid of the articles in a given category */ - virtual QStringList articles(const Category& cat) = 0; + virtual TQStringList articles(const Category& cat) = 0; /** Appends all articles from another storage. If there is already an article in this feed with the same guid, it is replaced by the article from the source @param source the archive which articles should be appended @@ -86,53 +86,53 @@ class AKREGATOR_EXPORT FeedStorage : public QObject virtual void add(FeedStorage* source) = 0; /** reads an article from another storage and adds it to this storage */ - virtual void copyArticle(const QString& guid, FeedStorage* source) = 0; + virtual void copyArticle(const TQString& guid, FeedStorage* source) = 0; /** deletes all articles from the archive */ virtual void clear() = 0; - virtual bool contains(const QString& guid) = 0; - virtual void addEntry(const QString& guid) = 0; - virtual void deleteArticle(const QString& guid) = 0; - virtual int comments(const QString& guid) = 0; - virtual QString commentsLink(const QString& guid) = 0; - virtual void setCommentsLink(const QString& guid, const QString& commentsLink) = 0; - virtual void setComments(const QString& guid, int comments) = 0; - virtual bool guidIsHash(const QString& guid) = 0; - virtual void setGuidIsHash(const QString& guid, bool isHash) = 0; - virtual bool guidIsPermaLink(const QString& guid) = 0; - virtual void setGuidIsPermaLink(const QString& guid, bool isPermaLink) = 0; - virtual uint hash(const QString& guid) = 0; - virtual void setHash(const QString& guid, uint hash) = 0; - virtual void setDeleted(const QString& guid) = 0; - virtual QString link(const QString& guid) = 0; - virtual void setLink(const QString& guid, const QString& link) = 0; - virtual uint pubDate(const QString& guid) = 0; - virtual void setPubDate(const QString& guid, uint pubdate) = 0; - virtual int status(const QString& guid) = 0; - virtual void setStatus(const QString& guid, int status) = 0; - virtual QString title(const QString& guid) = 0; - virtual void setTitle(const QString& guid, const QString& title) = 0; - virtual QString description(const QString& guid) = 0; - virtual void setDescription(const QString& guid, const QString& description) = 0; - - virtual void addTag(const QString& guid, const QString& tag) = 0; - virtual void removeTag(const QString& guid, const QString& tag) = 0; + virtual bool contains(const TQString& guid) = 0; + virtual void addEntry(const TQString& guid) = 0; + virtual void deleteArticle(const TQString& guid) = 0; + virtual int comments(const TQString& guid) = 0; + virtual TQString commentsLink(const TQString& guid) = 0; + virtual void setCommentsLink(const TQString& guid, const TQString& commentsLink) = 0; + virtual void setComments(const TQString& guid, int comments) = 0; + virtual bool guidIsHash(const TQString& guid) = 0; + virtual void setGuidIsHash(const TQString& guid, bool isHash) = 0; + virtual bool guidIsPermaLink(const TQString& guid) = 0; + virtual void setGuidIsPermaLink(const TQString& guid, bool isPermaLink) = 0; + virtual uint hash(const TQString& guid) = 0; + virtual void setHash(const TQString& guid, uint hash) = 0; + virtual void setDeleted(const TQString& guid) = 0; + virtual TQString link(const TQString& guid) = 0; + virtual void setLink(const TQString& guid, const TQString& link) = 0; + virtual uint pubDate(const TQString& guid) = 0; + virtual void setPubDate(const TQString& guid, uint pubdate) = 0; + virtual int status(const TQString& guid) = 0; + virtual void setStatus(const TQString& guid, int status) = 0; + virtual TQString title(const TQString& guid) = 0; + virtual void setTitle(const TQString& guid, const TQString& title) = 0; + virtual TQString description(const TQString& guid) = 0; + virtual void setDescription(const TQString& guid, const TQString& description) = 0; + + virtual void addTag(const TQString& guid, const TQString& tag) = 0; + virtual void removeTag(const TQString& guid, const TQString& tag) = 0; /** returns the tags of a given article. If @c guid is null, it returns all tags used in this feed */ - virtual QStringList tags(const QString& guid=QString::null) = 0; + virtual TQStringList tags(const TQString& guid=TQString::null) = 0; - virtual void addCategory(const QString& guid, const Category& category) = 0; - virtual QValueList<Category> categories(const QString& guid=QString::null) = 0; + virtual void addCategory(const TQString& guid, const Category& category) = 0; + virtual TQValueList<Category> categories(const TQString& guid=TQString::null) = 0; - virtual void setEnclosure(const QString& guid, const QString& url, const QString& type, int length) = 0; - virtual void removeEnclosure(const QString& guid) = 0; + virtual void setEnclosure(const TQString& guid, const TQString& url, const TQString& type, int length) = 0; + virtual void removeEnclosure(const TQString& guid) = 0; - virtual void setAuthor(const QString& /*guid*/, const QString& /*author*/) {} - virtual QString author(const QString& /*guid*/) { return QString(); } + virtual void setAuthor(const TQString& /*guid*/, const TQString& /*author*/) {} + virtual TQString author(const TQString& /*guid*/) { return TQString(); } - virtual void enclosure(const QString& guid, bool& hasEnclosure, QString& url, QString& type, int& length) = 0; + virtual void enclosure(const TQString& guid, bool& hasEnclosure, TQString& url, TQString& type, int& length) = 0; virtual void close() = 0; virtual void commit() = 0; virtual void rollback() = 0; diff --git a/akregator/src/feedstoragedummyimpl.cpp b/akregator/src/feedstoragedummyimpl.cpp index f1e194949..6712d7482 100644 --- a/akregator/src/feedstoragedummyimpl.cpp +++ b/akregator/src/feedstoragedummyimpl.cpp @@ -27,10 +27,10 @@ #include <feed.h> -#include <qmap.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qvaluelist.h> +#include <tqmap.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqvaluelist.h> //typedef unsigned int uint; namespace Akregator { @@ -44,37 +44,37 @@ class FeedStorageDummyImpl::FeedStorageDummyImplPrivate public: Entry() : guidIsHash(false), guidIsPermaLink(false), status(0), pubDate(0), hash(0) {} StorageDummyImpl* mainStorage; - QValueList<Category> categories; - QString title; - QString description; - QString link; - QString author; - QString commentsLink; + TQValueList<Category> categories; + TQString title; + TQString description; + TQString link; + TQString author; + TQString commentsLink; bool guidIsHash; bool guidIsPermaLink; int comments; int status; uint pubDate; uint hash; - QStringList tags; + TQStringList tags; bool hasEnclosure; - QString enclosureUrl; - QString enclosureType; + TQString enclosureUrl; + TQString enclosureType; int enclosureLength; }; - QMap<QString, Entry> entries; + TQMap<TQString, Entry> entries; // all tags occurring in the feed - QStringList tags; + TQStringList tags; // tag -> articles index - QMap<QString, QStringList > taggedArticles; + TQMap<TQString, TQStringList > taggedArticles; - QValueList<Category> categories; - QMap<Category, QStringList> categorizedArticles; + TQValueList<Category> categories; + TQMap<Category, TQStringList> categorizedArticles; Storage* mainStorage; - QString url; + TQString url; }; @@ -82,7 +82,7 @@ void FeedStorageDummyImpl::convertOldArchive() { } -FeedStorageDummyImpl::FeedStorageDummyImpl(const QString& url, StorageDummyImpl* main) : d(new FeedStorageDummyImplPrivate) +FeedStorageDummyImpl::FeedStorageDummyImpl(const TQString& url, StorageDummyImpl* main) : d(new FeedStorageDummyImplPrivate) { d->url = url; d->mainStorage = main; @@ -135,17 +135,17 @@ void FeedStorageDummyImpl::setLastFetch(int lastFetch) d->mainStorage->setLastFetchFor(d->url, lastFetch); } -QStringList FeedStorageDummyImpl::articles(const QString& tag) +TQStringList FeedStorageDummyImpl::articles(const TQString& tag) { - return tag.isNull() ? QStringList(d->entries.keys()) : d->taggedArticles[tag]; + return tag.isNull() ? TQStringList(d->entries.keys()) : d->taggedArticles[tag]; } -QStringList FeedStorageDummyImpl::articles(const Category& cat) +TQStringList FeedStorageDummyImpl::articles(const Category& cat) { return d->categorizedArticles[cat]; } -void FeedStorageDummyImpl::addEntry(const QString& guid) +void FeedStorageDummyImpl::addEntry(const TQString& guid) { if (!d->entries.contains(guid)) { @@ -154,12 +154,12 @@ void FeedStorageDummyImpl::addEntry(const QString& guid) } } -bool FeedStorageDummyImpl::contains(const QString& guid) +bool FeedStorageDummyImpl::contains(const TQString& guid) { return d->entries.contains(guid); } -void FeedStorageDummyImpl::deleteArticle(const QString& guid) +void FeedStorageDummyImpl::deleteArticle(const TQString& guid) { if (!d->entries.contains(guid)) return; @@ -169,34 +169,34 @@ void FeedStorageDummyImpl::deleteArticle(const QString& guid) d->entries.remove(guid); } -int FeedStorageDummyImpl::comments(const QString& guid) +int FeedStorageDummyImpl::comments(const TQString& guid) { return contains(guid) ? d->entries[guid].comments : 0; } -QString FeedStorageDummyImpl::commentsLink(const QString& guid) +TQString FeedStorageDummyImpl::commentsLink(const TQString& guid) { return contains(guid) ? d->entries[guid].commentsLink : ""; } -bool FeedStorageDummyImpl::guidIsHash(const QString& guid) +bool FeedStorageDummyImpl::guidIsHash(const TQString& guid) { return contains(guid) ? d->entries[guid].guidIsHash : false; } -bool FeedStorageDummyImpl::guidIsPermaLink(const QString& guid) +bool FeedStorageDummyImpl::guidIsPermaLink(const TQString& guid) { return contains(guid) ? d->entries[guid].guidIsPermaLink : false; } -uint FeedStorageDummyImpl::hash(const QString& guid) +uint FeedStorageDummyImpl::hash(const TQString& guid) { return contains(guid) ? d->entries[guid].hash : 0; } -void FeedStorageDummyImpl::setDeleted(const QString& guid) +void FeedStorageDummyImpl::setDeleted(const TQString& guid) { if (!contains(guid)) return; @@ -204,8 +204,8 @@ void FeedStorageDummyImpl::setDeleted(const QString& guid) FeedStorageDummyImplPrivate::Entry entry = d->entries[guid]; // remove article from tag->article index - QStringList::ConstIterator it = entry.tags.begin(); - QStringList::ConstIterator end = entry.tags.end(); + TQStringList::ConstIterator it = entry.tags.begin(); + TQStringList::ConstIterator end = entry.tags.end(); for ( ; it != end; ++it) { @@ -215,8 +215,8 @@ void FeedStorageDummyImpl::setDeleted(const QString& guid) } // remove article from tag->category index - QValueList<Category>::ConstIterator it2 = entry.categories.begin(); - QValueList<Category>::ConstIterator end2 = entry.categories.end(); + TQValueList<Category>::ConstIterator it2 = entry.categories.begin(); + TQValueList<Category>::ConstIterator end2 = entry.categories.end(); for ( ; it2 != end2; ++it2) { @@ -231,94 +231,94 @@ void FeedStorageDummyImpl::setDeleted(const QString& guid) entry.commentsLink = ""; } -QString FeedStorageDummyImpl::link(const QString& guid) +TQString FeedStorageDummyImpl::link(const TQString& guid) { return contains(guid) ? d->entries[guid].link : ""; } -uint FeedStorageDummyImpl::pubDate(const QString& guid) +uint FeedStorageDummyImpl::pubDate(const TQString& guid) { return contains(guid) ? d->entries[guid].pubDate : 0; } -int FeedStorageDummyImpl::status(const QString& guid) +int FeedStorageDummyImpl::status(const TQString& guid) { return contains(guid) ? d->entries[guid].status : 0; } -void FeedStorageDummyImpl::setStatus(const QString& guid, int status) +void FeedStorageDummyImpl::setStatus(const TQString& guid, int status) { if (contains(guid)) d->entries[guid].status = status; } -QString FeedStorageDummyImpl::title(const QString& guid) +TQString FeedStorageDummyImpl::title(const TQString& guid) { return contains(guid) ? d->entries[guid].title : ""; } -QString FeedStorageDummyImpl::description(const QString& guid) +TQString FeedStorageDummyImpl::description(const TQString& guid) { return contains(guid) ? d->entries[guid].description : ""; } -void FeedStorageDummyImpl::setPubDate(const QString& guid, uint pubdate) +void FeedStorageDummyImpl::setPubDate(const TQString& guid, uint pubdate) { if (contains(guid)) d->entries[guid].pubDate = pubdate; } -void FeedStorageDummyImpl::setGuidIsHash(const QString& guid, bool isHash) +void FeedStorageDummyImpl::setGuidIsHash(const TQString& guid, bool isHash) { if (contains(guid)) d->entries[guid].guidIsHash = isHash; } -void FeedStorageDummyImpl::setLink(const QString& guid, const QString& link) +void FeedStorageDummyImpl::setLink(const TQString& guid, const TQString& link) { if (contains(guid)) d->entries[guid].link = link; } -void FeedStorageDummyImpl::setHash(const QString& guid, uint hash) +void FeedStorageDummyImpl::setHash(const TQString& guid, uint hash) { if (contains(guid)) d->entries[guid].hash = hash; } -void FeedStorageDummyImpl::setTitle(const QString& guid, const QString& title) +void FeedStorageDummyImpl::setTitle(const TQString& guid, const TQString& title) { if (contains(guid)) d->entries[guid].title = title; } -void FeedStorageDummyImpl::setDescription(const QString& guid, const QString& description) +void FeedStorageDummyImpl::setDescription(const TQString& guid, const TQString& description) { if (contains(guid)) d->entries[guid].description = description; } -void FeedStorageDummyImpl::setCommentsLink(const QString& guid, const QString& commentsLink) +void FeedStorageDummyImpl::setCommentsLink(const TQString& guid, const TQString& commentsLink) { if (contains(guid)) d->entries[guid].commentsLink = commentsLink; } -void FeedStorageDummyImpl::setComments(const QString& guid, int comments) +void FeedStorageDummyImpl::setComments(const TQString& guid, int comments) { if (contains(guid)) d->entries[guid].comments = comments; } -void FeedStorageDummyImpl::setGuidIsPermaLink(const QString& guid, bool isPermaLink) +void FeedStorageDummyImpl::setGuidIsPermaLink(const TQString& guid, bool isPermaLink) { if (contains(guid)) d->entries[guid].guidIsPermaLink = isPermaLink; } -void FeedStorageDummyImpl::addTag(const QString& guid, const QString& tag) +void FeedStorageDummyImpl::addTag(const TQString& guid, const TQString& tag) { if (contains(guid)) { @@ -331,7 +331,7 @@ void FeedStorageDummyImpl::addTag(const QString& guid, const QString& tag) } -void FeedStorageDummyImpl::addCategory(const QString& guid, const Category& cat) +void FeedStorageDummyImpl::addCategory(const TQString& guid, const Category& cat) { if (!contains(guid)) return; @@ -343,27 +343,27 @@ void FeedStorageDummyImpl::addCategory(const QString& guid, const Category& cat) d->categorizedArticles[cat].append(guid); } -void FeedStorageDummyImpl::setAuthor(const QString& guid, const QString& author) +void FeedStorageDummyImpl::setAuthor(const TQString& guid, const TQString& author) { if (contains(guid)) d->entries[guid].author = author; } -QString FeedStorageDummyImpl::author(const QString& guid) +TQString FeedStorageDummyImpl::author(const TQString& guid) { - return contains(guid) ? d->entries[guid].author : QString(); + return contains(guid) ? d->entries[guid].author : TQString(); } -QValueList<Category> FeedStorageDummyImpl::categories(const QString& guid) +TQValueList<Category> FeedStorageDummyImpl::categories(const TQString& guid) { if (!guid.isNull()) - return contains(guid) ? d->entries[guid].categories : QValueList<Category>(); + return contains(guid) ? d->entries[guid].categories : TQValueList<Category>(); else return d->categories; } -void FeedStorageDummyImpl::removeTag(const QString& guid, const QString& tag) +void FeedStorageDummyImpl::removeTag(const TQString& guid, const TQString& tag) { if (contains(guid)) { @@ -374,10 +374,10 @@ void FeedStorageDummyImpl::removeTag(const QString& guid, const QString& tag) } } -QStringList FeedStorageDummyImpl::tags(const QString& guid) +TQStringList FeedStorageDummyImpl::tags(const TQString& guid) { if (!guid.isNull()) - return contains(guid) ? d->entries[guid].tags : QStringList(); + return contains(guid) ? d->entries[guid].tags : TQStringList(); else { return d->tags; @@ -386,15 +386,15 @@ QStringList FeedStorageDummyImpl::tags(const QString& guid) void FeedStorageDummyImpl::add(FeedStorage* source) { - QStringList articles = source->articles(); - for (QStringList::ConstIterator it = articles.begin(); it != articles.end(); ++it) + TQStringList articles = source->articles(); + for (TQStringList::ConstIterator it = articles.begin(); it != articles.end(); ++it) copyArticle(*it, source); setUnread(source->unread()); setLastFetch(source->lastFetch()); setTotalCount(source->totalCount()); } -void FeedStorageDummyImpl::copyArticle(const QString& guid, FeedStorage* source) +void FeedStorageDummyImpl::copyArticle(const TQString& guid, FeedStorage* source) { if (!contains(guid)) addEntry(guid); @@ -409,9 +409,9 @@ void FeedStorageDummyImpl::copyArticle(const QString& guid, FeedStorage* source) setPubDate(guid, source->pubDate(guid)); setStatus(guid, source->status(guid)); setTitle(guid, source->title(guid)); - QStringList tags = source->tags(guid); + TQStringList tags = source->tags(guid); - for (QStringList::ConstIterator it = tags.begin(); it != tags.end(); ++it) + for (TQStringList::ConstIterator it = tags.begin(); it != tags.end(); ++it) addTag(guid, *it); } @@ -422,7 +422,7 @@ void FeedStorageDummyImpl::clear() setTotalCount(0); } -void FeedStorageDummyImpl::setEnclosure(const QString& guid, const QString& url, const QString& type, int length) +void FeedStorageDummyImpl::setEnclosure(const TQString& guid, const TQString& url, const TQString& type, int length) { if (contains(guid)) { @@ -434,19 +434,19 @@ void FeedStorageDummyImpl::setEnclosure(const QString& guid, const QString& url, } } -void FeedStorageDummyImpl::removeEnclosure(const QString& guid) +void FeedStorageDummyImpl::removeEnclosure(const TQString& guid) { if (contains(guid)) { FeedStorageDummyImplPrivate::Entry entry = d->entries[guid]; entry.hasEnclosure = false; - entry.enclosureUrl = QString::null; - entry.enclosureType = QString::null; + entry.enclosureUrl = TQString::null; + entry.enclosureType = TQString::null; entry.enclosureLength = -1; } } -void FeedStorageDummyImpl::enclosure(const QString& guid, bool& hasEnclosure, QString& url, QString& type, int& length) +void FeedStorageDummyImpl::enclosure(const TQString& guid, bool& hasEnclosure, TQString& url, TQString& type, int& length) { if (contains(guid)) { @@ -459,8 +459,8 @@ void FeedStorageDummyImpl::enclosure(const QString& guid, bool& hasEnclosure, QS else { hasEnclosure = false; - url = QString::null; - type = QString::null; + url = TQString::null; + type = TQString::null; length = -1; } } diff --git a/akregator/src/feedstoragedummyimpl.h b/akregator/src/feedstoragedummyimpl.h index 563edb5c3..60c708571 100644 --- a/akregator/src/feedstoragedummyimpl.h +++ b/akregator/src/feedstoragedummyimpl.h @@ -32,11 +32,11 @@ class StorageDummyImpl; class FeedStorageDummyImpl : public FeedStorage { public: - FeedStorageDummyImpl(const QString& url, StorageDummyImpl* main); + FeedStorageDummyImpl(const TQString& url, StorageDummyImpl* main); virtual ~FeedStorageDummyImpl(); virtual void add(FeedStorage* source); - virtual void copyArticle(const QString& guid, FeedStorage* source); + virtual void copyArticle(const TQString& guid, FeedStorage* source); virtual void clear(); virtual int unread(); @@ -45,48 +45,48 @@ class FeedStorageDummyImpl : public FeedStorage virtual int lastFetch(); virtual void setLastFetch(int lastFetch); - virtual QStringList articles(const QString& tag=QString::null); - - virtual QStringList articles(const Category& cat); - - - virtual bool contains(const QString& guid); - virtual void addEntry(const QString& guid); - virtual void deleteArticle(const QString& guid); - virtual int comments(const QString& guid); - virtual QString commentsLink(const QString& guid); - virtual void setCommentsLink(const QString& guid, const QString& commentsLink); - virtual void setComments(const QString& guid, int comments); - virtual bool guidIsHash(const QString& guid); - virtual void setGuidIsHash(const QString& guid, bool isHash); - virtual bool guidIsPermaLink(const QString& guid); - virtual void setGuidIsPermaLink(const QString& guid, bool isPermaLink); - virtual uint hash(const QString& guid); - virtual void setHash(const QString& guid, uint hash); - virtual void setDeleted(const QString& guid); - virtual QString link(const QString& guid); - virtual void setLink(const QString& guid, const QString& link); - virtual uint pubDate(const QString& guid); - virtual void setPubDate(const QString& guid, uint pubdate); - virtual int status(const QString& guid); - virtual void setStatus(const QString& guid, int status); - virtual QString title(const QString& guid); - virtual void setTitle(const QString& guid, const QString& title); - virtual QString description(const QString& guid); - virtual void setDescription(const QString& guid, const QString& description); - virtual void addTag(const QString& guid, const QString& tag); - virtual void removeTag(const QString& guid, const QString& tag); - virtual QStringList tags(const QString& guid=QString::null); - - virtual void setEnclosure(const QString& guid, const QString& url, const QString& type, int length); - virtual void removeEnclosure(const QString& guid); - virtual void enclosure(const QString& guid, bool& hasEnclosure, QString& url, QString& type, int& length); - - virtual void addCategory(const QString& guid, const Category& category); - virtual QValueList<Category> categories(const QString& guid=QString::null); - - virtual void setAuthor(const QString& guid, const QString& author); - virtual QString author(const QString& guid); + virtual TQStringList articles(const TQString& tag=TQString::null); + + virtual TQStringList articles(const Category& cat); + + + virtual bool contains(const TQString& guid); + virtual void addEntry(const TQString& guid); + virtual void deleteArticle(const TQString& guid); + virtual int comments(const TQString& guid); + virtual TQString commentsLink(const TQString& guid); + virtual void setCommentsLink(const TQString& guid, const TQString& commentsLink); + virtual void setComments(const TQString& guid, int comments); + virtual bool guidIsHash(const TQString& guid); + virtual void setGuidIsHash(const TQString& guid, bool isHash); + virtual bool guidIsPermaLink(const TQString& guid); + virtual void setGuidIsPermaLink(const TQString& guid, bool isPermaLink); + virtual uint hash(const TQString& guid); + virtual void setHash(const TQString& guid, uint hash); + virtual void setDeleted(const TQString& guid); + virtual TQString link(const TQString& guid); + virtual void setLink(const TQString& guid, const TQString& link); + virtual uint pubDate(const TQString& guid); + virtual void setPubDate(const TQString& guid, uint pubdate); + virtual int status(const TQString& guid); + virtual void setStatus(const TQString& guid, int status); + virtual TQString title(const TQString& guid); + virtual void setTitle(const TQString& guid, const TQString& title); + virtual TQString description(const TQString& guid); + virtual void setDescription(const TQString& guid, const TQString& description); + virtual void addTag(const TQString& guid, const TQString& tag); + virtual void removeTag(const TQString& guid, const TQString& tag); + virtual TQStringList tags(const TQString& guid=TQString::null); + + virtual void setEnclosure(const TQString& guid, const TQString& url, const TQString& type, int length); + virtual void removeEnclosure(const TQString& guid); + virtual void enclosure(const TQString& guid, bool& hasEnclosure, TQString& url, TQString& type, int& length); + + virtual void addCategory(const TQString& guid, const Category& category); + virtual TQValueList<Category> categories(const TQString& guid=TQString::null); + + virtual void setAuthor(const TQString& guid, const TQString& author); + virtual TQString author(const TQString& guid); virtual void close(); virtual void commit(); @@ -95,7 +95,7 @@ class FeedStorageDummyImpl : public FeedStorage virtual void convertOldArchive(); private: /** finds article by guid, returns -1 if not in archive **/ - int findArticle(const QString& guid); + int findArticle(const TQString& guid); void setTotalCount(int total); class FeedStorageDummyImplPrivate; FeedStorageDummyImplPrivate* d; diff --git a/akregator/src/fetchqueue.cpp b/akregator/src/fetchqueue.cpp index 5a3634304..63c4a4c4b 100644 --- a/akregator/src/fetchqueue.cpp +++ b/akregator/src/fetchqueue.cpp @@ -23,7 +23,7 @@ without including the source code for Qt in the source distribution. */ -#include <qvaluelist.h> +#include <tqvaluelist.h> #include "akregatorconfig.h" #include "fetchqueue.h" @@ -37,12 +37,12 @@ class FetchQueue::FetchQueuePrivate { public: - QValueList<Feed*> queuedFeeds; - QValueList<Feed*> fetchingFeeds; + TQValueList<Feed*> queuedFeeds; + TQValueList<Feed*> fetchingFeeds; }; -FetchQueue::FetchQueue(QObject* parent, const char* name): QObject(parent, name), d(new FetchQueuePrivate) {} +FetchQueue::FetchQueue(TQObject* parent, const char* name): TQObject(parent, name), d(new FetchQueuePrivate) {} FetchQueue::~FetchQueue() @@ -54,14 +54,14 @@ FetchQueue::~FetchQueue() void FetchQueue::slotAbort() { - for (QValueList<Feed*>::Iterator it = d->fetchingFeeds.begin(); it != d->fetchingFeeds.end(); ++it) + for (TQValueList<Feed*>::Iterator it = d->fetchingFeeds.begin(); it != d->fetchingFeeds.end(); ++it) { disconnectFromFeed(*it); (*it)->slotAbortFetch(); } d->fetchingFeeds.clear(); - for (QValueList<Feed*>::Iterator it = d->queuedFeeds.begin(); it != d->queuedFeeds.end(); ++it) + for (TQValueList<Feed*>::Iterator it = d->queuedFeeds.begin(); it != d->queuedFeeds.end(); ++it) { disconnectFromFeed(*it); } @@ -129,18 +129,18 @@ void FetchQueue::feedDone(Feed *f) void FetchQueue::connectToFeed(Feed* feed) { - connect (feed, SIGNAL(fetched(Feed*)), this, SLOT(slotFeedFetched(Feed*))); - connect (feed, SIGNAL(fetchError(Feed*)), this, SLOT(slotFetchError(Feed*))); - connect (feed, SIGNAL(fetchAborted(Feed*)), this, SLOT(slotFetchAborted(Feed*))); - connect (feed, SIGNAL(signalDestroyed(TreeNode*)), this, SLOT(slotNodeDestroyed(TreeNode*))); + connect (feed, TQT_SIGNAL(fetched(Feed*)), this, TQT_SLOT(slotFeedFetched(Feed*))); + connect (feed, TQT_SIGNAL(fetchError(Feed*)), this, TQT_SLOT(slotFetchError(Feed*))); + connect (feed, TQT_SIGNAL(fetchAborted(Feed*)), this, TQT_SLOT(slotFetchAborted(Feed*))); + connect (feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*))); } void FetchQueue::disconnectFromFeed(Feed* feed) { - disconnect (feed, SIGNAL(fetched(Feed*)), this, SLOT(slotFeedFetched(Feed*))); - disconnect (feed, SIGNAL(fetchError(Feed*)), this, SLOT(slotFetchError(Feed*))); - disconnect (feed, SIGNAL(fetchAborted(Feed*)), this, SLOT(slotFetchAborted(Feed*))); - disconnect (feed, SIGNAL(signalDestroyed(TreeNode*)), this, SLOT(slotNodeDestroyed(TreeNode*))); + disconnect (feed, TQT_SIGNAL(fetched(Feed*)), this, TQT_SLOT(slotFeedFetched(Feed*))); + disconnect (feed, TQT_SIGNAL(fetchError(Feed*)), this, TQT_SLOT(slotFetchError(Feed*))); + disconnect (feed, TQT_SIGNAL(fetchAborted(Feed*)), this, TQT_SLOT(slotFetchAborted(Feed*))); + disconnect (feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*))); } diff --git a/akregator/src/fetchqueue.h b/akregator/src/fetchqueue.h index f388344a6..873fde6fa 100644 --- a/akregator/src/fetchqueue.h +++ b/akregator/src/fetchqueue.h @@ -26,7 +26,7 @@ #ifndef AKREGATOR_FETCHQUEUE_H #define AKREGATOR_FETCHQUEUE_H -#include <qobject.h> +#include <tqobject.h> namespace Akregator { @@ -39,7 +39,7 @@ class FetchQueue : public QObject public: - FetchQueue(QObject* parent=0, const char* name=0); + FetchQueue(TQObject* parent=0, const char* name=0); virtual ~FetchQueue(); /** returns true when no feeds are neither fetching nor queued */ diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp index f7dc8afbf..f3a583a6d 100644 --- a/akregator/src/folder.cpp +++ b/akregator/src/folder.cpp @@ -27,10 +27,10 @@ #include "fetchqueue.h" #include "treenodevisitor.h" -#include <qlistview.h> -#include <qdom.h> -#include <qstringlist.h> -#include <qvaluelist.h> +#include <tqlistview.h> +#include <tqdom.h> +#include <tqstringlist.h> +#include <tqvaluelist.h> #include <kdebug.h> @@ -40,16 +40,16 @@ class Folder::FolderPrivate { public: /** List of children */ - QValueList<TreeNode*> children; + TQValueList<TreeNode*> children; /** caching unread count of children */ int unread; /** whether or not the folder is expanded */ bool open; /** caches guids for notifying added articles */ - QValueList<Article> addedArticlesNotify; + TQValueList<Article> addedArticlesNotify; /** caches guids for notifying removed articles */ - QValueList<Article> removedArticlesNotify; + TQValueList<Article> removedArticlesNotify; }; bool Folder::accept(TreeNodeVisitor* visitor) @@ -60,15 +60,15 @@ bool Folder::accept(TreeNodeVisitor* visitor) return visitor->visitTreeNode(this); } -Folder* Folder::fromOPML(QDomElement e) +Folder* Folder::fromOPML(TQDomElement e) { - Folder* fg = new Folder(e.hasAttribute(QString::fromLatin1("text")) ? e.attribute(QString::fromLatin1("text")) : e.attribute(QString::fromLatin1("title"))); - fg->setOpen( e.attribute(QString::fromLatin1("isOpen")) != QString::fromLatin1(("false"))); - fg->setId( e.attribute(QString::fromLatin1("id")).toUInt() ); + Folder* fg = new Folder(e.hasAttribute(TQString::fromLatin1("text")) ? e.attribute(TQString::fromLatin1("text")) : e.attribute(TQString::fromLatin1("title"))); + fg->setOpen( e.attribute(TQString::fromLatin1("isOpen")) != TQString::fromLatin1(("false"))); + fg->setId( e.attribute(TQString::fromLatin1("id")).toUInt() ); return fg; } -Folder::Folder(const QString& title) : TreeNode(), d(new FolderPrivate) +Folder::Folder(const TQString& title) : TreeNode(), d(new FolderPrivate) { d->unread = 0; setTitle(title); @@ -77,7 +77,7 @@ Folder::Folder(const QString& title) : TreeNode(), d(new FolderPrivate) Folder::~Folder() { TreeNode* tmp = 0; - for (QValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != d->children.end(); ++it) + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != d->children.end(); ++it) { delete tmp; tmp = *it; @@ -90,47 +90,47 @@ Folder::~Folder() d = 0; } -QStringList Folder::tags() const +TQStringList Folder::tags() const { - QStringList t; - QValueList<TreeNode*>::ConstIterator en = d->children.end(); - for (QValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) + TQStringList t; + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) { // intersect tag sets instead of appending lists, to avoid dupes. This sucks. Definitely. I want QSet. Now. - QStringList t2 = (*it)->tags(); - for (QStringList::ConstIterator it2 = t2.begin(); it2 != t2.end(); ++it2) + TQStringList t2 = (*it)->tags(); + for (TQStringList::ConstIterator it2 = t2.begin(); it2 != t2.end(); ++it2) if (!t.contains(*it2)) t.append(*it2); } return t; } -QValueList<Article> Folder::articles(const QString& tag) +TQValueList<Article> Folder::articles(const TQString& tag) { - QValueList<Article> seq; - QValueList<TreeNode*>::ConstIterator en = d->children.end(); - for (QValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) + TQValueList<Article> seq; + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) seq += (*it)->articles(tag); return seq; } -QDomElement Folder::toOPML( QDomElement parent, QDomDocument document ) const +TQDomElement Folder::toOPML( TQDomElement parent, TQDomDocument document ) const { - QDomElement el = document.createElement( "outline" ); + TQDomElement el = document.createElement( "outline" ); el.setAttribute( "text", title() ); parent.appendChild( el ); el.setAttribute("isOpen", d->open ? "true" : "false"); - el.setAttribute( "id", QString::number(id()) ); + el.setAttribute( "id", TQString::number(id()) ); - QValueList<TreeNode*>::ConstIterator en = d->children.end(); - for (QValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) el.appendChild( (*it)->toOPML(el, document) ); return el; } -QValueList<TreeNode*> Folder::children() const +TQValueList<TreeNode*> Folder::children() const { return d->children; } @@ -246,8 +246,8 @@ int Folder::totalCount() const { int totalCount = 0; - QValueList<TreeNode*>::ConstIterator en = d->children.end(); - for (QValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) totalCount += (*it)->totalCount(); return totalCount; @@ -257,8 +257,8 @@ void Folder::updateUnreadCount() { int unread = 0; - QValueList<TreeNode*>::ConstIterator en = d->children.end(); - for (QValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) unread += (*it)->unread(); d->unread = unread; @@ -267,8 +267,8 @@ void Folder::updateUnreadCount() void Folder::slotMarkAllArticlesAsRead() { setNotificationMode(false); - QValueList<TreeNode*>::ConstIterator en = d->children.end(); - for (QValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) (*it)->slotMarkAllArticlesAsRead(); setNotificationMode(true, true); } @@ -289,16 +289,16 @@ void Folder::slotChildDestroyed(TreeNode* node) void Folder::slotDeleteExpiredArticles() { setNotificationMode(false); - QValueList<TreeNode*>::ConstIterator en = d->children.end(); - for (QValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) (*it)->slotDeleteExpiredArticles(); setNotificationMode(true, true); } void Folder::slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly) { - QValueList<TreeNode*>::ConstIterator en = d->children.end(); - for (QValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) (*it)->slotAddToFetchQueue(queue, intervalFetchOnly); } @@ -308,20 +308,20 @@ void Folder::doArticleNotification() void Folder::connectToNode(TreeNode* child) { - connect(child, SIGNAL(signalChanged(TreeNode*)), this, SLOT(slotChildChanged(TreeNode*))); - connect(child, SIGNAL(signalDestroyed(TreeNode*)), this, SLOT(slotChildDestroyed(TreeNode*))); - connect(child, SIGNAL(signalArticlesAdded(TreeNode*, const QValueList<Article>&)), this, SIGNAL(signalArticlesAdded(TreeNode*, const QValueList<Article>&))); - connect(child, SIGNAL(signalArticlesRemoved(TreeNode*, const QValueList<Article>&)), this, SIGNAL(signalArticlesRemoved(TreeNode*, const QValueList<Article>&))); - connect(child, SIGNAL(signalArticlesUpdated(TreeNode*, const QValueList<Article>&)), this, SIGNAL(signalArticlesUpdated(TreeNode*, const QValueList<Article>&))); + connect(child, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotChildChanged(TreeNode*))); + connect(child, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotChildDestroyed(TreeNode*))); + connect(child, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&))); + connect(child, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&))); + connect(child, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&))); } void Folder::disconnectFromNode(TreeNode* child) { - disconnect(child, SIGNAL(signalChanged(TreeNode*)), this, SLOT(slotChildChanged(TreeNode*))); - disconnect(child, SIGNAL(signalDestroyed(TreeNode*)), this, SLOT(slotChildDestroyed(TreeNode*))); - disconnect(child, SIGNAL(signalArticlesAdded(TreeNode*, const QValueList<Article>&)), this, SIGNAL(signalArticlesAdded(TreeNode*, const QValueList<Article>&))); - disconnect(child, SIGNAL(signalArticlesRemoved(TreeNode*, const QValueList<Article>&)), this, SIGNAL(signalArticlesRemoved(TreeNode*, const QValueList<Article>&))); - disconnect(child, SIGNAL(signalArticlesUpdated(TreeNode*, const QValueList<Article>&)), this, SIGNAL(signalArticlesUpdated(TreeNode*, const QValueList<Article>&))); + disconnect(child, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotChildChanged(TreeNode*))); + disconnect(child, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotChildDestroyed(TreeNode*))); + disconnect(child, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&))); + disconnect(child, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&))); + disconnect(child, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&))); } TreeNode* Folder::next() diff --git a/akregator/src/folder.h b/akregator/src/folder.h index 5c437d314..ca12c164a 100644 --- a/akregator/src/folder.h +++ b/akregator/src/folder.h @@ -49,12 +49,12 @@ namespace Akregator Child nodes are not inserted or parsed. @param e the element representing the feed group @return a freshly created feed group */ - static Folder* fromOPML(QDomElement e); + static Folder* fromOPML(TQDomElement e); /** Creates a new folder with a given title @param title The title of the feed group */ - Folder(const QString& title = QString::null); + Folder(const TQString& title = TQString::null); virtual ~Folder(); @@ -62,10 +62,10 @@ namespace Akregator /** returns recursively concatenated articles of children @return an article sequence containing articles of children */ - virtual QValueList<Article> articles(const QString& tag=QString::null); + virtual TQValueList<Article> articles(const TQString& tag=TQString::null); /** returns a list of all tags occurring in the subtree of this folder */ - virtual QStringList tags() const; + virtual TQStringList tags() const; /** returns the number of unread articles in all children @return number of unread articles */ @@ -83,12 +83,12 @@ namespace Akregator @param parent The parent element @param document The DOM document @return The newly created element representing this feed group */ - virtual QDomElement toOPML( QDomElement parent, QDomDocument document ) const; + virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const; /** returns the (direct) children of this node. @return a list of pointers to the child nodes */ - virtual QValueList<TreeNode*> children() const; + virtual TQValueList<TreeNode*> children() const; /** inserts @c node as child after child node @c after. if @c after is not a child of this group, @c node will be inserted as first child diff --git a/akregator/src/folderitem.cpp b/akregator/src/folderitem.cpp index 1745295ea..6a3c0c055 100644 --- a/akregator/src/folderitem.cpp +++ b/akregator/src/folderitem.cpp @@ -27,7 +27,7 @@ #include "folderitem.h" #include "treenode.h" -#include <qpopupmenu.h> +#include <tqpopupmenu.h> #include <kaction.h> #include <kiconloader.h> @@ -76,11 +76,11 @@ FolderItem::~FolderItem() {} -void FolderItem::showContextMenu(const QPoint& p) +void FolderItem::showContextMenu(const TQPoint& p) { - QWidget* w = ActionManager::getInstance()->container("feedgroup_popup"); + TQWidget* w = ActionManager::getInstance()->container("feedgroup_popup"); if (w) - static_cast<QPopupMenu *>(w)->exec(p); + static_cast<TQPopupMenu *>(w)->exec(p); } } // namespace Akregator diff --git a/akregator/src/folderitem.h b/akregator/src/folderitem.h index 86c9e67a3..7c24b01e5 100644 --- a/akregator/src/folderitem.h +++ b/akregator/src/folderitem.h @@ -28,7 +28,7 @@ #include "treenode.h" #include "folder.h" -#include <qpixmap.h> +#include <tqpixmap.h> class QPoint; @@ -50,7 +50,7 @@ public: virtual Folder* node(); virtual void setOpen(bool open); - virtual void showContextMenu(const QPoint& p); + virtual void showContextMenu(const TQPoint& p); private: void initialize(Folder* node); diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp index faa8e371c..c8780462f 100644 --- a/akregator/src/frame.cpp +++ b/akregator/src/frame.cpp @@ -22,8 +22,8 @@ without including the source code for Qt in the source distribution. */ -#include <qregexp.h> -#include <qstylesheet.h> +#include <tqregexp.h> +#include <tqstylesheet.h> #include <kactioncollection.h> #include <kdebug.h> @@ -37,8 +37,8 @@ namespace Akregator { -Frame::Frame(QObject * parent, KParts::ReadOnlyPart *p, QWidget *visWidget, const QString& tit, bool watchSignals) - :QObject(parent, "aKregatorFrame") +Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, const TQString& tit, bool watchSignals) + :TQObject(parent, "aKregatorFrame") { m_autoDeletePart = false; m_part=p; @@ -50,25 +50,25 @@ Frame::Frame(QObject * parent, KParts::ReadOnlyPart *p, QWidget *visWidget, cons if (watchSignals) // e.g, articles tab has no part { - connect(m_part, SIGNAL(setWindowCaption (const QString &)), this, SLOT(setCaption (const QString &))); - connect(m_part, SIGNAL(setStatusBarText (const QString &)), this, SLOT(setStatusText (const QString &))); + connect(m_part, TQT_SIGNAL(setWindowCaption (const TQString &)), this, TQT_SLOT(setCaption (const TQString &))); + connect(m_part, TQT_SIGNAL(setStatusBarText (const TQString &)), this, TQT_SLOT(setStatusText (const TQString &))); KParts::BrowserExtension *ext=KParts::BrowserExtension::childObject( p ); if (ext) - connect( ext, SIGNAL(loadingProgress(int)), this, SLOT(setProgress(int)) ); + connect( ext, TQT_SIGNAL(loadingProgress(int)), this, TQT_SLOT(setProgress(int)) ); - connect(p, SIGNAL(started(KIO::Job*)), this, SLOT(setStarted())); - connect(p, SIGNAL(completed()), this, SLOT(setCompleted())); - connect(p, SIGNAL(canceled(const QString &)), this, SLOT(setCanceled(const QString&))); - connect(p, SIGNAL(completed(bool)), this, SLOT(setCompleted())); + connect(p, TQT_SIGNAL(started(KIO::Job*)), this, TQT_SLOT(setStarted())); + connect(p, TQT_SIGNAL(completed()), this, TQT_SLOT(setCompleted())); + connect(p, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(setCanceled(const TQString&))); + connect(p, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(setCompleted())); /* KActionCollection *coll=p->actionCollection(); if (coll) { - connect( coll, SIGNAL( actionStatusText( const QString & ) ), - this, SLOT( slotActionStatusText( const QString & ) ) ); - connect( coll, SIGNAL( clearStatusText() ), - this, SLOT( slotClearStatusText() ) ); + connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), + this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); + connect( coll, TQT_SIGNAL( clearStatusText() ), + this, TQT_SLOT( slotClearStatusText() ) ); } */ } @@ -99,12 +99,12 @@ KParts::ReadOnlyPart *Frame::part() const return m_part; } -QWidget *Frame::widget() const +TQWidget *Frame::widget() const { return m_widget; } -void Frame::setTitle(const QString &s) +void Frame::setTitle(const TQString &s) { if (m_title != s) { @@ -113,17 +113,17 @@ void Frame::setTitle(const QString &s) } } -void Frame::setCaption(const QString &s) +void Frame::setCaption(const TQString &s) { if(m_progressItem) m_progressItem->setLabel(s); m_caption=s; emit captionChanged(s); } -void Frame::setStatusText(const QString &s) +void Frame::setStatusText(const TQString &s) { m_statusText=s; - m_statusText.replace(QRegExp("<[^>]*>"), ""); + m_statusText.replace(TQRegExp("<[^>]*>"), ""); emit statusText(m_statusText); } @@ -146,7 +146,7 @@ void Frame::setState(int a) emit started(); break; case Frame::Canceled: - emit canceled(QString::null); + emit canceled(TQString::null); break; case Frame::Idle: case Frame::Completed: @@ -156,17 +156,17 @@ void Frame::setState(int a) -const QString& Frame::title() const +const TQString& Frame::title() const { return m_title; } -const QString& Frame::caption() const +const TQString& Frame::caption() const { return m_caption; } -const QString& Frame::statusText() const +const TQString& Frame::statusText() const { return m_statusText; } @@ -174,14 +174,14 @@ const QString& Frame::statusText() const void Frame::setStarted() { if(m_progressId.isNull() || m_progressId.isEmpty()) m_progressId = KPIM::ProgressManager::getUniqueID(); - m_progressItem = KPIM::ProgressManager::createProgressItem(m_progressId, QStyleSheet::escape( title() ), QString::null, false); + m_progressItem = KPIM::ProgressManager::createProgressItem(m_progressId, TQStyleSheet::escape( title() ), TQString::null, false); m_progressItem->setStatus(i18n("Loading...")); - //connect(m_progressItem, SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), SLOT(slotAbortFetch())); + //connect(m_progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQT_SLOT(slotAbortFetch())); m_state=Started; emit started(); } -void Frame::setCanceled(const QString &s) +void Frame::setCanceled(const TQString &s) { if(m_progressItem) { m_progressItem->setStatus(i18n("Loading canceled")); diff --git a/akregator/src/frame.h b/akregator/src/frame.h index d0fe2a4ef..1649722d7 100644 --- a/akregator/src/frame.h +++ b/akregator/src/frame.h @@ -25,7 +25,7 @@ #ifndef FRAME_H #define FRAME_H -#include <qobject.h> +#include <tqobject.h> namespace KParts { @@ -45,50 +45,50 @@ namespace Akregator Q_OBJECT public: - Frame(QObject *parent, KParts::ReadOnlyPart *part, QWidget *w, const QString& tit, bool watchSignals=true); + Frame(TQObject *parent, KParts::ReadOnlyPart *part, TQWidget *w, const TQString& tit, bool watchSignals=true); virtual ~Frame(); enum {Idle, Started, Completed, Canceled}; KParts::ReadOnlyPart *part() const; - QWidget *widget() const; - const QString& title() const; - const QString& caption() const; + TQWidget *widget() const; + const TQString& title() const; + const TQString& caption() const; int state() const; int progress() const; - const QString& statusText() const; + const TQString& statusText() const; /** if set to true, the part is deleted when the frame is deleted. Set to @c false by default */ void setAutoDeletePart(bool autoDelete); public slots: void setStarted(); - void setCanceled(const QString &); + void setCanceled(const TQString &); void setCompleted(); void setState(int); void setProgress(int); - void setCaption(const QString &); - void setTitle(const QString &); - void setStatusText(const QString &); + void setCaption(const TQString &); + void setTitle(const TQString &); + void setStatusText(const TQString &); signals: - void captionChanged(const QString &); - void titleChanged(Frame*, const QString&); + void captionChanged(const TQString &); + void titleChanged(Frame*, const TQString&); void started(); - void canceled(const QString &); + void canceled(const TQString &); void completed(); void loadingProgress(int); - void statusText(const QString &); + void statusText(const TQString &); private: KParts::ReadOnlyPart *m_part; - QWidget *m_widget; - QString m_title; - QString m_caption; + TQWidget *m_widget; + TQString m_title; + TQString m_caption; int m_state; int m_progress; - QString m_statusText; - QString m_progressId; + TQString m_statusText; + TQString m_progressId; KPIM::ProgressItem *m_progressItem; bool m_autoDeletePart; }; diff --git a/akregator/src/kcursorsaver.h b/akregator/src/kcursorsaver.h index c77a7377b..50e49aa87 100644 --- a/akregator/src/kcursorsaver.h +++ b/akregator/src/kcursorsaver.h @@ -3,8 +3,8 @@ #ifndef kcursorsaver_h #define kcursorsaver_h -#include <qcursor.h> -#include <qapplication.h> +#include <tqcursor.h> +#include <tqapplication.h> namespace Akregator { @@ -17,9 +17,9 @@ namespace Akregator { class KCursorSaver : public Qt { public: - /// constructor taking QCursor shapes + /// constructor taking TQCursor shapes KCursorSaver(Qt::CursorShape shape) { - QApplication::setOverrideCursor( QCursor(shape) ); + TQApplication::setOverrideCursor( TQCursor(shape) ); inited = true; } @@ -31,12 +31,12 @@ public: /// restore the cursor ~KCursorSaver() { if (inited) - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } /// call this to explitly restore the cursor inline void restoreCursor(void) { - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); inited = false; } @@ -55,10 +55,10 @@ private: */ namespace KBusyPtr { inline KCursorSaver idle() { - return KCursorSaver(QCursor::ArrowCursor); + return KCursorSaver(TQCursor::ArrowCursor); } inline KCursorSaver busy() { - return KCursorSaver(QCursor::WaitCursor); + return KCursorSaver(TQCursor::WaitCursor); } } diff --git a/akregator/src/librss/article.cpp b/akregator/src/librss/article.cpp index 010cf5dcb..244130535 100644 --- a/akregator/src/librss/article.cpp +++ b/akregator/src/librss/article.cpp @@ -19,8 +19,8 @@ #include <kurllabel.h> #include <kmdcodec.h> -#include <qdatetime.h> -#include <qdom.h> +#include <tqdatetime.h> +#include <tqdom.h> using namespace RSS; namespace RSS @@ -30,18 +30,18 @@ namespace RSS struct Article::Private : public Shared { - QString title; + TQString title; KURL link; - QString description; - QDateTime pubDate; - QString guid; - QString author; + TQString description; + TQDateTime pubDate; + TQString guid; + TQString author; bool guidIsPermaLink; MetaInfoMap meta; KURL commentsLink; int numComments; Enclosure enclosure; - QValueList<Category> categories; + TQValueList<Category> categories; }; Article::Article() : d(new Private) @@ -58,15 +58,15 @@ Enclosure Article::enclosure() const return d->enclosure; } -QValueList<Category> Article::categories() const +TQValueList<Category> Article::categories() const { return d->categories; } -Article::Article(const QDomNode &node, Format format, Version version) : d(new Private) +Article::Article(const TQDomNode &node, Format format, Version version) : d(new Private) { - QString elemText; + TQString elemText; d->numComments=0; @@ -75,38 +75,38 @@ Article::Article(const QDomNode &node, Format format, Version version) : d(new P if (format==AtomFeed) { - QDomNode n; + TQDomNode n; for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) { - const QDomElement e = n.toElement(); - if ( (e.tagName()==QString::fromLatin1("link")) && - (e.attribute(QString::fromLatin1("rel"), QString::fromLatin1("alternate")) == QString::fromLatin1("alternate"))) + const TQDomElement e = n.toElement(); + if ( (e.tagName()==TQString::fromLatin1("link")) && + (e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate"))) { - d->link=n.toElement().attribute(QString::fromLatin1("href")); + d->link=n.toElement().attribute(TQString::fromLatin1("href")); break; } } } else { - if (!(elemText = extractNode(node, QString::fromLatin1("link"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull()) d->link = elemText; } // prefer content/content:encoded over summary/description for feeds that provide it - QString tagName=(format==AtomFeed)? QString::fromLatin1("content"): QString::fromLatin1("content:encoded"); + TQString tagName=(format==AtomFeed)? TQString::fromLatin1("content"): TQString::fromLatin1("content:encoded"); if (!(elemText = extractNode(node, tagName, false)).isNull()) d->description = elemText; if (d->description.isEmpty()) { - if (!(elemText = extractNode(node, QString::fromLatin1("body"), false)).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("body"), false)).isNull()) d->description = elemText; if (d->description.isEmpty()) // 3rd try: see http://www.intertwingly.net/blog/1299.html { - if (!(elemText = extractNode(node, QString::fromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull()) d->description = elemText; } } @@ -116,21 +116,21 @@ Article::Article(const QDomNode &node, Format format, Version version) : d(new P if (format == AtomFeed) { if (version == vAtom_1_0) - elemText = extractNode(node, QString::fromLatin1("updated")); + elemText = extractNode(node, TQString::fromLatin1("updated")); else - elemText = extractNode(node, QString::fromLatin1("issued")); + elemText = extractNode(node, TQString::fromLatin1("issued")); if (!elemText.isNull()) time = parseISO8601Date(elemText); } else { - elemText = extractNode(node, QString::fromLatin1("pubDate")); + elemText = extractNode(node, TQString::fromLatin1("pubDate")); if (!elemText.isNull()) time = KRFCDate::parseDate(elemText); } - if (!(elemText = extractNode(node, QString::fromLatin1("dc:date"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("dc:date"))).isNull()) { time = parseISO8601Date(elemText); } @@ -139,32 +139,32 @@ Article::Article(const QDomNode &node, Format format, Version version) : d(new P if (time != 0) d->pubDate.setTime_t(time); - if (!(elemText = extractNode(node, QString::fromLatin1("wfw:comment"))).isNull()) { + if (!(elemText = extractNode(node, TQString::fromLatin1("wfw:comment"))).isNull()) { d->commentsLink = elemText; } - if (!(elemText = extractNode(node, QString::fromLatin1("slash:comments"))).isNull()) { + if (!(elemText = extractNode(node, TQString::fromLatin1("slash:comments"))).isNull()) { d->numComments = elemText.toInt(); } - QDomElement element = QDomNode(node).toElement(); + TQDomElement element = TQDomNode(node).toElement(); // in RSS 1.0, we use <item about> attribute as ID // FIXME: pass format version instead of checking for attribute - if (!element.isNull() && element.hasAttribute(QString::fromLatin1("rdf:about"))) + if (!element.isNull() && element.hasAttribute(TQString::fromLatin1("rdf:about"))) { - d->guid = element.attribute(QString::fromLatin1("rdf:about")); // HACK: using ns properly did not work + d->guid = element.attribute(TQString::fromLatin1("rdf:about")); // HACK: using ns properly did not work d->guidIsPermaLink = false; } else { - tagName=(format==AtomFeed)? QString::fromLatin1("id"): QString::fromLatin1("guid"); - QDomNode n = node.namedItem(tagName); + tagName=(format==AtomFeed)? TQString::fromLatin1("id"): TQString::fromLatin1("guid"); + TQDomNode n = node.namedItem(tagName); if (!n.isNull()) { d->guidIsPermaLink = (format==AtomFeed)? false : true; - if (n.toElement().attribute(QString::fromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false; + if (n.toElement().attribute(TQString::fromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false; if (!(elemText = extractNode(node, tagName)).isNull()) d->guid = elemText; } @@ -174,29 +174,29 @@ Article::Article(const QDomNode &node, Format format, Version version) : d(new P d->guidIsPermaLink = false; md5Machine.reset(); - QDomNode n(node); + TQDomNode n(node); md5Machine.update(d->title.utf8()); md5Machine.update(d->description.utf8()); - d->guid = QString(md5Machine.hexDigest().data()); - d->meta[QString::fromLatin1("guidIsHash")] = QString::fromLatin1("true"); + d->guid = TQString(md5Machine.hexDigest().data()); + d->meta[TQString::fromLatin1("guidIsHash")] = TQString::fromLatin1("true"); } - QDomNode enclosure = element.namedItem(QString::fromLatin1("enclosure")); + TQDomNode enclosure = element.namedItem(TQString::fromLatin1("enclosure")); if (enclosure.isElement()) d->enclosure = Enclosure::fromXML(enclosure.toElement()); d->author = parseItemAuthor(element, format, version); - for (QDomNode i = node.firstChild(); !i.isNull(); i = i.nextSibling()) + for (TQDomNode i = node.firstChild(); !i.isNull(); i = i.nextSibling()) { if (i.isElement()) { - if (i.toElement().tagName() == QString::fromLatin1("metaInfo:meta")) + if (i.toElement().tagName() == TQString::fromLatin1("metaInfo:meta")) { - QString type = i.toElement().attribute(QString::fromLatin1("type")); + TQString type = i.toElement().attribute(TQString::fromLatin1("type")); d->meta[type] = i.toElement().text(); } - else if (i.toElement().tagName() == QString::fromLatin1("category")) + else if (i.toElement().tagName() == TQString::fromLatin1("category")) { d->categories.append(Category::fromXML(i.toElement())); } @@ -210,12 +210,12 @@ Article::~Article() delete d; } -QString Article::title() const +TQString Article::title() const { return d->title; } -QString Article::author() const +TQString Article::author() const { return d->author; } @@ -225,12 +225,12 @@ const KURL &Article::link() const return d->link; } -QString Article::description() const +TQString Article::description() const { return d->description; } -QString Article::guid() const +TQString Article::guid() const { return d->guid; } @@ -240,7 +240,7 @@ bool Article::guidIsPermaLink() const return d->guidIsPermaLink; } -const QDateTime &Article::pubDate() const +const TQDateTime &Article::pubDate() const { return d->pubDate; } @@ -256,12 +256,12 @@ int Article::comments() const } -QString Article::meta(const QString &key) const +TQString Article::meta(const TQString &key) const { return d->meta[key]; } -KURLLabel *Article::widget(QWidget *parent, const char *name) const +KURLLabel *Article::widget(TQWidget *parent, const char *name) const { KURLLabel *label = new KURLLabel(d->link.url(), d->title, parent, name); label->setUseTips(true); diff --git a/akregator/src/librss/article.h b/akregator/src/librss/article.h index 74deb2539..4aa11850a 100644 --- a/akregator/src/librss/article.h +++ b/akregator/src/librss/article.h @@ -11,7 +11,7 @@ #ifndef LIBRSS_ARTICLE_H #define LIBRSS_ARTICLE_H -#include <qmap.h> +#include <tqmap.h> #include "global.h" @@ -40,7 +40,7 @@ namespace RSS /** * A list of articles. */ - typedef QValueList<Article> List; + typedef TQValueList<Article> List; /** * Default constructor. @@ -55,10 +55,10 @@ namespace RSS /** * Constructs an Article from a piece of RSS markup. - * @param node A QDomNode which references the DOM leaf to be used + * @param node A TQDomNode which references the DOM leaf to be used * for constructing the Article. */ - Article(const QDomNode &node, Format format, Version version); + Article(const TQDomNode &node, Format format, Version version); /** * Assignment operator. @@ -90,10 +90,10 @@ namespace RSS /** * RSS 0.90 and upwards - * @return The headline of this article, or QString::null if + * @return The headline of this article, or TQString::null if * no headline was available. */ - QString title() const; + TQString title() const; /** * RSS 0.90 and upwards @@ -106,25 +106,25 @@ namespace RSS /** * RSS 0.91 and upwards - * @return A story synopsis, or QString::null if no description + * @return A story synopsis, or TQString::null if no description * was available. */ - QString description() const; + TQString description() const; /** * a string desribing the author of the item. */ - QString author() const; + TQString author() const; /** * RSS 2.0 and upwards * @return An article GUID (globally unique identifier). */ - QString guid() const; + TQString guid() const; /** * RSS 2.0 and upwards - * @return If this article GUID is permalink. Has no meaning when guid() is QString::null. + * @return If this article GUID is permalink. Has no meaning when guid() is TQString::null. */ bool guidIsPermaLink() const; @@ -132,7 +132,7 @@ namespace RSS * RSS 2.0 and upwards * @return The date when the article was published. */ - const QDateTime &pubDate() const; + const TQDateTime &pubDate() const; const KURL &commentsLink() const; int comments() const; @@ -140,9 +140,9 @@ namespace RSS Enclosure enclosure() const; /** returns a list of categories this article is assigned to. (RSS2 only, Atom is not supported yet) */ - QValueList<Category> categories() const; + TQValueList<Category> categories() const; - QString meta(const QString &key) const; + TQString meta(const TQString &key) const; /** * @param parent The parent widget for the KURLLabel. @@ -151,16 +151,16 @@ namespace RSS * This makes building a user-interface which contains the * information in this Article object more convenient. * The returned KURLLabel's caption will be the title(), clicking - * on it will emit the URL link(), and it has a QToolTip attached + * on it will emit the URL link(), and it has a TQToolTip attached * to it which displays the description() (in case it has one, * if there is no description, the URL which the label links to * will be used). * Note that you have to delete the KURLLabel object returned by * this method yourself. */ - KURLLabel *widget(QWidget *parent = 0, const char *name = 0) const; + KURLLabel *widget(TQWidget *parent = 0, const char *name = 0) const; - typedef QMap<QString, QString> MetaInfoMap; + typedef TQMap<TQString, TQString> MetaInfoMap; private: struct Private; diff --git a/akregator/src/librss/category.cpp b/akregator/src/librss/category.cpp index 07508ecaf..3fd5bee22 100644 --- a/akregator/src/librss/category.cpp +++ b/akregator/src/librss/category.cpp @@ -25,8 +25,8 @@ #include "category.h" #include "tools_p.h" -#include <qdom.h> -#include <qstring.h> +#include <tqdom.h> +#include <tqstring.h> class QString; @@ -37,8 +37,8 @@ class Category::CategoryPrivate : public Shared { public: bool isNull; - QString category; - QString domain; + TQString category; + TQString domain; bool operator==(const CategoryPrivate &other) const { @@ -61,11 +61,11 @@ bool Category::isNull() const return d == 0; } -Category Category::fromXML(const QDomElement& e) +Category Category::fromXML(const TQDomElement& e) { Category obj; - if (e.hasAttribute(QString::fromLatin1("domain"))) - obj.d->domain = e.attribute(QString::fromLatin1("domain")); + if (e.hasAttribute(TQString::fromLatin1("domain"))) + obj.d->domain = e.attribute(TQString::fromLatin1("domain")); obj.d->category = e.text(); obj.d->isNull = false; return obj; @@ -81,7 +81,7 @@ Category::Category(const Category& other) : d(0) *this = other; } -Category::Category(const QString& category, const QString& domain) : d(new CategoryPrivate) +Category::Category(const TQString& category, const TQString& domain) : d(new CategoryPrivate) { d->isNull = false; d->category = category; @@ -114,14 +114,14 @@ bool Category::operator==(const Category &other) const return *d == *other.d; } -QString Category::category() const +TQString Category::category() const { - return !d->isNull ? d->category : QString::null; + return !d->isNull ? d->category : TQString::null; } -QString Category::domain() const +TQString Category::domain() const { - return !d->isNull ? d->domain : QString::null; + return !d->isNull ? d->domain : TQString::null; } } // namespace RSS diff --git a/akregator/src/librss/category.h b/akregator/src/librss/category.h index 43267b903..597b34e1f 100644 --- a/akregator/src/librss/category.h +++ b/akregator/src/librss/category.h @@ -37,19 +37,19 @@ namespace RSS { public: - static Category fromXML(const QDomElement& e); + static Category fromXML(const TQDomElement& e); Category(); Category(const Category& other); - Category(const QString& category, const QString& domain); + Category(const TQString& category, const TQString& domain); virtual ~Category(); Category& operator=(const Category& other); bool operator==(const Category& other) const; - QString category() const; + TQString category() const; - QString domain() const; + TQString domain() const; bool isNull() const; diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp index ad9614f98..b52ea87c9 100644 --- a/akregator/src/librss/document.cpp +++ b/akregator/src/librss/document.cpp @@ -18,9 +18,9 @@ #include <krfcdate.h> #include <kurl.h> -#include <qdatetime.h> -#include <qdom.h> -#include <qptrlist.h> +#include <tqdatetime.h> +#include <tqdom.h> +#include <tqptrlist.h> #include <kdebug.h> @@ -42,22 +42,22 @@ struct Document::Private : public Shared } Version version; - QString title; - QString description; + TQString title; + TQString description; KURL link; Image *image; TextInput *textInput; Article::List articles; Language language; Format format; - QString copyright; - QDateTime pubDate; - QDateTime lastBuildDate; - QString rating; + TQString copyright; + TQDateTime pubDate; + TQDateTime lastBuildDate; + TQString rating; KURL docs; int ttl; - QString managingEditor; - QString webMaster; + TQString managingEditor; + TQString webMaster; HourList skipHours; DayList skipDays; bool valid; @@ -72,48 +72,48 @@ Document::Document(const Document &other) : d(0) *this = other; } -static QString extractLink(const QDomNode& node, Format format) +static TQString extractLink(const TQDomNode& node, Format format) { if (format == AtomFeed) { - QDomNode n; + TQDomNode n; for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) { - const QDomElement e = n.toElement(); - if ( (e.tagName() == QString::fromLatin1("link")) - && (e.attribute(QString::fromLatin1("rel"), QString::fromLatin1("alternate")) == QString::fromLatin1("alternate"))) + const TQDomElement e = n.toElement(); + if ( (e.tagName() == TQString::fromLatin1("link")) + && (e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate"))) { - return n.toElement().attribute(QString::fromLatin1("href")); + return n.toElement().attribute(TQString::fromLatin1("href")); } } } - return extractNode(node, QString::fromLatin1("link")); + return extractNode(node, TQString::fromLatin1("link")); } -Document::Document(const QDomDocument &doc) : d(new Private) +Document::Document(const TQDomDocument &doc) : d(new Private) { - QString elemText; - QDomNode rootNode = doc.documentElement(); + TQString elemText; + TQDomNode rootNode = doc.documentElement(); // Determine the version of the present RSS markup. - QString attr; + TQString attr; // we should probably check that it ISN'T feed or rss, rather than check if it is xhtml - if (rootNode.toElement().tagName()==QString::fromLatin1("html")) + if (rootNode.toElement().tagName()==TQString::fromLatin1("html")) d->valid=false; else d->valid=true; - attr = rootNode.toElement().attribute(QString::fromLatin1("version"), QString::null); - if (rootNode.toElement().tagName()==QString::fromLatin1("feed")) + attr = rootNode.toElement().attribute(TQString::fromLatin1("version"), TQString::null); + if (rootNode.toElement().tagName()==TQString::fromLatin1("feed")) { d->format=AtomFeed; - if (attr == QString::fromLatin1("0.3")) + if (attr == TQString::fromLatin1("0.3")) d->version = vAtom_0_3; - else if (attr == QString::fromLatin1("0.2")) /* smt -> review */ + else if (attr == TQString::fromLatin1("0.2")) /* smt -> review */ d->version = vAtom_0_2; - else if (attr == QString::fromLatin1("0.1")) /* smt -> review */ + else if (attr == TQString::fromLatin1("0.1")) /* smt -> review */ d->version = vAtom_0_1; else d->version = vAtom_1_0; @@ -121,13 +121,13 @@ Document::Document(const QDomDocument &doc) : d(new Private) else { d->format=RSSFeed; - if (attr == QString::fromLatin1("0.91")) + if (attr == TQString::fromLatin1("0.91")) d->version = v0_91; - else if (attr == QString::fromLatin1("0.92")) + else if (attr == TQString::fromLatin1("0.92")) d->version = v0_92; - else if (attr == QString::fromLatin1("0.93")) + else if (attr == TQString::fromLatin1("0.93")) d->version = v0_93; - else if (attr == QString::fromLatin1("0.94")) + else if (attr == TQString::fromLatin1("0.94")) d->version = v0_94; else // otherwise, we just assume a RSS2 compatible feed. As rss2 is generally // backward-compatible, this should work @@ -137,7 +137,7 @@ Document::Document(const QDomDocument &doc) : d(new Private) if (d->format==UnknownFormat) { - attr = rootNode.toElement().attribute(QString::fromLatin1("xmlns"), QString::null); + attr = rootNode.toElement().attribute(TQString::fromLatin1("xmlns"), TQString::null); if (!attr.isNull()) { /* * Hardcoding these URLs is actually a bad idea, since the DTD doesn't @@ -147,27 +147,27 @@ Document::Document(const QDomDocument &doc) : d(new Private) * distinguish the RSS versions by analyzing the relationship between * the nodes. */ - if (attr == QString::fromLatin1("http://my.netscape.com/rdf/simple/0.9/")) { + if (attr == TQString::fromLatin1("http://my.netscape.com/rdf/simple/0.9/")) { d->format=RSSFeed; d->version = v0_90; } - else if (attr == QString::fromLatin1("http://purl.org/rss/1.0/")) { + else if (attr == TQString::fromLatin1("http://purl.org/rss/1.0/")) { d->format=RSSFeed; d->version = v1_0; } } } - QDomNode channelNode; + TQDomNode channelNode; if (d->format == AtomFeed) channelNode=rootNode; else - channelNode=rootNode.namedItem(QString::fromLatin1("channel")); + channelNode=rootNode.namedItem(TQString::fromLatin1("channel")); if (!(elemText = extractTitle(channelNode)).isNull()) d->title = elemText; - QString descriptionTagName = "description"; + TQString descriptionTagName = "description"; if (d->format == AtomFeed) { @@ -186,246 +186,246 @@ Document::Document(const QDomDocument &doc) : d(new Private) /* This is ugly but necessary since RSS 0.90 and 1.0 have a different parent * node for <image>, <textinput> and <item> than RSS 0.91-0.94 and RSS 2.0. */ - QDomNode parentNode; + TQDomNode parentNode; if (d->version == v0_90 || d->version == v1_0 || d->format == AtomFeed) parentNode = rootNode; else { // following is a HACK for broken 0.91 feeds like xanga.com's - if (!rootNode.namedItem(QString::fromLatin1("item")).isNull()) + if (!rootNode.namedItem(TQString::fromLatin1("item")).isNull()) parentNode = rootNode; else parentNode = channelNode; } // image and textinput aren't supported by Atom.. handle in case feed provides - QDomNode n = parentNode.namedItem(QString::fromLatin1("image")); + TQDomNode n = parentNode.namedItem(TQString::fromLatin1("image")); if (!n.isNull()) d->image = new Image(n); - n = parentNode.namedItem(QString::fromLatin1("textinput")); + n = parentNode.namedItem(TQString::fromLatin1("textinput")); if (!n.isNull()) d->textInput = new TextInput(n); // Our (hopefully faster) version of elementsByTagName() - QString tagName; + TQString tagName; if (d->format == AtomFeed) - tagName=QString::fromLatin1("entry"); + tagName=TQString::fromLatin1("entry"); else - tagName=QString::fromLatin1("item"); + tagName=TQString::fromLatin1("item"); for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) { - const QDomElement e = n.toElement(); + const TQDomElement e = n.toElement(); if (e.tagName() == tagName) d->articles.append(Article(e, d->format, d->version)); } - if (!(elemText = extractNode(channelNode, QString::fromLatin1("copyright"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("copyright"))).isNull()) d->copyright = elemText; if (d->format == AtomFeed) - elemText = rootNode.toElement().attribute(QString::fromLatin1("xml:lang"), QString::null); + elemText = rootNode.toElement().attribute(TQString::fromLatin1("xml:lang"), TQString::null); else - elemText = extractNode(channelNode, QString::fromLatin1("language")); + elemText = extractNode(channelNode, TQString::fromLatin1("language")); if (!elemText.isNull()){ - if (elemText == QString::fromLatin1("af")) + if (elemText == TQString::fromLatin1("af")) d->language = af; - else if (elemText == QString::fromLatin1("sq")) + else if (elemText == TQString::fromLatin1("sq")) d->language = sq; - else if (elemText == QString::fromLatin1("eu")) + else if (elemText == TQString::fromLatin1("eu")) d->language = eu; - else if (elemText == QString::fromLatin1("be")) + else if (elemText == TQString::fromLatin1("be")) d->language = be; - else if (elemText == QString::fromLatin1("bg")) + else if (elemText == TQString::fromLatin1("bg")) d->language = bg; - else if (elemText == QString::fromLatin1("ca")) + else if (elemText == TQString::fromLatin1("ca")) d->language = ca; - else if (elemText == QString::fromLatin1("zh-cn")) + else if (elemText == TQString::fromLatin1("zh-cn")) d->language = zh_cn; - else if (elemText == QString::fromLatin1("zh-tw")) + else if (elemText == TQString::fromLatin1("zh-tw")) d->language = zh_tw; - else if (elemText == QString::fromLatin1("hr")) + else if (elemText == TQString::fromLatin1("hr")) d->language = hr; - else if (elemText == QString::fromLatin1("cs")) + else if (elemText == TQString::fromLatin1("cs")) d->language = cs; - else if (elemText == QString::fromLatin1("da")) + else if (elemText == TQString::fromLatin1("da")) d->language = da; - else if (elemText == QString::fromLatin1("nl")) + else if (elemText == TQString::fromLatin1("nl")) d->language = nl; - else if (elemText == QString::fromLatin1("nl-be")) + else if (elemText == TQString::fromLatin1("nl-be")) d->language = nl_be; - else if (elemText == QString::fromLatin1("nl-nl")) + else if (elemText == TQString::fromLatin1("nl-nl")) d->language = nl_nl; - else if (elemText == QString::fromLatin1("en")) + else if (elemText == TQString::fromLatin1("en")) d->language = en; - else if (elemText == QString::fromLatin1("en-au")) + else if (elemText == TQString::fromLatin1("en-au")) d->language = en_au; - else if (elemText == QString::fromLatin1("en-bz")) + else if (elemText == TQString::fromLatin1("en-bz")) d->language = en_bz; - else if (elemText == QString::fromLatin1("en-ca")) + else if (elemText == TQString::fromLatin1("en-ca")) d->language = en_ca; - else if (elemText == QString::fromLatin1("en-ie")) + else if (elemText == TQString::fromLatin1("en-ie")) d->language = en_ie; - else if (elemText == QString::fromLatin1("en-jm")) + else if (elemText == TQString::fromLatin1("en-jm")) d->language = en_jm; - else if (elemText == QString::fromLatin1("en-nz")) + else if (elemText == TQString::fromLatin1("en-nz")) d->language = en_nz; - else if (elemText == QString::fromLatin1("en-ph")) + else if (elemText == TQString::fromLatin1("en-ph")) d->language = en_ph; - else if (elemText == QString::fromLatin1("en-za")) + else if (elemText == TQString::fromLatin1("en-za")) d->language = en_za; - else if (elemText == QString::fromLatin1("en-tt")) + else if (elemText == TQString::fromLatin1("en-tt")) d->language = en_tt; - else if (elemText == QString::fromLatin1("en-gb")) + else if (elemText == TQString::fromLatin1("en-gb")) d->language = en_gb; - else if (elemText == QString::fromLatin1("en-us")) + else if (elemText == TQString::fromLatin1("en-us")) d->language = en_us; - else if (elemText == QString::fromLatin1("en-zw")) + else if (elemText == TQString::fromLatin1("en-zw")) d->language = en_zw; - else if (elemText == QString::fromLatin1("fo")) + else if (elemText == TQString::fromLatin1("fo")) d->language = fo; - else if (elemText == QString::fromLatin1("fi")) + else if (elemText == TQString::fromLatin1("fi")) d->language = fi; - else if (elemText == QString::fromLatin1("fr")) + else if (elemText == TQString::fromLatin1("fr")) d->language = fr; - else if (elemText == QString::fromLatin1("fr-be")) + else if (elemText == TQString::fromLatin1("fr-be")) d->language = fr_be; - else if (elemText == QString::fromLatin1("fr-ca")) + else if (elemText == TQString::fromLatin1("fr-ca")) d->language = fr_ca; - else if (elemText == QString::fromLatin1("fr-fr")) + else if (elemText == TQString::fromLatin1("fr-fr")) d->language = fr_fr; - else if (elemText == QString::fromLatin1("fr-lu")) + else if (elemText == TQString::fromLatin1("fr-lu")) d->language = fr_lu; - else if (elemText == QString::fromLatin1("fr-mc")) + else if (elemText == TQString::fromLatin1("fr-mc")) d->language = fr_mc; - else if (elemText == QString::fromLatin1("fr-ch")) + else if (elemText == TQString::fromLatin1("fr-ch")) d->language = fr_ch; - else if (elemText == QString::fromLatin1("gl")) + else if (elemText == TQString::fromLatin1("gl")) d->language = gl; - else if (elemText == QString::fromLatin1("gd")) + else if (elemText == TQString::fromLatin1("gd")) d->language = gd; - else if (elemText == QString::fromLatin1("de")) + else if (elemText == TQString::fromLatin1("de")) d->language = de; - else if (elemText == QString::fromLatin1("de-at")) + else if (elemText == TQString::fromLatin1("de-at")) d->language = de_at; - else if (elemText == QString::fromLatin1("de-de")) + else if (elemText == TQString::fromLatin1("de-de")) d->language = de_de; - else if (elemText == QString::fromLatin1("de-li")) + else if (elemText == TQString::fromLatin1("de-li")) d->language = de_li; - else if (elemText == QString::fromLatin1("de-lu")) + else if (elemText == TQString::fromLatin1("de-lu")) d->language = de_lu; - else if (elemText == QString::fromLatin1("de-ch")) + else if (elemText == TQString::fromLatin1("de-ch")) d->language = de_ch; - else if (elemText == QString::fromLatin1("el")) + else if (elemText == TQString::fromLatin1("el")) d->language = el; - else if (elemText == QString::fromLatin1("hu")) + else if (elemText == TQString::fromLatin1("hu")) d->language = hu; - else if (elemText == QString::fromLatin1("is")) + else if (elemText == TQString::fromLatin1("is")) d->language = is; - else if (elemText == QString::fromLatin1("id")) + else if (elemText == TQString::fromLatin1("id")) d->language = id; - else if (elemText == QString::fromLatin1("ga")) + else if (elemText == TQString::fromLatin1("ga")) d->language = ga; - else if (elemText == QString::fromLatin1("it")) + else if (elemText == TQString::fromLatin1("it")) d->language = it; - else if (elemText == QString::fromLatin1("it-it")) + else if (elemText == TQString::fromLatin1("it-it")) d->language = it_it; - else if (elemText == QString::fromLatin1("it-ch")) + else if (elemText == TQString::fromLatin1("it-ch")) d->language = it_ch; - else if (elemText == QString::fromLatin1("ja")) + else if (elemText == TQString::fromLatin1("ja")) d->language = ja; - else if (elemText == QString::fromLatin1("ko")) + else if (elemText == TQString::fromLatin1("ko")) d->language = ko; - else if (elemText == QString::fromLatin1("mk")) + else if (elemText == TQString::fromLatin1("mk")) d->language = mk; - else if (elemText == QString::fromLatin1("no")) + else if (elemText == TQString::fromLatin1("no")) d->language = no; - else if (elemText == QString::fromLatin1("pl")) + else if (elemText == TQString::fromLatin1("pl")) d->language = pl; - else if (elemText == QString::fromLatin1("pt")) + else if (elemText == TQString::fromLatin1("pt")) d->language = pt; - else if (elemText == QString::fromLatin1("pt-br")) + else if (elemText == TQString::fromLatin1("pt-br")) d->language = pt_br; - else if (elemText == QString::fromLatin1("pt-pt")) + else if (elemText == TQString::fromLatin1("pt-pt")) d->language = pt_pt; - else if (elemText == QString::fromLatin1("ro")) + else if (elemText == TQString::fromLatin1("ro")) d->language = ro; - else if (elemText == QString::fromLatin1("ro-mo")) + else if (elemText == TQString::fromLatin1("ro-mo")) d->language = ro_mo; - else if (elemText == QString::fromLatin1("ro-ro")) + else if (elemText == TQString::fromLatin1("ro-ro")) d->language = ro_ro; - else if (elemText == QString::fromLatin1("ru")) + else if (elemText == TQString::fromLatin1("ru")) d->language = ru; - else if (elemText == QString::fromLatin1("ru-mo")) + else if (elemText == TQString::fromLatin1("ru-mo")) d->language = ru_mo; - else if (elemText == QString::fromLatin1("ru-ru")) + else if (elemText == TQString::fromLatin1("ru-ru")) d->language = ru_ru; - else if (elemText == QString::fromLatin1("sr")) + else if (elemText == TQString::fromLatin1("sr")) d->language = sr; - else if (elemText == QString::fromLatin1("sk")) + else if (elemText == TQString::fromLatin1("sk")) d->language = sk; - else if (elemText == QString::fromLatin1("sl")) + else if (elemText == TQString::fromLatin1("sl")) d->language = sl; - else if (elemText == QString::fromLatin1("es")) + else if (elemText == TQString::fromLatin1("es")) d->language = es; - else if (elemText == QString::fromLatin1("es-ar")) + else if (elemText == TQString::fromLatin1("es-ar")) d->language = es_ar; - else if (elemText == QString::fromLatin1("es-bo")) + else if (elemText == TQString::fromLatin1("es-bo")) d->language = es_bo; - else if (elemText == QString::fromLatin1("es-cl")) + else if (elemText == TQString::fromLatin1("es-cl")) d->language = es_cl; - else if (elemText == QString::fromLatin1("es-co")) + else if (elemText == TQString::fromLatin1("es-co")) d->language = es_co; - else if (elemText == QString::fromLatin1("es-cr")) + else if (elemText == TQString::fromLatin1("es-cr")) d->language = es_cr; - else if (elemText == QString::fromLatin1("es-do")) + else if (elemText == TQString::fromLatin1("es-do")) d->language = es_do; - else if (elemText == QString::fromLatin1("es-ec")) + else if (elemText == TQString::fromLatin1("es-ec")) d->language = es_ec; - else if (elemText == QString::fromLatin1("es-sv")) + else if (elemText == TQString::fromLatin1("es-sv")) d->language = es_sv; - else if (elemText == QString::fromLatin1("es-gt")) + else if (elemText == TQString::fromLatin1("es-gt")) d->language = es_gt; - else if (elemText == QString::fromLatin1("es-hn")) + else if (elemText == TQString::fromLatin1("es-hn")) d->language = es_hn; - else if (elemText == QString::fromLatin1("es-mx")) + else if (elemText == TQString::fromLatin1("es-mx")) d->language = es_mx; - else if (elemText == QString::fromLatin1("es-ni")) + else if (elemText == TQString::fromLatin1("es-ni")) d->language = es_ni; - else if (elemText == QString::fromLatin1("es-pa")) + else if (elemText == TQString::fromLatin1("es-pa")) d->language = es_pa; - else if (elemText == QString::fromLatin1("es-py")) + else if (elemText == TQString::fromLatin1("es-py")) d->language = es_py; - else if (elemText == QString::fromLatin1("es-pe")) + else if (elemText == TQString::fromLatin1("es-pe")) d->language = es_pe; - else if (elemText == QString::fromLatin1("es-pr")) + else if (elemText == TQString::fromLatin1("es-pr")) d->language = es_pr; - else if (elemText == QString::fromLatin1("es-es")) + else if (elemText == TQString::fromLatin1("es-es")) d->language = es_es; - else if (elemText == QString::fromLatin1("es-uy")) + else if (elemText == TQString::fromLatin1("es-uy")) d->language = es_uy; - else if (elemText == QString::fromLatin1("es-ve")) + else if (elemText == TQString::fromLatin1("es-ve")) d->language = es_ve; - else if (elemText == QString::fromLatin1("sv")) + else if (elemText == TQString::fromLatin1("sv")) d->language = sv; - else if (elemText == QString::fromLatin1("sv-fi")) + else if (elemText == TQString::fromLatin1("sv-fi")) d->language = sv_fi; - else if (elemText == QString::fromLatin1("sv-se")) + else if (elemText == TQString::fromLatin1("sv-se")) d->language = sv_se; - else if (elemText == QString::fromLatin1("tr")) + else if (elemText == TQString::fromLatin1("tr")) d->language = tr; - else if (elemText == QString::fromLatin1("uk")) + else if (elemText == TQString::fromLatin1("uk")) d->language = uk; else d->language = UndefinedLanguage; } if (d->format == AtomFeed) - tagName=QString::fromLatin1("issued"); // atom doesn't specify this for feeds + tagName=TQString::fromLatin1("issued"); // atom doesn't specify this for feeds // but some broken feeds do this else - tagName=QString::fromLatin1("pubDate"); + tagName=TQString::fromLatin1("pubDate"); if (!(elemText = extractNode(channelNode, tagName)).isNull()) { time_t _time; @@ -441,7 +441,7 @@ Document::Document(const QDomDocument &doc) : d(new Private) d->pubDate.setTime_t(_time); } - if (!(elemText = extractNode(channelNode, QString::fromLatin1("dc:date"))).isNull()) { + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("dc:date"))).isNull()) { time_t _time = parseISO8601Date(elemText); /* \bug This isn't really the right way since it will set the date to * Jan 1 1970, 1:00:00 if the passed date was invalid; this means that @@ -451,9 +451,9 @@ Document::Document(const QDomDocument &doc) : d(new Private) } if (d->format == AtomFeed) - tagName=QString::fromLatin1("modified"); + tagName=TQString::fromLatin1("modified"); else - tagName=QString::fromLatin1("lastBuildDate"); + tagName=TQString::fromLatin1("lastBuildDate"); if (!(elemText = extractNode(channelNode, tagName)).isNull()) { time_t _time; if (d->format == AtomFeed) @@ -463,44 +463,44 @@ Document::Document(const QDomDocument &doc) : d(new Private) d->lastBuildDate.setTime_t(_time); } - if (!(elemText = extractNode(channelNode, QString::fromLatin1("rating"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("rating"))).isNull()) d->rating = elemText; - if (!(elemText = extractNode(channelNode, QString::fromLatin1("docs"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("docs"))).isNull()) d->docs = elemText; - if (!(elemText = extractNode(channelNode, QString::fromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull()) d->managingEditor = elemText; - if (!(elemText = extractNode(channelNode, QString::fromLatin1("webMaster"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("webMaster"))).isNull()) d->webMaster = elemText; - if (!(elemText = extractNode(channelNode, QString::fromLatin1("ttl"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("ttl"))).isNull()) d->ttl = elemText.toUInt(); - n = channelNode.namedItem(QString::fromLatin1("skipHours")); + n = channelNode.namedItem(TQString::fromLatin1("skipHours")); if (!n.isNull()) - for (QDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement()) - if (e.tagName() == QString::fromLatin1("hour")) + for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement()) + if (e.tagName() == TQString::fromLatin1("hour")) d->skipHours.append(e.text().toUInt()); - n = channelNode.namedItem(QString::fromLatin1("skipDays")); + n = channelNode.namedItem(TQString::fromLatin1("skipDays")); if (!n.isNull()) { Day day; - QString elemText; - for (QDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement()) - if (e.tagName() == QString::fromLatin1("day")) { + TQString elemText; + for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement()) + if (e.tagName() == TQString::fromLatin1("day")) { elemText = e.text().lower(); - if (elemText == QString::fromLatin1("monday")) + if (elemText == TQString::fromLatin1("monday")) day = Monday; - else if (elemText == QString::fromLatin1("tuesday")) + else if (elemText == TQString::fromLatin1("tuesday")) day = Tuesday; - else if (elemText == QString::fromLatin1("wednesday")) + else if (elemText == TQString::fromLatin1("wednesday")) day = Wednesday; - else if (elemText == QString::fromLatin1("thursday")) + else if (elemText == TQString::fromLatin1("thursday")) day = Thursday; - else if (elemText == QString::fromLatin1("friday")) + else if (elemText == TQString::fromLatin1("friday")) day = Friday; - else if (elemText == QString::fromLatin1("saturday")) + else if (elemText == TQString::fromLatin1("saturday")) day = Saturday; - else if (elemText == QString::fromLatin1("sunday")) + else if (elemText == TQString::fromLatin1("sunday")) day = Sunday; else day = UndefinedDay; @@ -526,30 +526,30 @@ Version Document::version() const return d->version; } -QString Document::verbVersion() const +TQString Document::verbVersion() const { switch (d->version) { - case v0_90: return QString::fromLatin1("0.90"); - case v0_91: return QString::fromLatin1("0.91"); - case v0_92: return QString::fromLatin1("0.92"); - case v0_93: return QString::fromLatin1("0.93"); - case v0_94: return QString::fromLatin1("0.94"); - case v1_0: return QString::fromLatin1("1.0"); - case v2_0: return QString::fromLatin1("2.0"); - case vAtom_0_3: return QString::fromLatin1("0.3"); - case vAtom_0_2: return QString::fromLatin1("0.2"); - case vAtom_0_1: return QString::fromLatin1("0.1"); - case vAtom_1_0: return QString::fromLatin1("1.0"); + case v0_90: return TQString::fromLatin1("0.90"); + case v0_91: return TQString::fromLatin1("0.91"); + case v0_92: return TQString::fromLatin1("0.92"); + case v0_93: return TQString::fromLatin1("0.93"); + case v0_94: return TQString::fromLatin1("0.94"); + case v1_0: return TQString::fromLatin1("1.0"); + case v2_0: return TQString::fromLatin1("2.0"); + case vAtom_0_3: return TQString::fromLatin1("0.3"); + case vAtom_0_2: return TQString::fromLatin1("0.2"); + case vAtom_0_1: return TQString::fromLatin1("0.1"); + case vAtom_1_0: return TQString::fromLatin1("1.0"); } - return QString::null; + return TQString::null; } -QString Document::title() const +TQString Document::title() const { return d->title; } -QString Document::description() const +TQString Document::description() const { return d->description; } @@ -589,22 +589,22 @@ Language Document::language() const return d->language; } -QString Document::copyright() const +TQString Document::copyright() const { return d->copyright; } -const QDateTime &Document::pubDate() const +const TQDateTime &Document::pubDate() const { return d->pubDate; } -const QDateTime &Document::lastBuildDate() const +const TQDateTime &Document::lastBuildDate() const { return d->lastBuildDate; } -QString Document::rating() const +TQString Document::rating() const { return d->rating; } @@ -614,12 +614,12 @@ const KURL &Document::docs() const return d->docs; } -QString Document::managingEditor() const +TQString Document::managingEditor() const { return d->managingEditor; } -QString Document::webMaster() const +TQString Document::webMaster() const { return d->webMaster; } diff --git a/akregator/src/librss/document.h b/akregator/src/librss/document.h index 161960720..450dcf3ba 100644 --- a/akregator/src/librss/document.h +++ b/akregator/src/librss/document.h @@ -45,7 +45,7 @@ namespace RSS /** * Constructs a Document from a piece of XML markup. */ - Document(const QDomDocument &doc); + Document(const TQDomDocument &doc); /** * Assignment operator. @@ -75,28 +75,28 @@ namespace RSS /** * Convenience method. Differs from version() only in how the result * is returned. - * @return A QString representing the verbose version of the + * @return A TQString representing the verbose version of the * document. * @see version() */ - QString verbVersion() const; + TQString verbVersion() const; /** * RSS 0.90 and upwards - * @return The title of the RSS document, or QString::null if no + * @return The title of the RSS document, or TQString::null if no * title was available. This is often the name of the news source * from which the RSS document was retrieved. */ - QString title() const; + TQString title() const; /** * RSS 0.90 and upwards - * @return The description of the RSS document, or QString::null + * @return The description of the RSS document, or TQString::null * if no description was available. This is usually a short slogan * or description of the news source from which the RSS document * was retrieved. */ - QString description() const; + TQString description() const; /** * RSS 0.90 and upwards @@ -158,28 +158,28 @@ namespace RSS /** * RSS 0.91 and upwards * @return A copyright of the information contained in the RSS - * document, or QString::null if no copyright is available. + * document, or TQString::null if no copyright is available. */ - QString copyright() const; + TQString copyright() const; /** * RSS 0.91 and upwards * @return The date when the RSS document was published. */ - const QDateTime &pubDate() const; + const TQDateTime &pubDate() const; /** * RSS 0.91 and upwards. * @return The last time the channel was modified. */ - const QDateTime &lastBuildDate() const; + const TQDateTime &lastBuildDate() const; /** * RSS 0.91 and upwards * @return A <a href="http://www.w3.org/PICS/#Specs">PICS</a> * rating for this page. */ - QString rating() const; + TQString rating() const; /** * RSS 0.91 and upwards @@ -197,16 +197,16 @@ namespace RSS * bull@mancuso.com (Bull Mancuso). * @see webMaster() */ - QString managingEditor() const; + TQString managingEditor() const; /** * RSS 0.91 and upwards * @return The email address of the webmaster for the site, the * person to contact if there are technical problems with the - * channel, or QString::null if this information isn't available. + * channel, or TQString::null if this information isn't available. * @see managingEditor() */ - QString webMaster() const; + TQString webMaster() const; /** * RSS 0.91 and upwards diff --git a/akregator/src/librss/enclosure.cpp b/akregator/src/librss/enclosure.cpp index 60898f1bf..602a25588 100644 --- a/akregator/src/librss/enclosure.cpp +++ b/akregator/src/librss/enclosure.cpp @@ -25,8 +25,8 @@ #include "enclosure.h" #include "tools_p.h" -#include <qdom.h> -#include <qstring.h> +#include <tqdom.h> +#include <tqstring.h> #include <kdebug.h> @@ -39,9 +39,9 @@ class Enclosure::EnclosurePrivate : public Shared public: bool isNull; - QString url; + TQString url; int length; - QString type; + TQString type; bool operator==(const EnclosurePrivate &other) const { @@ -52,35 +52,35 @@ class Enclosure::EnclosurePrivate : public Shared }; -Enclosure Enclosure::fromXML(const QDomElement& e) +Enclosure Enclosure::fromXML(const TQDomElement& e) { - QString url, type; + TQString url, type; int length = -1; - if (e.hasAttribute(QString::fromLatin1("url"))) - url = e.attribute(QString::fromLatin1("url")); + if (e.hasAttribute(TQString::fromLatin1("url"))) + url = e.attribute(TQString::fromLatin1("url")); - if (e.hasAttribute(QString::fromLatin1("length"))) + if (e.hasAttribute(TQString::fromLatin1("length"))) { bool ok; - int c = e.attribute(QString::fromLatin1("length")).toInt(&ok); + int c = e.attribute(TQString::fromLatin1("length")).toInt(&ok); length = ok ? c : -1; } - if (e.hasAttribute(QString::fromLatin1("type"))) - type = e.attribute(QString::fromLatin1("type")); + if (e.hasAttribute(TQString::fromLatin1("type"))) + type = e.attribute(TQString::fromLatin1("type")); return Enclosure(url, length, type); } -QDomElement Enclosure::toXML(QDomDocument document) const +TQDomElement Enclosure::toXML(TQDomDocument document) const { - QDomElement e = document.createElement(QString::fromLatin1("enclosure")); + TQDomElement e = document.createElement(TQString::fromLatin1("enclosure")); if (!d->url.isNull()) - e.setAttribute(QString::fromLatin1("url"), d->url); + e.setAttribute(TQString::fromLatin1("url"), d->url); if (d->length != -1) - e.setAttribute(QString::fromLatin1("length"), QString::number(d->length)); + e.setAttribute(TQString::fromLatin1("length"), TQString::number(d->length)); if (!d->type.isNull()) - e.setAttribute(QString::fromLatin1("type"), d->type); + e.setAttribute(TQString::fromLatin1("type"), d->type); return e; } @@ -96,7 +96,7 @@ Enclosure::Enclosure(const Enclosure& other) : d(0) *this = other; } -Enclosure::Enclosure(const QString& url, int length, const QString& type) : d(new EnclosurePrivate) +Enclosure::Enclosure(const TQString& url, int length, const TQString& type) : d(new EnclosurePrivate) { d->isNull = false; d->url = url; @@ -135,7 +135,7 @@ bool Enclosure::isNull() const return d->isNull; } -QString Enclosure::url() const +TQString Enclosure::url() const { return d->url; } @@ -145,7 +145,7 @@ int Enclosure::length() const return d->length; } -QString Enclosure::type() const +TQString Enclosure::type() const { return d->type; } diff --git a/akregator/src/librss/enclosure.h b/akregator/src/librss/enclosure.h index d3db5d12a..d97fbd4bf 100644 --- a/akregator/src/librss/enclosure.h +++ b/akregator/src/librss/enclosure.h @@ -37,12 +37,12 @@ namespace RSS { public: - static Enclosure fromXML(const QDomElement& e); - QDomElement toXML(QDomDocument document) const; + static Enclosure fromXML(const TQDomElement& e); + TQDomElement toXML(TQDomDocument document) const; Enclosure(); Enclosure(const Enclosure& other); - Enclosure(const QString& url, int length, const QString& type); + Enclosure(const TQString& url, int length, const TQString& type); virtual ~Enclosure(); bool isNull() const; @@ -51,13 +51,13 @@ namespace RSS bool operator==(const Enclosure& other) const; /** returns the URL of the enclosure */ - QString url() const; + TQString url() const; /** returns the size of the enclosure in bytes */ int length() const; /** returns the mime type of the enclosure */ - QString type() const; + TQString type() const; private: diff --git a/akregator/src/librss/feeddetector.cpp b/akregator/src/librss/feeddetector.cpp index a45b18776..4407ff09f 100644 --- a/akregator/src/librss/feeddetector.cpp +++ b/akregator/src/librss/feeddetector.cpp @@ -22,10 +22,10 @@ without including the source code for Qt in the source distribution. */ -#include <qregexp.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qvaluelist.h> +#include <tqregexp.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqvaluelist.h> #include <kcharsets.h> #include <kurl.h> @@ -34,26 +34,26 @@ using namespace RSS; -FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s) +FeedDetectorEntryList FeedDetector::extractFromLinkTags(const TQString& s) { //reduce all sequences of spaces, newlines etc. to one space: - QString str = s.simplifyWhiteSpace(); + TQString str = s.simplifyWhiteSpace(); // extracts <link> tags - QRegExp reLinkTag("<[\\s]?LINK[^>]*REL[\\s]?=[\\s]?\\\"[\\s]?(ALTERNATE|SERVICE\\.FEED)[\\s]?\\\"[^>]*>", false); + TQRegExp reLinkTag("<[\\s]?LINK[^>]*REL[\\s]?=[\\s]?\\\"[\\s]?(ALTERNATE|SERVICE\\.FEED)[\\s]?\\\"[^>]*>", false); // extracts the URL (href="url") - QRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); + TQRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); // extracts type attribute - QRegExp reType("TYPE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); + TQRegExp reType("TYPE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); // extracts the title (title="title") - QRegExp reTitle("TITLE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); + TQRegExp reTitle("TITLE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); int pos = 0; int matchpos = 0; // get all <link> tags - QStringList linkTags; + TQStringList linkTags; //int strlength = str.length(); while ( matchpos != -1 ) { @@ -67,9 +67,9 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s) FeedDetectorEntryList list; - for ( QStringList::Iterator it = linkTags.begin(); it != linkTags.end(); ++it ) + for ( TQStringList::Iterator it = linkTags.begin(); it != linkTags.end(); ++it ) { - QString type; + TQString type; int pos = reType.search(*it, 0); if (pos != -1) type = reType.cap(1).lower(); @@ -79,14 +79,14 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s) && type != "application/atom+xml" && type != "text/xml" ) continue; - QString title; + TQString title; pos = reTitle.search(*it, 0); if (pos != -1) title = reTitle.cap(1); title = KCharsets::resolveEntities(title); - QString url; + TQString url; pos = reHref.search(*it, 0); if (pos != -1) url = reHref.cap(1); @@ -105,33 +105,33 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s) return list; } -QStringList FeedDetector::extractBruteForce(const QString& s) +TQStringList FeedDetector::extractBruteForce(const TQString& s) { - QString str = s.simplifyWhiteSpace(); + TQString str = s.simplifyWhiteSpace(); - QRegExp reAhrefTag("<[\\s]?A[^>]?HREF=[\\s]?\\\"[^\\\"]*\\\"[^>]*>", false); + TQRegExp reAhrefTag("<[\\s]?A[^>]?HREF=[\\s]?\\\"[^\\\"]*\\\"[^>]*>", false); // extracts the URL (href="url") - QRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); + TQRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); - QRegExp rssrdfxml(".*(RSS|RDF|XML)", false); + TQRegExp rssrdfxml(".*(RSS|RDF|XML)", false); int pos = 0; int matchpos = 0; // get all <a href> tags and capture url - QStringList list; + TQStringList list; //int strlength = str.length(); while ( matchpos != -1 ) { matchpos = reAhrefTag.search(str, pos); if ( matchpos != -1 ) { - QString ahref = str.mid(matchpos, reAhrefTag.matchedLength()); + TQString ahref = str.mid(matchpos, reAhrefTag.matchedLength()); int hrefpos = reHref.search(ahref, 0); if ( hrefpos != -1 ) { - QString url = reHref.cap(1); + TQString url = reHref.cap(1); url = KCharsets::resolveEntities(url); @@ -146,9 +146,9 @@ QStringList FeedDetector::extractBruteForce(const QString& s) return list; } -QString FeedDetector::fixRelativeURL(const QString &s, const KURL &baseurl) +TQString FeedDetector::fixRelativeURL(const TQString &s, const KURL &baseurl) { - QString s2=s; + TQString s2=s; KURL u; if (KURL::isRelativeURL(s2)) { @@ -160,8 +160,8 @@ QString FeedDetector::fixRelativeURL(const QString &s, const KURL &baseurl) else if (s2.startsWith("/")) { KURL b2(baseurl); - b2.setPath(QString()); // delete path and query, so that only protocol://host remains - b2.setQuery(QString()); + b2.setPath(TQString()); // delete path and query, so that only protocol://host remains + b2.setQuery(TQString()); u = KURL(b2, s2.remove(0,1)); // remove leading "/" } else diff --git a/akregator/src/librss/feeddetector.h b/akregator/src/librss/feeddetector.h index c27acf76e..2f502acd4 100644 --- a/akregator/src/librss/feeddetector.h +++ b/akregator/src/librss/feeddetector.h @@ -25,8 +25,8 @@ #ifndef LIBRSS_FEEDDETECTOR_H #define LIBRSS_FEEDDETECTOR_H -#include <qstring.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> class QStringList; class KURL; @@ -38,18 +38,18 @@ namespace RSS { public: FeedDetectorEntry() {} - FeedDetectorEntry(const QString& url, const QString& title) + FeedDetectorEntry(const TQString& url, const TQString& title) : m_url(url), m_title(title) {} - const QString& url() const { return m_url; } - const QString& title() const { return m_title; } + const TQString& url() const { return m_url; } + const TQString& title() const { return m_title; } private: - const QString m_url; - const QString m_title; + const TQString m_url; + const TQString m_title; }; - typedef QValueList<FeedDetectorEntry> FeedDetectorEntryList; + typedef TQValueList<FeedDetectorEntry> FeedDetectorEntryList; /** a class providing functions to detect linked feeds in HTML sources */ class FeedDetector @@ -61,16 +61,16 @@ namespace RSS @param s the html source to scan (the actual source, no URI) @return a list containing the detected feeds */ - static FeedDetectorEntryList extractFromLinkTags(const QString& s); + static FeedDetectorEntryList extractFromLinkTags(const TQString& s); /** \brief searches an HTML page for slightly feed-like looking links and catches everything not running away quickly enough. Extracts links from @c <a @c href> tags which end with @c xml, @c rss or @c rdf @param s the html source to scan (the actual source, no URI) @return a list containing the detected feeds */ - static QStringList extractBruteForce(const QString& s); + static TQStringList extractBruteForce(const TQString& s); - static QString fixRelativeURL(const QString &s, const KURL &baseurl); + static TQString fixRelativeURL(const TQString &s, const KURL &baseurl); private: FeedDetector() {} diff --git a/akregator/src/librss/global.h b/akregator/src/librss/global.h index cec9609c7..68cfb83a3 100644 --- a/akregator/src/librss/global.h +++ b/akregator/src/librss/global.h @@ -136,12 +136,12 @@ namespace RSS /** * This type is used by Document::skipDays(). */ - typedef QValueList<Day> DayList; + typedef TQValueList<Day> DayList; /** * This type is used by Document::skipHours(). */ - typedef QValueList<unsigned short> HourList; + typedef TQValueList<unsigned short> HourList; } #endif // LIBRSS_GLOBAL_H diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp index 33e1544ae..265c37117 100644 --- a/akregator/src/librss/image.cpp +++ b/akregator/src/librss/image.cpp @@ -14,9 +14,9 @@ #include <kio/job.h> #include <kurl.h> -#include <qbuffer.h> -#include <qdom.h> -#include <qpixmap.h> +#include <tqbuffer.h> +#include <tqdom.h> +#include <tqpixmap.h> using namespace RSS; @@ -25,40 +25,40 @@ struct Image::Private : public Shared Private() : height(31), width(88), pixmapBuffer(NULL), job(NULL) { } - QString title; + TQString title; KURL url; KURL link; - QString description; + TQString description; unsigned int height; unsigned int width; - QBuffer *pixmapBuffer; + TQBuffer *pixmapBuffer; KIO::Job *job; }; -Image::Image() : QObject(), d(new Private) +Image::Image() : TQObject(), d(new Private) { } -Image::Image(const Image &other) : QObject(), d(0) +Image::Image(const Image &other) : TQObject(), d(0) { *this = other; } -Image::Image(const QDomNode &node) : QObject(), d(new Private) +Image::Image(const TQDomNode &node) : TQObject(), d(new Private) { - QString elemText; + TQString elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("title"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull()) d->title = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("url"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("url"))).isNull()) d->url = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("link"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull()) d->link = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("description"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull()) d->description = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("height"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("height"))).isNull()) d->height = elemText.toUInt(); - if (!(elemText = extractNode(node, QString::fromLatin1("width"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("width"))).isNull()) d->width = elemText.toUInt(); } @@ -72,7 +72,7 @@ Image::~Image() } } -QString Image::title() const +TQString Image::title() const { return d->title; } @@ -87,7 +87,7 @@ const KURL &Image::link() const return d->link; } -QString Image::description() const +TQString Image::description() const { return d->description; } @@ -112,21 +112,21 @@ void Image::getPixmap() d->pixmapBuffer->open(IO_WriteOnly); d->job = KIO::get(d->url, false, false); - connect(d->job, SIGNAL(data(KIO::Job *, const QByteArray &)), - this, SLOT(slotData(KIO::Job *, const QByteArray &))); - connect(d->job, SIGNAL(result(KIO::Job *)), this, SLOT(slotResult(KIO::Job *))); + connect(d->job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), + this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); + connect(d->job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotResult(KIO::Job *))); } -void Image::slotData(KIO::Job *, const QByteArray &data) +void Image::slotData(KIO::Job *, const TQByteArray &data) { d->pixmapBuffer->writeBlock(data.data(), data.size()); } void Image::slotResult(KIO::Job *job) { - QPixmap pixmap; + TQPixmap pixmap; if (!job->error()) - pixmap = QPixmap(d->pixmapBuffer->buffer()); + pixmap = TQPixmap(d->pixmapBuffer->buffer()); emit gotPixmap(pixmap); delete d->pixmapBuffer; diff --git a/akregator/src/librss/image.h b/akregator/src/librss/image.h index 74197edb6..f79026683 100644 --- a/akregator/src/librss/image.h +++ b/akregator/src/librss/image.h @@ -13,7 +13,7 @@ #include "global.h" -#include <qobject.h> +#include <tqobject.h> class QDomNode; @@ -48,10 +48,10 @@ namespace RSS /** * Constructs an Image from a piece of RSS markup. - * @param node A QDomNode which references the DOM leaf to be used + * @param node A TQDomNode which references the DOM leaf to be used * for constructing the Image. */ - Image(const QDomNode &node); + Image(const TQDomNode &node); /** * Assignment operator. @@ -83,10 +83,10 @@ namespace RSS /** * RSS 0.90 and upwards - * @return The 'caption' of this image, or QString::null if no + * @return The 'caption' of this image, or TQString::null if no * caption is available. */ - QString title() const; + TQString title() const; /** * RSS 0.90 and upwards @@ -112,11 +112,11 @@ namespace RSS /** * RSS 0.91 and upwards * @return A description of what this picture shows, or - * QString::null if no description is available. Useful for + * TQString::null if no description is available. Useful for * people who deactivated images but want or need to know what is * shown. */ - QString description() const; + TQString description() const; /** * RSS 0.91 and upwards @@ -125,7 +125,7 @@ namespace RSS * this value to be between 1 and 400. * '0' if this information isn't available. This is merely provided * for completeness, you should not rely on this value but rather - * check what height the QPixmap as returned by gotPixmap() + * check what height the TQPixmap as returned by gotPixmap() * reports. */ unsigned int height() const; @@ -136,7 +136,7 @@ namespace RSS * default value is 88 pixels. The RSS 0.91 Specification requires * this value to be between 1 and 144. * This is merely provided for completeness, you should not rely - * on this value but rather check what width the QPixmap as + * on this value but rather check what width the TQPixmap as * returned by gotPixmap() reports. */ unsigned int width() const; @@ -157,10 +157,10 @@ namespace RSS * @param pixmap The pixmap as constructed from the data referenced * by the URL returned by link(). */ - void gotPixmap(const QPixmap &pixmap); + void gotPixmap(const TQPixmap &pixmap); private slots: - void slotData(KIO::Job *job, const QByteArray &data); + void slotData(KIO::Job *job, const TQByteArray &data); void slotResult(KIO::Job *job); private: diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp index d63d17676..df7f51a66 100644 --- a/akregator/src/librss/loader.cpp +++ b/akregator/src/librss/loader.cpp @@ -18,12 +18,12 @@ #include <kurl.h> #include <kdebug.h> -#include <qdom.h> -#include <qbuffer.h> -#include <qregexp.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qtimer.h> +#include <tqdom.h> +#include <tqbuffer.h> +#include <tqregexp.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqtimer.h> using namespace RSS; @@ -50,15 +50,15 @@ class FileRetriever::Private delete buffer; } - QBuffer *buffer; + TQBuffer *buffer; int lastError; KIO::Job *job; - static KStaticDeleter<QString> userAgentsd; - static QString* userAgent; + static KStaticDeleter<TQString> userAgentsd; + static TQString* userAgent; }; -KStaticDeleter<QString> FileRetriever::Private::userAgentsd; -QString* FileRetriever::Private::userAgent = 0L; +KStaticDeleter<TQString> FileRetriever::Private::userAgentsd; +TQString* FileRetriever::Private::userAgent = 0L; FileRetriever::FileRetriever() : d(new Private) { @@ -71,17 +71,17 @@ FileRetriever::~FileRetriever() bool FileRetriever::m_useCache = true; -QString FileRetriever::userAgent() +TQString FileRetriever::userAgent() { if (Private::userAgent == 0L) - FileRetriever::Private::userAgentsd.setObject(Private::userAgent, new QString); + FileRetriever::Private::userAgentsd.setObject(Private::userAgent, new TQString); return *Private::userAgent; } -void FileRetriever::setUserAgent(const QString &ua) +void FileRetriever::setUserAgent(const TQString &ua) { if (Private::userAgent == 0L) - FileRetriever::Private::userAgentsd.setObject(Private::userAgent, new QString); + FileRetriever::Private::userAgentsd.setObject(Private::userAgent, new TQString); (*Private::userAgent) = ua; } @@ -106,18 +106,18 @@ void FileRetriever::retrieveData(const KURL &url) d->job = KIO::get(u, false, false); d->job->addMetaData("cache", m_useCache ? "refresh" : "reload"); - QString ua = userAgent(); + TQString ua = userAgent(); if (!ua.isEmpty()) d->job->addMetaData("UserAgent", ua); - QTimer::singleShot(1000*90, this, SLOT(slotTimeout())); + TQTimer::singleShot(1000*90, this, TQT_SLOT(slotTimeout())); - connect(d->job, SIGNAL(data(KIO::Job *, const QByteArray &)), - SLOT(slotData(KIO::Job *, const QByteArray &))); - connect(d->job, SIGNAL(result(KIO::Job *)), SLOT(slotResult(KIO::Job *))); - connect(d->job, SIGNAL(permanentRedirection(KIO::Job *, const KURL &, const KURL &)), - SLOT(slotPermanentRedirection(KIO::Job *, const KURL &, const KURL &))); + connect(d->job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), + TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); + connect(d->job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *))); + connect(d->job, TQT_SIGNAL(permanentRedirection(KIO::Job *, const KURL &, const KURL &)), + TQT_SLOT(slotPermanentRedirection(KIO::Job *, const KURL &, const KURL &))); } void FileRetriever::slotTimeout() @@ -129,7 +129,7 @@ void FileRetriever::slotTimeout() d->lastError = KIO::ERR_SERVER_TIMEOUT; - emit dataRetrieved(QByteArray(), false); + emit dataRetrieved(TQByteArray(), false); } int FileRetriever::errorCode() const @@ -137,14 +137,14 @@ int FileRetriever::errorCode() const return d->lastError; } -void FileRetriever::slotData(KIO::Job *, const QByteArray &data) +void FileRetriever::slotData(KIO::Job *, const TQByteArray &data) { d->buffer->writeBlock(data.data(), data.size()); } void FileRetriever::slotResult(KIO::Job *job) { - QByteArray data = d->buffer->buffer(); + TQByteArray data = d->buffer->buffer(); data.detach(); delete d->buffer; @@ -183,7 +183,7 @@ struct OutputRetriever::Private } KShellProcess *process; - QBuffer *buffer; + TQBuffer *buffer; int lastError; }; @@ -207,10 +207,10 @@ void OutputRetriever::retrieveData(const KURL &url) d->buffer->open(IO_WriteOnly); d->process = new KShellProcess(); - connect(d->process, SIGNAL(processExited(KProcess *)), - SLOT(slotExited(KProcess *))); - connect(d->process, SIGNAL(receivedStdout(KProcess *, char *, int)), - SLOT(slotOutput(KProcess *, char *, int))); + connect(d->process, TQT_SIGNAL(processExited(KProcess *)), + TQT_SLOT(slotExited(KProcess *))); + connect(d->process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), + TQT_SLOT(slotOutput(KProcess *, char *, int))); *d->process << url.path(); d->process->start(KProcess::NotifyOnExit, KProcess::Stdout); } @@ -230,7 +230,7 @@ void OutputRetriever::slotExited(KProcess *p) if (!p->normalExit()) d->lastError = p->exitStatus(); - QByteArray data = d->buffer->buffer(); + TQByteArray data = d->buffer->buffer(); data.detach(); delete d->buffer; @@ -265,10 +265,10 @@ Loader *Loader::create() return new Loader; } -Loader *Loader::create(QObject *object, const char *slot) +Loader *Loader::create(TQObject *object, const char *slot) { Loader *loader = create(); - connect(loader, SIGNAL(loadingComplete(Loader *, Document, Status)), + connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), object, slot); return loader; } @@ -290,8 +290,8 @@ void Loader::loadFrom(const KURL &url, DataRetriever *retriever) d->url=url; d->retriever = retriever; - connect(d->retriever, SIGNAL(dataRetrieved(const QByteArray &, bool)), - this, SLOT(slotRetrieverDone(const QByteArray &, bool))); + connect(d->retriever, TQT_SIGNAL(dataRetrieved(const TQByteArray &, bool)), + this, TQT_SLOT(slotRetrieverDone(const TQByteArray &, bool))); d->retriever->retrieveData(url); } @@ -309,7 +309,7 @@ void Loader::abort() delete d->retriever; d->retriever=NULL; } - emit loadingComplete(this, QDomDocument(), Aborted); + emit loadingComplete(this, TQDomDocument(), Aborted); delete this; } @@ -318,7 +318,7 @@ const KURL &Loader::discoveredFeedURL() const return d->discoveredFeedURL; } -void Loader::slotRetrieverDone(const QByteArray &data, bool success) +void Loader::slotRetrieverDone(const TQByteArray &data, bool success) { d->lastError = d->retriever->errorCode(); @@ -329,7 +329,7 @@ void Loader::slotRetrieverDone(const QByteArray &data, bool success) Status status = Success; if (success) { - QDomDocument doc; + TQDomDocument doc; /* Some servers insert whitespace before the <?xml...?> declaration. * QDom doesn't tolerate that (and it's right, that's invalid XML), @@ -339,16 +339,16 @@ void Loader::slotRetrieverDone(const QByteArray &data, bool success) const char *charData = data.data(); int len = data.count(); - while (len && QChar(*charData).isSpace()) { + while (len && TQChar(*charData).isSpace()) { --len; ++charData; } - if ( len > 3 && QChar(*charData) == QChar(0357) ) { // 0357 0273 0277 + if ( len > 3 && TQChar(*charData) == TQChar(0357) ) { // 0357 0273 0277 len -= 3; charData += 3; } - QByteArray tmpData; + TQByteArray tmpData; tmpData.setRawData(charData, len); if (doc.setContent(tmpData)) @@ -375,11 +375,11 @@ void Loader::slotRetrieverDone(const QByteArray &data, bool success) delete this; } -void Loader::discoverFeeds(const QByteArray &data) +void Loader::discoverFeeds(const TQByteArray &data) { - QString str = QString(data).simplifyWhiteSpace(); + TQString str = TQString(data).simplifyWhiteSpace(); - QStringList feeds; + TQStringList feeds; FeedDetectorEntryList list = FeedDetector::extractFromLinkTags(str); @@ -391,12 +391,12 @@ void Loader::discoverFeeds(const QByteArray &data) if (list.isEmpty()) feeds = FeedDetector::extractBruteForce(str); - QString feed = feeds.first(); - QString host = d->url.host(); + TQString feed = feeds.first(); + TQString host = d->url.host(); KURL testURL; // loop through, prefer feeds on same host - QStringList::Iterator end( feeds.end() ); - for ( QStringList::Iterator it = feeds.begin(); it != end; ++it) + TQStringList::Iterator end( feeds.end() ); + for ( TQStringList::Iterator it = feeds.begin(); it != end; ++it) { testURL=*it; if (testURL.host() == host) @@ -406,7 +406,7 @@ void Loader::discoverFeeds(const QByteArray &data) } } - d->discoveredFeedURL = feed.isNull() ? QString() : FeedDetector::fixRelativeURL(feed, d->url); + d->discoveredFeedURL = feed.isNull() ? TQString() : FeedDetector::fixRelativeURL(feed, d->url); } #include "loader.moc" diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h index d60bad744..e958239f2 100644 --- a/akregator/src/librss/loader.h +++ b/akregator/src/librss/loader.h @@ -15,7 +15,7 @@ class KURL; -#include <qobject.h> +#include <tqobject.h> namespace KIO { @@ -75,7 +75,7 @@ namespace RSS * wrong and that the data parameter might contain no or invalid * data. */ - void dataRetrieved(const QByteArray &data, bool success); + void dataRetrieved(const TQByteArray &data, bool success); private: DataRetriever(const DataRetriever &other); @@ -120,8 +120,8 @@ namespace RSS virtual void abort(); static void setUseCache(bool enabled); - static void setUserAgent(const QString &ua); - static QString userAgent(); + static void setUserAgent(const TQString &ua); + static TQString userAgent(); signals: /** @@ -137,7 +137,7 @@ namespace RSS void slotTimeout(); private slots: - void slotData(KIO::Job *job, const QByteArray &data); + void slotData(KIO::Job *job, const TQByteArray &data); void slotResult(KIO::Job *job); void slotPermanentRedirection(KIO::Job *job, const KURL &fromUrl, const KURL &toUrl); @@ -208,8 +208,8 @@ namespace RSS * * \code * Loader *loader = Loader::create(); - * connect(loader, SIGNAL(loadingComplete(Loader *, Document, Status)), - * this, SLOT(slotLoadingComplete(Loader *, Document, Status))); + * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), + * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status))); * loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever); * \endcode * @@ -241,7 +241,7 @@ namespace RSS * if (status != RSS::Success) * return; * - * QString title = doc.title(); + * TQString title = doc.title(); * // do whatever you want with the information. * } * \endcode @@ -270,10 +270,10 @@ namespace RSS * Convenience method. Does the same as the above method except that * it also does the job of connecting the loadingComplete() signal * to the given slot for you. - * @param object A QObject which features the specified slot + * @param object A TQObject which features the specified slot * @param slot Which slot to connect to. */ - static Loader *create(QObject *object, const char *slot); + static Loader *create(TQObject *object, const char *slot); /** * Loads the RSS file referenced by the given URL using the @@ -323,14 +323,14 @@ namespace RSS void loadingComplete(Loader *loader, Document doc, Status status); private slots: - void slotRetrieverDone(const QByteArray &data, bool success); + void slotRetrieverDone(const TQByteArray &data, bool success); private: Loader(); Loader(const Loader &other); Loader &operator=(const Loader &other); ~Loader(); - void discoverFeeds(const QByteArray &data); + void discoverFeeds(const TQByteArray &data); struct Private; Private *d; diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp index 5d98bba46..7d88c3d1f 100644 --- a/akregator/src/librss/testlibrss.cpp +++ b/akregator/src/librss/testlibrss.cpp @@ -16,11 +16,11 @@ static const KCmdLineOptions options[] = }; -void Tester::test( const QString &url ) +void Tester::test( const TQString &url ) { Loader *loader = Loader::create(); - connect( loader, SIGNAL( loadingComplete( Loader *, Document, Status ) ), - this, SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); + connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ), + this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); loader->loadFrom( url, new FileRetriever ); } diff --git a/akregator/src/librss/testlibrss.h b/akregator/src/librss/testlibrss.h index c65fa3bd2..b84a0ab5c 100644 --- a/akregator/src/librss/testlibrss.h +++ b/akregator/src/librss/testlibrss.h @@ -1,7 +1,7 @@ #ifndef TESTLIBRSS_H #define TESTLIBRSS_H -#include <qobject.h> +#include <tqobject.h> #include "loader.h" #include "document.h" @@ -16,7 +16,7 @@ class Tester : public QObject { Q_OBJECT public: - void test( const QString &url ); + void test( const TQString &url ); private slots: void slotLoadingComplete( Loader *loader, Document doc, Status status ); diff --git a/akregator/src/librss/textinput.cpp b/akregator/src/librss/textinput.cpp index 432b773aa..04799fcaa 100644 --- a/akregator/src/librss/textinput.cpp +++ b/akregator/src/librss/textinput.cpp @@ -13,15 +13,15 @@ #include <kurl.h> -#include <qdom.h> +#include <tqdom.h> using namespace RSS; struct TextInput::Private : public Shared { - QString title; - QString description; - QString name; + TQString title; + TQString description; + TQString name; KURL link; }; @@ -34,17 +34,17 @@ TextInput::TextInput(const TextInput &other) : d(0) *this = other; } -TextInput::TextInput(const QDomNode &node) : d(new Private) +TextInput::TextInput(const TQDomNode &node) : d(new Private) { - QString elemText; + TQString elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("title"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull()) d->title = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("description"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull()) d->description = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("name")))) + if (!(elemText = extractNode(node, TQString::fromLatin1("name")))) d->name = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("link"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull()) d->link = elemText; } @@ -54,17 +54,17 @@ TextInput::~TextInput() delete d; } -QString TextInput::title() const +TQString TextInput::title() const { return d->title; } -QString TextInput::description() const +TQString TextInput::description() const { return d->description; } -QString TextInput::name() const +TQString TextInput::name() const { return d->name; } diff --git a/akregator/src/librss/textinput.h b/akregator/src/librss/textinput.h index dd13c424b..fa16108ce 100644 --- a/akregator/src/librss/textinput.h +++ b/akregator/src/librss/textinput.h @@ -43,10 +43,10 @@ namespace RSS /** * Constructs a TextInput from a piece of RSS markup. - * @param node A QDomNode which references the DOM leaf to be used + * @param node A TQDomNode which references the DOM leaf to be used * for constructing the TextInput. */ - TextInput(const QDomNode &node); + TextInput(const TQDomNode &node); /** * Assignment operator. @@ -79,25 +79,25 @@ namespace RSS /** * RSS 0.90 and upwards * @return The title (often a label to be used for the input field) - * of the text input, or QString::null if no title is available. + * of the text input, or TQString::null if no title is available. */ - QString title() const; + TQString title() const; /** * RSS 0.90 and upwards * @return The description (usually used as a tooltip which appears * if the mouse hovers above the input field for a short time) of - * the text input, or QString::null if no description is + * the text input, or TQString::null if no description is * available. */ - QString description() const; + TQString description() const; /** * RSS 0.90 and upwards * @return The name of the text input (what's this for?) of the - * text input, or QString::null, if no name is available. + * text input, or TQString::null, if no name is available. */ - QString name() const; + TQString name() const; /** * RSS 0.90 and upwards diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp index dec831814..41996fd8f 100644 --- a/akregator/src/librss/tools_p.cpp +++ b/akregator/src/librss/tools_p.cpp @@ -11,13 +11,13 @@ #include "tools_p.h" #include <krfcdate.h> -#include <qdom.h> +#include <tqdom.h> #include <kcharsets.h> -#include <qregexp.h> +#include <tqregexp.h> namespace RSS { -time_t parseISO8601Date(const QString &s) +time_t parseISO8601Date(const TQString &s) { // do some sanity check: 26-12-2004T00:00+00:00 is parsed to epoch+1 in the KRFCDate, which is wrong. So let's check if the date begins with YYYY -fo if (s.stripWhiteSpace().left(4).toInt() < 1000) @@ -30,19 +30,19 @@ time_t parseISO8601Date(const QString &s) return KRFCDate::parseDateISO8601(s + "T12:00:00"); } -QString childNodesAsXML(const QDomNode& parent) +TQString childNodesAsXML(const TQDomNode& parent) { - QDomNodeList list = parent.childNodes(); - QString str; - QTextStream ts( &str, IO_WriteOnly ); + TQDomNodeList list = parent.childNodes(); + TQString str; + TQTextStream ts( &str, IO_WriteOnly ); for (uint i = 0; i < list.count(); ++i) ts << list.item(i); return str.stripWhiteSpace(); } -static QString plainTextToHtml(const QString& plainText) +static TQString plainTextToHtml(const TQString& plainText) { - QString str(plainText); + TQString str(plainText); str.replace("&", "&"); str.replace("\"", """); str.replace("<", "<"); @@ -53,46 +53,46 @@ static QString plainTextToHtml(const QString& plainText) enum ContentFormat { Text, HTML, XML, Binary }; -static ContentFormat mapTypeToFormat(const QString& modep, const QString& typep, const QString& src) +static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& typep, const TQString& src) { - QString mode = modep.isNull() ? "escaped" : modep; - QString type = typep; + TQString mode = modep.isNull() ? "escaped" : modep; + TQString type = typep; //"If neither the type attribute nor the src attribute is provided, //Atom Processors MUST behave as though the type attribute were //present with a value of "text"" if (type.isNull() && src.isEmpty()) - type = QString::fromUtf8("text"); + type = TQString::fromUtf8("text"); - if (type == QString::fromUtf8("html") - || type == QString::fromUtf8("text/html")) + if (type == TQString::fromUtf8("html") + || type == TQString::fromUtf8("text/html")) return HTML; - if (type == QString::fromUtf8("text") - || (type.startsWith(QString::fromUtf8("text/"), false) - && !type.startsWith(QString::fromUtf8("text/xml"), false)) + if (type == TQString::fromUtf8("text") + || (type.startsWith(TQString::fromUtf8("text/"), false) + && !type.startsWith(TQString::fromUtf8("text/xml"), false)) ) return Text; - QStringList xmltypes; - xmltypes.append(QString::fromUtf8("xhtml")); + TQStringList xmltypes; + xmltypes.append(TQString::fromUtf8("xhtml")); // XML media types as defined in RFC3023: - xmltypes.append(QString::fromUtf8("text/xml")); - xmltypes.append(QString::fromUtf8("application/xml")); - xmltypes.append(QString::fromUtf8("text/xml-external-parsed-entity")); - xmltypes.append(QString::fromUtf8("application/xml-external-parsed-entity")); - xmltypes.append(QString::fromUtf8("application/xml-dtd")); + xmltypes.append(TQString::fromUtf8("text/xml")); + xmltypes.append(TQString::fromUtf8("application/xml")); + xmltypes.append(TQString::fromUtf8("text/xml-external-parsed-entity")); + xmltypes.append(TQString::fromUtf8("application/xml-external-parsed-entity")); + xmltypes.append(TQString::fromUtf8("application/xml-dtd")); if (xmltypes.contains(type) - || type.endsWith(QString::fromUtf8("+xml"), false) - || type.endsWith(QString::fromUtf8("/xml"), false)) + || type.endsWith(TQString::fromUtf8("+xml"), false) + || type.endsWith(TQString::fromUtf8("/xml"), false)) return XML; return Binary; } -static QString extractAtomContent(const QDomElement& e) +static TQString extractAtomContent(const TQDomElement& e) { ContentFormat format = mapTypeToFormat(e.attribute("mode"), e.attribute("type"), @@ -111,20 +111,20 @@ static QString extractAtomContent(const QDomElement& e) return childNodesAsXML(e).simplifyWhiteSpace(); case Binary: default: - return QString(); + return TQString(); } - return QString(); + return TQString(); } -QString extractNode(const QDomNode &parent, const QString &elemName, bool isInlined) +TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined) { - QDomNode node = parent.namedItem(elemName); + TQDomNode node = parent.namedItem(elemName); if (node.isNull()) - return QString::null; + return TQString::null; - QDomElement e = node.toElement(); - QString result = e.text().stripWhiteSpace(); // let's assume plain text + TQDomElement e = node.toElement(); + TQString result = e.text().stripWhiteSpace(); // let's assume plain text if (elemName == "content") // we have Atom here { @@ -135,47 +135,47 @@ QString extractNode(const QDomNode &parent, const QString &elemName, bool isInli bool hasPre = result.contains("<pre>", false) || result.contains("<pre ", false); bool hasHtml = hasPre || result.contains("<"); // FIXME: test if we have html, should be more clever -> regexp if(!isInlined && !hasHtml) // perform nl2br if not a inline elt and it has no html elts - result = result = result.replace(QChar('\n'), "<br />"); + result = result = result.replace(TQChar('\n'), "<br />"); if(!hasPre) // strip white spaces if no <pre> result = result.simplifyWhiteSpace(); } - return result.isEmpty() ? QString::null : result; + return result.isEmpty() ? TQString::null : result; } -QString extractTitle(const QDomNode & parent) +TQString extractTitle(const TQDomNode & parent) { - QDomNode node = parent.namedItem(QString::fromLatin1("title")); + TQDomNode node = parent.namedItem(TQString::fromLatin1("title")); if (node.isNull()) - return QString::null; + return TQString::null; - QString result = node.toElement().text(); + TQString result = node.toElement().text(); - result = KCharsets::resolveEntities(KCharsets::resolveEntities(result).replace(QRegExp("<[^>]*>"), "").remove("\\")); + result = KCharsets::resolveEntities(KCharsets::resolveEntities(result).replace(TQRegExp("<[^>]*>"), "").remove("\\")); result = result.simplifyWhiteSpace(); if (result.isEmpty()) - return QString::null; + return TQString::null; return result; } -static void authorFromString(const QString& strp, QString& name, QString& email) +static void authorFromString(const TQString& strp, TQString& name, TQString& email) { - QString str = strp.stripWhiteSpace(); + TQString str = strp.stripWhiteSpace(); if (str.isEmpty()) return; // look for something looking like a mail address ( "foo@bar.com", // "<foo@bar.com>") and extract it - QRegExp remail("<?([^@\\s<]+@[^>\\s]+)>?"); // FIXME: user "proper" regexp, + TQRegExp remail("<?([^@\\s<]+@[^>\\s]+)>?"); // FIXME: user "proper" regexp, // search kmail source for it int pos = remail.search(str); if (pos != -1) { - QString all = remail.cap(0); + TQString all = remail.cap(0); email = remail.cap(1); str.replace(all, ""); // remove mail address } @@ -190,7 +190,7 @@ static void authorFromString(const QString& strp, QString& name, QString& email) // str is of the format "Foo M. Bar (President)", // we should not cut anything. - QRegExp rename("^\\(([^\\)]*)\\)"); + TQRegExp rename("^\\(([^\\)]*)\\)"); pos = rename.search(name); @@ -199,32 +199,32 @@ static void authorFromString(const QString& strp, QString& name, QString& email) name = rename.cap(1); } - name = name.isEmpty() ? QString() : name; - email = email.isEmpty() ? QString() : email; + name = name.isEmpty() ? TQString() : name; + email = email.isEmpty() ? TQString() : email; } -QString parseItemAuthor(const QDomElement& element, Format format, Version version) +TQString parseItemAuthor(const TQDomElement& element, Format format, Version version) { - QString name; - QString email; + TQString name; + TQString email; - QDomElement dcCreator = element.namedItem("dc:creator").toElement(); + TQDomElement dcCreator = element.namedItem("dc:creator").toElement(); if (!dcCreator.isNull()) authorFromString(dcCreator.text(), name, email); else if (format == AtomFeed) { - QDomElement atomAuthor = element.namedItem("author").toElement(); + TQDomElement atomAuthor = element.namedItem("author").toElement(); if (atomAuthor.isNull()) atomAuthor = element.namedItem("atom:author").toElement(); if (!atomAuthor.isNull()) { - QDomElement atomName = atomAuthor.namedItem("name").toElement(); + TQDomElement atomName = atomAuthor.namedItem("name").toElement(); if (atomName.isNull()) atomName = atomAuthor.namedItem("atom:name").toElement(); name = atomName.text().stripWhiteSpace(); - QDomElement atomEmail = atomAuthor.namedItem("email").toElement(); + TQDomElement atomEmail = atomAuthor.namedItem("email").toElement(); if (atomEmail.isNull()) atomEmail = atomAuthor.namedItem("atom:email").toElement(); email = atomEmail.text().stripWhiteSpace(); @@ -239,7 +239,7 @@ QString parseItemAuthor(const QDomElement& element, Format format, Version versi name = email; if (!email.isNull()) - return QString("<a href=\"mailto:%1\">%2</a>").arg(email).arg(name); + return TQString("<a href=\"mailto:%1\">%2</a>").arg(email).arg(name); else return name; } diff --git a/akregator/src/librss/tools_p.h b/akregator/src/librss/tools_p.h index a257da8a6..9fad6f9e2 100644 --- a/akregator/src/librss/tools_p.h +++ b/akregator/src/librss/tools_p.h @@ -29,11 +29,11 @@ namespace RSS unsigned int count; }; - QString extractNode(const QDomNode &parent, const QString &elemName, bool isInlined=true); - QString extractTitle(const QDomNode &parent); - QString childNodesAsXML(const QDomNode& parent); - time_t parseISO8601Date(const QString &s); - QString parseItemAuthor(const QDomElement& element, Format format, Version version); + TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined=true); + TQString extractTitle(const TQDomNode &parent); + TQString childNodesAsXML(const TQDomNode& parent); + time_t parseISO8601Date(const TQString &s); + TQString parseItemAuthor(const TQDomElement& element, Format format, Version version); } #endif // LIBRSS_TOOLS_P_H diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp index 78f1d0d30..5434a4a6e 100644 --- a/akregator/src/listtabwidget.cpp +++ b/akregator/src/listtabwidget.cpp @@ -29,13 +29,13 @@ #include <kmultitabbar.h> -#include <qiconset.h> -#include <qlayout.h> -#include <qmap.h> -#include <qptrlist.h> -#include <qstring.h> -#include <qvaluelist.h> -#include <qwidgetstack.h> +#include <tqiconset.h> +#include <tqlayout.h> +#include <tqmap.h> +#include <tqptrlist.h> +#include <tqstring.h> +#include <tqvaluelist.h> +#include <tqwidgetstack.h> #include <kdebug.h> @@ -47,14 +47,14 @@ class ListTabWidget::ListTabWidgetPrivate public: int idCounter; KMultiTabBar* tabBar; - QWidgetStack* stack; + TQWidgetStack* stack; NodeListView* current; int currentID; - QValueList<NodeListView*> views; - QMap<int, NodeListView*> idToView; - QHBoxLayout* layout; + TQValueList<NodeListView*> views; + TQMap<int, NodeListView*> idToView; + TQHBoxLayout* layout; ViewMode viewMode; - QMap<QWidget*, QString> captions; + TQMap<TQWidget*, TQString> captions; }; @@ -125,7 +125,7 @@ void ListTabWidget::slotRootNodeChanged(NodeListView* view, TreeNode* node) if (unread > 0) { //uncomment this to append unread count - //d->tabWidget->changeTab(view, QString("<qt>%1 (%2)").arg(d->captions[view]).arg(node->unread())); + //d->tabWidget->changeTab(view, TQString("<qt>%1 (%2)").arg(d->captions[view]).arg(node->unread())); d->tabWidget->changeTab(view, d->captions[view]); } else @@ -152,14 +152,14 @@ void ListTabWidget::slotTabClicked(int id) } } -ListTabWidget::ListTabWidget(QWidget* parent, const char* name) : QWidget(parent, name), d(new ListTabWidgetPrivate) +ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(parent, name), d(new ListTabWidgetPrivate) { d->idCounter = 0; d->current = 0; d->currentID = -1; d->viewMode = verticalTabs; - d->layout = new QHBoxLayout(this); - //d->layout = new QGridLayout(this, 1, 2); + d->layout = new TQHBoxLayout(this); + //d->layout = new TQGridLayout(this, 1, 2); d->tabBar = new KMultiTabBar(KMultiTabBar::Vertical, this); d->tabBar->setStyle(KMultiTabBar::KDEV3ICON); //d->tabBar->setStyle(KMultiTabBar::KDEV3); @@ -167,10 +167,10 @@ ListTabWidget::ListTabWidget(QWidget* parent, const char* name) : QWidget(parent d->tabBar->setPosition(KMultiTabBar::Left); d->layout->addWidget(d->tabBar/*, 0, 0*/); - d->stack = new QWidgetStack(this); + d->stack = new TQWidgetStack(this); d->layout->addWidget(d->stack/*, 0, 1*/); -// connect(d->tabBar, SIGNAL(currentChanged(QWidget*)), this, SLOT(slotCurrentChanged(QWidget*))); +// connect(d->tabBar, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentChanged(TQWidget*))); } ListTabWidget::~ListTabWidget() @@ -196,21 +196,21 @@ ListTabWidget::ViewMode ListTabWidget::viewMode() const return d->viewMode; } -void ListTabWidget::addView(NodeListView* view, const QString& caption, const QPixmap& icon) +void ListTabWidget::addView(NodeListView* view, const TQString& caption, const TQPixmap& icon) { d->captions[view] = caption; - view->reparent(d->stack, QPoint(0,0)); + view->reparent(d->stack, TQPoint(0,0)); d->stack->addWidget(view); int tabId = d->idCounter++; d->tabBar->appendTab(icon, tabId, caption); d->idToView[tabId] = view; - connect(d->tabBar->tab(tabId), SIGNAL(clicked(int)), this, SLOT(slotTabClicked(int))); + connect(d->tabBar->tab(tabId), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotTabClicked(int))); - connect(view, SIGNAL(signalNodeSelected(TreeNode*)), this, SIGNAL(signalNodeSelected(TreeNode*))); - connect(view, SIGNAL(signalRootNodeChanged(NodeListView*, TreeNode*)), this, SLOT(slotRootNodeChanged(NodeListView*, TreeNode*))); + connect(view, TQT_SIGNAL(signalNodeSelected(TreeNode*)), this, TQT_SIGNAL(signalNodeSelected(TreeNode*))); + connect(view, TQT_SIGNAL(signalRootNodeChanged(NodeListView*, TreeNode*)), this, TQT_SLOT(slotRootNodeChanged(NodeListView*, TreeNode*))); if (tabId == 0) // first widget diff --git a/akregator/src/listtabwidget.h b/akregator/src/listtabwidget.h index 72e423e84..5cf7bf193 100644 --- a/akregator/src/listtabwidget.h +++ b/akregator/src/listtabwidget.h @@ -25,7 +25,7 @@ #ifndef AKREGATOR_LISTTABWIDGET_H #define AKREGATOR_LISTTABWIDGET_H -#include <qwidget.h> +#include <tqwidget.h> class QIconSet; class QPixmap; @@ -49,7 +49,7 @@ Q_OBJECT public: - ListTabWidget(QWidget* parent=0, const char* name=0); + ListTabWidget(TQWidget* parent=0, const char* name=0); virtual ~ListTabWidget(); enum ViewMode { single, /* horizontalTabs, */ verticalTabs }; @@ -57,7 +57,7 @@ public: void setViewMode(ViewMode mode); ViewMode viewMode() const; - void addView(NodeListView* view, const QString& caption, const QPixmap& icon); + void addView(NodeListView* view, const TQString& caption, const TQPixmap& icon); NodeListView* activeView() const; diff --git a/akregator/src/main.cpp b/akregator/src/main.cpp index 5c07d0cd4..f6a3976cd 100644 --- a/akregator/src/main.cpp +++ b/akregator/src/main.cpp @@ -22,7 +22,7 @@ without including the source code for Qt in the source distribution. */ -#include <qstringlist.h> +#include <tqstringlist.h> #include <dcopref.h> #include <kcmdlineargs.h> @@ -65,12 +65,12 @@ int Application::newInstance() akr.send("openStandardFeedList"); } - QString addFeedGroup = !args->getOption("group").isEmpty() - ? QString::fromLocal8Bit(args->getOption("group")) + TQString addFeedGroup = !args->getOption("group").isEmpty() + ? TQString::fromLocal8Bit(args->getOption("group")) : i18n("Imported Folder"); QCStringList feeds = args->getOptionList("addfeed"); - QStringList feedsToAdd; + TQStringList feedsToAdd; QCStringList::ConstIterator end( feeds.end() ); for (QCStringList::ConstIterator it = feeds.begin(); it != end; ++it) feedsToAdd.append(*it); diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index 41f307b8e..8271994ff 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -52,11 +52,11 @@ #include "statusbarprogresswidget.h" #include "trayicon.h" -#include <qmetaobject.h> -#include <qpen.h> -#include <qpainter.h> +#include <tqmetaobject.h> +#include <tqpen.h> +#include <tqpainter.h> #include <private/qucomextra_p.h> -#include <qtimer.h> +#include <tqtimer.h> namespace Akregator { @@ -85,7 +85,7 @@ MainWindow::MainWindow() int statH=fontMetrics().height()+2; m_statusLabel = new KSqueezedTextLabel(this); m_statusLabel->setTextFormat(Qt::RichText); - m_statusLabel->setSizePolicy(QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Fixed )); + m_statusLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); m_statusLabel->setMinimumWidth( 0 ); m_statusLabel->setFixedHeight( statH ); statusBar()->addWidget (m_statusLabel, 1, false); @@ -111,9 +111,9 @@ bool MainWindow::loadPart() // tell the KParts::MainWindow that this is indeed the main widget setCentralWidget(m_part->widget()); - connect(m_part, SIGNAL(setWindowCaption (const QString &)), this, SLOT(setCaption (const QString &))); + connect(m_part, TQT_SIGNAL(setWindowCaption (const TQString &)), this, TQT_SLOT(setCaption (const TQString &))); - connect(TrayIcon::getInstance(), SIGNAL(quitSelected()), this, SLOT(slotQuit())); + connect(TrayIcon::getInstance(), TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotQuit())); // and integrate the part's GUI with the shell's connectActionCollection(m_part->actionCollection()); createGUI(m_part); @@ -145,7 +145,7 @@ MainWindow::~MainWindow() { } -void MainWindow::setCaption(const QString &a) +void MainWindow::setCaption(const TQString &a) { KParts::MainWindow::setCaption(a); } @@ -154,13 +154,13 @@ void MainWindow::setupActions() { connectActionCollection(actionCollection()); - KStdAction::quit(kapp, SLOT(quit()), actionCollection()); + KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); setStandardToolBarMenuEnabled(true); createStandardStatusBarAction(); - KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); } void MainWindow::saveProperties(KConfig* config) @@ -203,8 +203,8 @@ void MainWindow::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, SIGNAL(newToolbarConfig()), - this, SLOT(applyNewToolbarConfig())); + connect(&dlg, TQT_SIGNAL(newToolbarConfig()), + this, TQT_SLOT(applyNewToolbarConfig())); dlg.exec(); } @@ -226,10 +226,10 @@ KParts::BrowserExtension *MainWindow::browserExtension(KParts::ReadOnlyPart *p) void MainWindow::connectActionCollection( KActionCollection *coll ) { if (!coll) return; - connect( coll, SIGNAL( actionStatusText( const QString & ) ), - m_statusLabel, SLOT( setText( const QString & ) ) ); - connect( coll, SIGNAL( clearStatusText() ), - this, SLOT( slotClearStatusText() ) ); + connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), + m_statusLabel, TQT_SLOT( setText( const TQString & ) ) ); + connect( coll, TQT_SIGNAL( clearStatusText() ), + this, TQT_SLOT( slotClearStatusText() ) ); } bool MainWindow::queryExit() @@ -261,10 +261,10 @@ bool MainWindow::queryClose() } else { - QPixmap shot = TrayIcon::getInstance()->takeScreenshot(); + TQPixmap shot = TrayIcon::getInstance()->takeScreenshot(); // Associate source to image and show the dialog: - QMimeSourceFactory::defaultFactory()->setPixmap("systray_shot", shot); + TQMimeSourceFactory::defaultFactory()->setPixmap("systray_shot", shot); KMessageBox::information(this, i18n( "<qt><p>Closing the main window will keep Akregator running in the system tray. Use 'Quit' from the 'File' menu to quit the application.</p><p><center><img source=\"systray_shot\"></center></p></qt>" ), i18n( "Docking in System Tray" ), "hideOnCloseInfo"); hide(); return false; @@ -274,10 +274,10 @@ bool MainWindow::queryClose() void MainWindow::slotClearStatusText() { - m_statusLabel->setText(QString()); + m_statusLabel->setText(TQString()); } -void MainWindow::slotSetStatusBarText( const QString & text ) +void MainWindow::slotSetStatusBarText( const TQString & text ) { m_statusLabel->setText(text); } diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h index c88b08174..d8012d90b 100644 --- a/akregator/src/mainwindow.h +++ b/akregator/src/mainwindow.h @@ -85,7 +85,7 @@ public: */ void setupProgressWidgets(); - virtual void setCaption(const QString &); + virtual void setCaption(const TQString &); /** Loads the part @@ -95,7 +95,7 @@ public: public slots: void slotClearStatusText(); - void slotSetStatusBarText(const QString &c); + void slotSetStatusBarText(const TQString &c); protected: /** diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp index 521f9f326..b03f0438b 100644 --- a/akregator/src/mk4storage/feedstoragemk4impl.cpp +++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp @@ -31,8 +31,8 @@ #include "../librss/document.h" #include <mk4.h> -#include <qdom.h> -#include <qfile.h> +#include <tqdom.h> +#include <tqfile.h> #include <kdebug.h> #include <kglobal.h> @@ -72,7 +72,7 @@ class FeedStorageMK4Impl::FeedStorageMK4ImplPrivate pcategories("categories") {} - QString url; + TQString url; c4_Storage* storage; StorageMK4Impl* mainStorage; c4_View archiveView; @@ -85,7 +85,7 @@ class FeedStorageMK4Impl::FeedStorageMK4ImplPrivate bool modified; bool taggingEnabled; bool convert; - QString oldArchivePath; + TQString oldArchivePath; c4_StringProp pguid, ptitle, pdescription, plink, pcommentsLink, ptag, pEnclosureType, pEnclosureUrl, pcatTerm, pcatScheme, pcatName, pauthor; c4_IntProp phash, pguidIsHash, pguidIsPermaLink, pcomments, pstatus, ppubDate, pHasEnclosure, pEnclosureLength; c4_ViewProp ptags, ptaggedArticles, pcategorizedArticles, pcategories; @@ -97,15 +97,15 @@ void FeedStorageMK4Impl::convertOldArchive() return; d->convert = false; - QFile file(d->oldArchivePath); + TQFile file(d->oldArchivePath); if ( !file.open(IO_ReadOnly) ) return; - QTextStream stream(&file); - stream.setEncoding(QTextStream::UnicodeUTF8); - QString data=stream.read(); - QDomDocument xmldoc; + TQTextStream stream(&file); + stream.setEncoding(TQTextStream::UnicodeUTF8); + TQString data=stream.read(); + TQDomDocument xmldoc; if (!xmldoc.setContent(data)) return; @@ -129,7 +129,7 @@ void FeedStorageMK4Impl::convertOldArchive() commit(); } -FeedStorageMK4Impl::FeedStorageMK4Impl(const QString& url, StorageMK4Impl* main) +FeedStorageMK4Impl::FeedStorageMK4Impl(const TQString& url, StorageMK4Impl* main) { d = new FeedStorageMK4ImplPrivate; d->autoCommit = main->autoCommit(); @@ -137,20 +137,20 @@ FeedStorageMK4Impl::FeedStorageMK4Impl(const QString& url, StorageMK4Impl* main) d->mainStorage = main; d->taggingEnabled = main->taggingEnabled(); - QString url2 = url; + TQString url2 = url; if (url.length() > 255) { - url2 = url.left(200) + QString::number(Akregator::Utils::calcHash(url), 16); + url2 = url.left(200) + TQString::number(Akregator::Utils::calcHash(url), 16); } kdDebug() << url2 << endl; - QString t = url2; - QString t2 = url2; - QString filePath = main->archivePath() +"/"+ t.replace("/", "_").replace(":", "_"); + TQString t = url2; + TQString t2 = url2; + TQString filePath = main->archivePath() +"/"+ t.replace("/", "_").replace(":", "_"); d->oldArchivePath = KGlobal::dirs()->saveLocation("data", "akregator/Archive/") + t2.replace("/", "_").replace(":", "_") + ".xml"; - d->convert = !QFile::exists(filePath + ".mk4") && QFile::exists(d->oldArchivePath); + d->convert = !TQFile::exists(filePath + ".mk4") && TQFile::exists(d->oldArchivePath); d->storage = new c4_Storage((filePath + ".mk4").local8Bit(), true); d->archiveView = d->storage->GetAs("articles[guid:S,title:S,hash:I,guidIsHash:I,guidIsPermaLink:I,description:S,link:S,comments:I,commentsLink:S,status:I,pubDate:I,tags[tag:S],hasEnclosure:I,enclosureUrl:S,enclosureType:S,enclosureLength:I,categories[catTerm:S,catScheme:S,catName:S],author:S]"); @@ -245,14 +245,14 @@ void FeedStorageMK4Impl::setLastFetch(int lastFetch) d->mainStorage->setLastFetchFor(d->url, lastFetch); } -QStringList FeedStorageMK4Impl::articles(const QString& tag) +TQStringList FeedStorageMK4Impl::articles(const TQString& tag) { - QStringList list; + TQStringList list; if (tag.isNull()) // return all articles { int size = d->archiveView.GetSize(); for (int i = 0; i < size; i++) // fill with guids - list += QString(d->pguid(d->archiveView.GetAt(i))); + list += TQString(d->pguid(d->archiveView.GetAt(i))); } else if (d->taggingEnabled) { @@ -265,16 +265,16 @@ QStringList FeedStorageMK4Impl::articles(const QString& tag) c4_View tagView = d->ptaggedArticles(tagrow); int size = tagView.GetSize(); for (int i = 0; i < size; i++) - list += QString(d->pguid(tagView.GetAt(i))); + list += TQString(d->pguid(tagView.GetAt(i))); } } return list; } -QStringList FeedStorageMK4Impl::articles(const Category& cat) +TQStringList FeedStorageMK4Impl::articles(const Category& cat) { - QStringList list; + TQStringList list; /* c4_Row catrow; d->pcatTerm(catrow) = cat.term.utf8().data(); @@ -287,13 +287,13 @@ QStringList FeedStorageMK4Impl::articles(const Category& cat) c4_View catView = d->pcategorizedArticles(catrow); int size = catView.GetSize(); for (int i = 0; i < size; i++) - list += QString(d->pguid(catView.GetAt(i))); + list += TQString(d->pguid(catView.GetAt(i))); } */ return list; } -void FeedStorageMK4Impl::addEntry(const QString& guid) +void FeedStorageMK4Impl::addEntry(const TQString& guid) { c4_Row row; d->pguid(row) = guid.ascii(); @@ -305,26 +305,26 @@ void FeedStorageMK4Impl::addEntry(const QString& guid) } } -bool FeedStorageMK4Impl::contains(const QString& guid) +bool FeedStorageMK4Impl::contains(const TQString& guid) { return findArticle(guid) != -1; } -int FeedStorageMK4Impl::findArticle(const QString& guid) +int FeedStorageMK4Impl::findArticle(const TQString& guid) { c4_Row findrow; d->pguid(findrow) = guid.ascii(); return d->archiveView.Find(findrow); } -void FeedStorageMK4Impl::deleteArticle(const QString& guid) +void FeedStorageMK4Impl::deleteArticle(const TQString& guid) { int findidx = findArticle(guid); if (findidx != -1) { - QStringList list = tags(guid); - for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) + TQStringList list = tags(guid); + for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) removeTag(guid, *it); setTotalCount(totalCount()-1); d->archiveView.RemoveAt(findidx); @@ -332,38 +332,38 @@ void FeedStorageMK4Impl::deleteArticle(const QString& guid) } } -int FeedStorageMK4Impl::comments(const QString& guid) +int FeedStorageMK4Impl::comments(const TQString& guid) { int findidx = findArticle(guid); return findidx != -1 ? d->pcomments(d->archiveView.GetAt(findidx)) : 0; } -QString FeedStorageMK4Impl::commentsLink(const QString& guid) +TQString FeedStorageMK4Impl::commentsLink(const TQString& guid) { int findidx = findArticle(guid); - return findidx != -1 ? QString(d->pcommentsLink(d->archiveView.GetAt(findidx))) : ""; + return findidx != -1 ? TQString(d->pcommentsLink(d->archiveView.GetAt(findidx))) : ""; } -bool FeedStorageMK4Impl::guidIsHash(const QString& guid) +bool FeedStorageMK4Impl::guidIsHash(const TQString& guid) { int findidx = findArticle(guid); return findidx != -1 ? d->pguidIsHash(d->archiveView.GetAt(findidx)) : false; } -bool FeedStorageMK4Impl::guidIsPermaLink(const QString& guid) +bool FeedStorageMK4Impl::guidIsPermaLink(const TQString& guid) { int findidx = findArticle(guid); return findidx != -1 ? d->pguidIsPermaLink(d->archiveView.GetAt(findidx)) : false; } -uint FeedStorageMK4Impl::hash(const QString& guid) +uint FeedStorageMK4Impl::hash(const TQString& guid) { int findidx = findArticle(guid); return findidx != -1 ? d->phash(d->archiveView.GetAt(findidx)) : 0; } -void FeedStorageMK4Impl::setDeleted(const QString& guid) +void FeedStorageMK4Impl::setDeleted(const TQString& guid) { int findidx = findArticle(guid); if (findidx == -1) @@ -371,8 +371,8 @@ void FeedStorageMK4Impl::setDeleted(const QString& guid) c4_Row row; row = d->archiveView.GetAt(findidx); - QStringList list = tags(guid); - for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) + TQStringList list = tags(guid); + for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) removeTag(guid, *it); d->pdescription(row) = ""; d->ptitle(row) = ""; @@ -383,25 +383,25 @@ void FeedStorageMK4Impl::setDeleted(const QString& guid) markDirty(); } -QString FeedStorageMK4Impl::link(const QString& guid) +TQString FeedStorageMK4Impl::link(const TQString& guid) { int findidx = findArticle(guid); - return findidx != -1 ? QString(d->plink(d->archiveView.GetAt(findidx))) : ""; + return findidx != -1 ? TQString(d->plink(d->archiveView.GetAt(findidx))) : ""; } -uint FeedStorageMK4Impl::pubDate(const QString& guid) +uint FeedStorageMK4Impl::pubDate(const TQString& guid) { int findidx = findArticle(guid); return findidx != -1 ? d->ppubDate(d->archiveView.GetAt(findidx)) : 0; } -int FeedStorageMK4Impl::status(const QString& guid) +int FeedStorageMK4Impl::status(const TQString& guid) { int findidx = findArticle(guid); return findidx != -1 ? d->pstatus(d->archiveView.GetAt(findidx)) : 0; } -void FeedStorageMK4Impl::setStatus(const QString& guid, int status) +void FeedStorageMK4Impl::setStatus(const TQString& guid, int status) { int findidx = findArticle(guid); if (findidx == -1) @@ -413,20 +413,20 @@ void FeedStorageMK4Impl::setStatus(const QString& guid, int status) markDirty(); } -QString FeedStorageMK4Impl::title(const QString& guid) +TQString FeedStorageMK4Impl::title(const TQString& guid) { int findidx = findArticle(guid); - return findidx != -1 ? QString::fromUtf8(d->ptitle(d->archiveView.GetAt(findidx))) : ""; + return findidx != -1 ? TQString::fromUtf8(d->ptitle(d->archiveView.GetAt(findidx))) : ""; } -QString FeedStorageMK4Impl::description(const QString& guid) +TQString FeedStorageMK4Impl::description(const TQString& guid) { int findidx = findArticle(guid); - return findidx != -1 ? QString::fromUtf8(d->pdescription(d->archiveView.GetAt(findidx))) : ""; + return findidx != -1 ? TQString::fromUtf8(d->pdescription(d->archiveView.GetAt(findidx))) : ""; } -void FeedStorageMK4Impl::setPubDate(const QString& guid, uint pubdate) +void FeedStorageMK4Impl::setPubDate(const TQString& guid, uint pubdate) { int findidx = findArticle(guid); if (findidx == -1) @@ -438,7 +438,7 @@ void FeedStorageMK4Impl::setPubDate(const QString& guid, uint pubdate) markDirty(); } -void FeedStorageMK4Impl::setGuidIsHash(const QString& guid, bool isHash) +void FeedStorageMK4Impl::setGuidIsHash(const TQString& guid, bool isHash) { int findidx = findArticle(guid); if (findidx == -1) @@ -450,7 +450,7 @@ void FeedStorageMK4Impl::setGuidIsHash(const QString& guid, bool isHash) markDirty(); } -void FeedStorageMK4Impl::setLink(const QString& guid, const QString& link) +void FeedStorageMK4Impl::setLink(const TQString& guid, const TQString& link) { int findidx = findArticle(guid); if (findidx == -1) @@ -462,7 +462,7 @@ void FeedStorageMK4Impl::setLink(const QString& guid, const QString& link) markDirty(); } -void FeedStorageMK4Impl::setHash(const QString& guid, uint hash) +void FeedStorageMK4Impl::setHash(const TQString& guid, uint hash) { int findidx = findArticle(guid); if (findidx == -1) @@ -474,7 +474,7 @@ void FeedStorageMK4Impl::setHash(const QString& guid, uint hash) markDirty(); } -void FeedStorageMK4Impl::setTitle(const QString& guid, const QString& title) +void FeedStorageMK4Impl::setTitle(const TQString& guid, const TQString& title) { int findidx = findArticle(guid); if (findidx == -1) @@ -486,7 +486,7 @@ void FeedStorageMK4Impl::setTitle(const QString& guid, const QString& title) markDirty(); } -void FeedStorageMK4Impl::setDescription(const QString& guid, const QString& description) +void FeedStorageMK4Impl::setDescription(const TQString& guid, const TQString& description) { int findidx = findArticle(guid); if (findidx == -1) @@ -498,7 +498,7 @@ void FeedStorageMK4Impl::setDescription(const QString& guid, const QString& desc markDirty(); } -void FeedStorageMK4Impl::setAuthor(const QString& guid, const QString& author) +void FeedStorageMK4Impl::setAuthor(const TQString& guid, const TQString& author) { int findidx = findArticle(guid); if (findidx == -1) @@ -510,14 +510,14 @@ void FeedStorageMK4Impl::setAuthor(const QString& guid, const QString& author) markDirty(); } -QString FeedStorageMK4Impl::author(const QString& guid) +TQString FeedStorageMK4Impl::author(const TQString& guid) { int findidx = findArticle(guid); - return findidx != -1 ? QString::fromUtf8(d->pauthor(d->archiveView.GetAt(findidx))) : ""; + return findidx != -1 ? TQString::fromUtf8(d->pauthor(d->archiveView.GetAt(findidx))) : ""; } -void FeedStorageMK4Impl::setCommentsLink(const QString& guid, const QString& commentsLink) +void FeedStorageMK4Impl::setCommentsLink(const TQString& guid, const TQString& commentsLink) { int findidx = findArticle(guid); if (findidx == -1) @@ -529,7 +529,7 @@ void FeedStorageMK4Impl::setCommentsLink(const QString& guid, const QString& com markDirty(); } -void FeedStorageMK4Impl::setComments(const QString& guid, int comments) +void FeedStorageMK4Impl::setComments(const TQString& guid, int comments) { int findidx = findArticle(guid); if (findidx == -1) @@ -542,7 +542,7 @@ void FeedStorageMK4Impl::setComments(const QString& guid, int comments) } -void FeedStorageMK4Impl::setGuidIsPermaLink(const QString& guid, bool isPermaLink) +void FeedStorageMK4Impl::setGuidIsPermaLink(const TQString& guid, bool isPermaLink) { int findidx = findArticle(guid); if (findidx == -1) @@ -554,7 +554,7 @@ void FeedStorageMK4Impl::setGuidIsPermaLink(const QString& guid, bool isPermaLin markDirty(); } -void FeedStorageMK4Impl::addCategory(const QString& /*guid*/, const Category& /*cat*/) +void FeedStorageMK4Impl::addCategory(const TQString& /*guid*/, const Category& /*cat*/) { return; /* @@ -610,10 +610,10 @@ void FeedStorageMK4Impl::addCategory(const QString& /*guid*/, const Category& /* */ } -QValueList<Category> FeedStorageMK4Impl::categories(const QString& /*guid*/) +TQValueList<Category> FeedStorageMK4Impl::categories(const TQString& /*guid*/) { - QValueList<Category> list; + TQValueList<Category> list; return list; /* if (!guid.isNull()) // return categories for an article @@ -631,9 +631,9 @@ QValueList<Category> FeedStorageMK4Impl::categories(const QString& /*guid*/) { Category cat; - cat.term = QString::fromUtf8(d->pcatTerm(catView.GetAt(i))); - cat.scheme = QString::fromUtf8(d->pcatScheme(catView.GetAt(i))); - cat.name = QString::fromUtf8(d->pcatName(catView.GetAt(i))); + cat.term = TQString::fromUtf8(d->pcatTerm(catView.GetAt(i))); + cat.scheme = TQString::fromUtf8(d->pcatScheme(catView.GetAt(i))); + cat.name = TQString::fromUtf8(d->pcatName(catView.GetAt(i))); list += cat; } @@ -646,9 +646,9 @@ QValueList<Category> FeedStorageMK4Impl::categories(const QString& /*guid*/) c4_Row row = d->catView.GetAt(i); Category cat; - cat.term = QString(d->pcatTerm(row)); - cat.scheme = QString(d->pcatScheme(row)); - cat.name = QString(d->pcatName(row)); + cat.term = TQString(d->pcatTerm(row)); + cat.scheme = TQString(d->pcatScheme(row)); + cat.name = TQString(d->pcatName(row)); list += cat; } @@ -657,7 +657,7 @@ QValueList<Category> FeedStorageMK4Impl::categories(const QString& /*guid*/) return list;*/ } -void FeedStorageMK4Impl::addTag(const QString& guid, const QString& tag) +void FeedStorageMK4Impl::addTag(const TQString& guid, const TQString& tag) { if (!d->taggingEnabled) return; @@ -701,7 +701,7 @@ void FeedStorageMK4Impl::addTag(const QString& guid, const QString& tag) } } -void FeedStorageMK4Impl::removeTag(const QString& guid, const QString& tag) +void FeedStorageMK4Impl::removeTag(const TQString& guid, const TQString& tag) { if (!d->taggingEnabled) return; @@ -746,9 +746,9 @@ void FeedStorageMK4Impl::removeTag(const QString& guid, const QString& tag) } } -QStringList FeedStorageMK4Impl::tags(const QString& guid) +TQStringList FeedStorageMK4Impl::tags(const TQString& guid) { - QStringList list; + TQStringList list; if (!d->taggingEnabled) return list; @@ -765,13 +765,13 @@ QStringList FeedStorageMK4Impl::tags(const QString& guid) int size = tagView.GetSize(); for (int i = 0; i < size; ++i) - list += QString::fromUtf8(d->ptag(tagView.GetAt(i))); + list += TQString::fromUtf8(d->ptag(tagView.GetAt(i))); } else // return all tags in the feed { int size = d->tagView.GetSize(); for (int i = 0; i < size; i++) - list += QString(d->ptag(d->tagView.GetAt(i))); + list += TQString(d->ptag(d->tagView.GetAt(i))); } return list; @@ -779,15 +779,15 @@ QStringList FeedStorageMK4Impl::tags(const QString& guid) void FeedStorageMK4Impl::add(FeedStorage* source) { - QStringList articles = source->articles(); - for (QStringList::ConstIterator it = articles.begin(); it != articles.end(); ++it) + TQStringList articles = source->articles(); + for (TQStringList::ConstIterator it = articles.begin(); it != articles.end(); ++it) copyArticle(*it, source); setUnread(source->unread()); setLastFetch(source->lastFetch()); setTotalCount(source->totalCount()); } -void FeedStorageMK4Impl::copyArticle(const QString& guid, FeedStorage* source) +void FeedStorageMK4Impl::copyArticle(const TQString& guid, FeedStorage* source) { if (!contains(guid)) addEntry(guid); @@ -803,12 +803,12 @@ void FeedStorageMK4Impl::copyArticle(const QString& guid, FeedStorage* source) setTitle(guid, source->title(guid)); setAuthor(guid, source->author(guid)); - QStringList tags = source->tags(guid); - for (QStringList::ConstIterator it = tags.begin(); it != tags.end(); ++it) + TQStringList tags = source->tags(guid); + for (TQStringList::ConstIterator it = tags.begin(); it != tags.end(); ++it) addTag(guid, *it); } -void FeedStorageMK4Impl::setEnclosure(const QString& guid, const QString& url, const QString& type, int length) +void FeedStorageMK4Impl::setEnclosure(const TQString& guid, const TQString& url, const TQString& type, int length) { int findidx = findArticle(guid); if (findidx == -1) @@ -824,7 +824,7 @@ void FeedStorageMK4Impl::setEnclosure(const QString& guid, const QString& url, c markDirty(); } -void FeedStorageMK4Impl::removeEnclosure(const QString& guid) +void FeedStorageMK4Impl::removeEnclosure(const TQString& guid) { int findidx = findArticle(guid); if (findidx == -1) @@ -840,14 +840,14 @@ void FeedStorageMK4Impl::removeEnclosure(const QString& guid) markDirty(); } -void FeedStorageMK4Impl::enclosure(const QString& guid, bool& hasEnclosure, QString& url, QString& type, int& length) +void FeedStorageMK4Impl::enclosure(const TQString& guid, bool& hasEnclosure, TQString& url, TQString& type, int& length) { int findidx = findArticle(guid); if (findidx == -1) { hasEnclosure = false; - url = QString::null; - type = QString::null; + url = TQString::null; + type = TQString::null; length = -1; return; } diff --git a/akregator/src/mk4storage/feedstoragemk4impl.h b/akregator/src/mk4storage/feedstoragemk4impl.h index d27933d0f..b6fea2e86 100644 --- a/akregator/src/mk4storage/feedstoragemk4impl.h +++ b/akregator/src/mk4storage/feedstoragemk4impl.h @@ -32,12 +32,12 @@ class StorageMK4Impl; class FeedStorageMK4Impl : public FeedStorage { public: - FeedStorageMK4Impl(const QString& url, StorageMK4Impl* main); + FeedStorageMK4Impl(const TQString& url, StorageMK4Impl* main); virtual ~FeedStorageMK4Impl(); virtual void add(FeedStorage* source); - virtual void copyArticle(const QString& guid, FeedStorage* source); + virtual void copyArticle(const TQString& guid, FeedStorage* source); virtual void clear(); virtual int unread(); @@ -46,47 +46,47 @@ class FeedStorageMK4Impl : public FeedStorage virtual int lastFetch(); virtual void setLastFetch(int lastFetch); - virtual QStringList articles(const QString& tag=QString::null); + virtual TQStringList articles(const TQString& tag=TQString::null); - virtual QStringList articles(const Category& cat); + virtual TQStringList articles(const Category& cat); - virtual bool contains(const QString& guid); - virtual void addEntry(const QString& guid); - virtual void deleteArticle(const QString& guid); - virtual int comments(const QString& guid); - virtual QString commentsLink(const QString& guid); - virtual void setCommentsLink(const QString& guid, const QString& commentsLink); - virtual void setComments(const QString& guid, int comments); - virtual bool guidIsHash(const QString& guid); - virtual void setGuidIsHash(const QString& guid, bool isHash); - virtual bool guidIsPermaLink(const QString& guid); - virtual void setGuidIsPermaLink(const QString& guid, bool isPermaLink); - virtual uint hash(const QString& guid); - virtual void setHash(const QString& guid, uint hash); - virtual void setDeleted(const QString& guid); - virtual QString link(const QString& guid); - virtual void setLink(const QString& guid, const QString& link); - virtual uint pubDate(const QString& guid); - virtual void setPubDate(const QString& guid, uint pubdate); - virtual int status(const QString& guid); - virtual void setStatus(const QString& guid, int status); - virtual QString title(const QString& guid); - virtual void setTitle(const QString& guid, const QString& title); - virtual QString description(const QString& guid); - virtual void setDescription(const QString& guid, const QString& description); - virtual void setEnclosure(const QString& guid, const QString& url, const QString& type, int length); - virtual void removeEnclosure(const QString& guid); - virtual void enclosure(const QString& guid, bool& hasEnclosure, QString& url, QString& type, int& length); + virtual bool contains(const TQString& guid); + virtual void addEntry(const TQString& guid); + virtual void deleteArticle(const TQString& guid); + virtual int comments(const TQString& guid); + virtual TQString commentsLink(const TQString& guid); + virtual void setCommentsLink(const TQString& guid, const TQString& commentsLink); + virtual void setComments(const TQString& guid, int comments); + virtual bool guidIsHash(const TQString& guid); + virtual void setGuidIsHash(const TQString& guid, bool isHash); + virtual bool guidIsPermaLink(const TQString& guid); + virtual void setGuidIsPermaLink(const TQString& guid, bool isPermaLink); + virtual uint hash(const TQString& guid); + virtual void setHash(const TQString& guid, uint hash); + virtual void setDeleted(const TQString& guid); + virtual TQString link(const TQString& guid); + virtual void setLink(const TQString& guid, const TQString& link); + virtual uint pubDate(const TQString& guid); + virtual void setPubDate(const TQString& guid, uint pubdate); + virtual int status(const TQString& guid); + virtual void setStatus(const TQString& guid, int status); + virtual TQString title(const TQString& guid); + virtual void setTitle(const TQString& guid, const TQString& title); + virtual TQString description(const TQString& guid); + virtual void setDescription(const TQString& guid, const TQString& description); + virtual void setEnclosure(const TQString& guid, const TQString& url, const TQString& type, int length); + virtual void removeEnclosure(const TQString& guid); + virtual void enclosure(const TQString& guid, bool& hasEnclosure, TQString& url, TQString& type, int& length); - virtual void addTag(const QString& guid, const QString& tag); - virtual void removeTag(const QString& guid, const QString& tag); - virtual QStringList tags(const QString& guid=QString::null); + virtual void addTag(const TQString& guid, const TQString& tag); + virtual void removeTag(const TQString& guid, const TQString& tag); + virtual TQStringList tags(const TQString& guid=TQString::null); - virtual void addCategory(const QString& guid, const Category& category); - virtual QValueList<Category> categories(const QString& guid=QString::null); + virtual void addCategory(const TQString& guid, const Category& category); + virtual TQValueList<Category> categories(const TQString& guid=TQString::null); - virtual void setAuthor(const QString& guid, const QString& author); - virtual QString author(const QString& guid); + virtual void setAuthor(const TQString& guid, const TQString& author); + virtual TQString author(const TQString& guid); virtual void close(); virtual void commit(); @@ -96,7 +96,7 @@ class FeedStorageMK4Impl : public FeedStorage private: void markDirty(); /** finds article by guid, returns -1 if not in archive **/ - int findArticle(const QString& guid); + int findArticle(const TQString& guid); void setTotalCount(int total); class FeedStorageMK4ImplPrivate; FeedStorageMK4ImplPrivate* d; diff --git a/akregator/src/mk4storage/mk4confwidget.cpp b/akregator/src/mk4storage/mk4confwidget.cpp index fb95e1602..fce697201 100644 --- a/akregator/src/mk4storage/mk4confwidget.cpp +++ b/akregator/src/mk4storage/mk4confwidget.cpp @@ -26,8 +26,8 @@ #include "mk4confwidget.h" #include "storagemk4impl.h" -#include <qcheckbox.h> -#include <qlabel.h> +#include <tqcheckbox.h> +#include <tqlabel.h> #include <klocale.h> #include <kmessagebox.h> #include <kurlrequester.h> @@ -52,14 +52,14 @@ MK4ConfWidget::MK4ConfWidget() : MK4ConfWidgetBase() label->setEnabled(true); } filereq->setURL(MK4Config::archivePath()); - connect(cbUseDefault, SIGNAL(toggled(bool)), this, SLOT(slotChkBoxUseDefault(bool))); + connect(cbUseDefault, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChkBoxUseDefault(bool))); } void MK4ConfWidget::accept() { - QString path = cbUseDefault->isChecked() ? StorageMK4Impl::defaultArchivePath() : filereq->url(); + TQString path = cbUseDefault->isChecked() ? StorageMK4Impl::defaultArchivePath() : filereq->url(); if (path != MK4Config::archivePath()) { // TODO: if the user changed the archive location, inform him that diff --git a/akregator/src/mk4storage/storagefactorymk4impl.cpp b/akregator/src/mk4storage/storagefactorymk4impl.cpp index 9303bb965..09cacc9db 100644 --- a/akregator/src/mk4storage/storagefactorymk4impl.cpp +++ b/akregator/src/mk4storage/storagefactorymk4impl.cpp @@ -27,26 +27,26 @@ //#include "mk4config.h" #include <klocale.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qwidget.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqwidget.h> namespace Akregator { namespace Backend { -Storage* StorageFactoryMK4Impl::createStorage(const QStringList& params) const +Storage* StorageFactoryMK4Impl::createStorage(const TQStringList& params) const { Storage* storage = new StorageMK4Impl; storage->initialize(params); return storage; } -QString StorageFactoryMK4Impl::key() const +TQString StorageFactoryMK4Impl::key() const { return "metakit"; } -QString StorageFactoryMK4Impl::name() const +TQString StorageFactoryMK4Impl::name() const { return i18n("Metakit"); } @@ -58,7 +58,7 @@ void StorageFactoryMK4Impl::configure() // fill with Settings - if (confWidget->exec() == QDialog::Accepted) + if (confWidget->exec() == TQDialog::Accepted) { // store and apply settings } diff --git a/akregator/src/mk4storage/storagefactorymk4impl.h b/akregator/src/mk4storage/storagefactorymk4impl.h index b5e51db9d..2fa915934 100644 --- a/akregator/src/mk4storage/storagefactorymk4impl.h +++ b/akregator/src/mk4storage/storagefactorymk4impl.h @@ -38,10 +38,10 @@ class Storage; class StorageFactoryMK4Impl : public StorageFactory { public: - virtual QString key() const; - virtual QString name() const; + virtual TQString key() const; + virtual TQString name() const; virtual void configure(); - virtual Storage* createStorage(const QStringList& params) const; + virtual Storage* createStorage(const TQStringList& params) const; virtual bool isConfigurable() const { return false; } virtual bool allowsMultipleWriteAccess() const { return false; } diff --git a/akregator/src/mk4storage/storagemk4impl.cpp b/akregator/src/mk4storage/storagemk4impl.cpp index 8a3af0e02..4fc9ecec1 100644 --- a/akregator/src/mk4storage/storagemk4impl.cpp +++ b/akregator/src/mk4storage/storagemk4impl.cpp @@ -27,10 +27,10 @@ #include <mk4.h> -#include <qmap.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qtimer.h> +#include <tqmap.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqtimer.h> #include <kdebug.h> #include <kstandarddirs.h> @@ -53,11 +53,11 @@ class StorageMK4Impl::StorageMK4ImplPrivate c4_View archiveView; bool autoCommit; bool modified; - QMap<QString, FeedStorage*> feeds; - QStringList feedURLs; + TQMap<TQString, FeedStorage*> feeds; + TQStringList feedURLs; c4_StringProp purl, pFeedList, pTagSet; c4_IntProp punread, ptotalCount, plastFetch; - QString archivePath; + TQString archivePath; bool taggingEnabled; @@ -70,7 +70,7 @@ bool StorageMK4Impl::taggingEnabled() const return d->taggingEnabled; } -void StorageMK4Impl::setArchivePath(const QString& archivePath) +void StorageMK4Impl::setArchivePath(const TQString& archivePath) { if (archivePath.isNull()) // if isNull, reset to default d->archivePath = defaultArchivePath(); @@ -78,17 +78,17 @@ void StorageMK4Impl::setArchivePath(const QString& archivePath) d->archivePath = archivePath; } -QString StorageMK4Impl::archivePath() const +TQString StorageMK4Impl::archivePath() const { return d->archivePath; } StorageMK4Impl::StorageMK4Impl() : d(new StorageMK4ImplPrivate) { - setArchivePath(QString::null); // set path to default + setArchivePath(TQString::null); // set path to default } -QString StorageMK4Impl::defaultArchivePath() +TQString StorageMK4Impl::defaultArchivePath() { return KGlobal::dirs()->saveLocation("data", "akregator")+"Archive"; } @@ -99,16 +99,16 @@ StorageMK4Impl::~StorageMK4Impl() delete d; d = 0; } -void StorageMK4Impl::initialize(const QStringList& params) +void StorageMK4Impl::initialize(const TQStringList& params) { d->taggingEnabled = false; - QStringList::ConstIterator it = params.begin(); - QStringList::ConstIterator end = params.end(); + TQStringList::ConstIterator it = params.begin(); + TQStringList::ConstIterator end = params.end(); for ( ; it != end; ++it) { - QStringList tokens = QStringList::split("=", *it); + TQStringList tokens = TQStringList::split("=", *it); if (tokens.count() == 2 && *(tokens.at(0)) == "taggingEnabled" && *(tokens.at(1)) == "true") { @@ -120,7 +120,7 @@ void StorageMK4Impl::initialize(const QStringList& params) bool StorageMK4Impl::open(bool autoCommit) { - QString filePath = d->archivePath +"/archiveindex.mk4"; + TQString filePath = d->archivePath +"/archiveindex.mk4"; d->storage = new c4_Storage(filePath.local8Bit(), true); d->archiveView = d->storage->GetAs("archive[url:S,unread:I,totalCount:I,lastFetch:I]"); c4_View hash = d->storage->GetAs("archiveHash[_H:I,_R:I]"); @@ -140,8 +140,8 @@ bool StorageMK4Impl::autoCommit() const bool StorageMK4Impl::close() { - QMap<QString, FeedStorage*>::Iterator it; - QMap<QString, FeedStorage*>::Iterator end(d->feeds.end() ) ; + TQMap<TQString, FeedStorage*>::Iterator it; + TQMap<TQString, FeedStorage*>::Iterator end(d->feeds.end() ) ; for (it = d->feeds.begin(); it != end; ++it) { it.data()->close(); @@ -162,8 +162,8 @@ bool StorageMK4Impl::close() bool StorageMK4Impl::commit() { - QMap<QString, FeedStorage*>::Iterator it; - QMap<QString, FeedStorage*>::Iterator end(d->feeds.end() ) ; + TQMap<TQString, FeedStorage*>::Iterator it; + TQMap<TQString, FeedStorage*>::Iterator end(d->feeds.end() ) ; for ( it = d->feeds.begin(); it != end; ++it ) it.data()->commit(); @@ -178,8 +178,8 @@ bool StorageMK4Impl::commit() bool StorageMK4Impl::rollback() { - QMap<QString, FeedStorage*>::Iterator it; - QMap<QString, FeedStorage*>::Iterator end(d->feeds.end() ) ; + TQMap<TQString, FeedStorage*>::Iterator it; + TQMap<TQString, FeedStorage*>::Iterator end(d->feeds.end() ) ; for ( it = d->feeds.begin(); it != end; ++it ) it.data()->rollback(); @@ -191,7 +191,7 @@ bool StorageMK4Impl::rollback() return false; } -int StorageMK4Impl::unreadFor(const QString &url) +int StorageMK4Impl::unreadFor(const TQString &url) { c4_Row findrow; d->purl(findrow) = url.ascii(); @@ -200,7 +200,7 @@ int StorageMK4Impl::unreadFor(const QString &url) return findidx != -1 ? d->punread(d->archiveView.GetAt(findidx)) : 0; } -void StorageMK4Impl::setUnreadFor(const QString &url, int unread) +void StorageMK4Impl::setUnreadFor(const TQString &url, int unread) { c4_Row findrow; d->purl(findrow) = url.ascii(); @@ -213,7 +213,7 @@ void StorageMK4Impl::setUnreadFor(const QString &url, int unread) markDirty(); } -int StorageMK4Impl::totalCountFor(const QString &url) +int StorageMK4Impl::totalCountFor(const TQString &url) { c4_Row findrow; d->purl(findrow) = url.ascii(); @@ -222,7 +222,7 @@ int StorageMK4Impl::totalCountFor(const QString &url) return findidx != -1 ? d->ptotalCount(d->archiveView.GetAt(findidx)) : 0; } -void StorageMK4Impl::setTotalCountFor(const QString &url, int total) +void StorageMK4Impl::setTotalCountFor(const TQString &url, int total) { c4_Row findrow; d->purl(findrow) = url.ascii(); @@ -235,7 +235,7 @@ void StorageMK4Impl::setTotalCountFor(const QString &url, int total) markDirty(); } -int StorageMK4Impl::lastFetchFor(const QString& url) +int StorageMK4Impl::lastFetchFor(const TQString& url) { c4_Row findrow; d->purl(findrow) = url.ascii(); @@ -244,7 +244,7 @@ int StorageMK4Impl::lastFetchFor(const QString& url) return (findidx != -1 ? d->plastFetch(d->archiveView.GetAt(findidx)) : 0); } -void StorageMK4Impl::setLastFetchFor(const QString& url, int lastFetch) +void StorageMK4Impl::setLastFetchFor(const TQString& url, int lastFetch) { c4_Row findrow; d->purl(findrow) = url.ascii(); @@ -263,7 +263,7 @@ void StorageMK4Impl::markDirty() { d->modified = true; // commit changes after 3 seconds - QTimer::singleShot(3000, this, SLOT(slotCommit())); + TQTimer::singleShot(3000, this, TQT_SLOT(slotCommit())); } } @@ -274,7 +274,7 @@ void StorageMK4Impl::slotCommit() d->modified = false; } -FeedStorage* StorageMK4Impl::archiveFor(const QString& url) +FeedStorage* StorageMK4Impl::archiveFor(const TQString& url) { if (!d->feeds.contains(url)) { @@ -296,13 +296,13 @@ FeedStorage* StorageMK4Impl::archiveFor(const QString& url) return d->feeds[url]; } -QStringList StorageMK4Impl::feeds() const +TQStringList StorageMK4Impl::feeds() const { // TODO: cache list - QStringList list; + TQStringList list; int size = d->archiveView.GetSize(); for (int i = 0; i < size; i++) - list += QString(d->purl(d->archiveView.GetAt(i))); + list += TQString(d->purl(d->archiveView.GetAt(i))); // fill with urls return list; @@ -310,10 +310,10 @@ QStringList StorageMK4Impl::feeds() const void StorageMK4Impl::add(Storage* source) { - QStringList feeds = source->feeds(); - QStringList::ConstIterator end(feeds.end() ) ; + TQStringList feeds = source->feeds(); + TQStringList::ConstIterator end(feeds.end() ) ; - for (QStringList::ConstIterator it = feeds.begin(); it != end; ++it) + for (TQStringList::ConstIterator it = feeds.begin(); it != end; ++it) { FeedStorage* fa = archiveFor(*it); fa->add(source->archiveFor(*it)); @@ -323,13 +323,13 @@ void StorageMK4Impl::add(Storage* source) void StorageMK4Impl::clear() { - QStringList feeds; + TQStringList feeds; int size = d->archiveView.GetSize(); for (int i = 0; i < size; i++) - feeds += QString(d->purl(d->archiveView.GetAt(i))); - QStringList::ConstIterator end(feeds.end() ) ; + feeds += TQString(d->purl(d->archiveView.GetAt(i))); + TQStringList::ConstIterator end(feeds.end() ) ; - for (QStringList::ConstIterator it = feeds.begin(); it != end; ++it) + for (TQStringList::ConstIterator it = feeds.begin(); it != end; ++it) { FeedStorage* fa = archiveFor(*it); fa->clear(); @@ -340,7 +340,7 @@ void StorageMK4Impl::clear() } -void StorageMK4Impl::storeFeedList(const QString& opmlStr) +void StorageMK4Impl::storeFeedList(const TQString& opmlStr) { if (d->feedListView.GetSize() == 0) @@ -359,16 +359,16 @@ void StorageMK4Impl::storeFeedList(const QString& opmlStr) markDirty(); } -QString StorageMK4Impl::restoreFeedList() const +TQString StorageMK4Impl::restoreFeedList() const { if (d->feedListView.GetSize() == 0) return ""; c4_Row row = d->feedListView.GetAt(0); - return QString::fromUtf8(d->pFeedList(row)); + return TQString::fromUtf8(d->pFeedList(row)); } -void StorageMK4Impl::storeTagSet(const QString& xmlStr) +void StorageMK4Impl::storeTagSet(const TQString& xmlStr) { if (d->feedListView.GetSize() == 0) @@ -387,13 +387,13 @@ void StorageMK4Impl::storeTagSet(const QString& xmlStr) markDirty(); } -QString StorageMK4Impl::restoreTagSet() const +TQString StorageMK4Impl::restoreTagSet() const { if (d->feedListView.GetSize() == 0) return ""; c4_Row row = d->feedListView.GetAt(0); - return QString::fromUtf8(d->pTagSet(row)); + return TQString::fromUtf8(d->pTagSet(row)); } } // namespace Backend diff --git a/akregator/src/mk4storage/storagemk4impl.h b/akregator/src/mk4storage/storagemk4impl.h index 7b3a43783..bf50efc68 100644 --- a/akregator/src/mk4storage/storagemk4impl.h +++ b/akregator/src/mk4storage/storagemk4impl.h @@ -46,20 +46,20 @@ class StorageMK4Impl : public Storage /** KGlobal::dirs()->saveLocation("data", "akregator")+"/Archive" */ - static QString defaultArchivePath(); + static TQString defaultArchivePath(); /** sets the directory where the metakit files will be stored. - @param archivePath the path to the archive, or QString::null to reset it to the default. + @param archivePath the path to the archive, or TQString::null to reset it to the default. */ - void setArchivePath(const QString& archivePath); + void setArchivePath(const TQString& archivePath); /** returns the path to the metakit archives */ - QString archivePath() const; + TQString archivePath() const; - virtual void initialize(const QStringList& params); + virtual void initialize(const TQStringList& params); /** * Open storage and prepare it for work. * @return true on success. @@ -87,22 +87,22 @@ class StorageMK4Impl : public Storage /** * @return Article archive for feed at given url. */ - virtual FeedStorage* archiveFor(const QString &url); + virtual FeedStorage* archiveFor(const TQString &url); virtual bool autoCommit() const; - virtual int unreadFor(const QString &url); - virtual void setUnreadFor(const QString &url, int unread); - virtual int totalCountFor(const QString &url); - virtual void setTotalCountFor(const QString &url, int total); - virtual int lastFetchFor(const QString& url); - virtual void setLastFetchFor(const QString& url, int lastFetch); + virtual int unreadFor(const TQString &url); + virtual void setUnreadFor(const TQString &url, int unread); + virtual int totalCountFor(const TQString &url); + virtual void setTotalCountFor(const TQString &url, int total); + virtual int lastFetchFor(const TQString& url); + virtual void setLastFetchFor(const TQString& url, int lastFetch); - virtual QStringList feeds() const; + virtual TQStringList feeds() const; - virtual void storeFeedList(const QString& opmlStr); - virtual QString restoreFeedList() const; + virtual void storeFeedList(const TQString& opmlStr); + virtual TQString restoreFeedList() const; - virtual void storeTagSet(const QString& xmlStr); - virtual QString restoreTagSet() const; + virtual void storeTagSet(const TQString& xmlStr); + virtual TQString restoreTagSet() const; /** adds all feed storages from a source to this storage existing articles are replaced diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp index c59cb5c11..952428409 100644 --- a/akregator/src/nodelist.cpp +++ b/akregator/src/nodelist.cpp @@ -29,19 +29,19 @@ #include <kapplication.h> -#include <qmap.h> -#include <qstring.h> -#include <qvaluelist.h> +#include <tqmap.h> +#include <tqstring.h> +#include <tqvaluelist.h> namespace Akregator { class NodeList::NodeListPrivate { public: - QValueList<TreeNode*> flatList; + TQValueList<TreeNode*> flatList; Folder* rootNode; - QString title; - QMap<int, TreeNode*> idMap; + TQString title; + TQMap<int, TreeNode*> idMap; AddNodeVisitor* addNodeVisitor; RemoveNodeVisitor* removeNodeVisitor; }; @@ -60,15 +60,15 @@ class NodeList::AddNodeVisitor : public TreeNodeVisitor m_list->d->idMap[node->id()] = node; m_list->d->flatList.append(node); - connect(node, SIGNAL(signalDestroyed(TreeNode*)), m_list, SLOT(slotNodeDestroyed(TreeNode*) )); + connect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_list, TQT_SLOT(slotNodeDestroyed(TreeNode*) )); m_list->signalNodeAdded(node); // emit return true; } virtual bool visitFolder(Folder* node) { - connect(node, SIGNAL(signalChildAdded(TreeNode*)), m_list, SLOT(slotNodeAdded(TreeNode*) )); - connect(node, SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_list, SLOT(slotNodeRemoved(Folder*, TreeNode*) )); + connect(node, TQT_SIGNAL(signalChildAdded(TreeNode*)), m_list, TQT_SLOT(slotNodeAdded(TreeNode*) )); + connect(node, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_list, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); visitTreeNode(node); @@ -99,7 +99,7 @@ class NodeList::RemoveNodeVisitor : public TreeNodeVisitor m_list->d->idMap.remove(node->id()); m_list->d->flatList.remove(node); - disconnect(node, SIGNAL(signalDestroyed(TreeNode*)), m_list, SLOT(slotNodeDestroyed(TreeNode*) )); + disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_list, TQT_SLOT(slotNodeDestroyed(TreeNode*) )); m_list->signalNodeRemoved(node); // emit signal return true; @@ -108,8 +108,8 @@ class NodeList::RemoveNodeVisitor : public TreeNodeVisitor virtual bool visitFolder(Folder* node) { - disconnect(node, SIGNAL(signalChildAdded(TreeNode*)), m_list, SLOT(slotNodeAdded(TreeNode*) )); - disconnect(node, SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_list, SLOT(slotNodeRemoved(Folder*, TreeNode*) )); + disconnect(node, TQT_SIGNAL(signalChildAdded(TreeNode*)), m_list, TQT_SLOT(slotNodeAdded(TreeNode*) )); + disconnect(node, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_list, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); visitTreeNode(node); return true; @@ -118,7 +118,7 @@ class NodeList::RemoveNodeVisitor : public TreeNodeVisitor NodeList* m_list; }; -NodeList::NodeList(QObject *parent, const char *name) : d(new NodeListPrivate) +NodeList::NodeList(TQObject *parent, const char *name) : d(new NodeListPrivate) { d->rootNode = 0; d->addNodeVisitor = new AddNodeVisitor(this); @@ -126,7 +126,7 @@ NodeList::NodeList(QObject *parent, const char *name) : d(new NodeListPrivate) } -const QString& NodeList::title() const +const TQString& NodeList::title() const { return d->title; } @@ -136,7 +136,7 @@ TreeNode* NodeList::findByID(int id) const return d->idMap[id]; } -void NodeList::setTitle(const QString& title) +void NodeList::setTitle(const TQString& title) { d->title = title; } @@ -146,7 +146,7 @@ Folder* NodeList::rootNode() const return d->rootNode; } -const QValueList<TreeNode*>& NodeList::asFlatList() const +const TQValueList<TreeNode*>& NodeList::asFlatList() const { return d->flatList; } @@ -156,7 +156,7 @@ bool NodeList::isEmpty() const return d->rootNode->firstChild() == 0; } -QValueList<TreeNode*>* NodeList::flatList() const +TQValueList<TreeNode*>* NodeList::flatList() const { return &(d->flatList); } @@ -165,13 +165,13 @@ void NodeList::clear() { Q_ASSERT(rootNode()); - QValueList<TreeNode*> children = rootNode()->children(); + TQValueList<TreeNode*> children = rootNode()->children(); - for (QValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it) + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it) delete *it; // emits signal "emitSignalDestroyed" } -QMap<int, TreeNode*>* NodeList::idMap() const +TQMap<int, TreeNode*>* NodeList::idMap() const { return &(d->idMap); } @@ -184,8 +184,8 @@ void NodeList::setRootNode(Folder* folder) if (d->rootNode) { d->rootNode->setOpen(true); - connect(d->rootNode, SIGNAL(signalChildAdded(TreeNode*)), this, SLOT(slotNodeAdded(TreeNode*))); - connect(d->rootNode, SIGNAL(signalChildRemoved(Folder*, TreeNode*)), this, SLOT(slotNodeRemoved(Folder*, TreeNode*))); + connect(d->rootNode, TQT_SIGNAL(signalChildAdded(TreeNode*)), this, TQT_SLOT(slotNodeAdded(TreeNode*))); + connect(d->rootNode, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), this, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*))); } } diff --git a/akregator/src/nodelist.h b/akregator/src/nodelist.h index 20a52fee9..d5b0024c0 100644 --- a/akregator/src/nodelist.h +++ b/akregator/src/nodelist.h @@ -25,7 +25,7 @@ #ifndef AKREGATOR_NODELIST_H #define AKREGATOR_NODELIST_H -#include <qobject.h> +#include <tqobject.h> class QDomDocument; class QDomNode; @@ -51,27 +51,27 @@ class NodeList : public QObject Q_OBJECT public: - NodeList(QObject *parent=0, const char *name=0); + NodeList(TQObject *parent=0, const char *name=0); virtual ~NodeList(); virtual Folder* rootNode() const; - virtual bool readFromXML(const QDomDocument& doc) = 0; + virtual bool readFromXML(const TQDomDocument& doc) = 0; - virtual QDomDocument toXML() const = 0; + virtual TQDomDocument toXML() const = 0; virtual bool isEmpty() const; TreeNode* findByID(int id) const; /** returns the title of the feed list (as used in the OPML document) */ - const QString& title() const; + const TQString& title() const; /** sets the title of the feed list */ - void setTitle(const QString& name); + void setTitle(const TQString& name); /** returns a flat list containing all nodes in the tree */ - const QValueList<TreeNode*>& asFlatList() const; + const TQValueList<TreeNode*>& asFlatList() const; signals: void signalDestroyed(NodeList*); @@ -90,8 +90,8 @@ public slots: public: // compat with KDE-3.x assertions, remove for KDE 4 // protected: - QValueList<TreeNode*>* flatList() const; - QMap<int, TreeNode*>* idMap() const; + TQValueList<TreeNode*>* flatList() const; + TQMap<int, TreeNode*>* idMap() const; int generateID(); void setRootNode(Folder* folder); @@ -107,7 +107,7 @@ public slots: // compat with KDE-3.x assertions, remove for KDE 4 public: // compat with KDE-3.x assertions, remove for KDE 4 // private: - NodeList(const NodeList&) : QObject() {} + NodeList(const NodeList&) : TQObject() {} NodeList& operator=(const NodeList&) { return *this; } friend class AddNodeVisitor; diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp index ae1b2c886..b505b2b82 100644 --- a/akregator/src/notificationmanager.cpp +++ b/akregator/src/notificationmanager.cpp @@ -27,15 +27,15 @@ #include <kstaticdeleter.h> #include <kurl.h> -#include <qlabel.h> -#include <qtimer.h> +#include <tqlabel.h> +#include <tqtimer.h> #include "feed.h" #include "notificationmanager.h" namespace Akregator { -NotificationManager::NotificationManager() : QObject() +NotificationManager::NotificationManager() : TQObject() { m_intervalsLapsed = 0; m_checkInterval = 2000; @@ -52,7 +52,7 @@ NotificationManager::~NotificationManager() m_self = 0; } -void NotificationManager::setWidget(QWidget* widget, KInstance* inst) +void NotificationManager::setWidget(TQWidget* widget, KInstance* inst) { m_widget = widget; m_instance = inst != NULL ? inst : KGlobal::instance(); @@ -67,11 +67,11 @@ void NotificationManager::slotNotifyArticle(const Article& article) else if (!m_running) { m_running = true; - QTimer::singleShot(m_checkInterval, this, SLOT(slotIntervalCheck())); + TQTimer::singleShot(m_checkInterval, this, TQT_SLOT(slotIntervalCheck())); } } -void NotificationManager::slotNotifyFeeds(const QStringList& feeds) +void NotificationManager::slotNotifyFeeds(const TQStringList& feeds) { if (feeds.count() == 1) { @@ -80,8 +80,8 @@ void NotificationManager::slotNotifyFeeds(const QStringList& feeds) } else if (feeds.count() > 1) { - QString message; - for (QStringList::ConstIterator it = feeds.begin(); it != feeds.end(); ++it) + TQString message; + for (TQStringList::ConstIterator it = feeds.begin(); it != feeds.end(); ++it) message += *it + "\n"; KNotifyClient::Instance inst(m_instance); KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feeds added:\n %1").arg(message)); @@ -90,16 +90,16 @@ void NotificationManager::slotNotifyFeeds(const QStringList& feeds) void NotificationManager::doNotify() { - QString message = "<html><body>"; - QString feedTitle; - QValueList<Article>::ConstIterator it = m_articles.begin(); - QValueList<Article>::ConstIterator en = m_articles.end(); + TQString message = "<html><body>"; + TQString feedTitle; + TQValueList<Article>::ConstIterator it = m_articles.begin(); + TQValueList<Article>::ConstIterator en = m_articles.end(); for (; it != en; ++it) { if (feedTitle != (*it).feed()->title()) { feedTitle = (*it).feed()->title(); - message += QString("<p><b>%1:</b></p>").arg(feedTitle); + message += TQString("<p><b>%1:</b></p>").arg(feedTitle); } message += (*it).title() + "<br>"; } @@ -123,7 +123,7 @@ void NotificationManager::slotIntervalCheck() else { m_addedInLastInterval = false; - QTimer::singleShot(m_checkInterval, this, SLOT(slotIntervalCheck())); + TQTimer::singleShot(m_checkInterval, this, TQT_SLOT(slotIntervalCheck())); } } diff --git a/akregator/src/notificationmanager.h b/akregator/src/notificationmanager.h index 5b274cef7..9a5430343 100644 --- a/akregator/src/notificationmanager.h +++ b/akregator/src/notificationmanager.h @@ -25,7 +25,7 @@ #ifndef AKREGATORNOTIFICATIONMANAGER_H #define AKREGATORNOTIFICATIONMANAGER_H -#include <qobject.h> +#include <tqobject.h> #include "article.h" @@ -43,7 +43,7 @@ class NotificationManager : public QObject ~NotificationManager(); /** the widget used for notification, normally either the mainwindow or the tray icon */ - void setWidget(QWidget* widget, KInstance* inst=0); + void setWidget(TQWidget* widget, KInstance* inst=0); public slots: @@ -52,7 +52,7 @@ class NotificationManager : public QObject void slotNotifyArticle(const Article& article); /** notifies the addition of feeds (used when added via DCOP or command line) */ - void slotNotifyFeeds(const QStringList& feeds); + void slotNotifyFeeds(const TQStringList& feeds); protected: @@ -64,7 +64,7 @@ class NotificationManager : public QObject private: NotificationManager(); - NotificationManager(const NotificationManager&) : QObject(){} + NotificationManager(const NotificationManager&) : TQObject(){} uint m_checkInterval; uint m_intervalsLapsed; @@ -72,10 +72,10 @@ class NotificationManager : public QObject uint m_maxArticles; bool m_running; bool m_addedInLastInterval; - QWidget* m_widget; + TQWidget* m_widget; KInstance* m_instance; - QValueList<Article> m_articles; + TQValueList<Article> m_articles; static NotificationManager* m_self; }; diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index 1a10b4953..9f1e5591c 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -44,15 +44,15 @@ #include <kstdaccel.h> #include <kparts/browserinterface.h> -#include <qclipboard.h> -#include <qcstring.h> -#include <qdatastream.h> -#include <qdatetime.h> -#include <qfile.h> -#include <qmetaobject.h> -#include <qscrollview.h> -#include <qstring.h> -#include <qvaluelist.h> +#include <tqclipboard.h> +#include <tqcstring.h> +#include <tqdatastream.h> +#include <tqdatetime.h> +#include <tqfile.h> +#include <tqmetaobject.h> +#include <tqscrollview.h> +#include <tqstring.h> +#include <tqvaluelist.h> #include <private/qucomextra_p.h> #include <cstdlib> @@ -67,14 +67,14 @@ class PageViewer::HistoryEntry public: KURL url; - QString title; - QByteArray state; + TQString title; + TQByteArray state; int id; HistoryEntry() {} - HistoryEntry(const KURL& u, const QString& t=QString::null): url(u), title(t) + HistoryEntry(const KURL& u, const TQString& t=TQString::null): url(u), title(t) { - id = abs( QTime::currentTime().msecsTo( QTime() ) ); // nasty, but should provide a reasonably unique number + id = abs( TQTime::currentTime().msecsTo( TQTime() ) ); // nasty, but should provide a reasonably unique number } }; @@ -83,19 +83,19 @@ class PageViewer::PageViewerPrivate { public: - QValueList<HistoryEntry> history; - QValueList<HistoryEntry>::Iterator current; + TQValueList<HistoryEntry> history; + TQValueList<HistoryEntry>::Iterator current; KToolBarPopupAction* backAction; KToolBarPopupAction* forwardAction; KAction* reloadAction; KAction* stopAction; - QString caption; + TQString caption; }; -PageViewer::PageViewer(QWidget *parent, const char *name) +PageViewer::PageViewer(TQWidget *parent, const char *name) : Viewer(parent, name), d(new PageViewerPrivate) { // this hack is necessary since the part looks for []HTML Settings] in @@ -109,44 +109,44 @@ PageViewer::PageViewer(QWidget *parent, const char *name) d->backAction = new KToolBarPopupAction(backForward.first, KStdAccel::shortcut(KStdAccel::Back), this, - SLOT(slotBack()), actionCollection(), + TQT_SLOT(slotBack()), actionCollection(), "pageviewer_back"); - connect(d->backAction->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotBackAboutToShow())); - connect(d->backAction->popupMenu(), SIGNAL(activated(int)), - this, SLOT(slotPopupActivated(int))); + connect(d->backAction->popupMenu(), TQT_SIGNAL(aboutToShow()), + this, TQT_SLOT(slotBackAboutToShow())); + connect(d->backAction->popupMenu(), TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotPopupActivated(int))); d->forwardAction = new KToolBarPopupAction(backForward.second, KStdAccel::shortcut(KStdAccel::Forward),this, - SLOT(slotForward()), actionCollection(), + TQT_SLOT(slotForward()), actionCollection(), "pageviewer_forward"); - connect(d->forwardAction->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotForwardAboutToShow())); - connect(d->forwardAction->popupMenu(), SIGNAL(activated(int)), - this, SLOT(slotPopupActivated(int))); + connect(d->forwardAction->popupMenu(), TQT_SIGNAL(aboutToShow()), + this, TQT_SLOT(slotForwardAboutToShow())); + connect(d->forwardAction->popupMenu(), TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotPopupActivated(int))); d->reloadAction = new KAction(i18n("Reload"), "reload", 0, - this, SLOT(slotReload()), + this, TQT_SLOT(slotReload()), actionCollection(), "pageviewer_reload"); d->stopAction = new KAction(KStdGuiItem::guiItem(KStdGuiItem::Stop), 0, - this, SLOT(slotStop()), + this, TQT_SLOT(slotStop()), actionCollection(), "pageviewer_stop"); - //connect( this, SIGNAL(popupMenu(const QString &, const QPoint &)), this, SLOT(slotPopupMenu(const QString &, const QPoint &))); + //connect( this, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(slotPopupMenu(const TQString &, const TQPoint &))); d->backAction->setEnabled(false); d->forwardAction->setEnabled(false); d->stopAction->setEnabled(false); - connect( this, SIGNAL(setWindowCaption (const QString &)), - this, SLOT(slotSetCaption (const QString &)) ); + connect( this, TQT_SIGNAL(setWindowCaption (const TQString &)), + this, TQT_SLOT(slotSetCaption (const TQString &)) ); - connect(this, SIGNAL(started(KIO::Job *)), this, SLOT(slotStarted(KIO::Job* ))); - connect(this, SIGNAL(completed()), this, SLOT(slotCompleted())); - connect(this, SIGNAL(canceled(const QString &)), this, SLOT(slotCancelled(const QString &))); + connect(this, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(slotStarted(KIO::Job* ))); + connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted())); + connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCancelled(const TQString &))); d->current = d->history.end(); @@ -166,7 +166,7 @@ void PageViewer::slotBack() { if ( d->current != d->history.begin() ) { - QValueList<HistoryEntry>::Iterator tmp = d->current; + TQValueList<HistoryEntry>::Iterator tmp = d->current; --tmp; restoreHistoryEntry(tmp); } @@ -177,7 +177,7 @@ void PageViewer::slotForward() { if ( d->current != d->history.fromLast() && d->current != d->history.end() ) { - QValueList<HistoryEntry>::Iterator tmp = d->current; + TQValueList<HistoryEntry>::Iterator tmp = d->current; ++tmp; restoreHistoryEntry(tmp); } @@ -191,7 +191,7 @@ void PageViewer::slotBackAboutToShow() if ( d->current == d->history.begin() ) return; - QValueList<HistoryEntry>::Iterator it = d->current; + TQValueList<HistoryEntry>::Iterator it = d->current; --it; int i = 0; @@ -217,7 +217,7 @@ void PageViewer::slotForwardAboutToShow() if ( d->current == d->history.fromLast() ) return; - QValueList<HistoryEntry>::Iterator it = d->current; + TQValueList<HistoryEntry>::Iterator it = d->current; ++it; int i = 0; @@ -258,9 +258,9 @@ bool PageViewer::openURL(const KURL& url) d->backAction->setEnabled( d->current != d->history.begin() ); d->forwardAction->setEnabled( d->current != d->history.fromLast() ); - QString favicon = FeedIconManager::self()->iconLocation(url); + TQString favicon = FeedIconManager::self()->iconLocation(url); if (!favicon.isEmpty()) - emit setTabIcon(QPixmap(KGlobal::dirs()->findResource("cache", favicon+".png"))); + emit setTabIcon(TQPixmap(KGlobal::dirs()->findResource("cache", favicon+".png"))); else emit setTabIcon(SmallIcon("html")); @@ -281,7 +281,7 @@ void PageViewer::slotOpenURLRequest(const KURL& url, const KParts::URLArgs& args void PageViewer::slotPopupActivated( int id ) { - QValueList<HistoryEntry>::Iterator it = d->history.begin(); + TQValueList<HistoryEntry>::Iterator it = d->history.begin(); while( it != d->history.end() ) { if ( (*it).id == id ) @@ -296,16 +296,16 @@ void PageViewer::slotPopupActivated( int id ) void PageViewer::updateHistoryEntry() { (*d->current).title = d->caption; - (*d->current).state = QByteArray(); // Start with empty buffer. - QDataStream stream( (*d->current).state, IO_WriteOnly); + (*d->current).state = TQByteArray(); // Start with empty buffer. + TQDataStream stream( (*d->current).state, IO_WriteOnly); browserExtension()->saveState(stream); } -void PageViewer::restoreHistoryEntry(const QValueList<HistoryEntry>::Iterator& entry) +void PageViewer::restoreHistoryEntry(const TQValueList<HistoryEntry>::Iterator& entry) { updateHistoryEntry(); - QDataStream stream( (*entry).state, IO_ReadOnly ); + TQDataStream stream( (*entry).state, IO_ReadOnly ); browserExtension()->restoreState( stream ); d->current = entry; d->backAction->setEnabled( d->current != d->history.begin() ); @@ -318,7 +318,7 @@ void PageViewer::restoreHistoryEntry(const QValueList<HistoryEntry>::Iterator& e // Taken from KDevelop (lib/widgets/kdevhtmlpart.cpp) void PageViewer::addHistoryEntry(const KURL& url) { - QValueList<HistoryEntry>::Iterator it = d->current; + TQValueList<HistoryEntry>::Iterator it = d->current; // if We're not already the last entry, we truncate the list here before adding an entry if ( it != d->history.end() && it != d->history.fromLast() ) @@ -349,14 +349,14 @@ void PageViewer::slotCompleted( ) } // Taken from KDevelop (lib/widgets/kdevhtmlpart.cpp) -void PageViewer::slotCancelled( const QString & /*errMsg*/ ) +void PageViewer::slotCancelled( const TQString & /*errMsg*/ ) { d->stopAction->setEnabled(false); } -void PageViewer::urlSelected(const QString &url, int button, int state, const QString &_target, KParts::URLArgs args) +void PageViewer::urlSelected(const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args) { - if (url.startsWith(QString::fromLatin1( "javascript:" ), /*case-sensitive=*/false) ) + if (url.startsWith(TQString::fromLatin1( "javascript:" ), /*case-sensitive=*/false) ) { KHTMLPart::urlSelected(url,button,state,_target,args); } @@ -375,7 +375,7 @@ void PageViewer::urlSelected(const QString &url, int button, int state, const QS } } -void PageViewer::slotSetCaption(const QString& cap) +void PageViewer::slotSetCaption(const TQString& cap) { d->caption = cap; (*d->current).title = cap; @@ -386,7 +386,7 @@ void PageViewer::slotPaletteOrFontChanged() kdDebug() << "PageViewer::slotPaletteOrFontChanged()" << endl; // taken from KonqView (kdebase/konqueror/konq_view.cc) - QObject *obj = KParts::BrowserExtension::childObject(this); + TQObject *obj = KParts::BrowserExtension::childObject(this); if ( !obj ) // not all views have a browser extension ! return; @@ -414,10 +414,10 @@ void PageViewer::slotGlobalBookmarkArticle() } -void PageViewer::slotPopupMenu(KXMLGUIClient*, const QPoint& p, const KURL& kurl, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags kpf, mode_t) +void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags kpf, mode_t) { m_url = kurl; - QString url = kurl.url(); // maximal url confusion + TQString url = kurl.url(); // maximal url confusion const bool showReload = (kpf & KParts::BrowserExtension::ShowReload) != 0; const bool showNavigationItems = (kpf & KParts::BrowserExtension::ShowNavigationItems) != 0; @@ -429,9 +429,9 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const QPoint& p, const KURL& kurl int idNewWindow = -2; if (isLink) { - idNewWindow = popup.insertItem(SmallIcon("tab_new"),i18n("Open Link in New &Tab"), this, SLOT(slotOpenLinkInForegroundTab())); + idNewWindow = popup.insertItem(SmallIcon("tab_new"),i18n("Open Link in New &Tab"), this, TQT_SLOT(slotOpenLinkInForegroundTab())); popup.setWhatsThis(idNewWindow, i18n("<b>Open Link in New Tab</b><p>Opens current link in a new tab.")); - popup.insertItem(SmallIcon("window_new"), i18n("Open Link in External &Browser"), this, SLOT(slotOpenLinkInBrowser())); + popup.insertItem(SmallIcon("window_new"), i18n("Open Link in External &Browser"), this, TQT_SLOT(slotOpenLinkInBrowser())); popup.insertSeparator(); action("savelinkas")->plug(&popup); @@ -472,7 +472,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const QPoint& p, const KURL& kurl popup.insertSeparator(); } - popup.insertItem(SmallIcon("window_new"), i18n("Open Page in External Browser"), this, SLOT(slotOpenLinkInBrowser())); + popup.insertItem(SmallIcon("window_new"), i18n("Open Page in External Browser"), this, TQT_SLOT(slotOpenLinkInBrowser())); action("viewer_print")->plug(&popup); popup.insertSeparator(); @@ -480,7 +480,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const QPoint& p, const KURL& kurl KAction *ac = action("setEncoding"); if (ac) ac->plug(&popup); - popup.insertItem(SmallIcon("bookmark_add"),i18n("Add to Konqueror Bookmarks"), this, SLOT(slotGlobalBookmarkArticle())); + popup.insertItem(SmallIcon("bookmark_add"),i18n("Add to Konqueror Bookmarks"), this, TQT_SLOT(slotGlobalBookmarkArticle())); } int r = popup.exec(p); diff --git a/akregator/src/pageviewer.h b/akregator/src/pageviewer.h index 68001d80c..357f5a4ac 100644 --- a/akregator/src/pageviewer.h +++ b/akregator/src/pageviewer.h @@ -41,7 +41,7 @@ namespace Akregator { Q_OBJECT public: - PageViewer(QWidget* parent, const char* name); + PageViewer(TQWidget* parent, const char* name); virtual ~PageViewer(); virtual bool openURL(const KURL &url); @@ -49,12 +49,12 @@ namespace Akregator class HistoryEntry; void addHistoryEntry(const KURL& url); - void restoreHistoryEntry(const QValueList<HistoryEntry>::Iterator& entry); + void restoreHistoryEntry(const TQValueList<HistoryEntry>::Iterator& entry); void updateHistoryEntry(); protected slots: - void slotSetCaption(const QString& cap); + void slotSetCaption(const TQString& cap); void slotBack(); void slotForward(); void slotReload(); @@ -64,19 +64,19 @@ namespace Akregator void slotStarted(KIO::Job *); void slotCompleted(); - void slotCancelled(const QString &errMsg); + void slotCancelled(const TQString &errMsg); void slotBackAboutToShow(); void slotForwardAboutToShow(); void slotPopupActivated( int id ); - virtual void slotPopupMenu(KXMLGUIClient*, const QPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t); + virtual void slotPopupMenu(KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t); void slotGlobalBookmarkArticle(); virtual void slotOpenURLRequest(const KURL& url, const KParts::URLArgs& args); - virtual void urlSelected(const QString &url, int button, int state, const QString &_target, KParts::URLArgs args); + virtual void urlSelected(const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args); signals: - void setTabIcon(const QPixmap&); + void setTabIcon(const TQPixmap&); private: class PageViewerPrivate; diff --git a/akregator/src/plugin.cpp b/akregator/src/plugin.cpp index ad3825ba9..9b413f5cc 100644 --- a/akregator/src/plugin.cpp +++ b/akregator/src/plugin.cpp @@ -16,14 +16,14 @@ Plugin::~Plugin() void -Plugin::addPluginProperty( const QString& key, const QString& value ) +Plugin::addPluginProperty( const TQString& key, const TQString& value ) { m_properties[key.lower()] = value; } QString -Plugin::pluginProperty( const QString& key ) +Plugin::pluginProperty( const TQString& key ) { if ( m_properties.find( key.lower() ) == m_properties.end() ) return "false"; @@ -33,7 +33,7 @@ Plugin::pluginProperty( const QString& key ) bool -Plugin::hasPluginProperty( const QString& key ) +Plugin::hasPluginProperty( const TQString& key ) { return m_properties.find( key.lower() ) != m_properties.end(); } diff --git a/akregator/src/plugin.h b/akregator/src/plugin.h index ed10bf200..650a4a924 100644 --- a/akregator/src/plugin.h +++ b/akregator/src/plugin.h @@ -11,8 +11,8 @@ Akregator::Plugin* create_plugin() { return new classname; } \ } -#include <qmap.h> -#include <qstring.h> +#include <tqmap.h> +#include <tqstring.h> namespace Akregator @@ -29,18 +29,18 @@ namespace Akregator * TODO @param parent you must parent the widget to parent * @return the configure widget for your plugin, create it on the heap! */ - //TODO rename configureWidget( QWidget *parent ) + //TODO rename configureWidget( TQWidget *parent ) // virtual PluginConfig* configure() const { return 0; } - void addPluginProperty( const QString& key, const QString& value ); - QString pluginProperty( const QString& key ); - bool hasPluginProperty( const QString& key ); + void addPluginProperty( const TQString& key, const TQString& value ); + TQString pluginProperty( const TQString& key ); + bool hasPluginProperty( const TQString& key ); protected: Plugin(); private: - QMap<QString, QString> m_properties; + TQMap<TQString, TQString> m_properties; }; } //namespace Akregator diff --git a/akregator/src/pluginmanager.cpp b/akregator/src/pluginmanager.cpp index db6c70117..83e746f8f 100644 --- a/akregator/src/pluginmanager.cpp +++ b/akregator/src/pluginmanager.cpp @@ -18,8 +18,8 @@ email : markey@web.de #include <vector> -#include <qfile.h> -#include <qstring.h> +#include <tqfile.h> +#include <tqstring.h> #include <klibloader.h> #include <kdebug.h> @@ -40,12 +40,12 @@ PluginManager::m_store; ///////////////////////////////////////////////////////////////////////////////////// KTrader::OfferList -PluginManager::query( const QString& constraint ) +PluginManager::query( const TQString& constraint ) { // Add versioning constraint QString str = "[X-KDE-akregator-framework-version] == "; - str += QString::number( FrameworkVersion ); + str += TQString::number( FrameworkVersion ); str += " and "; if (!constraint.stripWhiteSpace().isEmpty()) str += constraint + " and "; @@ -58,7 +58,7 @@ PluginManager::query( const QString& constraint ) Plugin* -PluginManager::createFromQuery( const QString &constraint ) +PluginManager::createFromQuery( const TQString &constraint ) { KTrader::OfferList offers = query( constraint ); @@ -87,7 +87,7 @@ PluginManager::createFromService( const KService::Ptr service ) //get the library loader instance KLibLoader *loader = KLibLoader::self(); //try to load the specified library - KLibrary *lib = loader->globalLibrary( QFile::encodeName( service->library() ) ); + KLibrary *lib = loader->globalLibrary( TQFile::encodeName( service->library() ) ); if ( !lib ) { KMessageBox::error( 0, i18n( "<p>KLibLoader could not load the plugin:<br/><i>%1</i></p>" @@ -154,7 +154,7 @@ PluginManager::getService( const Plugin* plugin ) void -PluginManager::showAbout( const QString &constraint ) +PluginManager::showAbout( const TQString &constraint ) { KTrader::OfferList offers = query( constraint ); @@ -163,9 +163,9 @@ PluginManager::showAbout( const QString &constraint ) KService::Ptr s = offers.front(); - const QString body = "<tr><td>%1</td><td>%2</td></tr>"; + const TQString body = "<tr><td>%1</td><td>%2</td></tr>"; - QString str = "<html><body><table width=\"100%\" border=\"1\">"; + TQString str = "<html><body><table width=\"100%\" border=\"1\">"; str += body.arg( i18n( "Name" ), s->name() ); str += body.arg( i18n( "Library" ), s->library() ); diff --git a/akregator/src/pluginmanager.h b/akregator/src/pluginmanager.h index 15d0c253e..ca97753f4 100644 --- a/akregator/src/pluginmanager.h +++ b/akregator/src/pluginmanager.h @@ -49,22 +49,22 @@ class PluginManager * The keys used in the query (Type, ServiceType, Exec) are all * fields found in the .desktop files. * - * @param constraint A constraint to limit the choices returned, QString::null to + * @param constraint A constraint to limit the choices returned, TQString::null to * get all services of the given @p servicetype * * @return A list of services that satisfy the query * @see http://developer.kde.org/documentation/library/kdeqt/tradersyntax.html */ - static KTrader::OfferList query( const QString& constraint = QString::null ); + static KTrader::OfferList query( const TQString& constraint = TQString::null ); /** * Load and instantiate plugin from query - * @param constraint A constraint to limit the choices returned, QString::null to + * @param constraint A constraint to limit the choices returned, TQString::null to * get all services of the given @p servicetype * @return Pointer to Plugin, or NULL if error * @see http://developer.kde.org/documentation/library/kdeqt/tradersyntax.html */ - static Akregator::Plugin* createFromQuery( const QString& constraint = QString::null ); + static Akregator::Plugin* createFromQuery( const TQString& constraint = TQString::null ); /** * Load and instantiate plugin from service @@ -96,7 +96,7 @@ class PluginManager * Show modal info dialog about plugin * @param constraint A constraint to limit the choices returned */ - static void showAbout( const QString& constraint ); + static void showAbout( const TQString& constraint ); private: struct StoreItem { diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp index 201cf5b6d..6146ddd86 100644 --- a/akregator/src/progressmanager.cpp +++ b/akregator/src/progressmanager.cpp @@ -22,8 +22,8 @@ without including the source code for Qt in the source distribution. */ -#include <qmap.h> -#include <qstylesheet.h> +#include <tqmap.h> +#include <tqstylesheet.h> #include <klocale.h> #include <kstaticdeleter.h> @@ -44,7 +44,7 @@ class ProgressManager::ProgressManagerPrivate { public: FeedList* feedList; - QMap<Feed*, ProgressItemHandler*> handlers; + TQMap<Feed*, ProgressItemHandler*> handlers; }; @@ -76,24 +76,24 @@ void ProgressManager::setFeedList(FeedList* feedList) if (d->feedList != 0) { - for (QMap<Feed*, ProgressItemHandler*>::ConstIterator it = d->handlers.begin(); it != d->handlers.end(); ++it) + for (TQMap<Feed*, ProgressItemHandler*>::ConstIterator it = d->handlers.begin(); it != d->handlers.end(); ++it) delete *it; d->handlers.clear(); - disconnect(d->feedList, SIGNAL(signalNodeAdded(TreeNode*)), this, SLOT(slotNodeAdded(TreeNode*))); - disconnect(d->feedList, SIGNAL(signalNodeRemoved(TreeNode*)), this, SLOT(slotNodeRemoved(TreeNode*))); + disconnect(d->feedList, TQT_SIGNAL(signalNodeAdded(TreeNode*)), this, TQT_SLOT(slotNodeAdded(TreeNode*))); + disconnect(d->feedList, TQT_SIGNAL(signalNodeRemoved(TreeNode*)), this, TQT_SLOT(slotNodeRemoved(TreeNode*))); } d->feedList = feedList; if (feedList != 0) { - QValueList<TreeNode*> list = feedList->asFlatList(); + TQValueList<TreeNode*> list = feedList->asFlatList(); - for (QValueList<TreeNode*>::ConstIterator it = list.begin(); it != list.end(); ++it) + for (TQValueList<TreeNode*>::ConstIterator it = list.begin(); it != list.end(); ++it) slotNodeAdded(*it); - connect(feedList, SIGNAL(signalNodeAdded(TreeNode*)), this, SLOT(slotNodeAdded(TreeNode*))); - connect(feedList, SIGNAL(signalNodeRemoved(TreeNode*)), this, SLOT(slotNodeRemoved(TreeNode*))); + connect(feedList, TQT_SIGNAL(signalNodeAdded(TreeNode*)), this, TQT_SLOT(slotNodeAdded(TreeNode*))); + connect(feedList, TQT_SIGNAL(signalNodeRemoved(TreeNode*)), this, TQT_SLOT(slotNodeRemoved(TreeNode*))); } } @@ -104,7 +104,7 @@ void ProgressManager::slotNodeAdded(TreeNode* node) { if (!d->handlers.contains(feed)) d->handlers[feed] = new ProgressItemHandler(feed); - connect(feed, SIGNAL(signalDestroyed(TreeNode*)), this, SLOT(slotNodeDestroyed(TreeNode*))); + connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*))); } } @@ -113,7 +113,7 @@ void ProgressManager::slotNodeRemoved(TreeNode* node) Feed* feed = dynamic_cast<Feed*>(node); if (feed) { - disconnect(feed, SIGNAL(signalDestroyed(TreeNode*)), this, SLOT(slotNodeDestroyed(TreeNode*))); + disconnect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*))); delete d->handlers[feed]; d->handlers.remove(feed); } @@ -142,10 +142,10 @@ ProgressItemHandler::ProgressItemHandler(Feed* feed) : d(new ProgressItemHandler d->feed = feed; d->progressItem = 0; - connect(feed, SIGNAL(fetchStarted(Feed*)), this, SLOT(slotFetchStarted())); - connect(feed, SIGNAL(fetched(Feed*)), this, SLOT(slotFetchCompleted())); - connect(feed, SIGNAL(fetchError(Feed*)), this, SLOT(slotFetchError())); - connect(feed, SIGNAL(fetchAborted(Feed*)), this, SLOT(slotFetchAborted())); + connect(feed, TQT_SIGNAL(fetchStarted(Feed*)), this, TQT_SLOT(slotFetchStarted())); + connect(feed, TQT_SIGNAL(fetched(Feed*)), this, TQT_SLOT(slotFetchCompleted())); + connect(feed, TQT_SIGNAL(fetchError(Feed*)), this, TQT_SLOT(slotFetchError())); + connect(feed, TQT_SIGNAL(fetchAborted(Feed*)), this, TQT_SLOT(slotFetchAborted())); } ProgressItemHandler::~ProgressItemHandler() @@ -168,9 +168,9 @@ void ProgressItemHandler::slotFetchStarted() d->progressItem = 0; } - d->progressItem = KPIM::ProgressManager::createProgressItem(KPIM::ProgressManager::getUniqueID(), QStyleSheet::escape( d->feed->title() ), QString::null, true); + d->progressItem = KPIM::ProgressManager::createProgressItem(KPIM::ProgressManager::getUniqueID(), TQStyleSheet::escape( d->feed->title() ), TQString::null, true); - connect(d->progressItem, SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), d->feed, SLOT(slotAbortFetch())); + connect(d->progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), d->feed, TQT_SLOT(slotAbortFetch())); } diff --git a/akregator/src/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp index cd63c2045..28ee7858d 100644 --- a/akregator/src/propertiesdialog.cpp +++ b/akregator/src/propertiesdialog.cpp @@ -32,13 +32,13 @@ #include <klocale.h> #include <knuminput.h> -#include <qcheckbox.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> namespace Akregator { -FeedPropertiesWidget::FeedPropertiesWidget(QWidget *parent, const char *name) +FeedPropertiesWidget::FeedPropertiesWidget(TQWidget *parent, const char *name) : FeedPropertiesWidgetBase(parent, name) { } @@ -65,14 +65,14 @@ void FeedPropertiesWidget::slotUpdateCheckBoxToggled( bool enabled ) } -FeedPropertiesDialog::FeedPropertiesDialog(QWidget *parent, const char *name) +FeedPropertiesDialog::FeedPropertiesDialog(TQWidget *parent, const char *name) : KDialogBase(KDialogBase::Swallow, Qt::WStyle_DialogBorder, parent, name, true, i18n("Feed Properties"), KDialogBase::Ok|KDialogBase::Cancel) { widget=new FeedPropertiesWidget(this); setMainWidget(widget); widget->feedNameEdit->setFocus(); - connect(widget->feedNameEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotSetCaption(const QString&))); + connect(widget->feedNameEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotSetCaption(const TQString&))); } FeedPropertiesDialog::~FeedPropertiesDialog() @@ -97,7 +97,7 @@ void FeedPropertiesDialog::slotOk() KDialogBase::slotOk(); } -void FeedPropertiesDialog::slotSetCaption(const QString& c) +void FeedPropertiesDialog::slotSetCaption(const TQString& c) { if(c.isEmpty()) setCaption(i18n("Feed Properties")); @@ -129,12 +129,12 @@ void FeedPropertiesDialog::setFeed(Feed* feed) } -const QString FeedPropertiesDialog::feedName() const +const TQString FeedPropertiesDialog::feedName() const { return widget->feedNameEdit->text(); } -const QString FeedPropertiesDialog::url() const +const TQString FeedPropertiesDialog::url() const { return widget->urlEdit->text(); } @@ -213,12 +213,12 @@ void FeedPropertiesDialog::setArchiveMode(Feed::ArchiveMode mode) widget->rb_limitArticleNumber->setChecked(true); } } -void FeedPropertiesDialog::setFeedName(const QString& title) +void FeedPropertiesDialog::setFeedName(const TQString& title) { widget->feedNameEdit->setText(title); } -void FeedPropertiesDialog::setUrl(const QString& url) +void FeedPropertiesDialog::setUrl(const TQString& url) { widget->urlEdit->setText(url); } diff --git a/akregator/src/propertiesdialog.h b/akregator/src/propertiesdialog.h index 234df190a..f6f853760 100644 --- a/akregator/src/propertiesdialog.h +++ b/akregator/src/propertiesdialog.h @@ -34,7 +34,7 @@ namespace Akregator { Q_OBJECT public: - FeedPropertiesWidget(QWidget *parent = 0, const char *name = 0); + FeedPropertiesWidget(TQWidget *parent = 0, const char *name = 0); ~FeedPropertiesWidget(); virtual void slotUpdateComboBoxActivated(int index); virtual void slotUpdateCheckBoxToggled(bool enabled); @@ -45,7 +45,7 @@ namespace Akregator { Q_OBJECT public: - FeedPropertiesDialog(QWidget *parent = 0, const char *name = 0); + FeedPropertiesDialog(TQWidget *parent = 0, const char *name = 0); ~FeedPropertiesDialog(); void setFeed(Feed* feed); @@ -54,8 +54,8 @@ namespace Akregator void selectFeedName(); protected: - const QString feedName() const; - const QString url() const; + const TQString feedName() const; + const TQString url() const; bool autoFetch() const; int fetchInterval() const; Feed::ArchiveMode archiveMode() const; @@ -65,8 +65,8 @@ namespace Akregator bool useNotification() const; bool loadLinkedWebsite() const; - void setFeedName(const QString& title); - void setUrl(const QString& url); + void setFeedName(const TQString& title); + void setUrl(const TQString& url); void setAutoFetch(bool); void setFetchInterval(int); void setArchiveMode(Feed::ArchiveMode mode); @@ -84,7 +84,7 @@ namespace Akregator Feed* m_feed; private slots: - void slotSetCaption(const QString&); + void slotSetCaption(const TQString&); }; } diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp index d565c2847..eb5b7cff7 100644 --- a/akregator/src/searchbar.cpp +++ b/akregator/src/searchbar.cpp @@ -33,14 +33,14 @@ #include <klocale.h> #include <kstandarddirs.h> -#include <qapplication.h> -#include <qhbox.h> -#include <qlabel.h> -#include <qpixmap.h> -#include <qstring.h> -#include <qtimer.h> -#include <qtoolbutton.h> -#include <qtooltip.h> +#include <tqapplication.h> +#include <tqhbox.h> +#include <tqlabel.h> +#include <tqpixmap.h> +#include <tqstring.h> +#include <tqtimer.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> using Akregator::Filters::ArticleMatcher; using Akregator::Filters::Criterion; @@ -53,58 +53,58 @@ class SearchBar::SearchBarPrivate public: Akregator::Filters::ArticleMatcher textFilter; Akregator::Filters::ArticleMatcher statusFilter; - QString searchText; - QTimer timer; + TQString searchText; + TQTimer timer; KLineEdit* searchLine; KComboBox* searchCombo; int delay; }; -SearchBar::SearchBar(QWidget* parent, const char* name) : QHBox(parent, name), d(new SearchBar::SearchBarPrivate) +SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name), d(new SearchBar::SearchBarPrivate) { d->delay = 400; setMargin(2); setSpacing(5); - setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Fixed ) ); - QToolButton *clearButton = new QToolButton(this); - clearButton->setIconSet( SmallIconSet( QApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); + TQToolButton *clearButton = new TQToolButton(this); + clearButton->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) ); clearButton->setAutoRaise(true); - QLabel* searchLabel = new QLabel(this); + TQLabel* searchLabel = new TQLabel(this); searchLabel->setText( i18n("S&earch:") ); d->searchLine = new KLineEdit(this, "searchline"); - connect(d->searchLine, SIGNAL(textChanged(const QString &)), - this, SLOT(slotSearchStringChanged(const QString &))); + connect(d->searchLine, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SLOT(slotSearchStringChanged(const TQString &))); searchLabel->setBuddy(d->searchLine); - QLabel* statusLabel = new QLabel(this); + TQLabel* statusLabel = new TQLabel(this); statusLabel->setText( i18n("Status:") ); d->searchCombo = new KComboBox(this, "searchcombo"); - QPixmap iconAll = KGlobal::iconLoader()->loadIcon("exec", KIcon::Small); - QPixmap iconNew(locate("data", "akregator/pics/kmmsgnew.png")); - QPixmap iconUnread(locate("data", "akregator/pics/kmmsgunseen.png")); - QPixmap iconKeep(locate("data", "akregator/pics/kmmsgflag.png")); + TQPixmap iconAll = KGlobal::iconLoader()->loadIcon("exec", KIcon::Small); + TQPixmap iconNew(locate("data", "akregator/pics/kmmsgnew.png")); + TQPixmap iconUnread(locate("data", "akregator/pics/kmmsgunseen.png")); + TQPixmap iconKeep(locate("data", "akregator/pics/kmmsgflag.png")); d->searchCombo->insertItem(iconAll, i18n("All Articles")); d->searchCombo->insertItem(iconUnread, i18n("Unread")); d->searchCombo->insertItem(iconNew, i18n("New")); d->searchCombo->insertItem(iconKeep, i18n("Important")); - QToolTip::add( clearButton, i18n( "Clear filter" ) ); - QToolTip::add( d->searchLine, i18n( "Enter space-separated terms to filter article list" ) ); - QToolTip::add( d->searchCombo, i18n( "Choose what kind of articles to show in article list" ) ); + TQToolTip::add( clearButton, i18n( "Clear filter" ) ); + TQToolTip::add( d->searchLine, i18n( "Enter space-separated terms to filter article list" ) ); + TQToolTip::add( d->searchCombo, i18n( "Choose what kind of articles to show in article list" ) ); - connect(clearButton, SIGNAL( clicked() ), - this, SLOT(slotClearSearch()) ); + connect(clearButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT(slotClearSearch()) ); - connect(d->searchCombo, SIGNAL(activated(int)), - this, SLOT(slotSearchComboChanged(int))); + connect(d->searchCombo, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotSearchComboChanged(int))); - connect(&(d->timer), SIGNAL(timeout()), this, SLOT(slotActivateSearch())); + connect(&(d->timer), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotActivateSearch())); } SearchBar::~SearchBar() @@ -113,7 +113,7 @@ SearchBar::~SearchBar() d = 0; } -QString SearchBar::text() const +TQString SearchBar::text() const { return d->searchText; } @@ -150,7 +150,7 @@ void SearchBar::slotSetStatus(int status) slotSearchComboChanged(status); } -void SearchBar::slotSetText(const QString& text) +void SearchBar::slotSetText(const TQString& text) { d->searchLine->setText(text); slotSearchStringChanged(text); @@ -164,7 +164,7 @@ void SearchBar::slotSearchComboChanged(int /*index*/) d->timer.start(200, true); } -void SearchBar::slotSearchStringChanged(const QString& search) +void SearchBar::slotSearchStringChanged(const TQString& search) { d->searchText = search; if (d->timer.isActive()) @@ -175,8 +175,8 @@ void SearchBar::slotSearchStringChanged(const QString& search) void SearchBar::slotActivateSearch() { - QValueList<Criterion> textCriteria; - QValueList<Criterion> statusCriteria; + TQValueList<Criterion> textCriteria; + TQValueList<Criterion> statusCriteria; if (!d->searchText.isEmpty()) { diff --git a/akregator/src/searchbar.h b/akregator/src/searchbar.h index f9cfb879c..8787f2927 100644 --- a/akregator/src/searchbar.h +++ b/akregator/src/searchbar.h @@ -25,7 +25,7 @@ #ifndef AKREGATOR_SEARCHBAR_H #define AKREGATOR_SEARCHBAR_H -#include <qhbox.h> +#include <tqhbox.h> class QString; @@ -43,10 +43,10 @@ class SearchBar : public QHBox public: - SearchBar(QWidget* parent=0, const char* name=0); + SearchBar(TQWidget* parent=0, const char* name=0); virtual ~SearchBar(); - QString text() const; + TQString text() const; int status() const; void setDelay(int ms); @@ -59,11 +59,11 @@ class SearchBar : public QHBox public slots: void slotClearSearch(); void slotSetStatus(int status); - void slotSetText(const QString& text); + void slotSetText(const TQString& text); private slots: - void slotSearchStringChanged(const QString& search); + void slotSearchStringChanged(const TQString& search); void slotSearchComboChanged(int index); void slotActivateSearch(); diff --git a/akregator/src/settings_advanced.cpp b/akregator/src/settings_advanced.cpp index 5d1254835..7a849ff9b 100644 --- a/akregator/src/settings_advanced.cpp +++ b/akregator/src/settings_advanced.cpp @@ -3,38 +3,38 @@ #include "storagefactory.h" #include "storagefactoryregistry.h" -#include <qpushbutton.h> -#include <qstringlist.h> -#include <qwidget.h> +#include <tqpushbutton.h> +#include <tqstringlist.h> +#include <tqwidget.h> #include <kcombobox.h> namespace Akregator { -SettingsAdvanced::SettingsAdvanced(QWidget* parent, const char* name) : SettingsAdvancedBase(parent, name) +SettingsAdvanced::SettingsAdvanced(TQWidget* parent, const char* name) : SettingsAdvancedBase(parent, name) { - QStringList backends = Backend::StorageFactoryRegistry::self()->list(); - QString tname; + TQStringList backends = Backend::StorageFactoryRegistry::self()->list(); + TQString tname; int i = 0; - QStringList::Iterator end( backends.end() ); - for (QStringList::Iterator it = backends.begin(); it != end; ++it) + TQStringList::Iterator end( backends.end() ); + for (TQStringList::Iterator it = backends.begin(); it != end; ++it) { m_factories[i] = Backend::StorageFactoryRegistry::self()->getFactory(*it); m_keyPos[m_factories[i]->key()] = i; cbBackend->insertItem(m_factories[i]->name()); i++; } - connect(pbBackendConfigure, SIGNAL(clicked()), this, SLOT(slotConfigureStorage())); - connect(cbBackend, SIGNAL(activated(int)), this, SLOT(slotFactorySelected(int))); + connect(pbBackendConfigure, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigureStorage())); + connect(cbBackend, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotFactorySelected(int))); } -QString SettingsAdvanced::selectedFactory() const +TQString SettingsAdvanced::selectedFactory() const { return m_factories[cbBackend->currentItem()]->key(); } -void SettingsAdvanced::selectFactory(const QString& key) +void SettingsAdvanced::selectFactory(const TQString& key) { cbBackend->setCurrentItem(m_keyPos[key]); pbBackendConfigure->setEnabled((m_factories[m_keyPos[key]]->isConfigurable())); diff --git a/akregator/src/settings_advanced.h b/akregator/src/settings_advanced.h index c741f3f77..ff8a75e73 100644 --- a/akregator/src/settings_advanced.h +++ b/akregator/src/settings_advanced.h @@ -3,7 +3,7 @@ #include "settings_advancedbase.h" -#include <qmap.h> +#include <tqmap.h> class QString; class QWidget; @@ -20,12 +20,12 @@ class SettingsAdvanced : public SettingsAdvancedBase Q_OBJECT public: - SettingsAdvanced(QWidget* parent=0, const char* name=0); + SettingsAdvanced(TQWidget* parent=0, const char* name=0); /** returns the key of the currently selected factory */ - QString selectedFactory() const; + TQString selectedFactory() const; - void selectFactory(const QString& key); + void selectFactory(const TQString& key); public slots: @@ -33,8 +33,8 @@ class SettingsAdvanced : public SettingsAdvancedBase void slotFactorySelected(int); private: - QMap<int,Backend::StorageFactory*> m_factories; - QMap<QString, int> m_keyPos; + TQMap<int,Backend::StorageFactory*> m_factories; + TQMap<TQString, int> m_keyPos; }; } // namespace Akregator diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp index ea6f7974e..5c3272a13 100644 --- a/akregator/src/simplenodeselector.cpp +++ b/akregator/src/simplenodeselector.cpp @@ -31,9 +31,9 @@ #include <klistview.h> #include <klocale.h> -#include <qlayout.h> -#include <qmap.h> -#include <qwidget.h> +#include <tqlayout.h> +#include <tqmap.h> +#include <tqwidget.h> namespace Akregator { @@ -44,13 +44,13 @@ class SelectNodeDialog::SelectNodeDialogPrivate SimpleNodeSelector* widget; }; -SelectNodeDialog::SelectNodeDialog(FeedList* feedList, QWidget* parent, char* name) : +SelectNodeDialog::SelectNodeDialog(FeedList* feedList, TQWidget* parent, char* name) : KDialogBase(parent, name, true, i18n("Select Feed or Folder"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), d(new SelectNodeDialogPrivate) { d->widget = new SimpleNodeSelector(feedList, this); - connect(d->widget, SIGNAL(signalNodeSelected(TreeNode*)), this, SLOT(slotNodeSelected(TreeNode*))); + connect(d->widget, TQT_SIGNAL(signalNodeSelected(TreeNode*)), this, TQT_SLOT(slotNodeSelected(TreeNode*))); setMainWidget(d->widget); enableButtonOK(false); @@ -84,8 +84,8 @@ class SimpleNodeSelector::SimpleNodeSelectorPrivate KListView* view; FeedList* list; NodeVisitor* visitor; - QMap<TreeNode*,QListViewItem*> nodeToItem; - QMap<QListViewItem*, TreeNode*> itemToNode; + TQMap<TreeNode*,TQListViewItem*> nodeToItem; + TQMap<TQListViewItem*, TreeNode*> itemToNode; }; class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor @@ -102,16 +102,16 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor virtual bool visitFolder(Folder* node) { visitTreeNode(node); - QValueList<TreeNode*> children = node->children(); + TQValueList<TreeNode*> children = node->children(); m_view->d->nodeToItem[node]->setExpandable(true); - for (QValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it) + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it) createItems(*it); return true; } virtual bool visitTreeNode(TreeNode* node) { - QListViewItem* pi = node->parent() ? m_view->d->nodeToItem[node->parent()] : 0; + TQListViewItem* pi = node->parent() ? m_view->d->nodeToItem[node->parent()] : 0; KListViewItem* item = 0; if (pi != 0) @@ -121,7 +121,7 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor item->setExpandable(false); m_view->d->nodeToItem.insert(node, item); m_view->d->itemToNode.insert(item, node); - connect(node, SIGNAL(signalDestroyed(TreeNode*)), m_view, SLOT(slotNodeDestroyed(TreeNode*))); + connect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*))); return true; } @@ -131,18 +131,18 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor }; -SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, QWidget* parent, const char* name) : QWidget(parent, name), d(new SimpleNodeSelectorPrivate) +SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, const char* name) : TQWidget(parent, name), d(new SimpleNodeSelectorPrivate) { d->list = feedList; - connect(feedList, SIGNAL(signalDestroyed(FeedList*)), this, SLOT(slotFeedListDestroyed(FeedList*))); + connect(feedList, TQT_SIGNAL(signalDestroyed(FeedList*)), this, TQT_SLOT(slotFeedListDestroyed(FeedList*))); d->view = new KListView(this); d->view->setRootIsDecorated(true); d->view->addColumn(i18n("Feeds")); - connect(d->view, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(slotItemSelected(QListViewItem*))); + connect(d->view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - QGridLayout* layout = new QGridLayout(this, 1, 1); + TQGridLayout* layout = new TQGridLayout(this, 1, 1); layout->addWidget(d->view, 0, 0); d->visitor = new NodeVisitor(this); @@ -166,7 +166,7 @@ TreeNode* SimpleNodeSelector::selectedNode() const void SimpleNodeSelector::slotSelectNode(TreeNode* node) { - QListViewItem* item = d->nodeToItem[node]; + TQListViewItem* item = d->nodeToItem[node]; if (item != 0) d->view->setSelected(item, true); } @@ -178,7 +178,7 @@ void SimpleNodeSelector::slotFeedListDestroyed(FeedList* /*list*/) d->view->clear(); } -void SimpleNodeSelector::slotItemSelected(QListViewItem* item) +void SimpleNodeSelector::slotItemSelected(TQListViewItem* item) { emit signalNodeSelected(d->itemToNode[item]); } @@ -187,7 +187,7 @@ void SimpleNodeSelector::slotNodeDestroyed(TreeNode* node) { if (d->nodeToItem.contains(node)) { - QListViewItem* item = d->nodeToItem[node]; + TQListViewItem* item = d->nodeToItem[node]; d->nodeToItem.remove(node); d->itemToNode.remove(item); delete item; diff --git a/akregator/src/simplenodeselector.h b/akregator/src/simplenodeselector.h index 244672abe..aea9cd141 100644 --- a/akregator/src/simplenodeselector.h +++ b/akregator/src/simplenodeselector.h @@ -25,7 +25,7 @@ #ifndef AKREGATOR_SIMPLENODESELECTOR_H #define AKREGATOR_SIMPLENODESELECTOR_H -#include <qwidget.h> +#include <tqwidget.h> #include <kdialogbase.h> @@ -45,7 +45,7 @@ class SelectNodeDialog : public KDialogBase { Q_OBJECT public: - SelectNodeDialog(FeedList* feedList, QWidget* parent=0, char* name=0); + SelectNodeDialog(FeedList* feedList, TQWidget* parent=0, char* name=0); virtual ~SelectNodeDialog(); TreeNode* selectedNode() const; @@ -68,7 +68,7 @@ class SimpleNodeSelector : public QWidget Q_OBJECT public: - SimpleNodeSelector(FeedList* feedList, QWidget* parent=0, const char* name=0); + SimpleNodeSelector(FeedList* feedList, TQWidget* parent=0, const char* name=0); virtual ~SimpleNodeSelector(); TreeNode* selectedNode() const; @@ -81,7 +81,7 @@ class SimpleNodeSelector : public QWidget protected slots: - virtual void slotItemSelected(QListViewItem* item); + virtual void slotItemSelected(TQListViewItem* item); virtual void slotNodeDestroyed(TreeNode* node); virtual void slotFeedListDestroyed(FeedList* list); diff --git a/akregator/src/speechclient.cpp b/akregator/src/speechclient.cpp index ffa42119c..4f98df2c1 100644 --- a/akregator/src/speechclient.cpp +++ b/akregator/src/speechclient.cpp @@ -34,8 +34,8 @@ #include <kstaticdeleter.h> #include <ktrader.h> -#include <qstring.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> namespace Akregator { @@ -45,7 +45,7 @@ class SpeechClient::SpeechClientPrivate public: bool isTextSpeechInstalled; - QValueList<uint> pendingJobs; + TQValueList<uint> pendingJobs; }; SpeechClient* SpeechClient::m_self = 0; @@ -60,7 +60,7 @@ SpeechClient* SpeechClient::self() } -SpeechClient::SpeechClient() : DCOPStub("kttsd", "KSpeech"), DCOPObject("akregatorpart_kspeechsink"), QObject(), d(new SpeechClientPrivate) +SpeechClient::SpeechClient() : DCOPStub("kttsd", "KSpeech"), DCOPObject("akregatorpart_kspeechsink"), TQObject(), d(new SpeechClientPrivate) { d->isTextSpeechInstalled = false; setupSpeechSystem(); @@ -72,7 +72,7 @@ SpeechClient::~SpeechClient() d = 0; } -void SpeechClient::slotSpeak(const QString& text, const QString& language) +void SpeechClient::slotSpeak(const TQString& text, const TQString& language) { if (!isTextToSpeechInstalled() || text.isEmpty()) return; @@ -91,21 +91,21 @@ void SpeechClient::slotSpeak(const Article& article) if (!isTextToSpeechInstalled() || article.isNull()) return; - QString speakMe; + TQString speakMe; speakMe += KCharsets::resolveEntities(Utils::stripTags((article).title())) + ". . . . " + KCharsets::resolveEntities(Utils::stripTags((article).description())); slotSpeak(speakMe, "en"); } -void SpeechClient::slotSpeak(const QValueList<Article>& articles) +void SpeechClient::slotSpeak(const TQValueList<Article>& articles) { if (!isTextToSpeechInstalled() || articles.isEmpty()) return; - QString speakMe; + TQString speakMe; - for (QValueList<Article>::ConstIterator it = articles.begin(); it != articles.end(); ++it) + for (TQValueList<Article>::ConstIterator it = articles.begin(); it != articles.end(); ++it) { if (!speakMe.isEmpty()) speakMe += ". . . . . . " + i18n("Next Article: "); @@ -121,7 +121,7 @@ void SpeechClient::slotAbortJobs() { if (!d->pendingJobs.isEmpty()) { - for (QValueList<uint>::ConstIterator it = d->pendingJobs.begin(); it != d->pendingJobs.end(); ++it) + for (TQValueList<uint>::ConstIterator it = d->pendingJobs.begin(); it != d->pendingJobs.end(); ++it) { removeText(*it); } @@ -132,7 +132,7 @@ void SpeechClient::slotAbortJobs() } } -ASYNC SpeechClient::textRemoved(const QCString& /*appId*/, uint jobNum) +ASYNC SpeechClient::textRemoved(const TQCString& /*appId*/, uint jobNum) { kdDebug() << "SpeechClient::textRemoved() called" << endl; if (d->pendingJobs.contains(jobNum)) @@ -169,8 +169,8 @@ void SpeechClient::setupSpeechSystem() } else { - QString error; - if (KApplication::startServiceByDesktopName("kttsd", QStringList(), &error)) + TQString error; + if (KApplication::startServiceByDesktopName("kttsd", TQStringList(), &error)) { kdDebug() << "Starting KTTSD failed with message " << error << endl; d->isTextSpeechInstalled = false; @@ -185,14 +185,14 @@ void SpeechClient::setupSpeechSystem() { bool c = connectDCOPSignal("kttsd", "KSpeech", - "textRemoved(QCString, uint)", - "textRemoved(QCString, uint)", + "textRemoved(TQCString, uint)", + "textRemoved(TQCString, uint)", false); if (!c) kdDebug() << "SpeechClient::setupSpeechSystem(): connecting signals failed" << endl; c = connectDCOPSignal("kttsd", "KSpeech", - "textFinished(QCString, uint)", - "textRemoved(QCString, uint)", + "textFinished(TQCString, uint)", + "textRemoved(TQCString, uint)", false); } } diff --git a/akregator/src/speechclient.h b/akregator/src/speechclient.h index 03cf681a1..56e1c7148 100644 --- a/akregator/src/speechclient.h +++ b/akregator/src/speechclient.h @@ -28,7 +28,7 @@ #include <kspeechsink.h> #include "kspeech_stub.h" -#include <qobject.h> +#include <tqobject.h> class QString; template <class T> class QValueList; @@ -38,7 +38,7 @@ namespace Akregator class Article; -class SpeechClient : public QObject, public KSpeech_stub, virtual public KSpeechSink +class SpeechClient : public TQObject, public KSpeech_stub, virtual public KSpeechSink { Q_OBJECT @@ -51,9 +51,9 @@ class SpeechClient : public QObject, public KSpeech_stub, virtual public KSpeech public slots: - void slotSpeak(const QString& text, const QString& language); + void slotSpeak(const TQString& text, const TQString& language); void slotSpeak(const Article& article); - void slotSpeak(const QValueList<Article>& articles); + void slotSpeak(const TQValueList<Article>& articles); void slotAbortJobs(); signals: @@ -71,7 +71,7 @@ class SpeechClient : public QObject, public KSpeech_stub, virtual public KSpeech SpeechClient(); void setupSpeechSystem(); - ASYNC textRemoved(const QCString& appId, uint jobNum); + ASYNC textRemoved(const TQCString& appId, uint jobNum); private: diff --git a/akregator/src/storage.h b/akregator/src/storage.h index 59dd410a4..3b53bb7ef 100644 --- a/akregator/src/storage.h +++ b/akregator/src/storage.h @@ -25,7 +25,7 @@ #ifndef AKREGATOR_BACKEND_STORAGE_H #define AKREGATOR_BACKEND_STORAGE_H -#include <qobject.h> +#include <tqobject.h> #include "akregator_export.h" @@ -52,7 +52,7 @@ class AKREGATOR_EXPORT Storage : public QObject /** initializes the storage object with given parameters */ - virtual void initialize(const QStringList& params) = 0; + virtual void initialize(const TQStringList& params) = 0; /** * Open storage and prepare it for work. @@ -81,28 +81,28 @@ class AKREGATOR_EXPORT Storage : public QObject /** * @return Article archive for feed at given url. */ - virtual FeedStorage* archiveFor(const QString &url) = 0; + virtual FeedStorage* archiveFor(const TQString &url) = 0; virtual bool autoCommit() const = 0; - virtual int unreadFor(const QString &url) = 0; - virtual void setUnreadFor(const QString &url, int unread) = 0; - virtual int totalCountFor(const QString &url) = 0; - virtual void setTotalCountFor(const QString &url, int total) = 0; - virtual int lastFetchFor(const QString& url) = 0; - virtual void setLastFetchFor(const QString& url, int lastFetch) = 0; + virtual int unreadFor(const TQString &url) = 0; + virtual void setUnreadFor(const TQString &url, int unread) = 0; + virtual int totalCountFor(const TQString &url) = 0; + virtual void setTotalCountFor(const TQString &url, int total) = 0; + virtual int lastFetchFor(const TQString& url) = 0; + virtual void setLastFetchFor(const TQString& url, int lastFetch) = 0; /** stores the feed list in the storage backend. This is a fallback for the case that the feeds.opml file gets corrupted @param opmlStr the feed list in OPML format */ - virtual void storeFeedList(const QString& opmlStr) = 0; - virtual QString restoreFeedList() const = 0; + virtual void storeFeedList(const TQString& opmlStr) = 0; + virtual TQString restoreFeedList() const = 0; - virtual void storeTagSet(const QString& xmlStr) = 0; - virtual QString restoreTagSet() const = 0; + virtual void storeTagSet(const TQString& xmlStr) = 0; + virtual TQString restoreTagSet() const = 0; /** returns a list of all feeds (URLs) stored in this archive */ - virtual QStringList feeds() const = 0; + virtual TQStringList feeds() const = 0; /** adds all feed storages from a source to this storage existing articles are replaced diff --git a/akregator/src/storagedummyimpl.cpp b/akregator/src/storagedummyimpl.cpp index cca08d75a..25d3f320f 100644 --- a/akregator/src/storagedummyimpl.cpp +++ b/akregator/src/storagedummyimpl.cpp @@ -24,9 +24,9 @@ #include "storagedummyimpl.h" #include "feedstoragedummyimpl.h" -#include <qmap.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqmap.h> +#include <tqstring.h> +#include <tqstringlist.h> namespace Akregator { namespace Backend { @@ -43,7 +43,7 @@ class StorageDummyImpl::StorageDummyImplPrivate FeedStorage* feedStorage; }; - void addEntry(const QString& url, int unread, int totalCount, int lastFetch) + void addEntry(const TQString& url, int unread, int totalCount, int lastFetch) { Entry entry; entry.unread = unread; @@ -53,9 +53,9 @@ class StorageDummyImpl::StorageDummyImplPrivate feeds[url] = entry; } - QString tagSet; - QString feedList; - QMap<QString, Entry> feeds; + TQString tagSet; + TQString feedList; + TQMap<TQString, Entry> feeds; }; StorageDummyImpl::StorageDummyImpl() : d(new StorageDummyImplPrivate) @@ -66,7 +66,7 @@ StorageDummyImpl::~StorageDummyImpl() { delete d; d = 0; } -void StorageDummyImpl::initialize(const QStringList&) {} +void StorageDummyImpl::initialize(const TQStringList&) {} bool StorageDummyImpl::open(bool /*autoCommit*/) { @@ -80,7 +80,7 @@ bool StorageDummyImpl::autoCommit() const bool StorageDummyImpl::close() { - for (QMap<QString, StorageDummyImplPrivate::Entry>::ConstIterator it = d->feeds.begin(); it != d->feeds.end(); ++it) + for (TQMap<TQString, StorageDummyImplPrivate::Entry>::ConstIterator it = d->feeds.begin(); it != d->feeds.end(); ++it) { (*it).feedStorage->close(); delete (*it).feedStorage; @@ -98,12 +98,12 @@ bool StorageDummyImpl::rollback() return true; } -int StorageDummyImpl::unreadFor(const QString &url) +int StorageDummyImpl::unreadFor(const TQString &url) { return d->feeds.contains(url) ? d->feeds[url].unread : 0; } -void StorageDummyImpl::setUnreadFor(const QString &url, int unread) +void StorageDummyImpl::setUnreadFor(const TQString &url, int unread) { if (!d->feeds.contains(url)) d->addEntry(url, unread, unread, 0); @@ -111,12 +111,12 @@ void StorageDummyImpl::setUnreadFor(const QString &url, int unread) d->feeds[url].unread = unread; } -int StorageDummyImpl::totalCountFor(const QString &url) +int StorageDummyImpl::totalCountFor(const TQString &url) { return d->feeds.contains(url) ? d->feeds[url].totalCount : 0; } -void StorageDummyImpl::setTotalCountFor(const QString &url, int total) +void StorageDummyImpl::setTotalCountFor(const TQString &url, int total) { if (!d->feeds.contains(url)) d->addEntry(url, 0, total, 0); @@ -124,12 +124,12 @@ void StorageDummyImpl::setTotalCountFor(const QString &url, int total) d->feeds[url].totalCount = total; } -int StorageDummyImpl::lastFetchFor(const QString& url) +int StorageDummyImpl::lastFetchFor(const TQString& url) { return d->feeds.contains(url) ? d->feeds[url].lastFetch : 0; } -void StorageDummyImpl::setLastFetchFor(const QString& url, int lastFetch) +void StorageDummyImpl::setLastFetchFor(const TQString& url, int lastFetch) { if (!d->feeds.contains(url)) d->addEntry(url, 0, 0, lastFetch); @@ -141,7 +141,7 @@ void StorageDummyImpl::slotCommit() { } -FeedStorage* StorageDummyImpl::archiveFor(const QString& url) +FeedStorage* StorageDummyImpl::archiveFor(const TQString& url) { if (!d->feeds.contains(url)) d->feeds[url].feedStorage = new FeedStorageDummyImpl(url, this); @@ -149,15 +149,15 @@ FeedStorage* StorageDummyImpl::archiveFor(const QString& url) return d->feeds[url].feedStorage; } -QStringList StorageDummyImpl::feeds() const +TQStringList StorageDummyImpl::feeds() const { return d->feeds.keys(); } void StorageDummyImpl::add(Storage* source) { - QStringList feeds = source->feeds(); - for (QStringList::ConstIterator it = feeds.begin(); it != feeds.end(); ++it) + TQStringList feeds = source->feeds(); + for (TQStringList::ConstIterator it = feeds.begin(); it != feeds.end(); ++it) { FeedStorage* fa = archiveFor(*it); fa->add(source->archiveFor(*it)); @@ -166,7 +166,7 @@ void StorageDummyImpl::add(Storage* source) void StorageDummyImpl::clear() { - for (QMap<QString, StorageDummyImplPrivate::Entry>::ConstIterator it = d->feeds.begin(); it != d->feeds.end(); ++it) + for (TQMap<TQString, StorageDummyImplPrivate::Entry>::ConstIterator it = d->feeds.begin(); it != d->feeds.end(); ++it) { delete (*it).feedStorage; } @@ -174,22 +174,22 @@ void StorageDummyImpl::clear() } -void StorageDummyImpl::storeFeedList(const QString& opmlStr) +void StorageDummyImpl::storeFeedList(const TQString& opmlStr) { d->feedList = opmlStr; } -QString StorageDummyImpl::restoreFeedList() const +TQString StorageDummyImpl::restoreFeedList() const { return d->feedList; } -void StorageDummyImpl::storeTagSet(const QString& xmlStr) +void StorageDummyImpl::storeTagSet(const TQString& xmlStr) { d->tagSet = xmlStr; } -QString StorageDummyImpl::restoreTagSet() const +TQString StorageDummyImpl::restoreTagSet() const { return d->tagSet; } diff --git a/akregator/src/storagedummyimpl.h b/akregator/src/storagedummyimpl.h index 497bcf01c..e5ef8cd81 100644 --- a/akregator/src/storagedummyimpl.h +++ b/akregator/src/storagedummyimpl.h @@ -43,7 +43,7 @@ class StorageDummyImpl : public Storage StorageDummyImpl(const StorageDummyImpl&); StorageDummyImpl &operator =(const StorageDummyImpl&); virtual ~StorageDummyImpl(); - virtual void initialize(const QStringList& params); + virtual void initialize(const TQStringList& params); /** * Open storage and prepare it for work. * @return true on success. @@ -71,21 +71,21 @@ class StorageDummyImpl : public Storage /** * @return Article archive for feed at given url. */ - virtual FeedStorage* archiveFor(const QString &url); + virtual FeedStorage* archiveFor(const TQString &url); virtual bool autoCommit() const; - virtual int unreadFor(const QString &url); - virtual void setUnreadFor(const QString &url, int unread); - virtual int totalCountFor(const QString &url); - virtual void setTotalCountFor(const QString &url, int total); - virtual int lastFetchFor(const QString& url); - virtual void setLastFetchFor(const QString& url, int lastFetch); - virtual QStringList feeds() const; - - virtual void storeFeedList(const QString& opmlStr); - virtual QString restoreFeedList() const; - - virtual void storeTagSet(const QString& xmlStr); - virtual QString restoreTagSet() const; + virtual int unreadFor(const TQString &url); + virtual void setUnreadFor(const TQString &url, int unread); + virtual int totalCountFor(const TQString &url); + virtual void setTotalCountFor(const TQString &url, int total); + virtual int lastFetchFor(const TQString& url); + virtual void setLastFetchFor(const TQString& url, int lastFetch); + virtual TQStringList feeds() const; + + virtual void storeFeedList(const TQString& opmlStr); + virtual TQString restoreFeedList() const; + + virtual void storeTagSet(const TQString& xmlStr); + virtual TQString restoreTagSet() const; /** adds all feed storages from a source to this storage existing articles are replaced diff --git a/akregator/src/storagefactory.h b/akregator/src/storagefactory.h index f95ab7d13..fbcd90074 100644 --- a/akregator/src/storagefactory.h +++ b/akregator/src/storagefactory.h @@ -42,10 +42,10 @@ class AKREGATOR_EXPORT StorageFactory /** identifier of the storage type, like "metakit", "postgres" etc. For use in configuration files. Must not contain spaces or special characters. */ - virtual QString key() const = 0; + virtual TQString key() const = 0; /** returns the (i18n'd) name of the storage type. */ - virtual QString name() const = 0; + virtual TQString name() const = 0; /** true if the plugin is configurable via a config dialog */ virtual bool isConfigurable() const = 0; @@ -63,7 +63,7 @@ class AKREGATOR_EXPORT StorageFactory /** creates a storage object with given parameters @param params list of implementation-specific parameters */ - virtual Storage* createStorage(const QStringList& params) const = 0; + virtual Storage* createStorage(const TQStringList& params) const = 0; }; } diff --git a/akregator/src/storagefactorydummyimpl.cpp b/akregator/src/storagefactorydummyimpl.cpp index 2f0bccfb9..70f5a956d 100644 --- a/akregator/src/storagefactorydummyimpl.cpp +++ b/akregator/src/storagefactorydummyimpl.cpp @@ -25,26 +25,26 @@ #include "storagedummyimpl.h" #include <klocale.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qwidget.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqwidget.h> namespace Akregator { namespace Backend { -Storage* StorageFactoryDummyImpl::createStorage(const QStringList& params) const +Storage* StorageFactoryDummyImpl::createStorage(const TQStringList& params) const { Storage* storage = new StorageDummyImpl; storage->initialize(params); return storage; } -QString StorageFactoryDummyImpl::key() const +TQString StorageFactoryDummyImpl::key() const { return "dummy"; } -QString StorageFactoryDummyImpl::name() const +TQString StorageFactoryDummyImpl::name() const { return i18n("No Archive"); } diff --git a/akregator/src/storagefactorydummyimpl.h b/akregator/src/storagefactorydummyimpl.h index ff04d6f67..abb4e599d 100644 --- a/akregator/src/storagefactorydummyimpl.h +++ b/akregator/src/storagefactorydummyimpl.h @@ -38,12 +38,12 @@ class Storage; class StorageFactoryDummyImpl : public StorageFactory { public: - virtual QString key() const; - virtual QString name() const; + virtual TQString key() const; + virtual TQString name() const; virtual void configure(); virtual bool isConfigurable() const { return false; } virtual bool allowsMultipleWriteAccess() const { return true; } - virtual Storage* createStorage(const QStringList& params) const; + virtual Storage* createStorage(const TQStringList& params) const; }; } diff --git a/akregator/src/storagefactoryregistry.cpp b/akregator/src/storagefactoryregistry.cpp index afe4422f2..a175df9da 100644 --- a/akregator/src/storagefactoryregistry.cpp +++ b/akregator/src/storagefactoryregistry.cpp @@ -27,9 +27,9 @@ #include <kstaticdeleter.h> -#include <qmap.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqmap.h> +#include <tqstring.h> +#include <tqstringlist.h> namespace Akregator { namespace Backend { @@ -37,7 +37,7 @@ namespace Backend { class StorageFactoryRegistry::StorageFactoryRegistryPrivate { public: - QMap<QString, StorageFactory*> map; + TQMap<TQString, StorageFactory*> map; }; StorageFactoryRegistry* StorageFactoryRegistry::m_instance = 0; @@ -50,7 +50,7 @@ StorageFactoryRegistry* StorageFactoryRegistry::self() return m_instance; } -bool StorageFactoryRegistry::registerFactory(StorageFactory* factory, const QString& typestr) +bool StorageFactoryRegistry::registerFactory(StorageFactory* factory, const TQString& typestr) { if (containsFactory(typestr)) return false; @@ -58,22 +58,22 @@ bool StorageFactoryRegistry::registerFactory(StorageFactory* factory, const QStr return true; } -void StorageFactoryRegistry::unregisterFactory(const QString& typestr) +void StorageFactoryRegistry::unregisterFactory(const TQString& typestr) { d->map.remove(typestr); } -StorageFactory* StorageFactoryRegistry::getFactory(const QString& typestr) +StorageFactory* StorageFactoryRegistry::getFactory(const TQString& typestr) { return d->map[typestr]; } -bool StorageFactoryRegistry::containsFactory(const QString& typestr) const +bool StorageFactoryRegistry::containsFactory(const TQString& typestr) const { return d->map.contains(typestr); } -QStringList StorageFactoryRegistry::list() const +TQStringList StorageFactoryRegistry::list() const { return d->map.keys(); } diff --git a/akregator/src/storagefactoryregistry.h b/akregator/src/storagefactoryregistry.h index e625c7e78..fde3191ac 100644 --- a/akregator/src/storagefactoryregistry.h +++ b/akregator/src/storagefactoryregistry.h @@ -42,11 +42,11 @@ class AKREGATOR_EXPORT StorageFactoryRegistry ~StorageFactoryRegistry(); - bool registerFactory(StorageFactory* factory, const QString& typestr); - void unregisterFactory(const QString& typestr); - StorageFactory* getFactory(const QString& typestr); - bool containsFactory(const QString& typestr) const; - QStringList list() const; + bool registerFactory(StorageFactory* factory, const TQString& typestr); + void unregisterFactory(const TQString& typestr); + StorageFactory* getFactory(const TQString& typestr); + bool containsFactory(const TQString& typestr) const; + TQStringList list() const; private: diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp index 561b93e5d..df969aacc 100644 --- a/akregator/src/tabwidget.cpp +++ b/akregator/src/tabwidget.cpp @@ -24,15 +24,15 @@ #include "tabwidget.h" -#include <qstyle.h> -#include <qapplication.h> -#include <qiconset.h> -#include <qclipboard.h> -#include <qmap.h> -#include <qptrdict.h> -#include <qstring.h> -#include <qtoolbutton.h> -#include <qtooltip.h> +#include <tqstyle.h> +#include <tqapplication.h> +#include <tqiconset.h> +#include <tqclipboard.h> +#include <tqmap.h> +#include <tqptrdict.h> +#include <tqstring.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> #include <kapplication.h> #include <kdebug.h> @@ -57,32 +57,32 @@ namespace Akregator { class TabWidget::TabWidgetPrivate { public: - QPtrDict<Frame> frames; + TQPtrDict<Frame> frames; uint CurrentMaxLength; - QWidget* currentItem; - QToolButton* tabsClose; + TQWidget* currentItem; + TQToolButton* tabsClose; }; -TabWidget::TabWidget(QWidget * parent, const char *name) +TabWidget::TabWidget(TQWidget * parent, const char *name) :KTabWidget(parent, name), d(new TabWidgetPrivate) { d->CurrentMaxLength = 30; d->currentItem = 0; setMinimumSize(250,150); setTabReorderingEnabled(false); - connect( this, SIGNAL( currentChanged(QWidget *) ), this, - SLOT( slotTabChanged(QWidget *) ) ); - connect(this, SIGNAL(closeRequest(QWidget*)), this, SLOT(slotCloseRequest(QWidget*))); + connect( this, TQT_SIGNAL( currentChanged(TQWidget *) ), this, + TQT_SLOT( slotTabChanged(TQWidget *) ) ); + connect(this, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(slotCloseRequest(TQWidget*))); setHoverCloseButton(Settings::closeButtonOnTabs()); - d->tabsClose = new QToolButton(this); - d->tabsClose->setAccel(QKeySequence("Ctrl+W")); - connect( d->tabsClose, SIGNAL( clicked() ), this, - SLOT( slotRemoveCurrentFrame() ) ); + d->tabsClose = new TQToolButton(this); + d->tabsClose->setAccel(TQKeySequence("Ctrl+W")); + connect( d->tabsClose, TQT_SIGNAL( clicked() ), this, + TQT_SLOT( slotRemoveCurrentFrame() ) ); d->tabsClose->setIconSet( SmallIconSet( "tab_remove" ) ); d->tabsClose->adjustSize(); - QToolTip::add(d->tabsClose, i18n("Close the current tab")); + TQToolTip::add(d->tabsClose, i18n("Close the current tab")); setCornerWidget( d->tabsClose, TopRight ); } @@ -117,21 +117,21 @@ void TabWidget::addFrame(Frame *f) return; d->frames.insert(f->widget(), f); addTab(f->widget(), f->title()); - connect(f, SIGNAL(titleChanged(Frame*, const QString& )), this, SLOT(slotSetTitle(Frame*, const QString& ))); + connect(f, TQT_SIGNAL(titleChanged(Frame*, const TQString& )), this, TQT_SLOT(slotSetTitle(Frame*, const TQString& ))); slotSetTitle(f, f->title()); } Frame *TabWidget::currentFrame() { - QWidget* w = currentPage(); + TQWidget* w = currentPage(); return w ? d->frames[w] : 0; } -QPtrList<Frame> TabWidget::frames() const +TQPtrList<Frame> TabWidget::frames() const { - QPtrList<Frame> result; - QPtrDictIterator<Frame> it(d->frames); + TQPtrList<Frame> result; + TQPtrDictIterator<Frame> it(d->frames); while (it.current()) { result.append(it.current()); @@ -141,7 +141,7 @@ QPtrList<Frame> TabWidget::frames() const return result; } -void TabWidget::slotTabChanged(QWidget *w) +void TabWidget::slotTabChanged(TQWidget *w) { // FIXME: Don't hardcode the tab position of main frame d->tabsClose->setDisabled(currentPageIndex() == 0); @@ -166,34 +166,34 @@ void TabWidget::removeFrame(Frame *f) uint TabWidget::tabBarWidthForMaxChars( uint maxLength ) { int hframe, overlap; - hframe = tabBar()->style().pixelMetric( QStyle::PM_TabBarTabHSpace, this ); - overlap = tabBar()->style().pixelMetric( QStyle::PM_TabBarTabOverlap, this ); + hframe = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabHSpace, this ); + overlap = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabOverlap, this ); - QFontMetrics fm = tabBar()->fontMetrics(); + TQFontMetrics fm = tabBar()->fontMetrics(); int x = 0; for( int i=0; i < count(); ++i ) { Frame *f=d->frames[page(i)]; - QString newTitle=f->title(); + TQString newTitle=f->title(); if ( newTitle.length() > maxLength ) newTitle = newTitle.left( maxLength-3 ) + "..."; - QTab* tab = tabBar()->tabAt( i ); + TQTab* tab = tabBar()->tabAt( i ); int lw = fm.width( newTitle ); int iw = 0; if ( tab->iconSet() ) - iw = tab->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width() + 4; + iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4; - x += ( tabBar()->style().sizeFromContents( QStyle::CT_TabBarTab, this, QSize( QMAX( lw + hframe + iw, QApplication::globalStrut().width() ), 0 ), QStyleOption( tab ) ) ).width(); + x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( QMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width(); } return x; } -void TabWidget::slotSetTitle(Frame* frame, const QString& title) +void TabWidget::slotSetTitle(Frame* frame, const TQString& title) { setTitle(title, frame->widget()); } -void TabWidget::setTitle( const QString &title , QWidget* sender) +void TabWidget::setTitle( const TQString &title , TQWidget* sender) { removeTabToolTip( sender ); @@ -211,7 +211,7 @@ void TabWidget::setTitle( const QString &title , QWidget* sender) if ( tabBarWidthForMaxChars( newMaxLength ) < maxTabBarWidth ) break; } - QString newTitle = title; + TQString newTitle = title; if ( newTitle.length() > newMaxLength ) { setTabToolTip( sender, newTitle ); @@ -243,13 +243,13 @@ void TabWidget::setTitle( const QString &title , QWidget* sender) } } -void TabWidget::contextMenu(int i, const QPoint &p) +void TabWidget::contextMenu(int i, const TQPoint &p) { - QWidget* w = ActionManager::getInstance()->container("tab_popup"); + TQWidget* w = ActionManager::getInstance()->container("tab_popup"); d->currentItem = page(i); //kdDebug() << indexOf(d->currentItem) << endl; if (w && indexOf(d->currentItem) != 0) - static_cast<QPopupMenu *>(w)->exec(p); + static_cast<TQPopupMenu *>(w)->exec(p); d->currentItem = 0; } @@ -321,7 +321,7 @@ void TabWidget::initiateDrag(int tab) } } -void TabWidget::slotCloseRequest(QWidget* widget) +void TabWidget::slotCloseRequest(TQWidget* widget) { if (d->frames.find(widget) != NULL) removeFrame(d->frames.find(widget)); diff --git a/akregator/src/tabwidget.h b/akregator/src/tabwidget.h index 854d27d2b..f3b529b97 100644 --- a/akregator/src/tabwidget.h +++ b/akregator/src/tabwidget.h @@ -25,7 +25,7 @@ #ifndef TABWIDGET_H #define TABWIDGET_H -#include <qptrlist.h> +#include <tqptrlist.h> #include <ktabwidget.h> class QString; @@ -40,17 +40,17 @@ class TabWidget : public KTabWidget Q_OBJECT public: - TabWidget(QWidget * parent = 0, const char *name = 0); + TabWidget(TQWidget * parent = 0, const char *name = 0); virtual ~TabWidget(); void addFrame(Frame *f); Frame* currentFrame(); void removeFrame(Frame *f); - QPtrList<Frame> frames() const; + TQPtrList<Frame> frames() const; public slots: - void slotSetTitle(Frame* frame, const QString& title); + void slotSetTitle(Frame* frame, const TQString& title); void slotSettingsChanged(); void slotNextTab(); void slotPreviousTab(); @@ -67,7 +67,7 @@ class TabWidget : public KTabWidget private: // methods uint tabBarWidthForMaxChars( uint maxLength ); - void setTitle( const QString &title , QWidget* sender); + void setTitle( const TQString &title , TQWidget* sender); private slots: @@ -75,9 +75,9 @@ class TabWidget : public KTabWidget void slotDetachTab(); void slotCopyLinkAddress(); void slotCloseTab(); - void slotCloseRequest(QWidget* widget); - void contextMenu (int item, const QPoint &p); - void slotTabChanged(QWidget *w); + void slotCloseRequest(TQWidget* widget); + void contextMenu (int item, const TQPoint &p); + void slotTabChanged(TQWidget *w); private: diff --git a/akregator/src/tag.cpp b/akregator/src/tag.cpp index 251c4e633..12cc7a7ff 100644 --- a/akregator/src/tag.cpp +++ b/akregator/src/tag.cpp @@ -26,20 +26,20 @@ #include "tag.h" #include "tagset.h" -#include <qstring.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> namespace Akregator { class Tag::TagPrivate : public Shared { public: - QString id; - QString name; - QString scheme; - QString icon; + TQString id; + TQString name; + TQString scheme; + TQString icon; - QValueList<TagSet*> tagSets; + TQValueList<TagSet*> tagSets; bool operator==(const TagPrivate& other) const { return id == other.id; // name is ignored! @@ -49,7 +49,7 @@ class Tag::TagPrivate : public Shared Tag::Tag() : d(new TagPrivate) {} -Tag::Tag(const QString& id, const QString& name, const QString& scheme) : d(new TagPrivate) +Tag::Tag(const TQString& id, const TQString& name, const TQString& scheme) : d(new TagPrivate) { d->id = id; d->name = name.isNull() ? id : name; @@ -57,7 +57,7 @@ Tag::Tag(const QString& id, const QString& name, const QString& scheme) : d(new d->icon = "rss_tag"; } -Tag Tag::fromCategory(const QString& term, const QString& scheme, const QString& name) +Tag Tag::fromCategory(const TQString& term, const TQString& scheme, const TQString& name) { Tag tag(scheme + "/" + term, name, scheme); return tag; @@ -106,38 +106,38 @@ bool Tag::isNull() const return d->id.isNull(); } -QString Tag::name() const +TQString Tag::name() const { return d->name; } -QString Tag::scheme() const +TQString Tag::scheme() const { return d->scheme; } -QString Tag::icon() const +TQString Tag::icon() const { return d->icon; } -void Tag::setIcon(const QString& icon) +void Tag::setIcon(const TQString& icon) { if (icon != d->icon) { d->icon = icon; - for (QValueList<TagSet*>::ConstIterator it = d->tagSets.begin(); it != d->tagSets.end(); ++it) + for (TQValueList<TagSet*>::ConstIterator it = d->tagSets.begin(); it != d->tagSets.end(); ++it) (*it)->tagUpdated(*this); } } -void Tag::setName(const QString& name) +void Tag::setName(const TQString& name) { if (name != d->name) { d->name = name; - for (QValueList<TagSet*>::ConstIterator it = d->tagSets.begin(); it != d->tagSets.end(); ++it) + for (TQValueList<TagSet*>::ConstIterator it = d->tagSets.begin(); it != d->tagSets.end(); ++it) (*it)->tagUpdated(*this); } } @@ -152,7 +152,7 @@ void Tag::removedFromTagSet(TagSet* tagSet) const d->tagSets.remove(tagSet); } -QString Tag::id() const +TQString Tag::id() const { return d->id; } diff --git a/akregator/src/tag.h b/akregator/src/tag.h index ebb3cf8eb..01c0f4e20 100644 --- a/akregator/src/tag.h +++ b/akregator/src/tag.h @@ -25,7 +25,7 @@ #ifndef AKREGATOR_TAG_H #define AKREGATOR_TAG_H -#include <qstring.h> +#include <tqstring.h> namespace Akregator { @@ -47,8 +47,8 @@ class Tag public: - /** creates a tag with given id, name and scheme. If name is QString::null, the id is used as name. If id is QString::null, the object is considered as NULL object (see isNull())*/ - Tag(const QString& id, const QString& name=QString::null, const QString& scheme=QString::null); + /** creates a tag with given id, name and scheme. If name is TQString::null, the id is used as name. If id is TQString::null, the object is considered as NULL object (see isNull())*/ + Tag(const TQString& id, const TQString& name=TQString::null, const TQString& scheme=TQString::null); /** creates a null tag (isNull() is @c true) */ Tag(); @@ -73,7 +73,7 @@ class Tag The @c id is built using 'scheme + "/" + term': The example gets id = "http://del.icio.us/tag/foo" @encode */ - static Tag fromCategory(const QString& term, const QString& scheme=QString::null, const QString& name=QString::null); + static Tag fromCategory(const TQString& term, const TQString& scheme=TQString::null, const TQString& name=TQString::null); virtual ~Tag(); @@ -82,18 +82,18 @@ class Tag bool isNull() const; /** tag identifier, used as key throughout the app and archive. Must be unique in the tag set. Can be an arbitrary unicode string, an URI etc. */ - QString id() const; + TQString id() const; /** user-visible name of the tag */ - QString name() const; + TQString name() const; /** (optional) classfication scheme this tag belongs to */ - QString scheme() const; + TQString scheme() const; - void setName(const QString& name); + void setName(const TQString& name); - QString icon() const; - void setIcon(const QString& icon); + TQString icon() const; + void setIcon(const TQString& icon); Tag& operator=(const Tag& other); diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp index 4222bf2d7..eba476c51 100644 --- a/akregator/src/tagaction.cpp +++ b/akregator/src/tagaction.cpp @@ -30,8 +30,8 @@ #include <kdebug.h> #include <kpopupmenu.h> -#include <qmap.h> -#include <qpopupmenu.h> +#include <tqmap.h> +#include <tqpopupmenu.h> namespace Akregator { @@ -40,17 +40,17 @@ class TagAction::TagActionPrivate { public: Tag tag; - //QMap<int, QPopupMenu*> idToPopup; - //QMap<QPopupMenu*, int> popupToId; + //TQMap<int, TQPopupMenu*> idToPopup; + //TQMap<TQPopupMenu*, int> popupToId; }; -TagAction::TagAction(const Tag& tag, const QObject *receiver, const char *slot, QObject *parent) -//KAction (const QString &text, const KShortcut &cut, const QObject *receiver, const char *slot, QObject *parent, const char *name=0) +TagAction::TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *parent) +//KAction (const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name=0) : KToggleAction(tag.name(), KShortcut(), 0, 0, parent), d(new TagActionPrivate) { d->tag = tag; - connect(this, SIGNAL(toggled(const Tag&, bool)), receiver, slot); - connect(this, SIGNAL(toggled(bool)), this, SLOT(slotToggled(bool))); + connect(this, TQT_SIGNAL(toggled(const Tag&, bool)), receiver, slot); + connect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled(bool))); } TagAction::~TagAction() @@ -65,11 +65,11 @@ Tag TagAction::tag() const } /* -void TagAction::unplug(QWidget* widget) +void TagAction::unplug(TQWidget* widget) { KToggleAction::unplug(widget); - QPopupMenu* popup = ::qt_cast<QPopupMenu *>(widget); + TQPopupMenu* popup = ::qt_cast<TQPopupMenu *>(widget); if (popup) { d->idToPopup.remove(d->popupToId[popup]); @@ -78,9 +78,9 @@ void TagAction::unplug(QWidget* widget) }*/ /* -int TagAction::plug(QWidget* widget, int index) +int TagAction::plug(TQWidget* widget, int index) { - QPopupMenu* popup = ::qt_cast<QPopupMenu *>( widget ); + TQPopupMenu* popup = ::qt_cast<TQPopupMenu *>( widget ); if (!popup) { kdWarning() << "Can not plug KToggleAction in " << widget->className() << endl; @@ -93,7 +93,7 @@ int TagAction::plug(QWidget* widget, int index) int id = popup->insertItem(TagMenuItem::checkBoxIconSet(isChecked(), popup->colorGroup()), item, -1, index); - popup->connectItem (id, this, SLOT(slotActivated())); + popup->connectItem (id, this, TQT_SLOT(slotActivated())); d->popupToId[popup] = id; d->idToPopup[id] = popup; diff --git a/akregator/src/tagaction.h b/akregator/src/tagaction.h index f4ecfe674..98ebcdc5b 100644 --- a/akregator/src/tagaction.h +++ b/akregator/src/tagaction.h @@ -41,11 +41,11 @@ class TagAction : public KToggleAction public: - TagAction(const Tag& tag, const QObject *receiver, const char *slot, QObject *parent=0); + TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *parent=0); virtual ~TagAction(); - //virtual int plug(QWidget *widget, int index=-1); - //virtual void unplug(QWidget* widget); + //virtual int plug(TQWidget *widget, int index=-1); + //virtual void unplug(TQWidget* widget); virtual Tag tag() const; diff --git a/akregator/src/tagfolder.cpp b/akregator/src/tagfolder.cpp index 2fb64b1c3..cc9583074 100644 --- a/akregator/src/tagfolder.cpp +++ b/akregator/src/tagfolder.cpp @@ -25,7 +25,7 @@ #include "tagfolder.h" #include "treenodevisitor.h" -#include <qdom.h> +#include <tqdom.h> namespace Akregator { @@ -33,7 +33,7 @@ class TagFolder::TagFolderPrivate { }; -TagFolder::TagFolder(const QString& title) : Folder(title), d(new TagFolderPrivate) +TagFolder::TagFolder(const TQString& title) : Folder(title), d(new TagFolderPrivate) { } @@ -52,9 +52,9 @@ bool TagFolder::accept(TreeNodeVisitor* visitor) return visitor->visitFolder(this); } -QDomElement TagFolder::toOPML( QDomElement /*parent*/, QDomDocument /*document*/ ) const +TQDomElement TagFolder::toOPML( TQDomElement /*parent*/, TQDomDocument /*document*/ ) const { - return QDomElement(); + return TQDomElement(); } } diff --git a/akregator/src/tagfolder.h b/akregator/src/tagfolder.h index 0ec027bc8..11437d637 100644 --- a/akregator/src/tagfolder.h +++ b/akregator/src/tagfolder.h @@ -38,12 +38,12 @@ class TagFolder : public Folder { public: - TagFolder(const QString& title = QString::null); + TagFolder(const TQString& title = TQString::null); virtual ~TagFolder(); virtual bool accept(TreeNodeVisitor* visitor); - virtual QDomElement toOPML( QDomElement parent, QDomDocument document ) const; + virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const; private: class TagFolderPrivate; diff --git a/akregator/src/tagfolderitem.cpp b/akregator/src/tagfolderitem.cpp index d3f0c8d5c..920827afe 100644 --- a/akregator/src/tagfolderitem.cpp +++ b/akregator/src/tagfolderitem.cpp @@ -27,7 +27,7 @@ #include "tagfolderitem.h" #include "treenode.h" -#include <qpopupmenu.h> +#include <tqpopupmenu.h> #include <kaction.h> #include <kiconloader.h> @@ -59,11 +59,11 @@ TagFolderItem::~TagFolderItem() {} -void TagFolderItem::showContextMenu(const QPoint& p) +void TagFolderItem::showContextMenu(const TQPoint& p) { - QWidget* w = ActionManager::getInstance()->container("tagfolder_popup"); + TQWidget* w = ActionManager::getInstance()->container("tagfolder_popup"); if (w) - static_cast<QPopupMenu *>(w)->exec(p); + static_cast<TQPopupMenu *>(w)->exec(p); } } diff --git a/akregator/src/tagfolderitem.h b/akregator/src/tagfolderitem.h index 8b30f0b1c..d80d19e59 100644 --- a/akregator/src/tagfolderitem.h +++ b/akregator/src/tagfolderitem.h @@ -29,7 +29,7 @@ #include "folderitem.h" #include "treenode.h" -#include <qpixmap.h> +#include <tqpixmap.h> class QPoint; @@ -48,7 +48,7 @@ public: virtual TagFolder* node(); - virtual void showContextMenu(const QPoint& p); + virtual void showContextMenu(const TQPoint& p); }; } diff --git a/akregator/src/tagnode.cpp b/akregator/src/tagnode.cpp index 9fd1ee5e6..b351d668f 100644 --- a/akregator/src/tagnode.cpp +++ b/akregator/src/tagnode.cpp @@ -31,9 +31,9 @@ #include "treenode.h" #include "treenodevisitor.h" -#include <qdom.h> -#include <qstring.h> -#include <qvaluelist.h> +#include <tqdom.h> +#include <tqstring.h> +#include <tqvaluelist.h> namespace Akregator { @@ -43,12 +43,12 @@ class TagNode::TagNodePrivate Filters::TagMatcher filter; TreeNode* observed; int unread; - QString icon; + TQString icon; Tag tag; - QValueList<Article> articles; - QValueList<Article> addedArticlesNotify; - QValueList<Article> removedArticlesNotify; - QValueList<Article> updatedArticlesNotify; + TQValueList<Article> articles; + TQValueList<Article> addedArticlesNotify; + TQValueList<Article> removedArticlesNotify; + TQValueList<Article> updatedArticlesNotify; }; TagNode::TagNode(const Tag& tag, TreeNode* observed) : d(new TagNodePrivate) @@ -60,16 +60,16 @@ TagNode::TagNode(const Tag& tag, TreeNode* observed) : d(new TagNodePrivate) d->observed = observed; d->unread = 0; - connect(observed, SIGNAL(signalDestroyed(TreeNode*)), this, SLOT(slotObservedDestroyed(TreeNode*))); - connect(observed, SIGNAL(signalArticlesAdded(TreeNode*, const QValueList<Article>&)), this, SLOT(slotArticlesAdded(TreeNode*, const QValueList<Article>&)) ); - connect(observed, SIGNAL(signalArticlesUpdated(TreeNode*, const QValueList<Article>&)), this, SLOT(slotArticlesUpdated(TreeNode*, const QValueList<Article>&)) ); - connect(observed, SIGNAL(signalArticlesRemoved(TreeNode*, const QValueList<Article>&)), this, SLOT(slotArticlesRemoved(TreeNode*, const QValueList<Article>&)) ); + connect(observed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotObservedDestroyed(TreeNode*))); + connect(observed, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) ); + connect(observed, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) ); + connect(observed, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) ); d->articles = observed->articles(tag.id()); calcUnread(); } -QString TagNode::icon() const +TQString TagNode::icon() const { return d->icon; } @@ -97,8 +97,8 @@ bool TagNode::accept(TreeNodeVisitor* visitor) void TagNode::calcUnread() { int unread = 0; - QValueList<Article>::Iterator en = d->articles.end(); - for (QValueList<Article>::Iterator it = d->articles.begin(); it != en; ++it) + TQValueList<Article>::Iterator en = d->articles.end(); + for (TQValueList<Article>::Iterator it = d->articles.begin(); it != en; ++it) if ((*it).status() != Article::Read) ++unread; if (d->unread != unread) @@ -120,20 +120,20 @@ int TagNode::totalCount() const } -QValueList<Article> TagNode::articles(const QString& tag) +TQValueList<Article> TagNode::articles(const TQString& tag) { return d->articles; } -QStringList TagNode::tags() const +TQStringList TagNode::tags() const { // TODO - return QStringList(); + return TQStringList(); } -QDomElement TagNode::toOPML( QDomElement parent, QDomDocument document ) const +TQDomElement TagNode::toOPML( TQDomElement parent, TQDomDocument document ) const { - return QDomElement(); + return TQDomElement(); } TreeNode* TagNode::next() @@ -160,8 +160,8 @@ void TagNode::slotDeleteExpiredArticles() void TagNode::slotMarkAllArticlesAsRead() { setNotificationMode(false); - QValueList<Article>::Iterator en = d->articles.end(); - for (QValueList<Article>::Iterator it = d->articles.begin(); it != en; ++it) + TQValueList<Article>::Iterator en = d->articles.end(); + for (TQValueList<Article>::Iterator it = d->articles.begin(); it != en; ++it) (*it).setStatus(Article::Read); setNotificationMode(true); } @@ -191,10 +191,10 @@ void TagNode::doArticleNotification() TreeNode::doArticleNotification(); } -void TagNode::slotArticlesAdded(TreeNode* node, const QValueList<Article>& list) +void TagNode::slotArticlesAdded(TreeNode* node, const TQValueList<Article>& list) { bool added = false; - for (QValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it) + for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it) { if (!d->articles.contains(*it) && d->filter.matches(*it)) { @@ -211,10 +211,10 @@ void TagNode::slotArticlesAdded(TreeNode* node, const QValueList<Article>& list) } } -void TagNode::slotArticlesUpdated(TreeNode* node, const QValueList<Article>& list) +void TagNode::slotArticlesUpdated(TreeNode* node, const TQValueList<Article>& list) { bool updated = false; - for (QValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it) + for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it) { if (d->articles.contains(*it)) { @@ -247,10 +247,10 @@ void TagNode::slotArticlesUpdated(TreeNode* node, const QValueList<Article>& lis } } -void TagNode::slotArticlesRemoved(TreeNode* node, const QValueList<Article>& list) +void TagNode::slotArticlesRemoved(TreeNode* node, const TQValueList<Article>& list) { bool removed = false; - for (QValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it) + for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it) { if (d->articles.contains(*it)) { @@ -266,7 +266,7 @@ void TagNode::slotArticlesRemoved(TreeNode* node, const QValueList<Article>& lis } } -void TagNode::setTitle(const QString& title) +void TagNode::setTitle(const TQString& title) { if (d->tag.name() != title) d->tag.setName(title); diff --git a/akregator/src/tagnode.h b/akregator/src/tagnode.h index 51ee4879c..df66c4b5c 100644 --- a/akregator/src/tagnode.h +++ b/akregator/src/tagnode.h @@ -61,7 +61,7 @@ public: virtual Tag tag() const; - virtual QString icon() const; + virtual TQString icon() const; /** The unread count, returns the number of new/unread articles in the node (for groups: the accumulated count of the subtree) @return number of new/unread articles */ @@ -79,11 +79,11 @@ public: If @c tag is not null, only articles tagged with @c tag are returned @return sequence of articles */ - virtual QValueList<Article> articles(const QString& tag=QString::null); + virtual TQValueList<Article> articles(const TQString& tag=TQString::null); /** returns a list of all tags occurring in this node (sub tree for folders) */ - virtual QStringList tags() const; + virtual TQStringList tags() const; /** Helps the rest of the app to decide if node should be handled as group or not. Only use where necessary, use polymorphism where possible. @return whether the node is a feed group or not */ @@ -92,14 +92,14 @@ public: /** reimplemented to return an invalid element */ - virtual QDomElement toOPML( QDomElement parent, QDomDocument document ) const; + virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const; /** returns the next node in the tree. Calling next() unless it returns 0 iterates through the tree in pre-order */ virtual TreeNode* next(); - virtual void setTitle(const QString& title); + virtual void setTitle(const TQString& title); /** called by @c TagNodeList when the tag of this node was changed */ virtual void tagChanged(); @@ -116,9 +116,9 @@ public slots: /** does nothing for TagNode */ virtual void slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly=false); - virtual void slotArticlesAdded(TreeNode* node, const QValueList<Article>& list); - virtual void slotArticlesUpdated(TreeNode* node, const QValueList<Article>& list); - virtual void slotArticlesRemoved(TreeNode* node, const QValueList<Article>& list); + virtual void slotArticlesAdded(TreeNode* node, const TQValueList<Article>& list); + virtual void slotArticlesUpdated(TreeNode* node, const TQValueList<Article>& list); + virtual void slotArticlesRemoved(TreeNode* node, const TQValueList<Article>& list); virtual void slotObservedDestroyed(TreeNode* node); protected: diff --git a/akregator/src/tagnodeitem.cpp b/akregator/src/tagnodeitem.cpp index 70f2c90fd..265ec5f78 100644 --- a/akregator/src/tagnodeitem.cpp +++ b/akregator/src/tagnodeitem.cpp @@ -30,8 +30,8 @@ #include <kaction.h> #include <kiconloader.h> -#include <qpoint.h> -#include <qpopupmenu.h> +#include <tqpoint.h> +#include <tqpopupmenu.h> namespace Akregator { @@ -77,11 +77,11 @@ TagNode* TagNodeItem::node() return static_cast<TagNode*> (m_node); } -void TagNodeItem::showContextMenu(const QPoint& p) +void TagNodeItem::showContextMenu(const TQPoint& p) { - QWidget* w = ActionManager::getInstance()->container("tagnode_popup"); + TQWidget* w = ActionManager::getInstance()->container("tagnode_popup"); if (w) - static_cast<QPopupMenu *>(w)->exec(p); + static_cast<TQPopupMenu *>(w)->exec(p); } TagNodeItem::~TagNodeItem() diff --git a/akregator/src/tagnodeitem.h b/akregator/src/tagnodeitem.h index 95a995c45..f9ef1b1ba 100644 --- a/akregator/src/tagnodeitem.h +++ b/akregator/src/tagnodeitem.h @@ -45,7 +45,7 @@ public: virtual void nodeChanged(); virtual TagNode* node(); - virtual void showContextMenu(const QPoint& p); + virtual void showContextMenu(const TQPoint& p); private: void initialize(TagNode* node); diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp index 5a2822bbb..c53e5be3b 100644 --- a/akregator/src/tagnodelist.cpp +++ b/akregator/src/tagnodelist.cpp @@ -30,10 +30,10 @@ #include "folder.h" #include "tagfolder.h" -#include <qdom.h> -#include <qmap.h> -#include <qstring.h> -#include <qvaluelist.h> +#include <tqdom.h> +#include <tqmap.h> +#include <tqstring.h> +#include <tqvaluelist.h> #include <kapplication.h> #include <klocale.h> @@ -45,7 +45,7 @@ class TagNodeList::TagNodeListPrivate public: FeedList* feedList; TagSet* tagSet; - QMap<QString, TagNode*> tagIdToNodeMap; + TQMap<TQString, TagNode*> tagIdToNodeMap; }; FeedList* TagNodeList::feedList() const @@ -58,14 +58,14 @@ TagNodeList::TagNodeList(FeedList* feedList, TagSet* tagSet) : NodeList(), d(ne d->feedList = feedList; d->tagSet = tagSet; - 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, SIGNAL(signalTagUpdated(const Tag&)), this, SLOT(slotTagUpdated(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&))); + connect(d->tagSet, TQT_SIGNAL(signalTagUpdated(const Tag&)), this, TQT_SLOT(slotTagUpdated(const Tag&))); setRootNode(new TagFolder(i18n("My Tags"))); - 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) { insert(new TagNode(*it, d->feedList->rootNode())); } @@ -83,7 +83,7 @@ TagFolder* TagNodeList::rootNode() const return static_cast<TagFolder*>(NodeList::rootNode()); } -TagNode* TagNodeList::findByTagID(const QString& tagID) +TagNode* TagNodeList::findByTagID(const TQString& tagID) { return d->tagIdToNodeMap[tagID]; } @@ -91,7 +91,7 @@ TagNode* TagNodeList::findByTagID(const QString& tagID) bool TagNodeList::insert(TagNode* tagNode) { tagNode->setId(KApplication::random()); - QString id = tagNode->tag().id(); + TQString id = tagNode->tag().id(); if (!containsTagId(id)) { rootNode()->appendChild(tagNode); // TODO: maintain sorting @@ -104,7 +104,7 @@ bool TagNodeList::insert(TagNode* tagNode) bool TagNodeList::remove(TagNode* tagNode) { - QString id = tagNode->tag().id(); + TQString id = tagNode->tag().id(); if (containsTagId(id)) { rootNode()->removeChild(tagNode); @@ -118,7 +118,7 @@ bool TagNodeList::remove(TagNode* tagNode) void TagNodeList::slotNodeDestroyed(TreeNode* node) { TagNode* tagNode = dynamic_cast<TagNode*>(node); - QString id = tagNode ? tagNode->tag().id() : QString::null; + TQString id = tagNode ? tagNode->tag().id() : TQString::null; if (tagNode != 0 && containsTagId(id)) { @@ -133,7 +133,7 @@ void TagNodeList::slotNodeAdded(TreeNode* node) NodeList::slotNodeAdded(node); TagNode* tagNode = dynamic_cast<TagNode*>(node); - QString id = tagNode ? tagNode->tag().id() : QString::null; + TQString id = tagNode ? tagNode->tag().id() : TQString::null; if (tagNode != 0L && !containsTagId(id)) { @@ -147,7 +147,7 @@ void TagNodeList::slotNodeRemoved(Folder* parent, TreeNode* node) NodeList::slotNodeRemoved(parent, node); TagNode* tagNode = dynamic_cast<TagNode*>(node); - QString id = tagNode ? tagNode->tag().id() : QString::null; + TQString id = tagNode ? tagNode->tag().id() : TQString::null; if (parent == rootNode() && tagNode != 0L && containsTagId(id)) { @@ -156,24 +156,24 @@ void TagNodeList::slotNodeRemoved(Folder* parent, TreeNode* node) } } -bool TagNodeList::containsTagId(const QString& tagId) +bool TagNodeList::containsTagId(const TQString& tagId) { return d->tagIdToNodeMap.contains(tagId); } -QValueList<TagNode*> TagNodeList::toList() const +TQValueList<TagNode*> TagNodeList::toList() const { return d->tagIdToNodeMap.values(); } -bool TagNodeList::readFromXML(const QDomDocument& doc) +bool TagNodeList::readFromXML(const TQDomDocument& doc) { return false; // TODO } -QDomDocument TagNodeList::toXML() const +TQDomDocument TagNodeList::toXML() const { - return QDomDocument(); + return TQDomDocument(); } void TagNodeList::slotTagAdded(const Tag& tag) diff --git a/akregator/src/tagnodelist.h b/akregator/src/tagnodelist.h index 421506db4..64d2048f4 100644 --- a/akregator/src/tagnodelist.h +++ b/akregator/src/tagnodelist.h @@ -53,13 +53,13 @@ namespace Akregator { FeedList* feedList() const; bool insert(TagNode* tagNode); bool remove(TagNode* tagNode); - bool containsTagId(const QString& tagId); - QValueList<TagNode*> toList() const; + bool containsTagId(const TQString& tagId); + TQValueList<TagNode*> toList() const; - TagNode* findByTagID(const QString& tagID); + TagNode* findByTagID(const TQString& tagID); - virtual bool readFromXML(const QDomDocument& doc); - virtual QDomDocument toXML() const; + virtual bool readFromXML(const TQDomDocument& doc); + virtual TQDomDocument toXML() const; virtual TagFolder* rootNode() const; diff --git a/akregator/src/tagpropertiesdialog.cpp b/akregator/src/tagpropertiesdialog.cpp index 62f432275..ea4848c41 100644 --- a/akregator/src/tagpropertiesdialog.cpp +++ b/akregator/src/tagpropertiesdialog.cpp @@ -25,7 +25,7 @@ #include <kicondialog.h> #include <klocale.h> -#include <qlineedit.h> +#include <tqlineedit.h> #include "tag.h" #include "tagpropertiesdialog.h" @@ -40,14 +40,14 @@ class TagPropertiesDialog::TagPropertiesDialogPrivate TagPropertiesWidgetBase* widget; }; -TagPropertiesDialog::TagPropertiesDialog(QWidget *parent, const char *name) : KDialogBase(KDialogBase::Swallow, Qt::WStyle_DialogBorder, parent, name, true, i18n("Tag Properties"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Apply), d(new TagPropertiesDialogPrivate) +TagPropertiesDialog::TagPropertiesDialog(TQWidget *parent, const char *name) : KDialogBase(KDialogBase::Swallow, Qt::WStyle_DialogBorder, parent, name, true, i18n("Tag Properties"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Apply), d(new TagPropertiesDialogPrivate) { d->widget = new TagPropertiesWidgetBase(this); setMainWidget(d->widget); d->widget->le_title->setFocus(); enableButtonOK(false); enableButtonApply(false); - connect(d->widget->le_title, SIGNAL(textChanged(const QString&)), this, SLOT(slotTextChanged(const QString& ))); + connect(d->widget->le_title, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotTextChanged(const TQString& ))); } TagPropertiesDialog::~TagPropertiesDialog() @@ -72,7 +72,7 @@ void TagPropertiesDialog::slotOk() KDialogBase::slotOk(); } -void TagPropertiesDialog::slotTextChanged(const QString& text) +void TagPropertiesDialog::slotTextChanged(const TQString& text) { enableButtonOK(!text.isEmpty()); enableButtonApply(!text.isEmpty()); diff --git a/akregator/src/tagpropertiesdialog.h b/akregator/src/tagpropertiesdialog.h index e9bcdb30c..503b6f0e0 100644 --- a/akregator/src/tagpropertiesdialog.h +++ b/akregator/src/tagpropertiesdialog.h @@ -37,7 +37,7 @@ class TagPropertiesDialog : public KDialogBase public: - TagPropertiesDialog(QWidget *parent=0, const char *name=0); + TagPropertiesDialog(TQWidget *parent=0, const char *name=0); virtual ~TagPropertiesDialog(); void setTag(const Tag& tag); @@ -46,7 +46,7 @@ class TagPropertiesDialog : public KDialogBase virtual void slotOk(); virtual void slotApply(); - virtual void slotTextChanged(const QString& text); + virtual void slotTextChanged(const TQString& text); private: class TagPropertiesDialogPrivate; diff --git a/akregator/src/tagset.cpp b/akregator/src/tagset.cpp index 24cb09faf..e3a8d60ec 100644 --- a/akregator/src/tagset.cpp +++ b/akregator/src/tagset.cpp @@ -25,27 +25,27 @@ #include "tag.h" #include "tagset.h" -#include <qdom.h> -#include <qmap.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqdom.h> +#include <tqmap.h> +#include <tqstring.h> +#include <tqstringlist.h> namespace Akregator { class TagSet::TagSetPrivate { public: - QMap<QString,Tag> map; + TQMap<TQString,Tag> map; }; -TagSet::TagSet(QObject* parent) : QObject(parent), d(new TagSetPrivate) +TagSet::TagSet(TQObject* parent) : TQObject(parent), d(new TagSetPrivate) { } TagSet::~TagSet() { - QValueList<Tag> tags = d->map.values(); - for (QValueList<Tag>::Iterator it = tags.begin(); it != tags.end(); ++it) + TQValueList<Tag> tags = d->map.values(); + for (TQValueList<Tag>::Iterator it = tags.begin(); it != tags.end(); ++it) (*it).removedFromTagSet(this); delete d; @@ -72,7 +72,7 @@ void TagSet::remove(const Tag& tag) } } -bool TagSet::containsID(const QString& id) const +bool TagSet::containsID(const TQString& id) const { return d->map.contains(id); } @@ -82,38 +82,38 @@ bool TagSet::contains(const Tag& tag) const return d->map.contains(tag.id()); } -Tag TagSet::findByID(const QString& id) const +Tag TagSet::findByID(const TQString& id) const { return d->map.contains(id) ? d->map[id] : Tag(); } -QMap<QString,Tag> TagSet::toMap() const +TQMap<TQString,Tag> TagSet::toMap() const { return d->map; } -void TagSet::readFromXML(const QDomDocument& doc) +void TagSet::readFromXML(const TQDomDocument& doc) { - QDomElement root = doc.documentElement(); + TQDomElement root = doc.documentElement(); if (root.isNull()) return; - QDomNodeList list = root.elementsByTagName(QString::fromLatin1("tag")); + TQDomNodeList list = root.elementsByTagName(TQString::fromLatin1("tag")); for (uint i = 0; i < list.length(); ++i) { - QDomElement e = list.item(i).toElement(); + TQDomElement e = list.item(i).toElement(); if (!e.isNull()) { - if (e.hasAttribute(QString::fromLatin1("id"))) + if (e.hasAttribute(TQString::fromLatin1("id"))) { - QString id = e.attribute(QString::fromLatin1("id")); - QString name = e.text(); - QString scheme = e.attribute(QString::fromLatin1("scheme")); + TQString id = e.attribute(TQString::fromLatin1("id")); + TQString name = e.text(); + TQString scheme = e.attribute(TQString::fromLatin1("scheme")); Tag tag(id, name, scheme); - QString icon = e.attribute(QString::fromLatin1("icon")); + TQString icon = e.attribute(TQString::fromLatin1("icon")); if (!icon.isEmpty()) tag.setIcon(icon); @@ -129,27 +129,27 @@ void TagSet::tagUpdated(const Tag& tag) emit signalTagUpdated(tag); } -QDomDocument TagSet::toXML() const +TQDomDocument TagSet::toXML() const { - QDomDocument doc; + TQDomDocument doc; doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) ); - QDomElement root = doc.createElement("tagSet"); + TQDomElement root = doc.createElement("tagSet"); root.setAttribute( "version", "0.1" ); doc.appendChild(root); - QValueList<Tag> list = d->map.values(); - for (QValueList<Tag>::ConstIterator it = list.begin(); it != list.end(); ++it) + TQValueList<Tag> list = d->map.values(); + for (TQValueList<Tag>::ConstIterator it = list.begin(); it != list.end(); ++it) { - QDomElement tn = doc.createElement("tag"); + TQDomElement tn = doc.createElement("tag"); - QDomText text = doc.createTextNode((*it).name()); - tn.setAttribute(QString::fromLatin1("id"),(*it).id()); + TQDomText text = doc.createTextNode((*it).name()); + tn.setAttribute(TQString::fromLatin1("id"),(*it).id()); if (!(*it).scheme().isEmpty()) - tn.setAttribute(QString::fromLatin1("scheme"),(*it).scheme()); + tn.setAttribute(TQString::fromLatin1("scheme"),(*it).scheme()); if (!(*it).icon().isEmpty()) - tn.setAttribute(QString::fromLatin1("icon"),(*it).icon()); + tn.setAttribute(TQString::fromLatin1("icon"),(*it).icon()); tn.appendChild(text); root.appendChild(tn); } diff --git a/akregator/src/tagset.h b/akregator/src/tagset.h index 0c0a2009e..be4bbdd93 100644 --- a/akregator/src/tagset.h +++ b/akregator/src/tagset.h @@ -25,7 +25,7 @@ #ifndef AKREGATOR_TAGSET_H #define AKREGATOR_TAGSET_H -#include <qobject.h> +#include <tqobject.h> class QDomDocument; template <class K,class T> class QMap; @@ -50,7 +50,7 @@ class TagSet : public QObject Q_OBJECT public: - TagSet(QObject* parent=0); + TagSet(TQObject* parent=0); virtual ~TagSet(); /** adds a tag to the tag set. The tag set will emit signalTagAdded */ @@ -60,20 +60,20 @@ class TagSet : public QObject void remove(const Tag& tag); /** returns the tag set as map ((id, Tag) pairs) */ - QMap<QString,Tag> toMap() const; + TQMap<TQString,Tag> toMap() const; /** returns @c true if this set contains @c tag */ bool contains(const Tag& tag) const; /** returns @c true if this set contains a tag with a given ID */ - bool containsID(const QString& id) const; + bool containsID(const TQString& id) const; /** returns the tag with the given ID if the tag is element of the set, or a null tag if not */ - Tag findByID(const QString& id) const; + Tag findByID(const TQString& id) const; /** reads tag set from XML see toXML() for an explanation of the format */ - void readFromXML(const QDomDocument& doc); + void readFromXML(const TQDomDocument& doc); /** returns an XML representation of the tag set. The root element is @c <tagSet>, a tag ("someID", "someName") is represented as @@ -87,7 +87,7 @@ class TagSet : public QObject </tagSet> \endcode */ - QDomDocument toXML() const; + TQDomDocument toXML() const; signals: /** emitted when a tag was added to this tag set */ diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp index 4b4f3153b..680f88ca4 100644 --- a/akregator/src/trayicon.cpp +++ b/akregator/src/trayicon.cpp @@ -36,10 +36,10 @@ #include <kpopupmenu.h> #include <kiconloader.h> -#include <qbitmap.h> -#include <qpainter.h> -#include <qfont.h> -#include <qtooltip.h> +#include <tqbitmap.h> +#include <tqpainter.h> +#include <tqfont.h> +#include <tqtooltip.h> namespace Akregator { @@ -57,15 +57,15 @@ void TrayIcon::setInstance(TrayIcon* trayIcon) } -TrayIcon::TrayIcon(QWidget *parent, const char *name) +TrayIcon::TrayIcon(TQWidget *parent, const char *name) : KSystemTray(parent, name), m_unread(0) { m_defaultIcon=KSystemTray::loadIcon("akregator"); - QPixmap m_unreadIcon=KSystemTray::loadIcon("akregator_empty"); + TQPixmap m_unreadIcon=KSystemTray::loadIcon("akregator_empty"); m_lightIconImage=m_unreadIcon.convertToImage(); KIconEffect::deSaturate(m_lightIconImage, 0.60); setPixmap(m_defaultIcon); - QToolTip::add(this, i18n("Akregator - RSS Feed Reader")); + TQToolTip::add(this, i18n("Akregator - RSS Feed Reader")); } @@ -73,7 +73,7 @@ TrayIcon::~TrayIcon() {} -void TrayIcon::mousePressEvent(QMouseEvent *e) { +void TrayIcon::mousePressEvent(TQMouseEvent *e) { if (e->button() == LeftButton) { emit showPart(); } @@ -82,9 +82,9 @@ void TrayIcon::mousePressEvent(QMouseEvent *e) { } -QPixmap TrayIcon::takeScreenshot() const +TQPixmap TrayIcon::takeScreenshot() const { - QPoint g = mapToGlobal(pos()); + TQPoint g = mapToGlobal(pos()); int desktopWidth = kapp->desktop()->width(); int desktopHeight = kapp->desktop()->height(); int tw = width(); @@ -103,19 +103,19 @@ QPixmap TrayIcon::takeScreenshot() const y = desktopHeight - h; // Grab the desktop and draw a circle arround the icon: - QPixmap shot = QPixmap::grabWindow(qt_xrootwin(), x, y, w, h); - QPainter painter(&shot); + TQPixmap shot = TQPixmap::grabWindow(qt_xrootwin(), x, y, w, h); + TQPainter painter(&shot); const int MARGINS = 6; const int WIDTH = 3; int ax = g.x() - x - MARGINS -1; int ay = g.y() - y - MARGINS -1; - painter.setPen( QPen(Qt::red/*KApplication::palette().active().highlight()*/, WIDTH) ); + painter.setPen( TQPen(Qt::red/*KApplication::palette().active().highlight()*/, WIDTH) ); painter.drawArc(ax, ay, tw + 2*MARGINS, th + 2*MARGINS, 0, 16*360); painter.end(); // Paint the border const int BORDER = 1; - QPixmap finalShot(w + 2*BORDER, h + 2*BORDER); + TQPixmap finalShot(w + 2*BORDER, h + 2*BORDER); finalShot.fill(KApplication::palette().active().foreground()); painter.begin(&finalShot); painter.drawPixmap(BORDER, BORDER, shot); @@ -130,8 +130,8 @@ void TrayIcon::slotSetUnread(int unread) m_unread=unread; - QToolTip::remove(this); - QToolTip::add(this, i18n("Akregator - 1 unread article", "Akregator - %n unread articles", unread > 0 ? unread : 0)); + TQToolTip::remove(this); + TQToolTip::add(this, i18n("Akregator - 1 unread article", "Akregator - %n unread articles", unread > 0 ? unread : 0)); if (unread <= 0) { @@ -143,11 +143,11 @@ void TrayIcon::slotSetUnread(int unread) int oldW = pixmap()->size().width(); int oldH = pixmap()->size().height(); - QString uStr=QString::number( unread ); - QFont f=KGlobalSettings::generalFont(); + TQString uStr=TQString::number( unread ); + TQFont f=KGlobalSettings::generalFont(); f.setBold(true); float pointSize=f.pointSizeFloat(); - QFontMetrics fm(f); + TQFontMetrics fm(f); int w=fm.width(uStr); if( w > (oldW) ) { @@ -155,21 +155,21 @@ void TrayIcon::slotSetUnread(int unread) f.setPointSizeFloat(pointSize); } - QPixmap pix(oldW, oldH); + TQPixmap pix(oldW, oldH); pix.fill(Qt::white); - QPainter p(&pix); + TQPainter p(&pix); p.setFont(f); p.setPen(Qt::blue); p.drawText(pix.rect(), Qt::AlignCenter, uStr); pix.setMask(pix.createHeuristicMask()); - QImage img=pix.convertToImage(); + TQImage img=pix.convertToImage(); // overlay - QImage overlayImg=m_lightIconImage.copy(); + TQImage overlayImg=m_lightIconImage.copy(); KIconEffect::overlay(overlayImg, img); - QPixmap icon; + TQPixmap icon; icon.convertFromImage(overlayImg); setPixmap(icon); } @@ -177,7 +177,7 @@ void TrayIcon::slotSetUnread(int unread) void TrayIcon::viewButtonClicked() { - QWidget *p=static_cast<QWidget*>(parent()); + TQWidget *p=static_cast<TQWidget*>(parent()); KWin::forceActiveWindow(p->winId()); } diff --git a/akregator/src/trayicon.h b/akregator/src/trayicon.h index f294ab9b6..ac742ae6a 100644 --- a/akregator/src/trayicon.h +++ b/akregator/src/trayicon.h @@ -27,8 +27,8 @@ #include <ksystemtray.h> -#include <qimage.h> -#include <qpixmap.h> +#include <tqimage.h> +#include <tqpixmap.h> namespace Akregator { @@ -39,11 +39,11 @@ namespace Akregator static TrayIcon* getInstance(); static void setInstance(TrayIcon* trayIcon); - TrayIcon(QWidget *parent = 0, const char *name = 0); + TrayIcon(TQWidget *parent = 0, const char *name = 0); ~TrayIcon(); - QPixmap takeScreenshot() const; - virtual void mousePressEvent(QMouseEvent *); + TQPixmap takeScreenshot() const; + virtual void mousePressEvent(TQMouseEvent *); public slots: void settingsChanged(); void slotSetUnread(int unread); @@ -55,8 +55,8 @@ namespace Akregator private: static TrayIcon* m_instance; - QPixmap m_defaultIcon; - QImage m_lightIconImage; + TQPixmap m_defaultIcon; + TQImage m_lightIconImage; int m_unread; }; } diff --git a/akregator/src/treenode.cpp b/akregator/src/treenode.cpp index 85bf3c5ee..5aa316865 100644 --- a/akregator/src/treenode.cpp +++ b/akregator/src/treenode.cpp @@ -25,8 +25,8 @@ #include "folder.h" #include "treenode.h" -#include <qstring.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> #include <kdebug.h> @@ -39,14 +39,14 @@ class TreeNode::TreeNodePrivate bool doNotify; bool nodeChangeOccurred; bool articleChangeOccurred; - QString title; + TQString title; Folder* parent; uint id; bool signalDestroyedEmitted; }; TreeNode::TreeNode() - : QObject(0, 0), d(new TreeNodePrivate) + : TQObject(0, 0), d(new TreeNodePrivate) { d->doNotify = true; d->nodeChangeOccurred = false; @@ -74,12 +74,12 @@ TreeNode::~TreeNode() d = 0; } -const QString& TreeNode::title() const +const TQString& TreeNode::title() const { return d->title; } -void TreeNode::setTitle(const QString& title) +void TreeNode::setTitle(const TQString& title) { if (d->title != title) @@ -93,7 +93,7 @@ TreeNode* TreeNode::nextSibling() const { if (!d->parent) return 0; - QValueList<TreeNode*> children = d->parent->children(); + TQValueList<TreeNode*> children = d->parent->children(); TreeNode* me = (TreeNode*)this; int idx = children.findIndex(me); @@ -105,7 +105,7 @@ TreeNode* TreeNode::prevSibling() const { if (!d->parent) return 0; - QValueList<TreeNode*> children = d->parent->children(); + TQValueList<TreeNode*> children = d->parent->children(); TreeNode* me = (TreeNode*)this; int idx = children.findIndex(me); diff --git a/akregator/src/treenode.h b/akregator/src/treenode.h index fd25f05cb..43ac418d5 100644 --- a/akregator/src/treenode.h +++ b/akregator/src/treenode.h @@ -26,7 +26,7 @@ #ifndef AKREGATORTREENODE_H #define AKREGATORTREENODE_H -#include <qobject.h> +#include <tqobject.h> class QDomDocument; class QDomElement; @@ -77,14 +77,14 @@ public: /** Get title of node. @return the title of the node */ - virtual const QString& title() const; + virtual const TQString& title() const; /** Sets the title of the node. @c title should not contain entities. @param title the title string */ - virtual void setTitle(const QString& title); + virtual void setTitle(const TQString& title); /** Get the next sibling. @@ -115,11 +115,11 @@ public: If @c tag is not null, only articles tagged with @c tag are returned @return sequence of articles */ - virtual QValueList<Article> articles(const QString& tag=QString::null) = 0; + virtual TQValueList<Article> articles(const TQString& tag=TQString::null) = 0; /** returns a list of all tags occurring in this node (sub tree for folders) */ - virtual QStringList tags() const = 0; + virtual TQStringList tags() const = 0; /** Helps the rest of the app to decide if node should be handled as group or not. Only use where necessary, use polymorphism where possible. @return whether the node is a feed group or not */ @@ -130,7 +130,7 @@ public: @param parent the dom element the child node will be attached to @param document the opml document */ - virtual QDomElement toOPML( QDomElement parent, QDomDocument document ) const = 0; + virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const = 0; /** @param doNotify notification on changes on/off flag @@ -182,13 +182,13 @@ signals: @param node the node articles were added to @param guids the guids of the articles added */ - void signalArticlesAdded(TreeNode* node, const QValueList<Article>& guids); + void signalArticlesAdded(TreeNode* node, const TQValueList<Article>& guids); /** emitted when articles were updated */ - void signalArticlesUpdated(TreeNode*, const QValueList<Article>& guids); + void signalArticlesUpdated(TreeNode*, const TQValueList<Article>& guids); /** emitted when articles were removed from this subtree. Note that this has nothing to do with actual article deletion! The article might have moved somewhere else in the tree, e.g. if the user moved the feed */ - void signalArticlesRemoved(TreeNode*, const QValueList<Article>& guids); + void signalArticlesRemoved(TreeNode*, const TQValueList<Article>& guids); protected: diff --git a/akregator/src/treenodeitem.cpp b/akregator/src/treenodeitem.cpp index 8dd7ebdb4..92a36859a 100644 --- a/akregator/src/treenodeitem.cpp +++ b/akregator/src/treenodeitem.cpp @@ -25,10 +25,10 @@ #include "treenode.h" #include "treenodeitem.h" #include "folderitem.h" -#include <qfont.h> -#include <qheader.h> -#include <qpainter.h> -#include <qstring.h> +#include <tqfont.h> +#include <tqheader.h> +#include <tqpainter.h> +#include <tqstring.h> #include <kstringhandler.h> @@ -69,9 +69,9 @@ void TreeNodeItem::initialize(TreeNode* node) TreeNodeItem::~TreeNodeItem() {} -QString TreeNodeItem::toolTip() const +TQString TreeNodeItem::toolTip() const { - return QString::null; + return TQString::null; } TreeNode* TreeNodeItem::node() @@ -106,7 +106,7 @@ FolderItem* TreeNodeItem::parent() const // TODO: reverse for reverse layout -void TreeNodeItem::paintCell( QPainter * p, const QColorGroup & cg, +void TreeNodeItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ) { @@ -119,7 +119,7 @@ void TreeNodeItem::paintCell( QPainter * p, const QColorGroup & cg, } // from kfoldertree - QString oldText = text(column); + TQString oldText = text(column); setText( column, " " ); // draw bg @@ -128,21 +128,21 @@ void TreeNodeItem::paintCell( QPainter * p, const QColorGroup & cg, setText( column, oldText); // draw fg - QFont f = p->font(); - f.setWeight(QFont::Bold); + TQFont f = p->font(); + f.setWeight(TQFont::Bold); p->setFont(f); - QFontMetrics fm( p->fontMetrics() ); - QListView *lv = listView(); + TQFontMetrics fm( p->fontMetrics() ); + TQListView *lv = listView(); int x = lv ? lv->itemMargin() : 1; int m=x; - const QPixmap *icon = pixmap( column ); - QRect br; + const TQPixmap *icon = pixmap( column ); + TQRect br; if (icon) x += icon->width() + m; - QString txt = " (" + QString::number(u) + ")"; + TQString txt = " (" + TQString::number(u) + ")"; int txtW=fm.width( txt ); if (fm.width( oldText ) + txtW + x > width) diff --git a/akregator/src/treenodeitem.h b/akregator/src/treenodeitem.h index 1c2d535bb..5ce02a93c 100644 --- a/akregator/src/treenodeitem.h +++ b/akregator/src/treenodeitem.h @@ -52,18 +52,18 @@ public: virtual void nodeChanged(); - virtual QString toolTip() const; + virtual TQString toolTip() const; virtual TreeNodeItem* firstChild() const; virtual TreeNodeItem* nextSibling() const; virtual FolderItem* parent() const; - virtual void showContextMenu(const QPoint& p) = 0; + virtual void showContextMenu(const TQPoint& p) = 0; protected: TreeNode* m_node; - virtual void paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int align ); + virtual void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ); private: diff --git a/akregator/src/utils.cpp b/akregator/src/utils.cpp index c91a44976..e4a24209e 100644 --- a/akregator/src/utils.cpp +++ b/akregator/src/utils.cpp @@ -23,17 +23,17 @@ */ #include "utils.h" -#include <qregexp.h> -#include <qstring.h> +#include <tqregexp.h> +#include <tqstring.h> namespace Akregator { -QString Utils::stripTags(const QString& str) +TQString Utils::stripTags(const TQString& str) { - return QString(str).replace(QRegExp("<[^>]*>"), ""); + return TQString(str).replace(TQRegExp("<[^>]*>"), ""); } -uint Utils::calcHash(const QString& str) +uint Utils::calcHash(const TQString& str) { if (str.isNull()) // handle null string as "", prevents crash return calcHash(""); @@ -44,14 +44,14 @@ uint Utils::calcHash(const QString& str) return hash; } -QString Utils::fileNameForUrl(const QString& url_p) +TQString Utils::fileNameForUrl(const TQString& url_p) { - QString url2(url_p); + TQString url2(url_p); url2 = url2.replace("/", "_").replace(":", "_"); if (url2.length() > 255) - url2 = url2.left(200) + QString::number(Akregator::Utils::calcHash(url2), 16); + url2 = url2.left(200) + TQString::number(Akregator::Utils::calcHash(url2), 16); return url2; } diff --git a/akregator/src/utils.h b/akregator/src/utils.h index 9ee4eaaa9..f4f86363e 100644 --- a/akregator/src/utils.h +++ b/akregator/src/utils.h @@ -34,7 +34,7 @@ class Utils { public: /** removes HTML/XML tags (everything between < and >, that is) from a string. "<p><strong>foo</strong> bar</p>" becomes "foo bar" */ - static QString stripTags(const QString& str); + static TQString stripTags(const TQString& str); /** taken from some website... -fo * djb2 @@ -42,7 +42,7 @@ class Utils * many years ago in comp.lang.c */ - static uint calcHash(const QString& str); + static uint calcHash(const TQString& str); /** * returns a file name for a URL, with chars like "/" ":" @@ -50,7 +50,7 @@ class Utils * appended with a hash value. * */ - static QString fileNameForUrl(const QString& url); + static TQString fileNameForUrl(const TQString& url); }; } diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index 6490fb82a..55e9b758e 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -37,9 +37,9 @@ #include <kurl.h> #include <kparts/browserextension.h> -#include <qaccel.h> -#include <qclipboard.h> -#include <qpaintdevicemetrics.h> +#include <tqaccel.h> +#include <tqclipboard.h> +#include <tqpaintdevicemetrics.h> #include "viewer.h" #include "akregator_run.h" @@ -47,7 +47,7 @@ namespace Akregator { -Viewer::Viewer(QWidget *parent, const char *name) +Viewer::Viewer(TQWidget *parent, const char *name) : KHTMLPart(parent, name), m_url(0) { setZoomFactor(100); @@ -57,28 +57,28 @@ Viewer::Viewer(QWidget *parent, const char *name) setStatusMessagesEnabled(true); // change the cursor when loading stuff... - connect( this, SIGNAL(started(KIO::Job *)), - this, SLOT(slotStarted(KIO::Job *))); - connect( this, SIGNAL(completed()), - this, SLOT(slotCompleted())); + connect( this, TQT_SIGNAL(started(KIO::Job *)), + this, TQT_SLOT(slotStarted(KIO::Job *))); + connect( this, TQT_SIGNAL(completed()), + this, TQT_SLOT(slotCompleted())); - connect( browserExtension(), SIGNAL(popupMenu (KXMLGUIClient*, const QPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t)), this, SLOT(slotPopupMenu(KXMLGUIClient*, const QPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t))); + connect( browserExtension(), TQT_SIGNAL(popupMenu (KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t)), this, TQT_SLOT(slotPopupMenu(KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t))); - KStdAction::print(this, SLOT(slotPrint()), actionCollection(), "viewer_print"); - KStdAction::copy(this, SLOT(slotCopy()), actionCollection(), "viewer_copy"); + KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection(), "viewer_print"); + KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection(), "viewer_copy"); - new KAction( i18n("&Increase Font Sizes"), "viewmag+", "Ctrl+Plus", this, SLOT(slotZoomIn()), actionCollection(), "incFontSizes" ); - new KAction( i18n("&Decrease Font Sizes"), "viewmag-", "Ctrl+Minus", this, SLOT(slotZoomOut()), actionCollection(), "decFontSizes" ); + new KAction( i18n("&Increase Font Sizes"), "viewmag+", "Ctrl+Plus", this, TQT_SLOT(slotZoomIn()), actionCollection(), "incFontSizes" ); + new KAction( i18n("&Decrease Font Sizes"), "viewmag-", "Ctrl+Minus", this, TQT_SLOT(slotZoomOut()), actionCollection(), "decFontSizes" ); - connect(this, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged())); + connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); - connect( browserExtension(), SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), this, SLOT(slotOpenURLRequest(const KURL&, const KParts::URLArgs& )) ); + connect( browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), this, TQT_SLOT(slotOpenURLRequest(const KURL&, const KParts::URLArgs& )) ); new KAction(i18n("Copy &Link Address"), "", 0, - this, SLOT(slotCopyLinkAddress()), + this, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "copylinkaddress"); new KAction(i18n("&Save Link As..."), "", 0, - this, SLOT(slotSaveLinkAs()), + this, TQT_SLOT(slotSaveLinkAs()), actionCollection(), "savelinkas"); } @@ -88,17 +88,17 @@ Viewer::~Viewer() bool Viewer::closeURL() { emit browserExtension()->loadingProgress(-1); - emit canceled(QString::null); + emit canceled(TQString::null); return KHTMLPart::closeURL(); } int Viewer::pointsToPixel(int pointSize) const { - const QPaintDeviceMetrics metrics(view()); + const TQPaintDeviceMetrics metrics(view()); return ( pointSize * metrics.logicalDpiY() + 36 ) / 72 ; } -void Viewer::displayInExternalBrowser(const KURL &url, const QString &mimetype) +void Viewer::displayInExternalBrowser(const KURL &url, const TQString &mimetype) { if (!url.isValid()) return; if (Settings::externalBrowserUseKdeDefault()) @@ -110,11 +110,11 @@ void Viewer::displayInExternalBrowser(const KURL &url, const QString &mimetype) } else { - QString cmd = Settings::externalBrowserCustomCommand(); - QString urlStr = url.url(); - cmd.replace(QRegExp("%u"), urlStr); + TQString cmd = Settings::externalBrowserCustomCommand(); + TQString urlStr = url.url(); + cmd.replace(TQRegExp("%u"), urlStr); KProcess *proc = new KProcess; - QStringList cmdAndArgs = KShell::splitArgs(cmd); + TQStringList cmdAndArgs = KShell::splitArgs(cmd); *proc << cmdAndArgs; proc->start(KProcess::DontCare); delete proc; @@ -126,7 +126,7 @@ void Viewer::slotOpenURLRequest(const KURL& /*url*/, const KParts::URLArgs& /*ar } -void Viewer::urlSelected(const QString &url, int button, int state, const QString &_target, KParts::URLArgs args) +void Viewer::urlSelected(const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args) { m_url = completeURL(url); browserExtension()->setURLArgs(args); @@ -165,20 +165,20 @@ void Viewer::urlSelected(const QString &url, int button, int state, const QStrin KHTMLPart::urlSelected(url,button,state,_target,args); } -void Viewer::slotPopupMenu(KXMLGUIClient*, const QPoint& p, const KURL& kurl, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags kpf, mode_t) +void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags kpf, mode_t) { const bool isLink = (kpf & (KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowTextSelectionItems)) == 0; const bool isSelection = (kpf & KParts::BrowserExtension::ShowTextSelectionItems) != 0; - QString url = kurl.url(); + TQString url = kurl.url(); m_url = url; KPopupMenu popup; if (isLink && !isSelection) { - popup.insertItem(SmallIcon("tab_new"), i18n("Open Link in New &Tab"), this, SLOT(slotOpenLinkInForegroundTab())); - popup.insertItem(SmallIcon("window_new"), i18n("Open Link in External &Browser"), this, SLOT(slotOpenLinkInBrowser())); + popup.insertItem(SmallIcon("tab_new"), i18n("Open Link in New &Tab"), this, TQT_SLOT(slotOpenLinkInForegroundTab())); + popup.insertItem(SmallIcon("window_new"), i18n("Open Link in External &Browser"), this, TQT_SLOT(slotOpenLinkInBrowser())); popup.insertSeparator(); action("savelinkas")->plug(&popup); action("copylinkaddress")->plug(&popup); @@ -201,18 +201,18 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const QPoint& p, const KURL& kurl, co // taken from KDevelop void Viewer::slotCopy() { - QString text = selectedText(); - text.replace( QChar( 0xa0 ), ' ' ); - QClipboard *cb = QApplication::clipboard(); - disconnect( cb, SIGNAL( selectionChanged() ), this, SLOT( slotClearSelection() ) ); + TQString text = selectedText(); + text.replace( TQChar( 0xa0 ), ' ' ); + QClipboard *cb = TQApplication::clipboard(); + disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); cb->setText(text); - connect( cb, SIGNAL( selectionChanged() ), this, SLOT( slotClearSelection() ) ); + connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); } void Viewer::slotCopyLinkAddress() { if(m_url.isEmpty()) return; - QClipboard *cb = QApplication::clipboard(); + QClipboard *cb = TQApplication::clipboard(); cb->setText(m_url.prettyURL(), QClipboard::Clipboard); cb->setText(m_url.prettyURL(), QClipboard::Selection); } @@ -244,7 +244,7 @@ void Viewer::slotOpenLinkInThisTab() void Viewer::slotOpenLinkInBrowser() { - displayInExternalBrowser(m_url, QString::null); + displayInExternalBrowser(m_url, TQString::null); } void Viewer::slotSaveLinkAs() diff --git a/akregator/src/viewer.h b/akregator/src/viewer.h index 364aeb9e6..95924e824 100644 --- a/akregator/src/viewer.h +++ b/akregator/src/viewer.h @@ -44,9 +44,9 @@ namespace Akregator /** * Display article in external browser. */ - static void displayInExternalBrowser(const KURL &url, const QString& mimetype=QString::null); + static void displayInExternalBrowser(const KURL &url, const TQString& mimetype=TQString::null); - Viewer(QWidget* parent, const char* name); + Viewer(TQWidget* parent, const char* name); virtual ~Viewer(); virtual bool closeURL(); @@ -76,12 +76,12 @@ namespace Akregator // FIXME: Sort out how things are supposed to work and clean up the following slots /** reimplemented to handle url selection according to the settings for LMB and MMB */ - virtual void urlSelected(const QString &url, int button, int state, const QString &_target, KParts::URLArgs args); + virtual void urlSelected(const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args); /** slot for handling openURLRequestDelayed() signal from the browserextension. Handles POST requests (for forms) only, other link handling goes to urlSelected(). Does nothing in Viewer, reimplemented in PageViewer to make forms working */ virtual void slotOpenURLRequest(const KURL& url, const KParts::URLArgs& args); - virtual void slotPopupMenu(KXMLGUIClient*, const QPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t); + virtual void slotPopupMenu(KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t); /** Copies current link to clipboard. */ void slotCopyLinkAddress(); |