diff options
Diffstat (limited to 'akregator')
117 files changed, 1498 insertions, 927 deletions
diff --git a/akregator/HACKING b/akregator/HACKING index 7ff48118..3dc85fbd 100644 --- a/akregator/HACKING +++ b/akregator/HACKING @@ -87,17 +87,17 @@ class should be roughly as follows: public typedefs: public ctors: public methods: -public Q_SLOTS: -Q_SIGNALS: +public slots: +signals: protected methods: -protected Q_SLOTS: +protected slots: protected fields: private methods: -private Q_SLOTS: +private slots: private fields: private ctors: // if you define ctors/dtor as private, put them at end -If there are no private Q_SLOTS there is no need for two private sections, however +If there are no private slots there is no need for two private sections, however private functions and private variables should be clearly separated. The implementations files -- .cpp files -- should follow (when possible) the @@ -145,15 +145,15 @@ class QSomething; namespace Akregator { -class Test : public QObject +class Test : public TQObject { - Q_OBJECT + TQ_OBJECT public: typedef QValueList<Test> list; Test(); - Test(QString someString); + Test(TQString someString); explicit Test(int i = 0); virtual ~Test(); @@ -163,10 +163,10 @@ class Test : public QObject static Test *instance() { return m_instance; } - public Q_SLOTS: + public slots: void receive(QSomething &); - Q_SIGNALS: + signals: void send(QSomething &); protected: @@ -174,7 +174,7 @@ class Test : public QObject static void someProtectedStaticFunc(); - protected Q_SLOTS: + protected slots: void protectedSlot(); protected: @@ -185,7 +185,7 @@ class Test : public QObject static int staticPrivateMethod(); - private Q_SLOTS: + private slots: void privateSlotIndeed(int youWonder); private: @@ -212,7 +212,7 @@ test.cpp: namespace Akregator { Test::Test() - : QObject() + : TQObject() , m_protectedVar(0) , m_privateVar(0) , m_tastyThing(0) @@ -220,8 +220,8 @@ Test::Test() { } -Test::Test(QString someString) - : QObject() +Test::Test(TQString someString) + : TQObject() , m_protectedVar(0) , m_privateVar(0) , m_tastyThing(someString) @@ -230,7 +230,7 @@ Test::Test(QString someString) } Test::Test(int i); - : QObject() + : TQObject() , m_protectedVar(0) , m_privateVar(0) , m_tastyThing(i) diff --git a/akregator/src/about/akregator.css b/akregator/src/about/akregator.css index 9c31cfe3..ab0bb774 100644 --- a/akregator/src/about/akregator.css +++ b/akregator/src/about/akregator.css @@ -15,6 +15,3 @@ background-position: bottom right; } */ - -/* vim:set sw=2 et nocindent smartindent: */ - diff --git a/akregator/src/about/main.html b/akregator/src/about/main.html index 5bcca3d4..52cfe4ad 100644 --- a/akregator/src/about/main.html +++ b/akregator/src/about/main.html @@ -64,4 +64,3 @@ <div id="footer"><div id="footerL"/><div id="footerR"/></div> </body> </html> -<!-- vim:set sw=2 et nocindent smartindent: --> diff --git a/akregator/src/aboutdata.h b/akregator/src/aboutdata.h index aa461134..50f04c45 100644 --- a/akregator/src/aboutdata.h +++ b/akregator/src/aboutdata.h @@ -26,7 +26,7 @@ #define ABOUTDATA_H #include <tdeaboutdata.h> -#include <tdepimmacros.h> +#include <tdemacros.h> #define AKREGATOR_VERSION "1.2.9" @@ -34,7 +34,7 @@ namespace Akregator { /** @author Teemu Rytilahti */ -class KDE_EXPORT AboutData : public TDEAboutData +class TDE_EXPORT AboutData : public TDEAboutData { public: AboutData(); diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp index 7fa61cdc..6c7b3cee 100644 --- a/akregator/src/actionmanagerimpl.cpp +++ b/akregator/src/actionmanagerimpl.cpp @@ -161,16 +161,16 @@ void ActionManagerImpl::setTagSet(TagSet* tagSet) if (d->tagSet != 0) { - 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&))); + disconnect(d->tagSet, TQ_SIGNAL(signalTagAdded(const Tag&)), this, TQ_SLOT(slotTagAdded(const Tag&))); + disconnect(d->tagSet, TQ_SIGNAL(signalTagRemoved(const Tag&)), this, TQ_SLOT(slotTagRemoved(const Tag&))); } d->tagSet = tagSet; if (tagSet != 0) { - connect(d->tagSet, TQT_SIGNAL(signalTagAdded(const Tag&)), this, TQT_SLOT(slotTagAdded(const Tag&))); - connect(d->tagSet, TQT_SIGNAL(signalTagRemoved(const Tag&)), this, TQT_SLOT(slotTagRemoved(const Tag&))); + connect(d->tagSet, TQ_SIGNAL(signalTagAdded(const Tag&)), this, TQ_SLOT(slotTagAdded(const Tag&))); + connect(d->tagSet, TQ_SIGNAL(signalTagRemoved(const Tag&)), this, TQ_SLOT(slotTagRemoved(const Tag&))); } TQValueList<TagAction*> actions = d->tagActions.values(); @@ -200,7 +200,7 @@ void ActionManagerImpl::slotTagAdded(const Tag& tag) if (!d->tagActions.contains(tag.id())) { - d->tagActions[tag.id()] = new TagAction(tag, TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu); + d->tagActions[tag.id()] = new TagAction(tag, d->view, TQ_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu); d->tagMenu->insert(d->tagActions[tag.id()]); } } @@ -263,15 +263,15 @@ void ActionManagerImpl::initTrayIcon(TrayIcon* trayIcon) void ActionManagerImpl::initPart() { - new TDEAction(i18n("&Import Feeds..."), "", "", d->part, TQT_SLOT(fileImport()), d->actionCollection, "file_import"); - new TDEAction(i18n("&Export Feeds..."), "", "", d->part, TQT_SLOT(fileExport()), d->actionCollection, "file_export"); - //new TDEAction(i18n("&Get Feeds From Web..."), "", "", d->part, TQT_SLOT(fileGetFeeds()), d->actionCollection, "file_getfromweb"); + new TDEAction(i18n("&Import Feeds..."), "", "", d->part, TQ_SLOT(fileImport()), d->actionCollection, "file_import"); + new TDEAction(i18n("&Export Feeds..."), "", "", d->part, TQ_SLOT(fileExport()), d->actionCollection, "file_export"); + //new TDEAction(i18n("&Get Feeds From Web..."), "", "", d->part, TQ_SLOT(fileGetFeeds()), d->actionCollection, "file_getfromweb"); - new TDEAction(i18n("Send &Link Address..."), "mail_generic", "", d->part, TQT_SLOT(fileSendLink()), d->actionCollection, "file_sendlink"); - new TDEAction(i18n("Send &File..."), "mail_generic", "", d->part, TQT_SLOT(fileSendFile()), d->actionCollection, "file_sendfile"); + new TDEAction(i18n("Send &Link Address..."), "mail_generic", "", d->part, TQ_SLOT(fileSendLink()), d->actionCollection, "file_sendlink"); + new TDEAction(i18n("Send &File..."), "mail_generic", "", d->part, TQ_SLOT(fileSendFile()), d->actionCollection, "file_sendfile"); - KStdAction::configureNotifications(d->part, TQT_SLOT(showKNotifyOptions()), d->actionCollection); // options_configure_notifications - new TDEAction( i18n("Configure &Akregator..."), "configure", "", d->part, TQT_SLOT(showOptions()), d->actionCollection, "akregator_configure_akregator" ); + KStdAction::configureNotifications(d->part, TQ_SLOT(showKNotifyOptions()), d->actionCollection); // options_configure_notifications + new TDEAction( i18n("Configure &Akregator..."), "configure", "", d->part, TQ_SLOT(showOptions()), d->actionCollection, "akregator_configure_akregator" ); } void ActionManagerImpl::initView(View* view) @@ -282,51 +282,51 @@ void ActionManagerImpl::initView(View* view) d->view = view; // tag actions - new TDEAction(i18n("&New Tag..."), "", "", TQT_TQOBJECT(d->view), TQT_SLOT(slotNewTag()), actionCollection(), "tag_new"); + new TDEAction(i18n("&New Tag..."), "", "", d->view, TQ_SLOT(slotNewTag()), actionCollection(), "tag_new"); // Feed/Feed Group popup menu - new TDEAction(i18n("&Open Homepage"), "", "Ctrl+H", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage"); - new TDEAction(i18n("&Add Feed..."), "bookmark_add", "Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAdd()), actionCollection(), "feed_add"); - new TDEAction(i18n("Ne&w Folder..."), "folder-new", "Shift+Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group"); - new TDEAction(i18n("&Delete Feed"), "edit-delete", "Alt+Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedRemove()), actionCollection(), "feed_remove"); - new TDEAction(i18n("&Edit Feed..."), "edit", "F2", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedModify()), actionCollection(), "feed_modify"); + new TDEAction(i18n("&Open Homepage"), "", "Ctrl+H", d->view, TQ_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage"); + new TDEAction(i18n("&Add Feed..."), "bookmark_add", "Insert", d->view, TQ_SLOT(slotFeedAdd()), actionCollection(), "feed_add"); + new TDEAction(i18n("Ne&w Folder..."), "folder-new", "Shift+Insert", d->view, TQ_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group"); + new TDEAction(i18n("&Delete Feed"), "edit-delete", "Alt+Delete", d->view, TQ_SLOT(slotFeedRemove()), actionCollection(), "feed_remove"); + new TDEAction(i18n("&Edit Feed..."), "edit", "F2", d->view, TQ_SLOT(slotFeedModify()), actionCollection(), "feed_modify"); TDEActionMenu* vm = new TDEActionMenu( i18n( "&View Mode" ), actionCollection(), "view_mode" ); - TDERadioAction *ra = new TDERadioAction(i18n("&Normal View"), "view_top_bottom", "Ctrl+Shift+1", TQT_TQOBJECT(d->view), TQT_SLOT(slotNormalView()), actionCollection(), "normal_view"); + TDERadioAction *ra = new TDERadioAction(i18n("&Normal View"), "view_top_bottom", "Ctrl+Shift+1", d->view, TQ_SLOT(slotNormalView()), actionCollection(), "normal_view"); ra->setExclusiveGroup( "ViewMode" ); vm->insert(ra); - ra = new TDERadioAction(i18n("&Widescreen View"), "view_left_right", "Ctrl+Shift+2", TQT_TQOBJECT(d->view), TQT_SLOT(slotWidescreenView()), actionCollection(), "widescreen_view"); + ra = new TDERadioAction(i18n("&Widescreen View"), "view_left_right", "Ctrl+Shift+2", d->view, TQ_SLOT(slotWidescreenView()), actionCollection(), "widescreen_view"); ra->setExclusiveGroup( "ViewMode" ); vm->insert(ra); - ra = new TDERadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", TQT_TQOBJECT(d->view), TQT_SLOT(slotCombinedView()), actionCollection(), "combined_view"); + ra = new TDERadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", d->view, TQ_SLOT(slotCombinedView()), actionCollection(), "combined_view"); ra->setExclusiveGroup( "ViewMode" ); vm->insert(ra); // toolbar / feed menu - new TDEAction(i18n("&Fetch Feed"), "go-down", TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch"); - new TDEAction(i18n("Fe&tch All Feeds"), "go-bottom", "Ctrl+L", TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all"); + new TDEAction(i18n("&Fetch Feed"), "go-down", TDEStdAccel::shortcut(TDEStdAccel::Reload), d->view, TQ_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch"); + new TDEAction(i18n("Fe&tch All Feeds"), "go-bottom", "Ctrl+L", d->view, TQ_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all"); - TDEAction* stopAction = new TDEAction(i18n( "&Abort Fetches" ), "process-stop", Key_Escape, Kernel::self()->fetchQueue(), TQT_SLOT(slotAbort()), actionCollection(), "feed_stop"); + TDEAction* stopAction = new TDEAction(i18n( "&Abort Fetches" ), "process-stop", Key_Escape, Kernel::self()->fetchQueue(), TQ_SLOT(slotAbort()), actionCollection(), "feed_stop"); stopAction->setEnabled(false); - new TDEAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", TQT_TQOBJECT(d->view), TQT_SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read"); - new TDEAction(i18n("Ma&rk All Feeds as Read"), "goto", "Ctrl+Shift+R", TQT_TQOBJECT(d->view), TQT_SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read"); + new TDEAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", d->view, TQ_SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read"); + new TDEAction(i18n("Ma&rk All Feeds as Read"), "goto", "Ctrl+Shift+R", d->view, TQ_SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read"); // Settings menu - TDEToggleAction* sqf = new TDEToggleAction(i18n("Show Quick Filter"), TQString(), 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter"); + TDEToggleAction* sqf = new TDEToggleAction(i18n("Show Quick Filter"), TQString(), 0, d->view, TQ_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter"); sqf->setChecked( Settings::showQuickFilter() ); - new TDEAction( i18n("Open in Tab"), "tab_new", "Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" ); - new TDEAction( i18n("Open in Background Tab"), TQString(), "tab_new", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" ); - new TDEAction( i18n("Open in External Browser"), "window-new", "Ctrl+Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" ); - new TDEAction( i18n("Copy Link Address"), TQString(), TQString(), TQT_TQOBJECT(d->view), TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" ); + new TDEAction( i18n("Open in Tab"), "tab_new", "Shift+Return", d->view, TQ_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" ); + new TDEAction( i18n("Open in Background Tab"), TQString(), "tab_new", d->view, TQ_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" ); + new TDEAction( i18n("Open in External Browser"), "window-new", "Ctrl+Shift+Return", d->view, TQ_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" ); + new TDEAction( i18n("Copy Link Address"), TQString(), TQString(), d->view, TQ_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" ); - new TDEAction(i18n("Pre&vious Unread Article"), "", Key_Minus, TQT_TQOBJECT(d->view), TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article"); - new TDEAction(i18n("Ne&xt Unread Article"), "", Key_Plus, TQT_TQOBJECT(d->view), TQT_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article"); + new TDEAction(i18n("Pre&vious Unread Article"), "", Key_Minus, d->view, TQ_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article"); + new TDEAction(i18n("Ne&xt Unread Article"), "", Key_Plus, d->view, TQ_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article"); - new TDEAction(i18n("&Delete"), "edit-delete", "Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleDelete()), actionCollection(), "article_delete"); + new TDEAction(i18n("&Delete"), "edit-delete", "Delete", d->view, TQ_SLOT(slotArticleDelete()), actionCollection(), "article_delete"); if (Settings::showTaggingGUI()) { @@ -336,39 +336,39 @@ void ActionManagerImpl::initView(View* view) TDEActionMenu* statusMenu = new TDEActionMenu ( i18n( "&Mark As" ), actionCollection(), "article_set_status" ); - d->speakSelectedArticlesAction = new TDEAction(i18n("&Speak Selected Articles"), "kttsd", "", TQT_TQOBJECT(d->view), TQT_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech"); + d->speakSelectedArticlesAction = new TDEAction(i18n("&Speak Selected Articles"), "kttsd", "", d->view, TQ_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech"); - TDEAction* abortTTS = new TDEAction(i18n( "&Stop Speaking" ), "media-playback-stop", Key_Escape, SpeechClient::self(), TQT_SLOT(slotAbortJobs()), actionCollection(), "akr_aborttexttospeech"); + TDEAction* abortTTS = new TDEAction(i18n( "&Stop Speaking" ), "media-playback-stop", Key_Escape, SpeechClient::self(), TQ_SLOT(slotAbortJobs()), actionCollection(), "akr_aborttexttospeech"); abortTTS->setEnabled(false); - connect(SpeechClient::self(), TQT_SIGNAL(signalActivated(bool)), - abortTTS, TQT_SLOT(setEnabled(bool))); + connect(SpeechClient::self(), TQ_SIGNAL(signalActivated(bool)), + abortTTS, TQ_SLOT(setEnabled(bool))); statusMenu->insert(new TDEAction(KGuiItem(i18n("as in: mark as read","&Read"), "", i18n("Mark selected article as read")), - "Ctrl+E", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleRead()), + "Ctrl+E", d->view, TQ_SLOT(slotSetSelectedArticleRead()), actionCollection(), "article_set_status_read")); statusMenu->insert(new TDEAction(KGuiItem(i18n("&New"), "", i18n("Mark selected article as new")), - "Ctrl+N", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleNew()), + "Ctrl+N", d->view, TQ_SLOT(slotSetSelectedArticleNew()), actionCollection(), "article_set_status_new" )); statusMenu->insert(new TDEAction(KGuiItem(i18n("&Unread"), "", i18n("Mark selected article as unread")), - "Ctrl+U", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleUnread()), + "Ctrl+U", d->view, TQ_SLOT(slotSetSelectedArticleUnread()), actionCollection(), "article_set_status_unread")); TDEToggleAction* importantAction = new TDEToggleAction(i18n("&Mark as Important"), "flag", "Ctrl+I", actionCollection(), "article_set_status_important"); importantAction->setCheckedState(i18n("Remove &Important Mark")); - connect(importantAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleToggleKeepFlag(bool))); + connect(importantAction, TQ_SIGNAL(toggled(bool)), d->view, TQ_SLOT(slotArticleToggleKeepFlag(bool))); - new TDEAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" ); - new TDEAction( i18n("Move Node Down"), TQString(), "Shift+Alt+Down", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" ); - new TDEAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" ); - new TDEAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right"); + new TDEAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", view, TQ_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" ); + new TDEAction( i18n("Move Node Down"), TQString(), "Shift+Alt+Down", view, TQ_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" ); + new TDEAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", view, TQ_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" ); + new TDEAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", view, TQ_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right"); } void ActionManagerImpl::initArticleViewer(ArticleViewer* articleViewer) @@ -386,8 +386,8 @@ void ActionManagerImpl::initArticleListView(ArticleListView* articleList) else d->articleList = articleList; - new TDEAction( i18n("&Previous Article"), TQString(), "Left", TQT_TQOBJECT(articleList), TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" ); - new TDEAction( i18n("&Next Article"), TQString(), "Right", TQT_TQOBJECT(articleList), TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" ); + new TDEAction( i18n("&Previous Article"), TQString(), "Left", articleList, TQ_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" ); + new TDEAction( i18n("&Next Article"), TQString(), "Right", articleList, TQ_SLOT(slotNextArticle()), actionCollection(), "go_next_article" ); } void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget) @@ -397,17 +397,17 @@ void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget) else d->listTabWidget = listTabWidget; - new TDEAction(i18n("&Previous Feed"), "", "P", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotPrevFeed()),actionCollection(), "go_prev_feed"); - new TDEAction(i18n("&Next Feed"), "", "N", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotNextFeed()),actionCollection(), "go_next_feed"); - new TDEAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed"); - new TDEAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed"); - - new TDEAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" ); - new TDEAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" ); - new TDEAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" ); - new TDEAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" ); - new TDEAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" ); - new TDEAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" ); + new TDEAction(i18n("&Previous Feed"), "", "P", listTabWidget, TQ_SLOT(slotPrevFeed()),actionCollection(), "go_prev_feed"); + new TDEAction(i18n("&Next Feed"), "", "N", listTabWidget, TQ_SLOT(slotNextFeed()),actionCollection(), "go_next_feed"); + new TDEAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", listTabWidget, TQ_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed"); + new TDEAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", listTabWidget, TQ_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed"); + + new TDEAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", listTabWidget, TQ_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" ); + new TDEAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", listTabWidget, TQ_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" ); + new TDEAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", listTabWidget, TQ_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" ); + new TDEAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", listTabWidget, TQ_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" ); + new TDEAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", listTabWidget, TQ_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" ); + new TDEAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", listTabWidget, TQ_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" ); } void ActionManagerImpl::initTabWidget(TabWidget* tabWidget) @@ -417,11 +417,11 @@ void ActionManagerImpl::initTabWidget(TabWidget* tabWidget) else d->tabWidget = tabWidget; - new TDEAction(i18n("Select Next Tab"), "", "Ctrl+Period", TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotNextTab()),actionCollection(), "select_next_tab"); - new TDEAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab"); - new TDEAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotDetachTab()), actionCollection(), "tab_detach" ); - new TDEAction( i18n("Copy Link Address"), TQString(), TQString(), TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" ); - new TDEAction( i18n("&Close Tab"), "tab_remove", TDEStdAccel::close(), TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" ); + new TDEAction(i18n("Select Next Tab"), "", "Ctrl+Period", d->tabWidget, TQ_SLOT(slotNextTab()),actionCollection(), "select_next_tab"); + new TDEAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", d->tabWidget, TQ_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab"); + new TDEAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, d->tabWidget, TQ_SLOT(slotDetachTab()), actionCollection(), "tab_detach" ); + new TDEAction( i18n("Copy Link Address"), TQString(), TQString(), d->tabWidget, TQ_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" ); + new TDEAction( i18n("&Close Tab"), "tab_remove", TDEStdAccel::close(), d->tabWidget, TQ_SLOT(slotCloseTab()), actionCollection(), "tab_remove" ); } TQWidget* ActionManagerImpl::container(const char* name) diff --git a/akregator/src/actionmanagerimpl.h b/akregator/src/actionmanagerimpl.h index adbb6627..6b192986 100644 --- a/akregator/src/actionmanagerimpl.h +++ b/akregator/src/actionmanagerimpl.h @@ -49,7 +49,7 @@ class TabWidget; /** Akregator-specific implementation of the ActionManager interface */ class ActionManagerImpl : public ActionManager { - Q_OBJECT + TQ_OBJECT public: diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp index 05a6a8e0..1e09dc71 100644 --- a/akregator/src/addfeeddialog.cpp +++ b/akregator/src/addfeeddialog.cpp @@ -42,7 +42,7 @@ namespace Akregator { AddFeedWidget::AddFeedWidget(TQWidget *parent, const char *name) : AddFeedWidgetBase(parent, name) { - pixmapLabel1->setPixmap(kapp->iconLoader()->loadIcon( "applications-internet",TDEIcon::Desktop,TDEIcon::SizeHuge, TDEIcon::DefaultState, 0, true)); + pixmapLabel1->setPixmap(tdeApp->iconLoader()->loadIcon( "applications-internet",TDEIcon::Desktop,TDEIcon::SizeHuge, TDEIcon::DefaultState, 0, true)); statusLabel->setText(TQString()); } @@ -53,7 +53,7 @@ AddFeedDialog::AddFeedDialog(TQWidget *parent, const char *name) : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, parent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel) { widget = new AddFeedWidget(this); - connect(widget->urlEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged(const TQString&))); + connect(widget->urlEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(textChanged(const TQString&))); enableButtonOK(false); setMainWidget(widget); } @@ -85,12 +85,12 @@ void AddFeedDialog::slotOk( ) widget->statusLabel->setText( i18n("Downloading %1").arg(feedURL) ); - 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 *)) ); + connect( feed, TQ_SIGNAL(fetched(Feed* )), + this, TQ_SLOT(fetchCompleted(Feed *)) ); + connect( feed, TQ_SIGNAL(fetchError(Feed* )), + this, TQ_SLOT(fetchError(Feed *)) ); + connect( feed, TQ_SIGNAL(fetchDiscovery(Feed* )), + this, TQ_SLOT(fetchDiscovery(Feed *)) ); f->fetch(true); } @@ -120,4 +120,3 @@ void AddFeedDialog::textChanged(const TQString& text) } // namespace Akregator #include "addfeeddialog.moc" -// vim: ts=4 sw=4 et diff --git a/akregator/src/addfeeddialog.h b/akregator/src/addfeeddialog.h index 51d93ba2..b81948de 100644 --- a/akregator/src/addfeeddialog.h +++ b/akregator/src/addfeeddialog.h @@ -40,7 +40,7 @@ namespace Akregator class AddFeedWidget : public AddFeedWidgetBase { - Q_OBJECT + TQ_OBJECT public: AddFeedWidget(TQWidget *parent = 0, const char *name = 0); @@ -49,7 +49,7 @@ namespace Akregator class AddFeedDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: AddFeedDialog(TQWidget *parent = 0, const char *name = 0); diff --git a/akregator/src/akregator_export.h b/akregator/src/akregator_export.h index 00fead92..4ee5db1c 100644 --- a/akregator/src/akregator_export.h +++ b/akregator/src/akregator_export.h @@ -21,8 +21,8 @@ #ifndef AKREGATOR_AKREGATOREXPORT_H #define AKREGATOR_AKREGATOREXPORT_H -#include <tdepimmacros.h> +#include <tdemacros.h> -#define AKREGATOR_EXPORT KDE_EXPORT +#define AKREGATOR_EXPORT TDE_EXPORT #endif diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index d7ca0d44..14562fc8 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -33,14 +33,14 @@ #include <tdefiledialog.h> #include <tdeglobalsettings.h> #include <tdehtmldefaults.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdemainwindow.h> #include <tdemessagebox.h> #include <knotifyclient.h> #include <knotifydialog.h> #include <tdepopupmenu.h> #include <kservice.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdaction.h> #include <tdetempfile.h> #include <ktrader.h> @@ -54,7 +54,7 @@ #include <tqstringlist.h> #include <tqtimer.h> #include <tqwidgetlist.h> -#include <tqucomextra_p.h> +#include <private/tqucomextra_p.h> #include <cerrno> #include <sys/types.h> @@ -195,12 +195,12 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, m_extension = new BrowserExtension(this, "ak_extension"); - 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(TDEIO::Job*)), this, TQT_SIGNAL(started(TDEIO::Job*))); - connect(m_view, TQT_SIGNAL(signalCompleted()), this, TQT_SIGNAL(completed())); + connect(m_view, TQ_SIGNAL(setWindowCaption(const TQString&)), this, TQ_SIGNAL(setWindowCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(setStatusBarText(const TQString&)), this, TQ_SIGNAL(setStatusBarText(const TQString&))); + connect(m_view, TQ_SIGNAL(setProgress(int)), m_extension, TQ_SIGNAL(loadingProgress(int))); + connect(m_view, TQ_SIGNAL(signalCanceled(const TQString&)), this, TQ_SIGNAL(canceled(const TQString&))); + connect(m_view, TQ_SIGNAL(signalStarted(TDEIO::Job*)), this, TQ_SIGNAL(started(TDEIO::Job*))); + connect(m_view, TQ_SIGNAL(signalCompleted()), this, TQ_SIGNAL(completed())); // notify the part that this is our internal widget setWidget(m_view); @@ -209,7 +209,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, TrayIcon::setInstance(trayIcon); m_actionManager->initTrayIcon(trayIcon); - connect(trayIcon, TQT_SIGNAL(showPart()), this, TQT_SIGNAL(showPart())); + connect(trayIcon, TQ_SIGNAL(showPart()), this, TQ_SIGNAL(showPart())); if ( isTrayIconEnabled() ) { @@ -219,15 +219,15 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, else NotificationManager::self()->setWidget(getMainWindow(), instance()); - connect( trayIcon, TQT_SIGNAL(quitSelected()), - kapp, TQT_SLOT(quit())) ; + connect( trayIcon, TQ_SIGNAL(quitSelected()), + tdeApp, TQ_SLOT(quit())) ; - connect( m_view, TQT_SIGNAL(signalUnreadCountChanged(int)), trayIcon, TQT_SLOT(slotSetUnread(int)) ); + connect( m_view, TQ_SIGNAL(signalUnreadCountChanged(int)), trayIcon, TQ_SLOT(slotSetUnread(int)) ); - connect(kapp, TQT_SIGNAL(shutDown()), this, TQT_SLOT(slotOnShutdown())); + connect(tdeApp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(slotOnShutdown())); m_autosaveTimer = new TQTimer(this); - connect(m_autosaveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSaveFeedList())); + connect(m_autosaveTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSaveFeedList())); m_autosaveTimer->start(5*60*1000); // 5 minutes setXMLFile("akregator_part.rc", true); @@ -255,7 +255,7 @@ void Part::slotOnShutdown() m_shuttingDown = true; const TQString lockLocation = locateLocal("data", "akregator/lock"); - KSimpleConfig config(lockLocation); + TDESimpleConfig config(lockLocation); config.writeEntry("pid", -1); config.sync(); @@ -530,7 +530,7 @@ TQWidget* Part::getMainWindow() { // this is a dirty fix to get the main window used for the tray icon - TQWidgetList *l = kapp->topLevelWidgets(); + TQWidgetList *l = tdeApp->topLevelWidgets(); TQWidgetListIt it( *l ); TQWidget *wid; @@ -721,7 +721,7 @@ void Part::fileSendArticle(bool attach) title = m_view->currentFrame()->title(); if(attach) { - kapp->invokeMailer("", + tdeApp->invokeMailer("", "", "", title, @@ -730,7 +730,7 @@ void Part::fileSendArticle(bool attach) text); } else { - kapp->invokeMailer("", + tdeApp->invokeMailer("", "", "", title, @@ -782,10 +782,10 @@ void Part::showOptions() TDEConfigDialog* dialog = new ConfigDialog( m_view, "settings", Settings::self() ); - connect( dialog, TQT_SIGNAL(settingsChanged()), - this, TQT_SLOT(slotSettingsChanged()) ); - connect( dialog, TQT_SIGNAL(settingsChanged()), - TrayIcon::getInstance(), TQT_SLOT(settingsChanged()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), + this, TQ_SLOT(slotSettingsChanged()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), + TrayIcon::getInstance(), TQ_SLOT(settingsChanged()) ); dialog->show(); } @@ -946,19 +946,19 @@ static TQString getMyHostName() bool Part::tryToLock(const TQString& backendName) { // Check and create a lock file to prevent concurrent access to metakit archive - TQString appName = kapp->instanceName(); + TQString appName = tdeApp->instanceName(); if ( appName.isEmpty() ) appName = "akregator"; TQString programName; - const TDEAboutData *about = kapp->aboutData(); + const TDEAboutData *about = tdeApp->aboutData(); if ( about ) programName = about->programName(); if ( programName.isEmpty() ) programName = i18n("Akregator"); TQString lockLocation = locateLocal("data", "akregator/lock"); - KSimpleConfig config(lockLocation); + TDESimpleConfig config(lockLocation); int oldPid = config.readNumEntry("pid", -1); const TQString oldHostName = config.readEntry("hostname"); const TQString oldAppName = config.readEntry( "appName", appName ); @@ -982,7 +982,7 @@ bool Part::tryToLock(const TQString& backendName) { // this can only happen if the user is running this application on // different displays on the same machine. All other cases will be - // taken care of by KUniqueApplication() + // taken care of by TDEUniqueApplication() if ( oldAppName == appName ) msg = i18n("<qt>%1 already seems to be running on another display on " "this machine. <b>Running %2 more than once is not supported " diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h index 1e17c05f..d84f2f90 100644 --- a/akregator/src/akregator_part.h +++ b/akregator/src/akregator_part.h @@ -59,7 +59,7 @@ namespace Akregator class BrowserExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT public: @@ -76,7 +76,7 @@ namespace Akregator */ class Part : public MyBasePart, virtual public AkregatorPartIface { - Q_OBJECT + TQ_OBJECT public: typedef MyBasePart inherited; @@ -220,5 +220,3 @@ namespace Akregator } #endif // _AKREGATORPART_H_ - -// vim: set et ts=4 sts=4 sw=4: diff --git a/akregator/src/akregator_run.cpp b/akregator/src/akregator_run.cpp index 84fd6572..d22f2f61 100644 --- a/akregator/src/akregator_run.cpp +++ b/akregator/src/akregator_run.cpp @@ -38,7 +38,7 @@ BrowserRun::BrowserRun(TQWidget* mainWindow, Viewer* currentViewer, const KURL& if (mode == CURRENT_TAB) { - connect(m_currentViewer, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotViewerDeleted())); + connect(m_currentViewer, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotViewerDeleted())); } setEnableExternalBrowser(false); } @@ -68,5 +68,3 @@ void BrowserRun::slotViewerDeleted() } // namespace Akregator #include "akregator_run.moc" - -// vim: set et ts=4 sts=4 sw=4: diff --git a/akregator/src/akregator_run.h b/akregator/src/akregator_run.h index e819dc13..82b46db9 100644 --- a/akregator/src/akregator_run.h +++ b/akregator/src/akregator_run.h @@ -34,7 +34,7 @@ class Viewer; class BrowserRun : public KParts::BrowserRun { - Q_OBJECT + TQ_OBJECT public: /** indicates how HTML pages should be opened. It is passed in the constructor and sent back via the openInViewer signal. This is a workaround to fix opening of non-HTML mimetypes in 3.5, which will be refactored for KDE4 anyway. For 3.5.x it's the easiest way to fix the problem without changing too much code TODO KDE4: refactor, remove this enum */ @@ -67,5 +67,3 @@ class BrowserRun : public KParts::BrowserRun } #endif - -// vim: set et ts=4 sts=4 sw=4: diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index a65adf39..35d55057 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -76,10 +76,10 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kpassdlg.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krun.h> #include <kshell.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> #include <kxmlguifactory.h> #include <tdeparts/partmanager.h> @@ -224,26 +224,26 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons m_shuttingDown = false; m_displayingAboutPage = false; m_currentFrame = 0L; - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); TQVBoxLayout *lt = new TQVBoxLayout( this ); - m_horizontalSplitter = new TQSplitter(Qt::Horizontal, this); + m_horizontalSplitter = new TQSplitter(TQt::Horizontal, this); m_horizontalSplitter->setOpaqueResize(true); lt->addWidget(m_horizontalSplitter); - 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()->fetchQueue(), TQ_SIGNAL(fetched(Feed*)), this, TQ_SLOT(slotFeedFetched(Feed*))); + connect (Kernel::self()->fetchQueue(), TQ_SIGNAL(signalStarted()), this, TQ_SLOT(slotFetchingStarted())); + connect (Kernel::self()->fetchQueue(), TQ_SIGNAL(signalStopped()), this, TQ_SLOT(slotFetchingStopped())); - 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&))); + connect(Kernel::self()->tagSet(), TQ_SIGNAL(signalTagAdded(const Tag&)), this, TQ_SLOT(slotTagCreated(const Tag&))); + connect(Kernel::self()->tagSet(), TQ_SIGNAL(signalTagRemoved(const Tag&)), this, TQ_SLOT(slotTagRemoved(const Tag&))); m_listTabWidget = new ListTabWidget(m_horizontalSplitter); m_actionManager->initListTabWidget(m_listTabWidget); - connect(m_listTabWidget, TQT_SIGNAL(signalNodeSelected(TreeNode*)), this, TQT_SLOT(slotNodeSelected(TreeNode*))); + connect(m_listTabWidget, TQ_SIGNAL(signalNodeSelected(TreeNode*)), this, TQ_SLOT(slotNodeSelected(TreeNode*))); if (!Settings::showTaggingGUI()) m_listTabWidget->setViewMode(ListTabWidget::single); @@ -251,16 +251,16 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons m_feedListView = new NodeListView( this, "feedtree" ); m_listTabWidget->addView(m_feedListView, i18n("Feeds"), TDEGlobal::iconLoader()->loadIcon("folder", TDEIcon::Small)); - connect(m_feedListView, TQT_SIGNAL(signalContextMenu(TDEListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&))); + connect(m_feedListView, TQ_SIGNAL(signalContextMenu(TDEListView*, TreeNode*, const TQPoint&)), this, TQ_SLOT(slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&))); - connect(m_feedListView, TQT_SIGNAL(signalDropped (KURL::List &, TreeNode*, - Folder*)), this, TQT_SLOT(slotFeedURLDropped (KURL::List &, + connect(m_feedListView, TQ_SIGNAL(signalDropped (KURL::List &, TreeNode*, + Folder*)), this, TQ_SLOT(slotFeedURLDropped (KURL::List &, TreeNode*, Folder*))); m_tagNodeListView = new NodeListView(this); m_listTabWidget->addView(m_tagNodeListView, i18n("Tags"), TDEGlobal::iconLoader()->loadIcon("rss_tag", TDEIcon::Small)); - connect(m_tagNodeListView, TQT_SIGNAL(signalContextMenu(TDEListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&))); + connect(m_tagNodeListView, TQ_SIGNAL(signalContextMenu(TDEListView*, TreeNode*, const TQPoint&)), this, TQ_SLOT(slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&))); ProgressManager::self()->setFeedList(m_feedList); @@ -268,10 +268,10 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons m_tabs = new TabWidget(m_horizontalSplitter); m_actionManager->initTabWidget(m_tabs); - connect( m_part, TQT_SIGNAL(signalSettingsChanged()), m_tabs, TQT_SLOT(slotSettingsChanged())); + connect( m_part, TQ_SIGNAL(signalSettingsChanged()), m_tabs, TQ_SLOT(slotSettingsChanged())); - connect( m_tabs, TQT_SIGNAL( currentFrameChanged(Frame *) ), this, - TQT_SLOT( slotFrameChanged(Frame *) ) ); + connect( m_tabs, TQ_SIGNAL( currentFrameChanged(Frame *) ), this, + TQ_SLOT( slotFrameChanged(Frame *) ) ); TQWhatsThis::add(m_tabs, i18n("You can view multiple articles in several open tabs.")); @@ -287,39 +287,39 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons mainTabLayout->addWidget(m_searchBar); - m_articleSplitter = new TQSplitter(Qt::Vertical, m_mainTab, "panner2"); + m_articleSplitter = new TQSplitter(TQt::Vertical, m_mainTab, "panner2"); m_articleList = new ArticleListView( m_articleSplitter, "articles" ); m_actionManager->initArticleListView(m_articleList); - connect( m_articleList, TQT_SIGNAL(signalMouseButtonPressed(int, const Article&, const TQPoint &, int)), this, TQT_SLOT(slotMouseButtonPressed(int, const Article&, const TQPoint &, int))); + connect( m_articleList, TQ_SIGNAL(signalMouseButtonPressed(int, const Article&, const TQPoint &, int)), this, TQ_SLOT(slotMouseButtonPressed(int, const Article&, const TQPoint &, int))); // use selectionChanged instead of clicked - 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)) ); + connect( m_articleList, TQ_SIGNAL(signalArticleChosen(const Article&)), + this, TQ_SLOT( slotArticleSelected(const Article&)) ); + connect( m_articleList, TQ_SIGNAL(signalDoubleClicked(const Article&, const TQPoint&, int)), + this, TQ_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, 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, TQ_SIGNAL(signalSearch(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)), m_articleList, TQ_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_searchBar, TQ_SIGNAL(signalSearch(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)), m_articleViewer, TQ_SLOT(slotSetFilter(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&))); - connect( m_articleViewer, TQT_SIGNAL(urlClicked(const KURL&, Viewer*, bool, bool)), - this, TQT_SLOT(slotUrlClickedInViewer(const KURL&, Viewer*, bool, bool)) ); + connect( m_articleViewer, TQ_SIGNAL(urlClicked(const KURL&, Viewer*, bool, bool)), + this, TQ_SLOT(slotUrlClickedInViewer(const KURL&, Viewer*, bool, bool)) ); - connect( m_articleViewer->browserExtension(), TQT_SIGNAL(mouseOverInfo(const KFileItem *)), - this, TQT_SLOT(slotMouseOverInfo(const KFileItem *)) ); + connect( m_articleViewer->browserExtension(), TQ_SIGNAL(mouseOverInfo(const KFileItem *)), + this, TQ_SLOT(slotMouseOverInfo(const KFileItem *)) ); - connect( m_part, TQT_SIGNAL(signalSettingsChanged()), m_articleViewer, TQT_SLOT(slotPaletteOrFontChanged())); + connect( m_part, TQ_SIGNAL(signalSettingsChanged()), m_articleViewer, TQ_SLOT(slotPaletteOrFontChanged())); TQWhatsThis::add(m_articleViewer->widget(), i18n("Browsing area.")); mainTabLayout->addWidget( m_articleSplitter ); - m_mainFrame=new Frame(TQT_TQOBJECT(this), m_part, m_mainTab, i18n("Articles"), false); + m_mainFrame=new Frame(this, m_part, m_mainTab, i18n("Articles"), false); connectFrame(m_mainFrame); m_tabs->addFrame(m_mainFrame); @@ -342,17 +342,17 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons } m_fetchTimer = new TQTimer(this); - connect( m_fetchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDoIntervalFetches()) ); + connect( m_fetchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDoIntervalFetches()) ); m_fetchTimer->start(1000*60); // delete expired articles once per hour m_expiryTimer = new TQTimer(this); - connect(m_expiryTimer, TQT_SIGNAL(timeout()), this, - TQT_SLOT(slotDeleteExpiredArticles()) ); + connect(m_expiryTimer, TQ_SIGNAL(timeout()), this, + TQ_SLOT(slotDeleteExpiredArticles()) ); m_expiryTimer->start(3600*1000); m_markReadTimer = new TQTimer(this); - connect(m_markReadTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSetCurrentArticleReadDelayed()) ); + connect(m_markReadTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSetCurrentArticleReadDelayed()) ); switch (Settings::viewMode()) { @@ -372,7 +372,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons m_searchBar->slotSetText(Settings::textFilter()); } - TQTimer::singleShot(1000, this, TQT_SLOT(slotDeleteExpiredArticles()) ); + TQTimer::singleShot(1000, this, TQ_SLOT(slotDeleteExpiredArticles()) ); m_part->mergePart(m_articleViewer); } @@ -433,17 +433,17 @@ void View::slotOpenNewTab(const KURL& url, bool background) { PageViewer* page = new PageViewer(this, "page"); - connect( m_part, TQT_SIGNAL(signalSettingsChanged()), page, TQT_SLOT(slotPaletteOrFontChanged())); + connect( m_part, TQ_SIGNAL(signalSettingsChanged()), page, TQ_SLOT(slotPaletteOrFontChanged())); - 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)) ); + connect( page, TQ_SIGNAL(setTabIcon(const TQPixmap&)), + this, TQ_SLOT(setTabIcon(const TQPixmap&))); + connect( page, TQ_SIGNAL(urlClicked(const KURL &, Viewer*, bool, bool)), + this, TQ_SLOT(slotUrlClickedInViewer(const KURL &, Viewer*, bool, bool)) ); - Frame* frame = new Frame(TQT_TQOBJECT(this), page, page->widget(), i18n("Untitled")); + Frame* frame = new Frame(this, page, page->widget(), i18n("Untitled")); frame->setAutoDeletePart(true); // delete page viewer when removing the tab - connect(page, TQT_SIGNAL(setWindowCaption (const TQString &)), frame, TQT_SLOT(setTitle (const TQString &))); + connect(page, TQ_SIGNAL(setWindowCaption (const TQString &)), frame, TQ_SLOT(setTitle (const TQString &))); connectFrame(frame); m_tabs->addFrame(frame); @@ -466,12 +466,12 @@ void View::setTabIcon(const TQPixmap& icon) void View::connectFrame(Frame *f) { - 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&))); + connect(f, TQ_SIGNAL(statusText(const TQString &)), this, TQ_SLOT(slotStatusText(const TQString&))); + connect(f, TQ_SIGNAL(captionChanged (const TQString &)), this, TQ_SLOT(slotCaptionChanged (const TQString &))); + connect(f, TQ_SIGNAL(loadingProgress(int)), this, TQ_SLOT(slotLoadingProgress(int)) ); + connect(f, TQ_SIGNAL(started()), this, TQ_SLOT(slotStarted())); + connect(f, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted())); + connect(f, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotCanceled(const TQString&))); } void View::slotStatusText(const TQString &c) @@ -647,7 +647,7 @@ void View::slotNormalView() m_articleViewer->slotShowSummary(m_listTabWidget->activeView()->selectedNode()); } - m_articleSplitter->setOrientation(Qt::Vertical); + m_articleSplitter->setOrientation(TQt::Vertical); m_viewMode = NormalView; Settings::setViewMode( m_viewMode ); @@ -671,7 +671,7 @@ void View::slotWidescreenView() m_articleViewer->slotShowSummary(m_listTabWidget->activeView()->selectedNode()); } - m_articleSplitter->setOrientation(Qt::Horizontal); + m_articleSplitter->setOrientation(TQt::Horizontal); m_viewMode = WidescreenView; Settings::setViewMode( m_viewMode ); @@ -841,8 +841,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, TQT_SIGNAL(signalOpenInViewer(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode)), - this, TQT_SLOT(slotOpenURLReply(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode))); + connect(r, TQ_SIGNAL(signalOpenInViewer(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode)), + this, TQ_SLOT(slotOpenURLReply(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode))); } } @@ -1109,7 +1109,7 @@ void View::slotFeedFetched(Feed *feed) void View::slotMouseButtonPressed(int button, const Article& article, const TQPoint &, int) { - if (button == Qt::MidButton) + if (button == TQt::MidButton) { KURL link = article.link(); switch (Settings::mMBBehaviour()) @@ -1518,13 +1518,13 @@ void View::saveProperties(TDEConfig* config) void View::connectToFeedList(FeedList* feedList) { - connect(feedList->rootNode(), TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotSetTotalUnread())); + connect(feedList->rootNode(), TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotSetTotalUnread())); slotSetTotalUnread(); } void View::disconnectFromFeedList(FeedList* feedList) { - disconnect(feedList->rootNode(), TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotSetTotalUnread())); + disconnect(feedList->rootNode(), TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotSetTotalUnread())); } void View::updateTagActions() diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h index bfc08df4..629f9057 100644 --- a/akregator/src/akregator_view.h +++ b/akregator/src/akregator_view.h @@ -79,7 +79,7 @@ namespace Akregator { */ class View : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/akregator/src/akregatorconfig.kcfgc b/akregator/src/akregatorconfig.kcfgc index 66183471..fef64628 100644 --- a/akregator/src/akregatorconfig.kcfgc +++ b/akregator/src/akregatorconfig.kcfgc @@ -4,5 +4,5 @@ ClassName=Settings NameSpace=Akregator Singleton=true Mutators=true -Visibility=KDE_EXPORT +Visibility=TDE_EXPORT MemberVariables=private diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp index a0e5c8b7..7cbe624f 100644 --- a/akregator/src/articlelistview.cpp +++ b/akregator/src/articlelistview.cpp @@ -32,7 +32,7 @@ #include "treenode.h" #include "treenodevisitor.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdeglobal.h> #include <kiconloader.h> @@ -271,13 +271,13 @@ ArticleListView::ArticleListView(TQWidget *parent, const char *name) "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, 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(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(currentChanged(TQListViewItem*)), this, TQ_SLOT(slotCurrentChanged(TQListViewItem* ))); + connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(slotDoubleClicked(TQListViewItem*, const TQPoint&, int)) ); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT(slotMouseButtonPressed(int, TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)), this, TQ_SLOT(slotMouseButtonPressed(int, TQListViewItem *, const TQPoint &, int))); } Article ArticleListView::currentArticle() const @@ -482,18 +482,18 @@ void ArticleListView::slotArticlesRemoved(TreeNode* /*node*/, const TQValueList< void ArticleListView::connectToNode(TreeNode* node) { - connect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear()) ); - connect(node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) ); - connect(node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) ); - connect(node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) ); + connect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotClear()) ); + connect(node, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) ); + connect(node, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) ); + connect(node, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) ); } void ArticleListView::disconnectFromNode(TreeNode* node) { - disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear()) ); - disconnect(node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) ); - disconnect(node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) ); - disconnect(node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) ); + disconnect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotClear()) ); + disconnect(node, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) ); + disconnect(node, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) ); + disconnect(node, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) ); } void ArticleListView::applyFilters() @@ -809,4 +809,3 @@ TQValueList<Article> ArticleListView::selectedArticles() const } // namespace Akregator #include "articlelistview.moc" -// vim: ts=4 sw=4 et diff --git a/akregator/src/articlelistview.h b/akregator/src/articlelistview.h index caf1258b..6455aead 100644 --- a/akregator/src/articlelistview.h +++ b/akregator/src/articlelistview.h @@ -42,7 +42,7 @@ namespace Akregator class ArticleListView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: ArticleListView(TQWidget *parent = 0, const char *name = 0); diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index 8067b732..e2259ad5 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -33,9 +33,9 @@ #include <tdeglobalsettings.h> #include <tdehtmlview.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krun.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kshell.h> #include <tdemessagebox.h> #include <tdeio/netaccess.h> @@ -170,13 +170,13 @@ ArticleViewer::ArticleViewer(TQWidget *parent, const char *name) generateNormalModeCSS(); generateCombinedModeCSS(); - new TDEAction( i18n("&Scroll Up"), TQString(), "Up", this, TQT_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" ); - new TDEAction( i18n("&Scroll Down"), TQString(), "Down", this, TQT_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" ); + new TDEAction( i18n("&Scroll Up"), TQString(), "Up", this, TQ_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" ); + new TDEAction( i18n("&Scroll Down"), TQString(), "Down", this, TQ_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" ); - connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(slotPaletteOrFontChanged()) ); - connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), this, TQT_SLOT(slotPaletteOrFontChanged()) ); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(slotPaletteOrFontChanged()) ); + connect(tdeApp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotPaletteOrFontChanged()) ); m_imageDir.setPath(TDEGlobal::dirs()->saveLocation("cache", "akregator/Media/")); m_htmlFooter = "</body></html>"; @@ -370,7 +370,7 @@ void ArticleViewer::displayAboutPage() TQString location = locate("data", "akregator/about/main.html"); TQString content = KPIM::kFileToString(location); content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); - if ( kapp->reverseLayout() ) + if ( tdeApp->reverseLayout() ) content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); else content = content.arg( "" ); @@ -767,15 +767,15 @@ void ArticleViewer::connectToNode(TreeNode* node) { if (m_viewMode == CombinedView) { -// connect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotUpdateCombinedView() ) ); - connect( node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&))); - connect( node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&))); - connect( node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&))); +// connect( node, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotUpdateCombinedView() ) ); + connect( node, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&))); + connect( node, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&))); + connect( node, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&))); } if (m_viewMode == SummaryView) - connect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotShowSummary(TreeNode*) ) ); + connect( node, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotShowSummary(TreeNode*) ) ); - connect( node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear() ) ); + connect( node, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotClear() ) ); } } @@ -783,12 +783,12 @@ void ArticleViewer::disconnectFromNode(TreeNode* node) { if (node) { -// disconnect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotUpdateCombinedView() ) ); - disconnect( node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear() ) ); - disconnect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotShowSummary(TreeNode*) ) ); - disconnect( node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&))); - disconnect( node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&))); - disconnect( node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&))); +// disconnect( node, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotUpdateCombinedView() ) ); + disconnect( node, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotClear() ) ); + disconnect( node, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotShowSummary(TreeNode*) ) ); + disconnect( node, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&))); + disconnect( node, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&))); + disconnect( node, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&))); } } diff --git a/akregator/src/articleviewer.h b/akregator/src/articleviewer.h index 44443f7d..e74a86ce 100644 --- a/akregator/src/articleviewer.h +++ b/akregator/src/articleviewer.h @@ -47,7 +47,7 @@ namespace Akregator Use the high-level interface provided by the public slots whereever possible (and extend them when necessary instead of using low-level methods).*/ class ArticleViewer : public Viewer { - Q_OBJECT + TQ_OBJECT public: /** Constructor */ diff --git a/akregator/src/configdialog.h b/akregator/src/configdialog.h index 3fd7c8f2..d165e094 100644 --- a/akregator/src/configdialog.h +++ b/akregator/src/configdialog.h @@ -34,7 +34,7 @@ class SettingsAppearance; class ConfigDialog : public TDEConfigDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp index 7e7f59e8..ef54e082 100644 --- a/akregator/src/feed.cpp +++ b/akregator/src/feed.cpp @@ -34,7 +34,7 @@ #include <kurl.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "akregatorconfig.h" #include "article.h" @@ -579,8 +579,8 @@ void Feed::tryFetch() { d->fetchError = false; - d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, Status)) ); - //connect(d->loader, TQT_SIGNAL(progress(unsigned long)), this, TQT_SLOT(slotSetProgress(unsigned long))); + d->loader = RSS::Loader::create( this, TQ_SLOT(fetchCompleted(Loader *, Document, Status)) ); + //connect(d->loader, TQ_SIGNAL(progress(unsigned long)), this, TQ_SLOT(slotSetProgress(unsigned long))); d->loader->loadFrom( d->xmlUrl, new RSS::FileRetriever ); } @@ -635,7 +635,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status) if (doc.image() && d->imagePixmap.isNull()) { d->image = *doc.image(); - connect(&d->image, TQT_SIGNAL(gotPixmap(const TQPixmap&)), this, TQT_SLOT(slotImageFetched(const TQPixmap&))); + connect(&d->image, TQ_SIGNAL(gotPixmap(const TQPixmap&)), this, TQ_SLOT(slotImageFetched(const TQPixmap&))); d->image.getPixmap(); } diff --git a/akregator/src/feed.h b/akregator/src/feed.h index 2a6c5639..7a376386 100644 --- a/akregator/src/feed.h +++ b/akregator/src/feed.h @@ -63,7 +63,7 @@ namespace Akregator { friend class Article; - Q_OBJECT + TQ_OBJECT public: /** the archiving modes: diff --git a/akregator/src/feediconmanager.cpp b/akregator/src/feediconmanager.cpp index 2167abf4..39aad70d 100644 --- a/akregator/src/feediconmanager.cpp +++ b/akregator/src/feediconmanager.cpp @@ -29,7 +29,7 @@ #include <dcopclient.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <kurl.h> @@ -62,7 +62,7 @@ void FeedIconManager::fetchIcon(Feed* feed) if (!d->registeredFeeds.contains(feed)) { d->registeredFeeds.append(feed); - connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotFeedDestroyed(TreeNode*))); + connect(feed, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotFeedDestroyed(TreeNode*))); } TQString iconURL = getIconURL(KURL(feed->xmlUrl())); d->urlDict.insert(iconURL, feed); @@ -95,7 +95,7 @@ void FeedIconManager::loadIcon(const TQString & url) TQByteArray data; TQDataStream ds(data, IO_WriteOnly); ds << u; - kapp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", + tdeApp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data); } else @@ -116,10 +116,10 @@ TQString FeedIconManager::iconLocation(const KURL & url) const ds << url; - kapp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data, + tdeApp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data, replyType, reply); - if (replyType == TQSTRING_OBJECT_NAME_STRING) { + if (replyType == "TQString") { TQDataStream replyStream(reply, IO_ReadOnly); TQString result; replyStream >> result; diff --git a/akregator/src/feediconmanager.h b/akregator/src/feediconmanager.h index 83df9d35..55adb33e 100644 --- a/akregator/src/feediconmanager.h +++ b/akregator/src/feediconmanager.h @@ -44,7 +44,7 @@ namespace Akregator class FeedIconManager:public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/akregator/src/feedlist.h b/akregator/src/feedlist.h index 0587e498..cc3473d6 100644 --- a/akregator/src/feedlist.h +++ b/akregator/src/feedlist.h @@ -43,7 +43,7 @@ class TreeNode; class FeedList : public NodeList { -Q_OBJECT +TQ_OBJECT public: diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp index f0a37363..34aa6825 100644 --- a/akregator/src/feedlistview.cpp +++ b/akregator/src/feedlistview.cpp @@ -82,16 +82,16 @@ class NodeListView::ConnectNodeVisitor : public TreeNodeVisitor virtual bool visitTreeNode(TreeNode* node) { - connect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*) )); - connect(node, TQT_SIGNAL(signalChanged(TreeNode*)), m_view, TQT_SLOT(slotNodeChanged(TreeNode*) )); + connect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQ_SLOT(slotNodeDestroyed(TreeNode*) )); + connect(node, TQ_SIGNAL(signalChanged(TreeNode*)), m_view, TQ_SLOT(slotNodeChanged(TreeNode*) )); return true; } virtual bool visitFolder(Folder* node) { visitTreeNode(node); - connect(node, TQT_SIGNAL(signalChildAdded(TreeNode*)), m_view, TQT_SLOT(slotNodeAdded(TreeNode*) )); - connect(node, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_view, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); + connect(node, TQ_SIGNAL(signalChildAdded(TreeNode*)), m_view, TQ_SLOT(slotNodeAdded(TreeNode*) )); + connect(node, TQ_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_view, TQ_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); return true; } @@ -99,10 +99,10 @@ class NodeListView::ConnectNodeVisitor : public TreeNodeVisitor { visitTreeNode(node); - connect(node, TQT_SIGNAL(fetchStarted(Feed*)), m_view, TQT_SLOT(slotFeedFetchStarted(Feed*))); - connect(node, TQT_SIGNAL(fetchAborted(Feed*)), m_view, TQT_SLOT(slotFeedFetchAborted(Feed*))); - connect(node, TQT_SIGNAL(fetchError(Feed*)), m_view, TQT_SLOT(slotFeedFetchError(Feed*))); - connect(node, TQT_SIGNAL(fetched(Feed*)), m_view, TQT_SLOT(slotFeedFetchCompleted(Feed*))); + connect(node, TQ_SIGNAL(fetchStarted(Feed*)), m_view, TQ_SLOT(slotFeedFetchStarted(Feed*))); + connect(node, TQ_SIGNAL(fetchAborted(Feed*)), m_view, TQ_SLOT(slotFeedFetchAborted(Feed*))); + connect(node, TQ_SIGNAL(fetchError(Feed*)), m_view, TQ_SLOT(slotFeedFetchError(Feed*))); + connect(node, TQ_SIGNAL(fetched(Feed*)), m_view, TQ_SLOT(slotFeedFetchCompleted(Feed*))); return true; } private: @@ -119,30 +119,30 @@ class NodeListView::DisconnectNodeVisitor : public TreeNodeVisitor virtual bool visitTagNode(TagNode* node) { - disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*) )); - disconnect(node, TQT_SIGNAL(signalChanged(TreeNode*)), m_view, TQT_SLOT(slotNodeChanged(TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQ_SLOT(slotNodeDestroyed(TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalChanged(TreeNode*)), m_view, TQ_SLOT(slotNodeChanged(TreeNode*) )); return true; } virtual bool visitFolder(Folder* node) { - disconnect(node, TQT_SIGNAL(signalChildAdded(TreeNode*)), m_view, TQT_SLOT(slotNodeAdded(TreeNode*) )); - disconnect(node, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_view, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalChildAdded(TreeNode*)), m_view, TQ_SLOT(slotNodeAdded(TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_view, TQ_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); - disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*) )); - disconnect(node, TQT_SIGNAL(signalChanged(TreeNode*)), m_view, TQT_SLOT(slotNodeChanged(TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQ_SLOT(slotNodeDestroyed(TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalChanged(TreeNode*)), m_view, TQ_SLOT(slotNodeChanged(TreeNode*) )); return true; } virtual bool visitFeed(Feed* node) { - disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*) )); - disconnect(node, TQT_SIGNAL(signalChanged(TreeNode*)), m_view, TQT_SLOT(slotNodeChanged(TreeNode*) )); - disconnect(node, TQT_SIGNAL(fetchStarted(Feed*)), m_view, TQT_SLOT(slotFeedFetchStarted(Feed*))); - disconnect(node, TQT_SIGNAL(fetchAborted(Feed*)), m_view, TQT_SLOT(slotFeedFetchAborted(Feed*))); - disconnect(node, TQT_SIGNAL(fetchError(Feed*)), m_view, TQT_SLOT(slotFeedFetchError(Feed*))); - disconnect(node, TQT_SIGNAL(fetched(Feed*)), m_view, TQT_SLOT(slotFeedFetchCompleted(Feed*))); + disconnect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQ_SLOT(slotNodeDestroyed(TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalChanged(TreeNode*)), m_view, TQ_SLOT(slotNodeChanged(TreeNode*) )); + disconnect(node, TQ_SIGNAL(fetchStarted(Feed*)), m_view, TQ_SLOT(slotFeedFetchStarted(Feed*))); + disconnect(node, TQ_SIGNAL(fetchAborted(Feed*)), m_view, TQ_SLOT(slotFeedFetchAborted(Feed*))); + disconnect(node, TQ_SIGNAL(fetchError(Feed*)), m_view, TQ_SLOT(slotFeedFetchError(Feed*))); + disconnect(node, TQ_SIGNAL(fetched(Feed*)), m_view, TQ_SLOT(slotFeedFetchCompleted(Feed*))); return true; } private: @@ -381,11 +381,11 @@ NodeListView::NodeListView( TQWidget *parent, const char *name) setAcceptDrops(true); setItemsMovable(true); - connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*)) ); - connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, int, const TQString&)), this, TQT_SLOT(slotItemRenamed(TQListViewItem*, int, const TQString&)) ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); - connect( &(d->autoopentimer), TQT_SIGNAL( timeout() ), this, TQT_SLOT( openFolder() ) ); + connect( this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), this, TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*)) ); + connect( this, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(itemRenamed(TQListViewItem*, int, const TQString&)), this, TQ_SLOT(slotItemRenamed(TQListViewItem*, int, const TQString&)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( &(d->autoopentimer), TQ_SIGNAL( timeout() ), this, TQ_SLOT( openFolder() ) ); clear(); @@ -948,8 +948,8 @@ void NodeListView::connectToNodeList(NodeList* list) if (!list) return; - connect(list, TQT_SIGNAL(signalDestroyed(NodeList*)), this, TQT_SLOT(slotNodeListDestroyed(NodeList*)) ); - connect(list->rootNode(), TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotRootNodeChanged(TreeNode*))); + connect(list, TQ_SIGNAL(signalDestroyed(NodeList*)), this, TQ_SLOT(slotNodeListDestroyed(NodeList*)) ); + connect(list->rootNode(), TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotRootNodeChanged(TreeNode*))); } void NodeListView::disconnectFromNodeList(NodeList* list) @@ -957,8 +957,8 @@ void NodeListView::disconnectFromNodeList(NodeList* list) if (!list) return; - disconnect(list, TQT_SIGNAL(signalDestroyed(NodeList*)), this, TQT_SLOT(slotNodeListDestroyed(NodeList*)) ); - disconnect(list->rootNode(), TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotRootNodeChanged(TreeNode*))); + disconnect(list, TQ_SIGNAL(signalDestroyed(NodeList*)), this, TQ_SLOT(slotNodeListDestroyed(NodeList*)) ); + disconnect(list->rootNode(), TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotRootNodeChanged(TreeNode*))); } void NodeListView::disconnectFromNode(TreeNode* node) diff --git a/akregator/src/feedlistview.h b/akregator/src/feedlistview.h index 28d79d09..d7aff329 100644 --- a/akregator/src/feedlistview.h +++ b/akregator/src/feedlistview.h @@ -38,7 +38,7 @@ class TagNodeList; class NodeListView : public TDEListView { -Q_OBJECT +TQ_OBJECT public: NodeListView( TQWidget *parent = 0, const char *name = 0 ); @@ -192,7 +192,7 @@ public: // compat with KDE-3.x assertions, remove for KDE 4 class TagNodeListView : public NodeListView { - Q_OBJECT + TQ_OBJECT public: TagNodeListView(TQWidget *parent = 0, const char *name = 0) {} diff --git a/akregator/src/fetchqueue.cpp b/akregator/src/fetchqueue.cpp index c78d9a48..0bc7b38e 100644 --- a/akregator/src/fetchqueue.cpp +++ b/akregator/src/fetchqueue.cpp @@ -129,18 +129,18 @@ void FetchQueue::feedDone(Feed *f) void FetchQueue::connectToFeed(Feed* feed) { - connect (feed, TQT_SIGNAL(fetched(Feed*)), this, TQT_SLOT(slotFeedFetched(Feed*))); - connect (feed, TQT_SIGNAL(fetchError(Feed*)), this, TQT_SLOT(slotFetchError(Feed*))); - connect (feed, TQT_SIGNAL(fetchAborted(Feed*)), this, TQT_SLOT(slotFetchAborted(Feed*))); - connect (feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*))); + connect (feed, TQ_SIGNAL(fetched(Feed*)), this, TQ_SLOT(slotFeedFetched(Feed*))); + connect (feed, TQ_SIGNAL(fetchError(Feed*)), this, TQ_SLOT(slotFetchError(Feed*))); + connect (feed, TQ_SIGNAL(fetchAborted(Feed*)), this, TQ_SLOT(slotFetchAborted(Feed*))); + connect (feed, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotNodeDestroyed(TreeNode*))); } void FetchQueue::disconnectFromFeed(Feed* feed) { - disconnect (feed, TQT_SIGNAL(fetched(Feed*)), this, TQT_SLOT(slotFeedFetched(Feed*))); - disconnect (feed, TQT_SIGNAL(fetchError(Feed*)), this, TQT_SLOT(slotFetchError(Feed*))); - disconnect (feed, TQT_SIGNAL(fetchAborted(Feed*)), this, TQT_SLOT(slotFetchAborted(Feed*))); - disconnect (feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*))); + disconnect (feed, TQ_SIGNAL(fetched(Feed*)), this, TQ_SLOT(slotFeedFetched(Feed*))); + disconnect (feed, TQ_SIGNAL(fetchError(Feed*)), this, TQ_SLOT(slotFetchError(Feed*))); + disconnect (feed, TQ_SIGNAL(fetchAborted(Feed*)), this, TQ_SLOT(slotFetchAborted(Feed*))); + disconnect (feed, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotNodeDestroyed(TreeNode*))); } diff --git a/akregator/src/fetchqueue.h b/akregator/src/fetchqueue.h index 1a0f449e..d93b955f 100644 --- a/akregator/src/fetchqueue.h +++ b/akregator/src/fetchqueue.h @@ -35,7 +35,7 @@ class TreeNode; class FetchQueue : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -86,6 +86,3 @@ class FetchQueue : public TQObject } // namespace Akregator #endif - -// vim: set et ts=4 sts=4 sw=4: - diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp index 739b0cf1..57105f4f 100644 --- a/akregator/src/folder.cpp +++ b/akregator/src/folder.cpp @@ -308,20 +308,20 @@ void Folder::doArticleNotification() void Folder::connectToNode(TreeNode* child) { - connect(child, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotChildChanged(TreeNode*))); - connect(child, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotChildDestroyed(TreeNode*))); - connect(child, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&))); - connect(child, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&))); - connect(child, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&))); + connect(child, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotChildChanged(TreeNode*))); + connect(child, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotChildDestroyed(TreeNode*))); + connect(child, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&))); + connect(child, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&))); + connect(child, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&))); } void Folder::disconnectFromNode(TreeNode* child) { - disconnect(child, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotChildChanged(TreeNode*))); - disconnect(child, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotChildDestroyed(TreeNode*))); - disconnect(child, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&))); - disconnect(child, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&))); - disconnect(child, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&))); + disconnect(child, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotChildChanged(TreeNode*))); + disconnect(child, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotChildDestroyed(TreeNode*))); + disconnect(child, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&))); + disconnect(child, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&))); + disconnect(child, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&))); } TreeNode* Folder::next() diff --git a/akregator/src/folder.h b/akregator/src/folder.h index d8060386..504b457f 100644 --- a/akregator/src/folder.h +++ b/akregator/src/folder.h @@ -43,7 +43,7 @@ namespace Akregator */ class Folder : public TreeNode { - Q_OBJECT + TQ_OBJECT public: /** creates a feed group parsed from a XML dom element. diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp index 6e27b915..64e0e37f 100644 --- a/akregator/src/frame.cpp +++ b/akregator/src/frame.cpp @@ -50,25 +50,25 @@ Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, co if (watchSignals) // e.g, articles tab has no part { - connect(m_part, TQT_SIGNAL(setWindowCaption (const TQString &)), this, TQT_SLOT(setCaption (const TQString &))); - connect(m_part, TQT_SIGNAL(setStatusBarText (const TQString &)), this, TQT_SLOT(setStatusText (const TQString &))); + connect(m_part, TQ_SIGNAL(setWindowCaption (const TQString &)), this, TQ_SLOT(setCaption (const TQString &))); + connect(m_part, TQ_SIGNAL(setStatusBarText (const TQString &)), this, TQ_SLOT(setStatusText (const TQString &))); KParts::BrowserExtension *ext=KParts::BrowserExtension::childObject( p ); if (ext) - connect( ext, TQT_SIGNAL(loadingProgress(int)), this, TQT_SLOT(setProgress(int)) ); + connect( ext, TQ_SIGNAL(loadingProgress(int)), this, TQ_SLOT(setProgress(int)) ); - connect(p, TQT_SIGNAL(started(TDEIO::Job*)), this, TQT_SLOT(setStarted())); - connect(p, TQT_SIGNAL(completed()), this, TQT_SLOT(setCompleted())); - connect(p, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(setCanceled(const TQString&))); - connect(p, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(setCompleted())); + connect(p, TQ_SIGNAL(started(TDEIO::Job*)), this, TQ_SLOT(setStarted())); + connect(p, TQ_SIGNAL(completed()), this, TQ_SLOT(setCompleted())); + connect(p, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(setCanceled(const TQString&))); + connect(p, TQ_SIGNAL(completed(bool)), this, TQ_SLOT(setCompleted())); /* TDEActionCollection *coll=p->actionCollection(); if (coll) { - connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), - this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); - connect( coll, TQT_SIGNAL( clearStatusText() ), - this, TQT_SLOT( slotClearStatusText() ) ); + connect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ), + this, TQ_SLOT( slotActionStatusText( const TQString & ) ) ); + connect( coll, TQ_SIGNAL( clearStatusText() ), + this, TQ_SLOT( slotClearStatusText() ) ); } */ } @@ -176,7 +176,7 @@ void Frame::setStarted() if(m_progressId.isNull() || m_progressId.isEmpty()) m_progressId = KPIM::ProgressManager::getUniqueID(); m_progressItem = KPIM::ProgressManager::createProgressItem(m_progressId, TQStyleSheet::escape( title() ), TQString(), false); m_progressItem->setStatus(i18n("Loading...")); - //connect(m_progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQT_SLOT(slotAbortFetch())); + //connect(m_progressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQ_SLOT(slotAbortFetch())); m_state=Started; emit started(); } diff --git a/akregator/src/frame.h b/akregator/src/frame.h index 4a0cb36d..1cecfd52 100644 --- a/akregator/src/frame.h +++ b/akregator/src/frame.h @@ -42,7 +42,7 @@ namespace Akregator class Frame : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -96,6 +96,3 @@ namespace Akregator } #endif - - -// vim: set et ts=4 sts=4 sw=4: diff --git a/akregator/src/librss/CMakeLists.txt b/akregator/src/librss/CMakeLists.txt index c2e7a001..23dc39a2 100644 --- a/akregator/src/librss/CMakeLists.txt +++ b/akregator/src/librss/CMakeLists.txt @@ -16,7 +16,6 @@ include_directories( ${TQT_INCLUDE_DIRS} ) - ##### rsslocal (static) ######################### tde_add_library( rsslocal STATIC_PIC AUTOMOC @@ -25,3 +24,30 @@ tde_add_library( rsslocal STATIC_PIC AUTOMOC tools_p.cpp loader.cpp enclosure.cpp category.cpp feeddetector.cpp ) + +tde_add_check_executable( testlibrss AUTOMOC + SOURCES testlibrss.cpp + LINK rsslocal-static ${TQT_LIBRARIES} tdeio-shared +) + +set( TEST_DATA "${CMAKE_CURRENT_SOURCE_DIR}/test_data") + +add_test( NAME TestLibRSS_0.91 + COMMAND testlibrss ${TEST_DATA}/rss091.xml +) + +add_test( NAME TestLibRSS_CommentAPI + COMMAND testlibrss ${TEST_DATA}/comment_api.xml +) + +add_test( NAME TestLibRSS_DublinCore + COMMAND testlibrss ${TEST_DATA}/dublincore.xml +) + +add_test( NAME TestLibRSS_RDF + COMMAND testlibrss ${TEST_DATA}/rdf.xml +) + +add_test( NAME TestLibRSS_AtomSpec + COMMAND testlibrss ${TEST_DATA}/atom_spec.xml +) diff --git a/akregator/src/librss/article.cpp b/akregator/src/librss/article.cpp index 24413053..88d42a7d 100644 --- a/akregator/src/librss/article.cpp +++ b/akregator/src/librss/article.cpp @@ -92,13 +92,16 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new d->link = elemText; } + // prefer content/content:encoded over summary/description for feeds that provide it + if (format == AtomFeed) + { + d->description = extractNode(node, TQString::fromLatin1("content"), false); + } + else + { + d->description = extractElementTextNS(node, ContentNamespace, TQString::fromLatin1("encoded"), false); + } - // prefer content/content:encoded over summary/description for feeds that provide it - TQString tagName=(format==AtomFeed)? TQString::fromLatin1("content"): TQString::fromLatin1("content:encoded"); - - if (!(elemText = extractNode(node, tagName, false)).isNull()) - d->description = elemText; - if (d->description.isEmpty()) { if (!(elemText = extractNode(node, TQString::fromLatin1("body"), false)).isNull()) @@ -130,7 +133,7 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new time = KRFCDate::parseDate(elemText); } - if (!(elemText = extractNode(node, TQString::fromLatin1("dc:date"))).isNull()) + if (!(elemText = extractElementTextNS(node, DublinCoreNamespace, TQString::fromLatin1("date"))).isNull()) { time = parseISO8601Date(elemText); } @@ -139,27 +142,22 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new if (time != 0) d->pubDate.setTime_t(time); - if (!(elemText = extractNode(node, TQString::fromLatin1("wfw:comment"))).isNull()) { - d->commentsLink = elemText; - } - - if (!(elemText = extractNode(node, TQString::fromLatin1("slash:comments"))).isNull()) { - d->numComments = elemText.toInt(); - } + d->commentsLink = extractElementTextNS(node, CommentAPINamespace, TQString::fromLatin1("comment")); + d->numComments = extractElementTextNS(node, SlashNamespace, TQString::fromLatin1("comments")).toInt(); TQDomElement element = TQDomNode(node).toElement(); // in RSS 1.0, we use <item about> attribute as ID // FIXME: pass format version instead of checking for attribute - if (!element.isNull() && element.hasAttribute(TQString::fromLatin1("rdf:about"))) + if (!element.isNull() && element.hasAttributeNS(RDFNamespace, TQString::fromLatin1("about"))) { - d->guid = element.attribute(TQString::fromLatin1("rdf:about")); // HACK: using ns properly did not work + d->guid = element.attributeNS(RDFNamespace, TQString::fromLatin1("about"), TQString::null); d->guidIsPermaLink = false; } else { - tagName=(format==AtomFeed)? TQString::fromLatin1("id"): TQString::fromLatin1("guid"); + TQString tagName=(format==AtomFeed)? TQString::fromLatin1("id"): TQString::fromLatin1("guid"); TQDomNode n = node.namedItem(tagName); if (!n.isNull()) { @@ -286,5 +284,3 @@ bool Article::operator==(const Article &other) const { return d->guid == other.guid(); } - -// vim:noet:ts=4 diff --git a/akregator/src/librss/article.h b/akregator/src/librss/article.h index 7656eeed..574f4840 100644 --- a/akregator/src/librss/article.h +++ b/akregator/src/librss/article.h @@ -34,7 +34,7 @@ namespace RSS * is via Document::articles(). * @see Document::articles() */ - class KDE_EXPORT Article + class TDE_EXPORT Article { public: /** @@ -169,4 +169,3 @@ namespace RSS } #endif // LIBRSS_ARTICLE_H -// vim: noet:ts=4 diff --git a/akregator/src/librss/category.h b/akregator/src/librss/category.h index 0c40e418..c38a1c4e 100644 --- a/akregator/src/librss/category.h +++ b/akregator/src/librss/category.h @@ -33,7 +33,7 @@ class TQString; namespace RSS { - class KDE_EXPORT Category + class TDE_EXPORT Category { public: diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp index 6d6e1057..7d94a252 100644 --- a/akregator/src/librss/document.cpp +++ b/akregator/src/librss/document.cpp @@ -224,7 +224,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) d->copyright = elemText; if (d->format == AtomFeed) - elemText = rootNode.toElement().attribute(TQString::fromLatin1("xml:lang"), TQString()); + elemText = rootNode.toElement().attributeNS(XMLNamespace, "lang", TQString::null); else elemText = extractNode(channelNode, TQString::fromLatin1("language")); @@ -441,7 +441,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) d->pubDate.setTime_t(_time); } - if (!(elemText = extractNode(channelNode, TQString::fromLatin1("dc:date"))).isNull()) { + if (!(elemText = extractElementTextNS(channelNode, DublinCoreNamespace, "date")).isNull()) { time_t _time = parseISO8601Date(elemText); /* \bug This isn't really the right way since it will set the date to * Jan 1 1970, 1:00:00 if the passed date was invalid; this means that @@ -649,5 +649,3 @@ Document &Document::operator=(const Document &other) } return *this; } - -// vim:noet:ts=4 diff --git a/akregator/src/librss/document.h b/akregator/src/librss/document.h index 7a94e59d..b876caf2 100644 --- a/akregator/src/librss/document.h +++ b/akregator/src/librss/document.h @@ -28,7 +28,7 @@ namespace RSS * but rather use Loader::loadFrom() to produce a Document object. * @see Loader::loadForm() */ - class KDE_EXPORT Document + class TDE_EXPORT Document { public: /** @@ -234,4 +234,3 @@ namespace RSS } #endif // LIBRSS_DOCUMENT_H -// vim: noet:ts=4 diff --git a/akregator/src/librss/enclosure.h b/akregator/src/librss/enclosure.h index 154f8bc0..54ee2059 100644 --- a/akregator/src/librss/enclosure.h +++ b/akregator/src/librss/enclosure.h @@ -33,7 +33,7 @@ class TQString; namespace RSS { - class KDE_EXPORT Enclosure + class TDE_EXPORT Enclosure { public: diff --git a/akregator/src/librss/global.h b/akregator/src/librss/global.h index 091018cb..8ff4e406 100644 --- a/akregator/src/librss/global.h +++ b/akregator/src/librss/global.h @@ -11,13 +11,28 @@ #ifndef LIBRSS_GLOBAL_H #define LIBRSS_GLOBAL_H -#include <tdepimmacros.h> +#include <tdemacros.h> template <class> class TQValueList; namespace RSS { + /// The Atom 1.0 XML namespace. + constexpr const char *AtomNamespace = "http://www.w3.org/2005/Atom"; + /// The CommentAPI XML namespace. + constexpr const char *CommentAPINamespace = "http://wellformedweb.org/CommentAPI/"; + /// The Content XML namespace. + constexpr const char *ContentNamespace = "http://purl.org/rss/1.0/modules/content/"; + /// The Dublin Core XML namespace. + constexpr const char *DublinCoreNamespace = "http://purl.org/dc/elements/1.1/"; + /// The RDF Concepts Vocabulary (RDF) namespace. + constexpr const char *RDFNamespace = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + /// The Slash XML namespace. + constexpr const char *SlashNamespace = "http://purl.org/rss/1.0/modules/slash/"; + /// The XML namespace. + constexpr const char *XMLNamespace = "http://www.w3.org/XML/1998/namespace"; + /** * Versions currently supported by this library. This enumeration is * subject to be extended in the future and used by Document::version() to @@ -145,4 +160,3 @@ namespace RSS } #endif // LIBRSS_GLOBAL_H -// vim: noet:ts=4 diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp index 383d76b9..65aaf539 100644 --- a/akregator/src/librss/image.cpp +++ b/akregator/src/librss/image.cpp @@ -112,9 +112,9 @@ void Image::getPixmap() d->pixmapBuffer->open(IO_WriteOnly); d->job = TDEIO::get(d->url, false, false); - connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *))); + connect(d->job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(d->job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotResult(TDEIO::Job *))); } void Image::slotData(TDEIO::Job *, const TQByteArray &data) @@ -164,4 +164,3 @@ bool Image::operator==(const Image &other) const } #include "image.moc" -// vim:noet:ts=4 diff --git a/akregator/src/librss/image.h b/akregator/src/librss/image.h index ab0cf687..d98a59fc 100644 --- a/akregator/src/librss/image.h +++ b/akregator/src/librss/image.h @@ -31,9 +31,9 @@ namespace RSS * is via Document::image(). * @see Document::image() */ - class KDE_EXPORT Image : public TQObject + class TDE_EXPORT Image : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -171,4 +171,3 @@ namespace RSS } #endif // LIBRSS_IMAGE_H -// vim: noet:ts=4 diff --git a/akregator/src/librss/librss.h b/akregator/src/librss/librss.h index b99556b1..877d06f2 100644 --- a/akregator/src/librss/librss.h +++ b/akregator/src/librss/librss.h @@ -21,4 +21,3 @@ #include "textinput.h" #endif // LIBRSS_LIBRSS_H -// vim: noet:ts=4 diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp index ea0134e6..8674dfb7 100644 --- a/akregator/src/librss/loader.cpp +++ b/akregator/src/librss/loader.cpp @@ -13,7 +13,7 @@ #include "feeddetector.h" #include <tdeio/job.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kstaticdeleter.h> #include <kurl.h> #include <kdebug.h> @@ -111,13 +111,13 @@ void FileRetriever::retrieveData(const KURL &url) d->job->addMetaData("UserAgent", ua); - TQTimer::singleShot(1000*90, this, TQT_SLOT(slotTimeout())); + TQTimer::singleShot(1000*90, this, TQ_SLOT(slotTimeout())); - connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); - connect(d->job, TQT_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)), - TQT_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &))); + connect(d->job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(d->job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *))); + connect(d->job, TQ_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)), + TQ_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &))); } void FileRetriever::slotTimeout() @@ -207,10 +207,10 @@ void OutputRetriever::retrieveData(const KURL &url) d->buffer->open(IO_WriteOnly); d->process = new KShellProcess(); - connect(d->process, TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(slotExited(TDEProcess *))); - connect(d->process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - TQT_SLOT(slotOutput(TDEProcess *, char *, int))); + connect(d->process, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(slotExited(TDEProcess *))); + connect(d->process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQ_SLOT(slotOutput(TDEProcess *, char *, int))); *d->process << url.path(); d->process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } @@ -268,7 +268,7 @@ Loader *Loader::create() Loader *Loader::create(TQObject *object, const char *slot) { Loader *loader = create(); - connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), + connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)), object, slot); return loader; } @@ -290,8 +290,8 @@ void Loader::loadFrom(const KURL &url, DataRetriever *retriever) d->url=url; d->retriever = retriever; - connect(d->retriever, TQT_SIGNAL(dataRetrieved(const TQByteArray &, bool)), - this, TQT_SLOT(slotRetrieverDone(const TQByteArray &, bool))); + connect(d->retriever, TQ_SIGNAL(dataRetrieved(const TQByteArray &, bool)), + this, TQ_SLOT(slotRetrieverDone(const TQByteArray &, bool))); d->retriever->retrieveData(url); } @@ -351,7 +351,7 @@ void Loader::slotRetrieverDone(const TQByteArray &data, bool success) TQByteArray tmpData; tmpData.setRawData(charData, len); - if (doc.setContent(tmpData)) + if (doc.setContent(tmpData, /* namespaceProcessing */ true)) { rssDoc = Document(doc); if (!rssDoc.isValid()) @@ -410,4 +410,3 @@ void Loader::discoverFeeds(const TQByteArray &data) } #include "loader.moc" -// vim:noet:ts=4 diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h index 670ed9d3..ce93fc25 100644 --- a/akregator/src/librss/loader.h +++ b/akregator/src/librss/loader.h @@ -32,9 +32,9 @@ namespace RSS * a new retrieval algorithm which can then be plugged into the RSS loader. * @see Loader, FileRetriever, OutputRetriever */ - class KDE_EXPORT DataRetriever : public TQObject + class TDE_EXPORT DataRetriever : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -87,9 +87,9 @@ namespace RSS * Implements a file retriever, to be used with Loader::loadFrom(). * @see DataRetriever, Loader::loadFrom() */ - class KDE_EXPORT FileRetriever : public DataRetriever + class TDE_EXPORT FileRetriever : public DataRetriever { - Q_OBJECT + TQ_OBJECT public: /** @@ -161,7 +161,7 @@ namespace RSS */ class OutputRetriever : public DataRetriever { - Q_OBJECT + TQ_OBJECT public: /** @@ -211,8 +211,8 @@ namespace RSS * * \code * Loader *loader = Loader::create(); - * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), - * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status))); + * connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)), + * this, TQ_SLOT(slotLoadingComplete(Loader *, Document, Status))); * loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever); * \endcode * @@ -254,9 +254,9 @@ namespace RSS * loadingComplete signal goes out of scope. This is e.g. the case if you * intend to call getPixmap() on Document::image()! */ - class KDE_EXPORT Loader : public TQObject + class TDE_EXPORT Loader : public TQObject { - Q_OBJECT + TQ_OBJECT friend class someClassWhichDoesNotExist; public: @@ -342,4 +342,3 @@ namespace RSS } #endif // LIBRSS_LOADER_H -// vim: noet:ts=4 diff --git a/akregator/src/librss/test_data/atom_spec.xml b/akregator/src/librss/test_data/atom_spec.xml new file mode 100644 index 00000000..b8e3dff4 --- /dev/null +++ b/akregator/src/librss/test_data/atom_spec.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en-us"> + <title type="text">dive into mark</title> + <subtitle type="html"> + A <em>lot</em> of effort + went into making this effortless + </subtitle> + <updated>2005-07-31T12:29:29Z</updated> + <id>tag:example.org,2003:3</id> + <link rel="alternate" type="text/html" hreflang="en" href="http://example.org/"/> + <link rel="self" type="application/atom+xml" href="http://example.org/feed.atom"/> + <rights>Copyright (c) 2003, Mark Pilgrim</rights> + <generator uri="http://www.example.com/" version="1.0"> + Example Toolkit + </generator> + <entry> + <title>Atom draft-07 snapshot</title> + <link rel="alternate" type="text/html" href="http://example.org/2005/04/02/atom"/> + <link rel="enclosure" type="audio/mpeg" length="1337" href="http://example.org/audio/ph34r_my_podcast.mp3"/> + <id>tag:example.org,2003:3.2397</id> + <updated>2005-07-31T12:29:29Z</updated> + <published>2003-12-13T08:29:29-04:00</published> + <author> + <name>Mark Pilgrim</name> + <uri>http://example.org/</uri> + <email>f8dy@example.com</email> + </author> + <contributor> + <name>Sam Ruby</name> + </contributor> + <contributor> + <name>Joe Gregorio</name> + </contributor> + <content type="xhtml" xml:lang="en" xml:base="http://diveintomark.org/"> + <div xmlns="http://www.w3.org/1999/xhtml"> + <p> + <i>[Update: The Atom draft is finished.]</i> + </p> + </div> + </content> + </entry> +</feed> diff --git a/akregator/src/librss/test_data/comment_api.xml b/akregator/src/librss/test_data/comment_api.xml new file mode 100644 index 00000000..7bbb29ae --- /dev/null +++ b/akregator/src/librss/test_data/comment_api.xml @@ -0,0 +1,411 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:wfw='http://wellformedweb.org/CommentAPI/' xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:rl='http://www.purl.org/RESTLog/'> + <channel> + <title>The Well-Formed Web</title> + <link>http://wellformedweb.org/news/</link> + <description>Exploring the limits of XML and HTTP</description> + <dc:creator>BitWorking, Inc</dc:creator> + <item> + <title>Should you use Content Negotiation in your Web Services?</title> + <link>http://bitworking.org/news/WebServicesAndContentNegotiation</link> + <description> + <p>Should you use Content Negotiation when building your web service? +The short answer is no. There are definite problems with <abbrev title="Content Negotiation">conneg</abbrev> +and I can give some examples of problems I have run into and also point to problems +other have run into.</p> + + +<p>First let's back up and explain Content Negotiation. Your browser is + a generic display program and can take in various kinds of media, such + as HTML, JPEGs, CSS, Flash, etc. and display it for you. The first thing to + note is that each of those kinds of media have different mime types. + Each format has it's own registered mime type and when a client + does a GET on a URL it gets back not only the content but the response + also includes a <code>Content-Type:</code> header which lists + the mime-type of what is in the body. +</p> + +<p>One of the interesting things about HTTP is that it allows + the same URI to have multiple representations. For example I + could have a URL that had both <code>plain/text</code> and <code>text/html</code> + representations. Now that leads to two obvious questions.</p> + +<ol> + <li>How does the server know which represenation to serve?</li> + <li>How can the browser influence the servers choice to get something it can handle?</li> +</ol> + +<p>Let's start by answering question two first. The browser uses the <code>Accept:</code> + header to list out the mime-types that it is willing to accept. There is also a weighting + scheme that allows the client to specify a preference for one media type + over another. For example, here is the capture of some of the headers, including the <code>Accept:</code> header, + sent by Mozilla when it does a GET on a URI:</p> + +<pre class="example"><code>Accept: text/xml,application/xml,application/xhtml+xml,\ + text/html;q=0.9,text/plain;q=0.8,video/x-mng,\ + image/png,image/jpeg,image/gif;q=0.2,*/*;q=0.1 +Accept-Language: en-us,en;q=0.5 +Accept-Encoding: gzip,deflate,compress;q=0.9 +Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7 +</code></pre> + +<p>The <code>Accept:</code> header list the mime-types that the browser can + handle along with weights of the form <code>q=</code> where the argument + is a floating point number between 0 and 1. The weights indicate a preference + for that media type, with a higher number inidicating a higher preference. Note that + there are several bits of complexity I am going to ignore for now. The first is the last + type the Mozilla browser says in can accept, */*;q=0.1. This is a wild card + match, which will match any mime-type that the server could want to serve up. The second + is that there are multiple Accept headers, one for language, one for encoding, another + for charset. How these over-lap and influence the response sent won't be covered here. +</p> + +<p>Now to answer the first question. The server looks at the available representations + is has and servers up the one with the highest preference to the client. + Based on the <code>Accept:</code> + header it sends an appropriate representation back and indicates the type it + chose using the <code>Content-Type:</code> header.</p> + +<p>This seems like a really cool and vastly under utilized feature of HTTP. It also + seems particularly intriguing for web services. You could return + JPEGs from that mapping service for the older client platforms, but also + serve up SVG for the newer clients so they can scale and rotate their maps. + What could possibly go wrong?</p> + +<p>The first thing that could go wrong is a bug or mis-configuration on the client or the server. + This has happened to me in the + past. The W3C does conneg on some of their recommendations, returning either HTML or plain + text based on the clients capabilities. This is fine, but one day their server was + either confused or mis-configured because it would only serve the recommendation in <code>plain/text</code>. + I really needed the HTML form, but after trying multiple browsers from multipe locations I could only retrieve the text + format. I ended up pulling the HTML version out of the Google cache.</p> + +<p>The second problem that I ran across highlights the real core problem with conneg. I was + trying to use the W3C XSLT service to do some transformations on my web pages. Now the server side + software I use to run Well-Formed Web does conneg and can return either HTML or an RSS item + fragment for each URI. At the time I was serving up XHTML 1.0, which is valid XML and + thus good input into an XSLT service. So the way the XSLT service works is that you enter two URIs, one + for the source content and the other for the XSLT sheet to apply to the source content. + My transformation kept failing and it was because of the + Accept headers that the XSLT service sent when it went to retrieve the source content. + My server kept returning the RSS item fragment and not + the XHTML. Now this would have been fine if I wanted to apply an XSLT sheet to my RSS item fragment, but in this + case I wanted it to apply to the XHTML. Note that the problem could have been completely reversed, I could have + been trying to apply the XSLT to the RSS item and not to the XHTML and my server could have returned + the XHTML all the time. The crux of the problem is that when I gave the URI to the XSLT transformation + service I have no way of specifying what mime-type to request. I get no chance to tweak the + services <code>Accept:</code> header. +</p> + +<p>Let's cover that again to clarify. If I hand you a URI only, and that URI supports conneg, + then I get no control over which representation you retrieve. In the cases where you are + passing a URI into a service that is later going to retrieve a represenation from that URI, you + really have no idea which representation it's going to get. That could mean that you end up + passing your RSS feed to the W3C HTML validator, or you end up passing XHTML instead of RSS into + an XSLT translator service, or you end up passing a 12MB PNG to a handheld instead of + that 20KB SVG file. You end up with a problem that is hard to debug and + one that wouldn't exist if each URI had only one mime-type.</p> + +<h3>Further Reading</h3> +<p><a href="http://norman.walsh.name/2003/07/02/conneg">Norman Walsh has also run into problems</a> with Content Negotiation.</p> +<p>The issue of using fragment identifiers with conneg has not only come up but was important enough to + merit mention in the W3C document <a href="http://www.w3.org/TR/webarch/#frag-conneg">Architecture of the World Wide Web</a>.</p> + + + </description> + + <dc:date>2003-09-06T21:54:43-05:00</dc:date> + <wfw:comment>http://bitworking.org/news/comments/WebServicesAndContentNegotiation</wfw:comment> + <wfw:commentRss>http://bitworking.org/news/WebServicesAndContentNegotiation?crss</wfw:commentRss> + </item> + <item> + <title>Google2Atom</title> + <link>http://wellformedweb.org/news/Google2Atom</link> + <description> +<p>Welcome to the Google2Atom web service. Just enter your + search and your <a href="http://www.google.com/apis/">Google key</a> + below. Once you press "Search" you will get an <a href="http://www.mnot.net/drafts/draft-nottingham-atom-format-00.html"> + Atom</a> feed of the search results. +</p> + +<form method="get" action="http://wellformedweb.org/cgi-bin/google2atom.cgi"> +<p><input size="50" name="q"/></p> +<p>Google Key: <input size="20" name="license_key"/></p> +<p><input type="submit" value=" Search "/></p> +</form> + +<hr /> + +<p><strong>Note:</strong> The Google Key is no longer mandatory, if it's not + supplied it will use my own key. In light of that please feel free to + use my key for experimentation, but if you start making heavy use + of this service please get your own Google API Key to avoid + limiting others use of this service.</p> + +<p>This is a REST based reformulation of the Google API. As such it uses + query parameters in a GET based HTTP request to do the search. That is, it works + just like the regular google web page, but this form returns + a well-formed XML document instead of a web page. Why is this better?</p> + +<dl> + <dt>Simplicity</dt> + <dd> + It works just like the google web page, so it is + conceptually easier to understand. + </dd> + + <dt>Composability</dt> + <dd>Since the request is just a simple GET the results of a query can be composed + with other web services. For example, the results could be transformed using + XSLT or fed into a validator. + </dd> +</dl> + +<h3>Bonus Features</h3> + +<p>One feature found in this interface that is not found + in the original Google API is the well-formedness of the + results content. + <a href="http://bitworking.org/news/Announcing_pyTidy">PyTidy</a> + is used to transform the HTML + snippets from the Google API into well-formed XML and place + those into 'content' elements with type='text/html' and + mode='xml'. +</p> + +<h3>Colophon</h3> + +<p>Google2Atom is written in <a href="http://www.python.org">Python</a> and uses + both the <a href="http://bitworking.org/news/Announcing_pyTidy"> + pyTidy</a> and <a href="http://www.diveintomark.org/projects/pygoogle/"> + pyGoogle</a> libraries.</p> + + </description> + + <dc:date>2003-11-22T01:18:42-05:00</dc:date> + <wfw:comment>http://wellformedweb.org/news/comments/Google2Atom</wfw:comment> + <wfw:commentRss>http://wellformedweb.org/news/Google2Atom?crss</wfw:commentRss> + </item> + <item> + <title>wfw namespace elements</title> + <link>http://wellformedweb.org/news/wfw_namespace_elements</link> + <description> + <p>The <code>wfw</code> namespace, http://wellformedweb.org/CommentAPI/ +contains multiple elements. As more are added in various places I will +endeavor to keep the list here updated.</p> + +<dl> + <dt>wfw:comment</dt> + <dd>The first element to appear in this namespace is <code>comment</code>. This element appears + in RSS feeds and contains the URI that comment entries are to be POSTed to. The details + of this are outlined in the <a href="http://wellformedweb.org/story/9">CommentAPI Specification</a>.<dd> + + <dt>wfw:commentRss</dt> + <dd>The second element to appear in the wfw namespace is <code>commentRss</code>. This element + also appears in RSS feeds and contains the URI of the RSS feed for comments on that Item. + This is documented in <a href="http://www.sellsbrothers.com/spout/default.aspx?content=archive.htm#exposingRssComments">Chris Sells' Specification</a>. Note that for quite a while this page has had a typo and erroneously referred to + this element as 'commentRSS' as opposed to the correct 'commentRss'. Feed consumers should be aware + that they may run into both spellings in the wild. Please see + <a href="http://www.intertwingly.net/blog/2006/04/16/commentRss">this page</a> for + more information. + </dd> +</dl> + </description> + + <dc:date>2003-10-10T13:11:46-05:00</dc:date> + <wfw:comment>http://wellformedweb.org/news/comments/wfw_namespace_elements</wfw:comment> + <wfw:commentRss>http://wellformedweb.org/news/wfw_namespace_elements?crss</wfw:commentRss> + </item> + <item> + <title>The HTTP verb PUT under Apache: Safe or Dangerous?</title> + <link>http://wellformedweb.org/news/PUT_SaferOrDangerous</link> + <description> + <p>"Is the HTTP verb PUT under Apache safe or dangerous?" This is a question I come across often, and have now + run into it twice in the work on Atom. So is it safe? The answer is maybe.</p> +<p>Here are two such examples:</p> + +<blockquote><p> + Using DELETE and PUT may be the "right thing to do" + in an ideal world, but the fact of the matter is that a + lot -- if not the vast majority -- of webservers do not allow these + operations. </p></blockquote> + +<blockquote><p>If anyone knows of a newer article describing + HTTP PUT with apache, I would be very interested in seeing it. Because, + due to my experience with PUT, you have to define a single PUTScript in + httpd.conf, and if you PUT something to an apache server at the URI + www.example.com/blog/entries/1 or something similar, apache passes all + of the information to the PUTScript, not to anything else.</p></blockquote> + +<p>Both of the above quotes are from the <a href="http://www.intertwingly.net/wiki/pie/RestEchoApiPutAndDelete">Atom Wiki discussion + of the use of PUT</a>. A little digging reveals that the ApacheWeek article + <a href="http://www.apacheweek.com/features/put">Publishing Pages with PUT</a> + is referenced most often when the danger of PUT is raised. <p> + +<p>That ApacheWeek article does talk about the dangers of PUT and + the cautions you need to follow when writing a script that + does content publishing via PUT. That key part of that phrase + is <strong>content publishing</strong>. That means that PUT is being + used to upload arbitrary content to the server and the client + is determining via the URI where the content should be stored. + Now you can imagine how this might be dangerous, for example + not correctly checking URI paths that include <code>../..</code> could + let a malicious agent re-write your <code>.bashrc</code>.</p> + +<p>Implementing a PUT script can be difficult and a security hazard + in the context of content publishing, but that's the case because + the client is choosing the target URI and the client could upload + any content type. In the case of Web Services in general, and + the AtomAPI in particular, PUT is used in a much narrower manner + and avoids those potential security problems.</p> + +<p>In the case of the AtomAPI PUT is only allowed on URIs that point + to a pre-existing resource. The + AtomAPI follows a general idiom for editing resources of doing + a GET to retrieve the original XML, then a PUT on the same URI + to upate that resource with the edited XML. No URIs are created + by doing a PUT. PUT is not accepted on arbitrary URIs. This makes + the use of PUT in the context of the AtomAPI just as safe as POST.</p> + +<p>There are quite a few ways to configure Apache to process + incoming requests. In particular it is possible to have a single + script that handles all PUT requests below a chosen directory. This + strategy, and all of the associated security concerns associated with + it, are covered fully in the <a href="http://www.apacheweek.com/features/put">Publishing Pages with PUT</a>.</p> + +<p>When processing request with a CGI script all the PUT requests + will come through. The verb is passed to the CGI program via the REQUEST_METHOD environment + variable, and the program decides what to do with the content.</p> + +<p>Using PUT propoerly has advantages in Web Service development. First, + Apache lets you control security based on the verb using the + <a href="http://httpd.apache.org/docs-2.0/mod/core.html#limit">Limit</a> + and <a href="http://httpd.apache.org/docs-2.0/mod/core.html#limitexcept">LimitExcept</a> + directives, which + let you restrict access controls based on the verb. Here is a sample + of one of my <code>.htaccess</code> files that restricts the use of + all verbs except GET to the CGI program <code>Bulu.cgi.</code></p> + +<pre class="example"><code>&lt;Files Bulu.cgi> +AuthType Basic +AuthName myrealm +AuthUserFile /path/to/my/password/file + &lt;LimitExcept GET> + Require valid-user + &lt;/LimitExcept> +&lt;/Files> +</code></pre> + +<p>In addition, the <a href="http://httpd.apache.org/docs-2.0/mod/mod_actions.html#script">Script</a> + directive can be used to dispatch to a CGI program based on the verb used:</p> + +<pre class="example"><code>Script PUT /cgi-bin/put.cgi</code></pre> + +<p>The second advantage using PUT brings is clarity. Given the idiom + of using GET/PUT in tandem on a URI to edit resources PUT + clearly signals what the interface is doing.</p> + +<h4>Resources</h4> + +<p><a href="http://www.apacheweek.com">ApacheWeek</a>: <a href="http://www.apacheweek.com/features/put">Publishing Pages with PUT</a></p> +<p><a href="http://www.intertwingly.net/wiki/pie/RestEchoApiPutAndDelete">RestEchoApiPutAndDelete</a>: Discussion on the use of PUT + and DELETE in the AtomAPI.</p> +<p><a href="http://httpd.apache.org/docs-2.0/mod/mod_actions.html">mod_actions</a>: An Apache module for + controlling dispatching based on verb or content-type.</p> +<p><a href="http://www.w3.org/Amaya/User/Put.html">Configuring your WWW server to understand the PUT method</a>, from the W3Cs Amaya project documentation.</p> +<p><a href="http://www.webdav.org/">WebDAV</a> is also something you may be interested in if you + are looking for ways to publish your content using HTTP. WebDAV stands for + "Web-based Distributed Authoring and Versioning". It is a set of extensions to the HTTP + protocol which allows users to collaboratively edit and manage files on remote web servers. + <a href="http://httpd.apache.org/docs-2.0/mod/mod_dav.html"> + Mod_dav</a> in an Apache module that implements WebDAV.</p> + + + + </description> + + <dc:date>2003-08-23T00:45:25-05:00</dc:date> + <wfw:comment>http://wellformedweb.org/news/comments/PUT_SaferOrDangerous</wfw:comment> + <wfw:commentRss>http://wellformedweb.org/news/PUT_SaferOrDangerous?crss</wfw:commentRss> + </item> + <item> + <title>Six Plus One</title> + <link>http://wellformedweb.org/news/SixPlusOne</link> + <description> + <p>Previously I talked about the <a href="http://bitworking.org/news/Six_Places">six different places</a> there are to + store information in an HTTP transaction. This is slightly misleading. +</p> + +<p> To review, the six places are:</p> +<ol> + <li>Request URI</li> + <li>Request Headers</li> + <li>Request Content</li> + <li>Response Status Code</li> + <li>Response Headers</li> + <li>Response Content</li> +</ol> + +<p>This is slightly misleading because the URI is listed as a single + storage location. This isn't the best characterization, as it really + contains two different sets of information: the path, and the query parameters.</p> + +<p>Now the path part of a URI usually corresponds to the directory structure on the server. + But remember that the path structure of a server is completely controlled + by that server and it need not corresponse to any file or directory strucure. + While it is at times convenient to map it to a directory structure, this isn't required, + and it is possible to pass path information to a + CGI program. For example, if you do a GET on the following URL:</p> + +<pre class="example"><code>http://example.org/cgi-bin/test.py/fred/12 +</code></pre> + +<p>and there exists a program named <code>test.py</code> in the <code>cgi-bin</code> directory + then that program will be executed. The remaining path after the program is passed + to the CGI program in the PATH_INFO environment variable. In contrast, if query + parameters are passed in, they are passed to the CGI program + via the QUERY_STRING environment variable.</p> + +<p>For example, if this is the script <code>test.py</code>:</p> + +<pre class="example"><code>import os +print "Content-type: text/plain\n\n" +print "PATH_INFO = %s" % os.environ['PATH_INFO'] +print "QUERY_STRING = %s" % os.environ['QUERY_STRING']</code></pre> + +<p>And it handles the GET for this URI:</p> + +<pre class="example"><code>http://localhost/cgi-bin/test.py/reilly/12?id=234454</code></pre> + +<p>It will display:</p> + +<pre class="example"><code>PATH_INFO = /reilly/12 +QUERY_STRING = id=234454 +</code></pre> + +<p>Note how the piece of the path below test.py has been stripped off and made + available via <code>PATH_INFO</code>, while the query parameters are + stored in the QUERY_STRING environment variable. +</p> + +<p>So HTTP, via the structure of a URI, gives you two distinct places + to store information, one in the path and the second in the query parameters. + This isn't even the full story, because if you are running Apache and have + the ability to use .htaccess files you can use + <a href="http://httpd.apache.org/docs/mod/mod_rewrite.html">mod_rewrite</a> and map URIs so that they appear + as paths but show up in the CGI as query parameters, but we won't cover that + now. +</p> + + + </description> + + <dc:date>2003-08-03T01:34:49-05:00</dc:date> + <wfw:comment>http://wellformedweb.org/news/comments/SixPlusOne</wfw:comment> + <wfw:commentRss>http://wellformedweb.org/news/SixPlusOne?crss</wfw:commentRss> + </item> + </channel> +</rss> + + + diff --git a/akregator/src/librss/test_data/dublincore.xml b/akregator/src/librss/test_data/dublincore.xml new file mode 100644 index 00000000..075822bb --- /dev/null +++ b/akregator/src/librss/test_data/dublincore.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<rss xmlns:media="http://search.yahoo.com/mrss/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="2.0"> + <channel> + <title>The Guardian</title> + <link>https://www.theguardian.com/us</link> + <description>Latest US news, world news, sports, business, opinion, analysis and reviews from the Guardian, the world's leading liberal voice</description> + <copyright>Guardian News and Media Limited or its affiliated companies. All rights reserved. 2025</copyright> + <language>en-gb</language> + <!-- pubDate has been modified so we can assure dc:date is chosen. --> + <pubDate>Thu, 13 Mar 2020 10:38:39 GMT</pubDate> + <dc:date>2025-03-13T07:28:39Z</dc:date> + <dc:language>en-gb</dc:language> + <dc:rights>Guardian News and Media Limited or its affiliated companies. All rights reserved. 2025</dc:rights> + <image> + <title>The Guardian</title> + <url>https://assets.guim.co.uk/images/guardian-logo-rss.c45beb1bafa34b347ac333af2e6fe23f.png</url> + <link>https://www.theguardian.com</link> + </image> + <item> + <title>Judge orders Elon Musk and Doge to produce records about cost-cutting operations</title> + <link>https://www.theguardian.com/us-news/2025/mar/13/elon-musk-doge-court-ruling-records</link> + <description><p>The documents would ultimately inform whether Musk has been operating unconstitutionally to the extent Doge’s activities should be halted</p><p>Elon Musk and his so-called “department of government efficiency”, or Doge, have been ordered by <a href="https://www.theguardian.com/us-news/2025/mar/12/judge-blocks-trump-order-perkins-coie">a federal judge</a> to turn over a wide array of records that would reveal the identities of staffers and internal records related to efforts to aggressively cut federal government spending and programs.</p><p>US district judge Tanya Chutkan’s order forces Musk to produce documents related to Doge’s activities <a href="https://storage.courtlistener.com/recap/gov.uscourts.dcd.277463/gov.uscourts.dcd.277463.61.0_1.pdf">as part of a lawsuit</a> brought by 14 Democratic state attorneys general that alleges Musk violated the constitution by wielding powers that only Senate-confirmed officials should possess.</p> <a href="https://www.theguardian.com/us-news/2025/mar/13/elon-musk-doge-court-ruling-records">Continue reading...</a></description> + <category domain="https://www.theguardian.com/us-news/trump-administration">Trump administration</category> + <category domain="https://www.theguardian.com/us-news/donaldtrump">Donald Trump</category> + <category domain="https://www.theguardian.com/law/law-us">Law (US)</category> + <category domain="https://www.theguardian.com/us-news/us-politics">US politics</category> + <category domain="https://www.theguardian.com/us-news/us-news">US news</category> + <!-- pubDate has been modified so we can assure dc:date is chosen. --> + <pubDate>Thu, 13 Mar 2020 10:38:39 GMT</pubDate> + <guid>https://www.theguardian.com/us-news/2025/mar/13/elon-musk-doge-court-ruling-records</guid> + <media:content width="140" url="https://i.guim.co.uk/img/media/8570e3094dfad7e268555097158aa8085221d48f/0_72_5221_3132/master/5221.jpg?width=140&quality=85&auto=format&fit=max&s=8677942b4c15d93e73d6bd18a13a12c0"> + <media:credit scheme="urn:ebu">Photograph: Alex Brandon/AP</media:credit> + </media:content> + <media:content width="460" url="https://i.guim.co.uk/img/media/8570e3094dfad7e268555097158aa8085221d48f/0_72_5221_3132/master/5221.jpg?width=460&quality=85&auto=format&fit=max&s=bcd596d741b8c9e4be82c602e5105122"> + <media:credit scheme="urn:ebu">Photograph: Alex Brandon/AP</media:credit> + </media:content> + <dc:creator>Hugo Lowell in Washington</dc:creator> + <dc:date>2025-03-13T05:22:00Z</dc:date> + </item> + </channel> +</rss> + diff --git a/akregator/src/librss/test_data/rdf.xml b/akregator/src/librss/test_data/rdf.xml new file mode 100644 index 00000000..dadcde6d --- /dev/null +++ b/akregator/src/librss/test_data/rdf.xml @@ -0,0 +1,64 @@ +<?xml version="1.0"?> +<rdf:RDF + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns="http://purl.org/rss/1.0/" +> + + <channel rdf:about="http://www.xml.com/xml/news.rss"> + <title>XML.com</title> + <link>http://xml.com/pub</link> + + <description> + XML.com features a rich mix of information and services + for the XML community. + </description> + + <image rdf:resource="http://xml.com/universal/images/xml_tiny.gif" /> + + <items> + <rdf:Seq> + + <rdf:li resource="http://xml.com/pub/2000/08/09/xslt/xslt.html" /> + <rdf:li resource="http://xml.com/pub/2000/08/09/rdfdb/index.html" /> + </rdf:Seq> + </items> + + <textinput rdf:resource="http://search.xml.com" /> + + </channel> + <image rdf:about="http://xml.com/universal/images/xml_tiny.gif"> + <title>XML.com</title> + <link>http://www.xml.com</link> + <url>http://xml.com/universal/images/xml_tiny.gif</url> + + </image> + <item rdf:about="http://xml.com/pub/2000/08/09/xslt/xslt.html"> + <title>Processing Inclusions with XSLT</title> + <link>http://xml.com/pub/2000/08/09/xslt/xslt.html</link> + <description> + + Processing document inclusions with general XML tools can be + problematic. This article proposes a way of preserving inclusion + information through SAX-based processing. + </description> + </item> + <item rdf:about="http://xml.com/pub/2000/08/09/rdfdb/index.html"> + <title>Putting RDF to Work</title> + <link>http://xml.com/pub/2000/08/09/rdfdb/index.html</link> + + <description> + Tool and API support for the Resource Description Framework + is slowly coming of age. Edd Dumbill takes a look at RDFDB, + one of the most exciting new RDF toolkits. + </description> + </item> + + <textinput rdf:about="http://search.xml.com"> + <title>Search XML.com</title> + + <description>Search XML.com's XML collection</description> + <name>s</name> + <link>http://search.xml.com</link> + </textinput> + +</rdf:RDF> diff --git a/akregator/src/librss/test_data/rss091.xml b/akregator/src/librss/test_data/rss091.xml new file mode 100644 index 00000000..65788c3d --- /dev/null +++ b/akregator/src/librss/test_data/rss091.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<rss version="0.91"> + <channel> + <title>WriteTheWeb</title> + <link>http://writetheweb.com</link> + <description>News for web users that write back</description> + <language>en-us</language> + <copyright>Copyright 2000, WriteTheWeb team.</copyright> + <managingEditor>editor@writetheweb.com</managingEditor> + <webMaster>webmaster@writetheweb.com</webMaster> + <image> + <title>WriteTheWeb</title> + <url>http://writetheweb.com/images/mynetscape88.gif</url> + <link>http://writetheweb.com</link> + <width>88</width> + <height>31</height> + <description>News for web users that write back</description> + </image> + <item> + <title>Giving the world a pluggable Gnutella</title> + <link>http://writetheweb.com/read.php?item=24</link> + <description>WorldOS is a framework on which to build programs that work like Freenet or Gnutella -allowing distributed applications using peer-to-peer routing.</description> + </item> + <item> + <title>Syndication discussions hot up</title> + <link>http://writetheweb.com/read.php?item=23</link> + <description>After a period of dormancy, the Syndication mailing list has become active again, with contributions from leaders in traditional media and Web syndication.</description> + </item> + <item> + <title>Personal web server integrates file sharing and messaging</title> + <link>http://writetheweb.com/read.php?item=22</link> + <description>The Magi Project is an innovative project to create a combined personal web server and messaging system that enables the sharing and synchronization of information across desktop, laptop and palmtop devices.</description> + </item> + <item> + <title>Syndication and Metadata</title> + <link>http://writetheweb.com/read.php?item=21</link> + <description>RSS is probably the best known metadata format around. RDF is probably one of the least understood. In this essay, published on my O'Reilly Network weblog, I argue that the next generation of RSS should be based on RDF.</description> + </item> + <item> + <title>UK bloggers get organised</title> + <link>http://writetheweb.com/read.php?item=20</link> + <description>Looks like the weblogs scene is gathering pace beyond the shores of the US. There's now a UK-specific page on weblogs.com, and a mailing list at egroups.</description> + </item> + <item> + <title>Yournamehere.com more important than anything</title> + <link>http://writetheweb.com/read.php?item=19</link> + <description>Whatever you're publishing on the web, your site name is the most valuable asset you have, according to Carl Steadman.</description> + </item> + </channel> + </rss> diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp index bef989c6..5e298ea3 100644 --- a/akregator/src/librss/testlibrss.cpp +++ b/akregator/src/librss/testlibrss.cpp @@ -1,67 +1,268 @@ #include "testlibrss.h" -#include "image.h" +#include <tqdatetime.h> +#include <tqfile.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <tdeapplication.h> #include <kdebug.h> +#include <krfcdate.h> + +#include "image.h" +#include "enclosure.h" + +#include <cstdlib> using namespace RSS; + +TestRetriever::TestRetriever() + : m_errorCode(0) +{ +} + +TestRetriever::~TestRetriever() +{ +} + +void TestRetriever::retrieveData(const KURL &url) +{ + // Test files are local paths + TQFile file(url.path()); + if (file.open(IO_ReadOnly)) + { + TQStringList lines; + TQTextStream stream(&file); + + while (!stream.atEnd()) + { + lines += stream.readLine(); + } + file.close(); + + TQCString content = lines.join("\n").local8Bit(); + TQByteArray data; + data.duplicate(content, content.length()); + emit dataRetrieved(data, true); + } + else + { + kdError() << "Failed to retrieveData: " << file.errorString() << endl; + m_errorCode = file.status(); + emit dataRetrieved(TQByteArray{}, false); + } +} + static const TDECmdLineOptions options[] = { { "+url", I18N_NOOP("URL of feed"), 0 }, TDECmdLineLastOption }; +template<typename ActualType, typename ExpectedType> +static void assertEquals(const ActualType& actual, const ExpectedType& expected) +{ + if (actual != expected) + { + kdError() << "Assertion failed: actual == expected\n" + << " actual: " << actual << "\n" + << " expected: " << expected << endl; + tdeApp->exit(1); + } +} + +static void checkRSS091(const Document& document) +{ + assertEquals(document.title(), "WriteTheWeb"); + assertEquals(document.link().url(), "http://writetheweb.com"); + assertEquals(document.description(), "News for web users that write back"); + assertEquals(document.language(), Language::en_us); + assertEquals(document.copyright(), "Copyright 2000, WriteTheWeb team."); + assertEquals(document.managingEditor(), "editor@writetheweb.com"); + assertEquals(document.webMaster(), "webmaster@writetheweb.com"); + + const Image* image = document.image(); + if (!image) + { + kdError() << "Expected an <image> element to be found" << endl; + tdeApp->exit(1); + } + + assertEquals(image->title(), "WriteTheWeb"); + assertEquals(image->url().url(), "http://writetheweb.com/images/mynetscape88.gif"); + assertEquals(image->link().url(), "http://writetheweb.com"); + assertEquals(image->description(), "News for web users that write back"); + assertEquals(image->width(), 88); + assertEquals(image->height(), 31); + + assertEquals(document.articles().count(), 6); + + Article article = document.articles().first(); + assertEquals(article.title(), "Giving the world a pluggable Gnutella"); + assertEquals(article.link().url(), "http://writetheweb.com/read.php?item=24"); + assertEquals(article.description(), "WorldOS is a framework on which to build programs that work like Freenet or Gnutella -allowing distributed applications using peer-to-peer routing."); +} + +static void checkWFW(const Document& document) +{ + assertEquals(document.link().url(), "http://wellformedweb.org/news/"); + assertEquals(document.description(), "Exploring the limits of XML and HTTP"); + + assertEquals(document.articles().count(), 5); + + Article article = document.articles().front(); + assertEquals(article.title(), "Should you use Content Negotiation in your Web Services?"); + assertEquals(article.commentsLink().url(), "http://bitworking.org/news/comments/WebServicesAndContentNegotiation"); +} + +static void checkDC(const Document& document) +{ + // librss will use dc:date if it is provided, otherwise it will use pubDate + assertEquals(document.link().url(), "https://www.theguardian.com/us"); + + TQDateTime expectedTime; + time_t time = KRFCDate::parseDateISO8601("2025-03-13T07:28:39Z"); + expectedTime.setTime_t(time); + assertEquals(document.pubDate(), expectedTime); + + assertEquals(document.articles().count(), 1); + + Article article = document.articles().first(); + time = KRFCDate::parseDateISO8601("2025-03-13T05:22:00Z"); + expectedTime.setTime_t(time); + assertEquals(article.pubDate(), expectedTime); + + assertEquals(article.author(), "Hugo Lowell in Washington"); +} + +static void checkRDF(const Document& document) +{ + assertEquals(document.title(), "XML.com"); + assertEquals(document.link().url(), "http://xml.com/pub"); + + assertEquals(document.articles().count(), 2); + + Article article = document.articles().first(); + + assertEquals(article.title(), "Processing Inclusions with XSLT"); + assertEquals(article.link().url(), "http://xml.com/pub/2000/08/09/xslt/xslt.html"); + assertEquals(article.guid(), "http://xml.com/pub/2000/08/09/xslt/xslt.html"); + assertEquals(article.guidIsPermaLink(), false); +} + +static void checkAtom10(const Document& document) +{ + assertEquals(document.title(), "dive into mark"); + assertEquals(document.description(), "A <em>lot</em> of effort went into making this effortless"); + kdWarning() << "Skipping check for Atom \"rights\" (Document::copyright) -- not implemented." << endl; + // assertEquals(document.copyright(), "Copyright (c) 2003, Mark Pilgrim"); + assertEquals(document.language(), Language::en_us); + + // 2005-07-31T12:29:29Z + // TQDateTime compTime; + // time_t time = KRFCDate::parseDateISO8601("2005-07-31T12:29:29Z"); + // compTime.setTime_t(time); + // assertEquals(document.pubDate(), compTime); + kdWarning() << "Skipping check for Atom \"updated\" (Document::pubDate/lastBuildDate) -- not implemented." << endl; + + assertEquals(document.link().url(), "http://example.org/"); + + assertEquals(document.articles().count(), 1); + + Article article = document.articles().first(); + + assertEquals(article.title(), "Atom draft-07 snapshot"); + assertEquals(article.link().url(), "http://example.org/2005/04/02/atom"); + + if (article.description().isNull()) + { + kdError() << "Empty Atom article description." << endl; + tdeApp->exit(1); + } + + // Enclosure enclosure = article.enclosure(); + // assertEquals(enclosure.url(), "http://example.org/audio/ph34r_my_podcast.mp3"); + // assertEquals(enclosure.length(), 1337); + // assertEquals(enclosure.type(), "audio/mpeg"); + kdWarning() << "Skipping check for Atom \"enclosure\" links -- not implemented." << endl; + + assertEquals(article.guid(), "tag:example.org,2003:3.2397"); + + // 2005-07-31T12:29:29Z + // Need a little workaround since librss converts the timestamp to local time. + // NOTE: Atom provides both 'published' and 'updated'; librss uses 'updated'. + TQDateTime articlePublishedDate; + time_t publishedTime = KRFCDate::parseDateISO8601("2005-07-31T12:29:29Z"); + articlePublishedDate.setTime_t(publishedTime); + assertEquals(article.pubDate(), articlePublishedDate); + + assertEquals(article.author(), "<a href=\"mailto:f8dy@example.com\">Mark Pilgrim</a>"); +} void Tester::test( const TQString &url ) { Loader *loader = Loader::create(); - connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ), - this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); - loader->loadFrom( url, new FileRetriever ); + connect( loader, TQ_SIGNAL( loadingComplete( Loader *, Document, Status ) ), + this, TQ_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); + loader->loadFrom( url, new TestRetriever ); } void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status ) { - if ( status == Success ) + if (status != Success) { - kdDebug() << "Successfully retrieved '" << doc.title() << "'" << endl; - kdDebug() << doc.description() << endl; - - if ( doc.image() ) { - kdDebug() << "Image: "; - kdDebug() << " Title: " << doc.image()->title() << endl; - kdDebug() << " URL: " << doc.image()->url() << endl; - kdDebug() << " Link: " << doc.image()->link() << endl; - } - - kdDebug() << "Articles:" << endl; - - Article::List list = doc.articles(); - Article::List::ConstIterator it; - Article::List::ConstIterator en=list.end(); - for (it = list.begin(); it != en; ++it) + kdError() << "Failed to load Document: ec=" << loader->errorCode() << " status=" << status << endl; + exit(1); + } + + switch (doc.version()) + { + case RSS::v0_91: { - kdDebug() << "\tTitle: " << (*it).title() << endl; - kdDebug() << "\tText: " << (*it).description() << endl; + checkRSS091(doc); + break; + } + case RSS::v2_0: + { + if (doc.title() == "The Well-Formed Web") + { + checkWFW(doc); + break; + } + else if (doc.title() == "The Guardian") + { + checkDC(doc); + break; + } + else if (doc.title() == "XML.com") + { + checkRDF(doc); + break; + } + kdError() << "Unknown RSS 2.0 document '" << doc.title() << "'" << endl; + exit(1); + } + case RSS::vAtom_1_0: + { + checkAtom10(doc); + break; + } + default: + { + break; } } - if ( status != Success ) - kdDebug() << "ERROR " << loader->errorCode() << endl; - - kapp->quit(); + exit(0); } int main( int argc, char **argv ) { TDEAboutData aboutData( "testlibrss", "testlibrss", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); - TDECmdLineArgs::addCmdLineOptions( options ); - TDEApplication app; + TDECmdLineArgs::addCmdLineOptions( options ); + TDEApplication app(false, false); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() != 1 ) args->usage(); diff --git a/akregator/src/librss/testlibrss.h b/akregator/src/librss/testlibrss.h index 222943a6..fdbccbd1 100644 --- a/akregator/src/librss/testlibrss.h +++ b/akregator/src/librss/testlibrss.h @@ -14,8 +14,8 @@ using RSS::Status; class Tester : public TQObject { - Q_OBJECT - + TQ_OBJECT + public: void test( const TQString &url ); @@ -23,4 +23,22 @@ class Tester : public TQObject void slotLoadingComplete( Loader *loader, Document doc, Status status ); }; +class TestRetriever : public RSS::DataRetriever +{ + TQ_OBJECT + +public: + TestRetriever(); + ~TestRetriever() override; + + void retrieveData(const KURL &url) override; + + int errorCode() const override { return m_errorCode; } + + void abort() override { /* no-op */ } + +private: + int m_errorCode; +}; + #endif diff --git a/akregator/src/librss/textinput.cpp b/akregator/src/librss/textinput.cpp index 04799fca..a32c9f58 100644 --- a/akregator/src/librss/textinput.cpp +++ b/akregator/src/librss/textinput.cpp @@ -92,5 +92,3 @@ bool TextInput::operator==(const TextInput &other) const d->name == other.name() && d->link == other.link(); } - -// vim:noet:ts=4 diff --git a/akregator/src/librss/textinput.h b/akregator/src/librss/textinput.h index cbf5bdb6..dd46d176 100644 --- a/akregator/src/librss/textinput.h +++ b/akregator/src/librss/textinput.h @@ -118,4 +118,3 @@ namespace RSS } #endif // LIBRSS_TEXTINPUT_H -// vim: noet:ts=4 diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp index bd8ce39b..04dc570b 100644 --- a/akregator/src/librss/tools_p.cpp +++ b/akregator/src/librss/tools_p.cpp @@ -117,6 +117,59 @@ static TQString extractAtomContent(const TQDomElement& e) return TQString(); } +TQDomElement extractElementNS(const TQDomNode &parent, const TQString &nameSpace, const TQString &localName) +{ + TQDomElement element; + + if (parent.isNull()) + { + return element; + } + + TQDomNodeList children = parent.childNodes(); + for (size_t i = 0; i < children.count(); ++i) + { + TQDomNode node = children.item(i); + if (node.isElement() && node.namespaceURI() == nameSpace && node.localName() == localName) + { + element = node.toElement(); + break; + } + } + + return element; +} + +TQString extractElementTextNS(const TQDomNode &parent, const TQString &namespaceURI, const TQString &localName, bool isInlined) +{ + TQDomElement element = extractElementNS(parent, namespaceURI, localName); + + if (element.isNull()) + { + return TQString::null; + } + + TQString result = element.text().stripWhiteSpace(); + if (localName == "content") + { + // Atom content + result = extractAtomContent(element); + } + else + { + // Check for HTML; not necessary for atom:content + // Taken from extractNode below + bool hasPre = result.contains("<pre>", false) || result.contains("<pre ", false); + bool hasHtml = hasPre || result.contains("<"); + if (!isInlined && !hasHtml) + result = result = result.replace(TQChar('\n'), "<br />"); + if (!hasPre) + result = result.simplifyWhiteSpace(); + } + + return result.isEmpty() ? TQString::null : result; +} + TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined) { TQDomNode node = parent.namedItem(elemName); @@ -208,25 +261,25 @@ TQString parseItemAuthor(const TQDomElement& element, Format format, Version ver TQString name; TQString email; - TQDomElement dcCreator = element.namedItem("dc:creator").toElement(); - + TQDomElement dcCreator = extractElementNS(element, DublinCoreNamespace, "creator"); + if (!dcCreator.isNull()) authorFromString(dcCreator.text(), name, email); else if (format == AtomFeed) { TQDomElement atomAuthor = element.namedItem("author").toElement(); if (atomAuthor.isNull()) - atomAuthor = element.namedItem("atom:author").toElement(); + atomAuthor = extractElementNS(element, AtomNamespace, "author"); if (!atomAuthor.isNull()) { TQDomElement atomName = atomAuthor.namedItem("name").toElement(); if (atomName.isNull()) - atomName = atomAuthor.namedItem("atom:name").toElement(); + atomName = extractElementNS(atomAuthor, AtomNamespace, "name"); name = atomName.text().stripWhiteSpace(); TQDomElement atomEmail = atomAuthor.namedItem("email").toElement(); if (atomEmail.isNull()) - atomEmail = atomAuthor.namedItem("atom:email").toElement(); + atomEmail = extractElementNS(atomAuthor, AtomNamespace, "email"); email = atomEmail.text().stripWhiteSpace(); } } @@ -245,5 +298,3 @@ TQString parseItemAuthor(const TQDomElement& element, Format format, Version ver } } // namespace RSS - -// vim:noet:ts=4 diff --git a/akregator/src/librss/tools_p.h b/akregator/src/librss/tools_p.h index 47be905d..1b89fc85 100644 --- a/akregator/src/librss/tools_p.h +++ b/akregator/src/librss/tools_p.h @@ -29,6 +29,8 @@ namespace RSS unsigned int count; }; + TQDomElement extractElementNS(const TQDomNode& parent, const TQString& namespaceURI, const TQString& localName); + TQString extractElementTextNS(const TQDomNode& parent, const TQString& namespaceURI, const TQString& localName, bool isInlined = true); TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined=true); TQString extractTitle(const TQDomNode &parent); TQString childNodesAsXML(const TQDomNode& parent); @@ -37,4 +39,3 @@ namespace RSS } #endif // LIBRSS_TOOLS_P_H -// vim:noet:ts=4 diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp index 1920a5ff..8349f28a 100644 --- a/akregator/src/listtabwidget.cpp +++ b/akregator/src/listtabwidget.cpp @@ -170,7 +170,7 @@ ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(pare d->stack = new TQWidgetStack(this); d->layout->addWidget(d->stack/*, 0, 1*/); -// connect(d->tabBar, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentChanged(TQWidget*))); +// connect(d->tabBar, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotCurrentChanged(TQWidget*))); } ListTabWidget::~ListTabWidget() @@ -206,11 +206,11 @@ void ListTabWidget::addView(NodeListView* view, const TQString& caption, const T int tabId = d->idCounter++; d->tabBar->appendTab(icon, tabId, caption); d->idToView[tabId] = view; - connect(d->tabBar->tab(tabId), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotTabClicked(int))); + connect(d->tabBar->tab(tabId), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotTabClicked(int))); - connect(view, TQT_SIGNAL(signalNodeSelected(TreeNode*)), this, TQT_SIGNAL(signalNodeSelected(TreeNode*))); - connect(view, TQT_SIGNAL(signalRootNodeChanged(NodeListView*, TreeNode*)), this, TQT_SLOT(slotRootNodeChanged(NodeListView*, TreeNode*))); + connect(view, TQ_SIGNAL(signalNodeSelected(TreeNode*)), this, TQ_SIGNAL(signalNodeSelected(TreeNode*))); + connect(view, TQ_SIGNAL(signalRootNodeChanged(NodeListView*, TreeNode*)), this, TQ_SLOT(slotRootNodeChanged(NodeListView*, TreeNode*))); if (tabId == 0) // first widget diff --git a/akregator/src/listtabwidget.h b/akregator/src/listtabwidget.h index 7e395167..4038f9a2 100644 --- a/akregator/src/listtabwidget.h +++ b/akregator/src/listtabwidget.h @@ -45,7 +45,7 @@ class TreeNode; class ListTabWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/akregator/src/main.cpp b/akregator/src/main.cpp index 4c4b31ec..9f6e466e 100644 --- a/akregator/src/main.cpp +++ b/akregator/src/main.cpp @@ -28,7 +28,7 @@ #include <tdecmdlineargs.h> #include <tdelocale.h> #include <knotifyclient.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include "aboutdata.h" #include "mainwindow.h" @@ -36,7 +36,7 @@ namespace Akregator { -class Application : public KUniqueApplication { +class Application : public TDEUniqueApplication { public: Application() : mMainWindow( ) {} ~Application() {} @@ -80,7 +80,7 @@ int Application::newInstance() args->clear(); } - return KUniqueApplication::newInstance(); + return TDEUniqueApplication::newInstance(); } } // namespace Akregator @@ -90,7 +90,7 @@ int main(int argc, char **argv) Akregator::AboutData about; TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( Akregator::akregator_options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); Akregator::Application app; diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index c4e47338..b236d001 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -43,7 +43,7 @@ #include <tdemessagebox.h> #include <tdeparts/partmanager.h> #include <ksqueezedtextlabel.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstatusbar.h> #include <kstdaction.h> #include <kurl.h> @@ -55,14 +55,14 @@ #include <tqmetaobject.h> #include <tqpen.h> #include <tqpainter.h> -#include <tqucomextra_p.h> +#include <private/tqucomextra_p.h> #include <tqtimer.h> namespace Akregator { BrowserInterface::BrowserInterface( MainWindow *shell, const char *name ) - : KParts::BrowserInterface( TQT_TQOBJECT(shell), name ) + : KParts::BrowserInterface( shell, name ) { m_shell = shell; } @@ -104,16 +104,16 @@ bool MainWindow::loadPart() { // now that the Part is loaded, we cast it to a Part to get // our hands on it - m_part = static_cast<Akregator::Part*>(factory->create(TQT_TQOBJECT(this), "akregator_part", "KParts::ReadOnlyPart" )); + m_part = static_cast<Akregator::Part*>(factory->create(this, "akregator_part", "KParts::ReadOnlyPart" )); if (m_part) { // tell the KParts::MainWindow that this is indeed the main widget setCentralWidget(m_part->widget()); - connect(m_part, TQT_SIGNAL(setWindowCaption (const TQString &)), this, TQT_SLOT(setCaption (const TQString &))); + connect(m_part, TQ_SIGNAL(setWindowCaption (const TQString &)), this, TQ_SLOT(setCaption (const TQString &))); - connect(TrayIcon::getInstance(), TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotQuit())); + connect(TrayIcon::getInstance(), TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotQuit())); // and integrate the part's GUI with the shell's connectActionCollection(m_part->actionCollection()); createGUI(m_part); @@ -154,13 +154,13 @@ void MainWindow::setupActions() { connectActionCollection(actionCollection()); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); setStandardToolBarMenuEnabled(true); createStandardStatusBarAction(); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); } void MainWindow::saveProperties(TDEConfig* config) @@ -203,8 +203,8 @@ void MainWindow::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } @@ -226,16 +226,16 @@ KParts::BrowserExtension *MainWindow::browserExtension(KParts::ReadOnlyPart *p) void MainWindow::connectActionCollection( TDEActionCollection *coll ) { if (!coll) return; - connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), - m_statusLabel, TQT_SLOT( setText( const TQString & ) ) ); - connect( coll, TQT_SIGNAL( clearStatusText() ), - this, TQT_SLOT( slotClearStatusText() ) ); + connect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ), + m_statusLabel, TQ_SLOT( setText( const TQString & ) ) ); + connect( coll, TQ_SIGNAL( clearStatusText() ), + this, TQ_SLOT( slotClearStatusText() ) ); } bool MainWindow::queryExit() { kdDebug() << "MainWindow::queryExit()" << endl; - if ( !kapp->sessionSaving() ) + if ( !tdeApp->sessionSaving() ) { delete m_part; // delete that here instead of dtor to ensure nested tdehtmlparts are deleted before singleton objects like TDEHTMLPageCache m_part = 0; @@ -250,12 +250,12 @@ void MainWindow::slotQuit() { if (TrayIcon::getInstance()) TrayIcon::getInstance()->hide(); - kapp->quit(); + tdeApp->quit(); } bool MainWindow::queryClose() { - if (kapp->sessionSaving() || TrayIcon::getInstance() == 0 || TrayIcon::getInstance()->isHidden() ) + if (tdeApp->sessionSaving() || TrayIcon::getInstance() == 0 || TrayIcon::getInstance()->isHidden() ) { return true; } @@ -285,6 +285,3 @@ void MainWindow::slotSetStatusBarText( const TQString & text ) } // namespace Akregator #include "mainwindow.moc" - - -// vim: set et ts=4 sts=4 sw=4: diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h index c5d9529b..23d5d0c0 100644 --- a/akregator/src/mainwindow.h +++ b/akregator/src/mainwindow.h @@ -53,7 +53,7 @@ class MainWindow; class BrowserInterface : public KParts::BrowserInterface { - Q_OBJECT + TQ_OBJECT public: @@ -72,7 +72,7 @@ private: */ class MainWindow : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp index 501b8b26..8a4af99c 100644 --- a/akregator/src/mk4storage/feedstoragemk4impl.cpp +++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp @@ -36,7 +36,7 @@ #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> namespace Akregator { namespace Backend { diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES index 160c4bad..edd5f861 100644 --- a/akregator/src/mk4storage/metakit/CHANGES +++ b/akregator/src/mk4storage/metakit/CHANGES @@ -1686,5 +1686,3 @@ ALSO LISTED IN THE RELEASE HISTORY Moves do not involve any data copying w.r.t. subviews and memo's. The old release history is at http://www.equi4.com/metakit/history.html - -# vim: tw=72 diff --git a/akregator/src/mk4storage/metakit/README b/akregator/src/mk4storage/metakit/README index 21edd0fc..5538acc0 100644 --- a/akregator/src/mk4storage/metakit/README +++ b/akregator/src/mk4storage/metakit/README @@ -55,9 +55,7 @@ INSTALLATION All platform builds and language bindings are designed to work from a single common "builds/" directory. Where possible, that is - it turns out to be -impossible to keep build side-effects limited to *just* this directory -(CodeWarrior can't be told where to place its temp data, and Visual C++ still -alters a few files next to the project ".dsw" file, to name two offenders). +impossible to keep build side-effects limited to *just* this directory. UNIX @@ -86,7 +84,7 @@ WINDOWS There is a "win/" directory which contains subdirectories for a number of compiler systems. Metakit has been built with many different compilers - in the past (Microsoft, Borland, Watcom, Symantec, Metrowerks, Optima), + in the past (Microsoft, Watcom, Symantec, Optima), only a few are maintained (there are 12 configurations for MSVC6 alone!). The MS Visual C++ 6.0 project is "win/msvc60/mksrc.dsw", with subprojects @@ -98,14 +96,6 @@ WINDOWS To build with STL containers and strings under MSVC, define "q4_STD". To build with MFC containers and strings under MSVC, define "q4_MFC". - The Metrowerks Codewarrior project is in the "mac/" directory, and can be - used to build both Mac and Windows versions (on either Mac *or* Windows). - The core libraries are built with "mac/cw5.mcp", demos / tests are built - with "cw5apps.mcp", Tcl is "cw5tcl.mcp", and Python is "cw5python.mcp". - - The Borland C++ Builder projects have not yet been incorporated in this - release, but the "KitViewer" application is an example of how to use BCB. - The Cygwin build (B20.1 / gcc 2.95.2) is different, because it uses the unix autoconf system, and must be launched as described above for UNIX. I have upgraded to the latest development of libtool to be able to build @@ -116,14 +106,6 @@ WINDOWS efficiency on x86 hardware: "-O2 -m486 -malign-loops=2 -malign-jumps=2". I have not yet tried this myself, but am passing on the tip. -MACINTOSH CLASSIC - - The Mac version requires Metrowerks CodeWarrior 6. See the info above - in the Windows section (MWCW is multi-platform). The projects are all - located in the "mac/" folder, which is also where MWCW will place its own - "... Data" folders with intermediate results. As with all other setups, - final results are made to end up in the "builds/" directory. - LICENSE AND COPYRIGHT STATEMENT =============================== diff --git a/akregator/src/mk4storage/metakit/include/mk4.h b/akregator/src/mk4storage/metakit/include/mk4.h index 33016dba..2b311246 100644 --- a/akregator/src/mk4storage/metakit/include/mk4.h +++ b/akregator/src/mk4storage/metakit/include/mk4.h @@ -114,19 +114,6 @@ //--------------------------------------------------------------------------- - // Borland C++ and C++ Builder -#if defined (__BORLANDC__) - // by default, if runtime is linked as a DLL, then so is Metakit -#if defined (_RTLDLL) && !defined (q4_KITDLL) -#define q4_KITDLL 1 -#endif - - // Borland 5.0 supports the bool datatype -#if __BORLANDC__ >= 0x500 -#define q4_BOOL 1 -#endif -#endif // __BORLANDC__ - // IRIX supports the bool datatype // define before gcc to cover both the gcc and MipsPRO compiler #if defined (sgi) @@ -153,17 +140,6 @@ #endif #endif - // Metrowerks CodeWarrior -#if defined (__MWERKS__) -#if __option(bool) -#define q4_BOOL 1 // bool datatype is optionally supported - // undef, these conflict with c4_Storage::c4_Storage overloading -#undef bool -#undef true -#undef false -#endif -#endif - // Microsoft Visual C++ #if defined (_MSC_VER) // MSVC 5.0 supports the bool datatype, MSVC 4.x has no namespaces diff --git a/akregator/src/mk4storage/metakit/src/Makefile.am b/akregator/src/mk4storage/metakit/src/Makefile.am index e428fe93..acd0db89 100644 --- a/akregator/src/mk4storage/metakit/src/Makefile.am +++ b/akregator/src/mk4storage/metakit/src/Makefile.am @@ -2,8 +2,8 @@ INCLUDES = -I$(srcdir)/../include noinst_LTLIBRARIES = libmetakitlocal.la -noinst_HEADERS = borc.h column.h column.inl custom.h derived.h field.h field.inl format.h gnuc.h handler.h handler.inl header.h mfc.h \ - msvc.h mwcw.h persist.h remap.h std.h store.h store.inl univ.h univ.inl win.h +noinst_HEADERS = column.h column.inl custom.h derived.h field.h field.inl format.h gnuc.h handler.h handler.inl header.h mfc.h \ + msvc.h persist.h remap.h std.h store.h store.inl univ.h univ.inl win.h libmetakitlocal_la_SOURCES = column.cpp custom.cpp derived.cpp field.cpp fileio.cpp format.cpp handler.cpp persist.cpp remap.cpp std.cpp store.cpp \ string.cpp table.cpp univ.cpp view.cpp viewx.cpp diff --git a/akregator/src/mk4storage/metakit/src/borc.h b/akregator/src/mk4storage/metakit/src/borc.h deleted file mode 100644 index 2b881fc9..00000000 --- a/akregator/src/mk4storage/metakit/src/borc.h +++ /dev/null @@ -1,33 +0,0 @@ -// borc.h -- -// $Id$ -// This is part of Metakit, see http://www.equi4.com/metakit/ - -/** @file - * Configuration header for Borland C++ - */ - -#define q4_BORC 1 - - // get rid of several common warning messages -#if !q4_STRICT -#pragma warn -aus // 'identifier' is assigned a value that is never used -#pragma warn -par // Parameter 'parameter' is never used. -#pragma warn -sig // Conversion may lose significant digits -#pragma warn -use // 'identifier' declared but never used -#endif - -#if __BORLANDC__ >= 0x500 -#define q4_BOOL 1 // supports the bool datatype - // undo previous defaults, because q4_BOOL is not set early enough -#undef false -#undef true -#undef bool -#endif - -#if !defined (q4_EXPORT) -#define q4_EXPORT 1 // requires export/import specifiers -#endif - -#if defined (__MT__) -#define q4_MULTI 1 // uses multi-threading -#endif diff --git a/akregator/src/mk4storage/metakit/src/column.cpp b/akregator/src/mk4storage/metakit/src/column.cpp index 2e8f24d1..1e4efb44 100644 --- a/akregator/src/mk4storage/metakit/src/column.cpp +++ b/akregator/src/mk4storage/metakit/src/column.cpp @@ -1212,8 +1212,6 @@ void c4_ColOfInts::SetAccessWidth(int bits_) if (l2bp1 > 4 && (_mustFlip || ((Persist() != 0) && Strategy()._bytesFlipped))) l2bp1 += 3; // switch to the trailing entries for byte flipping - // Metrowerks Codewarrior 11 is dumb, it requires the "&c4_ColOfInts::" - static tGetter gTab [] = { &c4_ColOfInts::Get_0b, // 0: 0 bits/entry diff --git a/akregator/src/mk4storage/metakit/src/fileio.cpp b/akregator/src/mk4storage/metakit/src/fileio.cpp index 28ff7dca..8e69ede7 100644 --- a/akregator/src/mk4storage/metakit/src/fileio.cpp +++ b/akregator/src/mk4storage/metakit/src/fileio.cpp @@ -41,127 +41,6 @@ #endif ///////////////////////////////////////////////////////////////////////////// -// -// The "Carbon" version of a build on Macintosh supports running under -// either MacOS 7..9 (which has no mmap), or MacOS X (which has mmap). -// The logic below was adapted from a contribution by Paul Snively, it -// decides at run time which case it is, and switches I/O calls to match. - -#if defined (q4_CARBON) && q4_CARBON -//#if q4_MAC && !defined (__MACH__) && (!q4_MWCW || __MWERKS__ >= 0x3000) -#undef HAVE_MMAP -#define HAVE_MMAP 1 - -#include <CFBundle.h> -#include <Folders.h> - -#define PROT_NONE 0x00 -#define PROT_READ 0x01 -#define PROT_WRITE 0x02 -#define PROT_EXEC 0x04 - -#define MAP_SHARED 0x0001 -#define MAP_PRIVATE 0x0002 - -#define MAP_FIXED 0x0010 -#define MAP_RENAME 0x0020 -#define MAP_NORESERVE 0x0040 -#define MAP_INHERIT 0x0080 -#define MAP_NOEXTEND 0x0100 -#define MAP_HASSEMAPHORE 0x0200 - -typedef unsigned long t4_u32; - -static t4_u32 sfwRefCount = 0; -static CFBundleRef systemFramework = NULL; - -static char* fake_mmap(char*, t4_u32, int, int, int, long long) - { return (char*) -1L; } -static int fake_munmap(char*, t4_u32) - { return 0; } - -static FILE* (*my_fopen)(const char*,const char*) = fopen; -static int (*my_fclose)(FILE*) = fclose; -static long (*my_ftell)(FILE*) = ftell; -static int (*my_fseek)(FILE*,long,int) = fseek; -static t4_u32 (*my_fread)(void* ptr,t4_u32,t4_u32,FILE*) = fread; -static t4_u32 (*my_fwrite)(const void* ptr,t4_u32,t4_u32,FILE*) = fwrite; -static int (*my_ferror)(FILE*) = ferror; -static int (*my_fflush)(FILE*) = fflush; -static int (*my_fileno)(FILE*) = fileno; -static char* (*my_mmap)(char*,t4_u32,int,int,int,long long) = fake_mmap; -static int (*my_munmap)(char*,t4_u32) = fake_munmap; - -static void InitializeIO() -{ - if (sfwRefCount++) return; // race condition, infinitesimal risk - - FSRef theRef; - if (FSFindFolder(kOnAppropriateDisk, kFrameworksFolderType, - false, &theRef) == noErr) { - CFURLRef fw = CFURLCreateFromFSRef(kCFAllocatorSystemDefault, &theRef); - if (fw) { - CFURLRef bd = - CFURLCreateCopyAppendingPathComponent(kCFAllocatorSystemDefault, - fw, CFSTR("System.framework"), false); - CFRelease(fw); - if (bd) { - systemFramework = CFBundleCreate(kCFAllocatorSystemDefault, bd); - CFRelease(bd); - } - } - if (!systemFramework || !CFBundleLoadExecutable(systemFramework)) - return; -#define F(x) CFBundleGetFunctionPointerForName(systemFramework, CFSTR(#x)) - my_fopen = (FILE* (*)(const char*,const char*)) F(fopen); - my_fclose = (int (*)(FILE*)) F(fclose); - my_ftell = (long (*)(FILE*)) F(ftell); - my_fseek = (int (*)(FILE*,long,int)) F(fseek); - my_fread = (t4_u32 (*)(void* ptr,t4_u32,t4_u32,FILE*)) F(fread); - my_fwrite = (t4_u32 (*)(const void* ptr,t4_u32,t4_u32,FILE*)) F(fwrite); - my_ferror = (int (*)(FILE*)) F(ferror); - my_fflush = (int (*)(FILE*)) F(fflush); - my_fileno = (int (*)(FILE*)) F(fileno); - my_mmap = (char* (*)(char*,t4_u32,int,int,int,long long)) F(mmap); - my_munmap = (int (*)(char*,t4_u32)) F(munmap); -#undef F - d4_assert(my_fopen && my_fclose && my_ftell && my_fseek && - my_fread && my_fwrite && my_ferror && my_fflush && - my_fileno && my_mmap && my_munmap); - } -} - -static void FinalizeIO() -{ - if (--sfwRefCount) return; // race condition, infinitesimal risk - - if (systemFramework) { - CFBundleUnloadExecutable(systemFramework); - CFRelease(systemFramework); - systemFramework = 0; - } -} - -#define fopen my_fopen -#define fclose my_fclose -#define ftell my_ftell -#define fseek my_fseek -#define fread my_fread -#define fwrite my_fwrite -#define ferror my_ferror -#define fflush my_fflush -#define fileno my_fileno -#define mmap my_mmap -#define munmap my_munmap - -#else - -#define InitializeIO() -#define FinalizeIO() - -#endif - -///////////////////////////////////////////////////////////////////////////// #if q4_CHECK #include <stdlib.h> @@ -209,7 +88,6 @@ bool c4_FileStream::Write(const void* buffer_, int length_) c4_FileStrategy::c4_FileStrategy (FILE* file_) : _file (file_), _cleanup (0) { - InitializeIO(); ResetFileMapping(); } @@ -222,7 +100,6 @@ c4_FileStrategy::~c4_FileStrategy () fclose(_cleanup); d4_assert(_mapStart == 0); - FinalizeIO(); } bool c4_FileStrategy::IsValid() const @@ -319,7 +196,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_) { d4_assert(!_file); -#if q4_WIN32 && !q4_BORC && !q4_WINCE +#if q4_WIN32 && !q4_WINCE int flags = _O_BINARY | _O_NOINHERIT | (mode_ > 0 ? _O_RDWR : _O_RDONLY); int fd = _open(fname_, flags); if (fd != -1) @@ -330,7 +207,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_) if (_file != 0) fcntl(fileno(_file), F_SETFD, FD_CLOEXEC); #endif //q4_UNIX -#endif //q4_WIN32 && !q4_BORC && !q4_WINCE +#endif //q4_WIN32 && !q4_WINCE if (_file != 0) { ResetFileMapping(); @@ -338,7 +215,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_) } if (mode_ > 0) { -#if q4_WIN32 && !q4_BORC && !q4_WINCE +#if q4_WIN32 && !q4_WINCE fd = _open(fname_, flags | _O_CREAT, _S_IREAD | _S_IWRITE); if (fd != -1) _cleanup = _file = _fdopen(fd, "w+b"); @@ -348,7 +225,7 @@ bool c4_FileStrategy::DataOpen(const char* fname_, int mode_) if (_file != 0) fcntl(fileno(_file), F_SETFD, FD_CLOEXEC); #endif //q4_UNIX -#endif //q4_WIN32 && !q4_BORC && !q4_WINCE +#endif //q4_WIN32 && !q4_WINCE } //d4_assert(_file != 0); diff --git a/akregator/src/mk4storage/metakit/src/header.h b/akregator/src/mk4storage/metakit/src/header.h index 2f8648b8..4f62551f 100644 --- a/akregator/src/mk4storage/metakit/src/header.h +++ b/akregator/src/mk4storage/metakit/src/header.h @@ -91,14 +91,8 @@ // Use '#define q4_xxx 1' to flag the choice of an IDE, and optionally also // add '#include "file.h"' to force inclusion of a header file right here. -#if defined (__BORLANDC__) // Borland C++ -#include "borc.h" -#elif defined (__DECCXX) // DEC C++ -#define q4_DECC 1 -#elif defined (__GNUC__) // GNU C++ +#if defined (__GNUC__) // GNU C++ #include "gnuc.h" -#elif defined (__MWERKS__) // Metrowerks CodeWarrior C++ -#include "mwcw.h" #elif defined (_MSC_VER) // Microsoft Visual C++ #include "msvc.h" #elif defined (__SC__) // Symantec C++ diff --git a/akregator/src/mk4storage/metakit/src/mwcw.h b/akregator/src/mk4storage/metakit/src/mwcw.h deleted file mode 100644 index 1c863b96..00000000 --- a/akregator/src/mk4storage/metakit/src/mwcw.h +++ /dev/null @@ -1,31 +0,0 @@ -// mwcw.h -- -// $Id$ -// This is part of Metakit, see http://www.equi4.com/metakit/ - -/** @file - * Configuration header for Metrowerks CodeWarrior - */ - -#define q4_MWCW 1 - -///////////////////////////////////////////////////////////////////////////// - -#if q4_68K -#if !__option(IEEEdoubles) -#error Cannot build Metakit with 10-byte doubles -#endif -#endif - -#if __option(bool) -#define q4_BOOL 1 - // undo previous defaults, because q4_BOOL is not set early enough -#undef false -#undef true -#undef bool -#endif - -#undef _MSC_VER - -#pragma export on - -///////////////////////////////////////////////////////////////////////////// diff --git a/akregator/src/mk4storage/metakit/src/string.cpp b/akregator/src/mk4storage/metakit/src/string.cpp index 33c8836c..e5d140ab 100644 --- a/akregator/src/mk4storage/metakit/src/string.cpp +++ b/akregator/src/mk4storage/metakit/src/string.cpp @@ -34,7 +34,7 @@ ///////////////////////////////////////////////////////////////////////////// -#if q4_MSVC || q4_WATC || q4_BORC || (q4_MWCW && __MWERKS__ < 0x3000) +#if q4_MSVC || q4_WATC #define strcasecmp stricmp #elif q4_WINCE diff --git a/akregator/src/mk4storage/metakit/src/univ.cpp b/akregator/src/mk4storage/metakit/src/univ.cpp index 81a73015..08a4ba1a 100644 --- a/akregator/src/mk4storage/metakit/src/univ.cpp +++ b/akregator/src/mk4storage/metakit/src/univ.cpp @@ -21,8 +21,7 @@ #if q4_UNIX || __MINGW32__ #define _strdup strdup -#elif !q4_BORC && !q4_MSVC && !q4_WATC && !(q4_MWCW && defined(_WIN32)) && \ - !(q4_MWCW && __MWERKS__ >= 0x3000) +#elif !q4_MSVC && !q4_WATC static char* _strdup(const char* p) { @@ -35,34 +34,6 @@ #endif - // The Borland C++ RTL does not want file handle objects to cross - // DLL boundaries, so we add special fopen/fclose hooks to this DLL. - -#if q4_BORC - #include <stdio.h> - -#if q4_WIN32 - __declspec(dllexport) FILE* -#else - FILE* __export -#endif - f4_FileOpenInDLL(const char* name_, const char* mode_) - { - return fopen(name_, mode_); - } - -#if q4_WIN32 - __declspec(dllexport) -#else - int __export -#endif - f4_FileCloseInDLL(FILE* file_) - { - return fclose(file_); - } - -#endif - ///////////////////////////////////////////////////////////////////////////// // c4_BaseArray diff --git a/akregator/src/mk4storage/metakit/tests/regress.cpp b/akregator/src/mk4storage/metakit/tests/regress.cpp index 0725f57f..6724d338 100644 --- a/akregator/src/mk4storage/metakit/tests/regress.cpp +++ b/akregator/src/mk4storage/metakit/tests/regress.cpp @@ -15,11 +15,6 @@ #endif #endif -#if __profile__ - #define q4_MWCW_PROFILER 1 - #include <profiler.h> -#endif - #if q4_NOTHROW const char* msg; #endif @@ -56,10 +51,6 @@ main() DebugNewForgetLeaks(); #endif -#if q4_MWCW_PROFILER - if (!ProfilerInit(collectDetailed, bestTimeBase, 20, 5)) - { -#endif TestBasics1(); TestBasics2(); TestNotify(); @@ -77,12 +68,6 @@ main() TestMapped(); TestLimits(); -#if q4_MWCW_PROFILER - ProfilerDump("\pRegress.prof"); - ProfilerTerm(); - } -#endif - #if defined (_DEBUG) fputs("\nPress return... ", stderr); getchar(); @@ -226,18 +211,14 @@ int StartTest(int mask_, const char* name_, const char* desc_) #if q4_MFC && defined(_DEBUG) TRACE("%s - %-40s *** DISABLED ***\n", name_, desc_); #endif - #if !q4_MWCW_PROFILER - fprintf(stderr, "%s - %-40s *** DISABLED ***\n", name_, desc_); - #endif + fprintf(stderr, "%s - %-40s *** DISABLED ***\n", name_, desc_); return false; } #if q4_MFC && defined(_DEBUG) TRACE("%s - %s\n", name_, desc_); #endif - #if !q4_MWCW_PROFILER - fprintf(stderr, "%s - %s\n", name_, desc_); - #endif + fprintf(stderr, "%s - %s\n", name_, desc_); char buffer [50]; sprintf(buffer, "%s%s.txt", TESTDIR, name_); @@ -254,16 +235,12 @@ int StartTest(int mask_, const char* name_, const char* desc_) void CatchMsg(const char* msg) { - #if !q4_MWCW_PROFILER - fprintf(stderr, "\t%s\n", msg); - #endif + fprintf(stderr, "\t%s\n", msg); printf("*** %s ***\n", msg); } void CatchOther() { - #if !q4_MWCW_PROFILER - fputs("\tException!\n", stderr); - #endif + fputs("\tException!\n", stderr); printf("*** Exception ***\n"); } diff --git a/akregator/src/mk4storage/metakit/tests/regress.h b/akregator/src/mk4storage/metakit/tests/regress.h index b5611e57..1574bc0d 100644 --- a/akregator/src/mk4storage/metakit/tests/regress.h +++ b/akregator/src/mk4storage/metakit/tests/regress.h @@ -132,14 +132,3 @@ extern void TestStores2(); extern void TestStores3(); extern void TestStores4(); extern void TestStores5(); - - // The Borland C++ RTL does not want file handle objects to cross - // DLL boundaries, so we use special fopen/fclose hooks in the DLL. - -#if defined (__BORLANDC__) // this assumes Metakit is in a DLL! -extern FILE* f4_FileOpenInDLL(const char*, const char*); -extern int f4_FileCloseInDLL(FILE*); - -#define fopen f4_FileOpenInDLL -#define fclose f4_FileCloseInDLL -#endif diff --git a/akregator/src/mk4storage/mk4confwidget.cpp b/akregator/src/mk4storage/mk4confwidget.cpp index c028b156..09b4c2de 100644 --- a/akregator/src/mk4storage/mk4confwidget.cpp +++ b/akregator/src/mk4storage/mk4confwidget.cpp @@ -52,7 +52,7 @@ MK4ConfWidget::MK4ConfWidget() : MK4ConfWidgetBase() label->setEnabled(true); } filereq->setURL(MK4Config::archivePath()); - connect(cbUseDefault, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChkBoxUseDefault(bool))); + connect(cbUseDefault, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChkBoxUseDefault(bool))); } diff --git a/akregator/src/mk4storage/mk4confwidget.h b/akregator/src/mk4storage/mk4confwidget.h index 194295de..797ad5c0 100644 --- a/akregator/src/mk4storage/mk4confwidget.h +++ b/akregator/src/mk4storage/mk4confwidget.h @@ -32,7 +32,7 @@ namespace Backend { class MK4ConfWidget : public MK4ConfWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui index c5c837a5..9eea1d7d 100644 --- a/akregator/src/mk4storage/mk4confwidgetbase.ui +++ b/akregator/src/mk4storage/mk4confwidgetbase.ui @@ -104,9 +104,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -132,9 +129,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -170,9 +164,9 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/akregator/src/mk4storage/storagemk4impl.cpp b/akregator/src/mk4storage/storagemk4impl.cpp index 1e104bd3..9c504c2f 100644 --- a/akregator/src/mk4storage/storagemk4impl.cpp +++ b/akregator/src/mk4storage/storagemk4impl.cpp @@ -33,7 +33,7 @@ #include <tqtimer.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> namespace Akregator { namespace Backend { @@ -263,7 +263,7 @@ void StorageMK4Impl::markDirty() { d->modified = true; // commit changes after 3 seconds - TQTimer::singleShot(3000, this, TQT_SLOT(slotCommit())); + TQTimer::singleShot(3000, this, TQ_SLOT(slotCommit())); } } diff --git a/akregator/src/mk4storage/storagemk4impl.h b/akregator/src/mk4storage/storagemk4impl.h index d6c4a59c..8fcde1ea 100644 --- a/akregator/src/mk4storage/storagemk4impl.h +++ b/akregator/src/mk4storage/storagemk4impl.h @@ -36,7 +36,7 @@ namespace Backend { */ class StorageMK4Impl : public Storage { - Q_OBJECT + TQ_OBJECT public: diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp index 8a4123dc..40a8d622 100644 --- a/akregator/src/nodelist.cpp +++ b/akregator/src/nodelist.cpp @@ -60,15 +60,15 @@ class NodeList::AddNodeVisitor : public TreeNodeVisitor m_list->d->idMap[node->id()] = node; m_list->d->flatList.append(node); - connect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_list, TQT_SLOT(slotNodeDestroyed(TreeNode*) )); + connect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_list, TQ_SLOT(slotNodeDestroyed(TreeNode*) )); m_list->signalNodeAdded(node); // emit return true; } virtual bool visitFolder(Folder* node) { - connect(node, TQT_SIGNAL(signalChildAdded(TreeNode*)), m_list, TQT_SLOT(slotNodeAdded(TreeNode*) )); - connect(node, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_list, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); + connect(node, TQ_SIGNAL(signalChildAdded(TreeNode*)), m_list, TQ_SLOT(slotNodeAdded(TreeNode*) )); + connect(node, TQ_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_list, TQ_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); visitTreeNode(node); @@ -99,7 +99,7 @@ class NodeList::RemoveNodeVisitor : public TreeNodeVisitor m_list->d->idMap.remove(node->id()); m_list->d->flatList.remove(node); - disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_list, TQT_SLOT(slotNodeDestroyed(TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_list, TQ_SLOT(slotNodeDestroyed(TreeNode*) )); m_list->signalNodeRemoved(node); // emit signal return true; @@ -108,8 +108,8 @@ class NodeList::RemoveNodeVisitor : public TreeNodeVisitor virtual bool visitFolder(Folder* node) { - disconnect(node, TQT_SIGNAL(signalChildAdded(TreeNode*)), m_list, TQT_SLOT(slotNodeAdded(TreeNode*) )); - disconnect(node, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_list, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalChildAdded(TreeNode*)), m_list, TQ_SLOT(slotNodeAdded(TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_list, TQ_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); visitTreeNode(node); return true; @@ -184,8 +184,8 @@ void NodeList::setRootNode(Folder* folder) if (d->rootNode) { d->rootNode->setOpen(true); - connect(d->rootNode, TQT_SIGNAL(signalChildAdded(TreeNode*)), this, TQT_SLOT(slotNodeAdded(TreeNode*))); - connect(d->rootNode, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), this, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*))); + connect(d->rootNode, TQ_SIGNAL(signalChildAdded(TreeNode*)), this, TQ_SLOT(slotNodeAdded(TreeNode*))); + connect(d->rootNode, TQ_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), this, TQ_SLOT(slotNodeRemoved(Folder*, TreeNode*))); } } diff --git a/akregator/src/nodelist.h b/akregator/src/nodelist.h index 48703d7e..e023e12b 100644 --- a/akregator/src/nodelist.h +++ b/akregator/src/nodelist.h @@ -48,7 +48,7 @@ class TreeNode; class NodeList : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp index 5a144681..23a3a3a8 100644 --- a/akregator/src/notificationmanager.cpp +++ b/akregator/src/notificationmanager.cpp @@ -67,7 +67,7 @@ void NotificationManager::slotNotifyArticle(const Article& article) else if (!m_running) { m_running = true; - TQTimer::singleShot(m_checkInterval, this, TQT_SLOT(slotIntervalCheck())); + TQTimer::singleShot(m_checkInterval, this, TQ_SLOT(slotIntervalCheck())); } } @@ -123,7 +123,7 @@ void NotificationManager::slotIntervalCheck() else { m_addedInLastInterval = false; - TQTimer::singleShot(m_checkInterval, this, TQT_SLOT(slotIntervalCheck())); + TQTimer::singleShot(m_checkInterval, this, TQ_SLOT(slotIntervalCheck())); } } diff --git a/akregator/src/notificationmanager.h b/akregator/src/notificationmanager.h index 1ff1d888..74b3c784 100644 --- a/akregator/src/notificationmanager.h +++ b/akregator/src/notificationmanager.h @@ -35,7 +35,7 @@ namespace Akregator /** this class collects notification requests (new articles etc.) and processes them using KNotify. */ class NotificationManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** singleton instance of notification manager */ diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index 14e702aa..03d8a4db 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -40,7 +40,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdestdaccel.h> #include <tdeparts/browserinterface.h> @@ -53,7 +53,7 @@ #include <tqscrollview.h> #include <tqstring.h> #include <tqvaluelist.h> -#include <tqucomextra_p.h> +#include <private/tqucomextra_p.h> #include <cstdlib> using std::abs; @@ -109,44 +109,44 @@ PageViewer::PageViewer(TQWidget *parent, const char *name) d->backAction = new TDEToolBarPopupAction(backForward.first, TDEStdAccel::shortcut(TDEStdAccel::Back), this, - TQT_SLOT(slotBack()), actionCollection(), + TQ_SLOT(slotBack()), actionCollection(), "pageviewer_back"); - connect(d->backAction->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotBackAboutToShow())); - connect(d->backAction->popupMenu(), TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPopupActivated(int))); + connect(d->backAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotBackAboutToShow())); + connect(d->backAction->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPopupActivated(int))); d->forwardAction = new TDEToolBarPopupAction(backForward.second, TDEStdAccel::shortcut(TDEStdAccel::Forward),this, - TQT_SLOT(slotForward()), actionCollection(), + TQ_SLOT(slotForward()), actionCollection(), "pageviewer_forward"); - connect(d->forwardAction->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotForwardAboutToShow())); - connect(d->forwardAction->popupMenu(), TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPopupActivated(int))); + connect(d->forwardAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotForwardAboutToShow())); + connect(d->forwardAction->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPopupActivated(int))); d->reloadAction = new TDEAction(i18n("Reload"), "reload", 0, - this, TQT_SLOT(slotReload()), + this, TQ_SLOT(slotReload()), actionCollection(), "pageviewer_reload"); d->stopAction = new TDEAction(KStdGuiItem::guiItem(KStdGuiItem::Stop), 0, - this, TQT_SLOT(slotStop()), + this, TQ_SLOT(slotStop()), actionCollection(), "pageviewer_stop"); - //connect( this, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(slotPopupMenu(const TQString &, const TQPoint &))); + //connect( this, TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQ_SLOT(slotPopupMenu(const TQString &, const TQPoint &))); d->backAction->setEnabled(false); d->forwardAction->setEnabled(false); d->stopAction->setEnabled(false); - connect( this, TQT_SIGNAL(setWindowCaption (const TQString &)), - this, TQT_SLOT(slotSetCaption (const TQString &)) ); + connect( this, TQ_SIGNAL(setWindowCaption (const TQString &)), + this, TQ_SLOT(slotSetCaption (const TQString &)) ); - connect(this, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(slotStarted(TDEIO::Job* ))); - connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted())); - connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCancelled(const TQString &))); + connect(this, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(slotStarted(TDEIO::Job* ))); + connect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted())); + connect(this, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotCancelled(const TQString &))); d->current = d->history.end(); @@ -362,7 +362,7 @@ void PageViewer::urlSelected(const TQString &url, int button, int state, const T } else { - if (button == Qt::LeftButton) + if (button == TQt::LeftButton) { m_url = completeURL(url); browserExtension()->setURLArgs(args); @@ -384,7 +384,7 @@ void PageViewer::slotSetCaption(const TQString& cap) void PageViewer::slotPaletteOrFontChanged() { kdDebug() << "PageViewer::slotPaletteOrFontChanged()" << endl; - // taken from KonqView (tdebase/konqueror/konq_view.cc) + // taken from KonqView (tdebase/konqueror/konq_view.cpp) TQObject *obj = KParts::BrowserExtension::childObject(this); if ( !obj ) // not all views have a browser extension ! @@ -429,9 +429,9 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur int idNewWindow = -2; if (isLink) { - idNewWindow = popup.insertItem(SmallIcon("tab_new"),i18n("Open Link in New &Tab"), this, TQT_SLOT(slotOpenLinkInForegroundTab())); + idNewWindow = popup.insertItem(SmallIcon("tab_new"),i18n("Open Link in New &Tab"), this, TQ_SLOT(slotOpenLinkInForegroundTab())); popup.setWhatsThis(idNewWindow, i18n("<b>Open Link in New Tab</b><p>Opens current link in a new tab.")); - popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, TQT_SLOT(slotOpenLinkInBrowser())); + popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, TQ_SLOT(slotOpenLinkInBrowser())); popup.insertSeparator(); action("savelinkas")->plug(&popup); @@ -472,7 +472,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur popup.insertSeparator(); } - popup.insertItem(SmallIcon("window-new"), i18n("Open Page in External Browser"), this, TQT_SLOT(slotOpenLinkInBrowser())); + popup.insertItem(SmallIcon("window-new"), i18n("Open Page in External Browser"), this, TQ_SLOT(slotOpenLinkInBrowser())); action("viewer_print")->plug(&popup); popup.insertSeparator(); @@ -480,7 +480,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur TDEAction *ac = action("setEncoding"); if (ac) ac->plug(&popup); - popup.insertItem(SmallIcon("bookmark_add"),i18n("Add to Konqueror Bookmarks"), this, TQT_SLOT(slotGlobalBookmarkArticle())); + popup.insertItem(SmallIcon("bookmark_add"),i18n("Add to Konqueror Bookmarks"), this, TQ_SLOT(slotGlobalBookmarkArticle())); } int r = popup.exec(p); diff --git a/akregator/src/pageviewer.h b/akregator/src/pageviewer.h index d337779a..ba385674 100644 --- a/akregator/src/pageviewer.h +++ b/akregator/src/pageviewer.h @@ -39,7 +39,7 @@ namespace Akregator // the back/forward navigation was taken from KDevelop. Kudos to the KDevelop team! class PageViewer : public Viewer { - Q_OBJECT + TQ_OBJECT public: PageViewer(TQWidget* parent, const char* name); diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp index dd27fbe9..1e205c8e 100644 --- a/akregator/src/progressmanager.cpp +++ b/akregator/src/progressmanager.cpp @@ -80,8 +80,8 @@ void ProgressManager::setFeedList(FeedList* feedList) delete *it; d->handlers.clear(); - disconnect(d->feedList, TQT_SIGNAL(signalNodeAdded(TreeNode*)), this, TQT_SLOT(slotNodeAdded(TreeNode*))); - disconnect(d->feedList, TQT_SIGNAL(signalNodeRemoved(TreeNode*)), this, TQT_SLOT(slotNodeRemoved(TreeNode*))); + disconnect(d->feedList, TQ_SIGNAL(signalNodeAdded(TreeNode*)), this, TQ_SLOT(slotNodeAdded(TreeNode*))); + disconnect(d->feedList, TQ_SIGNAL(signalNodeRemoved(TreeNode*)), this, TQ_SLOT(slotNodeRemoved(TreeNode*))); } d->feedList = feedList; @@ -92,8 +92,8 @@ void ProgressManager::setFeedList(FeedList* feedList) for (TQValueList<TreeNode*>::ConstIterator it = list.begin(); it != list.end(); ++it) slotNodeAdded(*it); - connect(feedList, TQT_SIGNAL(signalNodeAdded(TreeNode*)), this, TQT_SLOT(slotNodeAdded(TreeNode*))); - connect(feedList, TQT_SIGNAL(signalNodeRemoved(TreeNode*)), this, TQT_SLOT(slotNodeRemoved(TreeNode*))); + connect(feedList, TQ_SIGNAL(signalNodeAdded(TreeNode*)), this, TQ_SLOT(slotNodeAdded(TreeNode*))); + connect(feedList, TQ_SIGNAL(signalNodeRemoved(TreeNode*)), this, TQ_SLOT(slotNodeRemoved(TreeNode*))); } } @@ -104,7 +104,7 @@ void ProgressManager::slotNodeAdded(TreeNode* node) { if (!d->handlers.contains(feed)) d->handlers[feed] = new ProgressItemHandler(feed); - connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*))); + connect(feed, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotNodeDestroyed(TreeNode*))); } } @@ -113,7 +113,7 @@ void ProgressManager::slotNodeRemoved(TreeNode* node) Feed* feed = dynamic_cast<Feed*>(node); if (feed) { - disconnect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*))); + disconnect(feed, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotNodeDestroyed(TreeNode*))); delete d->handlers[feed]; d->handlers.remove(feed); } @@ -142,10 +142,10 @@ ProgressItemHandler::ProgressItemHandler(Feed* feed) : d(new ProgressItemHandler d->feed = feed; d->progressItem = 0; - connect(feed, TQT_SIGNAL(fetchStarted(Feed*)), this, TQT_SLOT(slotFetchStarted())); - connect(feed, TQT_SIGNAL(fetched(Feed*)), this, TQT_SLOT(slotFetchCompleted())); - connect(feed, TQT_SIGNAL(fetchError(Feed*)), this, TQT_SLOT(slotFetchError())); - connect(feed, TQT_SIGNAL(fetchAborted(Feed*)), this, TQT_SLOT(slotFetchAborted())); + connect(feed, TQ_SIGNAL(fetchStarted(Feed*)), this, TQ_SLOT(slotFetchStarted())); + connect(feed, TQ_SIGNAL(fetched(Feed*)), this, TQ_SLOT(slotFetchCompleted())); + connect(feed, TQ_SIGNAL(fetchError(Feed*)), this, TQ_SLOT(slotFetchError())); + connect(feed, TQ_SIGNAL(fetchAborted(Feed*)), this, TQ_SLOT(slotFetchAborted())); } ProgressItemHandler::~ProgressItemHandler() @@ -170,7 +170,7 @@ void ProgressItemHandler::slotFetchStarted() d->progressItem = KPIM::ProgressManager::createProgressItem(KPIM::ProgressManager::getUniqueID(), TQStyleSheet::escape( d->feed->title() ), TQString(), true); - connect(d->progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), d->feed, TQT_SLOT(slotAbortFetch())); + connect(d->progressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), d->feed, TQ_SLOT(slotAbortFetch())); } diff --git a/akregator/src/progressmanager.h b/akregator/src/progressmanager.h index 2b5598f3..361c326b 100644 --- a/akregator/src/progressmanager.h +++ b/akregator/src/progressmanager.h @@ -35,7 +35,7 @@ class ProgressItemHandler; class ProgressManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -66,7 +66,7 @@ class ProgressManager : public TQObject class ProgressItemHandler : public TQObject { - Q_OBJECT + TQ_OBJECT public: ProgressItemHandler(Feed* feed); diff --git a/akregator/src/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp index 149eb480..7bea6f53 100644 --- a/akregator/src/propertiesdialog.cpp +++ b/akregator/src/propertiesdialog.cpp @@ -72,7 +72,7 @@ FeedPropertiesDialog::FeedPropertiesDialog(TQWidget *parent, const char *name) setMainWidget(widget); widget->feedNameEdit->setFocus(); - connect(widget->feedNameEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotSetCaption(const TQString&))); + connect(widget->feedNameEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotSetCaption(const TQString&))); } FeedPropertiesDialog::~FeedPropertiesDialog() @@ -321,4 +321,3 @@ void FeedPropertiesDialog::selectFeedName() } // namespace Akregator #include "propertiesdialog.moc" -// vim: ts=4 sw=4 et diff --git a/akregator/src/propertiesdialog.h b/akregator/src/propertiesdialog.h index b9652221..6734a565 100644 --- a/akregator/src/propertiesdialog.h +++ b/akregator/src/propertiesdialog.h @@ -32,7 +32,7 @@ namespace Akregator { class FeedPropertiesWidget : public FeedPropertiesWidgetBase { - Q_OBJECT + TQ_OBJECT public: FeedPropertiesWidget(TQWidget *parent = 0, const char *name = 0); @@ -44,7 +44,7 @@ namespace Akregator class FeedPropertiesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: FeedPropertiesDialog(TQWidget *parent = 0, const char *name = 0); diff --git a/akregator/src/propertieswidgetbase.ui b/akregator/src/propertieswidgetbase.ui index fae011b0..073c46b4 100644 --- a/akregator/src/propertieswidgetbase.ui +++ b/akregator/src/propertieswidgetbase.ui @@ -452,10 +452,10 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">slotUpdateComboBoxActivated( int )</slot> <slot access="protected" specifier="pure virtual">slotUpdateCheckBoxToggled( bool )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp index ff163993..a43f8bcd 100644 --- a/akregator/src/searchbar.cpp +++ b/akregator/src/searchbar.cpp @@ -31,7 +31,7 @@ #include <kiconloader.h> #include <klineedit.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqapplication.h> #include <tqhbox.h> @@ -75,8 +75,8 @@ SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name), searchLabel->setText( i18n("S&earch:") ); d->searchLine = new KLineEdit(this, "searchline"); - connect(d->searchLine, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotSearchStringChanged(const TQString &))); + connect(d->searchLine, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotSearchStringChanged(const TQString &))); searchLabel->setBuddy(d->searchLine); @@ -98,13 +98,13 @@ SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name), TQToolTip::add( d->searchLine, i18n( "Enter space-separated terms to filter article list" ) ); TQToolTip::add( d->searchCombo, i18n( "Choose what kind of articles to show in article list" ) ); - connect(clearButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT(slotClearSearch()) ); + connect(clearButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT(slotClearSearch()) ); - connect(d->searchCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSearchComboChanged(int))); + connect(d->searchCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSearchComboChanged(int))); - connect(&(d->timer), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotActivateSearch())); + connect(&(d->timer), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotActivateSearch())); } SearchBar::~SearchBar() diff --git a/akregator/src/searchbar.h b/akregator/src/searchbar.h index cbb01a6b..113da699 100644 --- a/akregator/src/searchbar.h +++ b/akregator/src/searchbar.h @@ -39,7 +39,7 @@ namespace Filters class SearchBar : public TQHBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/akregator/src/settings_advanced.cpp b/akregator/src/settings_advanced.cpp index 7a849ff9..44106cfa 100644 --- a/akregator/src/settings_advanced.cpp +++ b/akregator/src/settings_advanced.cpp @@ -25,8 +25,8 @@ SettingsAdvanced::SettingsAdvanced(TQWidget* parent, const char* name) : Setting cbBackend->insertItem(m_factories[i]->name()); i++; } - connect(pbBackendConfigure, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigureStorage())); - connect(cbBackend, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotFactorySelected(int))); + connect(pbBackendConfigure, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotConfigureStorage())); + connect(cbBackend, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotFactorySelected(int))); } TQString SettingsAdvanced::selectedFactory() const diff --git a/akregator/src/settings_advanced.h b/akregator/src/settings_advanced.h index cbb7b7f5..e2e14fe7 100644 --- a/akregator/src/settings_advanced.h +++ b/akregator/src/settings_advanced.h @@ -17,7 +17,7 @@ namespace Backend class SettingsAdvanced : public SettingsAdvancedBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp index a4f1d4be..ddb54505 100644 --- a/akregator/src/simplenodeselector.cpp +++ b/akregator/src/simplenodeselector.cpp @@ -50,7 +50,7 @@ SelectNodeDialog::SelectNodeDialog(FeedList* feedList, TQWidget* parent, char* n { d->widget = new SimpleNodeSelector(feedList, this); - connect(d->widget, TQT_SIGNAL(signalNodeSelected(TreeNode*)), this, TQT_SLOT(slotNodeSelected(TreeNode*))); + connect(d->widget, TQ_SIGNAL(signalNodeSelected(TreeNode*)), this, TQ_SLOT(slotNodeSelected(TreeNode*))); setMainWidget(d->widget); enableButtonOK(false); @@ -122,7 +122,7 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor item->setExpandable(false); m_view->d->nodeToItem.insert(node, item); m_view->d->itemToNode.insert(item, node); - connect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*))); + connect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQ_SLOT(slotNodeDestroyed(TreeNode*))); return true; } @@ -135,13 +135,13 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, const char* name) : TQWidget(parent, name), d(new SimpleNodeSelectorPrivate) { d->list = feedList; - connect(feedList, TQT_SIGNAL(signalDestroyed(FeedList*)), this, TQT_SLOT(slotFeedListDestroyed(FeedList*))); + connect(feedList, TQ_SIGNAL(signalDestroyed(FeedList*)), this, TQ_SLOT(slotFeedListDestroyed(FeedList*))); d->view = new TDEListView(this); d->view->setRootIsDecorated(true); d->view->addColumn(i18n("Feeds")); - connect(d->view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotItemSelected(TQListViewItem*))); + connect(d->view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotItemSelected(TQListViewItem*))); TQGridLayout* layout = new TQGridLayout(this, 1, 1); layout->addWidget(d->view, 0, 0); diff --git a/akregator/src/simplenodeselector.h b/akregator/src/simplenodeselector.h index 1ac25b37..e0578d15 100644 --- a/akregator/src/simplenodeselector.h +++ b/akregator/src/simplenodeselector.h @@ -43,7 +43,7 @@ class SimpleNodeSelector; class SelectNodeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: SelectNodeDialog(FeedList* feedList, TQWidget* parent=0, char* name=0); @@ -66,7 +66,7 @@ class SelectNodeDialog : public KDialogBase class SimpleNodeSelector : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/akregator/src/speechclient.h b/akregator/src/speechclient.h index d4fe8f6f..bc097a9f 100644 --- a/akregator/src/speechclient.h +++ b/akregator/src/speechclient.h @@ -41,7 +41,7 @@ class Article; class SpeechClient : public TQObject, public KSpeech_stub, virtual public KSpeechSink { - Q_OBJECT + TQ_OBJECT public: diff --git a/akregator/src/storagedummyimpl.h b/akregator/src/storagedummyimpl.h index 3288737a..d39fc3c1 100644 --- a/akregator/src/storagedummyimpl.h +++ b/akregator/src/storagedummyimpl.h @@ -36,7 +36,7 @@ namespace Backend { */ class StorageDummyImpl : public Storage { - Q_OBJECT + TQ_OBJECT public: diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp index 76c8b198..f1f1bb89 100644 --- a/akregator/src/tabwidget.cpp +++ b/akregator/src/tabwidget.cpp @@ -70,15 +70,15 @@ TabWidget::TabWidget(TQWidget * parent, const char *name) d->currentItem = 0; setMinimumSize(250,150); setTabReorderingEnabled(false); - connect( this, TQT_SIGNAL( currentChanged(TQWidget *) ), this, - TQT_SLOT( slotTabChanged(TQWidget *) ) ); - connect(this, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(slotCloseRequest(TQWidget*))); + connect( this, TQ_SIGNAL( currentChanged(TQWidget *) ), this, + TQ_SLOT( slotTabChanged(TQWidget *) ) ); + connect(this, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(slotCloseRequest(TQWidget*))); setHoverCloseButton(Settings::closeButtonOnTabs()); d->tabsClose = new TQToolButton(this); d->tabsClose->setAccel(TQKeySequence("Ctrl+W")); - connect( d->tabsClose, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotRemoveCurrentFrame() ) ); + connect( d->tabsClose, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotRemoveCurrentFrame() ) ); d->tabsClose->setIconSet( SmallIconSet( "tab_remove" ) ); d->tabsClose->adjustSize(); @@ -117,7 +117,7 @@ void TabWidget::addFrame(Frame *f) return; d->frames.insert(f->widget(), f); addTab(f->widget(), f->title()); - connect(f, TQT_SIGNAL(titleChanged(Frame*, const TQString& )), this, TQT_SLOT(slotSetTitle(Frame*, const TQString& ))); + connect(f, TQ_SIGNAL(titleChanged(Frame*, const TQString& )), this, TQ_SLOT(slotSetTitle(Frame*, const TQString& ))); slotSetTitle(f, f->title()); } @@ -183,7 +183,7 @@ uint TabWidget::tabBarWidthForMaxChars( uint maxLength ) if ( tab->iconSet() ) iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4; - x += ( tabBar()->style().tqsizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width(); + x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width(); } return x; } @@ -269,7 +269,7 @@ void TabWidget::slotDetachTab() url = view->part()->url(); - kapp->invokeBrowser(url.url(), "0"); + tdeApp->invokeBrowser(url.url(), "0"); slotCloseTab(); } @@ -288,8 +288,8 @@ void TabWidget::slotCopyLinkAddress() url = view->part()->url(); - kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection); - kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard); + tdeApp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection); + tdeApp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard); } void TabWidget::slotCloseTab() diff --git a/akregator/src/tabwidget.h b/akregator/src/tabwidget.h index 70fdca04..e190f51d 100644 --- a/akregator/src/tabwidget.h +++ b/akregator/src/tabwidget.h @@ -37,7 +37,7 @@ class Frame; class TabWidget : public KTabWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp index f987409c..b4a252a5 100644 --- a/akregator/src/tagaction.cpp +++ b/akregator/src/tagaction.cpp @@ -49,8 +49,8 @@ TagAction::TagAction(const Tag& tag, const TQObject *receiver, const char *slot, : TDEToggleAction(tag.name(), TDEShortcut(), 0, 0, parent), d(new TagActionPrivate) { d->tag = tag; - connect(this, TQT_SIGNAL(toggled(const Tag&, bool)), receiver, slot); - connect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled(bool))); + connect(this, TQ_SIGNAL(toggled(const Tag&, bool)), receiver, slot); + connect(this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled(bool))); } TagAction::~TagAction() @@ -86,14 +86,14 @@ int TagAction::plug(TQWidget* widget, int index) kdWarning() << "Can not plug TDEToggleAction in " << widget->className() << endl; return -1; } - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return -1; TagMenuItem* item = new TagMenuItem(d->tag); int id = popup->insertItem(TagMenuItem::checkBoxIconSet(isChecked(), popup->colorGroup()), item, -1, index); - popup->connectItem (id, this, TQT_SLOT(slotActivated())); + popup->connectItem (id, this, TQ_SLOT(slotActivated())); d->popupToId[popup] = id; d->idToPopup[id] = popup; diff --git a/akregator/src/tagaction.h b/akregator/src/tagaction.h index 26abb636..5837944b 100644 --- a/akregator/src/tagaction.h +++ b/akregator/src/tagaction.h @@ -37,7 +37,7 @@ class Tag; /** a TDEToggleAction for assigning and removing tags. Displays the tag name and emits the tag when activated */ class TagAction : public TDEToggleAction { - Q_OBJECT + TQ_OBJECT public: diff --git a/akregator/src/tagnode.cpp b/akregator/src/tagnode.cpp index 1f5743fd..af64e546 100644 --- a/akregator/src/tagnode.cpp +++ b/akregator/src/tagnode.cpp @@ -60,10 +60,10 @@ TagNode::TagNode(const Tag& tag, TreeNode* observed) : d(new TagNodePrivate) d->observed = observed; d->unread = 0; - connect(observed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotObservedDestroyed(TreeNode*))); - connect(observed, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) ); - connect(observed, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) ); - connect(observed, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) ); + connect(observed, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotObservedDestroyed(TreeNode*))); + connect(observed, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) ); + connect(observed, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) ); + connect(observed, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) ); d->articles = observed->articles(tag.id()); calcUnread(); diff --git a/akregator/src/tagnode.h b/akregator/src/tagnode.h index a41439fc..2266fd0f 100644 --- a/akregator/src/tagnode.h +++ b/akregator/src/tagnode.h @@ -44,7 +44,7 @@ class TreeNodeVisitor; class TagNode : public TreeNode { -Q_OBJECT +TQ_OBJECT public: diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp index 6d60da63..288ecc77 100644 --- a/akregator/src/tagnodelist.cpp +++ b/akregator/src/tagnodelist.cpp @@ -58,9 +58,9 @@ TagNodeList::TagNodeList(FeedList* feedList, TagSet* tagSet) : NodeList(), d(ne d->feedList = feedList; d->tagSet = tagSet; - connect(d->tagSet, TQT_SIGNAL(signalTagAdded(const Tag&)), this, TQT_SLOT(slotTagAdded(const Tag&))); - connect(d->tagSet, TQT_SIGNAL(signalTagRemoved(const Tag&)), this, TQT_SLOT(slotTagRemoved(const Tag&))); - connect(d->tagSet, TQT_SIGNAL(signalTagUpdated(const Tag&)), this, TQT_SLOT(slotTagUpdated(const Tag&))); + connect(d->tagSet, TQ_SIGNAL(signalTagAdded(const Tag&)), this, TQ_SLOT(slotTagAdded(const Tag&))); + connect(d->tagSet, TQ_SIGNAL(signalTagRemoved(const Tag&)), this, TQ_SLOT(slotTagRemoved(const Tag&))); + connect(d->tagSet, TQ_SIGNAL(signalTagUpdated(const Tag&)), this, TQ_SLOT(slotTagUpdated(const Tag&))); setRootNode(new TagFolder(i18n("My Tags"))); diff --git a/akregator/src/tagnodelist.h b/akregator/src/tagnodelist.h index be85e7e8..c31ee69f 100644 --- a/akregator/src/tagnodelist.h +++ b/akregator/src/tagnodelist.h @@ -43,7 +43,7 @@ namespace Akregator { class TagNodeList : public NodeList { - Q_OBJECT + TQ_OBJECT public: diff --git a/akregator/src/tagpropertiesdialog.cpp b/akregator/src/tagpropertiesdialog.cpp index 4f73467e..b21f1d03 100644 --- a/akregator/src/tagpropertiesdialog.cpp +++ b/akregator/src/tagpropertiesdialog.cpp @@ -47,7 +47,7 @@ TagPropertiesDialog::TagPropertiesDialog(TQWidget *parent, const char *name) : K d->widget->le_title->setFocus(); enableButtonOK(false); enableButtonApply(false); - connect(d->widget->le_title, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotTextChanged(const TQString& ))); + connect(d->widget->le_title, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged(const TQString& ))); } TagPropertiesDialog::~TagPropertiesDialog() diff --git a/akregator/src/tagpropertiesdialog.h b/akregator/src/tagpropertiesdialog.h index 24e6788d..347f1f03 100644 --- a/akregator/src/tagpropertiesdialog.h +++ b/akregator/src/tagpropertiesdialog.h @@ -33,7 +33,7 @@ class Tag; class TagPropertiesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/akregator/src/tagset.h b/akregator/src/tagset.h index f0814834..12a4247e 100644 --- a/akregator/src/tagset.h +++ b/akregator/src/tagset.h @@ -47,7 +47,7 @@ class Tag; class TagSet : public TQObject { friend class Tag; - Q_OBJECT + TQ_OBJECT public: diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp index 9cab8b3b..fe816d19 100644 --- a/akregator/src/trayicon.cpp +++ b/akregator/src/trayicon.cpp @@ -74,7 +74,7 @@ TrayIcon::~TrayIcon() void TrayIcon::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { emit showPart(); } @@ -85,8 +85,8 @@ void TrayIcon::mousePressEvent(TQMouseEvent *e) { TQPixmap TrayIcon::takeScreenshot() const { TQPoint g = mapToGlobal(pos()); - int desktopWidth = kapp->desktop()->width(); - int desktopHeight = kapp->desktop()->height(); + int desktopWidth = tdeApp->desktop()->width(); + int desktopHeight = tdeApp->desktop()->height(); int tw = width(); int th = height(); int w = desktopWidth / 4; @@ -200,7 +200,7 @@ void TrayIcon::setUnread(int unread, bool force) void TrayIcon::viewButtonClicked() { - TQWidget *p=TQT_TQWIDGET(parent()); + TQWidget *p=static_cast<TQWidget*>(parent()); KWin::forceActiveWindow(p->winId()); } diff --git a/akregator/src/trayicon.h b/akregator/src/trayicon.h index 7c854666..5d9f4fea 100644 --- a/akregator/src/trayicon.h +++ b/akregator/src/trayicon.h @@ -34,7 +34,7 @@ namespace Akregator { class TrayIcon : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: static TrayIcon* getInstance(); diff --git a/akregator/src/treenode.h b/akregator/src/treenode.h index 02b64614..1a804440 100644 --- a/akregator/src/treenode.h +++ b/akregator/src/treenode.h @@ -50,7 +50,7 @@ class FetchQueue; */ class TreeNode : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index 0588a429..da06562d 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -31,7 +31,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <tdepopupmenu.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krun.h> #include <kshell.h> #include <kurl.h> @@ -57,28 +57,28 @@ Viewer::Viewer(TQWidget *parent, const char *name) setStatusMessagesEnabled(true); // change the cursor when loading stuff... - connect( this, TQT_SIGNAL(started(TDEIO::Job *)), - this, TQT_SLOT(slotStarted(TDEIO::Job *))); - connect( this, TQT_SIGNAL(completed()), - this, TQT_SLOT(slotCompleted())); + connect( this, TQ_SIGNAL(started(TDEIO::Job *)), + this, TQ_SLOT(slotStarted(TDEIO::Job *))); + connect( this, TQ_SIGNAL(completed()), + this, TQ_SLOT(slotCompleted())); - connect( browserExtension(), TQT_SIGNAL(popupMenu (KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t)), this, TQT_SLOT(slotPopupMenu(KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t))); + connect( browserExtension(), TQ_SIGNAL(popupMenu (KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t)), this, TQ_SLOT(slotPopupMenu(KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t))); - KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection(), "viewer_print"); - KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection(), "viewer_copy"); + KStdAction::print(this, TQ_SLOT(slotPrint()), actionCollection(), "viewer_print"); + KStdAction::copy(this, TQ_SLOT(slotCopy()), actionCollection(), "viewer_copy"); - new TDEAction( i18n("&Increase Font Sizes"), "zoom-in", "Ctrl+Plus", this, TQT_SLOT(slotZoomIn()), actionCollection(), "incFontSizes" ); - new TDEAction( i18n("&Decrease Font Sizes"), "zoom-out", "Ctrl+Minus", this, TQT_SLOT(slotZoomOut()), actionCollection(), "decFontSizes" ); + new TDEAction( i18n("&Increase Font Sizes"), "zoom-in", "Ctrl+Plus", this, TQ_SLOT(slotZoomIn()), actionCollection(), "incFontSizes" ); + new TDEAction( i18n("&Decrease Font Sizes"), "zoom-out", "Ctrl+Minus", this, TQ_SLOT(slotZoomOut()), actionCollection(), "decFontSizes" ); - connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); - connect( browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), this, TQT_SLOT(slotOpenURLRequest(const KURL&, const KParts::URLArgs& )) ); + connect( browserExtension(), TQ_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), this, TQ_SLOT(slotOpenURLRequest(const KURL&, const KParts::URLArgs& )) ); new TDEAction(i18n("Copy &Link Address"), "", 0, - this, TQT_SLOT(slotCopyLinkAddress()), + this, TQ_SLOT(slotCopyLinkAddress()), actionCollection(), "copylinkaddress"); new TDEAction(i18n("&Save Link As..."), "", 0, - this, TQT_SLOT(slotSaveLinkAs()), + this, TQ_SLOT(slotSaveLinkAs()), actionCollection(), "savelinkas"); } @@ -104,7 +104,7 @@ void Viewer::displayInExternalBrowser(const KURL &url, const TQString &mimetype) if (Settings::externalBrowserUseTdeDefault()) { if (mimetype.isEmpty()) - kapp->invokeBrowser(url.url(), "0"); + tdeApp->invokeBrowser(url.url(), "0"); else KRun::runURL(url, mimetype, false, false); } @@ -130,7 +130,7 @@ void Viewer::urlSelected(const TQString &url, int button, int state, const TQStr { m_url = completeURL(url); browserExtension()->setURLArgs(args); - if (button == Qt::LeftButton) + if (button == TQt::LeftButton) { switch (Settings::lMBBehaviour()) { @@ -146,7 +146,7 @@ void Viewer::urlSelected(const TQString &url, int button, int state, const TQStr } return; } - else if (button == Qt::MidButton) + else if (button == TQt::MidButton) { switch (Settings::mMBBehaviour()) { @@ -177,8 +177,8 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, c if (isLink && !isSelection) { - popup.insertItem(SmallIcon("tab_new"), i18n("Open Link in New &Tab"), this, TQT_SLOT(slotOpenLinkInForegroundTab())); - popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, TQT_SLOT(slotOpenLinkInBrowser())); + popup.insertItem(SmallIcon("tab_new"), i18n("Open Link in New &Tab"), this, TQ_SLOT(slotOpenLinkInForegroundTab())); + popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, TQ_SLOT(slotOpenLinkInBrowser())); popup.insertSeparator(); action("savelinkas")->plug(&popup); action("copylinkaddress")->plug(&popup); @@ -204,9 +204,9 @@ void Viewer::slotCopy() TQString text = selectedText(); text.replace( TQChar( 0xa0 ), ' ' ); TQClipboard *cb = TQApplication::clipboard(); - disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); + disconnect( cb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotClearSelection() ) ); cb->setText(text); - connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); + connect( cb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotClearSelection() ) ); } void Viewer::slotCopyLinkAddress() @@ -332,5 +332,3 @@ void Viewer::setSafeMode() } // namespace Akregator #include "viewer.moc" - -// vim: set et ts=4 sts=4 sw=4: diff --git a/akregator/src/viewer.h b/akregator/src/viewer.h index af89fee2..3e6fabb1 100644 --- a/akregator/src/viewer.h +++ b/akregator/src/viewer.h @@ -38,7 +38,7 @@ namespace Akregator { class Viewer : public TDEHTMLPart { - Q_OBJECT + TQ_OBJECT public: @@ -121,4 +121,3 @@ namespace Akregator } #endif // VIEWER_H -// vim: ts=4 sw=4 et |