diff options
Diffstat (limited to 'akregator/src')
101 files changed, 490 insertions, 948 deletions
diff --git a/akregator/src/CMakeL10n.txt b/akregator/src/CMakeL10n.txt index 0a4bcd80..ce9c5230 100644 --- a/akregator/src/CMakeL10n.txt +++ b/akregator/src/CMakeL10n.txt @@ -1,3 +1,15 @@ ##### create translation templates ############## tde_l10n_create_template( "akregator" ) + +tde_l10n_create_template( + CATALOG "desktop_files/akregator-desktops/" + SOURCES *.desktop *.protocol + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) + +tde_l10n_create_template( + CATALOG "desktop_files/akregator-eventsrc/" + SOURCES eventsrc + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/akregator/src/CMakeLists.txt b/akregator/src/CMakeLists.txt index b1bb367d..557d2acf 100644 --- a/akregator/src/CMakeLists.txt +++ b/akregator/src/CMakeLists.txt @@ -46,26 +46,39 @@ install( FILES tde_install_icons( ) -install( FILES - akregator.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE akregator.desktop + PO_DIR akregator-desktops +) install( FILES akregator.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) -install( FILES - akregator_part.desktop feed.protocol - DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE akregator_part.desktop feed.protocol + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR akregator-desktops +) -install( FILES - akregator_plugin.desktop - DESTINATION ${SERVICETYPES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE akregator_plugin.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} + PO_DIR akregator-desktops +) -install( FILES - akregator_shell.rc articleviewer.rc eventsrc +tde_create_translated_desktop( + SOURCE eventsrc + DESTINATION ${DATA_INSTALL_DIR}/akregator + PO_DIR akregator-eventsrc +) + +install( + FILES + akregator_shell.rc articleviewer.rc pageviewer.rc akregator_part.rc - DESTINATION ${DATA_INSTALL_DIR}/akregator ) + DESTINATION ${DATA_INSTALL_DIR}/akregator +) ##### akregatorprivate (shared) ################# 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..9b57d201 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 <kdemacros.h> #define AKREGATOR_VERSION "1.2.9" 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..a7b88a11 100644 --- a/akregator/src/addfeeddialog.cpp +++ b/akregator/src/addfeeddialog.cpp @@ -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.desktop b/akregator/src/akregator.desktop index 5b292858..ddd35685 100644 --- a/akregator/src/akregator.desktop +++ b/akregator/src/akregator.desktop @@ -1,107 +1,14 @@ [Desktop Entry] Name=Akregator -Name[ne]=एक्रिगेटर + +GenericName=RSS Feed Reader + +Comment=An RSS Aggregator for TDE + Exec=akregator %i %m -caption "%c" Icon=akregator Type=Application X-DocPath=akregator/index.html -GenericName=RSS Feed Reader -GenericName[af]=RSS stroom leser -GenericName[bg]=Четец на новости RSS -GenericName[ca]=Lector d'enllaços RSS -GenericName[cs]=Čtení RSS kanálů -GenericName[da]=RSS-Kildelæser -GenericName[de]=Anzeige von RSS-Nachrichtenquellen -GenericName[el]=Αναγνώστης ροών RSS -GenericName[eo]=RSS-flulegilo por diskutrondoj -GenericName[es]=Lector de orígenes RSS -GenericName[et]=RSS-uudistevoogude lugemisvahend -GenericName[eu]=RSS iturri Irakurlea -GenericName[fa]=خوانندۀ خوراندن RSS -GenericName[fi]=RSS-syötelukija -GenericName[fr]=Lecteur de flux RSS -GenericName[fy]=RSS-nijsoanfierlêzer -GenericName[ga]=Léitheoir na bhFothaí RSS -GenericName[gl]=Lector de Novas por RSS -GenericName[he]=קורא חדשות (RSS) -GenericName[hu]=RSS hírolvasó -GenericName[is]=RSS fréttaforrit -GenericName[it]=Lettore Fonti RSS -GenericName[ja]=RSS ニュースリーダー -GenericName[kk]=RSS жаңалықтарын оқу -GenericName[km]=កម្មវិធីអានមតិព័ត៌មាន RSS -GenericName[ko]=RSS 피드 리더 -GenericName[lt]=RSS kanalų skaitytuvė -GenericName[ms]= Pembaca Suapan RSS -GenericName[nb]=Leser for RSS-kanal -GenericName[nds]=Kieker för RSS-Mellenströöm -GenericName[ne]=आरएसएस फिड रिडर -GenericName[nl]=RSS-feedlezer -GenericName[nn]=RSS-lesar -GenericName[pa]=RSS ਫੀਡ ਰੀਡਰ -GenericName[pl]=Program do przeglądania kanałów RSS -GenericName[pt]=Leitor de Fontes RSS -GenericName[pt_BR]=Leitor de Fontes de Notícias RSS -GenericName[ru]=Чтение лент новостей -GenericName[se]=RSS-gáldu logan -GenericName[sk]=Prehliadač RSS kŕmitok -GenericName[sl]=Bralnik virov RSS -GenericName[sr]=Читач RSS довода -GenericName[sr@Latn]=Čitač RSS dovoda -GenericName[sv]=Läsare av RSS-kanaler -GenericName[ta]=RSS பீஃட் வாசிப்பான் -GenericName[tr]=RSS Haber Kaynağı Okuyucu -GenericName[uk]=Програма для читання подач RSS -GenericName[uz]=RSS янгиликларни ўқувчи -GenericName[zh_CN]=RSS 种子阅读器 -GenericName[zh_TW]=RSS Feed 閱讀器 -Comment=An RSS Aggregator for TDE -Comment[af]='n RSS leser vir TDE -Comment[bg]=Четец на новости във формат RSS -Comment[ca]=Un lector RSS per TDE -Comment[cs]=RSS agregátor pro TDE -Comment[da]=En RSS Aggregator for TDE -Comment[de]=Ein RSS-Nachrichtensammler für TDE -Comment[el]=Ένας συσσωρευτής RSS για το TDE -Comment[eo]=RSS-akumulilo por TDE -Comment[es]=Un agregador de RSS para TDE -Comment[et]=TDE RSS-uudistevoogude lugemisvahend -Comment[eu]=TDE-ren RSS gehitzailea -Comment[fa]=انبوههساز RSSای برای TDE -Comment[fi]=RSS-syötelukija -Comment[fr]=Un lecteur de flux RSS pour TDE -Comment[fy]=In RSS-agregator foar TDE -Comment[ga]=Comhbhailitheoir RSS le haghaidh TDE -Comment[gl]=Un agregador de RSS para TDE -Comment[hu]=TDE-s hírolvasó RSS hírcsatornákhoz -Comment[is]=RSS fréttaforrit fyrir TDE -Comment[it]=Un concentratore TDE per RSS -Comment[ja]=TDE 用 RSS アグリゲータ -Comment[kk]=TDE-нің RSS жаңалық агрегаторы -Comment[km]=កម្មវិធីអាន RSS សម្រាប់ TDE -Comment[ko]=TDE용 RSS 리더 -Comment[ms]=Pengagregat RSS untuk TDE -Comment[nb]=En RSS-oppsamler for TDE -Comment[nds]=Tosamensteller för RSS-Mellenströöm vun TDE -Comment[ne]=केडीई का लागि एउटा आरएसएस एक्रिगेटर -Comment[nl]=Een RSS-agregator voor TDE -Comment[nn]=Ein RSS-lesar for TDE -Comment[pl]=Program podsumowujący kanały RSS dla TDE -Comment[pt]=Um Agregador RSS do TDE -Comment[pt_BR]=Um Agregador RSS para o TDE -Comment[ru]=Чтение лент новостей RSS -Comment[se]=TDE:a RSS-logan -Comment[sk]=Zhromažďovač RSS pre TDE -Comment[sl]=Zbiralnik RSS za TDE -Comment[sr]=Сакупљач RSS довода за TDE -Comment[sr@Latn]=Sakupljač RSS dovoda za TDE -Comment[sv]=En RSS-samlare för TDE -Comment[ta]=கேடியிக்கான ஒரு RSS சேர்ப்பான் -Comment[tr]=Bir TDE RSS Okuyucusu -Comment[uk]=Агрегатор RSS для TDE -Comment[uz]=TDE учун RSS янгиликларни ўқувчи -Comment[zh_CN]=TDE RSS 新闻收集器 -Comment[zh_TW]=TDE 的 RSS 收集器 Terminal=false Categories=Qt;TDE;Network;News; X-DCOP-ServiceType=Unique diff --git a/akregator/src/akregator_export.h b/akregator/src/akregator_export.h index 00fead92..d389c0d9 100644 --- a/akregator/src/akregator_export.h +++ b/akregator/src/akregator_export.h @@ -21,7 +21,7 @@ #ifndef AKREGATOR_AKREGATOREXPORT_H #define AKREGATOR_AKREGATOREXPORT_H -#include <tdepimmacros.h> +#include <kdemacros.h> #define AKREGATOR_EXPORT KDE_EXPORT diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index d7ca0d44..b69d0736 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -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()), + kapp, 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(kapp, 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); @@ -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(); } diff --git a/akregator/src/akregator_part.desktop b/akregator/src/akregator_part.desktop index 87189604..b83f182a 100644 --- a/akregator/src/akregator_part.desktop +++ b/akregator/src/akregator_part.desktop @@ -1,12 +1,6 @@ [Desktop Entry] Name=aKregatorPart -Name[cs]=Komponenta aKregator -Name[da]=AkregatorPart -Name[de]=aKregator-Komponente -Name[nds]=aKregator-Komponent -Name[pt_BR]=Componente do aKregator -Name[sv]=aKregator-delprogram -Name[ta]=aKregatorபகுதி + X-TDE-ServiceTypes=KParts/ReadOnlyPart X-TDE-Library=libakregatorpart Type=Service 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_plugin.desktop b/akregator/src/akregator_plugin.desktop index 096e655c..52635e09 100644 --- a/akregator/src/akregator_plugin.desktop +++ b/akregator/src/akregator_plugin.desktop @@ -1,57 +1,8 @@ [Desktop Entry] -Type=ServiceType -X-TDE-ServiceType=Akregator/Plugin Comment=Plugin for Akregator -Comment[af]=Inprop module vir Akregator -Comment[be]=Утулка для Akregator -Comment[bg]=Приставка за Akregator -Comment[br]=Lugent evit Akregator -Comment[ca]=Endollable per a l'Akregator -Comment[cs]=Modul pro Akregator -Comment[de]=Modul für Akregator -Comment[el]=Πρόσθετο για το Akregator -Comment[eo]=Kromprogramo por Akregator -Comment[es]=Extensión para Akregator -Comment[et]=Akregatori plugin -Comment[eu]=Akregator-en plugina -Comment[fa]=وصله برای Akregator -Comment[fi]=Liitännäinen Akregatoriin -Comment[fr]=Module pour Akregator -Comment[fy]=Plugin foar Akregator -Comment[ga]=Breiseán Akregator -Comment[gl]=Extensión para Akregator -Comment[he]=תוסף עבור Akregator -Comment[hu]=Akregator bővítőmodul -Comment[is]=Íforrit fyrir Akregator -Comment[it]=Plugin per Akregator -Comment[ja]=Akregator 用プラグイン -Comment[kk]=Akregator-дың плагин модулі -Comment[km]=កម្មវិធីជំនួយ Akregator -Comment[ko]=Akregator 플러그인 -Comment[lt]=Akregator skirtas priedas -Comment[mk]=Приклучок за Akregator -Comment[ms]=Plugin untuk Akregator -Comment[nb]=Programtillegg for Akregator -Comment[nds]=Moduul för Akregator -Comment[ne]=एक्रिगेटरका लागि प्लगइन -Comment[nl]=Plugin voor Akregator -Comment[nn]=Programtillegg til Akregator -Comment[pl]=Wtyczka dla Akregatora -Comment[pt]='Plugin' para o Akregator -Comment[pt_BR]=Plug-in para o Akregator -Comment[ru]=Модуль Akregator -Comment[se]=Lassemoduvla Akregatorii -Comment[sk]=Modul pre Akregator -Comment[sl]=Vstavek za Akregator -Comment[sr]=Прикључак за Akregator -Comment[sr@Latn]=Priključak za Akregator -Comment[sv]=Insticksprogram för Akregator -Comment[tr]=Akregator Eklentisi -Comment[uk]=Втулок для Akregator -Comment[uz]=Akregator учун плагин -Comment[zh_CN]=Akregator 插件 -Comment[zh_TW]=Akregator 外掛程式 +Type=ServiceType +X-TDE-ServiceType=Akregator/Plugin # Type of plugin, e.g. "storage". [PropertyDef::X-TDE-akregator-plugintype] 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..bcda5d16 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -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/articlelistview.cpp b/akregator/src/articlelistview.cpp index a0e5c8b7..7731c768 100644 --- a/akregator/src/articlelistview.cpp +++ b/akregator/src/articlelistview.cpp @@ -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..8da54096 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -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(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(slotPaletteOrFontChanged()) ); + connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotPaletteOrFontChanged()) ); m_imageDir.setPath(TDEGlobal::dirs()->saveLocation("cache", "akregator/Media/")); m_htmlFooter = "</body></html>"; @@ -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/eventsrc b/akregator/src/eventsrc index 6615ce17..56a99ab0 100644 --- a/akregator/src/eventsrc +++ b/akregator/src/eventsrc @@ -1,212 +1,13 @@ [!Global!] IconName=akregator Comment=Akregator -Comment[da]=Akregator Plugin -Comment[ne]=एक्रिगेटर -Comment[sv]=aKregator [feed_added] Name=Feed added -Name[af]=Stroom bygevoeg -Name[bg]=Добавена е новина -Name[ca]=Enllaç afegit -Name[cs]=Přidán kanál -Name[da]=Kilde tilføjet -Name[de]=Nachrichtenquelle hinzugefügt -Name[el]=Προστέθηκε ροή -Name[eo]=Fluo aldonita -Name[es]=Origen añadido -Name[et]=Uudisevoog lisatud -Name[eu]=Iturria gehituta -Name[fa]=خوراندن اضافهشده -Name[fi]=Syöte lisätty -Name[fr]=Flux ajouté -Name[fy]=Nijsoanfier taheakke -Name[ga]=Cuireadh fotha leis -Name[gl]=Engadiuse unha fonte -Name[he]=נוסף ערוץ -Name[hu]=Hírforrás felvéve -Name[is]=Straum bætt við -Name[it]=Aggiunta fonte -Name[ja]=フィード追加 -Name[kk]=Қор қосылды -Name[km]=បានបន្ថែមមតិព័ត៌មាន -Name[ko]=피드 추가됨 -Name[lt]=Kanalas pridėtas -Name[ms]=Suapan ditambah -Name[nb]=Kanal lagt til -Name[nds]=Narichtenstroom toföögt -Name[ne]=फिड थपियो -Name[nl]=Feed toegevoegd -Name[nn]=Kanal lagd til -Name[pl]=Kanał dodany -Name[pt]=Fonte adicionada -Name[pt_BR]=Fonte de notícias adicionada -Name[ru]=Лента новостей добавлена -Name[se]=Gáldu lasihuvvon -Name[sk]=Kŕmitko pridané -Name[sl]=Vir je dodan -Name[sr]=Довод је додат -Name[sr@Latn]=Dovod je dodat -Name[sv]=Kanal tillagd -Name[ta]=பீஃட் சேர்க்கப்பட்டது -Name[tr]=Haber kaynağı eklendi -Name[uk]=Подачу додано -Name[uz]=Янгиликлар тасмаси қўшилди -Name[zh_CN]=添加了新闻源 -Name[zh_TW]=已加入 Feed Comment=A new feed was remotely added to Akregator -Comment[af]='n Nuwe stroom was vanaf 'n afgeleë ligging by Akregator bygevoeg. -Comment[bg]=Отдалечено е добавена нова новина към Akregator -Comment[ca]=S'ha afegit remotament un enllaç a l'Akregator -Comment[cs]=Byl přidán nový kanál do Akregatoru -Comment[da]=En ny kilde blev tilføjet eksternt til Akregator -Comment[de]=Eine neue Nachrichtenquelle wurde von extern zu Akregator hinzugefügt -Comment[el]=Μια νέα ροή προστέθηκε απομακρυσμένα στο Akregator -Comment[es]=Se ha añadido remotamente un origen a Akregator -Comment[et]=Akregatorile lisati väljastpoolt uus uudisevoog -Comment[eu]=Iturri berri bat gehitu da urrunetik Akregator-era -Comment[fa]=خوراندن جدیدی که به صورت دور به Akregator اضافه شد -Comment[fi]=Uusi syöte lisättiin Akregatoriin ulkopuolelta -Comment[fr]=Un flux a été ajouté à distance à Akregator -Comment[fy]=Der wie ekstern nije nijsoanfier taheakke oan Akregator -Comment[gl]=Engadiuse remotamente unha nova fonte a Akregator -Comment[he]=נוסף ערוץ ל־Akregator מרחוק -Comment[hu]=Egy hírforrást távolról felvettek az Akregatorba -Comment[is]=Nýjum straum var bætt við Akregator -Comment[it]=Una nuova fonte è stata aggiunta ad Akregator da remoto -Comment[ja]=新規フィードがリモートで Akregator に追加されました -Comment[kk]=Akregator-ға қашықтан жаңа қор қосылды -Comment[km]=បានបន្ថែមមតិព័ត៌មានថ្មីមួយពីចម្ងាយទៅ Akregator -Comment[ko]=Akregator에 피드가 원격으로 추가됨 -Comment[lt]=Naujas nutolęs naujienų kanalas buvo įdėtas į Akregator -Comment[ms]=Suapan baru ditambah dari jauh kepada Akregator -Comment[nb]=En ny kanal ble lagt til Akgregator utenfra -Comment[nds]=En nieg Stroom wöör Akregator vun buten toföögt -Comment[ne]=एक्रिगेटरमा एउटा नयाँ फिड टाढाबाट थपिएको थियो -Comment[nl]=Er was extern een nieuwe feed toegevoegd aan Akregator -Comment[nn]=Ein ny kanal vart lagd til Akregator -Comment[pl]=Nowy kanał został zdalnie dodany do Akregatora -Comment[pt]=Foi adicionada remotamente uma nova fonte ao Akregator -Comment[pt_BR]=Uma nova fonte de notícias foi adicionada remotamente ao Akregator -Comment[ru]=Новая лента новостей добавлена в список Akregator -Comment[se]=Ođđa gáldu lasihuvvui Akregatorii -Comment[sk]=Nové kŕmitko bolo vzdialene pridané do Akregator -Comment[sl]=Nov vir je bil oddaljeno dodan v Akregator -Comment[sr]=Нови довод је удаљено додат у Akregator -Comment[sr@Latn]=Novi dovod je udaljeno dodat u Akregator -Comment[sv]=En ny kanal har lagts till i aKregator utifrån -Comment[ta]=Akregatorக்கு ஒரு புதிய உள்ளீடு சேர்க்கப்பட்டது -Comment[tr]=Akregator'a yeni bir haber kaynağı eklendi -Comment[uk]=Нову подачу було віддалено додано до Akregator -Comment[uz]=Akregator дастурига янги янгиликлар тасмаси қўшилди -Comment[zh_CN]=新闻源远程添加进了 Akregator -Comment[zh_TW]=已從遠端加入新的 feed 到 Akregator default_presentation=4 [new_articles] Name=New Articles -Name[af]=Nuwe Artikels -Name[ar]=المقالات الجديدة -Name[be]=Новыя артыкулы -Name[bg]=Нови статии -Name[br]=Pennadoù nevez -Name[ca]=Nous articles -Name[cs]=Nové články -Name[da]=Nye artikler -Name[de]=Neue Artikel -Name[el]=Άρθρα νέων -Name[eo]=Novaj Artikoloj -Name[es]=Artículos nuevos -Name[et]=Uued artiklid -Name[eu]=Artikulu berriak -Name[fa]=مقالات جدید -Name[fi]=Uudet artikkelit -Name[fr]=Nouveaux articles -Name[fy]=Nije artikels -Name[ga]=Altanna Nua -Name[gl]=Novos Artigos -Name[he]=מאמרים חדשים -Name[hu]=Hírekk -Name[is]=Nýjar greinar -Name[it]=Nuovi articoli -Name[ja]=新規記事 -Name[kk]=Жаңа мақалалар -Name[km]=អត្ថបទថ្មី -Name[ko]=새 글 -Name[lt]=Nauji straipsniai -Name[mk]=Нови написи -Name[ms]=Artikel Baru -Name[nb]=Nye artikler -Name[nds]=Niege Artikeln -Name[ne]=नयाँ लेख -Name[nl]=Nieuwe artikelen -Name[nn]=Nye artiklar -Name[pl]=Nowe artykuły -Name[pt]=Novos Artigos -Name[pt_BR]=Novos Artigos -Name[ru]=Новые статьи -Name[se]=Ođđa artihkkalat -Name[sk]=Nový článok -Name[sl]=Novi članki -Name[sr]=Нови чланци -Name[sr@Latn]=Novi članci -Name[sv]=Nya artiklar -Name[ta]= புதிய செய்திகள் -Name[tr]=Yeni Haberler -Name[uk]=Нові статті -Name[uz]=Янги мақолалар -Name[zh_CN]=新闻文章 -Name[zh_TW]=新文章 Comment=New articles were fetched -Comment[af]=Nuwe artikels was afgelaai -Comment[ar]=تمّ جلب المقالات الجديدة -Comment[bg]=Пристигнали са нови статии -Comment[ca]=S'han obtingut nous articles -Comment[cs]=Byly staženy nové články -Comment[da]=Nye artikler blev hentet -Comment[de]=Neue Artikel wurden abgeholt -Comment[el]=Έφτασαν νέα άρθρα -Comment[eo]=Novaj artikoloj estis alprenataj -Comment[es]=Se obtuvieron los artículos nuevos -Comment[et]=Tõmmati uued artiklid -Comment[eu]=Artikulu berriak eskuratu dira -Comment[fa]=مقالات جدید واکشی شدند -Comment[fi]=Uutta postia saapunut -Comment[fr]=Les nouveaux articles ont été relevés -Comment[fy]=Nije artikels binne ophelle -Comment[ga]=Fuarthas ailt nua -Comment[gl]=Obtivéronse novos artigos -Comment[he]=הורדו מאמרים נוספים -Comment[hu]=Új hírek lettek letöltve -Comment[is]=Nýjar greinar voru sóttar -Comment[it]=I nuovi articoli sono stati recuperati -Comment[ja]=新規記事を取得しました -Comment[kk]=Жаңа мақалалар қабылданды -Comment[km]=បានប្រមូលអត្ថបទថ្មី -Comment[ko]=새 글을 가져옴 -Comment[lt]=Nauji straipsniai parsiųsti -Comment[mk]=Беа земени нови написи -Comment[ms]=Artikel baru telah dikutip -Comment[nb]=Nye artikler ble hentet -Comment[nds]=Niege Artikeln wöörn haalt -Comment[ne]=नयाँ लेख तानिएका थिय -Comment[nl]=Nieuw artikelen zijn opgehaald -Comment[nn]=Nye artiklar vart henta -Comment[pl]=Pobrano nowe artykuły -Comment[pt]=Foram recebidos novos artigos -Comment[pt_BR]=Há novos artigos disponíveis -Comment[ru]=Получены новые статьи -Comment[se]=Ođđa artihkkalat vižžon -Comment[sk]=Získali sa nové články -Comment[sl]=Povlečeni so bili novi članki -Comment[sr]=Добављени су нови чланци -Comment[sr@Latn]=Dobavljeni su novi članci -Comment[sv]=Nya artiklar har hämtats -Comment[ta]=புதிய கட்டுரைகள் கொண்டுவரப்பட்டது -Comment[tr]=Yeni haberler alındı -Comment[uk]=Отримано нові статті -Comment[zh_CN]=获取了新文章 -Comment[zh_TW]=已抓到新文章 default_presentation=4 - diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp index 7e7f59e8..53b38f65 100644 --- a/akregator/src/feed.cpp +++ b/akregator/src/feed.cpp @@ -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..513f845f 100644 --- a/akregator/src/feediconmanager.cpp +++ b/akregator/src/feediconmanager.cpp @@ -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); @@ -119,7 +119,7 @@ TQString FeedIconManager::iconLocation(const KURL & url) const kapp->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/article.cpp b/akregator/src/librss/article.cpp index 24413053..18522fe3 100644 --- a/akregator/src/librss/article.cpp +++ b/akregator/src/librss/article.cpp @@ -286,5 +286,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..c27fdfe7 100644 --- a/akregator/src/librss/article.h +++ b/akregator/src/librss/article.h @@ -169,4 +169,3 @@ namespace RSS } #endif // LIBRSS_ARTICLE_H -// vim: noet:ts=4 diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp index 6d6e1057..3bc64d00 100644 --- a/akregator/src/librss/document.cpp +++ b/akregator/src/librss/document.cpp @@ -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..8d098e7d 100644 --- a/akregator/src/librss/document.h +++ b/akregator/src/librss/document.h @@ -234,4 +234,3 @@ namespace RSS } #endif // LIBRSS_DOCUMENT_H -// vim: noet:ts=4 diff --git a/akregator/src/librss/global.h b/akregator/src/librss/global.h index 091018cb..966521cc 100644 --- a/akregator/src/librss/global.h +++ b/akregator/src/librss/global.h @@ -11,7 +11,7 @@ #ifndef LIBRSS_GLOBAL_H #define LIBRSS_GLOBAL_H -#include <tdepimmacros.h> +#include <kdemacros.h> template <class> class TQValueList; @@ -145,4 +145,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..4c99c7f3 100644 --- a/akregator/src/librss/image.h +++ b/akregator/src/librss/image.h @@ -33,7 +33,7 @@ namespace RSS */ class KDE_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..5cc6aa22 100644 --- a/akregator/src/librss/loader.cpp +++ b/akregator/src/librss/loader.cpp @@ -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); } @@ -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..ea81a0a6 100644 --- a/akregator/src/librss/loader.h +++ b/akregator/src/librss/loader.h @@ -34,7 +34,7 @@ namespace RSS */ class KDE_EXPORT DataRetriever : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -89,7 +89,7 @@ namespace RSS */ class KDE_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 * @@ -256,7 +256,7 @@ namespace RSS */ class KDE_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/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp index bef989c6..4515cf7e 100644 --- a/akregator/src/librss/testlibrss.cpp +++ b/akregator/src/librss/testlibrss.cpp @@ -19,8 +19,8 @@ static const TDECmdLineOptions options[] = 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 ) ) ); + connect( loader, TQ_SIGNAL( loadingComplete( Loader *, Document, Status ) ), + this, TQ_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); loader->loadFrom( url, new FileRetriever ); } diff --git a/akregator/src/librss/testlibrss.h b/akregator/src/librss/testlibrss.h index 222943a6..2a918a5b 100644 --- a/akregator/src/librss/testlibrss.h +++ b/akregator/src/librss/testlibrss.h @@ -14,7 +14,7 @@ using RSS::Status; class Tester : public TQObject { - Q_OBJECT + TQ_OBJECT public: void test( const TQString &url ); 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..9303bdf5 100644 --- a/akregator/src/librss/tools_p.cpp +++ b/akregator/src/librss/tools_p.cpp @@ -245,5 +245,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..0ec9013f 100644 --- a/akregator/src/librss/tools_p.h +++ b/akregator/src/librss/tools_p.h @@ -37,4 +37,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/mainwindow.cpp b/akregator/src/mainwindow.cpp index c4e47338..aa10eb70 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -62,7 +62,7 @@ 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(kapp, 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,10 +226,10 @@ 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() @@ -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/CMakeLists.txt b/akregator/src/mk4storage/CMakeLists.txt index c229d6ec..a1c78613 100644 --- a/akregator/src/mk4storage/CMakeLists.txt +++ b/akregator/src/mk4storage/CMakeLists.txt @@ -27,7 +27,12 @@ link_directories( ##### other data ################################ -install( FILES akregator_mk4storage_plugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE akregator_mk4storage_plugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR akregator-desktops +) + install( FILES mk4config.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) diff --git a/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop b/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop index 4d932dcf..28d3cb0e 100644 --- a/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop +++ b/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop @@ -1,99 +1,10 @@ [Desktop Entry] -Type=Service Name=Metakit storage backend -Name[af]=Metakit stoor agterkant -Name[bg]=Приставка за архивиране Metakit -Name[ca]=Dorsal de emmagatzematge Metakit -Name[cs]=Metakit úložiště -Name[da]=Metakit lagringsgrænseflade -Name[de]=Metakit Archiv-Modul -Name[el]=Σύστημα υποστήριξης αποθήκευσης Metakit -Name[eo]=Metakit datumstora maŝino -Name[es]=Dorsal de almacenamiento Metakit -Name[et]=Metakiti salvestamisrakendus -Name[eu]=Metakit-en biltegiratze euskarria -Name[fa]=پشتیبان ذخیرهگاه Metakit -Name[fi]=Metakit-tallennusajuri -Name[fr]=Stockage avec Metakit -Name[fy]=Metakit-opslachefterein -Name[gl]=Manexador do almacenador Metakit -Name[hu]=Metakit tároló -Name[is]=Metakit geymslu bakendi -Name[it]=Backend archiviazione metakit -Name[ja]=メタキットストレージバックエンド -Name[kk]=Metakit архивтеу бағдарламасы -Name[km]=កម្មវិធីខាងក្រោយសម្រាប់រក្សាទុក (Metakit) -Name[ko]=Metakit 저장소 백엔드 -Name[lt]=Metakit saugojimo programinė sąsaja -Name[ms]=Hujung belakang storan Metakit -Name[nb]=Metakit lagringsbakstykke -Name[nds]=Metakit-Archivmoduul -Name[ne]=मेटाकिट भण्डारण ब्याकइन्ड -Name[nl]=Metakit-opslagbackend -Name[nn]=Metakit-lagringsbakstykke -Name[pl]=System przechowywania Metakit -Name[pt]=Infra-estrutura de armazenamento Metakit -Name[pt_BR]=Mecanismo de armazenamento Metakit -Name[ru]=Движок Metakit -Name[sl]=Shranjevanje Metakit -Name[sr]=Систем за смештање Мета комплета -Name[sr@Latn]=Sistem za smeštanje Meta kompleta -Name[sv]=Metakit lagringsgränssnitt -Name[tr]=Metakit depolama arka ucu -Name[uk]=Програма зберігання Metakit -Name[zh_CN]=Metakit 存储后端 -Name[zh_TW]=Metakit 儲存後端介面 -X-TDE-Library=libakregator_mk4storage_plugin + Comment=Plugin for Akregator -Comment[af]=Inprop module vir Akregator -Comment[be]=Утулка для Akregator -Comment[bg]=Приставка за Akregator -Comment[br]=Lugent evit Akregator -Comment[ca]=Endollable per a l'Akregator -Comment[cs]=Modul pro Akregator -Comment[de]=Modul für Akregator -Comment[el]=Πρόσθετο για το Akregator -Comment[eo]=Kromprogramo por Akregator -Comment[es]=Extensión para Akregator -Comment[et]=Akregatori plugin -Comment[eu]=Akregator-en plugina -Comment[fa]=وصله برای Akregator -Comment[fi]=Liitännäinen Akregatoriin -Comment[fr]=Module pour Akregator -Comment[fy]=Plugin foar Akregator -Comment[ga]=Breiseán Akregator -Comment[gl]=Extensión para Akregator -Comment[he]=תוסף עבור Akregator -Comment[hu]=Akregator bővítőmodul -Comment[is]=Íforrit fyrir Akregator -Comment[it]=Plugin per Akregator -Comment[ja]=Akregator 用プラグイン -Comment[kk]=Akregator-дың плагин модулі -Comment[km]=កម្មវិធីជំនួយ Akregator -Comment[ko]=Akregator 플러그인 -Comment[lt]=Akregator skirtas priedas -Comment[mk]=Приклучок за Akregator -Comment[ms]=Plugin untuk Akregator -Comment[nb]=Programtillegg for Akregator -Comment[nds]=Moduul för Akregator -Comment[ne]=एक्रिगेटरका लागि प्लगइन -Comment[nl]=Plugin voor Akregator -Comment[nn]=Programtillegg til Akregator -Comment[pl]=Wtyczka dla Akregatora -Comment[pt]='Plugin' para o Akregator -Comment[pt_BR]=Plug-in para o Akregator -Comment[ru]=Модуль Akregator -Comment[se]=Lassemoduvla Akregatorii -Comment[sk]=Modul pre Akregator -Comment[sl]=Vstavek za Akregator -Comment[sr]=Прикључак за Akregator -Comment[sr@Latn]=Priključak za Akregator -Comment[sv]=Insticksprogram för Akregator -Comment[tr]=Akregator Eklentisi -Comment[uk]=Втулок для Akregator -Comment[uz]=Akregator учун плагин -Comment[zh_CN]=Akregator 插件 -Comment[zh_TW]=Akregator 外掛程式 + +Type=Service +X-TDE-Library=libakregator_mk4storage_plugin X-TDE-ServiceTypes=Akregator/Plugin X-TDE-akregator-plugintype=storage @@ -103,4 +14,3 @@ X-TDE-akregator-email=frank.osterfeld@kdemail.net X-TDE-akregator-rank=255 X-TDE-akregator-version=1 X-TDE-akregator-framework-version=1 - 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/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..0331e0f1 100644 --- a/akregator/src/mk4storage/storagemk4impl.cpp +++ b/akregator/src/mk4storage/storagemk4impl.cpp @@ -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..1962824f 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -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..9e705ec5 100644 --- a/akregator/src/searchbar.cpp +++ b/akregator/src/searchbar.cpp @@ -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..b1cbf9c5 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; } 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..728bf0ab 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() @@ -93,7 +93,7 @@ int TagAction::plug(TQWidget* widget, int index) 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..5d04d549 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(); } @@ -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..603f4efc 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -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"); } @@ -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 |