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 +#include #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 +#include 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 +#include #include #include #include @@ -30,9 +30,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "actionmanagerimpl.h" #include "akregatorconfig.h" @@ -134,19 +134,19 @@ public: KActionMenu* tagMenu; KActionCollection* actionCollection; TagSet* tagSet; - QMap tagActions; + TQMap 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 actions = d->tagActions.values(); + TQValueList actions = d->tagActions.values(); - for (QValueList::ConstIterator it = actions.begin(); it != actions.end(); ++it) + for (TQValueList::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 actions = d->tagActions.values(); - for (QValueList::ConstIterator it = actions.begin(); it != actions.end(); ++it) + TQValueList actions = d->tagActions.values(); + for (TQValueList::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 list = tagSet->toMap().values(); - for (QValueList::ConstIterator it = list.begin(); it != list.end(); ++it) + TQValueList list = tagSet->toMap().values(); + for (TQValueList::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 +#include #include #include @@ -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 #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -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("The standard feed list is corrupted (no valid OPML). A backup was created:

%2

").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.") .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 -#include +#include #include 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 #include -#include -#include -#include // for startup time measure -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include // for startup time measure +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Akregator { @@ -145,13 +145,13 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor virtual bool visitTagNode(TagNode* node) { - QString msg = i18n("Are you sure you want to delete tag %1? The tag will be removed from all articles.").arg(node->title()); + TQString msg = i18n("Are you sure you want to delete tag %1? The tag will be removed from all articles.").arg(node->title()); if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Tag"), KStdGuiItem::del()) == KMessageBox::Continue) { Tag tag = node->tag(); - QValueList
articles = m_view->m_feedList->rootNode()->articles(tag.id()); + TQValueList
articles = m_view->m_feedList->rootNode()->articles(tag.id()); node->setNotificationMode(false); - for (QValueList
::Iterator it = articles.begin(); it != articles.end(); ++it) + for (TQValueList
::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("Are you sure you want to delete this folder and its feeds and subfolders?"); 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("Are you sure you want to delete this feed?"); 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(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
articles = feed->articles(); - QValueList
::ConstIterator it; - QValueList
::ConstIterator end = articles.end(); + TQValueList
articles = feed->articles(); + TQValueList
::ConstIterator it; + TQValueList
::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
selectedArticles = m_articleList->selectedArticles(); - for (QValueList
::Iterator it = selectedArticles.begin(); it != selectedArticles.end(); ++it) + TQValueList
selectedArticles = m_articleList->selectedArticles(); + for (TQValueList
::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
selectedArticles = m_articleList->selectedArticles(); - for (QValueList
::Iterator it = selectedArticles.begin(); it != selectedArticles.end(); ++it) + TQValueList
selectedArticles = m_articleList->selectedArticles(); + for (TQValueList
::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
articles = m_articleList->selectedArticles(); + TQValueList
articles = m_articleList->selectedArticles(); - QString msg; + TQString msg; switch (articles.count()) { case 0: return; case 1: - msg = i18n("Are you sure you want to delete article %1?").arg(QStyleSheet::escape(articles.first().title())); + msg = i18n("Are you sure you want to delete article %1?").arg(TQStyleSheet::escape(articles.first().title())); break; default: msg = i18n("Are you sure you want to delete the selected article?", @@ -1317,8 +1317,8 @@ void View::slotArticleDelete() if (m_listTabWidget->activeView()->selectedNode()) m_listTabWidget->activeView()->selectedNode()->setNotificationMode(false); - QValueList feeds; - for (QValueList
::Iterator it = articles.begin(); it != articles.end(); ++it) + TQValueList feeds; + for (TQValueList
::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::Iterator it = feeds.begin(); it != feeds.end(); ++it) + for (TQValueList::Iterator it = feeds.begin(); it != feeds.end(); ++it) { (*it)->setNotificationMode(true); } @@ -1340,28 +1340,28 @@ void View::slotArticleDelete() void View::slotArticleToggleKeepFlag(bool /*enabled*/) { - QValueList
articles = m_articleList->selectedArticles(); + TQValueList
articles = m_articleList->selectedArticles(); if (articles.isEmpty()) return; bool allFlagsSet = true; - for (QValueList
::Iterator it = articles.begin(); allFlagsSet && it != articles.end(); ++it) + for (TQValueList
::Iterator it = articles.begin(); allFlagsSet && it != articles.end(); ++it) if (!(*it).keep()) allFlagsSet = false; - for (QValueList
::Iterator it = articles.begin(); it != articles.end(); ++it) + for (TQValueList
::Iterator it = articles.begin(); it != articles.end(); ++it) (*it).setKeep(!allFlagsSet); } void View::slotSetSelectedArticleRead() { - QValueList
articles = m_articleList->selectedArticles(); + TQValueList
articles = m_articleList->selectedArticles(); if (articles.isEmpty()) return; - for (QValueList
::Iterator it = articles.begin(); it != articles.end(); ++it) + for (TQValueList
::Iterator it = articles.begin(); it != articles.end(); ++it) (*it).setStatus(Article::Read); } @@ -1385,7 +1385,7 @@ void View::slotTextToSpeechRequest() } else { - QString selectedText = static_cast(m_currentFrame->part())->selectedText(); + TQString selectedText = static_cast(m_currentFrame->part())->selectedText(); if (!selectedText.isEmpty()) SpeechClient::self()->slotSpeak(selectedText, "en"); @@ -1394,23 +1394,23 @@ void View::slotTextToSpeechRequest() void View::slotSetSelectedArticleUnread() { - QValueList
articles = m_articleList->selectedArticles(); + TQValueList
articles = m_articleList->selectedArticles(); if (articles.isEmpty()) return; - for (QValueList
::Iterator it = articles.begin(); it != articles.end(); ++it) + for (TQValueList
::Iterator it = articles.begin(); it != articles.end(); ++it) (*it).setStatus(Article::Unread); } void View::slotSetSelectedArticleNew() { - QValueList
articles = m_articleList->selectedArticles(); + TQValueList
articles = m_articleList->selectedArticles(); if (articles.isEmpty()) return; - for (QValueList
::Iterator it = articles.begin(); it != articles.end(); ++it) + for (TQValueList
::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 frames = m_tabs->frames(); - QPtrList::ConstIterator it = frames.begin(); + TQStringList urls; + TQPtrList frames = m_tabs->frames(); + TQPtrList::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
selectedArticles = m_articleList->selectedArticles(); + TQValueList
selectedArticles = m_articleList->selectedArticles(); - for (QValueList
::ConstIterator it = selectedArticles.begin(); it != selectedArticles.end(); ++it) + for (TQValueList
::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 -#include +#include +#include #include @@ -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 -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -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 cats = article.categories(); - QValueList::ConstIterator end = cats.end(); + TQValueList cats = article.categories(); + TQValueList::ConstIterator end = cats.end(); - for (QValueList::ConstIterator it = cats.begin(); it != end; ++it) + for (TQValueList::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
List; + typedef TQValueList
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 #include -#include +#include 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( 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 &criteria, Association assoc) +ArticleMatcher::ArticleMatcher( const TQValueList &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::ConstIterator it = m_criteria.begin(); it != m_criteria.end(); ++it) + for (TQValueList::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::ConstIterator it = m_criteria.begin(); - QValueList::ConstIterator end = m_criteria.end(); + TQValueList::ConstIterator it = m_criteria.begin(); + TQValueList::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::ConstIterator it = m_criteria.begin(); - QValueList::ConstIterator end = m_criteria.end(); + TQValueList::ConstIterator it = m_criteria.begin(); + TQValueList::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 -#include -#include +#include +#include +#include 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 +class ArticleFilterList : public TQValueList { 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 &criteria, Association assoc); + ArticleMatcher( const TQValueList &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 m_criteria; + TQValueList 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 +#include #include namespace Akregator @@ -10,7 +10,7 @@ namespace Akregator class ArticleInterceptorManager::ArticleInterceptorManagerPrivate { public: - QValueList interceptors; + TQValueList interceptors; }; @@ -43,7 +43,7 @@ void ArticleInterceptorManager::removeInterceptor(ArticleInterceptor* intercepto d->interceptors.remove(interceptor); } -QValueList ArticleInterceptorManager::interceptors() const +TQValueList 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 interceptors() const; + TQValueList 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 #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -73,7 +73,7 @@ class ArticleListView::ArticleListViewPrivate ArticleListView* m_parent; /** maps article to article item */ - QMap articleMap; + TQMap 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(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("

Article list

" + TQWhatsThis::add(this, i18n("

Article list

" "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
articles = d->node->articles(); + TQValueList
articles = d->node->articles(); - QValueList
::ConstIterator end = articles.end(); - QValueList
::ConstIterator it = articles.begin(); + TQValueList
::ConstIterator end = articles.end(); + TQValueList
::ConstIterator it = articles.begin(); for (; it != end; ++it) { @@ -345,14 +345,14 @@ void ArticleListView::slotClear() clear(); } -void ArticleListView::slotArticlesAdded(TreeNode* /*node*/, const QValueList
& list) +void ArticleListView::slotArticlesAdded(TreeNode* /*node*/, const TQValueList
& list) { setUpdatesEnabled(false); bool statusActive = !(d->statusFilter.matchesAll()); bool textActive = !(d->textFilter.matchesAll()); - for (QValueList
::ConstIterator it = list.begin(); it != list.end(); ++it) + for (TQValueList
::ConstIterator it = list.begin(); it != list.end(); ++it) { if (!d->articleMap.contains(*it)) { @@ -369,7 +369,7 @@ void ArticleListView::slotArticlesAdded(TreeNode* /*node*/, const QValueList& list) +void ArticleListView::slotArticlesUpdated(TreeNode* /*node*/, const TQValueList
& list) { setUpdatesEnabled(false); @@ -380,9 +380,9 @@ void ArticleListView::slotArticlesUpdated(TreeNode* /*node*/, const QValueListstatusFilter.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
::ConstIterator it = list.begin(); it != list.end(); ++it) + for (TQValueList
::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& list) +void ArticleListView::slotArticlesRemoved(TreeNode* /*node*/, const TQValueList
& 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
::ConstIterator it = list.begin(); it != list.end(); ++it) + for (TQValueList
::ConstIterator it = list.begin(); it != list.end(); ++it) { if (d->articleMap.contains(*it)) { @@ -482,18 +482,18 @@ void ArticleListView::slotArticlesRemoved(TreeNode* /*node*/, const QValueList&)), this, SLOT(slotArticlesAdded(TreeNode*, const QValueList
&)) ); - connect(node, SIGNAL(signalArticlesUpdated(TreeNode*, const QValueList
&)), this, SLOT(slotArticlesUpdated(TreeNode*, const QValueList
&)) ); - connect(node, SIGNAL(signalArticlesRemoved(TreeNode*, const QValueList
&)), this, SLOT(slotArticlesRemoved(TreeNode*, const QValueList
&)) ); + connect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear()) ); + connect(node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList
&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList
&)) ); + connect(node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList
&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList
&)) ); + connect(node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList
&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList
&)) ); } void ArticleListView::disconnectFromNode(TreeNode* node) { - disconnect(node, SIGNAL(signalDestroyed(TreeNode*)), this, SLOT(slotClear()) ); - disconnect(node, SIGNAL(signalArticlesAdded(TreeNode*, const QValueList
&)), this, SLOT(slotArticlesAdded(TreeNode*, const QValueList
&)) ); - disconnect(node, SIGNAL(signalArticlesUpdated(TreeNode*, const QValueList
&)), this, SLOT(slotArticlesUpdated(TreeNode*, const QValueList
&)) ); - disconnect(node, SIGNAL(signalArticlesRemoved(TreeNode*, const QValueList
&)), this, SLOT(slotArticlesRemoved(TreeNode*, const QValueList
&)) ); + disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear()) ); + disconnect(node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList
&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList
&)) ); + disconnect(node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList
&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList
&)) ); + disconnect(node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList
&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList
&)) ); } 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 (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 (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 (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 (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 (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
articles = selectedArticles(); + TQDragObject* d = 0; + TQValueList
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 (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(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(w); + TQWidget* w = ActionManager::getInstance()->container("article_popup"); + TQPopupMenu* popup = static_cast(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(item); if (ali) @@ -797,11 +797,11 @@ ArticleListView::~ArticleListView() d = 0; } -QValueList
ArticleListView::selectedArticles() const +TQValueList
ArticleListView::selectedArticles() const { - QValueList
ret; - QPtrList items = selectedItems(false); - for (QListViewItem* i = items.first(); i; i = items.next() ) + TQValueList
ret; + TQPtrList items = selectedItems(false); + for (TQListViewItem* i = items.first(); i; i = items.next() ) ret.append((static_cast(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
selectedArticles() const; + TQValueList
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
& list); - void slotArticlesUpdated(TreeNode* node, const QValueList
& list); - void slotArticlesRemoved(TreeNode* node, const QValueList
& list); + void slotArticlesAdded(TreeNode* node, const TQValueList
& list); + void slotArticlesUpdated(TreeNode* node, const TQValueList
& list); + void slotArticlesRemoved(TreeNode* node, const TQValueList
& 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 -#include -#include -#include +#include +#include +#include +#include #include #include @@ -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("
\n").arg(QApplication::reverseLayout() ? "rtl" : "ltr"); + TQString text; + text = TQString("
\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); - text += QString("
").arg(directionOf(Utils::stripTags(node->title()))); + text += TQString("
").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("
"); - QString url=node->xmlUrl(); - QString file = url.replace("/", "_").replace(":", "_"); + text += TQString("
"); + TQString url=node->xmlUrl(); + TQString file = url.replace("/", "_").replace(":", "_"); KURL u(m_view->m_imageDir); u.setFileName(file); - text += QString("\n").arg(node->htmlUrl()).arg(u.url()); + text += TQString("\n").arg(node->htmlUrl()).arg(u.url()); } else text += "
"; if( !node->description().isEmpty() ) { - text += QString("
").arg(Utils::stripTags(directionOf(node->description()))); + text += TQString("
").arg(Utils::stripTags(directionOf(node->description()))); text += i18n("Description: %1

").arg(node->description()); text += "
\n"; // /description } if ( !node->htmlUrl().isEmpty() ) { - text += QString("
").arg(directionOf(node->htmlUrl())); + text += TQString("
").arg(directionOf(node->htmlUrl())); text += i18n("Homepage: %2").arg(node->htmlUrl()).arg(node->htmlUrl()); text += "
\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("
\n").arg(QApplication::reverseLayout() ? "rtl" : "ltr"); - text += QString("
%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title()); + TQString text; + text = TQString("
\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); + text += TQString("
%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("
\n"); + text += TQString("
\n"); text += "
\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("
\n").arg(QApplication::reverseLayout() ? "rtl" : "ltr"); - text += QString("
%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title()); + TQString text; + text = TQString("
\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); + text += TQString("
%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("
\n"); + text += TQString("
\n"); text += "
\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 = ""; @@ -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 ( // "